diff options
Diffstat (limited to 'data/maps/SixIsland_WaterPath_House1/scripts.inc')
| -rw-r--r-- | data/maps/SixIsland_WaterPath_House1/scripts.inc | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index d38e40aac..e8784d75c 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,29 +5,29 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D lock faceplayer special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1720E5 + compare VAR_RESULT, 0 + goto_if_eq EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 - goto_if ge, EventScript_1720EF + compare VAR_RESULT, 6 + goto_if_ge EventScript_1720EF special CompareHeracrossSize - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1720F1 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1720FB - compare_var_to_value VAR_RESULT, 3 - goto_if eq, EventScript_172121 - compare_var_to_value VAR_RESULT, 4 - goto_if eq, EventScript_17210E + compare VAR_RESULT, 1 + goto_if_eq EventScript_1720F1 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1720FB + compare VAR_RESULT, 3 + goto_if_eq EventScript_172121 + compare VAR_RESULT, 4 + goto_if_eq EventScript_17210E release end @@ -46,15 +46,13 @@ EventScript_1720F1:: @ 81720F1 end EventScript_1720FB:: @ 81720FB - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B39 release end @@ -63,8 +61,8 @@ EventScript_172121:: @ 8172121 setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_17214D + compare VAR_RESULT, 0 + goto_if_eq EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -76,8 +74,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if TRUE, EventScript_17216B + goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end |