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
+17 -17
View File
@@ -23,7 +23,7 @@ Movement_166903:: @ 8166903
VermilionCity_MapScript1_166906:: @ 8166906
setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY
checkflag FLAG_0x2F9
call_if eq, EventScript_166913
call_if TRUE, EventScript_166913
end
EventScript_166913:: @ 8166913
@@ -38,7 +38,7 @@ VermilionCity_EventScript_166920:: @ 8166920
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if_eq EventScript_166937
goto_if eq, EventScript_166937
msgbox gUnknown_817F776
release
end
@@ -52,26 +52,26 @@ VermilionCity_EventScript_166941:: @ 8166941
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if_eq EventScript_166996
goto_if eq, EventScript_166996
msgbox gUnknown_817FA22
release
end
EventScript_166958:: @ 8166958
checkflag FLAG_0x84A
goto_if lt, EventScript_1A77B0
goto_if FALSE, EventScript_1A77B0
checkitem ITEM_MYSTIC_TICKET, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A77B0
goto_if eq, EventScript_1A77B0
goto EventScript_1A77AA
end
EventScript_166977:: @ 8166977
checkflag FLAG_0x84B
goto_if lt, EventScript_1A77B0
goto_if FALSE, EventScript_1A77B0
checkitem ITEM_AURORA_TICKET, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A77B0
goto_if eq, EventScript_1A77B0
goto EventScript_1A77AA
end
@@ -88,14 +88,14 @@ EventScript_166996:: @ 8166996
EventScript_1669BB:: @ 81669BB
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
call EventScript_166958
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_1669FD
goto_if eq, EventScript_1669FD
call EventScript_166977
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_166A5F
goto_if eq, EventScript_166A5F
setvar VAR_0x8004, 0
message Text_17FBB8
waitmessage
@@ -105,9 +105,9 @@ EventScript_1669BB:: @ 81669BB
EventScript_1669FD:: @ 81669FD
call EventScript_166977
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_166AB1
goto_if eq, EventScript_166AB1
checkflag FLAG_0x2F0
call_if lt, EventScript_166A53
call_if FALSE, EventScript_166A53
message Text_17FCC1
waitmessage
multichoice 17, 6, 54, 0
@@ -125,7 +125,7 @@ EventScript_166A53:: @ 8166A53
EventScript_166A5F:: @ 8166A5F
checkflag FLAG_0x2F1
call_if lt, EventScript_166AA5
call_if FALSE, EventScript_166AA5
message Text_17FCC1
waitmessage
multichoice 13, 6, 55, 0
@@ -143,9 +143,9 @@ EventScript_166AA5:: @ 8166AA5
EventScript_166AB1:: @ 8166AB1
checkflag FLAG_0x2F0
call_if lt, EventScript_166A53
call_if FALSE, EventScript_166A53
checkflag FLAG_0x2F1
call_if lt, EventScript_166AA5
call_if FALSE, EventScript_166AA5
message Text_17FCC1
waitmessage
multichoice 13, 5, 56, 0
@@ -210,10 +210,10 @@ EventScript_166BA0:: @ 8166BA0
applymovement 255, Movement_1A75EB
waitmovement 0
compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if_eq EventScript_166BED
goto_if eq, EventScript_166BED
msgbox gUnknown_817FA3C
checkflag FLAG_GOT_SS_TICKET
goto_if lt, EventScript_166BDE
goto_if FALSE, EventScript_166BDE
msgbox gUnknown_817FA77
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
releaseall