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
+26 -26
View File
@@ -3,8 +3,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
.byte 0
CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C
checkflag FLAG_0x26D
call_if lt, EventScript_16C656
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16C656
end
EventScript_16C656:: @ 816C656
@@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
showmoneybox 0, 0, 0
@@ -40,11 +40,11 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
EventScript_16C6E6:: @ 816C6E6
checkflag FLAG_GOT_COIN_CASE
goto_if lt, EventScript_16C790
goto_if FALSE, EventScript_16C790
compare_var_to_value VAR_0x8009, 0
goto_if_eq EventScript_16C734
goto_if eq, EventScript_16C734
compare_var_to_value VAR_0x8009, 1
goto_if_eq EventScript_16C706
goto_if eq, EventScript_16C706
end
EventScript_16C706:: @ 816C706
@@ -53,7 +53,7 @@ EventScript_16C706:: @ 816C706
goto_if ge, EventScript_16C79E
checkmoney 10000, 0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C7AC
goto_if eq, EventScript_16C7AC
givecoins 500
takemoney 10000, 0
goto EventScript_16C762
@@ -65,7 +65,7 @@ EventScript_16C734:: @ 816C734
goto_if ge, EventScript_16C79E
checkmoney 1000, 0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C7AC
goto_if eq, EventScript_16C7AC
givecoins 50
takemoney 1000, 0
goto EventScript_16C762
@@ -131,11 +131,11 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
lock
faceplayer
checkflag FLAG_0x26E
goto_if_eq EventScript_16C849
checkflag FLAG_GOT_10_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C849
msgbox gUnknown_8196AF3
checkflag FLAG_GOT_COIN_CASE
goto_if lt, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9990
goto_if ge, EventScript_16C82B
@@ -144,7 +144,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
msgbox gUnknown_8196B0D
playse SE_SHOP
waitse
setflag FLAG_0x26E
setflag FLAG_GOT_10_COINS_FROM_GAMBLER
goto EventScript_16C7CA
end
@@ -168,7 +168,7 @@ CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
lock
faceplayer
checkflag FLAG_DEFEATED_ERIKA
goto_if_eq EventScript_16C870
goto_if TRUE, EventScript_16C870
msgbox gUnknown_8196BAD
goto EventScript_16C7CA
end
@@ -195,11 +195,11 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
lock
faceplayer
checkflag FLAG_0x26F
goto_if_eq EventScript_16C8F0
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C8F0
msgbox gUnknown_8196D2B
checkflag FLAG_GOT_COIN_CASE
goto_if lt, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
goto_if ge, EventScript_16C8E2
@@ -208,7 +208,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
msgbox gUnknown_8196D47
playse SE_SHOP
waitse
setflag FLAG_0x26F
setflag FLAG_GOT_20_COINS_FROM_GAMBLER
goto EventScript_16C7CA
end
@@ -225,11 +225,11 @@ EventScript_16C8F0:: @ 816C8F0
CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
lock
faceplayer
checkflag FLAG_0x270
goto_if_eq EventScript_16C950
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
goto_if TRUE, EventScript_16C950
msgbox gUnknown_8196DB7
checkflag FLAG_GOT_COIN_CASE
goto_if lt, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
goto_if ge, EventScript_16C942
@@ -238,7 +238,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
msgbox gUnknown_8196DF8
playse SE_SHOP
waitse
setflag FLAG_0x270
setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
goto EventScript_16C7CA
end
@@ -264,10 +264,10 @@ EventScript_16C96A:: @ 816C96A
EventScript_16C96C:: @ 816C96C
checkflag FLAG_GOT_COIN_CASE
goto_if lt, EventScript_16CAA0
goto_if FALSE, EventScript_16CAA0
msgbox gUnknown_8196F46, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C96A
goto_if eq, EventScript_16C96A
setfieldeffectarg 0, 255
setfieldeffectarg 1, 10
setfieldeffectarg 2, 14
@@ -412,8 +412,8 @@ EventScript_16CAA0:: @ 816CAA0
CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
lockall
msgbox gUnknown_8196EDC
checkflag FLAG_0x26D
call_if lt, EventScript_16CABE
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16CABE
releaseall
end
@@ -425,7 +425,7 @@ EventScript_16CABE:: @ 816CABE
setmetatile 16, 3, 678, 1
setmetatile 17, 3, 679, 1
special DrawWholeMapView
setflag FLAG_0x26D
setflag FLAG_OPENED_ROCKET_HIDEOUT
return
CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5