LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
GriffinR
c940b67716
Continue macro comment updating
2021-11-17 17:45:59 -05:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces
2021-09-23 21:39:21 -04:00
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -04: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
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
ExpoSeed
c3113b43bb
Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion
2020-10-04 02:36:07 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
DizzyEggg
13c0c64d70
Merge with master
2020-02-23 12:41:36 +01:00
GriffinR
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
DizzyEggg
91acfb262f
Change x defend to x defense
2019-08-25 16:07:15 +02:00
GriffinR
d931ba9602
document remaining funcs
2019-08-21 17:06:55 -05:00
GriffinR
771a7b25fa
move data, more contest lady funcs
2019-08-21 17:06:55 -05:00
