summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalLowerDeck
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
commit5c1667b41a7d31df6d405d272833895bf8472cf6 (patch)
treedcee557154cc86398b9815838fc61fbe01837ddc /data/maps/SSTidalLowerDeck
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/SSTidalLowerDeck')
-rw-r--r--data/maps/SSTidalLowerDeck/events.inc8
-rw-r--r--data/maps/SSTidalLowerDeck/header.inc4
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
index 65ced7c13..73385dfc3 100644
--- a/data/maps/SSTidalLowerDeck/events.inc
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -1,13 +1,13 @@
-SSTidalLowerDeck_EventObjects: @ 853A2BC
+SSTidalLowerDeck_EventObjects:
object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0
-SSTidalLowerDeck_MapWarps: @ 853A2EC
+SSTidalLowerDeck_MapWarps:
warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
-SSTidalLowerDeck_MapBGEvents: @ 853A2F4
+SSTidalLowerDeck_MapBGEvents:
bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS
-SSTidalLowerDeck_MapEvents:: @ 853A300
+SSTidalLowerDeck_MapEvents::
map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index f86d3ac06..c14cf5513 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,10 +1,10 @@
-SSTidalLowerDeck: @ 8484F28
+SSTidalLowerDeck:
.4byte SSTidalLowerDeck_Layout
.4byte SSTidalLowerDeck_MapEvents
.4byte SSTidalLowerDeck_MapScripts
.4byte 0x0
.2byte MUS_M_BOAT
- .2byte 278
+ .2byte LAYOUT_SS_TIDAL_LOWER_DECK
.byte MAPSEC_DYNAMIC
.byte 0
.byte WEATHER_NONE