use TRUE and FALSE for flag conditionals; more story flags

This commit is contained in:
PikalaxALT
2019-10-20 21:24:16 -04:00
parent 6b503e306d
commit 9aa5709329
166 changed files with 1167 additions and 1165 deletions
+14 -14
View File
@@ -43,7 +43,7 @@ EventScript_166F52:: @ 8166F52
EventScript_166F5E:: @ 8166F5E
checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
goto_if_eq EventScript_166F68
goto_if TRUE, EventScript_166F68
return
EventScript_166F68:: @ 8166F68
@@ -94,24 +94,24 @@ EventScript_166FCD:: @ 8166FCD
lockall
textcolor 0
checkflag FLAG_TEMP_2
call_if lt, EventScript_167032
call_if FALSE, EventScript_167032
checkflag FLAG_TEMP_2
call_if eq, EventScript_16703D
call_if TRUE, EventScript_16703D
playse SE_PIN
applymovement 3, Movement_1A75DB
waitmovement 0
applymovement 3, Movement_1A75DD
waitmovement 0
checkflag FLAG_TEMP_2
call_if lt, EventScript_167048
call_if FALSE, EventScript_167048
checkflag FLAG_TEMP_2
call_if eq, EventScript_167053
call_if TRUE, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_167068
goto_if eq, EventScript_167068
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_167078
goto_if eq, EventScript_167078
end
EventScript_167032:: @ 8167032
@@ -147,9 +147,9 @@ EventScript_167078:: @ 8167078
msgbox gUnknown_8180DF8
closemessage
checkflag FLAG_TEMP_2
call_if lt, EventScript_1670A0
call_if FALSE, EventScript_1670A0
checkflag FLAG_TEMP_2
call_if eq, EventScript_1670B3
call_if TRUE, EventScript_1670B3
removeobject 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
@@ -202,18 +202,18 @@ Movement_1670E2:: @ 81670E2
EventScript_1670E6:: @ 81670E6
checkflag FLAG_TEMP_2
call_if eq, EventScript_167142
call_if TRUE, EventScript_167142
addobject 4
checkflag FLAG_TEMP_2
call_if lt, EventScript_167154
call_if FALSE, EventScript_167154
checkflag FLAG_TEMP_2
call_if eq, EventScript_167166
call_if TRUE, EventScript_167166
msgbox gUnknown_8180EAD
closemessage
checkflag FLAG_TEMP_2
call_if lt, EventScript_167171
call_if FALSE, EventScript_167171
checkflag FLAG_TEMP_2
call_if eq, EventScript_167183
call_if TRUE, EventScript_167183
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject 3
delay 40