Commit Graph

5 Commits

Author SHA1 Message Date
GriffinR dcdb9024d8 Sync palette macros 2023-05-26 14:52:21 -04:00
Eduardo Quezada 9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
2022-09-04 17:44:13 -03:00
GriffinR 96ecc82c98 Sync battle anim - poison, psychic 2022-08-17 13:52:24 -04:00
GriffinR b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -04:00
GriffinR 702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00