Name high-level overlay loading routines

3 files changed, 101 insertions, 101 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index e4c836c6..9374c856 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -61,9 +61,9 @@ _021D752C:
 	lsl r0, r0, #8
 	lsr r0, r0, #0x1c
 	beq _021D7564
-	ldr r0, _021D7678 ; =0x00000006
+	ldr r0, _021D7678 ; =SDK_MODULE_06_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 _021D7564:
 	ldr r2, [r4, #0x70]
 	mov r0, #3
@@ -174,7 +174,7 @@ _021D7666:
 	.balign 4, 0
 _021D7670: .word 0x04000050
 _021D7674: .word 0x04001050
-_021D7678: .word 0x00000006
+_021D7678: .word SDK_MODULE_06_ID
 
 	thumb_func_start MOD05_021D767C
 MOD05_021D767C: ; 0x021D767C
@@ -367,8 +367,8 @@ _021D7806:
 	lsl r0, r0, #8
 	lsr r0, r0, #0x1c
 	beq _021D7856
-	ldr r0, _021D7860 ; =0x00000006
-	bl FUN_02005F60
+	ldr r0, _021D7860 ; =SDK_MODULE_06_ID
+	bl UnloadOverlayByID
 _021D7856:
 	mov r0, #1
 	pop {r3, r4, r5, pc}
@@ -376,7 +376,7 @@ _021D785A:
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	nop
-_021D7860: .word 0x00000006
+_021D7860: .word SDK_MODULE_06_ID
 
 	thumb_func_start MOD05_021D7864
 MOD05_021D7864: ; 0x021D7864
@@ -9485,16 +9485,16 @@ _021DBE9C: .word 0x02050E2D
 MOD05_021DBEA0: ; 0x021DBEA0
 	push {r4, lr}
 	add r4, r0, #0
-	ldr r0, _021DBEB8 ; =0x00000033
+	ldr r0, _021DBEB8 ; =SDK_MODULE_51_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	add r0, r4, #0
 	bl FUN_02254A68
 	add r4, #0x80
 	str r0, [r4]
 	pop {r4, pc}
 	.balign 4, 0
-_021DBEB8: .word 0x00000033
+_021DBEB8: .word SDK_MODULE_51_ID
 
 	thumb_func_start MOD05_021DBEBC
 MOD05_021DBEBC: ; 0x021DBEBC
@@ -9516,11 +9516,11 @@ MOD05_021DBECC: ; 0x021DBECC
 	add r0, #0x80
 	ldr r0, [r0]
 	bl FUN_02254AB8
-	ldr r0, _021DBEE0 ; =0x00000033
-	bl FUN_02005F60
+	ldr r0, _021DBEE0 ; =SDK_MODULE_51_ID
+	bl UnloadOverlayByID
 	pop {r3, pc}
 	nop
-_021DBEE0: .word 0x00000033
+_021DBEE0: .word SDK_MODULE_51_ID
 
 	thumb_func_start MOD05_021DBEE4
 MOD05_021DBEE4: ; 0x021DBEE4
@@ -24576,11 +24576,11 @@ _021E33A0:
 	ldr r0, [r5, #0xc]
 	bl FUN_0204C1A8
 	add r6, r0, #0
-	ldr r0, _021E341C ; =0x00000013
-	bl FUN_02005F60
-	ldr r0, _021E3420 ; =0x00000014
+	ldr r0, _021E341C ; =SDK_MODULE_19_ID
+	bl UnloadOverlayByID
+	ldr r0, _021E3420 ; =SDK_MODULE_20_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	add r0, r6, #0
 	bl FUN_0204BEB8
 	mov r0, #1
@@ -24624,8 +24624,8 @@ _021E3414:
 	add sp, #4
 	pop {r3, r4, r5, r6, pc}
 	nop
-_021E341C: .word 0x00000013
-_021E3420: .word 0x00000014
+_021E341C: .word SDK_MODULE_19_ID
+_021E3420: .word SDK_MODULE_20_ID
 
 	thumb_func_start MOD05_021E3424
 MOD05_021E3424: ; 0x021E3424
@@ -50085,9 +50085,9 @@ MOD05_021EFAAC: ; 0x021EFAAC
 	bl FUN_0205F1E4
 	cmp r0, #0
 	bne _021EFAF8
-	ldr r0, _021EFB0C ; =0x00000014
+	ldr r0, _021EFB0C ; =SDK_MODULE_20_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	mov r0, #1
 	bl FUN_0200A03C
 	str r0, [sp]
@@ -50100,16 +50100,16 @@ MOD05_021EFAAC: ; 0x021EFAAC
 	add sp, #4
 	pop {r3, r4, r5, r6, pc}
 _021EFAF8:
-	ldr r0, _021EFB10 ; =0x00000013
+	ldr r0, _021EFB10 ; =SDK_MODULE_19_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	ldr r0, [r5, #8]
 	bl FUN_02252440
 	add sp, #4
 	pop {r3, r4, r5, r6, pc}
 	nop
-_021EFB0C: .word 0x00000014
-_021EFB10: .word 0x00000013
+_021EFB0C: .word SDK_MODULE_20_ID
+_021EFB10: .word SDK_MODULE_19_ID
 
 	thumb_func_start MOD05_021EFB14
 MOD05_021EFB14: ; 0x021EFB14
@@ -50165,8 +50165,8 @@ MOD05_021EFB50: ; 0x021EFB50
 	ldr r0, [r5, #4]
 	mov r1, #0
 	str r1, [r0, #0x14]
-	ldr r0, _021EFBAC ; =0x00000014
-	bl FUN_02005F60
+	ldr r0, _021EFBAC ; =SDK_MODULE_20_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r4, r5, r6, pc}
 _021EFB94:
@@ -50174,29 +50174,29 @@ _021EFB94:
 	bl FUN_02252504
 	cmp r0, #0
 	beq _021EFBA8
-	ldr r0, _021EFBB0 ; =0x00000013
-	bl FUN_02005F60
+	ldr r0, _021EFBB0 ; =SDK_MODULE_19_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r4, r5, r6, pc}
 _021EFBA8:
 	mov r0, #0
 	pop {r4, r5, r6, pc}
 	.balign 4, 0
-_021EFBAC: .word 0x00000014
-_021EFBB0: .word 0x00000013
+_021EFBAC: .word SDK_MODULE_20_ID
+_021EFBB0: .word SDK_MODULE_19_ID
 
 	thumb_func_start MOD05_021EFBB4
 MOD05_021EFBB4: ; 0x021EFBB4
 	push {r4, lr}
 	add r4, r0, #0
-	ldr r0, _021EFBC8 ; =0x00000013
+	ldr r0, _021EFBC8 ; =SDK_MODULE_19_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	ldr r0, [r4, #8]
 	bl FUN_02252440
 	pop {r4, pc}
 	.balign 4, 0
-_021EFBC8: .word 0x00000013
+_021EFBC8: .word SDK_MODULE_19_ID
 
 	thumb_func_start MOD05_021EFBCC
 MOD05_021EFBCC: ; 0x021EFBCC
@@ -50213,15 +50213,15 @@ MOD05_021EFBD8: ; 0x021EFBD8
 	bl FUN_02252504
 	cmp r0, #0
 	beq _021EFBEE
-	ldr r0, _021EFBF4 ; =0x00000013
-	bl FUN_02005F60
+	ldr r0, _021EFBF4 ; =SDK_MODULE_19_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r3, pc}
 _021EFBEE:
 	mov r0, #0
 	pop {r3, pc}
 	nop
-_021EFBF4: .word 0x00000013
+_021EFBF4: .word SDK_MODULE_19_ID
 
 	thumb_func_start MOD05_021EFBF8
 MOD05_021EFBF8: ; 0x021EFBF8
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 21634f2b..1f539d08 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -128,8 +128,8 @@ _0222D6AC:
 	bl MOD11_0222FC38

 	cmp r0, #1

 	bne _0222D6D2

-	ldr r0, _0222D7F0 ; =0x00000007

-	bl FUN_02005F60

+	ldr r0, _0222D7F0 ; =SDK_MODULE_07_ID

+	bl UnloadOverlayByID

 	mov r0, #7

 	str r0, [r4]

 	mov r0, #0x3d

@@ -147,9 +147,9 @@ _0222D6D4:
 	str r0, [r4]

 	b _0222D7EA

 _0222D6DA:

-	ldr r0, _0222D7F4 ; =0x00000008

+	ldr r0, _0222D7F4 ; =SDK_MODULE_08_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 	add r0, r6, #0

 	bl MOD11_0222DB50

 	mov r0, #9

@@ -184,8 +184,8 @@ _0222D720:
 	bl MOD11_0222FE58

 	cmp r0, #1

 	bne _0222D7EA

-	ldr r0, _0222D7F0 ; =0x00000007

-	bl FUN_02005F60

+	ldr r0, _0222D7F0 ; =SDK_MODULE_07_ID

+	bl UnloadOverlayByID

 	mov r0, #5

 	bl FUN_020168D0

 	mov r0, #0x3e

@@ -279,8 +279,8 @@ _0222D7EA:
 	add sp, #0x28

 	pop {r4, r5, r6, pc}

 	.align 2, 0

-_0222D7F0: .word 0x00000007

-_0222D7F4: .word 0x00000008

+_0222D7F0: .word SDK_MODULE_07_ID

+_0222D7F4: .word SDK_MODULE_08_ID

 

 	thumb_func_start MOD11_0222D7F8

 MOD11_0222D7F8: ; 0x0222D7F8

@@ -302,16 +302,16 @@ MOD11_0222D7F8: ; 0x0222D7F8
 	add r0, r4, #0

 	mov r1, #3

 	bl MOD11_02231338

-	ldr r0, _0222D838 ; =0x00000008

-	bl FUN_02005F60

-	ldr r0, _0222D83C ; =0x00000009

+	ldr r0, _0222D838 ; =SDK_MODULE_08_ID

+	bl UnloadOverlayByID

+	ldr r0, _0222D83C ; =SDK_MODULE_09_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 	pop {r4, pc}

 	.align 2, 0

 _0222D834: .word 0x000023FB

-_0222D838: .word 0x00000008

-_0222D83C: .word 0x00000009

+_0222D838: .word SDK_MODULE_08_ID

+_0222D83C: .word SDK_MODULE_09_ID

 

 	thumb_func_start MOD11_0222D840

 MOD11_0222D840: ; 0x0222D840

@@ -349,11 +349,11 @@ MOD11_0222D840: ; 0x0222D840
 MOD11_0222D88C: ; 0x0222D88C

 	push {r3, r4, r5, lr}

 	add r4, r0, #0

-	ldr r0, _0222D938 ; =0x00000009

-	bl FUN_02005F60

-	ldr r0, _0222D93C ; =0x00000008

+	ldr r0, _0222D938 ; =SDK_MODULE_09_ID

+	bl UnloadOverlayByID

+	ldr r0, _0222D93C ; =SDK_MODULE_08_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 	add r0, r4, #0

 	mov r1, #0

 	bl MOD11_02231338

@@ -415,8 +415,8 @@ MOD11_0222D88C: ; 0x0222D88C
 	bl FUN_02008D24

 	pop {r3, r4, r5, pc}

 	.align 2, 0

-_0222D938: .word 0x00000009

-_0222D93C: .word 0x00000008

+_0222D938: .word SDK_MODULE_09_ID

+_0222D93C: .word SDK_MODULE_08_ID

 _0222D940: .word 0x000023FB

 

 	thumb_func_start MOD11_0222D944

@@ -1396,13 +1396,13 @@ _0222E220:
 	bl FUN_0201C350

 	add r0, r4, #0

 	bl FUN_02016A18

-	ldr r0, _0222E25C ; =0x00000008

-	bl FUN_02005F60

+	ldr r0, _0222E25C ; =SDK_MODULE_08_ID

+	bl UnloadOverlayByID

 	bl FUN_02033590

 	cmp r0, #0

 	bne _0222E244

-	ldr r0, _0222E260 ; =0x00000010

-	bl FUN_02005F60

+	ldr r0, _0222E260 ; =SDK_MODULE_16_ID

+	bl UnloadOverlayByID

 _0222E244:

 	pop {r3, r4, r5, r6, r7, pc}

 	nop

@@ -1411,8 +1411,8 @@ _0222E24C: .word 0x00002410
 _0222E250: .word 0x000023F9

 _0222E254: .word 0x00002430

 _0222E258: .word 0x00000704

-_0222E25C: .word 0x00000008

-_0222E260: .word 0x00000010

+_0222E25C: .word SDK_MODULE_08_ID

+_0222E260: .word SDK_MODULE_16_ID

 

 	thumb_func_start MOD11_0222E264

 MOD11_0222E264: ; 0x0222E264

@@ -3384,13 +3384,13 @@ MOD11_0222F284: ; 0x0222F284
 	bl FUN_02033590

 	cmp r0, #0

 	bne _0222F296

-	ldr r0, _0222F298 ; =0x00000010

+	ldr r0, _0222F298 ; =SDK_MODULE_16_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 _0222F296:

 	pop {r3, pc}

 	.align 2, 0

-_0222F298: .word 0x00000010

+_0222F298: .word SDK_MODULE_16_ID

 

 	thumb_func_start MOD11_0222F29C

 MOD11_0222F29C: ; 0x0222F29C

@@ -4244,9 +4244,9 @@ _0222F9C6:
 	mov r0, #0

 	pop {r4, r5, r6, pc}

 _0222F9CA:

-	ldr r0, _0222FAB8 ; =0x00000007

+	ldr r0, _0222FAB8 ; =SDK_MODULE_07_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 	ldr r1, [r4, #0x2c]

 	mov r0, #8

 	tst r0, r1

@@ -4363,7 +4363,7 @@ _0222FAA4:
 	pop {r4, r5, r6, pc}

 	nop

 _0222FAB4: .word 0x00002444

-_0222FAB8: .word 0x00000007

+_0222FAB8: .word SDK_MODULE_07_ID

 

 	thumb_func_start MOD11_0222FABC

 MOD11_0222FABC: ; 0x0222FABC

@@ -4612,9 +4612,9 @@ _0222FCA2:
 	mov r0, #0

 	pop {r3, r4, r5, r6, r7, pc}

 _0222FCA8:

-	ldr r0, _0222FE54 ; =0x00000007

+	ldr r0, _0222FE54 ; =SDK_MODULE_07_ID

 	mov r1, #2

-	bl FUN_02005FDC

+	bl HandleLoadOverlay

 	mov r0, #5

 	mov r1, #0x2c

 	bl FUN_02016998

@@ -4818,7 +4818,7 @@ _0222FE48:
 	add sp, #0x10

 	pop {r3, r4, r5, r6, r7, pc}

 	.align 2, 0

-_0222FE54: .word 0x00000007

+_0222FE54: .word SDK_MODULE_07_ID

 

 	thumb_func_start MOD11_0222FE58

 MOD11_0222FE58: ; 0x0222FE58

diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 3f005555..9748eb5c 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -524,16 +524,16 @@ MOD12_0222D9B0: ; 0x0222D9B0
 	bl FUN_020168D0
 	bl FUN_02083404
 	bl FUN_02033ED0
-	ldr r0, _0222DADC ; =0x00000008
-	bl FUN_02005F60
-	ldr r0, _0222DAE0 ; =0x00000011
-	bl FUN_02005F60
+	ldr r0, _0222DADC ; =SDK_MODULE_08_ID
+	bl UnloadOverlayByID
+	ldr r0, _0222DAE0 ; =SDK_MODULE_17_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r3, r4, r5, pc}
 	nop
 _0222DAD8: .word 0x0000081C
-_0222DADC: .word 0x00000008
-_0222DAE0: .word 0x00000011
+_0222DADC: .word SDK_MODULE_08_ID
+_0222DAE0: .word SDK_MODULE_17_ID
 
 	thumb_func_start MOD12_0222DAE4
 MOD12_0222DAE4: ; 0x0222DAE4
@@ -3689,15 +3689,15 @@ _0222F3AE:
 	bl FUN_020168D0
 	bl FUN_02083404
 	bl FUN_02033ED0
-	ldr r0, _0222F450 ; =0x00000008
-	bl FUN_02005F60
-	ldr r0, _0222F454 ; =0x00000011
-	bl FUN_02005F60
+	ldr r0, _0222F450 ; =SDK_MODULE_08_ID
+	bl UnloadOverlayByID
+	ldr r0, _0222F454 ; =SDK_MODULE_17_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_0222F450: .word 0x00000008
-_0222F454: .word 0x00000011
+_0222F450: .word SDK_MODULE_08_ID
+_0222F454: .word SDK_MODULE_17_ID
 
 	thumb_func_start MOD12_0222F458
 MOD12_0222F458: ; 0x0222F458
@@ -5533,17 +5533,17 @@ _02230296:
 	bl FUN_020168D0
 	bl FUN_02083404
 	bl FUN_02033ED0
-	ldr r0, _022303B8 ; =0x00000008
-	bl FUN_02005F60
-	ldr r0, _022303BC ; =0x00000011
-	bl FUN_02005F60
+	ldr r0, _022303B8 ; =SDK_MODULE_08_ID
+	bl UnloadOverlayByID
+	ldr r0, _022303BC ; =SDK_MODULE_17_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022303B0: .word 0x00001130
 _022303B4: .word 0x0000110C
-_022303B8: .word 0x00000008
-_022303BC: .word 0x00000011
+_022303B8: .word SDK_MODULE_08_ID
+_022303BC: .word SDK_MODULE_17_ID
 
 	thumb_func_start MOD12_022303C0
 MOD12_022303C0: ; 0x022303C0
@@ -7447,16 +7447,16 @@ _022312B8: .word 0x00000127
 	thumb_func_start MOD12_022312BC
 MOD12_022312BC: ; 0x022312BC
 	push {r3, lr}
-	ldr r0, _022312D0 ; =0x00000008
+	ldr r0, _022312D0 ; =SDK_MODULE_08_ID
 	mov r1, #2
-	bl FUN_02005FDC
-	ldr r0, _022312D4 ; =0x00000011
+	bl HandleLoadOverlay
+	ldr r0, _022312D4 ; =SDK_MODULE_17_ID
 	mov r1, #2
-	bl FUN_02005FDC
+	bl HandleLoadOverlay
 	pop {r3, pc}
 	.align 2, 0
-_022312D0: .word 0x00000008
-_022312D4: .word 0x00000011
+_022312D0: .word SDK_MODULE_08_ID
+_022312D4: .word SDK_MODULE_17_ID
 
 	thumb_func_start MOD12_022312D8
 MOD12_022312D8: ; 0x022312D8
@@ -41601,10 +41601,10 @@ _022415D4:
 	lsl r2, r2, #8
 	bl MIi_CpuClear16
 	bl FUN_02033ED0
-	ldr r0, _0224174C ; =0x00000008
-	bl FUN_02005F60
-	ldr r0, _02241750 ; =0x00000011
-	bl FUN_02005F60
+	ldr r0, _0224174C ; =SDK_MODULE_08_ID
+	bl UnloadOverlayByID
+	ldr r0, _02241750 ; =SDK_MODULE_17_ID
+	bl UnloadOverlayByID
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
@@ -41614,8 +41614,8 @@ _0224173C: .word 0x00007FFF
 _02241740: .word 0x05000200
 _02241744: .word 0x05000400
 _02241748: .word 0x05000600
-_0224174C: .word 0x00000008
-_02241750: .word 0x00000011
+_0224174C: .word SDK_MODULE_08_ID
+_02241750: .word SDK_MODULE_17_ID
 
 	thumb_func_start MOD12_02241754
 MOD12_02241754: ; 0x02241754