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
@@ -7,10 +7,10 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
setvar VAR_0x8008, 8
call EventScript_1A8CAD
checkflag FLAG_0x276
goto_if_eq EventScript_16E473
goto_if TRUE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E45B
goto_if eq, EventScript_16E45B
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16E45B
@@ -44,47 +44,47 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
faceplayer
setvar VAR_RESULT, 0
checkflag FLAG_REVIVED_AMBER
call_if eq, EventScript_16E8A1
call_if TRUE, EventScript_16E8A1
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E897
goto_if eq, EventScript_16E897
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
goto_if_eq EventScript_16E736
goto_if eq, EventScript_16E736
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
goto_if_eq EventScript_16E72C
goto_if eq, EventScript_16E72C
call EventScript_16E4EC
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E544
goto_if eq, EventScript_16E544
call EventScript_16E504
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E586
goto_if eq, EventScript_16E586
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E5C8
goto_if eq, EventScript_16E5C8
msgbox gUnknown_819A282
goto EventScript_16E53A
end
EventScript_16E4EC:: @ 816E4EC
checkflag FLAG_0x273
goto_if lt, EventScript_16E534
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_HELIX
goto_if_eq EventScript_16E534
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E504:: @ 816E504
checkflag FLAG_0x272
goto_if lt, EventScript_16E534
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_DOME
goto_if_eq EventScript_16E534
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E51C:: @ 816E51C
checkflag FLAG_0x25E
goto_if lt, EventScript_16E534
checkflag FLAG_GOT_OLD_AMBER
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_AMBER
goto_if_eq EventScript_16E534
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
@@ -102,7 +102,7 @@ EventScript_16E544:: @ 816E544
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E5FA
goto_if eq, EventScript_16E5FA
multichoice 0, 0, 21, 0
switch VAR_RESULT
case 0, EventScript_16E668
@@ -115,7 +115,7 @@ EventScript_16E586:: @ 816E586
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E631
goto_if eq, EventScript_16E631
multichoice 0, 0, 22, 0
switch VAR_RESULT
case 0, EventScript_16E6A6
@@ -156,7 +156,7 @@ EventScript_16E668:: @ 816E668
getitemname 1, ITEM_HELIX_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_HELIX_FOSSIL, 1
@@ -171,7 +171,7 @@ EventScript_16E6A6:: @ 816E6A6
getitemname 1, ITEM_DOME_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_DOME_FOSSIL, 1
@@ -186,7 +186,7 @@ EventScript_16E6E4:: @ 816E6E4
getitemname 1, ITEM_OLD_AMBER
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_OLD_AMBER, 1
@@ -208,11 +208,11 @@ EventScript_16E72C:: @ 816E72C
EventScript_16E736:: @ 816E736
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
goto_if_eq EventScript_16E758
goto_if eq, EventScript_16E758
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
goto_if_eq EventScript_16E79D
goto_if eq, EventScript_16E79D
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
goto_if_eq EventScript_16E7E2
goto_if eq, EventScript_16E7E2
end
EventScript_16E758:: @ 816E758
@@ -221,12 +221,12 @@ EventScript_16E758:: @ 816E758
msgbox gUnknown_819A34F
givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_HELIX
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E79D:: @ 816E79D
@@ -235,12 +235,12 @@ EventScript_16E79D:: @ 816E79D
msgbox gUnknown_819A34F
givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_DOME
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E7E2:: @ 816E7E2
@@ -249,12 +249,12 @@ EventScript_16E7E2:: @ 816E7E2
msgbox gUnknown_819A34F
givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_AMBER
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E827:: @ 816E827
@@ -266,7 +266,7 @@ EventScript_16E827:: @ 816E827
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E895
goto_if eq, EventScript_16E895
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16E895
@@ -281,7 +281,7 @@ EventScript_16E85B:: @ 816E85B
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E88A
goto_if eq, EventScript_16E88A
call EventScript_1A8C33
goto EventScript_16E88A
end
@@ -302,20 +302,20 @@ EventScript_16E897:: @ 816E897
EventScript_16E8A1:: @ 816E8A1
checkflag FLAG_0x273
goto_if_eq EventScript_16E8B9
goto_if TRUE, EventScript_16E8B9
checkflag FLAG_0x272
goto_if_eq EventScript_16E8C8
goto_if TRUE, EventScript_16E8C8
goto EventScript_16E534
end
EventScript_16E8B9:: @ 816E8B9
checkflag FLAG_REVIVED_HELIX
goto_if lt, EventScript_16E534
goto_if FALSE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E8C8:: @ 816E8C8
checkflag FLAG_REVIVED_DOME
goto_if lt, EventScript_16E534
goto_if FALSE, EventScript_16E534
setvar VAR_RESULT, 1
return