5 files changed, 75 insertions, 6 deletions
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq
-\ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
new file mode 100644
index 000000000..2fa18eade
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/events.inc
@@ -0,0 +1,17 @@
+MagmaHideout_1F_EventObjects: @ 85371CC
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19
+
+MagmaHideout_1F_MapWarps: @ 853725C
+	warp_def 10, 34, 3, 4, MAP_JAGGED_PASS
+	warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R
+	warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R
+	warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R
+
+MagmaHideout_1F_MapEvents:: @ 853727C
+	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index eab20d0d0..851f56278 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,15 +1,15 @@
 MagmaHideout_1F: @ 8484828
-	.4byte MagmaHideout_1F_MapAttributes
+	.4byte MagmaHideout_1F_Layout
 	.4byte MagmaHideout_1F_MapEvents
 	.4byte MagmaHideout_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 336
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.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/MagmaHideout_1F/map.bin b/data/maps/MagmaHideout_1F/map.bin
deleted file mode 100644
index fdf0d4252..000000000
--- a/data/maps/MagmaHideout_1F/map.bin
+++ /dev/null
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
new file mode 100644
index 000000000..0e133a890
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -0,0 +1,53 @@
+MagmaHideout_1F_MapScripts:: @ 8239880
+	map_script 3, MagmaHideout_1F_MapScript1_239886
+	.byte 0
+
+MagmaHideout_1F_MapScript1_239886: @ 8239886
+	setvar VAR_0x40BD, 0
+	end
+
+MagmaHideout_1F_EventScript_23988C:: @ 823988C
+	trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964
+	msgbox MagmaHideout_1F_Text_2399B1, 6
+	end
+
+MagmaHideout_1F_EventScript_2398A3:: @ 82398A3
+	trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA
+	msgbox MagmaHideout_1F_Text_239ACD, 6
+	end
+
+MagmaHideout_1F_Text_2398BA: @ 82398BA
+	.string "When TEAM MAGMA has roll call, we get\n"
+	.string "important guarding assignments in\l"
+	.string "the order that we line up.\p"
+	.string "That’s why I’m stuck off in this corner.\n"
+	.string "I’m always late to roll call!$"
+
+MagmaHideout_1F_Text_239964: @ 8239964
+	.string "I’m always late for training sessions,\n"
+	.string "too!\p"
+	.string "I hate to say it, but I’m wimpy…$"
+
+MagmaHideout_1F_Text_2399B1: @ 82399B1
+	.string "Okay, I’ll try to put a little more\n"
+	.string "effort into things from now on…$"
+
+MagmaHideout_1F_Text_2399F5: @ 82399F5
+	.string "Our leader told us to dig into\n"
+	.string "MT. CHIMNEY, so we dug and dug.\p"
+	.string "And in the course of digging, we came\n"
+	.string "across something that blew our minds!\p"
+	.string "What did we find?\p"
+	.string "Fuhahaha!\n"
+	.string "I’ll tell you if you beat me!$"
+
+MagmaHideout_1F_Text_239ABA: @ 8239ABA
+	.string "Arrgh!\n"
+	.string "Taken down!$"
+
+MagmaHideout_1F_Text_239ACD: @ 8239ACD
+	.string "I won’t tell you after all.\n"
+	.string "You’ll find out when you get there!\p"
+	.string "It’d be better if you saved surprises\n"
+	.string "to the end, don’t you think?$"
+