Use macros for Trainer Hill

2 files changed, 16 insertions, 33 deletions

diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 909aaaf9f..0e8d28c1d 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -16,11 +16,9 @@ TrainerHill_Entrance_OnWarp: @ 82680CF
 	end
 
 TrainerHill_Entrance_OnResume: @ 82680D0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
-	special CallTrainerHillFunction
+	trainerhill_resumetimer
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
-	special CallTrainerHillFunction
+	trainerhill_clearresult
 	compare VAR_RESULT, 0  @ VAR_RESULT always 0 here
 	goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
 	setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
@@ -28,8 +26,7 @@ TrainerHill_Entrance_OnResume: @ 82680D0
 	end
 
 TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
-	special CallTrainerHillFunction
+	trainerhill_getwon
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
@@ -75,8 +72,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 
 TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
-	special CallTrainerHillFunction
+	trainerhill_getstatus
 	switch VAR_RESULT
 	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_ExitChallengeLost
 	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
@@ -113,8 +109,7 @@ TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
-	special CallTrainerHillFunction
+	trainerhill_inchallenge
 	compare VAR_RESULT, FALSE
 	goto_if_eq TrainerHill_Entrance_EventScript_ThanksForPlaying
 	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
@@ -131,12 +126,10 @@ TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
 	msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_getsaved
 	compare VAR_RESULT, FALSE
 	call_if_eq TrainerHill_Entrance_EventScript_SaveGame
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
-	special CallTrainerHillFunction
+	trainerhill_allfloorsused
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_Entrance_EventScript_AllFloorsUsed
 	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
@@ -165,15 +158,12 @@ TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_CancelEntry
 	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
-	copyvar VAR_0x8005, VAR_RESULT
-	special CallTrainerHillFunction
+	trainerhill_settag VAR_RESULT
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
 	msgbox TrainerHill_Entrance_Text_TimeProgessGetSetGo, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
-	special CallTrainerHillFunction
+	trainerhill_start
 	releaseall
 	end
 
@@ -188,19 +178,16 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 
 TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
 	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_setsaved
 	setvar VAR_TEMP_5, 1
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, FALSE
 	goto_if_eq TrainerHill_Entrance_EventScript_SaveFailed
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_setsaved
 	return
 
 TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_clearsaved
 	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index af4c9ea5a..e4e2cbb49 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -4,12 +4,10 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7
 	.byte 0
 
 TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
-	special CallTrainerHillFunction
+	trainerhill_settrainerflags
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
-	special CallTrainerHillFunction
+	trainerhill_getownerstate
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_Arrived
 	case 1, TrainerHill_Roof_EventScript_GivePrize
@@ -17,8 +15,7 @@ TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
 TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
 	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
 TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
-	special CallTrainerHillFunction
+	trainerhill_giveprize
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_ReceivePrize
 	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
@@ -38,8 +35,7 @@ TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
 	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
 TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
-	special CallTrainerHillFunction
+	trainerhill_finaltime
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_NewRecord
 	case 1, TrainerHill_Roof_EventScript_NoNewRecord