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
This commit is contained in:
Eduardo Quezada
2022-07-22 22:57:02 -04:00
327 changed files with 20712 additions and 15830 deletions

View File

@@ -12,7 +12,7 @@ MysteryGiftScript_AlteringCave_:
release
end
sText_MysteryGiftAlteringCave::
sText_MysteryGiftAlteringCave:
.string "Thank you for using the MYSTERY\n"
.string "GIFT System.\p"
.string "There appears to be a rumor about\n"