021F64EC to 021F6608

1 files changed, 60 insertions, 32 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 6ad3928b..fedab2fa 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -6280,7 +6280,7 @@ _021DA5F4: ; jump table
 	.short _021DA714 - _021DA5F4 - 2 ; case 4
 	.short _021DA772 - _021DA5F4 - 2 ; case 5
 _021DA600:
-	ldr r6, _021DA7A4 ; =0x021F650C
+	ldr r6, _021DA7A4 ; =UNK05_021F650C
 	add r3, sp, #0x34
 	mov r2, #0xa
 _021DA606:
@@ -6485,7 +6485,7 @@ _021DA79E:
 	add sp, #0x84
 	pop {r4, r5, r6, r7, pc}
 	.balign 4, 0
-_021DA7A4: .word 0x021F650C
+_021DA7A4: .word UNK05_021F650C
 _021DA7A8: .word 0x00000608
 _021DA7AC: .word 0x00000605
 _021DA7B0: .word 0x00000607
@@ -6516,7 +6516,7 @@ _021DA7D0: ; jump table
 	.short _021DA980 - _021DA7D0 - 2 ; case 5
 	.short _021DA9B0 - _021DA7D0 - 2 ; case 6
 _021DA7DE:
-	ldr r6, _021DA9D4 ; =0x021F655C
+	ldr r6, _021DA9D4 ; =UNK05_021F655C
 	add r3, sp, #0x34
 	mov r2, #0xa
 _021DA7E4:
@@ -6757,7 +6757,7 @@ _021DA9CE:
 	add sp, #0x84
 	pop {r4, r5, r6, r7, pc}
 	.balign 4, 0
-_021DA9D4: .word 0x021F655C
+_021DA9D4: .word UNK05_021F655C
 _021DA9D8: .word 0x0000FFA0
 _021DA9DC: .word 0x00000608
 _021DA9E0: .word 0x00000605
@@ -6897,7 +6897,7 @@ _021DAAC2: ; jump table
 	.short _021DAC16 - _021DAAC2 - 2 ; case 4
 	.short _021DAC34 - _021DAAC2 - 2 ; case 5
 _021DAACE:
-	ldr r3, _021DAC68 ; =0x021F64FC
+	ldr r3, _021DAC68 ; =UNK05_021F64FC
 	add r2, sp, #0x20
 	ldmia r3!, {r0, r1}
 	stmia r2!, {r0, r1}
@@ -7089,7 +7089,7 @@ _021DAC60:
 	add sp, #0x40
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_021DAC68: .word 0x021F64FC
+_021DAC68: .word UNK05_021F64FC
 _021DAC6C: .word 0x00000615
 
 	thumb_func_start MOD05_021DAC70
@@ -7319,7 +7319,7 @@ _021DAE3C:
 MOD05_021DAE40: ; 0x021DAE40
 	push {r4, r5, r6, r7, lr}
 	sub sp, #0x84
-	ldr r6, _021DAED0 ; =0x021F65AC
+	ldr r6, _021DAED0 ; =UNK05_021F65AC
 	str r3, [sp, #0x18]
 	add r5, r0, #0
 	add r7, r1, #0
@@ -7384,7 +7384,7 @@ _021DAEC8:
 	add sp, #0x84
 	pop {r4, r5, r6, r7, pc}
 	.balign 4, 0
-_021DAED0: .word 0x021F65AC
+_021DAED0: .word UNK05_021F65AC
 
 	thumb_func_start MOD05_021DAED4
 MOD05_021DAED4: ; 0x021DAED4
@@ -8084,7 +8084,7 @@ _021DB45A:
 	mov r1, #0x14
 	bl AllocFromHeap
 	add r4, r0, #0
-	ldr r0, _021DB4AC ; =0x021F65FC
+	ldr r0, _021DB4AC ; =UNK05_021F65FC
 	lsl r1, r6, #2
 	ldr r0, [r0, r1]
 	str r5, [r4, #0xc]
@@ -8121,7 +8121,7 @@ _021DB49E:
 	add r0, r4, #0
 	pop {r4, r5, r6, pc}
 	.balign 4, 0
-_021DB4AC: .word 0x021F65FC
+_021DB4AC: .word UNK05_021F65FC
 
 	thumb_func_start MOD05_021DB4B0
 MOD05_021DB4B0: ; 0x021DB4B0
@@ -9333,7 +9333,7 @@ MOD05_021DBD84: ; 0x021DBD84
 	add r7, r0, #0
 	add r5, r1, #0
 	mov r0, #0x18
-	ldr r1, _021DBDE8 ; =0x021F6608
+	ldr r1, _021DBDE8 ; =UNK05_021F6608
 	mul r0, r2
 	add r6, r3, #0
 	add r4, r1, r0
@@ -9374,7 +9374,7 @@ _021DBDE2:
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}
 	nop
-_021DBDE8: .word 0x021F6608
+_021DBDE8: .word UNK05_021F6608
 
 	thumb_func_start MOD05_021DBDEC
 MOD05_021DBDEC: ; 0x021DBDEC
@@ -63993,24 +63993,43 @@ UNK05_021F64E4: ; 0x021F64E4
 
 	.global UNK05_021F64EC
 UNK05_021F64EC: ; 0x021F64EC
-	.byte 0x82, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0xA9, 0x01, 0x00, 0x00, 0xAA, 0x01, 0x00, 0x00
-	.byte 0x82, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0xA9, 0x01, 0x00, 0x00, 0xAA, 0x01, 0x00, 0x00
-	.byte 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00
-	.byte 0xF6, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0xAB, 0x01, 0x00, 0x00, 0xC8, 0x01, 0x00, 0x00
-	.byte 0x04, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x39, 0x01, 0x00, 0x00, 0xB6, 0x01, 0x00, 0x00
-	.byte 0xBC, 0x01, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00, 0xBA, 0x01, 0x00, 0x00, 0x2A, 0x01, 0x00, 0x00
-	.byte 0xE4, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x02, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00
-	.byte 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00
-	.byte 0xF6, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0xAB, 0x01, 0x00, 0x00, 0xC8, 0x01, 0x00, 0x00
-	.byte 0x04, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x39, 0x01, 0x00, 0x00, 0xB6, 0x01, 0x00, 0x00
-	.byte 0xBC, 0x01, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00, 0xBA, 0x01, 0x00, 0x00, 0x2A, 0x01, 0x00, 0x00
-	.byte 0xE4, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x02, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00
-	.byte 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00
-	.byte 0xF6, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0xAB, 0x01, 0x00, 0x00, 0xC8, 0x01, 0x00, 0x00
-	.byte 0x04, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x39, 0x01, 0x00, 0x00, 0xB6, 0x01, 0x00, 0x00
-	.byte 0xBC, 0x01, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00, 0xBA, 0x01, 0x00, 0x00, 0x2A, 0x01, 0x00, 0x00
-	.byte 0xE4, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x02, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00
-	.byte 0xF8, 0xD1, 0x1F, 0x02, 0xE0, 0xD1, 0x1F, 0x02, 0x10, 0xD2, 0x1F, 0x02, 0xC1, 0xAE, 0x29, 0x00
+	.word 0x00000082, 0x00000083, 0x000001A9, 0x000001AA
+
+	.global UNK05_021F64FC
+UNK05_021F64FC: ; 0x021F64FC
+	.word 0x00000082, 0x00000083, 0x000001A9, 0x000001AA
+
+	.global UNK05_021F650C
+UNK05_021F650C: ; 0x021F650C
+	.word 0x00000042, 0x00000043, 0x00000044, 0x00000045
+	.word 0x000000F6, 0x00000046, 0x000001AB, 0x000001C8
+	.word 0x00000104, 0x00000138, 0x00000139, 0x000001B6
+	.word 0x000001BC, 0x000001B9, 0x000001BA, 0x0000012A
+	.word 0x000001E4, 0x00000080, 0x0000020F, 0x0000004B
+
+	.global UNK05_021F655C
+UNK05_021F655C: ; 0x021F655C
+	.word 0x00000042, 0x00000043, 0x00000044, 0x00000045
+	.word 0x000000F6, 0x00000046, 0x000001AB, 0x000001C8
+	.word 0x00000104, 0x00000138, 0x00000139, 0x000001B6
+	.word 0x000001BC, 0x000001B9, 0x000001BA, 0x0000012A
+	.word 0x000001E4, 0x00000080, 0x0000020F, 0x0000004B
+
+	.global UNK05_021F65AC
+UNK05_021F65AC: ; 0x021F65AC
+	.word 0x00000042, 0x00000043, 0x00000044, 0x00000045
+	.word 0x000000F6, 0x00000046, 0x000001AB, 0x000001C8
+	.word 0x00000104, 0x00000138, 0x00000139, 0x000001B6
+	.word 0x000001BC, 0x000001B9, 0x000001BA, 0x0000012A
+	.word 0x000001E4, 0x00000080, 0x0000020F, 0x0000004B
+
+	.global UNK05_021F65FC
+UNK05_021F65FC: ; 0x021F65FC
+	.word UNK05_021FD1F8, UNK05_021FD1E0, UNK05_021FD210
+
+	.global UNK05_021F6608
+UNK05_021F6608: ; 0x021F6608
+	.byte 0xC1, 0xAE, 0x29, 0x00
 	.byte 0x02, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00
 	.byte 0x00, 0x40, 0x38, 0x00, 0xC1, 0xAE, 0x29, 0x00, 0x62, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0xC1, 0x05, 0x00, 0x60, 0x09, 0x00, 0x00, 0x40, 0x38, 0x00, 0x4C, 0x37, 0x20, 0x00
@@ -66016,10 +66035,19 @@ UNK05_021F9494: ; 0x021F9494
 	.byte 0x8D, 0x62, 0x1F, 0x02, 0xC5, 0x62, 0x1F, 0x02, 0x00, 0x00, 0x00, 0x00
 
 	.section .data
-	; 0x021FD1E0
+
+	.global UNK05_021FD1E0
+UNK05_021FD1E0: ; 0x021FD1E0
 	.byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x61, 0x72, 0x65, 0x61, 0x30, 0x31, 0x6C, 0x69, 0x67, 0x68, 0x74
-	.byte 0x2E, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x61, 0x72, 0x65
+	.byte 0x2E, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00
+
+	.global UNK05_021FD1F8
+UNK05_021FD1F8: ; 0x021FD1F8
+	.byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x61, 0x72, 0x65
 	.byte 0x61, 0x30, 0x30, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x2E, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00
+
+	.global UNK05_021FD210
+UNK05_021FD210: ; 0x021FD210
 	.byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x61, 0x72, 0x65, 0x61, 0x30, 0x32, 0x6C, 0x69, 0x67, 0x68, 0x74
 	.byte 0x2E, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x73, 0x65, 0x61, 0x00, 0x72, 0x68, 0x61, 0x6E
 	.byte 0x61, 0x00, 0x00, 0x00, 0x68, 0x61, 0x6D, 0x61, 0x62, 0x65, 0x00, 0x00, 0x61, 0x73, 0x61, 0x73