summaryrefslogtreecommitdiff
path: root/data/maps/TwoIsland
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-05-16 13:30:03 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-05-16 13:30:03 -0400
commita2d1b854d678204929580b8d82e507f908261fc1 (patch)
tree36166505adf0b81d79f787c32250e0e3a1514944 /data/maps/TwoIsland
parent006881415d315e34876f4d4f3060aca4dcf8e98d (diff)
goto_if_eq and switch/case in scripts
Diffstat (limited to 'data/maps/TwoIsland')
-rw-r--r--data/maps/TwoIsland/scripts.inc28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index 39df8625b..a9a42eda5 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -10,11 +10,11 @@ TwoIsland_MapScript1_16756A:: @ 816756A
EventScript_167576:: @ 8167576
checkflag FLAG_0x844
- goto_if 1, EventScript_167597
+ goto_if_eq EventScript_167597
checkflag FLAG_0x82C
- goto_if 1, EventScript_1675B8
+ goto_if_eq EventScript_1675B8
checkflag FLAG_0x2A3
- goto_if 1, EventScript_1675D9
+ goto_if_eq EventScript_1675D9
goto EventScript_1675E8
end
@@ -70,21 +70,21 @@ EventScript_167606:: @ 8167606
TwoIsland_EventScript_16760F:: @ 816760F
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
- goto_if 1, EventScript_1A7AE0
+ goto_if_eq EventScript_1A7AE0
lock
faceplayer
compare_var_to_value VAR_0x4078, 4
- goto_if 1, EventScript_167646
+ goto_if_eq EventScript_167646
compare_var_to_value VAR_0x4078, 3
- goto_if 1, EventScript_16765E
+ goto_if_eq EventScript_16765E
compare_var_to_value VAR_0x4078, 2
- goto_if 1, EventScript_167676
+ goto_if_eq EventScript_167676
goto EventScript_16768E
end
EventScript_167646:: @ 8167646
checkflag FLAG_0x2A0
- goto_if 1, EventScript_1676A6
+ goto_if_eq EventScript_1676A6
setflag FLAG_0x2A0
message Text_181CAE
waitmessage
@@ -93,7 +93,7 @@ EventScript_167646:: @ 8167646
EventScript_16765E:: @ 816765E
checkflag FLAG_0x29F
- goto_if 1, EventScript_1676A6
+ goto_if_eq EventScript_1676A6
setflag FLAG_0x29F
message Text_181C77
waitmessage
@@ -102,7 +102,7 @@ EventScript_16765E:: @ 816765E
EventScript_167676:: @ 8167676
checkflag FLAG_0x29E
- goto_if 1, EventScript_1676A6
+ goto_if_eq EventScript_1676A6
setflag FLAG_0x29E
message Text_181B7C
waitmessage
@@ -111,7 +111,7 @@ EventScript_167676:: @ 8167676
EventScript_16768E:: @ 816768E
checkflag FLAG_0x29D
- goto_if 1, EventScript_1676A6
+ goto_if_eq EventScript_1676A6
setflag FLAG_0x29D
message Text_181AFE
waitmessage
@@ -122,11 +122,11 @@ EventScript_1676A6:: @ 81676A6
message Text_1A6211
waitmessage
compare_var_to_value VAR_0x4078, 4
- goto_if 1, EventScript_167728
+ goto_if_eq EventScript_167728
compare_var_to_value VAR_0x4078, 3
- goto_if 1, EventScript_167708
+ goto_if_eq EventScript_167708
compare_var_to_value VAR_0x4078, 2
- goto_if 1, EventScript_1676EC
+ goto_if_eq EventScript_1676EC
goto EventScript_1676D3
end