summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-21 21:25:48 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-21 21:25:48 -0500
commitadba0bacfccd15540f853dfd714ab8c91767e9c6 (patch)
tree9965f9c76e18bbab55474f1ae071d40ad3616c38 /include/battle_setup.h
parent161a37809bab3ab646c503a63d9ef258d9d518af (diff)
parent1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into load_save
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r--include/battle_setup.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e4acd8601..0168022cc 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -4,6 +4,9 @@
void BattleSetup_StartScriptedWildBattle(void);
u8 BattleSetup_GetTerrainId(void);
u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
+void BattleSetup_StartBattlePikeWildBattle(void);
+void BattleSetup_StartWildBattle(void);
+void BattleSetup_StartRoamerBattle(void);
u8 HasTrainerAlreadyBeenFought(u16);
void trainer_flag_set(u16);