mod05_021DBD84

3 files changed, 96 insertions, 89 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 6d8b337a..852aabfb 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -526,6 +526,7 @@ Overlay MODULE_05
 	Object mod05_021DB900.o
 	Object mod05_021DBA00.o
 	Object mod05_021DBABC.o
+	Object mod05_021DBD84.o
 	Object module_05.o
 }
 
diff --git a/arm9/modules/05/asm/mod05_021DBD84.s b/arm9/modules/05/asm/mod05_021DBD84.s
new file mode 100644
index 00000000..7c107314
--- /dev/null
+++ b/arm9/modules/05/asm/mod05_021DBD84.s
@@ -0,0 +1,95 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+	.section .text
+	.balign 4, 0
+
+	thumb_func_start MOD05_021DBD84
+MOD05_021DBD84: ; 0x021DBD84
+	push {r4, r5, r6, r7, lr}
+	sub sp, #0xc
+	add r7, r0, #0
+	add r5, r1, #0
+	mov r0, #0x18
+	ldr r1, _021DBDE8 ; =UNK05_021F6608
+	mul r0, r2
+	add r6, r3, #0
+	add r4, r1, r0
+	cmp r2, #0x10
+	blo _021DBD9E
+	bl ErrorHandling
+_021DBD9E:
+	mov r0, #4
+	bl FUN_0201EB64
+	str r0, [r5, #0x20]
+	ldrb r0, [r4, #0xc]
+	add r2, r4, #4
+	str r0, [sp]
+	mov r0, #1
+	str r0, [sp, #4]
+	ldr r0, [r5, #0x20]
+	str r0, [sp, #8]
+	ldrh r3, [r4, #0xe]
+	ldr r1, [r4]
+	add r0, r7, #0
+	bl FUN_0201ECA8
+	ldr r0, [r5, #0x20]
+	bl FUN_0201EB8C
+	ldr r0, [r4, #0x10]
+	ldr r1, [r4, #0x14]
+	ldr r2, [r5, #0x20]
+	bl FUN_0201EC94
+	cmp r6, #0
+	beq _021DBDE2
+	ldr r0, [r5, #0x20]
+	mov r1, #6
+	str r0, [sp]
+	mov r0, #7
+	mov r2, #2
+	mov r3, #4
+	bl FUN_0201EABC
+_021DBDE2:
+	add sp, #0xc
+	pop {r4, r5, r6, r7, pc}
+	nop
+_021DBDE8: .word UNK05_021F6608
+
+	thumb_func_start MOD05_021DBDEC
+MOD05_021DBDEC: ; 0x021DBDEC
+	push {r4, lr}
+	add r4, r0, #0
+	bl FUN_0201EB98
+	ldr r0, [r4, #0x20]
+	bl FUN_0201EB48
+	ldr r0, [r4, #0x20]
+	bl FUN_0201EB70
+	pop {r4, pc}
+	.balign 4, 0
+
+	.section .rodata
+
+	.global UNK05_021F6608
+UNK05_021F6608: ; 0x021F6608
+	.byte 0xC1, 0xAE, 0x29, 0x00, 0x02, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x62, 0xCF, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
+	.byte 0x4C, 0x37, 0x20, 0x00, 0x22, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x02, 0xD6, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
+	.byte 0x9B, 0xB8, 0x61, 0x00, 0x62, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x81, 0x02
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x70, 0x6C, 0x00, 0x05, 0xC8, 0x13, 0x00, 0x03, 0xD6, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0C, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00
+	.byte 0xDF, 0x28, 0x36, 0x00, 0x03, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x04
+	.byte 0x00, 0x30, 0x07, 0x00, 0x00, 0x50, 0x4C, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x03, 0xD6, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x90, 0x09, 0x00, 0x00, 0x70, 0x40, 0x00
+	.byte 0xC1, 0x6E, 0x29, 0x00, 0xE3, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0xA0, 0x40, 0x00, 0xAC, 0x59, 0x16, 0x00, 0x23, 0xE3, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0A, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
+	.byte 0xB1, 0x25, 0x4B, 0x00, 0xC3, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x03
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x20, 0x6D, 0x00, 0x55, 0x3D, 0x2A, 0x00, 0xE3, 0xD6, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x70, 0x46, 0x00
+	.byte 0x3F, 0xE9, 0x23, 0x00, 0x03, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x06
+	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0x4C, 0x37, 0x20, 0x00, 0x03, 0xDE, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
+	.byte 0x65, 0x97, 0x0A, 0x00, 0x44, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15
+	.byte 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0xDF, 0xDE, 0x28, 0x00, 0x22, 0xD9, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 2ebd1a45..304ec1f7 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3,68 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD05_021DBD84
-MOD05_021DBD84: ; 0x021DBD84
-	push {r4, r5, r6, r7, lr}
-	sub sp, #0xc
-	add r7, r0, #0
-	add r5, r1, #0
-	mov r0, #0x18
-	ldr r1, _021DBDE8 ; =UNK05_021F6608
-	mul r0, r2
-	add r6, r3, #0
-	add r4, r1, r0
-	cmp r2, #0x10
-	blo _021DBD9E
-	bl ErrorHandling
-_021DBD9E:
-	mov r0, #4
-	bl FUN_0201EB64
-	str r0, [r5, #0x20]
-	ldrb r0, [r4, #0xc]
-	add r2, r4, #4
-	str r0, [sp]
-	mov r0, #1
-	str r0, [sp, #4]
-	ldr r0, [r5, #0x20]
-	str r0, [sp, #8]
-	ldrh r3, [r4, #0xe]
-	ldr r1, [r4]
-	add r0, r7, #0
-	bl FUN_0201ECA8
-	ldr r0, [r5, #0x20]
-	bl FUN_0201EB8C
-	ldr r0, [r4, #0x10]
-	ldr r1, [r4, #0x14]
-	ldr r2, [r5, #0x20]
-	bl FUN_0201EC94
-	cmp r6, #0
-	beq _021DBDE2
-	ldr r0, [r5, #0x20]
-	mov r1, #6
-	str r0, [sp]
-	mov r0, #7
-	mov r2, #2
-	mov r3, #4
-	bl FUN_0201EABC
-_021DBDE2:
-	add sp, #0xc
-	pop {r4, r5, r6, r7, pc}
-	nop
-_021DBDE8: .word UNK05_021F6608
-
-	thumb_func_start MOD05_021DBDEC
-MOD05_021DBDEC: ; 0x021DBDEC
-	push {r4, lr}
-	add r4, r0, #0
-	bl FUN_0201EB98
-	ldr r0, [r4, #0x20]
-	bl FUN_0201EB48
-	ldr r0, [r4, #0x20]
-	bl FUN_0201EB70
-	pop {r4, pc}
-	.balign 4, 0
-
 	thumb_func_start MOD05_021DBE04
 MOD05_021DBE04: ; 0x021DBE04
 	push {r4, lr}
@@ -54627,33 +54565,6 @@ _021F6428: .word MOD05_021F57F0
 
 	.section .rodata
 
-	.global UNK05_021F6608
-UNK05_021F6608: ; 0x021F6608
-	.byte 0xC1, 0xAE, 0x29, 0x00, 0x02, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x62, 0xCF, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
-	.byte 0x4C, 0x37, 0x20, 0x00, 0x22, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x02, 0xD6, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
-	.byte 0x9B, 0xB8, 0x61, 0x00, 0x62, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x81, 0x02
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x70, 0x6C, 0x00, 0x05, 0xC8, 0x13, 0x00, 0x03, 0xD6, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0C, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00
-	.byte 0xDF, 0x28, 0x36, 0x00, 0x03, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x04
-	.byte 0x00, 0x30, 0x07, 0x00, 0x00, 0x50, 0x4C, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x03, 0xD6, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x90, 0x09, 0x00, 0x00, 0x70, 0x40, 0x00
-	.byte 0xC1, 0x6E, 0x29, 0x00, 0xE3, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0xA0, 0x40, 0x00, 0xAC, 0x59, 0x16, 0x00, 0x23, 0xE3, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0A, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
-	.byte 0xB1, 0x25, 0x4B, 0x00, 0xC3, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x03
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x20, 0x6D, 0x00, 0x55, 0x3D, 0x2A, 0x00, 0xE3, 0xD6, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x70, 0x46, 0x00
-	.byte 0x3F, 0xE9, 0x23, 0x00, 0x03, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x06
-	.byte 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0x4C, 0x37, 0x20, 0x00, 0x03, 0xDE, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
-	.byte 0x65, 0x97, 0x0A, 0x00, 0x44, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15
-	.byte 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0xDF, 0xDE, 0x28, 0x00, 0x22, 0xD9, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00
-
 	.global UNK05_021F6788
 UNK05_021F6788: ; 0x021F6788
 	.word MOD05_021DBE90