summaryrefslogtreecommitdiff
path: root/data/maps/SeafloorCavern_Room5
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SeafloorCavern_Room5')
-rw-r--r--data/maps/SeafloorCavern_Room5/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room5/events.inc16
-rw-r--r--data/maps/SeafloorCavern_Room5/header.inc10
-rw-r--r--data/maps/SeafloorCavern_Room5/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room5/scripts.inc3
5 files changed, 24 insertions, 7 deletions
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/maps/SeafloorCavern_Room5/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room5/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc
new file mode 100644
index 000000000..f0c69175b
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/events.inc
@@ -0,0 +1,16 @@
+SeafloorCavern_Room5_EventObjects: @ 85359F8
+ object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17
+ object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18
+ object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19
+ object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21
+ object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22
+ object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20
+
+SeafloorCavern_Room5_MapWarps: @ 8535A88
+ warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
+ warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4
+ warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4
+
+SeafloorCavern_Room5_MapEvents:: @ 8535AA0
+ map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 8f9edd756..aa2b0dc56 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,15 +1,15 @@
SeafloorCavern_Room5: @ 8484240
- .4byte SeafloorCavern_Room5_MapAttributes
+ .4byte SeafloorCavern_Room5_Layout
.4byte SeafloorCavern_Room5_MapEvents
.4byte SeafloorCavern_Room5_MapScripts
.4byte 0x0
.2byte MUS_TOZAN
.2byte 152
- .byte 68
+ .byte MAPSEC_SEAFLOOR_CAVERN
.byte 0
- .byte 0
- .byte 4
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/maps/SeafloorCavern_Room5/map.bin
deleted file mode 100644
index 386430fe4..000000000
--- a/data/maps/SeafloorCavern_Room5/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-32222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/scripts.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
new file mode 100644
index 000000000..e1c68db6e
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
@@ -0,0 +1,3 @@
+SeafloorCavern_Room5_MapScripts:: @ 8234DC4
+ .byte 0
+