summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity/scripts.inc')
-rw-r--r--data/maps/RustboroCity/scripts.inc81
1 files changed, 36 insertions, 45 deletions
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 26b1357a5..345faa51c 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -7,15 +7,15 @@ RustboroCity_MapScript1_1E06C8: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY
call RustboroCity_EventScript_271ED7
compare VAR_0x405A, 6
- call_if 1, RustboroCity_EventScript_1E0707
+ call_if_eq RustboroCity_EventScript_1E0707
getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_0x405A, 6
- goto_eq RustboroCity_EventScript_1E06EC
+ goto_if_eq RustboroCity_EventScript_1E06EC
end
RustboroCity_EventScript_1E06EC:: @ 81E06EC
compare VAR_TEMP_0, 11
- goto_eq RustboroCity_EventScript_1E06FF
+ goto_if_eq RustboroCity_EventScript_1E06FF
setobjectxyperm 15, 12, 15
end
@@ -134,8 +134,7 @@ RustboroCity_Movement_1E085D: @ 81E085D
RustboroCity_EventScript_1E085F:: @ 81E085F
lock
faceplayer
- checkflag FLAG_0x08E
- goto_eq RustboroCity_EventScript_1E0874
+ goto_if_set FLAG_0x08E, RustboroCity_EventScript_1E0874
msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT
release
end
@@ -159,8 +158,7 @@ RustboroCity_EventScript_1E088A:: @ 81E088A
RustboroCity_EventScript_1E0893:: @ 81E0893
lock
faceplayer
- checkflag FLAG_BADGE01_GET
- goto_eq RustboroCity_EventScript_1E08A8
+ goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8
msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT
release
end
@@ -173,8 +171,7 @@ RustboroCity_EventScript_1E08A8:: @ 81E08A8
RustboroCity_EventScript_1E08B2:: @ 81E08B2
lock
faceplayer
- checkflag FLAG_0x0BC
- goto_eq RustboroCity_EventScript_1E08C7
+ goto_if_set FLAG_0x0BC, RustboroCity_EventScript_1E08C7
msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT
release
end
@@ -451,8 +448,7 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5
RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
lock
faceplayer
- checkflag FLAG_0x08F
- goto_eq RustboroCity_EventScript_1E0AF2
+ goto_if_set FLAG_0x08F, RustboroCity_EventScript_1E0AF2
msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT
release
end
@@ -489,13 +485,13 @@ RustboroCity_EventScript_1E0B22:: @ 81E0B22
RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
compare VAR_TEMP_1, 0
- call_if 1, RustboroCity_EventScript_1E0B6F
+ call_if_eq RustboroCity_EventScript_1E0B6F
compare VAR_TEMP_1, 1
- call_if 1, RustboroCity_EventScript_1E0B9B
+ call_if_eq RustboroCity_EventScript_1E0B9B
compare VAR_TEMP_1, 2
- call_if 1, RustboroCity_EventScript_1E0BC7
+ call_if_eq RustboroCity_EventScript_1E0BC7
compare VAR_TEMP_1, 3
- call_if 1, RustboroCity_EventScript_1E0BF3
+ call_if_eq RustboroCity_EventScript_1E0BF3
setflag FLAG_0x09F
setvar VAR_0x405A, 3
moveobjectoffscreen 9
@@ -583,19 +579,19 @@ RustboroCity_EventScript_1E0C4F:: @ 81E0C4F
RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
compare VAR_TEMP_1, 0
- call_if 1, RustboroCity_EventScript_1E0CDC
+ call_if_eq RustboroCity_EventScript_1E0CDC
compare VAR_TEMP_1, 1
- call_if 1, RustboroCity_EventScript_1E0D08
+ call_if_eq RustboroCity_EventScript_1E0D08
compare VAR_TEMP_1, 2
- call_if 1, RustboroCity_EventScript_1E0D34
+ call_if_eq RustboroCity_EventScript_1E0D34
compare VAR_TEMP_1, 3
- call_if 1, RustboroCity_EventScript_1E0D60
+ call_if_eq RustboroCity_EventScript_1E0D60
compare VAR_TEMP_1, 4
- call_if 1, RustboroCity_EventScript_1E0D96
+ call_if_eq RustboroCity_EventScript_1E0D96
msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL
compare VAR_RESULT, 0
- call_if 1, RustboroCity_EventScript_1E0CD3
+ call_if_eq RustboroCity_EventScript_1E0CD3
msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT
closemessage
setflag FLAG_0x090
@@ -673,8 +669,7 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96
RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
lockall
- checkflag FLAG_0x120
- call_if 0, RustboroCity_EventScript_1E0DD1
+ call_if_unset FLAG_0x120, RustboroCity_EventScript_1E0DD1
applymovement 14, RustboroCity_Movement_27259E
waitmovement 0
goto RustboroCity_EventScript_1E0FF3
@@ -682,10 +677,10 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
Route104_EventScript_1E0DD1:: @ 81E0DD1
RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
checkplayergender
- compare VAR_RESULT, 0
- goto_eq RustboroCity_EventScript_1E0DE9
- compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E0DEE
+ compare VAR_RESULT, MALE
+ goto_if_eq RustboroCity_EventScript_1E0DE9
+ compare VAR_RESULT, FEMALE
+ goto_if_eq RustboroCity_EventScript_1E0DEE
return
RustboroCity_EventScript_1E0DE9:: @ 81E0DE9
@@ -826,17 +821,15 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
checkplayergender
- compare VAR_RESULT, 0
- goto_eq RustboroCity_EventScript_1E100B
- compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E1114
+ compare VAR_RESULT, MALE
+ goto_if_eq RustboroCity_EventScript_1E100B
+ compare VAR_RESULT, FEMALE
+ goto_if_eq RustboroCity_EventScript_1E1114
end
RustboroCity_EventScript_1E100B:: @ 81E100B
- checkflag FLAG_0x0D3
- goto_eq RustboroCity_EventScript_1E10C1
- checkflag FLAG_0x120
- goto_eq RustboroCity_EventScript_1E1070
+ goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E10C1
+ goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1070
setflag FLAG_0x120
msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT
closemessage
@@ -852,7 +845,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
setvar VAR_0x8008, 0
msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E1092
+ goto_if_eq RustboroCity_EventScript_1E1092
msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
call RustboroCity_EventScript_1E10D6
releaseall
@@ -862,7 +855,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070
setvar VAR_0x8008, 1
msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E1092
+ goto_if_eq RustboroCity_EventScript_1E1092
msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
releaseall
end
@@ -878,7 +871,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092
RustboroCity_EventScript_1E10C1:: @ 81E10C1
msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT
compare VAR_0x8008, 0
- call_if 1, RustboroCity_EventScript_1E10D6
+ call_if_eq RustboroCity_EventScript_1E10D6
releaseall
end
@@ -906,10 +899,8 @@ RustboroCity_EventScript_1E1101:: @ 81E1101
end
RustboroCity_EventScript_1E1114:: @ 81E1114
- checkflag FLAG_0x0D3
- goto_eq RustboroCity_EventScript_1E11C0
- checkflag FLAG_0x120
- goto_eq RustboroCity_EventScript_1E1174
+ goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E11C0
+ goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1174
setflag FLAG_0x120
msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT
closemessage
@@ -924,7 +915,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
setvar VAR_0x4063, 2
msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E1191
+ goto_if_eq RustboroCity_EventScript_1E1191
msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
call RustboroCity_EventScript_1E10D6
releaseall
@@ -933,7 +924,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
RustboroCity_EventScript_1E1174:: @ 81E1174
msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq RustboroCity_EventScript_1E1191
+ goto_if_eq RustboroCity_EventScript_1E1191
msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
releaseall
end
@@ -949,7 +940,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191
RustboroCity_EventScript_1E11C0:: @ 81E11C0
msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT
compare VAR_0x8008, 0
- call_if 1, RustboroCity_EventScript_1E10D6
+ call_if_eq RustboroCity_EventScript_1E10D6
releaseall
end