Merge branch 'master' into quest_log

2018-11-21 09:00:41 -05:00
parent 6bcabeab1e 2ed26ab8fc
commit 77d7434df2
44 changed files with 5266 additions and 6718 deletions
@@ -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