patch module 84

3 files changed, 42 insertions, 27 deletions

diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 67003c8c..0234a819 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -8434,7 +8434,7 @@ _02231A4C:
 	str r0, [r1, #0x20]
 	mov r0, #0x15
 	str r0, [sp]
-	ldr r1, _02231AE0 ; =0x02244D6C
+	ldr r1, _02231AE0 ; =MOD12_02244D6C
 	lsl r2, r5, #1
 	ldrh r1, [r1, r2]
 	mov r0, #0x2d
@@ -8473,7 +8473,7 @@ _02231A98:
 	mov r0, #0
 	str r0, [sp, #4]
 	str r0, [sp, #8]
-	ldr r2, _02231AE4 ; =0x02244D54
+	ldr r2, _02231AE4 ; =MOD12_02244D54
 	lsl r3, r5, #1
 	ldrh r2, [r2, r3]
 	add r0, r6, #0
@@ -8496,8 +8496,8 @@ _02231AD6:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02231AE0: .word 0x02244D6C
-_02231AE4: .word 0x02244D54
+_02231AE0: .word MOD12_02244D6C
+_02231AE4: .word MOD12_02244D54
 
 	thumb_func_start MOD12_02231AE8
 MOD12_02231AE8: ; 0x02231AE8
@@ -8570,14 +8570,14 @@ MOD12_02231B4C: ; 0x02231B4C
 	b _02231B80
 _02231B76:
 	mov r0, #0x30
-	ldr r1, _02231C70 ; =0x02245074
+	ldr r1, _02231C70 ; =MOD12_02245074
 	mul r0, r2
 	add r0, r1, r0
 	str r0, [sp, #0x10]
 _02231B80:
 	ldr r0, [sp, #4]
 	mov r1, #0x30
-	ldr r2, _02231C70 ; =0x02245074
+	ldr r2, _02231C70 ; =MOD12_02245074
 	mul r1, r0
 	add r0, r2, r1
 	str r0, [sp, #0x14]
@@ -8695,7 +8695,7 @@ _02231C62:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02231C70: .word 0x02245074
+_02231C70: .word MOD12_02245074
 _02231C74: .word 0x0000FFFF
 _02231C78: .word MOD12_0223336C
 _02231C7C: .word MOD12_022333A8
@@ -8716,7 +8716,7 @@ _02231C96:
 	mov r0, #0x2e
 	lsl r0, r0, #4
 	ldrsb r1, [r5, r0]
-	ldr r3, _02231D44 ; =0x02245074
+	ldr r3, _02231D44 ; =MOD12_02245074
 	mov r0, #0x30
 	add r2, r1, #0
 	mul r2, r0
@@ -8803,7 +8803,7 @@ _02231D3E:
 	ldr r0, [sp]
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_02231D44: .word 0x02245074
+_02231D44: .word MOD12_02245074
 
 	thumb_func_start MOD12_02231D48
 MOD12_02231D48: ; 0x02231D48
@@ -8970,7 +8970,7 @@ _02231E8E:
 	add r0, sp, #0x34
 	strh r2, [r0, r1]
 	ldr r0, _022320A8 ; =0x00010708
-	ldr r1, _022320AC ; =0x02244D94
+	ldr r1, _022320AC ; =MOD12_02244D94
 	str r0, [sp]
 	mov r0, #0
 	str r0, [sp, #4]
@@ -8981,7 +8981,7 @@ _02231E8E:
 	ldrh r1, [r1, r0]
 	mov r3, #2
 	str r1, [sp, #0xc]
-	ldr r1, _022320AC ; =0x02244D94
+	ldr r1, _022320AC ; =MOD12_02244D94
 	add r0, r1, r0
 	ldrh r0, [r0, #2]
 	add r1, r4, #0
@@ -9237,7 +9237,7 @@ _02232096:
 _022320A0: .word 0x000002E1
 _022320A4: .word 0x00000123
 _022320A8: .word 0x00010708
-_022320AC: .word 0x02244D94
+_022320AC: .word MOD12_02244D94
 _022320B0: .word 0x000080F0
 _022320B4: .word 0x00010200
 _022320B8: .word 0x02244E30
@@ -10992,7 +10992,7 @@ MOD12_02232E18: ; 0x02232E18
 	add r5, r0, #0
 	sub r2, #0x38
 	ldrsb r2, [r5, r2]
-	ldr r1, _02232E7C ; =0x02245074
+	ldr r1, _02232E7C ; =MOD12_02245074
 	mov r3, #0x30
 	add r4, r2, #0
 	mul r4, r3
@@ -11040,7 +11040,7 @@ _02232E76:
 	blx r2
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_02232E7C: .word 0x02245074
+_02232E7C: .word MOD12_02245074
 _02232E80: .word gUnknown21C48B8
 _02232E84: .word 0x00000CF3
 _02232E88: .word 0x000005DC
@@ -11061,7 +11061,7 @@ MOD12_02232E8C: ; 0x02232E8C
 	add r6, r5, r0
 	ldrsb r1, [r5, r1]
 	mov r0, #0x30
-	ldr r2, _02232FE4 ; =0x02245074
+	ldr r2, _02232FE4 ; =MOD12_02245074
 	mul r0, r1
 	add r7, r2, r0
 	mov r4, #0
@@ -11225,7 +11225,7 @@ _02232FDC:
 	add sp, #0x1c
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_02232FE4: .word 0x02245074
+_02232FE4: .word MOD12_02245074
 _02232FE8: .word 0x00000123
 _02232FEC: .word 0x02244D58
 
@@ -11281,7 +11281,7 @@ MOD12_0223302C: ; 0x0223302C
 	add r4, r5, r0
 	mov r3, #0x30
 	add r2, r1, #0
-	ldr r0, _02233144 ; =0x02245074
+	ldr r0, _02233144 ; =MOD12_02245074
 	mul r3, r6
 	add r1, r5, r7
 	add r6, r0, r3
@@ -11412,7 +11412,7 @@ _0223313A:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_02233144: .word 0x02245074
+_02233144: .word MOD12_02245074
 _02233148: .word 0x02244D5C
 
 	thumb_func_start MOD12_0223314C
@@ -11761,7 +11761,7 @@ MOD12_022333A8: ; 0x022333A8
 	ldrsb r1, [r1, r0]
 	mov r0, #0x30
 	mov r4, #0
-	ldr r2, _022333F0 ; =0x02245074
+	ldr r2, _022333F0 ; =MOD12_02245074
 	mul r0, r1
 	ldr r6, _022333F4 ; =0x0000FFFF
 	add r5, r2, r0
@@ -11791,7 +11791,7 @@ _022333E0:
 	bl FUN_0200CAB4
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_022333F0: .word 0x02245074
+_022333F0: .word MOD12_02245074
 _022333F4: .word 0x0000FFFF
 
 	thumb_func_start MOD12_022333F8
@@ -48259,11 +48259,22 @@ MOD12_02244D18: ; 0x02244D18
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03, 0x1E, 0x00, 0x27, 0x00, 0x00, 0x01, 0x02, 0x03
+	.byte 0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03
+
+	.global MOD12_02244D54
+MOD12_02244D54: ; 0x02244D54
+	.byte 0x1E, 0x00, 0x27, 0x00, 0x00, 0x01, 0x02, 0x03
 	.byte 0x00, 0x01, 0x02, 0x03, 0x03, 0x03, 0x00, 0x00, 0x14, 0x02, 0x11, 0x02, 0x0E, 0x02, 0x0B, 0x02
+
+	.global MOD12_02244D6C
+MOD12_02244D6C: ; 0x02244D6C
 	.byte 0x08, 0x00, 0x07, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x28, 0x00, 0x48, 0x00
 	.byte 0x80, 0x00, 0x48, 0x00, 0xD8, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x13, 0x00, 0x20, 0x00, 0x93, 0x00, 0x20, 0x00
+	.byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+
+	.global MOD12_02244D94
+MOD12_02244D94: ; 0x02244D94
+	.byte 0x13, 0x00, 0x20, 0x00, 0x93, 0x00, 0x20, 0x00
 	.byte 0x13, 0x00, 0x80, 0x00, 0x93, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
 	.byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x27, 0x00, 0x30, 0x00, 0xA7, 0x00, 0x30, 0x00
 	.byte 0x27, 0x00, 0x90, 0x00, 0xA7, 0x00, 0x90, 0x00, 0x08, 0x80, 0x00, 0x50, 0x08, 0x80, 0x58, 0xA8
@@ -48313,7 +48324,11 @@ MOD12_02244F64: ; 0x02244F64
 	.byte 0x7F, 0x46, 0x1F, 0x3E, 0xBF, 0x39, 0xBF, 0x00, 0xED, 0x1C, 0x5F, 0x5B, 0x08, 0x21, 0x2B, 0x7C
 	.byte 0x8C, 0x31, 0x31, 0x46, 0xD6, 0x5A, 0x00, 0x00, 0xCD, 0x75, 0xFF, 0x7F, 0xF9, 0x7F, 0x93, 0x7F
 	.byte 0x0E, 0x7F, 0xAA, 0x7F, 0x68, 0x77, 0xC5, 0x7E, 0x04, 0x29, 0xB7, 0x7F, 0x08, 0x21, 0x2B, 0x7C
-	.byte 0x8C, 0x31, 0x31, 0x46, 0xD6, 0x5A, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF
+	.byte 0x8C, 0x31, 0x31, 0x46, 0xD6, 0x5A, 0x00, 0x00
+
+	.global MOD12_02245074
+MOD12_02245074: ; 0x02245074
+	.byte 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF
 	.byte 0x00, 0x00, 0xFF, 0xFF, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x5D, 0x1D, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s
index 57d2036e..5794638d 100644
--- a/arm9/modules/84/asm/module_84_thumb1.s
+++ b/arm9/modules/84/asm/module_84_thumb1.s
@@ -1426,7 +1426,7 @@ _021D806E:
 	str r0, [r4, #0x2c]
 	mov r0, #0
 	str r0, [r4, #0x10]
-	ldr r0, _021D80B4 ; =MOD54_021D8150
+	ldr r0, _021D80B4 ; =MOD84_021D8150
 	add r1, r4, #0
 	mov r2, #1
 	bl FUN_0200CA98
@@ -1443,7 +1443,7 @@ _021D80A4: .word MOD84_021D80B8
 _021D80A8: .word MOD84_021D80F0
 _021D80AC: .word MOD84_021D8104
 _021D80B0: .word MOD84_021D813C
-_021D80B4: .word MOD54_021D8150
+_021D80B4: .word MOD84_021D8150
 	thumb_func_end MOD84_021D801C
 
 	.rodata
diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s
index 41b27a0f..1b7cf306 100644
--- a/arm9/modules/84/asm/module_84_thumb2.s
+++ b/arm9/modules/84/asm/module_84_thumb2.s
@@ -3,8 +3,8 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start FUN_021D8150
-FUN_021D8150: ; 0x021D8150
+	thumb_func_start MOD84_021D8150
+MOD84_021D8150: ; 0x021D8150
 	push	{r4, r5, r6, lr}
 	add	r5, r1, #0
 	add	r6, r0, #0