diff options
Diffstat (limited to 'data/maps/LilycoveCity_Harbor/scripts.inc')
| -rw-r--r-- | data/maps/LilycoveCity_Harbor/scripts.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 3bb6d47c8..2fb9bea30 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 - map_script 3, LilycoveCity_Harbor_MapScript1_159899 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_159899 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 @@ -17,12 +17,12 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD - msgbox LilycoveCity_Harbor_Text_18B306, 4 + msgbox LilycoveCity_Harbor_Text_18B306, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD - msgbox LilycoveCity_Harbor_Text_18B36F, 4 + msgbox LilycoveCity_Harbor_Text_18B36F, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 @@ -41,7 +41,7 @@ LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 end LilycoveCity_Harbor_EventScript_159929:: @ 8159929 - msgbox LilycoveCity_Harbor_Text_18B3A9, 4 + msgbox LilycoveCity_Harbor_Text_18B3A9, MSGBOX_DEFAULT release end @@ -73,9 +73,9 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E end LilycoveCity_Harbor_EventScript_15998A:: @ 815998A - msgbox LilycoveCity_Harbor_Text_18B4B3, 4 + msgbox LilycoveCity_Harbor_Text_18B4B3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -84,23 +84,23 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_1A040E + call Common_EventScript_FerryDepart return LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - applymovement 255, LilycoveCity_Harbor_Movement_159A86 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A86 waitmovement 0 return LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - applymovement 255, LilycoveCity_Harbor_Movement_159A89 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A89 waitmovement 0 return LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 - msgbox LilycoveCity_Harbor_Text_18B45B, 4 + msgbox LilycoveCity_Harbor_Text_18B45B, MSGBOX_DEFAULT release end @@ -108,20 +108,20 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA - msgbox LilycoveCity_Harbor_Text_1C50F2, 4 + msgbox LilycoveCity_Harbor_Text_1C50F2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_1A0839 + applymovement 4, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_Harbor_Text_1C5120, 4 + msgbox LilycoveCity_Harbor_Text_1C5120, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 @@ -130,10 +130,10 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_1A040E + call Common_EventScript_FerryDepart warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release @@ -142,25 +142,25 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 walk_right walk_in_place_fastest_up - end_movement + step_end LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 walk_up - end_movement + step_end @ 8159A8B walk_up - end_movement + step_end LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 - msgbox LilycoveCity_Harbor_Text_18B504, 4 + msgbox LilycoveCity_Harbor_Text_18B504, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2 - msgbox LilycoveCity_Harbor_Text_18B58E, 4 + msgbox LilycoveCity_Harbor_Text_18B58E, MSGBOX_DEFAULT release end |