summaryrefslogtreecommitdiff
path: root/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-12-21 16:03:37 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-12-21 16:03:37 -0600
commit2c0e5a41a294106d01d9393db4fc58ef76e5358d (patch)
treebfc664cb9e4318df406d02578f0a3f138c33e0fe /data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
parenta705a863d1f59411a6f18fdd95e81de76f66fd66 (diff)
parent66f9d4c266b3bbfe02430282f512f722f04eaa4c (diff)
Merge remote-tracking branch 'Shanty/script_macros'
Diffstat (limited to 'data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc')
-rw-r--r--data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
index 85fd5e417..f605f65a2 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
special sub_81A8E7C
delay 2
- compare_var_to_value VAR_RESULT, 2
+ compare VAR_RESULT, 2
goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
setvar VAR_0x400D, 0
releaseall
@@ -49,17 +49,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
- compare_var_to_value VAR_RESULT, 4
+ compare VAR_RESULT, 4
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
- compare_var_to_value VAR_RESULT, 5
+ compare VAR_RESULT, 5
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
- compare_var_to_value VAR_RESULT, 2
+ compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
- compare_var_to_value VAR_RESULT, 3
+ compare VAR_RESULT, 3
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
- compare_var_to_value VAR_RESULT, 9
+ compare VAR_RESULT, 9
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
setvar VAR_0x8004, 14
setvar VAR_0x8005, 8
@@ -134,7 +134,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
- compare_var_to_value VAR_RESULT, 7
+ compare VAR_RESULT, 7
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, 6
special sub_81A8E7C
@@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
setvar VAR_0x8004, 7
special sub_81A8E7C
callstd 1
- compare_var_to_value VAR_0x8007, 0
+ compare VAR_0x8007, 0
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
setvar VAR_0x8004, 8
special sub_81A8E7C