Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT committed 2018-11-21 09:00:41 -05:00
commit 77d7434df2
44 files changed
+5266 -6718

No files matched your search

+1
View File
@@ -16,5 +16,6 @@ void trainer_flag_clear(u16);
void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void);
void sub_80803FC(void);
#endif // GUARD_BATTLE_SETUP_H