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
+16 -16
View File
@@ -32,17 +32,17 @@ EventScript_165920:: @ 8165920
EventScript_165931:: @ 8165931
checkflag FLAG_BADGE02_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
checkflag FLAG_BADGE03_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
checkflag FLAG_BADGE04_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
checkflag FLAG_BADGE05_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
checkflag FLAG_BADGE06_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
checkflag FLAG_BADGE07_GET
goto_if lt, EventScript_1A77A9
goto_if FALSE, EventScript_1A77A9
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
return
@@ -91,7 +91,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
goto_if_eq EventScript_1659EC
goto_if eq, EventScript_1659EC
msgbox gUnknown_817DB39
closemessage
applymovement 3, Movement_1A75E5
@@ -108,19 +108,19 @@ ViridianCity_EventScript_1659F6:: @ 81659F6
lock
faceplayer
checkflag FLAG_BADGE01_GET
goto_if_eq EventScript_165A23
goto_if TRUE, EventScript_165A23
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
goto_if ge, EventScript_165A4A
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
goto_if_eq EventScript_165A54
goto_if eq, EventScript_165A54
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
goto_if_eq EventScript_165A84
goto_if eq, EventScript_165A84
end
EventScript_165A23:: @ 8165A23
msgbox gUnknown_817E046, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_165A40
goto_if eq, EventScript_165A40
msgbox gUnknown_817E0EA
release
end
@@ -149,7 +149,7 @@ EventScript_165A65:: @ 8165A65
msgbox gUnknown_817DE9B
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_807F888
waitstate
@@ -167,9 +167,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F
faceplayer
msgbox gUnknown_817DB98, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_165AB0
goto_if eq, EventScript_165AB0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_165ABA
goto_if eq, EventScript_165ABA
end
EventScript_165AB0:: @ 8165AB0
@@ -186,7 +186,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
goto_if_eq EventScript_165ADB
goto_if eq, EventScript_165ADB
msgbox gUnknown_817DC99
release
end
@@ -244,7 +244,7 @@ EventScript_165B4C:: @ 8165B4C
closemessage
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_807F888
waitstate