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
+15 -15
View File
@@ -4,11 +4,11 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B
Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
lock
faceplayer
checkflag FLAG_0x255
goto_if_eq EventScript_16FF7F
checkflag FLAG_GOT_SUPER_ROD
goto_if TRUE, EventScript_16FF7F
msgbox gUnknown_819EFE0, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16FF34
goto_if eq, EventScript_16FF34
msgbox gUnknown_819F1FA
release
end
@@ -16,11 +16,11 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
EventScript_16FF34:: @ 816FF34
checkitemspace ITEM_SUPER_ROD, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16FF75
goto_if eq, EventScript_16FF75
additem ITEM_SUPER_ROD, 1
msgbox gUnknown_819F05B
giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD
setflag FLAG_0x255
setflag FLAG_GOT_SUPER_ROD
msgbox gUnknown_819F0EB
release
end
@@ -33,12 +33,12 @@ EventScript_16FF75:: @ 816FF75
EventScript_16FF7F:: @ 816FF7F
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, sub_80CC48C
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16FFF5
goto_if eq, EventScript_16FFF5
special sub_80A096C
msgbox gUnknown_819F2DB
special sub_80BF8FC
@@ -48,13 +48,13 @@ EventScript_16FF7F:: @ 816FF7F
goto_if ge, EventScript_16FFFF
special sub_80A0984
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_170001
goto_if eq, EventScript_170001
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_17000B
goto_if eq, EventScript_17000B
compare_var_to_value VAR_RESULT, 3
goto_if_eq EventScript_170031
goto_if eq, EventScript_170031
compare_var_to_value VAR_RESULT, 4
goto_if_eq EventScript_17001E
goto_if eq, EventScript_17001E
release
end
@@ -74,14 +74,14 @@ EventScript_170001:: @ 8170001
EventScript_17000B:: @ 817000B
checkflag FLAG_0x29C
goto_if lt, EventScript_170031
goto_if FALSE, EventScript_170031
msgbox gUnknown_819F40A
release
end
EventScript_17001E:: @ 817001E
checkflag FLAG_0x29C
goto_if lt, EventScript_170031
goto_if FALSE, EventScript_170031
msgbox gUnknown_819F3CB
release
end
@@ -91,7 +91,7 @@ EventScript_170031:: @ 8170031
msgbox gUnknown_819F31B
giveitem ITEM_NET_BALL
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_17005D
goto_if eq, EventScript_17005D
msgbox gUnknown_819F395
release
end
@@ -104,7 +104,7 @@ EventScript_17005D:: @ 817005D
Route12_FishingHouse_EventScript_170067:: @ 8170067
lockall
checkflag FLAG_0x29C
goto_if_eq EventScript_17007B
goto_if TRUE, EventScript_17007B
msgbox gUnknown_819F50C
releaseall
end