summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authoritskobold <itskobold@users.noreply.github.com>2017-11-20 18:27:23 +0000
committeritskobold <itskobold@users.noreply.github.com>2017-11-20 18:27:23 +0000
commitcaf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch)
treef0592fc84aeb433b0fb59d9ceabd025b5589f83b /include/battle_setup.h
parent625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff)
parent1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
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);