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
@@ -9,7 +9,7 @@ OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
call_if ge, EventScript_170C22
checkflag FLAG_0x844
call_if eq, EventScript_170C36
call_if TRUE, EventScript_170C36
end
EventScript_170C22:: @ 8170C22
@@ -85,9 +85,9 @@ EventScript_170CB1:: @ 8170CB1
applymovement 255, Movement_1A75EB
waitmovement 0
checkflag FLAG_SYS_GAME_CLEAR
call_if eq, EventScript_170E34
call_if TRUE, EventScript_170E34
checkflag FLAG_SYS_GAME_CLEAR
call_if lt, EventScript_170E3D
call_if FALSE, EventScript_170E3D
applymovement 3, Movement_1A75ED
waitmovement 0
msgbox gUnknown_81A0E17
@@ -193,7 +193,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
lock
checkflag FLAG_0x2A1
goto_if_eq EventScript_170EB1
goto_if TRUE, EventScript_170EB1
msgbox gUnknown_81A1266
release
end
@@ -209,22 +209,22 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
goto_if_eq EventScript_170F35
goto_if eq, EventScript_170F35
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
goto_if_eq EventScript_170F9B
goto_if eq, EventScript_170F9B
checkflag FLAG_0x2DC
goto_if_eq EventScript_170FA5
goto_if TRUE, EventScript_170FA5
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if_eq EventScript_17103A
goto_if eq, EventScript_17103A
checkflag FLAG_0x2DD
goto_if_eq EventScript_171044
goto_if TRUE, EventScript_171044
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_1710F2
goto_if eq, EventScript_1710F2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_1710FC
goto_if eq, EventScript_1710FC
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
goto_if_eq EventScript_171134
goto_if eq, EventScript_171134
msgbox gUnknown_81A1321
closemessage
applymovement 3, Movement_1A75E5
@@ -236,9 +236,9 @@ EventScript_170F35:: @ 8170F35
msgbox gUnknown_81A1EBD
random 3
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_170F6D
goto_if eq, EventScript_170F6D
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_170F84
goto_if eq, EventScript_170F84
famechecker FAMECHECKER_BILL, 5
msgbox gUnknown_81A2076
release
@@ -325,14 +325,14 @@ EventScript_171044:: @ 8171044
waitmovement 0
msgbox gUnknown_81A19AA, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_171099
goto_if eq, EventScript_171099
goto EventScript_1710B2
end
EventScript_171099:: @ 8171099
msgbox gUnknown_81A1A08, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_171099
goto_if eq, EventScript_171099
goto EventScript_1710B2
end
@@ -405,7 +405,7 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
lock
faceplayer
checkflag FLAG_0x844
goto_if_eq EventScript_17116F
goto_if TRUE, EventScript_17116F
msgbox gUnknown_81A218D
release
end
@@ -418,9 +418,9 @@ EventScript_17116F:: @ 817116F
OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
lockall
checkflag FLAG_0x844
goto_if_eq EventScript_1711A0
goto_if TRUE, EventScript_1711A0
checkflag FLAG_0x2A1
goto_if_eq EventScript_171196
goto_if TRUE, EventScript_171196
msgbox gUnknown_81A223F
releaseall
end