Set up Battle Pyramid macros

2019-12-02 09:52:16 -05:00
parent 9fcfbdbef5
commit fdae25eab2
41 changed files with 204 additions and 173 deletions
@@ -32,11 +32,10 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
 	pike_inchallenge
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
-	special CallBattlePyramidFunction
-	compare VAR_RESULT, 1
+	pyramid_inchallenge
+	compare VAR_RESULT, 1  @ On Pyramid floor
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	compare VAR_RESULT, 2
+	compare VAR_RESULT, 2  @ On Pyramid peak
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	trainerhill_inchallenge
 	compare VAR_RESULT, TRUE