summaryrefslogtreecommitdiff
path: root/data/maps/SecretBase_Shrub4
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SecretBase_Shrub4')
-rw-r--r--data/maps/SecretBase_Shrub4/border.bin1
-rw-r--r--data/maps/SecretBase_Shrub4/events.inc23
-rw-r--r--data/maps/SecretBase_Shrub4/header.inc10
-rw-r--r--data/maps/SecretBase_Shrub4/map.bin69
-rw-r--r--data/maps/SecretBase_Shrub4/scripts.inc1
5 files changed, 29 insertions, 75 deletions
diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
new file mode 100644
index 000000000..c6d5f32f5
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub4_EventObjects: @ 8539BC0
+ object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173
+ object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+ object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+ object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+ object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+ object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+ object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+ object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+ object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+ object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+ object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+ object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+ object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+ object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+ object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Shrub4_MapWarps: @ 8539D28
+ warp_def 11, 8, 0, 126, MAP_NONE
+
+SecretBase_Shrub4_MapEvents:: @ 8539D30
+ map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 10a4d4ca4..72c5724f6 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,15 +1,15 @@
SecretBase_Shrub4: @ 8484D14
- .4byte SecretBase_Shrub4_MapAttributes
+ .4byte SecretBase_Shrub4_Layout
.4byte SecretBase_Shrub4_MapEvents
.4byte SecretBase_Shrub4_MapScripts
.4byte 0x0
.2byte MUS_MACHI_S3
.2byte 220
- .byte 86
+ .byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
- .byte 9
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_SECRET_BASE
.2byte 0
.byte 12
- .byte 8
+ .byte MAP_BATTLE_SCENE_FRONTIER
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin
deleted file mode 100644
index 8a4cf836d..000000000
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ /dev/null
@@ -1,69 +0,0 @@
- 
-2
-2"6
-2
-2
-2
-2
-2
-2
-2
-2
-2  
-2
-2#6
-2
-2
-2
-2
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2 
-2
-2
-2  
-2
-22
-2
-2   6
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2  
-2
-2
-2
-2
-2  2
-2
-2
-2  
-2
-2
-2
-2
-2 
-22
-2  
-2
-2
-2
-2
-2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc
new file mode 100644
index 000000000..1a9952232
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
@@ -0,0 +1 @@
+SecretBase_Shrub4_MapScripts:: @ 823B483