Use macros for Trainer Hill

2019-11-23 16:08:50 -05:00
parent 4dfa959fa2
commit 08a8dc46e3
7 changed files with 153 additions and 82 deletions
@@ -39,9 +39,8 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
-	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
+	trainerhill_inchallenge
+	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_1F_EventScript_Lost
 	special Script_FadeOutMapMusic
 	waitstate