Merge pull request #90 from PikalaxALT/pikalax_work

Split incbins; primordial bss sections

4 files changed, 28 insertions, 28 deletions

diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index e725bfc5..0f23da14 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -5820,7 +5820,7 @@ _021DA41E:
 	mov r2, #1
 	mov r3, #0
 	bl FUN_0206E314
-	ldr r0, _021DA5DC ; =0x0000004B
+	ldr r0, _021DA5DC ; =SDK_OVERLAY_MODULE_75_ID
 	mov r1, #2
 	bl HandleLoadOverlay
 	mov r1, #0x85
@@ -5860,7 +5860,7 @@ _021DA498:
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
 	bl FUN_02016A18
-	ldr r0, _021DA5DC ; =0x0000004B
+	ldr r0, _021DA5DC ; =SDK_OVERLAY_MODULE_75_ID
 	bl UnloadOverlayByID
 	ldr r0, _021DA5E4 ; =0x021E6A00
 	ldr r6, [r0, #8]
@@ -5992,7 +5992,7 @@ _021DA5D6:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _021DA5D8: .word 0x021E6264
-_021DA5DC: .word 0x0000004B
+_021DA5DC: .word SDK_OVERLAY_MODULE_75_ID
 _021DA5E0: .word 0x021EC68C
 _021DA5E4: .word 0x021E6A00
 _021DA5E8: .word 0x021C48B8
diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s
index 7841f0bd..97b4d96a 100644
--- a/arm9/modules/59/asm/module_59.s
+++ b/arm9/modules/59/asm/module_59.s
@@ -253,13 +253,13 @@ MOD59_021D76C0: ; 0x021D76C0
 	bl FUN_0200627C
 	add r0, r5, #0
 	bl FUN_020168D0
-	ldr r0, _021D771C ; =0x00000034
+	ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID
 	ldr r1, _021D7720 ; =0x021D76D8
 	bl FUN_02000E7C
 	mov r0, #1
 	pop {r4, r5, r6, pc}
 	nop
-_021D771C: .word 0x00000034
+_021D771C: .word SDK_OVERLAY_MODULE_52_ID
 _021D7720: .word 0x021D76D8
 	thumb_func_end MOD59_021D76C0
 
diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s
index 8759faaf..d55732ba 100644
--- a/arm9/modules/63/asm/module_63.s
+++ b/arm9/modules/63/asm/module_63.s
@@ -385,7 +385,7 @@ _021D77FE:
 _021D780A:
 	mov r0, #0
 	bl FUN_0200415C
-	ldr r0, _021D7824 ; =0x0000003F
+	ldr r0, _021D7824 ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _021D7828 ; =0x021DBE18
 	bl FUN_02000E7C
 _021D7818:
@@ -394,7 +394,7 @@ _021D7818:
 	.align 2, 0
 _021D781C: .word 0x020FF3D4
 _021D7820: .word 0x020FF368
-_021D7824: .word 0x0000003F
+_021D7824: .word SDK_OVERLAY_MODULE_63_ID
 _021D7828: .word 0x021DBE18
 	thumb_func_end MOD63_021D77B4
 
@@ -3210,13 +3210,13 @@ MOD63_021D8E68: ; 0x021D8E68
 	bl FUN_0200627C
 	mov r0, #0x4c
 	bl FUN_020168D0
-	ldr r0, _021D8E94 ; =0x0000003F
+	ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _021D8E98 ; =0x021DBAB8
 	bl FUN_02000E7C
 	mov r0, #1
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_021D8E94: .word 0x0000003F
+_021D8E94: .word SDK_OVERLAY_MODULE_63_ID
 _021D8E98: .word 0x021DBAB8
 	thumb_func_end MOD63_021D8E68
 
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 1eda08dc..3bc1abb1 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -2307,27 +2307,27 @@ _0222E7C0: ; jump table
 	.short _0222E802 - _0222E7C0 - 2 ; case 6
 	.short _0222E80A - _0222E7C0 - 2 ; case 7
 _0222E7D0:
-	ldr r0, _0222E824 ; =0x00000034
+	ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID
 	ldr r1, _0222E828 ; =0x021D76C8
 	bl FUN_02000E7C
 	pop {r3, pc}
 _0222E7DA:
-	ldr r0, _0222E824 ; =0x00000034
+	ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID
 	ldr r1, _0222E82C ; =0x021D76E8
 	bl FUN_02000E7C
 	pop {r3, pc}
 _0222E7E4:
-	ldr r0, _0222E830 ; =0x00000053
+	ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID
 	ldr r1, _0222E834 ; =0x0223A434
 	bl FUN_02000E7C
 	pop {r3, pc}
 _0222E7EE:
-	ldr r0, _0222E830 ; =0x00000053
+	ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID
 	ldr r1, _0222E838 ; =0x0223A4FC
 	bl FUN_02000E7C
 	pop {r3, pc}
 _0222E7F8:
-	ldr r0, _0222E830 ; =0x00000053
+	ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID
 	ldr r1, _0222E83C ; =0x0223A3A8
 	bl FUN_02000E7C
 	pop {r3, pc}
@@ -2343,22 +2343,22 @@ _0222E80A:
 	bl FUN_02000E7C
 	pop {r3, pc}
 _0222E81A:
-	ldr r0, _0222E848 ; =0x0000003F
+	ldr r0, _0222E848 ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _0222E84C ; =0x021DBAB8
 	bl FUN_02000E7C
 _0222E822:
 	pop {r3, pc}
 	.align 2, 0
-_0222E824: .word 0x00000034
+_0222E824: .word SDK_OVERLAY_MODULE_52_ID
 _0222E828: .word 0x021D76C8
 _0222E82C: .word 0x021D76E8
-_0222E830: .word 0x00000053
+_0222E830: .word SDK_OVERLAY_MODULE_83_ID
 _0222E834: .word 0x0223A434
 _0222E838: .word 0x0223A4FC
 _0222E83C: .word 0x0223A3A8
 _0222E840: .word 0x0223A8C4
 _0222E844: .word 0x020FD6D4
-_0222E848: .word 0x0000003F
+_0222E848: .word SDK_OVERLAY_MODULE_63_ID
 _0222E84C: .word 0x021DBAB8
 	thumb_func_end MOD83_0222E7AC
 
@@ -3312,7 +3312,7 @@ MOD83_0222F048: ; 0x0222F048
 	add r4, r0, #0
 	mov r0, #0x5b
 	bl FUN_020168D0
-	ldr r0, _0222F06C ; =0x0000003F
+	ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _0222F070 ; =0x021DBAB8
 	bl FUN_02000E7C
 	add r0, r4, #0
@@ -3322,7 +3322,7 @@ MOD83_0222F048: ; 0x0222F048
 	mov r0, #1
 	pop {r4, pc}
 	nop
-_0222F06C: .word 0x0000003F
+_0222F06C: .word SDK_OVERLAY_MODULE_63_ID
 _0222F070: .word 0x021DBAB8
 	thumb_func_end MOD83_0222F048
 
@@ -7682,14 +7682,14 @@ MOD83_0223137C: ; 0x0223137C
 	ldr r0, [r4, r0]
 	cmp r0, #0
 	bne _0223139A
-	ldr r0, _022313D0 ; =0x0000003F
+	ldr r0, _022313D0 ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _022313D4 ; =0x021DBAB8
 	bl FUN_02000E7C
 	b _022313A6
 _0223139A:
 	cmp r0, #1
 	bne _022313A6
-	ldr r0, _022313D8 ; =0x00000053
+	ldr r0, _022313D8 ; =SDK_OVERLAY_MODULE_83_ID
 	ldr r1, _022313DC ; =0x0223A444
 	bl FUN_02000E7C
 _022313A6:
@@ -7711,9 +7711,9 @@ _022313C6:
 	mov r0, #1
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_022313D0: .word 0x0000003F
+_022313D0: .word SDK_OVERLAY_MODULE_63_ID
 _022313D4: .word 0x021DBAB8
-_022313D8: .word 0x00000053
+_022313D8: .word SDK_OVERLAY_MODULE_83_ID
 _022313DC: .word 0x0223A444
 _022313E0: .word 0x000015D4
 	thumb_func_end MOD83_0223137C
@@ -11361,7 +11361,7 @@ _02233104:
 	ldr r0, _0223315C ; =0x0000299C
 	ldr r0, [r7, r0]
 	bl FUN_02016A18
-	ldr r0, _02233160 ; =0x00000053
+	ldr r0, _02233160 ; =SDK_OVERLAY_MODULE_83_ID
 	ldr r1, _02233164 ; =0x0223A434
 	bl FUN_02000E7C
 	mov r0, #0x5b
@@ -11376,7 +11376,7 @@ _02233104:
 _02233154: .word 0x000029A8
 _02233158: .word 0x00002B70
 _0223315C: .word 0x0000299C
-_02233160: .word 0x00000053
+_02233160: .word SDK_OVERLAY_MODULE_83_ID
 _02233164: .word 0x0223A434
 	thumb_func_end MOD83_022330A4
 
@@ -19268,7 +19268,7 @@ MOD83_02236DD0: ; 0x02236DD0
 	bl FUN_02006278
 	ldr r0, [r0, #0x20]
 	bl FUN_02016A18
-	ldr r0, _02236DFC ; =0x0000003F
+	ldr r0, _02236DFC ; =SDK_OVERLAY_MODULE_63_ID
 	ldr r1, _02236E00 ; =0x021DBAB8
 	bl FUN_02000E7C
 	add r0, r4, #0
@@ -19280,7 +19280,7 @@ MOD83_02236DD0: ; 0x02236DD0
 	mov r0, #1
 	pop {r4, pc}
 	.align 2, 0
-_02236DFC: .word 0x0000003F
+_02236DFC: .word SDK_OVERLAY_MODULE_63_ID
 _02236E00: .word 0x021DBAB8
 	thumb_func_end MOD83_02236DD0