diff options
Diffstat (limited to 'data/maps/OneIsland/scripts.inc')
| -rw-r--r-- | data/maps/OneIsland/scripts.inc | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 16830e056..545a3d333 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,30 +1,30 @@ OneIsland_MapScripts:: @ 8167484 - map_script 3, OneIsland_MapScript1_16748F - map_script 2, OneIsland_MapScript2_167493 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame .byte 0 -OneIsland_MapScript1_16748F:: @ 816748F +OneIsland_OnTransition:: @ 816748F setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end -OneIsland_MapScript2_167493:: @ 8167493 +OneIsland_OnFrame:: @ 8167493 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 EventScript_16749D:: @ 816749D lockall textcolor 0 - applymovement 255, Movement_167505 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167505 waitmovement 0 msgbox gUnknown_818161B closemessage applymovement 1, Movement_167507 - applymovement 255, Movement_1674F4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4 waitmovement 0 opendoor 14, 5 waitdooranim applymovement 1, Movement_167514 - applymovement 255, Movement_167501 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167501 waitmovement 0 closedoor 14, 5 waitdooranim @@ -36,57 +36,55 @@ EventScript_16749D:: @ 816749D end Movement_1674F4:: @ 81674F4 - step_11 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167501:: @ 8167501 - step_11 - step_11 - step_60 + walk_up + walk_up + set_invisible step_end Movement_167505:: @ 8167505 - step_11 + walk_up step_end Movement_167507:: @ 8167507 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167514:: @ 8167514 - step_11 - step_60 + walk_up + set_invisible step_end OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16753F - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_167535 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535 msgbox gUnknown_818174E release end @@ -102,13 +100,13 @@ EventScript_16753F:: @ 816753F end OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, 2 + msgbox gUnknown_8181A4A, MSGBOX_NPC end OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, 3 + msgbox gUnknown_81819E1, MSGBOX_SIGN end OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, 3 + msgbox gUnknown_8181A0A, MSGBOX_SIGN end |