summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-11-27 20:05:51 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-11-27 20:05:51 -0500
commitcbd2718b5e06afeaa86b2deb2ce740006d9ee389 (patch)
tree926885f4baa5671703707af2d76f65dc967167d8 /include/battle_setup.h
parent73b0f9eb5358b839bfa5f3d1b4c4163fe893d428 (diff)
parent18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff)
Merge branch 'master' into link
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);