diff options
Diffstat (limited to 'data/maps/SouthernIsland_Exterior/scripts.inc')
| -rw-r--r-- | data/maps/SouthernIsland_Exterior/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index abb25bda0..0e266bcce 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 - map_script 3, SouthernIsland_Exterior_MapScript1_160ADC + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_160ADC .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC @@ -12,43 +12,43 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SouthernIsland_Exterior_EventScript_160B25 - msgbox SouthernIsland_Exterior_Text_1C5281, 4 + msgbox SouthernIsland_Exterior_Text_1C5281, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 - call SouthernIsland_Exterior_EventScript_1A047C + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 - msgbox SouthernIsland_Exterior_Text_1C52A6, 4 + msgbox SouthernIsland_Exterior_Text_1C52A6, MSGBOX_DEFAULT release end -BattleTower_Outside_EventScript_160B2F:: @ 8160B2F - applymovement 255, BattleTower_Outside_Movement_160B45 +Ferry_EventScript_DepartIslandSouth:: @ 8160B2F + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B45 waitmovement 0 return -BattleTower_Outside_EventScript_160B3A:: @ 8160B3A - applymovement 255, BattleTower_Outside_Movement_160B47 +Ferry_EventScript_DepartIslandWest:: @ 8160B3A + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B47 waitmovement 0 return BattleTower_Outside_Movement_160B45:: @ 8160B45 walk_down - end_movement + step_end BattleTower_Outside_Movement_160B47:: @ 8160B47 walk_left walk_in_place_fastest_down - end_movement + step_end SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A - msgbox SouthernIsland_Exterior_Text_1C52FB, 3 + msgbox SouthernIsland_Exterior_Text_1C52FB, MSGBOX_SIGN end |