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
@@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
call EventScript_16BCF6
compare_var_to_value VAR_0x4001, 0
goto_if_eq EventScript_16C00E
goto_if eq, EventScript_16C00E
goto EventScript_16BD3E
end
@@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38
EventScript_16BD3E:: @ 816BD3E
msgbox gUnknown_8195D22, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C00C
goto_if eq, EventScript_16C00C
textcolor 3
message Text_195D5F
waitmessage
@@ -122,7 +122,7 @@ EventScript_16BF19:: @ 816BF19
setvar VAR_0x8008, ITEM_FRESH_WATER
setvar VAR_0x8009, ITEM_TM16
checkflag FLAG_0x296
goto_if_eq EventScript_16C018
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195D75
goto EventScript_16BF7C
end
@@ -131,7 +131,7 @@ EventScript_16BF3A:: @ 816BF3A
setvar VAR_0x8008, ITEM_SODA_POP
setvar VAR_0x8009, ITEM_TM20
checkflag FLAG_0x295
goto_if_eq EventScript_16C018
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195E33
goto EventScript_16BF7C
end
@@ -140,7 +140,7 @@ EventScript_16BF5B:: @ 816BF5B
setvar VAR_0x8008, ITEM_LEMONADE
setvar VAR_0x8009, ITEM_TM33
checkflag FLAG_0x294
goto_if_eq EventScript_16C018
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195EBF
goto EventScript_16BF7C
end
@@ -151,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C002
goto_if eq, EventScript_16C002
additem VAR_0x8009, 1
textcolor 3
playfanfare MUS_FANFA1
@@ -262,10 +262,10 @@ EventScript_16C0C4:: @ 816C0C4
EventScript_16C0CB:: @ 816C0CB
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C131
goto_if eq, EventScript_16C131
checkitemspace VAR_0x4000, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C13F
goto_if eq, EventScript_16C13F
compare_var_to_value VAR_0x4001, 0
call_if eq, EventScript_16C0B6
compare_var_to_value VAR_0x4001, 1