diff options
Diffstat (limited to 'data/maps/FiveIsland_WaterLabyrinth/scripts.inc')
| -rw-r--r-- | data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index a334ab2df..605b05065 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,19 +3,17 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E 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 lock faceplayer - checkflag FLAG_GOT_TOGEPI_EGG - goto_if TRUE, EventScript_1688E3 - checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - goto_if TRUE, EventScript_16892C + goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_1688AC + compare VAR_RESULT, 6 + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -32,9 +30,9 @@ EventScript_1688AC:: @ 81688AC end EventScript_1688BA:: @ 81688BA - countpokemon - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_16891F + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 @@ -50,13 +48,13 @@ EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168895 + compare VAR_RESULT, 1 + goto_if_eq EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168895 + compare VAR_RESULT, 1 + goto_if_eq EventScript_168895 msgbox gUnknown_818A9C0 release end |