summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-11-29 00:52:32 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-11-29 00:52:32 -0600
commit70743f4b951bb84ca33fd2151e55b2f5018eb6c5 (patch)
tree7298959f4e81c88adeac0c26b9016b9d197da1fd /include/battle_setup.h
parent52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (diff)
parent54da96309186b98263b4434911e1c5b8d4b4e3ec (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);