Commit graph

6 commits

Author SHA1 Message Date
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
GriffinR
8950a41bfd Update some GF rom header names 2022-06-21 18:31:09 -04: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
9b2038a9a5 Additional GF ROM header doc 2021-11-01 02:54:53 -04:00
GriffinR
e0e2212db3 Avoid changed section warning 2021-11-01 01:47:38 -04:00
GriffinR
ef2971d8dc Convert GF ROM header to C 2021-11-01 01:42:02 -04:00