diff options
Diffstat (limited to 'data/maps/SSTidalCorridor')
| -rw-r--r-- | data/maps/SSTidalCorridor/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/SSTidalCorridor/header.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index c36e38fda..56a07b43e 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,11 +1,11 @@ -SSTidalCorridor_EventObjects: @ 853A158 +SSTidalCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT -SSTidalCorridor_MapWarps: @ 853A1D0 +SSTidalCorridor_MapWarps: warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS @@ -16,7 +16,7 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK -SSTidalCorridor_MapBGEvents: @ 853A218 +SSTidalCorridor_MapBGEvents: bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D @@ -30,6 +30,6 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 -SSTidalCorridor_MapEvents:: @ 853A2A8 +SSTidalCorridor_MapEvents:: map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 37128821c..972fae215 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,10 +1,10 @@ -SSTidalCorridor: @ 8484F0C +SSTidalCorridor: .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 277 + .2byte LAYOUT_SS_TIDAL_CORRIDOR .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE |