diff options
Diffstat (limited to 'data/maps/LilycoveCity_Harbor/scripts.inc')
| -rw-r--r-- | data/maps/LilycoveCity_Harbor/scripts.inc | 112 |
1 files changed, 51 insertions, 61 deletions
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 67ef01e09..62bcc15dd 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -9,8 +9,7 @@ LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_21E54D + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E54D call LilycoveCity_Harbor_EventScript_21E194 call LilycoveCity_Harbor_EventScript_21E1C6 call LilycoveCity_Harbor_EventScript_21E1F8 @@ -18,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 compare VAR_TEMP_C, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 1 - goto_eq LilycoveCity_Harbor_EventScript_21E2F0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E2F0 compare VAR_TEMP_B, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E320 + goto_if_eq LilycoveCity_Harbor_EventScript_21E320 compare VAR_TEMP_B, 4 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 8 - goto_eq LilycoveCity_Harbor_EventScript_21E41D + goto_if_eq LilycoveCity_Harbor_EventScript_21E41D compare VAR_TEMP_B, 0 - goto_if 5, LilycoveCity_Harbor_EventScript_21E44D + goto_if_ne LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E557 + goto_if_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage @@ -88,7 +87,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -99,7 +98,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -108,66 +107,58 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 1 - checkflag FLAG_0x1AE - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - checkflag FLAG_0x8D5 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 1 - checkflag FLAG_0x1AF - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - checkflag FLAG_0x8D6 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 1 - checkflag FLAG_0x1B0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - checkflag FLAG_0x8E0 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 1 - checkflag FLAG_0x1DB - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 2 return LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C setvar VAR_TEMP_B, 0 compare VAR_TEMP_E, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E28E + call_if_eq LilycoveCity_Harbor_EventScript_21E28E compare VAR_TEMP_D, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E294 + call_if_eq LilycoveCity_Harbor_EventScript_21E294 compare VAR_TEMP_C, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E29A + call_if_eq LilycoveCity_Harbor_EventScript_21E29A compare VAR_TEMP_9, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 + call_if_eq LilycoveCity_Harbor_EventScript_21E2A0 return LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E @@ -189,13 +180,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 setvar VAR_TEMP_A, 0 compare VAR_TEMP_E, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 + call_if_eq LilycoveCity_Harbor_EventScript_21E2D8 compare VAR_TEMP_D, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2DE + call_if_eq LilycoveCity_Harbor_EventScript_21E2DE compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 + call_if_eq LilycoveCity_Harbor_EventScript_21E2E4 compare VAR_TEMP_9, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2EA + call_if_eq LilycoveCity_Harbor_EventScript_21E2EA return LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 @@ -263,25 +254,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 applymovement 4, LilycoveCity_Harbor_Movement_27259A waitmovement 0 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E656 + call_if_eq LilycoveCity_Harbor_EventScript_21E656 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E661 + call_if_eq LilycoveCity_Harbor_EventScript_21E661 addobject 5 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E675 + call_if_eq LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E680 + call_if_eq LilycoveCity_Harbor_EventScript_21E680 msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E68B + call_if_eq LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E696 + call_if_eq LilycoveCity_Harbor_EventScript_21E696 msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 + call_if_eq LilycoveCity_Harbor_EventScript_21E6A1 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E6BA + call_if_eq LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 @@ -368,11 +359,11 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 delay 30 removeobject 4 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -397,7 +388,7 @@ LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -408,7 +399,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -429,22 +420,22 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 - applymovement 255, LilycoveCity_Harbor_Movement_21E630 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E630 waitmovement 0 return LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B - applymovement 255, LilycoveCity_Harbor_Movement_21E633 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E633 waitmovement 0 return @@ -469,8 +460,7 @@ LilycoveCity_Harbor_Movement_21E635: @ 821E635 LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_Harbor_EventScript_21E64C + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E64C msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end @@ -525,14 +515,14 @@ LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6D7 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6D7 applymovement 4, LilycoveCity_Harbor_Movement_21E6DC waitmovement 0 return LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6E4 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6E4 applymovement 4, LilycoveCity_Harbor_Movement_21E6EA waitmovement 0 return |