021F683C to 021F7564

1 files changed, 106 insertions, 64 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 09893a79..0e02a902 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -10419,7 +10419,7 @@ MOD05_021DC554: ; 0x021DC554
 	ldr r0, _021DC58C ; =0x021FD2D4
 	mov r1, #4
 	str r0, [r4]
-	ldr r0, _021DC590 ; =0x021F689C
+	ldr r0, _021DC590 ; =UNK05_021F689C
 	str r0, [r4, #4]
 	mov r0, #0x41
 	bl NARC_ctor
@@ -10430,7 +10430,7 @@ MOD05_021DC554: ; 0x021DC554
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
 _021DC58C: .word 0x021FD2D4
-_021DC590: .word 0x021F689C
+_021DC590: .word UNK05_021F689C
 
 	thumb_func_start MOD05_021DC594
 MOD05_021DC594: ; 0x021DC594
@@ -15600,7 +15600,7 @@ _021DECE4:
 	bl _s32_div_f
 	mov r1, #3
 	sub r7, r1, r0
-	ldr r1, _021DEDA4 ; =0x021F687C
+	ldr r1, _021DEDA4 ; =UNK05_021F687C
 	add r0, r7, #1
 	ldr r1, [r1, r6]
 	mul r1, r0
@@ -15665,7 +15665,7 @@ _021DED9A:
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
 _021DEDA0: .word 0x00000F58
-_021DEDA4: .word 0x021F687C
+_021DEDA4: .word UNK05_021F687C
 _021DEDA8: .word UNK05_021F683C
 _021DEDAC: .word 0x00000309
 _021DEDB0: .word 0x00000106
@@ -20994,7 +20994,7 @@ _021E17BE:
 	cmp r0, #0
 	bne _021E17DE
 	ldr r1, [r4, #0x10]
-	ldr r2, _021E1840 ; =0x021F6908
+	ldr r2, _021E1840 ; =UNK05_021F6908
 	add r0, r5, #0
 	bl MOD05_021E1700
 	mov r7, #1
@@ -21013,7 +21013,7 @@ _021E17DE:
 	mov r1, #0x31
 	bl MOD05_021E198C
 	ldr r1, [r4, #0x10]
-	ldr r2, _021E1844 ; =0x021F6910
+	ldr r2, _021E1844 ; =UNK05_021F6910
 	add r0, r5, #0
 	bl MOD05_021E1700
 	ldr r0, [r5, #4]
@@ -21024,7 +21024,7 @@ _021E17DE:
 	beq _021E1826
 	mov r1, #0x31
 	bl MOD05_021E198C
-	ldr r2, _021E1844 ; =0x021F6910
+	ldr r2, _021E1844 ; =UNK05_021F6910
 	add r0, r5, #0
 	add r1, r7, #0
 	bl MOD05_021E1700
@@ -21044,8 +21044,8 @@ _021E183C:
 	add r0, r7, #0
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
-_021E1840: .word 0x021F6908
-_021E1844: .word 0x021F6910
+_021E1840: .word UNK05_021F6908
+_021E1844: .word UNK05_021F6910
 
 	thumb_func_start MOD05_021E1848
 MOD05_021E1848: ; 0x021E1848
@@ -21092,7 +21092,7 @@ _021E187E:
 
 	thumb_func_start MOD05_021E189C
 MOD05_021E189C: ; 0x021E189C
-	ldr r3, _021E18B8 ; =0x021F691C
+	ldr r3, _021E18B8 ; =UNK05_021F691C
 	mov r2, #0
 _021E18A0:
 	ldrh r0, [r3]
@@ -21109,14 +21109,14 @@ _021E18AC:
 	mov r0, #0xff
 	bx lr
 	.balign 4, 0
-_021E18B8: .word 0x021F691C
+_021E18B8: .word UNK05_021F691C
 
 	thumb_func_start MOD05_021E18BC
 MOD05_021E18BC: ; 0x021E18BC
 	push {r3, r4, r5, r6, r7, lr}
 	add r6, r0, #0
 	mov r0, #0xc
-	ldr r2, _021E1900 ; =0x021F691C
+	ldr r2, _021E1900 ; =UNK05_021F691C
 	mul r0, r1
 	add r0, r2, r0
 	ldr r7, _021E1904 ; =0x0000FFFF
@@ -21150,7 +21150,7 @@ _021E18F0:
 	lsr r0, r0, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
-_021E1900: .word 0x021F691C
+_021E1900: .word UNK05_021F691C
 _021E1904: .word 0x0000FFFF
 
 	thumb_func_start MOD05_021E1908
@@ -21178,7 +21178,7 @@ _021E192C:
 MOD05_021E1930: ; 0x021E1930
 	sub r1, r1, #1
 	lsl r1, r1, #0x10
-	ldr r2, _021E195C ; =0x021F691C
+	ldr r2, _021E195C ; =UNK05_021F691C
 	lsr r3, r1, #0x10
 	beq _021E1956
 	mov r1, #0xc
@@ -21201,20 +21201,20 @@ _021E1956:
 	mov r0, #0
 	bx lr
 	nop
-_021E195C: .word 0x021F691C
+_021E195C: .word UNK05_021F691C
 _021E1960: .word 0x0000FFFF
 
 	thumb_func_start MOD05_021E1964
 MOD05_021E1964: ; 0x021E1964
 	mov r2, #0xc
 	mul r2, r0
-	ldr r0, _021E1974 ; =0x021F691C
+	ldr r0, _021E1974 ; =UNK05_021F691C
 	lsl r1, r1, #1
 	add r0, r0, r2
 	ldrh r0, [r1, r0]
 	bx lr
 	nop
-_021E1974: .word 0x021F691C
+_021E1974: .word UNK05_021F691C
 
 	thumb_func_start MOD05_021E1978
 MOD05_021E1978: ; 0x021E1978
@@ -24649,7 +24649,7 @@ MOD05_021E3444: ; 0x021E3444
 	push {r3, r4, r5, lr}
 	add r5, r1, #0
 	lsl r1, r0, #2
-	ldr r0, _021E3470 ; =0x021F74E8
+	ldr r0, _021E3470 ; =UNK05_021F74E8
 	add r4, r2, #0
 	ldr r0, [r0, r1]
 	mov r1, #0x20
@@ -24668,7 +24668,7 @@ _021E346A:
 	str r1, [r0, #0x18]
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
-_021E3470: .word 0x021F74E8
+_021E3470: .word UNK05_021F74E8
 
 	thumb_func_start MOD05_021E3474
 MOD05_021E3474: ; 0x021E3474
@@ -25686,7 +25686,7 @@ _021E3C10: .word MOD05_021E3C14
 MOD05_021E3C14: ; 0x021E3C14
 	push {r3, r4, r5, r6, lr}
 	sub sp, #0x64
-	ldr r6, _021E3D10 ; =0x021F7464
+	ldr r6, _021E3D10 ; =UNK05_021F7464
 	add r3, sp, #0x54
 	add r5, r0, #0
 	add r4, r1, #0
@@ -25700,7 +25700,7 @@ MOD05_021E3C14: ; 0x021E3C14
 	mov r0, #1
 	add r1, r0, #0
 	bl FUN_0201E6E4
-	ldr r3, _021E3D14 ; =0x021F74AC
+	ldr r3, _021E3D14 ; =UNK05_021F74AC
 	add r2, sp, #0x38
 	ldmia r3!, {r0, r1}
 	stmia r2!, {r0, r1}
@@ -25729,7 +25729,7 @@ MOD05_021E3C14: ; 0x021E3C14
 	mov r0, #2
 	mov r1, #0
 	bl FUN_0201E6E4
-	ldr r3, _021E3D18 ; =0x021F7490
+	ldr r3, _021E3D18 ; =UNK05_021F7490
 	add r2, sp, #0x1c
 	ldmia r3!, {r0, r1}
 	stmia r2!, {r0, r1}
@@ -25758,7 +25758,7 @@ MOD05_021E3C14: ; 0x021E3C14
 	mov r0, #4
 	mov r1, #1
 	bl FUN_0201E6E4
-	ldr r3, _021E3D1C ; =0x021F7474
+	ldr r3, _021E3D1C ; =UNK05_021F7474
 	add r2, sp, #0
 	ldmia r3!, {r0, r1}
 	stmia r2!, {r0, r1}
@@ -25792,10 +25792,10 @@ MOD05_021E3C14: ; 0x021E3C14
 	add sp, #0x64
 	pop {r3, r4, r5, r6, pc}
 	nop
-_021E3D10: .word 0x021F7464
-_021E3D14: .word 0x021F74AC
-_021E3D18: .word 0x021F7490
-_021E3D1C: .word 0x021F7474
+_021E3D10: .word UNK05_021F7464
+_021E3D14: .word UNK05_021F74AC
+_021E3D18: .word UNK05_021F7490
+_021E3D1C: .word UNK05_021F7474
 
 	thumb_func_start MOD05_021E3D20
 MOD05_021E3D20: ; 0x021E3D20
@@ -26754,7 +26754,7 @@ _021E4438:
 	sub r2, r2, r3
 	ror r2, r1
 	add r2, r3, r2
-	ldr r1, _021E4518 ; =0x021F745C
+	ldr r1, _021E4518 ; =UNK05_021F745C
 	mov r3, #0x20
 	ldrb r1, [r1, r2]
 	lsr r2, r0, #3
@@ -26840,7 +26840,7 @@ _021E4510:
 	add sp, #0x1c
 	pop {r4, r5, r6, r7, pc}
 	nop
-_021E4518: .word 0x021F745C
+_021E4518: .word UNK05_021F745C
 
 	thumb_func_start MOD05_021E451C
 MOD05_021E451C: ; 0x021E451C
@@ -27079,7 +27079,7 @@ MOD05_021E46D4: ; 0x021E46D4
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #0x18
 	str r1, [sp, #0xc]
-	ldr r4, _021E474C ; =0x021F74C8
+	ldr r4, _021E474C ; =UNK05_021F74C8
 	str r0, [sp, #8]
 	str r2, [sp, #0x10]
 	str r3, [sp, #0x14]
@@ -27133,7 +27133,7 @@ _021E46E6:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_021E474C: .word 0x021F74C8
+_021E474C: .word UNK05_021F74C8
 _021E4750: .word 0x0000FFFF
 
 	thumb_func_start MOD05_021E4754
@@ -28174,7 +28174,7 @@ MOD05_021E4E90: ; 0x021E4E90
 	ldr r0, [r2]
 	add r2, sp, #0x14
 	str r0, [r3]
-	ldr r3, _021E4EE0 ; =0x021F7564
+	ldr r3, _021E4EE0 ; =UNK05_021F7564
 	ldmia r3!, {r0, r1}
 	stmia r2!, {r0, r1}
 	ldr r0, [r3]
@@ -28199,7 +28199,7 @@ _021E4EDA:
 	add sp, #0x20
 	pop {r4, pc}
 	.balign 4, 0
-_021E4EE0: .word 0x021F7564
+_021E4EE0: .word UNK05_021F7564
 
 	thumb_func_start MOD05_021E4EE4
 MOD05_021E4EE4: ; 0x021E4EE4
@@ -64101,20 +64101,36 @@ UNK05_021F681C: ; 0x021F681C
 
 	.global UNK05_021F683C
 UNK05_021F683C: ; 0x021F683C
-	.byte 0xFD, 0xFF, 0xFF, 0xFF, 0xFB, 0xFF, 0xFF, 0xFF, 0xFB, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF
-	.byte 0xFB, 0xFF, 0xFF, 0xFF, 0xFA, 0xFF, 0xFF, 0xFF, 0xF6, 0xFF, 0xFF, 0xFF, 0xFA, 0xFF, 0xFF, 0xFF
-	.byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-	.byte 0x15, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00
-	.byte 0x24, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
-	.byte 0x0A, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00
-	.byte 0x1E, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00
-	.byte 0x2D, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00
-	.byte 0x2F, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00
-	.byte 0x31, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x01, 0x00
-	.byte 0xFE, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x67, 0x00, 0x01, 0x00, 0xFE, 0x00, 0x00, 0x00
+	.word -3, -5, -5, -4
+	.word -5, -6, -10, -6
+	.word 0x00000002, 0x00000002, 0x00000002, 0x00000004
+	.word 0x00000004, 0x00000002, 0x00000002, 0x00000002
+
+	.global UNK05_021F687C
+UNK05_021F687C: ; 0x021F687C
+	.word 0x00000002, 0x00000002, 0x00000002, 0x000000004
+	.word 0x00000004, 0x00000002, 0x00000002, 0x000000002
+
+	.global UNK05_021F689C
+UNK05_021F689C: ; 0x021F689C
+	.word 0x00000015, 0x00000024, 0x00000026, 0x00000025
+	.word 0x00000024, 0x00000026, 0x00000009, 0x00000008
+	.word 0x0000000A, 0x0000002A, 0x0000002C, 0x0000002B
+	.word 0x0000001E, 0x0000001D, 0x0000001F, 0x0000002E
+	.word 0x0000002D, 0x0000002F, 0x00000033, 0x0000002D
+	.word 0x0000002F, 0x00000034, 0x00000035, 0x00000036
+	.word 0x00000031, 0x00000030, 0x00000032
+
+	.global UNK05_021F6908
+UNK05_021F6908: ; 0x021F6908
+	.word 0x0001004B, 0x000000FE
+
+	.global UNK05_021F6910
+UNK05_021F6910: ; 0x021F6910
+	.word 0x00010001, 0x00010067, 0x000000FE
+
+	.global UNK05_021F691C
+UNK05_021F691C: ; 0x021F691C
 	.byte 0x0E, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x73, 0x02
 	.byte 0x74, 0x02, 0xFF, 0xFF, 0x75, 0x02, 0x00, 0x00, 0x2C, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0xFF, 0xFF, 0x76, 0x02, 0x77, 0x02, 0xFF, 0xFF, 0x78, 0x02
@@ -64295,23 +64311,49 @@ UNK05_021F683C: ; 0x021F683C
 	.byte 0x69, 0x01, 0x69, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xFF, 0xFF
 	.byte 0xFF, 0xFF, 0x06, 0x03, 0xFF, 0xFF, 0x08, 0x03, 0x6A, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 	.byte 0xFF, 0xFF, 0x09, 0x03, 0x5D, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x03
-	.byte 0x00, 0x02, 0x05, 0x07, 0x01, 0x06, 0x03, 0x04, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x1F, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x1D, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00
-	.byte 0x2D, 0x00, 0x16, 0x00, 0x2D, 0x00, 0x44, 0x00, 0x5A, 0x00, 0x43, 0x00, 0x5B, 0x00, 0x71, 0x00
-	.byte 0x87, 0x00, 0x70, 0x00, 0x87, 0x00, 0x9E, 0x00, 0xB4, 0x00, 0x9D, 0x00, 0x69, 0x8A, 0x1E, 0x02
-	.byte 0xE9, 0x88, 0x1E, 0x02, 0xED, 0x8B, 0x1E, 0x02, 0x21, 0x8D, 0x1E, 0x02, 0x21, 0x8F, 0x1E, 0x02
-	.byte 0x31, 0x90, 0x1E, 0x02, 0x41, 0x91, 0x1E, 0x02, 0xA9, 0x94, 0x1E, 0x02, 0xA9, 0x97, 0x1E, 0x02
-	.byte 0x69, 0x9B, 0x1E, 0x02, 0xE5, 0xA0, 0x1E, 0x02, 0xA5, 0xA3, 0x1E, 0x02, 0xC9, 0xBB, 0x1E, 0x02
-	.byte 0xE9, 0xBB, 0x1E, 0x02, 0x09, 0xBC, 0x1E, 0x02, 0x29, 0xBC, 0x1E, 0x02, 0x49, 0xBC, 0x1E, 0x02
-	.byte 0x69, 0xBC, 0x1E, 0x02, 0x89, 0xBC, 0x1E, 0x02, 0xA9, 0xBC, 0x1E, 0x02, 0xB9, 0xC3, 0x1E, 0x02
-	.byte 0xD9, 0xC3, 0x1E, 0x02, 0xF9, 0xC3, 0x1E, 0x02, 0x19, 0xC4, 0x1E, 0x02, 0x39, 0xC4, 0x1E, 0x02
-	.byte 0x49, 0xB4, 0x1E, 0x02, 0xB5, 0xB5, 0x1E, 0x02, 0x61, 0xAD, 0x1E, 0x02, 0x61, 0xB1, 0x1E, 0x02
-	.byte 0x85, 0xA8, 0x1E, 0x02, 0xE9, 0xAA, 0x1E, 0x02, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+
+	.global UNK05_021F745C
+UNK05_021F745C: ; 0x021F745C
+	.byte 0x00, 0x02, 0x05, 0x07, 0x01, 0x06, 0x03, 0x04
+
+	.global UNK05_021F7464
+UNK05_021F7464: ; 0x021F7464
+	.word 0x00000001, 0x00000001, 0x00000000, 0x00000001
+
+	.global UNK05_021F7474
+UNK05_021F7474: ; 0x021F7474
+	.word 0x00000000, 0x00000000, 0x00000800, 0x00000000
+	.word 0x001F0101, 0x00010001, 0x00000000
+
+	.global UNK05_021F7490
+UNK05_021F7490: ; 0x021F7490
+	.word 0x00000000, 0x00000000, 0x00000800, 0x00000000
+	.word MOD05_021E0000, 0x00000001, 0x00000000
+
+	.global UNK05_021F74AC
+UNK05_021F74AC: ; 0x021F74AC
+	.word 0x00000000, 0x00000000, 0x00000800, 0x00000000
+	.word 0x011D0001, 0x00000300, 0x00000000
+
+	.global UNK05_021F74C8
+UNK05_021F74C8: ; 0x021F74C8
+	.short 0x0000, 0x0017, 0x002D, 0x0016, 0x002D, 0x0044, 0x005A, 0x0043
+	.short 0x005B, 0x0071, 0x0087, 0x0070, 0x0087, 0x009E, 0x00B4, 0x009D
+
+	.global UNK05_021F74E8
+UNK05_021F74E8: ; 0x021F74E8
+	.word MOD05_021E8A68, MOD05_021E88E8, MOD05_021E8BEC, MOD05_021E8D20
+	.word MOD05_021E8F20, MOD05_021E9030, MOD05_021E9140, MOD05_021E94A8
+	.word MOD05_021E97A8, MOD05_021E9B68, MOD05_021EA0E4, MOD05_021EA3A4
+	.word MOD05_021EBBC8, MOD05_021EBBE8, MOD05_021EBC08, MOD05_021EBC28
+	.word MOD05_021EBC48, MOD05_021EBC68, MOD05_021EBC88, MOD05_021EBCA8
+	.word MOD05_021EC3B8, MOD05_021EC3D8, MOD05_021EC3F8, MOD05_021EC418
+	.word MOD05_021EC438, MOD05_021EB448, MOD05_021EB5B4, MOD05_021EAD60
+	.word MOD05_021EB160, MOD05_021EA884, MOD05_021EAAE8
+
+	.global UNK05_021F7564
+UNK05_021F7564: ; 0x021F7564
+	.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
 	.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
 	.byte 0x80, 0x00, 0x00, 0x00, 0x4D, 0x54, 0x1E, 0x02, 0x91, 0x54, 0x1E, 0x02, 0x95, 0x54, 0x1E, 0x02
 	.byte 0xC1, 0x54, 0x1E, 0x02, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00