11 files changed, 35 insertions, 24 deletions
diff --git a/asm/arm7_rom.s b/asm/arm7_rom.s
index 1a02882d..9093c546 100644
--- a/asm/arm7_rom.s
+++ b/asm/arm7_rom.s
@@ -2,5 +2,9 @@
 
 	.section .text
 	.global Entry_ARM7
-Entry_ARM7:
-	.incbin "baserom.nds", 0x30D000, 0x2931C
+Entry_ARM7: @ 0x02380000
+	.incbin "baserom.nds", 0x30D000, 0x158
+
+	.global ARM7AutoLoad
+ARM7AutoLoad: @ 0x02380158
+	.incbin "baserom.nds", 0x30D158, 0x291C4
diff --git a/asm/arm9overlay.s b/asm/arm9overlay.s
new file mode 100644
index 00000000..70356c52
--- /dev/null
+++ b/asm/arm9overlay.s
@@ -0,0 +1,5 @@
+	.text
+
+	.global ARM9Overlay
+ARM9Overlay:
+	.incbin "baserom.nds", 0x10B800, 0xAE0
diff --git a/asm/entry.s b/asm/entry.s
index bd6ed223..90d233bb 100644
--- a/asm/entry.s
+++ b/asm/entry.s
@@ -188,9 +188,10 @@ _02000A50:
 	blt _02000A50
 	b _02000A0C
 _02000A6C:
-	b _2000A74
+	b ARM9AutoLoad
 	.pool
-_2000A74:
+	.global ARM9AutoLoad
+ARM9AutoLoad:
 	bx lr
 	arm_func_end do_autoload
 
diff --git a/asm/fat.s b/asm/fat.s
new file mode 100644
index 00000000..a2d7fb77
--- /dev/null
+++ b/asm/fat.s
@@ -0,0 +1,5 @@
+	.text
+
+	.global FileAllocationTable
+FileAllocationTable:
+	.incbin "baserom.nds", 0x337A00, 0xB20
diff --git a/asm/filenametable.s b/asm/filenametable.s
index 0ebb43f8..367efd68 100644
--- a/asm/filenametable.s
+++ b/asm/filenametable.s
@@ -1,4 +1,4 @@
 	.text
 	.global FileNameTable
 FileNameTable:
-	.incbin "baserom.nds", 0x336400, 0x3cc9c00 @0x157F
+	.incbin "baserom.nds", 0x336400, 0x157F
diff --git a/asm/gap1.s b/asm/gap1.s
deleted file mode 100644
index b71ccde3..00000000
--- a/asm/gap1.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.section .text
-	.rept 0x1E0
-	.byte 0xFF
-	.endr
diff --git a/asm/gap2.s b/asm/gap2.s
deleted file mode 100644
index 4af77b6d..00000000
--- a/asm/gap2.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.text
-	.rept 0x336400-0x33631c
-	.byte 255
-	.endr
diff --git a/asm/icon.s b/asm/icon.s
new file mode 100644
index 00000000..91a07147
--- /dev/null
+++ b/asm/icon.s
@@ -0,0 +1,2 @@
+	.text
+	.incbin "baserom.nds", 0x338600
diff --git a/asm/rom3.s b/asm/rom3.s
index 9bbb7b7a..0ebf4f62 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -2,4 +2,4 @@
 
 	.section .text
 
-	.incbin "baserom.nds", 0x10B724, 0x2016FC
+	.incbin "baserom.nds", 0x10C400, 0x200A20
diff --git a/asm/rom_header.s b/asm/rom_header.s
index 9b63d7e5..3e6ab02d 100644
--- a/asm/rom_header.s
+++ b/asm/rom_header.s
@@ -64,25 +64,25 @@ FileNameTableOffset:
 	.word _FileNameTableSegmentRomStart
 	.global FileNameTableSize
 FileNameTableSize:
-	.word 0x0000157F
+	.word _FileNameTableSegmentSize
 	.global FATOffset
 FATOffset:
-	.word 0x00337A00
+	.word _FileAllocationTableSegmentRomStart
 	.global FATSize
 FATSize:
-	.word 0x00000B20
+	.word _FileAllocationTableSegmentSize
 	.global ARM9OverlayOffset
 ARM9OverlayOffset:
-	.word 0x0010B800
+	.word _ARM9OverlaySegmentRomStart
 	.global ARM9OverlaySize
 ARM9OverlaySize:
-	.word 0x00000AE0
+	.word _ARM9OverlaySegmentSize
 	.global ARM7OverlayOffset
 ARM7OverlayOffset:
-	.word 0x00000000
+	.word _ARM7OverlaySegmentRomStart
 	.global ARM7OverlaySize
 ARM7OverlaySize:
-	.word 0x00000000
+	.word _ARM7OverlaySegmentSize
 	.global ROMControlInfo1
 ROMControlInfo1:
 	.word 0x00416657
@@ -91,7 +91,7 @@ ROMControlInfo2:
 	.word 0x081808F8
 	.global IconTitleOffset
 IconTitleOffset:
-	.word 0x00338600
+	.word _IconSegmentRomStart
 	.global SecureAreaCC
 SecureAreaCC:
 	.short 0x5931
@@ -100,10 +100,10 @@ ROMControlInfo3:
 	.short 0x0D7E
 	.global ARM9AutoLoadHook
 ARM9AutoLoadHook:
-	.word 0x02000A74
+	.word ARM9AutoLoad
 	.global ARM7AutoLoadHook
 ARM7AutoLoadHook:
-	.word 0x02380158
+	.word ARM7AutoLoad
 	.global SecureAreaDisable
 SecureAreaDisable:
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/asm/unk_10b724.s b/asm/unk_10b724.s
new file mode 100644
index 00000000..86695021
--- /dev/null
+++ b/asm/unk_10b724.s
@@ -0,0 +1,2 @@
+	.text
+	.incbin "baserom.nds", 0x10B724, 0xC