summaryrefslogtreecommitdiff
path: root/data/maps/SecretBase_Shrub1
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SecretBase_Shrub1')
-rw-r--r--data/maps/SecretBase_Shrub1/events.inc6
-rw-r--r--data/maps/SecretBase_Shrub1/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
index 07eb2e1bd..89c832969 100644
--- a/data/maps/SecretBase_Shrub1/events.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -1,4 +1,4 @@
-SecretBase_Shrub1_EventObjects: @ 8538078
+SecretBase_Shrub1_EventObjects:
object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
@@ -15,9 +15,9 @@ SecretBase_Shrub1_EventObjects: @ 8538078
object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-SecretBase_Shrub1_MapWarps: @ 85381E0
+SecretBase_Shrub1_MapWarps:
warp_def 5, 7, 0, 126, MAP_NONE
-SecretBase_Shrub1_MapEvents:: @ 85381E8
+SecretBase_Shrub1_MapEvents::
map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 4807cc485..76bfd4506 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,10 +1,10 @@
-SecretBase_Shrub1: @ 8484B1C
+SecretBase_Shrub1:
.4byte SecretBase_Shrub1_Layout
.4byte SecretBase_Shrub1_MapEvents
.4byte SecretBase_Shrub1_MapScripts
.4byte 0x0
.2byte MUS_MACHI_S3
- .2byte 202
+ .2byte LAYOUT_SECRET_BASE_SHRUB1
.byte MAPSEC_SECRET_BASE
.byte 0
.byte WEATHER_NONE