Eduardo Quezada
b62e5aa72e
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
...
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
2023-02-15 14:11:03 -03:00
Jaizu
717ba22ea1
Make contest opponents an enum
...
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
2023-02-03 15:49:22 +01:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
GriffinR
fbb70b3727
Document contest AI scripts
2020-08-21 14:57:17 -04:00
GriffinR
2749948eeb
Clean up contest doc
2020-08-16 05:52:17 -04:00
GriffinR
aca50c87be
Continue new contest documentation
2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6
Begin new contest documentation
2020-07-23 17:55:40 -04:00
GriffinR
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Phlosioneer
845307b3a6
Rename contest AI stuff
2019-04-01 22:16:07 -04:00
Phlosioneer
207a54393c
Fix mistakes and use EVENT_OBJ_GFX_* macros
2019-03-31 20:07:24 -04:00
Phlosioneer
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405
Move gContestOpponents into C
...
2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
Phlosioneer
153499ed6f
Clean up contest_opponents.inc
2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b
Move contest winner list to C
2019-03-09 00:01:49 -05:00
Eduardo Quezada