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

..

backgrounds

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-11-21 10:40:26 -08:00

masks

Document more battle anim effects

2021-02-28 09:54:55 -06:00

sprites

Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

2022-07-22 22:57:02 -04:00

unused

Label remaining symbols in graphics.c

2021-10-27 13:47:18 -04:00