Set up Battle Tent macros

8 files changed, 34 insertions, 79 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 651e4d832..36919fce0 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -9,6 +9,7 @@
 #include "constants/battle_pike.h"
 #include "constants/battle_pyramid.h"
 #include "constants/battle_setup.h"
+#include "constants/battle_tent.h"
 #include "constants/battle_tower.h"
 #include "constants/berry.h"
 #include "constants/cable_club.h"
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index e65b6bd77..ba8b3536f 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -49,8 +49,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 4
-	special CallVerdanturfTentFunction
+	battletent_getopponentintro
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
@@ -60,8 +59,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	playse SE_W173
 	waitse
 	waitmovement 0
-	setvar VAR_0x8004, 6
-	special CallFallarborTentFunction
+	fallarbortent_getopponentname
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
 
 FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
@@ -160,9 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
 FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special CallFallarborTentFunction
+	fallarbortent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 2bea29f38..fddadae15 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -39,19 +39,15 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
 	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
 	message FallarborTown_BattleTentLobby_Text_2C4EFF
 	waitmessage
-	setvar VAR_0x8004, 4
-	special CallFallarborTentFunction
+	fallarbortent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallFallarborTentFunction
+	fallarbortent_save 0
 	playse SE_SAVE
 	waitse
 
 FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
 	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 5
-	special CallFallarborTentFunction
+	fallarbortent_giveprize
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -84,9 +80,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
 	message FallarborTown_BattleTentLobby_Text_2C4FD7
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallFallarborTentFunction
+	fallarbortent_save 0
 	playse SE_SAVE
 	waitse
 	msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
@@ -99,9 +93,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 	lockall
 	message FallarborTown_BattleTentLobby_Text_2C504C
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special CallFallarborTentFunction
+	fallarbortent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -111,8 +103,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	special CallFallarborTentFunction
+	fallarbortent_getprize
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84
 	special SavePlayerParty
@@ -153,8 +144,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallFallarborTentFunction
+	fallarbortent_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index f89cca8f3..541dc3aae 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -47,8 +47,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	addobject 2
 	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
 	waitmovement 0
-	setvar VAR_0x8004, 4
-	special CallVerdanturfTentFunction
+	battletent_getopponentintro
 	lockall
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index b40a6f48e..493fd3f69 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -31,14 +31,11 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
 	waitmovement 0
 	compare VAR_0x8006, 2
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
-	setvar VAR_0x8004, 9
-	special CallSlateportTentFunction
-	setvar VAR_0x8004, 8
-	special CallSlateportTentFunction
+	slateporttent_generaterentalmons
+	slateporttent_generateopponentmons
 	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT
 	fadescreen 1
-	setvar VAR_0x8004, 6
-	special CallSlateportTentFunction
+	slateporttent_rentmons
 	waitstate
 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
@@ -92,8 +89,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
 
 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
-	setvar VAR_0x8004, 8
-	special CallSlateportTentFunction
+	slateporttent_generateopponentmons
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -102,8 +98,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
 
 SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
 	fadescreen 1
-	setvar VAR_0x8004, 7
-	special CallSlateportTentFunction
+	slateporttent_swapmons
 	waitstate
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -123,9 +118,7 @@ SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
 SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
 	message SlateportCity_BattleTentCorridor_Text_25ABAE
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special CallSlateportTentFunction
+	slateporttent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index bf64adca9..1a9801dd1 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -38,18 +38,14 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
 	lockall
 	message SlateportCity_BattleTentLobby_Text_2C5C6F
 	waitmessage
-	setvar VAR_0x8004, 4
-	special CallSlateportTentFunction
+	slateporttent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallSlateportTentFunction
+	slateporttent_save 0
 	playse SE_SAVE
 	waitse
 SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
 	msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 5
-	special CallSlateportTentFunction
+	slateporttent_giveprize
 	switch VAR_RESULT
 	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -68,9 +64,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
 	message SlateportCity_BattleTentLobby_Text_2C5BA2
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallSlateportTentFunction
+	slateporttent_save 0
 	playse SE_SAVE
 	waitse
 
@@ -85,9 +79,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
 	lockall
 	message SlateportCity_BattleTentLobby_Text_2C5DA7
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special CallSlateportTentFunction
+	slateporttent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -98,13 +90,11 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
 SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	special CallSlateportTentFunction
+	slateporttent_getprize
 	compare VAR_RESULT, 0
 	goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9
 	special SavePlayerParty
 	msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT
-
 SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
 	message SlateportCity_BattleTentLobby_Text_2C586A
 	waitmessage
@@ -128,8 +118,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
 SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallSlateportTentFunction
+	slateporttent_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	closemessage
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index 82df3143a..5ef8100cc 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -43,8 +43,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
 	addobject 2
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
 	waitmovement 0
-	setvar VAR_0x8004, 4
-	special CallVerdanturfTentFunction
+	battletent_getopponentintro
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
@@ -121,9 +120,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
 VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
 	message VerdanturfTown_BattleTentBattleRoom_Text_25007E
 	waitmessage
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 2
-	special CallVerdanturfTentFunction
+	verdanturftent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 0f2ec453e..6add7d182 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -39,19 +39,15 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
 	message VerdanturfTown_BattleTentLobby_Text_2C5791
 	waitmessage
-	setvar VAR_0x8004, 6
-	special CallVerdanturfTentFunction
+	verdanturftent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special CallVerdanturfTentFunction
+	verdanturftent_save 0
 	playse SE_SAVE
 	waitse
 
 VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 7
-	special CallVerdanturfTentFunction
+	verdanturftent_giveprize
 	switch VAR_RESULT
 	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -84,9 +80,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
 	message VerdanturfTown_BattleTentLobby_Text_2C56B8
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special CallVerdanturfTentFunction
+	verdanturftent_save 0
 	playse SE_SAVE
 	waitse
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
@@ -100,9 +94,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
 	msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT
 	message VerdanturfTown_BattleTentLobby_Text_24E5F6
 	waitmessage
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 1
-	special CallVerdanturfTentFunction
+	verdanturftent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -112,8 +104,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
 VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	special CallVerdanturfTentFunction
+	verdanturftent_getprize
 	compare VAR_RESULT, 0
 	goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE
 	special SavePlayerParty
@@ -154,8 +145,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
 VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallVerdanturfTentFunction
+	verdanturftent_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty