summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-07-10 15:58:32 +0300
committerGitHub <noreply@github.com>2020-07-10 15:58:32 +0300
commitd022486e419b8651a9716fb50e0cedcbb6733168 (patch)
tree088423d90c3d87df8a370515e79fe9cfc1915f13
parentebf4bb0d6f4e22d1c746582ba9f713ef81018dbd (diff)
parentc9ddf4561a78539653d63d71494144b31f935972 (diff)
Merge pull request #228 from red031000/master
modules 55, 56, 58, 61, 62, 65, 70, 73, 74, 76, 79, 80, 81, 82, 85 and 86 fully shiftable
-rw-r--r--arm9/global.inc12
-rw-r--r--arm9/modules/55/asm/module_55.s16
-rw-r--r--arm9/modules/56/asm/module_56.s42
-rw-r--r--arm9/modules/58/asm/module_58.s4
-rw-r--r--arm9/modules/61/asm/module_61.s2
-rw-r--r--arm9/modules/62/asm/module_62.s144
-rw-r--r--arm9/modules/65/asm/module_65.s43
-rw-r--r--arm9/modules/70/asm/module_70.s4
-rw-r--r--arm9/modules/73/asm/module_73.s21
-rw-r--r--arm9/modules/74/asm/module_74.s33
-rw-r--r--arm9/modules/76/asm/module_76.s10
-rw-r--r--arm9/modules/79/asm/module_79_arm.s160
-rw-r--r--arm9/modules/79/asm/module_79_thumb.s53
-rw-r--r--arm9/modules/80/asm/module_80.s108
-rw-r--r--arm9/modules/81/asm/module_81.s46
-rw-r--r--arm9/modules/82/asm/module_82.s36
-rw-r--r--arm9/modules/85/asm/module_85.s301
-rw-r--r--arm9/modules/86/asm/module_86.s4
18 files changed, 639 insertions, 400 deletions
diff --git a/arm9/global.inc b/arm9/global.inc
index d682b675..9cfbdec2 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7263,6 +7263,18 @@
.extern MOD79_02213D80
.extern MOD79_02213DBC
.extern MOD79_02213E24
+.extern MOD79_02216858
+.extern MOD79_02217124
+.extern MOD79_02217128
+.extern MOD79_0221712C
+.extern MOD79_02217130
+.extern MOD79_02217134
+.extern MOD79_02217138
+.extern MOD79_0221713C
+.extern MOD79_02217140
+.extern MOD79_02217144
+.extern MOD79_02217148
+.extern MOD79_0221714C
.extern MOD80_0222DFD0
.extern MOD80_0222E134
.extern MOD80_0222E25C
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index 1aff4965..58137f3d 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -5680,13 +5680,13 @@ MOD55_021DA458: ; 0x021DA458
.data
.global MOD55_021DA4A0
MOD55_021DA4A0: ; 0x021DA4A0
- .byte 0xD1, 0x81, 0x1D, 0x02, 0xDD, 0x81, 0x1D, 0x02, 0x7D, 0x8A, 0x1D, 0x02, 0x15, 0x8D, 0x1D, 0x02
- .byte 0x6D, 0x8E, 0x1D, 0x02, 0xE5, 0x8F, 0x1D, 0x02, 0x89, 0x9D, 0x1D, 0x02, 0xC1, 0x82, 0x1D, 0x02
- .byte 0x21, 0x83, 0x1D, 0x02, 0x71, 0x83, 0x1D, 0x02, 0x05, 0x84, 0x1D, 0x02, 0x41, 0x84, 0x1D, 0x02
- .byte 0xC9, 0x84, 0x1D, 0x02, 0x45, 0x85, 0x1D, 0x02, 0x85, 0x85, 0x1D, 0x02, 0x81, 0x86, 0x1D, 0x02
- .byte 0x8D, 0x86, 0x1D, 0x02, 0x81, 0xA0, 0x1D, 0x02, 0x85, 0x91, 0x1D, 0x02, 0xDD, 0x93, 0x1D, 0x02
- .byte 0xED, 0x95, 0x1D, 0x02, 0x51, 0x9C, 0x1D, 0x02, 0xC5, 0x9C, 0x1D, 0x02, 0x05, 0x9E, 0x1D, 0x02
- .byte 0x41, 0x9E, 0x1D, 0x02, 0xC9, 0x9E, 0x1D, 0x02, 0x71, 0x9F, 0x1D, 0x02, 0x8D, 0x9F, 0x1D, 0x02
- .byte 0xDD, 0x9F, 0x1D, 0x02, 0x1D, 0xA0, 0x1D, 0x02, 0xD9, 0x90, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word MOD55_021D81D0, MOD55_021D81DC, MOD55_021D8A7C, MOD55_021D8D14
+ .word MOD55_021D8E6C, MOD55_021D8FE4, MOD55_021D9D88, MOD55_021D82C0
+ .word MOD55_021D8320, MOD55_021D8370, MOD55_021D8404, MOD55_021D8440
+ .word MOD55_021D84C8, MOD55_021D8544, MOD55_021D8584, MOD55_021D8680
+ .word MOD55_021D868C, MOD55_021DA080, MOD55_021D9184, MOD55_021D93DC
+ .word MOD55_021D95EC, MOD55_021D9C50, MOD55_021D9CC4, MOD55_021D9E04
+ .word MOD55_021D9E40, MOD55_021D9EC8, MOD55_021D9F70, MOD55_021D9F8C
+ .word MOD55_021D9FDC, MOD55_021DA01C, MOD55_021D90D8, 0x00000000
.bss
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index ef4e11b1..ab9f8f3d 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -8742,17 +8742,17 @@ MOD56_022163D8: ; 0x022163D8
.global MOD56_022163F4
MOD56_022163F4: ; 0x022163F4
- .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x25, 0x36, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD56_02213924, MOD56_02213624, 0x00000000
.byte 0x22, 0x00, 0x05, 0x00, 0x00, 0x08, 0x00, 0x10, 0x20, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00
.global MOD56_02216414
MOD56_02216414: ; 0x02216414
- .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD56_02213924, 0x00000000, 0x00000000
.byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
.global MOD56_02216434
MOD56_02216434: ; 0x02216434
- .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD56_02213924, 0x00000000, 0x00000000
.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
.global MOD56_02216454
@@ -8779,23 +8779,23 @@ MOD56_022164C0: ; 0x022164C0
.global MOD56_022164E0
MOD56_022164E0: ; 0x022164E0
- .byte 0x1D, 0x2A, 0x21, 0x02, 0x3D, 0x2B, 0x21, 0x02, 0x85, 0x2B, 0x21, 0x02, 0xE9, 0x2B, 0x21, 0x02
- .byte 0x51, 0x2C, 0x21, 0x02, 0xCD, 0x2C, 0x21, 0x02, 0x55, 0x2D, 0x21, 0x02, 0x49, 0x30, 0x21, 0x02
- .byte 0x8D, 0x30, 0x21, 0x02, 0x99, 0x30, 0x21, 0x02, 0xA5, 0x30, 0x21, 0x02, 0xF5, 0x30, 0x21, 0x02
- .byte 0x3D, 0x31, 0x21, 0x02, 0x95, 0x31, 0x21, 0x02, 0xD9, 0x2D, 0x21, 0x02, 0x7D, 0x32, 0x21, 0x02
- .byte 0x69, 0x33, 0x21, 0x02, 0x89, 0x33, 0x21, 0x02, 0x95, 0x3A, 0x21, 0x02, 0x99, 0x3D, 0x21, 0x02
- .byte 0x91, 0x3F, 0x21, 0x02, 0xCD, 0x3F, 0x21, 0x02, 0xA5, 0x40, 0x21, 0x02, 0xDD, 0x40, 0x21, 0x02
- .byte 0x21, 0x41, 0x21, 0x02, 0x39, 0x42, 0x21, 0x02, 0x8D, 0x42, 0x21, 0x02, 0x2D, 0x43, 0x21, 0x02
- .byte 0xB5, 0x43, 0x21, 0x02, 0x05, 0x44, 0x21, 0x02, 0x65, 0x44, 0x21, 0x02, 0x69, 0x44, 0x21, 0x02
- .byte 0x6D, 0x44, 0x21, 0x02, 0x7D, 0x54, 0x21, 0x02, 0x75, 0x5E, 0x21, 0x02, 0xDD, 0x44, 0x21, 0x02
- .byte 0xD5, 0x45, 0x21, 0x02, 0xCD, 0x46, 0x21, 0x02, 0x21, 0x49, 0x21, 0x02, 0x05, 0x45, 0x21, 0x02
- .byte 0x21, 0x45, 0x21, 0x02, 0x69, 0x45, 0x21, 0x02, 0xD9, 0x49, 0x21, 0x02, 0xFD, 0x4B, 0x21, 0x02
- .byte 0x29, 0x4E, 0x21, 0x02, 0xD9, 0x4F, 0x21, 0x02, 0x21, 0x50, 0x21, 0x02, 0xA5, 0x50, 0x21, 0x02
- .byte 0x01, 0x52, 0x21, 0x02, 0xA9, 0x52, 0x21, 0x02, 0xE1, 0x52, 0x21, 0x02, 0x51, 0x53, 0x21, 0x02
- .byte 0x89, 0x53, 0x21, 0x02, 0xBD, 0x54, 0x21, 0x02, 0x69, 0x59, 0x21, 0x02, 0xB1, 0x59, 0x21, 0x02
- .byte 0x8D, 0x5A, 0x21, 0x02, 0xD5, 0x5A, 0x21, 0x02, 0x39, 0x5B, 0x21, 0x02, 0x91, 0x5B, 0x21, 0x02
- .byte 0xD5, 0x5B, 0x21, 0x02, 0x31, 0x5C, 0x21, 0x02, 0x21, 0x5D, 0x21, 0x02, 0x69, 0x5D, 0x21, 0x02
- .byte 0xFD, 0x32, 0x21, 0x02, 0x0D, 0x4F, 0x21, 0x02, 0x55, 0x4F, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word MOD56_02212A1C, MOD56_02212B3C, MOD56_02212B84, MOD56_02212BE8
+ .word MOD56_02212C50, MOD56_02212CCC, MOD56_02212D54, MOD56_02213048
+ .word MOD56_0221308C, MOD56_02213098, MOD56_022130A4, MOD56_022130F4
+ .word MOD56_0221313C, MOD56_02213194, MOD56_02212DD8, MOD56_0221327C
+ .word MOD56_02213368, MOD56_02213388, MOD56_02213A94, MOD56_02213D98
+ .word MOD56_02213F90, MOD56_02213FCC, MOD56_022140A4, MOD56_022140DC
+ .word MOD56_02214120, MOD56_02214238, MOD56_0221428C, MOD56_0221432C
+ .word MOD56_022143B4, MOD56_02214404, MOD56_02214464, MOD56_02214468
+ .word MOD56_0221446C, MOD56_0221547C, MOD56_02215E74, MOD56_022144DC
+ .word MOD56_022145D4, MOD56_022146CC, MOD56_02214920, MOD56_02214504
+ .word MOD56_02214520, MOD56_02214568, MOD56_022149D8, MOD56_02214BFC
+ .word MOD56_02214E28, MOD56_02214FD8, MOD56_02215020, MOD56_022150A4
+ .word MOD56_02215200, MOD56_022152A8, MOD56_022152E0, MOD56_02215350
+ .word MOD56_02215388, MOD56_022154BC, MOD56_02215968, MOD56_022159B0
+ .word MOD56_02215A8C, MOD56_02215AD4, MOD56_02215B38, MOD56_02215B90
+ .word MOD56_02215BD4, MOD56_02215C30, MOD56_02215D20, MOD56_02215D68
+ .word MOD56_022132FC, MOD56_02214F0C, MOD56_02214F54, 0x00000000
+ .word 0x00000000, 0x00000000, 0x00000000, 0x00000000
.bss
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s
index e32e80d6..4f170e87 100644
--- a/arm9/modules/58/asm/module_58.s
+++ b/arm9/modules/58/asm/module_58.s
@@ -2546,7 +2546,7 @@ MOD58_021DAE94: ; 0x021DAE94
.data
.global MOD58_021DAFA0
MOD58_021DAFA0: ; 0x021DAFA0
- .byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0xA6, 0x1D, 0x02, 0xC5, 0xA6, 0x1D, 0x02, 0xF5, 0xA6, 0x1D, 0x02
- .byte 0xF5, 0xA7, 0x1D, 0x02, 0x15, 0xA8, 0x1D, 0x02, 0x8D, 0xA7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD58_021DA62C, MOD58_021DA6C4, MOD58_021DA6F4
+ .word MOD58_021DA7F4, MOD58_021DA814, MOD58_021DA78C, 0x00000000
.bss
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index 950a5689..fb9ea05a 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -1913,7 +1913,7 @@ MOD61_021D8434: ; 0x021D8434
.global MOD61_021D8444
MOD61_021D8444: ; 0x021D8444
- .byte 0xAD, 0x75, 0x1D, 0x02, 0xD1, 0x75, 0x1D, 0x02, 0xF1, 0x76, 0x1D, 0x02, 0xDD, 0x77, 0x1D, 0x02
+ .word MOD61_021D75AC, MOD61_021D75D0, MOD61_021D76F0, MOD61_021D77DC
.global MOD61_021D8454
MOD61_021D8454: ; 0x021D8454
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 2504e001..33e331d3 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1444,7 +1444,7 @@ _0222E04A:
stmia r6!, {r0}
cmp r4, #8
blt _0222E04A
- ldr r3, _0222E0C4 ; =0x02231158
+ ldr r3, _0222E0C4 ; =MOD62_02231158
add r2, sp, #4
mov r1, #0x10
_0222E068:
@@ -1489,7 +1489,7 @@ _0222E0B4: .word 0x000066B4
_0222E0B8: .word 0x00006A2C
_0222E0BC: .word 0x00006DB8
_0222E0C0: .word 0x000061A8
-_0222E0C4: .word 0x02231158
+_0222E0C4: .word MOD62_02231158
thumb_func_end MOD62_0222E004
thumb_func_start MOD62_0222E0C8
@@ -1987,13 +1987,13 @@ _0222E49A:
ldr r1, [r5]
ldr r0, [sp, #0x20]
lsl r2, r1, #3
- ldr r1, _0222E538 ; =0x02231358
+ ldr r1, _0222E538 ; =MOD62_02231358
ldr r1, [r1, r2]
bl NewString_ReadMsgData
ldr r2, [r5]
add r4, r0, #0
lsl r3, r2, #3
- ldr r2, _0222E538 ; =0x02231358
+ ldr r2, _0222E538 ; =MOD62_02231358
mov r0, #0x67
add r2, r2, r3
ldr r1, [sp, #0x1c]
@@ -2058,7 +2058,7 @@ _0222E4D0:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
-_0222E538: .word 0x02231358
+_0222E538: .word MOD62_02231358
thumb_func_end MOD62_0222E3C4
thumb_func_start MOD62_0222E53C
@@ -2424,7 +2424,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
mov r0, #0x35
bl FUN_0200BB14
add r2, sp, #0x2c
- ldr r5, _0222E868 ; =0x02231138
+ ldr r5, _0222E868 ; =MOD62_02231138
str r0, [r4, #8]
ldmia r5!, {r0, r1}
add r3, r2, #0
@@ -2434,7 +2434,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
ldmia r5!, {r0, r1}
stmia r2!, {r0, r1}
ldmia r5!, {r0, r1}
- ldr r6, _0222E86C ; =0x0223110C
+ ldr r6, _0222E86C ; =MOD62_0223110C
stmia r2!, {r0, r1}
add r5, sp, #0x18
ldmia r6!, {r0, r1}
@@ -2448,7 +2448,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
ldr r0, [r4, #8]
mov r3, #0x20
bl FUN_0200BB6C
- ldr r3, _0222E870 ; =0x02231120
+ ldr r3, _0222E870 ; =MOD62_02231120
add r2, sp, #0
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
@@ -2478,9 +2478,9 @@ _0222E864:
add sp, #0x4c
pop {r3, r4, r5, r6, pc}
.align 2, 0
-_0222E868: .word 0x02231138
-_0222E86C: .word 0x0223110C
-_0222E870: .word 0x02231120
+_0222E868: .word MOD62_02231138
+_0222E86C: .word MOD62_0223110C
+_0222E870: .word MOD62_02231120
thumb_func_end MOD62_0222E7E8
thumb_func_start MOD62_0222E874
@@ -2553,7 +2553,7 @@ _0222E8F4: .word 0x0000BB80
MOD62_0222E8F8: ; 0x0222E8F8
push {r4, r5, r6, r7, lr}
sub sp, #0x64
- ldr r4, _0222E97C ; =0x02231178
+ ldr r4, _0222E97C ; =MOD62_02231178
add r6, r0, #0
add r3, sp, #0
mov r2, #6
@@ -2618,7 +2618,7 @@ _0222E912:
add sp, #0x64
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_0222E97C: .word 0x02231178
+_0222E97C: .word MOD62_02231178
_0222E980: .word 0x0000AFC8
_0222E984: .word 0x000066B2
_0222E988: .word 0x0000B798
@@ -4237,7 +4237,7 @@ MOD62_0222F5B0: ; 0x0222F5B0
add r1, r5, #0
add r2, sp, #0x6c
bl FUN_0200C154
- ldr r3, _0222F730 ; =0x022311A8
+ ldr r3, _0222F730 ; =MOD62_022311A8
str r0, [r4, #0x30]
add r2, sp, #0x38
mov r1, #0x1a
@@ -4248,7 +4248,7 @@ _0222F676:
add r2, r2, #2
sub r1, r1, #1
bne _0222F676
- ldr r3, _0222F734 ; =0x022311DC
+ ldr r3, _0222F734 ; =MOD62_022311DC
add r2, sp, #4
mov r1, #0x1a
_0222F688:
@@ -4320,8 +4320,8 @@ _0222F720: .word 0x00006DB4
_0222F724: .word 0x000062B6
_0222F728: .word 0x00006A27
_0222F72C: .word 0x00006DB3
-_0222F730: .word 0x022311A8
-_0222F734: .word 0x022311DC
+_0222F730: .word MOD62_022311A8
+_0222F734: .word MOD62_022311DC
thumb_func_end MOD62_0222F5B0
thumb_func_start MOD62_0222F738
@@ -4691,7 +4691,7 @@ MOD62_0222F990: ; 0x0222F990
lsl r1, r1, #2
ldr r1, [r4, r1]
lsl r2, r1, #2
- ldr r1, _0222F9B0 ; =0x02231220
+ ldr r1, _0222F9B0 ; =MOD62_02231220
ldr r1, [r1, r2]
blx r1
add r4, #0xe0
@@ -4701,7 +4701,7 @@ MOD62_0222F990: ; 0x0222F990
add r0, r5, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_0222F9B0: .word 0x02231220
+_0222F9B0: .word MOD62_02231220
thumb_func_end MOD62_0222F990
thumb_func_start MOD62_0222F9B4
@@ -5596,7 +5596,7 @@ MOD62_022300E4: ; 0x022300E4
mov r7, #0x1d
lsl r7, r7, #4
strb r0, [r1, #3]
- ldr r1, _022301A0 ; =0x02231260
+ ldr r1, _022301A0 ; =MOD62_02231260
ldr r2, [sp, #4]
add r3, r7, #1
add r4, r7, #2
@@ -5682,7 +5682,7 @@ _0223017E:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_022301A0: .word 0x02231260
+_022301A0: .word MOD62_02231260
_022301A4: .word 0x000001D2
_022301A8: .word MOD62_0222FE58
thumb_func_end MOD62_022300E4
@@ -7367,7 +7367,7 @@ MOD62_02230F80: ; 0x02230F80
sub sp, #0xfc
add r4, r0, #0
bl FUN_0201E6D8
- ldr r5, _022310B8 ; =0x02231238
+ ldr r5, _022310B8 ; =MOD62_02231238
add r3, sp, #0x10
mov r2, #5
_02230F90:
@@ -7401,7 +7401,7 @@ _02230F90:
lsl r1, r1, #0x14
lsl r2, r2, #0x10
bl MIi_CpuClear32
- ldr r5, _022310BC ; =0x02231210
+ ldr r5, _022310BC ; =MOD62_02231210
add r3, sp, #0
add r2, r3, #0
ldmia r5!, {r0, r1}
@@ -7410,7 +7410,7 @@ _02230F90:
stmia r3!, {r0, r1}
add r0, r2, #0
bl FUN_02016BBC
- ldr r5, _022310C0 ; =0x02231294
+ ldr r5, _022310C0 ; =MOD62_02231294
add r3, sp, #0xa8
mov r2, #0xa
_02230FF0:
@@ -7453,7 +7453,7 @@ _02230FF0:
strh r2, [r1]
add r1, r0, #0
bl FUN_0201E6E4
- ldr r5, _022310C8 ; =0x022312E8
+ ldr r5, _022310C8 ; =MOD62_022312E8
add r3, sp, #0x38
mov r2, #0xe
_02231052:
@@ -7499,11 +7499,11 @@ _02231052:
add sp, #0xfc
pop {r4, r5, pc}
nop
-_022310B8: .word 0x02231238
-_022310BC: .word 0x02231210
-_022310C0: .word 0x02231294
+_022310B8: .word MOD62_02231238
+_022310BC: .word MOD62_02231210
+_022310C0: .word MOD62_02231294
_022310C4: .word 0x04000008
-_022310C8: .word 0x022312E8
+_022310C8: .word MOD62_022312E8
thumb_func_end MOD62_02230F80
thumb_func_start MOD62_022310CC
@@ -7536,47 +7536,101 @@ _02231108: .word 0x00003FF8
thumb_func_end MOD62_022310CC
.section .rodata
- ; 0x0223110C
+
+ .global MOD62_0223110C
+MOD62_0223110C: ; 0x0223110C
.byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
- .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x10, 0x00, 0x00, 0x00
+
+ .global MOD62_02231120
+MOD62_02231120: ; 0x02231120
+ .byte 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
+ .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
+
+ .global MOD62_02231138
+MOD62_02231138: ; 0x02231138
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x13, 0x00, 0x17, 0x00
+ .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
+
+ .global MOD62_02231158
+MOD62_02231158: ; 0x02231158
+ .byte 0x13, 0x00, 0x17, 0x00
.byte 0x4B, 0x00, 0x17, 0x00, 0x13, 0x00, 0x2F, 0x00, 0x4B, 0x00, 0x2F, 0x00, 0x13, 0x00, 0x47, 0x00
- .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00, 0x88, 0x00, 0x00, 0x00
+ .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00
+
+ .global MOD62_02231178
+MOD62_02231178: ; 0x02231178
+ .byte 0x88, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x17, 0x00
+ .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+
+ .global MOD62_022311A8
+MOD62_022311A8: ; 0x022311A8
+ .byte 0x14, 0x00, 0x17, 0x00
.byte 0x14, 0x00, 0x2F, 0x00, 0x14, 0x00, 0x47, 0x00, 0x14, 0x00, 0x5F, 0x00, 0x4C, 0x00, 0x17, 0x00
.byte 0x4C, 0x00, 0x2F, 0x00, 0x4C, 0x00, 0x47, 0x00, 0x4C, 0x00, 0x5F, 0x00, 0x1B, 0x00, 0x7C, 0x00
.byte 0x43, 0x00, 0x7C, 0x00, 0x20, 0x00, 0xAB, 0x00, 0x68, 0x00, 0xAB, 0x00, 0xC0, 0x00, 0xAB, 0x00
+
+ .global MOD62_022311DC
+MOD62_022311DC: ; 0x022311DC
.byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0x0D, 0x00, 0x0A, 0x00, 0x0D, 0x00, 0x0A, 0x00, 0x10, 0x00, 0x0C, 0x00, 0x1C, 0x00, 0x0C, 0x00
- .byte 0x1C, 0x00, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0xB5, 0xFA, 0x22, 0x02, 0xAD, 0x03, 0x23, 0x02, 0xC1, 0x0C, 0x23, 0x02
- .byte 0x6D, 0x0D, 0x23, 0x02, 0xE1, 0x0D, 0x23, 0x02, 0x39, 0x0F, 0x23, 0x02, 0x01, 0x00, 0x00, 0x00
+ .byte 0x1C, 0x00, 0x0C, 0x00
+
+ .global MOD62_02231210
+MOD62_02231210: ; 0x02231210
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x00, 0x00
+
+ .global MOD62_02231220
+MOD62_02231220: ; 0x02231220
+ .word MOD62_0222FAB4, MOD62_022303AC, MOD62_02230CC0, MOD62_02230D6C
+ .word MOD62_02230DE0, MOD62_02230F38
+
+ .global MOD62_02231238
+MOD62_02231238: ; 0x02231238
+ .byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
- .byte 0x60, 0x00, 0x00, 0x00, 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18
+ .byte 0x60, 0x00, 0x00, 0x00
+
+ .global MOD62_02231260
+MOD62_02231260: ; 0x02231260
+ .byte 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18
.byte 0x28, 0x38, 0x40, 0x50, 0x40, 0x50, 0x08, 0x18, 0x40, 0x50, 0x40, 0x50, 0x58, 0x68, 0x08, 0x18
.byte 0x58, 0x68, 0x40, 0x50, 0x68, 0x80, 0x08, 0x30, 0x68, 0x80, 0x38, 0x60, 0xA8, 0xBC, 0x12, 0x4D
- .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED
+
+ .global MOD62_02231294
+MOD62_02231294: ; 0x02231294
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD62_022312E8
+MOD62_022312E8: ; 0x022312E8
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0D, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x01, 0x00, 0x02, 0x00, 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, 0x0C, 0x00, 0x00, 0x01, 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, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x3D, 0xF9, 0x22, 0x02, 0x01, 0x00, 0x00, 0x00, 0x05, 0xF9, 0x22, 0x02, 0x02, 0x00, 0x00, 0x00
- .byte 0x4D, 0xF9, 0x22, 0x02, 0x03, 0x00, 0x00, 0x00, 0x71, 0xF9, 0x22, 0x02, 0x04, 0x00, 0x00, 0x00
- .byte 0x81, 0xF9, 0x22, 0x02
+ .byte 0x01, 0x00, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD62_02231358
+MOD62_02231358: ; 0x02231358
+ .word 0x00, MOD62_0222F93C
+ .word 0x01, MOD62_0222F904
+ .word 0x02, MOD62_0222F94C
+ .word 0x03, MOD62_0222F970
+ .word 0x04, MOD62_0222F980
.section .sinit
.word MOD62_0222D5C0
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index 2c54f2b5..1c7adbed 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -5508,8 +5508,8 @@ MOD65_021DA064: ; 0x021DA064
.global MOD65_021DA07C
MOD65_021DA07C: ; 0x021DA07C
- .byte 0x4D, 0x77, 0x1D, 0x02, 0x01, 0x78, 0x1D, 0x02, 0x19, 0x78, 0x1D, 0x02, 0xAD, 0x78, 0x1D, 0x02
- .byte 0xCD, 0x78, 0x1D, 0x02, 0x21, 0x79, 0x1D, 0x02
+ .word MOD65_021D774C, MOD65_021D7800, MOD65_021D7818, MOD65_021D78AC
+ .word MOD65_021D78CC, MOD65_021D7920
.global MOD65_021DA094
MOD65_021DA094: ; 0x021DA094
@@ -5579,12 +5579,12 @@ MOD65_021DA2B8: ; 0x021DA2B8
.global MOD65_021DA2C0
MOD65_021DA2C0: ; 0x021DA2C0
- .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x87, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD65_021D8704, 0x00000000, 0x00000000
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MOD65_021DA2E0
MOD65_021DA2E0: ; 0x021DA2E0
- .byte 0x00, 0x00, 0x00, 0x00, 0xF1, 0x84, 0x1D, 0x02, 0xE5, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD65_021D84F0, MOD65_021D84E4, 0x00000000
.byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x08, 0x00, 0x10, 0x20, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00
.global MOD65_021DA300
@@ -5594,8 +5594,8 @@ MOD65_021DA300: ; 0x021DA300
.global MOD65_021DA314
MOD65_021DA314: ; 0x021DA314
- .byte 0x5C, 0xA4, 0x1D, 0x02, 0x40, 0xA4, 0x1D, 0x02, 0x94, 0xA4, 0x1D, 0x02, 0x78, 0xA4, 0x1D, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xA4, 0x1D, 0x02
+ .word MOD65_021DA45C, MOD65_021DA440, MOD65_021DA494, MOD65_021DA478
+ .word 0x00000000, 0x00000000, MOD65_021DA4B0
.global MOD65_021DA330
MOD65_021DA330: ; 0x021DA330
@@ -5646,15 +5646,26 @@ MOD65_021DA41C: ; 0x021DA41C
.data
.global MOD65_021DA440
MOD65_021DA440: ; 0x021DA440
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x70, 0x61
- .byte 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61
- .byte 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65
- .byte 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72
- .byte 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61
- .byte 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73
- .byte 0x65, 0x5F, 0x63, 0x65, 0x6C, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x65
- .byte 0x6C, 0x61, 0x63, 0x74, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .asciz "data/porucase_pal.resdat"
+
+ .balign 4, 0
+ .global MOD65_021DA45C
+MOD65_021DA45C: ; 0x021DA45C
+ .asciz "data/porucase_chr.resdat"
+
+ .balign 4, 0
+ .global MOD65_021DA478
+MOD65_021DA478: ; 0x021DA478
+ .asciz "data/porucase_canm.resdat"
+
+ .balign 4, 0
+ .global MOD65_021DA494
+MOD65_021DA494: ; 0x021DA494
+ .asciz "data/porucase_cell.resdat"
+
+ .balign 4, 0
+ .global MOD65_021DA4B0
+MOD65_021DA4B0: ; 0x021DA4B0
+ .asciz "data/porucase_celact.cldat"
.bss
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index f4b87636..7af50ac6 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -1727,7 +1727,7 @@ MOD70_021D82AC: ; 0x021D82AC
.data
.global MOD70_021D82E0
MOD70_021D82E0: ; 0x021D82E0
- .byte 0x71, 0x79, 0x1D, 0x02, 0xC1, 0x79, 0x1D, 0x02, 0x21, 0x7A, 0x1D, 0x02, 0x8D, 0x7A, 0x1D, 0x02
- .byte 0xDD, 0x7A, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word MOD70_021D7970, MOD70_021D79C0, MOD70_021D7A20, MOD70_021D7A8C
+ .word MOD70_021D7ADC
.bss
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 107b6334..8c3ed755 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -9467,13 +9467,20 @@ MOD73_021DBC8A: ; 0x021DBC8A
.global MOD73_021DBC9C
MOD73_021DBC9C: ; 0x021DBC9C
- .byte 0x9D, 0x76, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x31, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x69, 0x7F, 0x1D, 0x02, 0x02, 0x00, 0x00, 0x00
- .byte 0xB9, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x79, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0xAD, 0x7A, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x9D, 0x7C, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x75, 0x7F, 0x1D, 0x02, 0x03, 0x00, 0x00, 0x00, 0x6D, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word MOD73_021D769C, 0x01
+ .word MOD73_021D7830, 0x00
+ .word MOD73_021D7858, 0x00
+ .word MOD73_021D785C, 0x00
+ .word MOD73_021D7858, 0x00
+ .word MOD73_021D7F68, 0x02
+ .word MOD73_021D78B8, 0x00
+ .word MOD73_021D79E8, 0x00
+ .word MOD73_021D7AAC, 0x00
+ .word MOD73_021D7858, 0x00
+ .word MOD73_021D7C9C, 0x00
+ .word MOD73_021D7858, 0x00
+ .word MOD73_021D7F74, 0x03
+ .word MOD73_021D806C, 0x00
.global MOD73_021DBD0C
MOD73_021DBD0C: ; 0x021DBD0C
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index bbf859db..b0608987 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -2030,8 +2030,8 @@ MOD74_021D84C4: ; 0x021D84C4
.global MOD74_021D84DC
MOD74_021D84DC: ; 0x021D84DC
- .byte 0x98, 0x86, 0x1D, 0x02, 0x80, 0x86, 0x1D, 0x02, 0xB0, 0x86, 0x1D, 0x02, 0xC8, 0x86, 0x1D, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x86, 0x1D, 0x02
+ .word MOD74_021D8698, MOD74_021D8680, MOD74_021D86B0, MOD74_021D86C8
+ .word 0x00000000, 0x00000000, MOD74_021D86E0
.global MOD74_021D84F8
MOD74_021D84F8: ; 0x021D84F8
@@ -2075,13 +2075,26 @@ MOD74_021D85C4: ; 0x021D85C4
.data
.global MOD74_021D8680
MOD74_021D8680: ; 0x021D8680
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x70, 0x61, 0x6C, 0x2E
- .byte 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F
- .byte 0x77, 0x65, 0x72, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x63, 0x65, 0x6C, 0x6C
- .byte 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F
- .byte 0x77, 0x65, 0x72, 0x5F, 0x63, 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x63, 0x65, 0x6C, 0x61
- .byte 0x63, 0x74, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .asciz "data/btower_pal.resdat"
+
+ .balign 4, 0
+ .global MOD74_021D8698
+MOD74_021D8698: ; 0x021D8698
+ .asciz "data/btower_chr.resdat"
+
+ .balign 4, 0
+ .global MOD74_021D86B0
+MOD74_021D86B0: ; 0x021D86B0
+ .asciz "data/btower_cell.resdat"
+
+ .balign 4, 0
+ .global MOD74_021D86C8
+MOD74_021D86C8: ; 0x021D86C8
+ .asciz "data/btower_canm.resdat"
+
+ .balign 4, 0
+ .global MOD74_021D86E0
+MOD74_021D86E0: ; 0x021D86E0
+ .asciz "data/btower_celact.cldat"
.bss
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index 1667166f..be189441 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -3262,18 +3262,18 @@ MOD76_021D8EDC: ; 0x021D8EDC
.global MOD76_021D8EFC
MOD76_021D8EFC: ; 0x021D8EFC
- .byte 0x00, 0x00, 0x00, 0x00, 0xD1, 0x7F, 0x1D, 0x02, 0x09, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD76_021D7FD0, MOD76_021D8008, 0x00000000
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x02, 0x00, 0x10, 0x20, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.global MOD76_021D8F1C
MOD76_021D8F1C: ; 0x021D8F1C
- .byte 0x0D, 0x86, 0x1D, 0x02
+ .word MOD76_021D860C
.global MOD76_021D8F20
MOD76_021D8F20: ; 0x021D8F20
- .byte 0x2D, 0x86, 0x1D, 0x02, 0x7D, 0x86, 0x1D, 0x02, 0x89, 0x86, 0x1D, 0x02, 0xD9, 0x86, 0x1D, 0x02
- .byte 0xE5, 0x86, 0x1D, 0x02, 0x01, 0x87, 0x1D, 0x02, 0x1D, 0x87, 0x1D, 0x02, 0x39, 0x87, 0x1D, 0x02
- .byte 0x4D, 0x87, 0x1D, 0x02
+ .word MOD76_021D862C, MOD76_021D867C, MOD76_021D8688, MOD76_021D86D8
+ .word MOD76_021D86E4, MOD76_021D8700, MOD76_021D871C, MOD76_021D8738
+ .word MOD76_021D874C
.global MOD76_021D8F44
MOD76_021D8F44: ; 0x021D8F44
diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s
index 810b818f..24356937 100644
--- a/arm9/modules/79/asm/module_79_arm.s
+++ b/arm9/modules/79/asm/module_79_arm.s
@@ -11,7 +11,7 @@ MOD79_0221248C: ; 0x0221248C
mov r6, r1
mov r5, r2
bne _022124B8
- ldr r0, _02212544 ; =0x02216858
+ ldr r0, _02212544 ; =MOD79_02216858
ldr r1, _02212548 ; =0x0221686C
ldr r3, _0221254C ; =0x000001B7
mov r2, #0
@@ -54,7 +54,7 @@ _022124D4:
add sp, sp, #4
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
-_02212544: .word 0x02216858
+_02212544: .word MOD79_02216858
_02212548: .word MOD79_0221686C
_0221254C: .word 0x000001B7
_02212550: .word MOD79_0221687C
@@ -1118,18 +1118,18 @@ MOD79_02213380: ; 0x02213380
arm_func_start MOD79_02213384
MOD79_02213384: ; 0x02213384
stmdb sp!, {r4, r5, r6, lr}
- ldr r0, _02213400 ; =0x02217138
+ ldr r0, _02213400 ; =MOD79_02217138
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _02213404 ; =MOD79_02213638
bl MOD79_02213510
- ldr r5, _02213408 ; =0x0221712C
+ ldr r5, _02213408 ; =MOD79_0221712C
mov r6, #0
ldr r0, [r5]
cmp r0, #0
ble _022133D4
- ldr r4, _02213400 ; =0x02217138
+ ldr r4, _02213400 ; =MOD79_02217138
_022133B8:
ldr r0, [r4]
ldr r0, [r0, r6, lsl #2]
@@ -1139,22 +1139,22 @@ _022133B8:
cmp r6, r0
blt _022133B8
_022133D4:
- ldr r0, _02213400 ; =0x02217138
+ ldr r0, _02213400 ; =MOD79_02217138
ldr r0, [r0]
bl MOD04_021DD82C
- ldr r2, _02213400 ; =0x02217138
+ ldr r2, _02213400 ; =MOD79_02217138
mov r3, #0
- ldr r1, _02213408 ; =0x0221712C
- ldr r0, _0221340C ; =0x02217130
+ ldr r1, _02213408 ; =MOD79_0221712C
+ ldr r0, _0221340C ; =MOD79_02217130
str r3, [r2]
str r3, [r1]
str r3, [r0]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
-_02213400: .word 0x02217138
+_02213400: .word MOD79_02217138
_02213404: .word MOD79_02213638
-_02213408: .word 0x0221712C
-_0221340C: .word 0x02217130
+_02213408: .word MOD79_0221712C
+_0221340C: .word MOD79_02217130
arm_func_end MOD79_02213384
arm_func_start MOD79_02213410
@@ -1232,19 +1232,19 @@ _0221350C: .word 0x00000133
MOD79_02213510: ; 0x02213510
stmdb sp!, {r4, r5, r6, r7, lr}
sub sp, sp, #4
- ldr r1, _02213580 ; =0x02217130
+ ldr r1, _02213580 ; =MOD79_02217130
mov r5, r0
ldr r0, [r1]
cmp r0, #0
addle sp, sp, #4
ldmleia sp!, {r4, r5, r6, r7, pc}
bl MOD79_02213378
- ldr r7, _02213584 ; =0x0221712C
+ ldr r7, _02213584 ; =MOD79_0221712C
mov r4, #0
ldr r0, [r7]
cmp r0, #0
ble _02213574
- ldr r6, _02213588 ; =0x02217138
+ ldr r6, _02213588 ; =MOD79_02217138
_0221354C:
ldr r0, [r6]
ldr r0, [r0, r4, lsl #2]
@@ -1262,9 +1262,9 @@ _02213574:
add sp, sp, #4
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
-_02213580: .word 0x02217130
-_02213584: .word 0x0221712C
-_02213588: .word 0x02217138
+_02213580: .word MOD79_02217130
+_02213584: .word MOD79_0221712C
+_02213588: .word MOD79_02217138
arm_func_end MOD79_02213510
arm_func_start MOD79_0221358C
@@ -1278,7 +1278,7 @@ MOD79_0221358C: ; 0x0221358C
mov r2, #0
bl __msl_assertion_failed
_022135AC:
- ldr r0, _02213628 ; =0x0221712C
+ ldr r0, _02213628 ; =MOD79_0221712C
ldr r0, [r0]
cmp r4, r0
blt _022135D0
@@ -1291,7 +1291,7 @@ _022135D0:
bl MOD79_02213378
cmp r4, #0
blt _022135EC
- ldr r0, _02213628 ; =0x0221712C
+ ldr r0, _02213628 ; =MOD79_0221712C
ldr r0, [r0]
cmp r4, r0
blt _022135F8
@@ -1300,7 +1300,7 @@ _022135EC:
mov r0, #0
ldmia sp!, {r4, pc}
_022135F8:
- ldr r0, _02213634 ; =0x02217138
+ ldr r0, _02213634 ; =MOD79_02217138
ldr r0, [r0]
ldr r4, [r0, r4, lsl #2]
ldr r0, [r4]
@@ -1313,10 +1313,10 @@ _022135F8:
_0221361C: .word MOD79_02216998
_02213620: .word MOD79_0221696C
_02213624: .word 0x00000101
-_02213628: .word 0x0221712C
+_02213628: .word MOD79_0221712C
_0221362C: .word MOD79_022169A8
_02213630: .word 0x00000102
-_02213634: .word 0x02217138
+_02213634: .word MOD79_02217138
arm_func_end MOD79_0221358C
arm_func_start MOD79_02213638
@@ -1339,7 +1339,7 @@ _02213658:
mov r3, #0xb4
bl __msl_assertion_failed
_02213678:
- ldr r0, _0221380C ; =0x0221712C
+ ldr r0, _0221380C ; =MOD79_0221712C
ldr r1, [r4, #4]
ldr r0, [r0]
cmp r1, r0
@@ -1370,7 +1370,7 @@ _022136C0:
cmp r1, #0
movlt r0, #0
ldmltia sp!, {r4, pc}
- ldr r0, _0221380C ; =0x0221712C
+ ldr r0, _0221380C ; =MOD79_0221712C
ldr r0, [r0]
cmp r1, r0
movge r0, #0
@@ -1436,7 +1436,7 @@ _022137D4:
str r0, [r4, #0x16c]
_022137DC:
mov r1, #0
- ldr r0, _02213818 ; =0x02217130
+ ldr r0, _02213818 ; =MOD79_02217130
str r1, [r4]
ldr r1, [r0]
sub r1, r1, #1
@@ -1448,10 +1448,10 @@ _022137DC:
_02213800: .word MOD79_02216960
_02213804: .word MOD79_0221696C
_02213808: .word MOD79_022169C4
-_0221380C: .word 0x0221712C
+_0221380C: .word MOD79_0221712C
_02213810: .word MOD79_022169E0
_02213814: .word MOD79_02216A08
-_02213818: .word 0x02217130
+_02213818: .word MOD79_02217130
arm_func_end MOD79_02213638
arm_func_start MOD79_0221381C
@@ -1469,7 +1469,7 @@ MOD79_0221381C: ; 0x0221381C
mov r0, #0
ldmia sp!, {r4, r5, pc}
_0221384C:
- ldr r0, _022139C0 ; =0x02217138
+ ldr r0, _022139C0 ; =MOD79_02217138
mov r1, #0
ldr r0, [r0]
mov r2, #0x184
@@ -1478,7 +1478,7 @@ _0221384C:
bl memset
mov r0, #1
str r0, [r4]
- ldr r0, _022139C4 ; =0x02217134
+ ldr r0, _022139C4 ; =MOD79_02217134
str r5, [r4, #4]
ldr r2, [r0]
mov ip, #0
@@ -1557,7 +1557,7 @@ _02213980:
mov r0, #0
ldmia sp!, {r4, r5, pc}
_022139A0:
- ldr r0, _022139C8 ; =0x02217130
+ ldr r0, _022139C8 ; =MOD79_02217130
ldr r1, [r0]
add r1, r1, #1
str r1, [r0]
@@ -1566,21 +1566,21 @@ _022139A0:
add sp, sp, #4
ldmia sp!, {r4, r5, pc}
.align 2, 0
-_022139C0: .word 0x02217138
-_022139C4: .word 0x02217134
-_022139C8: .word 0x02217130
+_022139C0: .word MOD79_02217138
+_022139C4: .word MOD79_02217134
+_022139C8: .word MOD79_02217130
arm_func_end MOD79_0221381C
arm_func_start MOD79_022139CC
MOD79_022139CC: ; 0x022139CC
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #4
- ldr r1, _02213AF4 ; =0x0221712C
+ ldr r1, _02213AF4 ; =MOD79_0221712C
mov r0, #0
ldr r2, [r1]
cmp r2, #0
ble _02213A10
- ldr r1, _02213AF8 ; =0x02217138
+ ldr r1, _02213AF8 ; =MOD79_02217138
ldr r3, [r1]
_022139F0:
ldr r1, [r3, r0, lsl #2]
@@ -1592,7 +1592,7 @@ _022139F0:
cmp r0, r2
blt _022139F0
_02213A10:
- ldr r0, _02213AFC ; =0x02217130
+ ldr r0, _02213AFC ; =MOD79_02217130
ldr r0, [r0]
cmp r0, r2
beq _02213A34
@@ -1602,8 +1602,8 @@ _02213A10:
mov r3, #0x33
bl __msl_assertion_failed
_02213A34:
- ldr r1, _02213AF4 ; =0x0221712C
- ldr r0, _02213AF8 ; =0x02217138
+ ldr r1, _02213AF4 ; =MOD79_0221712C
+ ldr r0, _02213AF8 ; =MOD79_02217138
ldr r7, [r1]
ldr r0, [r0]
add r6, r7, #4
@@ -1613,7 +1613,7 @@ _02213A34:
addeq sp, sp, #4
mvneq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc}
- ldr r8, _02213AF8 ; =0x02217138
+ ldr r8, _02213AF8 ; =MOD79_02217138
mov r5, r7
str r0, [r8]
cmp r7, r6
@@ -1632,7 +1632,7 @@ _02213A7C:
sub r5, r5, #1
cmp r5, r7
blt _02213AC4
- ldr r4, _02213AF8 ; =0x02217138
+ ldr r4, _02213AF8 ; =MOD79_02217138
_02213AAC:
ldr r0, [r4]
ldr r0, [r0, r5, lsl #2]
@@ -1650,15 +1650,15 @@ _02213AD0:
cmp r5, r6
blt _02213A7C
_02213AE0:
- ldr r1, _02213AF4 ; =0x0221712C
+ ldr r1, _02213AF4 ; =MOD79_0221712C
mov r0, r7
str r6, [r1]
add sp, sp, #4
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
-_02213AF4: .word 0x0221712C
-_02213AF8: .word 0x02217138
-_02213AFC: .word 0x02217130
+_02213AF4: .word MOD79_0221712C
+_02213AF8: .word MOD79_02217138
+_02213AFC: .word MOD79_02217130
_02213B00: .word MOD79_02216A1C
_02213B04: .word MOD79_0221696C
arm_func_end MOD79_022139CC
@@ -1727,7 +1727,7 @@ _02213BB0:
mvneq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
_02213BD0:
- ldr r0, _02213D7C ; =0x0221713C
+ ldr r0, _02213D7C ; =MOD79_0221713C
ldr r0, [r0]
cmp r0, #0
bne _02213BE4
@@ -1845,7 +1845,7 @@ _02213D6C: .word MOD79_02216A60
_02213D70: .word 0x00000129
_02213D74: .word MOD79_02216A70
_02213D78: .word 0x0000012A
-_02213D7C: .word 0x0221713C
+_02213D7C: .word MOD79_0221713C
arm_func_end MOD79_02213B1C
arm_func_start MOD79_02213D80
@@ -1872,18 +1872,18 @@ MOD79_02213DBC: ; 0x02213DBC
stmdb sp!, {lr}
sub sp, sp, #4
bl MOD79_02213378
- ldr r0, _02213E1C ; =0x0221713C
+ ldr r0, _02213E1C ; =MOD79_0221713C
ldr r1, [r0]
subs r1, r1, #1
str r1, [r0]
bne _02213E10
bl MOD79_02213384
- ldr r0, _02213E20 ; =0x02217128
+ ldr r0, _02213E20 ; =MOD79_02217128
ldr r0, [r0]
cmp r0, #0
beq _02213E00
bl MOD04_021DD82C
- ldr r0, _02213E20 ; =0x02217128
+ ldr r0, _02213E20 ; =MOD79_02217128
mov r1, #0
str r1, [r0]
_02213E00:
@@ -1896,8 +1896,8 @@ _02213E10:
add sp, sp, #4
ldmia sp!, {pc}
.align 2, 0
-_02213E1C: .word 0x0221713C
-_02213E20: .word 0x02217128
+_02213E1C: .word MOD79_0221713C
+_02213E20: .word MOD79_02217128
arm_func_end MOD79_02213DBC
arm_func_start MOD79_02213E24
@@ -1905,7 +1905,7 @@ MOD79_02213E24: ; 0x02213E24
stmdb sp!, {lr}
sub sp, sp, #4
bl MOD79_02213378
- ldr r0, _02213E78 ; =0x0221713C
+ ldr r0, _02213E78 ; =MOD79_0221713C
ldr r1, [r0]
add r1, r1, #1
str r1, [r0]
@@ -1925,7 +1925,7 @@ _02213E6C:
add sp, sp, #4
ldmia sp!, {pc}
.align 2, 0
-_02213E78: .word 0x0221713C
+_02213E78: .word MOD79_0221713C
_02213E7C: .word MOD79_0221695C
_02213E80: .word MOD79_02216958
arm_func_end MOD79_02213E24
@@ -3030,7 +3030,7 @@ _02214D78: .word MOD79_02216ADC
MOD79_02214D7C: ; 0x02214D7C
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #4
- ldr r1, _02214F24 ; =0x0221714C
+ ldr r1, _02214F24 ; =MOD79_0221714C
mov r8, r0
ldr r0, [r1]
ldr r7, [r8, #0x13c]
@@ -3039,12 +3039,12 @@ MOD79_02214D7C: ; 0x02214D7C
bne _02214DD4
ldr r0, _02214F28 ; =0x02216EB0
bl strlen
- ldr r5, _02214F24 ; =0x0221714C
- ldr r3, _02214F2C ; =0x02217148
+ ldr r5, _02214F24 ; =MOD79_0221714C
+ ldr r3, _02214F2C ; =MOD79_02217148
add sl, r0, #0x2f
- ldr r2, _02214F30 ; =0x02217144
+ ldr r2, _02214F30 ; =MOD79_02217144
add sb, r0, #0x4c
- ldr r1, _02214F34 ; =0x02217140
+ ldr r1, _02214F34 ; =MOD79_02217140
add r6, r0, #4
str r0, [r5]
str sl, [r3]
@@ -3067,7 +3067,7 @@ _02214DF4:
ldr r0, [sl]
cmp r0, #0
bne _02214E34
- ldr r0, _02214F2C ; =0x02217148
+ ldr r0, _02214F2C ; =MOD79_02217148
ldr r1, [r0]
ldr r0, [sl, #4]
add r4, r4, r1
@@ -3079,7 +3079,7 @@ _02214DF4:
_02214E34:
cmp r0, #1
bne _02214EA0
- ldr r0, _02214F30 ; =0x02217144
+ ldr r0, _02214F30 ; =MOD79_02217144
ldr r1, [r0]
ldr r0, [sl, #4]
add r4, r4, r1
@@ -3108,7 +3108,7 @@ _02214E94:
_02214EA0:
cmp r0, #2
bne _02214EE4
- ldr r0, _02214F30 ; =0x02217144
+ ldr r0, _02214F30 ; =MOD79_02217144
ldr r1, [r0]
ldr r0, [sl, #4]
add r4, r4, r1
@@ -3137,17 +3137,17 @@ _02214F04:
cmp r6, r5
blt _02214DF4
_02214F10:
- ldr r0, _02214F34 ; =0x02217140
+ ldr r0, _02214F34 ; =MOD79_02217140
ldr r0, [r0]
add r0, r4, r0
add sp, sp, #4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
-_02214F24: .word 0x0221714C
+_02214F24: .word MOD79_0221714C
_02214F28: .word MOD79_02216EB0
-_02214F2C: .word 0x02217148
-_02214F30: .word 0x02217144
-_02214F34: .word 0x02217140
+_02214F2C: .word MOD79_02217148
+_02214F30: .word MOD79_02217144
+_02214F34: .word MOD79_02217140
_02214F38: .word MOD79_02216ED8
_02214F3C: .word MOD79_02216ADC
_02214F40: .word MOD79_02216D4C
@@ -3438,7 +3438,7 @@ _022152DC:
cmp r0, #0
beq _02215448
add r4, r0, #9
- ldr r1, _0221562C ; =0x0210430C
+ ldr r1, _0221562C ; =UNK_0210430C
mov r2, #0
b _02215330
_0221532C:
@@ -3460,7 +3460,7 @@ _02215358:
cmp r0, #0
bne _0221532C
mov r3, r4
- ldr r1, _0221562C ; =0x0210430C
+ ldr r1, _0221562C ; =UNK_0210430C
mov r2, #0
b _02215374
_02215370:
@@ -3655,7 +3655,7 @@ _0221561C: .word MOD79_02216F64
_02215620: .word MOD79_02216F6C
_02215624: .word 0x51EB851F
_02215628: .word MOD79_02216F70
-_0221562C: .word 0x0210430C
+_0221562C: .word UNK_0210430C
_02215630: .word MOD79_02216F7C
_02215634: .word MOD79_02216F8C
_02215638: .word MOD79_0221673C
@@ -4101,7 +4101,7 @@ _02215C1C:
bl sscanf
mov r3, #0
mov ip, #1
- ldr r2, _02215D24 ; =0x0210430C
+ ldr r2, _02215D24 ; =UNK_0210430C
b _02215C5C
_02215C50:
ldr r1, [sp, #0x14]
@@ -4163,7 +4163,7 @@ _02215D14: .word 0x0000024E
_02215D18: .word MOD79_02217000
_02215D1C: .word 0x0000024F
_02215D20: .word MOD79_02217020
-_02215D24: .word 0x0210430C
+_02215D24: .word UNK_0210430C
arm_func_end MOD79_02215BD8
arm_func_start MOD79_02215D28
@@ -4274,7 +4274,7 @@ _02215E7C:
ldr r0, [r5, #0x15c]
cmp r0, #0
bne _02215EA4
- ldr r0, _0221608C ; =0x02217128
+ ldr r0, _0221608C ; =MOD79_02217128
ldr r0, [r0]
cmp r0, #0
beq _02215EB8
@@ -4413,7 +4413,7 @@ _02216020:
_02216080: .word MOD79_0221705C
_02216084: .word MOD79_02217064
_02216088: .word MOD79_0221706C
-_0221608C: .word 0x02217128
+_0221608C: .word MOD79_02217128
_02216090: .word MOD79_02217074
_02216094: .word MOD79_02217080
_02216098: .word MOD79_02217088
@@ -4593,11 +4593,11 @@ _022162D0:
strh r0, [sp, #2]
b _02216368
_02216318:
- ldr r0, _02216470 ; =0x02217128
+ ldr r0, _02216470 ; =MOD79_02217128
ldr r0, [r0]
cmp r0, #0
beq _0221634C
- ldr r0, _02216474 ; =0x02217124
+ ldr r0, _02216474 ; =MOD79_02217124
ldrh r0, [r0]
mov r1, r0, asr #8
mov r0, r0, lsl #8
@@ -4685,8 +4685,8 @@ _0221643C:
ldmia sp!, {r4, pc}
.align 2, 0
_0221646C: .word MOD79_0221695C
-_02216470: .word 0x02217128
-_02216474: .word 0x02217124
+_02216470: .word MOD79_02217128
+_02216474: .word MOD79_02217124
arm_func_end MOD79_0221621C
arm_func_start MOD79_02216478
@@ -4710,7 +4710,7 @@ MOD79_02216478: ; 0x02216478
ldr r5, [r4, #0x15c]
cmp r5, #0
bne _022164D4
- ldr r0, _02216544 ; =0x02217128
+ ldr r0, _02216544 ; =MOD79_02217128
ldr r5, [r0]
cmp r5, #0
ldreq r5, [r4, #0x18]
@@ -4745,7 +4745,7 @@ _02216524:
add sp, sp, #4
ldmia sp!, {r4, r5, pc}
.align 2, 0
-_02216544: .word 0x02217128
+_02216544: .word MOD79_02217128
arm_func_end MOD79_02216478
arm_func_start MOD79_02216548
diff --git a/arm9/modules/79/asm/module_79_thumb.s b/arm9/modules/79/asm/module_79_thumb.s
index 6d9f33fe..fc4b1dd6 100644
--- a/arm9/modules/79/asm/module_79_thumb.s
+++ b/arm9/modules/79/asm/module_79_thumb.s
@@ -897,11 +897,58 @@ MOD79_02216834: ; 0x02216834
.global MOD79_0221684C
MOD79_0221684C: ; 0x0221684C
- .byte 0x25, 0x73, 0x3F, 0x70, 0x69, 0x64, 0x3D, 0x25, 0x64, 0x00, 0x00, 0x00, 0x62, 0x75, 0x66, 0x66
- .byte 0x65, 0x72, 0x49, 0x6E, 0x20, 0x21, 0x3D, 0x20, 0x4E, 0x55, 0x4C, 0x4C, 0x00, 0x00, 0x00, 0x00
+ .asciz "%s?pid=%d"
+
+ .balign 4, 0
+ .global MOD79_02216858
+MOD79_02216858: ; 0x02216858
+ .asciz "bufferIn != NULL"
.bss
.global MOD79_02217120
MOD79_02217120: ; 0x02217120
- .space 0x40
+ .space 0x04
+
+ .global MOD79_02217124
+MOD79_02217124: ; 0x02217124
+ .space 0x04
+
+ .global MOD79_02217128
+MOD79_02217128: ; 0x02217128
+ .space 0x04
+
+ .global MOD79_0221712C
+MOD79_0221712C: ; 0x0221712C
+ .space 0x04
+
+ .global MOD79_02217130
+MOD79_02217130: ; 0x02217130
+ .space 0x04
+
+ .global MOD79_02217134
+MOD79_02217134: ; 0x02217134
+ .space 0x04
+
+ .global MOD79_02217138
+MOD79_02217138: ; 0x02217138
+ .space 0x04
+
+ .global MOD79_0221713C
+MOD79_0221713C: ; 0x0221713C
+ .space 0x04
+
+ .global MOD79_02217140
+MOD79_02217140: ; 0x02217140
+ .space 0x04
+
+ .global MOD79_02217144
+MOD79_02217144: ; 0x02217144
+ .space 0x04
+
+ .global MOD79_02217148
+MOD79_02217148: ; 0x02217148
+ .space 0x04
+ .global MOD79_0221714C
+MOD79_0221714C: ; 0x0221714C
+ .space 0x14
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index f1234b9a..a8c9541d 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -19597,7 +19597,7 @@ MOD80_022375E4: ; 0x022375E4
.global MOD80_022375F0
MOD80_022375F0: ; 0x022375F0
- .byte 0x41, 0x7E, 0x23, 0x02, 0x65, 0x80, 0x23, 0x02, 0x05, 0x80, 0x23, 0x02, 0x51, 0x00, 0x00, 0x00
+ .word MOD81_02237E40, MOD81_02238064, MOD81_02238004, 0x00000051
.global MOD80_02237600
MOD80_02237600: ; 0x02237600
@@ -19703,28 +19703,28 @@ MOD80_02237938: ; 0x02237938
.global MOD80_02237984
MOD80_02237984: ; 0x02237984
- .byte 0x85, 0x62, 0x23, 0x02
+ .word MOD80_02236284
.global MOD80_02237988
MOD80_02237988: ; 0x02237988
- .byte 0x31, 0x63, 0x23, 0x02
+ .word MOD80_02236330
.global MOD80_0223798C
MOD80_0223798C: ; 0x0223798C
- .byte 0x51, 0x63, 0x23, 0x02, 0xF5, 0xE8, 0x22, 0x02, 0xB9, 0xE9, 0x22, 0x02, 0xD9, 0xE9, 0x22, 0x02
- .byte 0x95, 0xF3, 0x22, 0x02, 0x5D, 0xF4, 0x22, 0x02, 0x71, 0xF4, 0x22, 0x02, 0x61, 0xFE, 0x22, 0x02
- .byte 0x35, 0xFF, 0x22, 0x02, 0x49, 0xFF, 0x22, 0x02, 0x5D, 0x06, 0x23, 0x02, 0x29, 0x07, 0x23, 0x02
- .byte 0x3D, 0x07, 0x23, 0x02, 0xF1, 0x19, 0x23, 0x02, 0x65, 0x1A, 0x23, 0x02, 0x85, 0x1A, 0x23, 0x02
- .byte 0x19, 0x32, 0x23, 0x02, 0xA9, 0x32, 0x23, 0x02, 0xC9, 0x32, 0x23, 0x02, 0xFD, 0x46, 0x23, 0x02
- .byte 0x41, 0x47, 0x23, 0x02, 0x61, 0x47, 0x23, 0x02, 0x35, 0x5D, 0x23, 0x02, 0xD5, 0x5D, 0x23, 0x02
- .byte 0xFD, 0x5D, 0x23, 0x02, 0x09, 0x5E, 0x23, 0x02, 0xBD, 0x5F, 0x23, 0x02, 0x89, 0x61, 0x23, 0x02
+ .word MOD80_02236350, MOD80_0222E8F4, MOD80_0222E9B8, MOD80_0222E9D8
+ .word MOD80_0222F394, MOD80_0222F45C, MOD80_0222F470, MOD80_0222FE60
+ .word MOD80_0222FF34, MOD80_0222FF48, MOD80_0223065C, MOD80_02230728
+ .word MOD80_0223073C, MOD80_022319F0, MOD80_02231A64, MOD80_02231A84
+ .word MOD80_02233218, MOD80_022332A8, MOD80_022332C8, MOD80_022346FC
+ .word MOD80_02234740, MOD80_02234760, MOD80_02235D34, MOD80_02235DD4
+ .word MOD80_02235DFC, MOD80_02235E08, MOD80_02235FBC, MOD80_02236188
.global MOD80_022379FC
MOD80_022379FC: ; 0x022379FC
- .byte 0x25, 0xEE, 0x22, 0x02, 0x65, 0xEE, 0x22, 0x02, 0x75, 0xEE, 0x22, 0x02, 0x99, 0xEE, 0x22, 0x02
- .byte 0xAD, 0xEE, 0x22, 0x02, 0xC1, 0xEE, 0x22, 0x02, 0xFD, 0xEE, 0x22, 0x02, 0xA9, 0xF0, 0x22, 0x02
- .byte 0xD1, 0xF0, 0x22, 0x02, 0xE5, 0xF0, 0x22, 0x02, 0xB9, 0xF1, 0x22, 0x02, 0xD9, 0xF1, 0x22, 0x02
- .byte 0x2D, 0xF1, 0x22, 0x02, 0x4D, 0xF1, 0x22, 0x02
+ .word MOD80_0222EE24, MOD80_0222EE64, MOD80_0222EE74, MOD80_0222EE98
+ .word MOD80_0222EEAC, MOD80_0222EEC0, MOD80_0222EEFC, MOD80_0222F0A8
+ .word MOD80_0222F0D0, MOD80_0222F0E4, MOD80_0222F1B8, MOD80_0222F1D8
+ .word MOD80_0222F12C, MOD80_0222F14C
.global MOD80_02237A34
MOD80_02237A34: ; 0x02237A34
@@ -19732,14 +19732,14 @@ MOD80_02237A34: ; 0x02237A34
.global MOD80_02237A40
MOD80_02237A40: ; 0x02237A40
- .byte 0x65, 0xF8, 0x22, 0x02, 0x6D, 0xF8, 0x22, 0x02, 0xCD, 0xF8, 0x22, 0x02, 0xE9, 0xFA, 0x22, 0x02
- .byte 0x09, 0xFB, 0x22, 0x02, 0xF5, 0xF8, 0x22, 0x02, 0x19, 0xF9, 0x22, 0x02, 0x6D, 0xF9, 0x22, 0x02
- .byte 0x05, 0xFA, 0x22, 0x02
+ .word MOD80_0222F864, MOD80_0222F86C, MOD80_0222F8CC, MOD80_0222FAE8
+ .word MOD80_0222FB08, MOD80_0222F8F4, MOD80_0222F918, MOD80_0222F96C
+ .word MOD80_0222FA04
.global MOD80_02237A64
MOD80_02237A64: ; 0x02237A64
- .byte 0xF1, 0x02, 0x23, 0x02, 0xF9, 0x02, 0x23, 0x02, 0x95, 0x03, 0x23, 0x02, 0xD9, 0x04, 0x23, 0x02
- .byte 0xD9, 0x03, 0x23, 0x02, 0xF9, 0x03, 0x23, 0x02, 0xC9, 0x04, 0x23, 0x02
+ .word MOD80_022302F0, MOD80_022302F8, MOD80_02230394, MOD80_022304D8
+ .word MOD80_022303D8, MOD80_022303F8, MOD80_022304C8
.global MOD80_02237A80
MOD80_02237A80: ; 0x02237A80
@@ -19752,21 +19752,21 @@ MOD80_02237A82: ; 0x02237A82
.global MOD80_02237A94
MOD80_02237A94: ; 0x02237A94
- .byte 0x6D, 0x0B, 0x23, 0x02, 0x95, 0x0B, 0x23, 0x02, 0x15, 0x11, 0x23, 0x02, 0x3D, 0x11, 0x23, 0x02
- .byte 0xC9, 0x11, 0x23, 0x02, 0x01, 0x12, 0x23, 0x02, 0xCD, 0x12, 0x23, 0x02, 0x1D, 0x13, 0x23, 0x02
- .byte 0x91, 0x14, 0x23, 0x02, 0xED, 0x14, 0x23, 0x02, 0x25, 0x15, 0x23, 0x02, 0x15, 0x16, 0x23, 0x02
- .byte 0x71, 0x16, 0x23, 0x02, 0xA9, 0x16, 0x23, 0x02, 0xC9, 0x0C, 0x23, 0x02, 0xB9, 0x0D, 0x23, 0x02
- .byte 0x15, 0x0E, 0x23, 0x02, 0x9D, 0x0E, 0x23, 0x02, 0xFD, 0x0E, 0x23, 0x02, 0x3D, 0x0F, 0x23, 0x02
- .byte 0x29, 0x18, 0x23, 0x02, 0x49, 0x18, 0x23, 0x02, 0x91, 0x17, 0x23, 0x02, 0xB5, 0x17, 0x23, 0x02
- .byte 0xF9, 0x17, 0x23, 0x02, 0x01, 0x18, 0x23, 0x02, 0x79, 0x0F, 0x23, 0x02, 0xB5, 0x0F, 0x23, 0x02
+ .word MOD80_02230B6C, MOD80_02230B94, MOD80_02231114, MOD80_0223113C
+ .word MOD80_022311C8, MOD80_02231200, MOD80_022312CC, MOD80_0223131C
+ .word MOD80_02231490, MOD80_022314EC, MOD80_02231524, MOD80_02231614
+ .word MOD80_02231670, MOD80_022316A8, MOD80_02230CC8, MOD80_02230DB8
+ .word MOD80_02230E14, MOD80_02230E9C, MOD80_02230EFC, MOD80_02230F3C
+ .word MOD80_02231828, MOD80_02231848, MOD80_02231790, MOD80_022317B4
+ .word MOD80_022317F8, MOD80_02231800, MOD80_02230F78, MOD80_02230FB4
.global MOD80_02237B04
MOD80_02237B04: ; 0x02237B04
- .byte 0x29, 0x21, 0x23, 0x02, 0x3D, 0x21, 0x23, 0x02, 0x4D, 0x28, 0x23, 0x02, 0xE9, 0x2A, 0x23, 0x02
- .byte 0x09, 0x2B, 0x23, 0x02, 0xA5, 0x28, 0x23, 0x02, 0xC9, 0x28, 0x23, 0x02, 0x71, 0x24, 0x23, 0x02
- .byte 0x19, 0x25, 0x23, 0x02, 0x71, 0x26, 0x23, 0x02, 0x19, 0x27, 0x23, 0x02, 0x01, 0x29, 0x23, 0x02
- .byte 0x2D, 0x29, 0x23, 0x02, 0x51, 0x29, 0x23, 0x02, 0x35, 0x2A, 0x23, 0x02, 0x61, 0x2A, 0x23, 0x02
- .byte 0x85, 0x2A, 0x23, 0x02
+ .word MOD80_02232128, MOD80_0223213C, MOD80_0223284C, MOD80_02232AE8
+ .word MOD80_02232B08, MOD80_022328A4, MOD80_022328C8, MOD80_02232470
+ .word MOD80_02232518, MOD80_02232670, MOD80_02232718, MOD80_02232900
+ .word MOD80_0223292C, MOD80_02232950, MOD80_02232A34, MOD80_02232A60
+ .word MOD80_02232A84
.global MOD80_02237B48
MOD80_02237B48: ; 0x02237B48
@@ -19784,35 +19784,35 @@ MOD80_02237B64: ; 0x02237B64
.global MOD80_02237B84
MOD80_02237B84: ; 0x02237B84
- .byte 0xC5, 0x36, 0x23, 0x02, 0xF9, 0x36, 0x23, 0x02, 0x31, 0x3E, 0x23, 0x02, 0x85, 0x37, 0x23, 0x02
- .byte 0xBD, 0x37, 0x23, 0x02, 0x91, 0x38, 0x23, 0x02, 0x0D, 0x39, 0x23, 0x02, 0x6D, 0x3A, 0x23, 0x02
- .byte 0xC9, 0x3A, 0x23, 0x02, 0x01, 0x3B, 0x23, 0x02, 0xE9, 0x3B, 0x23, 0x02, 0x45, 0x3C, 0x23, 0x02
- .byte 0x7D, 0x3C, 0x23, 0x02, 0x8D, 0x3D, 0x23, 0x02, 0xB5, 0x3D, 0x23, 0x02, 0xD9, 0x3D, 0x23, 0x02
- .byte 0x85, 0x3E, 0x23, 0x02
+ .word MOD80_022336C4, MOD80_022336F8, MOD80_02233E30, MOD80_02233784
+ .word MOD80_022337BC, MOD80_02233890, MOD80_0223390C, MOD80_02233A6C
+ .word MOD80_02233AC8, MOD80_02233B00, MOD80_02233BE8, MOD80_02233C44
+ .word MOD80_02233C7C, MOD80_02233D8C, MOD80_02233DB4, MOD80_02233DD8
+ .word MOD80_02233E84
.global MOD80_02237BC8
MOD80_02237BC8: ; 0x02237BC8
- .byte 0xCD, 0x49, 0x23, 0x02, 0xCD, 0x51, 0x23, 0x02, 0xC1, 0x4A, 0x23, 0x02, 0xE5, 0x4A, 0x23, 0x02
- .byte 0x61, 0x4B, 0x23, 0x02, 0x75, 0x4B, 0x23, 0x02, 0xD1, 0x51, 0x23, 0x02, 0xD9, 0x4B, 0x23, 0x02
- .byte 0xF5, 0x4B, 0x23, 0x02, 0x8D, 0x4C, 0x23, 0x02, 0x9D, 0x4C, 0x23, 0x02, 0xE9, 0x51, 0x23, 0x02
- .byte 0xFD, 0x4C, 0x23, 0x02, 0x3D, 0x4D, 0x23, 0x02, 0xF9, 0x4D, 0x23, 0x02, 0x09, 0x4E, 0x23, 0x02
- .byte 0x01, 0x52, 0x23, 0x02, 0xAD, 0x52, 0x23, 0x02, 0xF1, 0x50, 0x23, 0x02, 0x59, 0x51, 0x23, 0x02
- .byte 0x69, 0x51, 0x23, 0x02, 0x15, 0x52, 0x23, 0x02, 0x2D, 0x52, 0x23, 0x02, 0x3D, 0x52, 0x23, 0x02
- .byte 0x69, 0x4E, 0x23, 0x02, 0x7D, 0x4E, 0x23, 0x02, 0x2D, 0x50, 0x23, 0x02, 0x41, 0x50, 0x23, 0x02
- .byte 0x19, 0x50, 0x23, 0x02, 0x99, 0x53, 0x23, 0x02, 0xB5, 0x53, 0x23, 0x02, 0xF5, 0x53, 0x23, 0x02
- .byte 0x11, 0x54, 0x23, 0x02, 0x31, 0x54, 0x23, 0x02, 0x55, 0x54, 0x23, 0x02, 0x71, 0x54, 0x23, 0x02
- .byte 0xBD, 0x54, 0x23, 0x02, 0x15, 0x55, 0x23, 0x02, 0x49, 0x53, 0x23, 0x02, 0x71, 0x53, 0x23, 0x02
+ .word MOD80_022349CC, MOD80_022351CC, MOD80_02234AC0, MOD80_02234AE4
+ .word MOD80_02234B60, MOD80_02234B74, MOD80_022351D0, MOD80_02234BD8
+ .word MOD80_02234BF4, MOD80_02234C8C, MOD80_02234C9C, MOD80_022351E8
+ .word MOD80_02234CFC, MOD80_02234D3C, MOD80_02234DF8, MOD80_02234E08
+ .word MOD80_02235200, MOD80_022352AC, MOD80_022350F0, MOD80_02235158
+ .word MOD80_02235168, MOD80_02235214, MOD80_0223522C, MOD80_0223523C
+ .word MOD80_02234E68, MOD80_02234E7C, MOD80_0223502C, MOD80_02235040
+ .word MOD80_02235018, MOD80_02235398, MOD80_022353B4, MOD80_022353F4
+ .word MOD80_02235410, MOD80_02235430, MOD80_02235454, MOD80_02235470
+ .word MOD80_022354BC, MOD80_02235514, MOD80_02235348, MOD80_02235370
.global MOD80_02237C68
MOD80_02237C68: ; 0x02237C68
- .byte 0xC5, 0x66, 0x23, 0x02, 0xFD, 0x66, 0x23, 0x02, 0x71, 0x68, 0x23, 0x02, 0x91, 0x68, 0x23, 0x02
- .byte 0xFD, 0x68, 0x23, 0x02, 0x11, 0x69, 0x23, 0x02, 0xA9, 0x69, 0x23, 0x02, 0xF1, 0x69, 0x23, 0x02
- .byte 0x01, 0x6A, 0x23, 0x02, 0xDD, 0x6A, 0x23, 0x02, 0xE9, 0x6B, 0x23, 0x02, 0x3D, 0x6C, 0x23, 0x02
- .byte 0x19, 0x6B, 0x23, 0x02, 0x65, 0x67, 0x23, 0x02, 0x95, 0x67, 0x23, 0x02, 0xF9, 0x67, 0x23, 0x02
- .byte 0x25, 0x68, 0x23, 0x02, 0x45, 0x68, 0x23, 0x02, 0x09, 0x6C, 0x23, 0x02, 0x51, 0x6B, 0x23, 0x02
- .byte 0xC9, 0x6B, 0x23, 0x02, 0x8D, 0x6A, 0x23, 0x02, 0xAD, 0x6A, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word MOD80_022366C4, MOD80_022366FC, MOD80_02236870, MOD80_02236890
+ .word MOD80_022368FC, MOD80_02236910, MOD80_022369A8, MOD80_022369F0
+ .word MOD80_02236A00, MOD80_02236ADC, MOD80_02236BE8, MOD80_02236C3C
+ .word MOD80_02236B18, MOD80_02236764, MOD80_02236794, MOD80_022367F8
+ .word MOD80_02236824, MOD80_02236844, MOD80_02236C08, MOD80_02236B50
+ .word MOD80_02236BC8, MOD80_02236A8C, MOD80_02236AAC, 0x00000000
+ .word 0x00000000, 0x00000000, 0x00000000, 0x00000000
+ .word 0x00000000, 0x00000000
.bss
.global MOD80_02237CE0
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 33b046b7..8057d633 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -316,10 +316,10 @@ _022380E0:
mov r0, #1
pop {r4, r5, r6, pc}
.align 2, 0
-_022380E4: .word MOD81_0223CF90
+_022380E4: .word MOD81_0223CF84 + 0xC
_022380E8: .word MOD81_0223CF84
-_022380EC: .word MOD81_0223CF88
-_022380F0: .word MOD81_0223CF8C
+_022380EC: .word MOD81_0223CF84 + 4
+_022380F0: .word MOD81_0223CF84 + 8
thumb_func_end MOD81_02238064
thumb_func_start MOD81_022380F4
@@ -10351,25 +10351,13 @@ MOD81_0223CF74: ; 0x0223CF74
.global MOD81_0223CF84
MOD81_0223CF84: ; 0x0223CF84
- .byte 0x19, 0x8D, 0x23, 0x02
-
- .global MOD81_0223CF88
-MOD81_0223CF88: ; 0x0223CF88
- .byte 0xC5, 0x8D, 0x23, 0x02
-
- .global MOD81_0223CF8C
-MOD81_0223CF8C: ; 0x0223CF8C
- .byte 0x65, 0x8D, 0x23, 0x02
-
- .global MOD81_0223CF90
-MOD81_0223CF90: ; 0x0223CF90
- .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x96, 0x23, 0x02, 0xA9, 0x97, 0x23, 0x02, 0x55, 0x97, 0x23, 0x02
- .byte 0x03, 0x00, 0x00, 0x00, 0x99, 0xA8, 0x23, 0x02, 0xF9, 0xA8, 0x23, 0x02, 0xC9, 0xA8, 0x23, 0x02
- .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0xB0, 0x23, 0x02, 0x21, 0xB1, 0x23, 0x02, 0x0D, 0xB1, 0x23, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0xE9, 0xB4, 0x23, 0x02, 0x55, 0xB5, 0x23, 0x02, 0x25, 0xB5, 0x23, 0x02
- .byte 0x05, 0x00, 0x00, 0x00, 0x19, 0xBD, 0x23, 0x02, 0x85, 0xBD, 0x23, 0x02, 0x4D, 0xBD, 0x23, 0x02
- .byte 0x05, 0x00, 0x00, 0x00, 0x31, 0xC5, 0x23, 0x02, 0xD5, 0xC5, 0x23, 0x02, 0x81, 0xC5, 0x23, 0x02
- .byte 0x05, 0x00, 0x00, 0x00
+ .word MOD81_02238D18, MOD81_02238DC4, MOD81_02238D64, 0x00000003
+ .word MOD81_022396E8, MOD81_022397A8, MOD81_02239754, 0x00000003
+ .word MOD81_0223A898, MOD81_0223A8F8, MOD81_0223A8C8, 0x00000003
+ .word MOD81_0223B0E8, MOD81_0223B120, MOD81_0223B10C, 0x00000001
+ .word MOD81_0223B4E8, MOD81_0223B554, MOD81_0223B524, 0x00000005
+ .word MOD81_0223BD18, MOD81_0223BD84, MOD81_0223BD4C, 0x00000005
+ .word MOD81_0223C530, MOD81_0223C5D4, MOD81_0223C580, 0x00000005
.global MOD81_0223CFF4
MOD81_0223CFF4: ; 0x0223CFF4
@@ -10377,7 +10365,7 @@ MOD81_0223CFF4: ; 0x0223CFF4
.global MOD81_0223CFFC
MOD81_0223CFFC: ; 0x0223CFFC
- .byte 0x45, 0x8E, 0x23, 0x02, 0x69, 0x90, 0x23, 0x02, 0x95, 0x90, 0x23, 0x02, 0xF5, 0x91, 0x23, 0x02
+ .word MOD81_02238E44, MOD81_02239068, MOD81_02239094, MOD81_022391F4
.global MOD81_0223D00C
MOD81_0223D00C: ; 0x0223D00C
@@ -10409,7 +10397,7 @@ MOD81_0223D084: ; 0x0223D084
.global MOD81_0223D094
MOD81_0223D094: ; 0x0223D094
- .byte 0x05, 0x98, 0x23, 0x02, 0x39, 0x98, 0x23, 0x02, 0x81, 0x98, 0x23, 0x02, 0x2D, 0x99, 0x23, 0x02
+ .word MOD81_02239804, MOD81_02239838, MOD81_02239880, MOD81_0223992C
.global MOD81_0223D0A4
MOD81_0223D0A4: ; 0x0223D0A4
@@ -10433,7 +10421,7 @@ MOD81_0223D0EC: ; 0x0223D0EC
.global MOD81_0223D114
MOD81_0223D114: ; 0x0223D114
- .byte 0x51, 0xA9, 0x23, 0x02, 0x99, 0xA9, 0x23, 0x02
+ .word MOD81_0223A950, MOD81_0223A998
.global MOD81_0223D11C
MOD81_0223D11C: ; 0x0223D11C
@@ -10456,7 +10444,7 @@ MOD81_0223D158: ; 0x0223D158
.global MOD81_0223D180
MOD81_0223D180: ; 0x0223D180
- .byte 0x51, 0xB1, 0x23, 0x02, 0x79, 0xB1, 0x23, 0x02
+ .word MOD81_0223B150, MOD81_0223B178
.global MOD81_0223D188
MOD81_0223D188: ; 0x0223D188
@@ -10485,7 +10473,7 @@ MOD81_0223D1EC: ; 0x0223D1EC
.global MOD81_0223D214
MOD81_0223D214: ; 0x0223D214
- .byte 0x85, 0xB5, 0x23, 0x02, 0xBD, 0xB5, 0x23, 0x02
+ .word MOD81_0223B584, MOD81_0223B5BC
.global MOD81_0223D21C
MOD81_0223D21C: ; 0x0223D21C
@@ -10512,7 +10500,7 @@ MOD81_0223D280: ; 0x0223D280
.global MOD81_0223D288
MOD81_0223D288: ; 0x0223D288
- .byte 0xF1, 0xBD, 0x23, 0x02, 0x21, 0xBE, 0x23, 0x02, 0xF1, 0xBE, 0x23, 0x02
+ .word MOD81_0223BDF0, MOD81_0223BE20, MOD81_0223BEF0
.global MOD81_0223D294
MOD81_0223D294: ; 0x0223D294
@@ -10544,7 +10532,7 @@ MOD81_0223D314: ; 0x0223D314
.global MOD81_0223D31C
MOD81_0223D31C: ; 0x0223D31C
- .byte 0x59, 0xC6, 0x23, 0x02, 0x29, 0xC8, 0x23, 0x02, 0x55, 0xC8, 0x23, 0x02, 0x21, 0xC9, 0x23, 0x02
+ .word MOD81_0223C658, MOD81_0223C828, MOD81_0223C854, MOD81_0223C920
.global MOD81_0223D32C
MOD81_0223D32C: ; 0x0223D32C
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index b2a8f127..0d510f44 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -4520,33 +4520,33 @@ MOD82_0222F9C4: ; 0x0222F9C4
.global MOD82_0222FA0C
MOD82_0222FA0C: ; 0x0222FA0C
- .byte 0x51, 0xE0, 0x22, 0x02
+ .word MOD82_0222E050
.global MOD82_0222FA10
MOD82_0222FA10: ; 0x0222FA10
- .byte 0x19, 0xE1, 0x22, 0x02
+ .word MOD82_0222E118
.global MOD82_0222FA14
MOD82_0222FA14: ; 0x0222FA14
- .byte 0x39, 0xE1, 0x22, 0x02
+ .word MOD82_0222E138
.global MOD82_0222FA18
MOD82_0222FA18: ; 0x0222FA18
- .byte 0x45, 0xE5, 0x22, 0x02, 0x75, 0xE5, 0x22, 0x02, 0x5D, 0xE6, 0x22, 0x02, 0x7D, 0xE6, 0x22, 0x02
- .byte 0xF5, 0xE6, 0x22, 0x02, 0x09, 0xE7, 0x22, 0x02, 0xA9, 0xE7, 0x22, 0x02, 0xE9, 0xE7, 0x22, 0x02
- .byte 0xF9, 0xE7, 0x22, 0x02, 0xB1, 0xE8, 0x22, 0x02, 0xC9, 0xE8, 0x22, 0x02, 0x59, 0xE9, 0x22, 0x02
- .byte 0x89, 0xE9, 0x22, 0x02, 0xCD, 0xE9, 0x22, 0x02, 0xA5, 0xEA, 0x22, 0x02, 0x41, 0xEB, 0x22, 0x02
- .byte 0x61, 0xEB, 0x22, 0x02, 0x4D, 0xEC, 0x22, 0x02, 0x11, 0xEB, 0x22, 0x02, 0x11, 0xF2, 0x22, 0x02
- .byte 0x41, 0xF2, 0x22, 0x02, 0x75, 0xF2, 0x22, 0x02, 0xA5, 0xF2, 0x22, 0x02, 0x89, 0xEC, 0x22, 0x02
- .byte 0xBD, 0xEC, 0x22, 0x02, 0x01, 0xED, 0x22, 0x02, 0xBD, 0xED, 0x22, 0x02, 0xF9, 0xED, 0x22, 0x02
- .byte 0x29, 0xEE, 0x22, 0x02, 0x75, 0xEE, 0x22, 0x02, 0x25, 0xEF, 0x22, 0x02, 0x55, 0xEF, 0x22, 0x02
- .byte 0x9D, 0xEF, 0x22, 0x02, 0x49, 0xF0, 0x22, 0x02, 0xA9, 0xF0, 0x22, 0x02, 0xC9, 0xF0, 0x22, 0x02
- .byte 0x95, 0xF1, 0x22, 0x02, 0xD9, 0xF1, 0x22, 0x02, 0xF1, 0xF1, 0x22, 0x02, 0xD9, 0xF2, 0x22, 0x02
- .byte 0x09, 0xF3, 0x22, 0x02, 0x25, 0xF3, 0x22, 0x02, 0x5D, 0xF3, 0x22, 0x02, 0xD1, 0xF1, 0x22, 0x02
- .byte 0x61, 0xF3, 0x22, 0x02, 0x51, 0xF4, 0x22, 0x02, 0xA5, 0xF4, 0x22, 0x02, 0x71, 0xF4, 0x22, 0x02
- .byte 0x91, 0xF3, 0x22, 0x02, 0xD9, 0xE5, 0x22, 0x02, 0x05, 0xE6, 0x22, 0x02, 0xBD, 0xF3, 0x22, 0x02
- .byte 0x31, 0xF4, 0x22, 0x02, 0x49, 0xF5, 0x22, 0x02, 0x71, 0xF5, 0x22, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .word MOD82_0222E544, MOD82_0222E574, MOD82_0222E65C, MOD82_0222E67C
+ .word MOD82_0222E6F4, MOD82_0222E708, MOD82_0222E7A8, MOD82_0222E7E8
+ .word MOD82_0222E7F8, MOD82_0222E8B0, MOD82_0222E8C8, MOD82_0222E958
+ .word MOD82_0222E988, MOD82_0222E9CC, MOD82_0222EAA4, MOD82_0222EB40
+ .word MOD82_0222EB60, MOD82_0222EC4C, MOD82_0222EB10, MOD82_0222F210
+ .word MOD82_0222F240, MOD82_0222F274, MOD82_0222F2A4, MOD82_0222EC88
+ .word MOD82_0222ECBC, MOD82_0222ED00, MOD82_0222EDBC, MOD82_0222EDF8
+ .word MOD82_0222EE28, MOD82_0222EE74, MOD82_0222EF24, MOD82_0222EF54
+ .word MOD82_0222EF9C, MOD82_0222F048, MOD82_0222F0A8, MOD82_0222F0C8
+ .word MOD82_0222F194, MOD82_0222F1D8, MOD82_0222F1F0, MOD82_0222F2D8
+ .word MOD82_0222F308, MOD82_0222F324, MOD82_0222F35C, MOD82_0222F1D0
+ .word MOD82_0222F360, MOD82_0222F450, MOD82_0222F4A4, MOD82_0222F470
+ .word MOD82_0222F390, MOD82_0222E5D8, MOD82_0222E604, MOD82_0222F3BC
+ .word MOD82_0222F430, MOD82_0222F548, MOD82_0222F570, 0x00000000
+ .word 0x00000000, 0x00000000
.bss
.global MOD82_0222FB00
diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s
index d3ee54a2..76c469d4 100644
--- a/arm9/modules/85/asm/module_85.s
+++ b/arm9/modules/85/asm/module_85.s
@@ -16199,54 +16199,106 @@ MOD85_021DED60: ; 0x021DED60
MOD85_021DED7C: ; 0x021DED7C
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB0, 0x1D, 0x02, 0x7D, 0xB3, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02, 0x59, 0xB2, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0x61, 0xB3, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02, 0x45, 0xB3, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DEDA4
+MOD85_021DEDA4: ; 0x021DEDA4
+ .word MOD85_021DB004
+
+ .global MOD85_021DEDA8
+MOD85_021DEDA8: ; 0x021DEDA8
+ .word MOD85_021DB37C
+ .word MOD85_021DB004
+
+ .global MOD85_021DEDB0
+MOD85_021DEDB0: ; 0x021DEDB0
+ .word MOD85_021DB258, MOD85_021DB004
+
+ .global MOD85_021DEDB8
+MOD85_021DEDB8: ; 0x021DEDB8
+ .word MOD85_021DB360
+ .word MOD85_021DB004
+
+ .global MOD85_021DEDC0
+MOD85_021DEDC0: ; 0x021DEDC0
+ .word MOD85_021DB344, MOD85_021DB004
.global MOD85_021DEDC8
MOD85_021DEDC8: ; 0x021DEDC8
- .byte 0x00, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x09, 0xB0, 0x1D, 0x02
- .byte 0x21, 0xB0, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0xE9, 0xB1, 0x1D, 0x02, 0x15, 0xB2, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02, 0xA1, 0xAF, 0x1D, 0x02, 0xB9, 0xAF, 0x1D, 0x02, 0xDD, 0xAF, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02, 0x6D, 0xB1, 0x1D, 0x02, 0x8D, 0xB1, 0x1D, 0x02, 0xB9, 0xB1, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02
+ .byte 0x00, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+
+ .global MOD85_021DEDD4
+MOD85_021DEDD4: ; 0x021DEDD4
+ .word MOD85_021DB008
+ .word MOD85_021DB020, MOD85_021DB004
+
+ .global MOD85_021DEDE0
+MOD85_021DEDE0: ; 0x021DEDE0
+ .word MOD85_021DB1E8, MOD85_021DB214
+ .word MOD85_021DB004
+
+ .global MOD85_021DEDEC
+MOD85_021DEDEC: ; 0x021DEDEC
+ .word MOD85_021DAFA0, MOD85_021DAFB8, MOD85_021DAFDC
+ .word MOD85_021DB004
+
+ .global MOD85_021DEDFC
+MOD85_021DEDFC: ; 0x021DEDFC
+ .word MOD85_021DB16C, MOD85_021DB18C, MOD85_021DB1B8
+ .word MOD85_021DB004
.global MOD85_021DEE0C
MOD85_021DEE0C: ; 0x021DEE0C
- .byte 0x24, 0x00, 0x00, 0x00, 0xC5, 0xB7, 0x1D, 0x02, 0xE9, 0xB7, 0x1D, 0x02, 0xF5, 0xB7, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000024, MOD85_021DB7C4, MOD85_021DB7E8, MOD85_021DB7F4
+ .word FUN_02064794
.global MOD85_021DEE20
MOD85_021DEE20: ; 0x021DEE20
- .byte 0x8D, 0x93, 0x1D, 0x02, 0x91, 0x93, 0x1D, 0x02, 0xA9, 0x93, 0x1D, 0x02, 0x05, 0x94, 0x1D, 0x02
- .byte 0xAD, 0x94, 0x1D, 0x02
+ .word MOD85_021D938C, MOD85_021D9390, MOD85_021D93A8, MOD85_021D9404
+ .word MOD85_021D94AC
.global MOD85_021DEE34
MOD85_021DEE34: ; 0x021DEE34
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00
- .byte 0x00, 0x00, 0x01, 0x00, 0xD5, 0xB0, 0x1D, 0x02, 0xF5, 0xB0, 0x1D, 0x02, 0x29, 0xB1, 0x1D, 0x02
- .byte 0x49, 0xB1, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x01, 0x00
+
+ .global MOD85_021DEE48
+MOD85_021DEE48: ; 0x021DEE48
+ .word MOD85_021DB0D4, MOD85_021DB0F4, MOD85_021DB128
+ .word MOD85_021DB148, MOD85_021DB004
.global MOD85_021DEE5C
MOD85_021DEE5C: ; 0x021DEE5C
- .byte 0x30, 0x00, 0x00, 0x00, 0xE5, 0xBA, 0x1D, 0x02, 0xFD, 0xBA, 0x1D, 0x02, 0x01, 0xBB, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02, 0x45, 0xB0, 0x1D, 0x02, 0x5D, 0xB0, 0x1D, 0x02, 0x89, 0xB0, 0x1D, 0x02
- .byte 0xB1, 0xB0, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0x71, 0xB2, 0x1D, 0x02, 0x95, 0xB2, 0x1D, 0x02
- .byte 0xC9, 0xB2, 0x1D, 0x02, 0xFD, 0xB2, 0x1D, 0x02, 0x21, 0xB3, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02
+ .word 0x00000030, MOD85_021DBAE4, MOD85_021DBAFC, MOD85_021DBB00
+ .word FUN_02064794
+
+ .global MOD85_021DEE70
+MOD85_021DEE70: ; 0x021DEE70
+ .word MOD85_021DB044, MOD85_021DB05C, MOD85_021DB088
+ .word MOD85_021DB0B0, MOD85_021DB004
+
+ .global MOD85_021DEE84
+MOD85_021DEE84: ; 0x021DEE84
+ .word MOD85_021DB270, MOD85_021DB294
+ .word MOD85_021DB2C8, MOD85_021DB2FC, MOD85_021DB320, MOD85_021DB004
.global MOD85_021DEE9C
MOD85_021DEE9C: ; 0x021DEE9C
.byte 0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00
- .byte 0x16, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x99, 0xB3, 0x1D, 0x02, 0xBD, 0xB3, 0x1D, 0x02
- .byte 0xF5, 0xB3, 0x1D, 0x02, 0x19, 0xB4, 0x1D, 0x02, 0x49, 0xB4, 0x1D, 0x02, 0x71, 0xB4, 0x1D, 0x02
- .byte 0x05, 0xB0, 0x1D, 0x02
+ .byte 0x16, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00
+
+ .global MOD85_021DEEB4
+MOD85_021DEEB4: ; 0x021DEEB4
+ .word MOD85_021DB398, MOD85_021DB3BC
+ .word MOD85_021DB3F4, MOD85_021DB418, MOD85_021DB448, MOD85_021DB470
+ .word MOD85_021DB004
.global MOD85_021DEED0
MOD85_021DEED0: ; 0x021DEED0
- .byte 0xA4, 0xED, 0x1D, 0x02, 0xEC, 0xED, 0x1D, 0x02, 0xD4, 0xED, 0x1D, 0x02, 0x70, 0xEE, 0x1D, 0x02
- .byte 0x48, 0xEE, 0x1D, 0x02, 0xFC, 0xED, 0x1D, 0x02, 0xE0, 0xED, 0x1D, 0x02, 0xB0, 0xED, 0x1D, 0x02
- .byte 0x84, 0xEE, 0x1D, 0x02, 0xC0, 0xED, 0x1D, 0x02, 0xB8, 0xED, 0x1D, 0x02, 0xA8, 0xED, 0x1D, 0x02
- .byte 0xB4, 0xEE, 0x1D, 0x02
+ .word MOD85_021DEDA4, MOD85_021DEDEC, MOD85_021DEDD4, MOD85_021DEE70
+ .word MOD85_021DEE48, MOD85_021DEDFC, MOD85_021DEDE0, MOD85_021DEDB0
+ .word MOD85_021DEE84, MOD85_021DEDC0, MOD85_021DEDB8, MOD85_021DEDA8
+ .word MOD85_021DEEB4
.global MOD85_021DEF04
MOD85_021DEF04: ; 0x021DEF04
@@ -16262,22 +16314,22 @@ MOD85_021DEF04: ; 0x021DEF04
.global MOD85_021DEF94
MOD85_021DEF94: ; 0x021DEF94
- .byte 0x31, 0x82, 0x1D, 0x02, 0xA1, 0x82, 0x1D, 0x02, 0xFD, 0x82, 0x1D, 0x02, 0x31, 0x83, 0x1D, 0x02
- .byte 0xFD, 0x83, 0x1D, 0x02, 0x1D, 0x84, 0x1D, 0x02, 0x15, 0x85, 0x1D, 0x02, 0x4D, 0x85, 0x1D, 0x02
- .byte 0xB5, 0x85, 0x1D, 0x02, 0xC9, 0x85, 0x1D, 0x02, 0xE5, 0x85, 0x1D, 0x02, 0xFD, 0x85, 0x1D, 0x02
- .byte 0x1D, 0x86, 0x1D, 0x02, 0x4D, 0x86, 0x1D, 0x02, 0x95, 0x86, 0x1D, 0x02, 0xB5, 0x86, 0x1D, 0x02
- .byte 0x01, 0x87, 0x1D, 0x02, 0x29, 0x87, 0x1D, 0x02, 0x55, 0x87, 0x1D, 0x02, 0x6D, 0x87, 0x1D, 0x02
- .byte 0x9D, 0x87, 0x1D, 0x02, 0xE9, 0x87, 0x1D, 0x02, 0x11, 0x88, 0x1D, 0x02, 0x5D, 0x88, 0x1D, 0x02
- .byte 0x75, 0x88, 0x1D, 0x02, 0x8D, 0x88, 0x1D, 0x02, 0xF9, 0x88, 0x1D, 0x02, 0x55, 0x89, 0x1D, 0x02
- .byte 0x89, 0x89, 0x1D, 0x02, 0x31, 0x8A, 0x1D, 0x02, 0x51, 0x8A, 0x1D, 0x02, 0x49, 0x8B, 0x1D, 0x02
- .byte 0x81, 0x8B, 0x1D, 0x02, 0xC5, 0x8B, 0x1D, 0x02, 0xE1, 0x8B, 0x1D, 0x02, 0x01, 0x8C, 0x1D, 0x02
- .byte 0x31, 0x8C, 0x1D, 0x02, 0x51, 0x8C, 0x1D, 0x02, 0x71, 0x8C, 0x1D, 0x02, 0xAD, 0x8C, 0x1D, 0x02
- .byte 0xF9, 0x8C, 0x1D, 0x02, 0x25, 0x8D, 0x1D, 0x02, 0x3D, 0x8D, 0x1D, 0x02, 0x89, 0x8D, 0x1D, 0x02
- .byte 0xFD, 0x8D, 0x1D, 0x02, 0x65, 0x8E, 0x1D, 0x02, 0x99, 0x8E, 0x1D, 0x02, 0x89, 0x8F, 0x1D, 0x02
- .byte 0xB1, 0x8F, 0x1D, 0x02, 0xB1, 0x90, 0x1D, 0x02, 0xE9, 0x90, 0x1D, 0x02, 0x21, 0x91, 0x1D, 0x02
- .byte 0x45, 0x91, 0x1D, 0x02, 0x79, 0x91, 0x1D, 0x02, 0xA5, 0x91, 0x1D, 0x02, 0xD9, 0x91, 0x1D, 0x02
- .byte 0x25, 0x92, 0x1D, 0x02, 0x3D, 0x92, 0x1D, 0x02, 0x55, 0x92, 0x1D, 0x02, 0x85, 0x92, 0x1D, 0x02
- .byte 0x99, 0x92, 0x1D, 0x02, 0xAD, 0x92, 0x1D, 0x02, 0xC1, 0x92, 0x1D, 0x02, 0xDD, 0x92, 0x1D, 0x02
+ .word MOD85_021D8230, MOD85_021D82A0, MOD85_021D82FC, MOD85_021D8330
+ .word MOD85_021D83FC, MOD85_021D841C, MOD85_021D8514, MOD85_021D854C
+ .word MOD85_021D85B4, MOD85_021D85C8, MOD85_021D85E4, MOD85_021D85FC
+ .word MOD85_021D861C, MOD85_021D864C, MOD85_021D8694, MOD85_021D86B4
+ .word MOD85_021D8700, MOD85_021D8728, MOD85_021D8754, MOD85_021D876C
+ .word MOD85_021D879C, MOD85_021D87E8, MOD85_021D8810, MOD85_021D885C
+ .word MOD85_021D8874, MOD85_021D888C, MOD85_021D88F8, MOD85_021D8954
+ .word MOD85_021D8988, MOD85_021D8A30, MOD85_021D8A50, MOD85_021D8B48
+ .word MOD85_021D8B80, MOD85_021D8BC4, MOD85_021D8BE0, MOD85_021D8C00
+ .word MOD85_021D8C30, MOD85_021D8C50, MOD85_021D8C70, MOD85_021D8CAC
+ .word MOD85_021D8CF8, MOD85_021D8D24, MOD85_021D8D3C, MOD85_021D8D88
+ .word MOD85_021D8DFC, MOD85_021D8E64, MOD85_021D8E98, MOD85_021D8F88
+ .word MOD85_021D8FB0, MOD85_021D90B0, MOD85_021D90E8, MOD85_021D9120
+ .word MOD85_021D9144, MOD85_021D9178, MOD85_021D91A4, MOD85_021D91D8
+ .word MOD85_021D9224, MOD85_021D923C, MOD85_021D9254, MOD85_021D9284
+ .word MOD85_021D9298, MOD85_021D92AC, MOD85_021D92C0, MOD85_021D92DC
.global MOD85_021DF094
MOD85_021DF094: ; 0x021DF094
@@ -16363,11 +16415,39 @@ MOD85_021DF094: ; 0x021DF094
.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00
.byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xBD, 0xD1, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x69, 0xD3, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02
- .byte 0xE5, 0xC9, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02, 0x01, 0xD3, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02
- .byte 0x99, 0xD2, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x89, 0xCF, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02
- .byte 0x25, 0xD2, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0xB5, 0xC8, 0x1D, 0x02, 0x3D, 0xC9, 0x1D, 0x02
- .byte 0xDD, 0xC5, 0x1D, 0x02
+
+ .global MOD85_021DF5B4
+MOD85_021DF5B4: ; 0x021DF5B4
+ .word MOD85_021DD1BC, MOD85_021DD004
+
+ .global MOD85_021DF5BC
+MOD85_021DF5BC: ; 0x021DF5BC
+ .word MOD85_021DD368, MOD85_021DD004
+
+ .global MOD85_021DF5C4
+MOD85_021DF5C4: ; 0x021DF5C4
+ .word MOD85_021DC9E4, MOD85_021DC5DC
+
+ .global MOD85_021DF5CC
+MOD85_021DF5CC: ; 0x021DF5CC
+ .word MOD85_021DD300, MOD85_021DD004
+
+ .global MOD85_021DF5D4
+MOD85_021DF5D4: ; 0x021DF5D4
+ .word MOD85_021DD298, MOD85_021DD004
+
+ .global MOD85_021DF5DC
+MOD85_021DF5DC: ; 0x021DF5DC
+ .word MOD85_021DCF88, MOD85_021DD004
+
+ .global MOD85_021DF5E4
+MOD85_021DF5E4: ; 0x021DF5E4
+ .word MOD85_021DD224, MOD85_021DD004
+
+ .global MOD85_021DF5EC
+MOD85_021DF5EC: ; 0x021DF5EC
+ .word MOD85_021DC8B4, MOD85_021DC93C
+ .word MOD85_021DC5DC
.global MOD85_021DF5F8
MOD85_021DF5F8: ; 0x021DF5F8
@@ -16387,8 +16467,11 @@ MOD85_021DF61C: ; 0x021DF61C
.global MOD85_021DF628
MOD85_021DF628: ; 0x021DF628
- .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xD3, 0x1D, 0x02
- .byte 0x3D, 0xD4, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02
+ .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DF634
+MOD85_021DF634: ; 0x021DF634
+ .word MOD85_021DD3D0, MOD85_021DD43C, MOD85_021DD004
.global MOD85_021DF640
MOD85_021DF640: ; 0x021DF640
@@ -16416,8 +16499,11 @@ MOD85_021DF67C: ; 0x021DF67C
.global MOD85_021DF688
MOD85_021DF688: ; 0x021DF688
- .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xC7, 0x1D, 0x02
- .byte 0x7D, 0xC7, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DF694
+MOD85_021DF694: ; 0x021DF694
+ .word MOD85_021DC714, MOD85_021DC77C, MOD85_021DC5DC
.global MOD85_021DF6A0
MOD85_021DF6A0: ; 0x021DF6A0
@@ -16449,8 +16535,11 @@ MOD85_021DF6E8: ; 0x021DF6E8
.global MOD85_021DF6F4
MOD85_021DF6F4: ; 0x021DF6F4
- .byte 0x00, 0x40, 0x0B, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xC7, 0x1D, 0x02
- .byte 0x49, 0xC8, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02
+ .byte 0x00, 0x40, 0x0B, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DF700
+MOD85_021DF700: ; 0x021DF700
+ .word MOD85_021DC7E0, MOD85_021DC848, MOD85_021DC5DC
.global MOD85_021DF70C
MOD85_021DF70C: ; 0x021DF70C
@@ -16490,8 +16579,11 @@ MOD85_021DF76C: ; 0x021DF76C
.global MOD85_021DF778
MOD85_021DF778: ; 0x021DF778
- .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xC6, 0x1D, 0x02
- .byte 0xF9, 0xC6, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DF784
+MOD85_021DF784: ; 0x021DF784
+ .word MOD85_021DC6CC, MOD85_021DC6F8, MOD85_021DC5DC
.global MOD85_021DF790
MOD85_021DF790: ; 0x021DF790
@@ -16507,8 +16599,11 @@ MOD85_021DF7A8: ; 0x021DF7A8
.global MOD85_021DF7B4
MOD85_021DF7B4: ; 0x021DF7B4
- .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xD0, 0x1D, 0x02
- .byte 0x59, 0xD1, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD85_021DF7C0
+MOD85_021DF7C0: ; 0x021DF7C0
+ .word MOD85_021DD0F0, MOD85_021DD158, MOD85_021DD004
.global MOD85_021DF7CC
MOD85_021DF7CC: ; 0x021DF7CC
@@ -16557,90 +16652,102 @@ MOD85_021DF850: ; 0x021DF850
.global MOD85_021DF85C
MOD85_021DF85C: ; 0x021DF85C
- .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xD0, 0x1D, 0x02
- .byte 0x65, 0xD0, 0x1D, 0x02, 0xC5, 0xD0, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x85, 0xC5, 0x1D, 0x02
- .byte 0x99, 0xC5, 0x1D, 0x02, 0xA9, 0xC5, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02, 0xE1, 0xC5, 0x1D, 0x02
- .byte 0x49, 0xC6, 0x1D, 0x02, 0xB1, 0xC6, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02
+ .word 0x00001000, 0x00001000, 0x00000000
+
+ .global MOD85_021DF868
+MOD85_021DF868: ; 0x021DF868
+ .word MOD85_021DD008
+ .word MOD85_021DD064, MOD85_021DD0C4, MOD85_021DD004
+
+ .global MOD85_021DF878
+MOD85_021DF878: ; 0x021DF878
+ .word MOD85_021DC584
+ .word MOD85_021DC598, MOD85_021DC5A8, MOD85_021DC5DC
+
+ .global MOD85_021DF888
+MOD85_021DF888: ; 0x021DF888
+ .word MOD85_021DC5E0
+ .word MOD85_021DC648, MOD85_021DC6B0, MOD85_021DC5DC
.global MOD85_021DF898
MOD85_021DF898: ; 0x021DF898
- .byte 0x18, 0x00, 0x00, 0x00, 0xE5, 0xDC, 0x1D, 0x02, 0x4D, 0xDD, 0x1D, 0x02, 0x61, 0xDD, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000018, MOD85_021DDCE4, MOD85_021DDD4C, MOD85_021DDD60
+ .word FUN_02064794
.global MOD85_021DF8AC
MOD85_021DF8AC: ; 0x021DF8AC
- .byte 0x20, 0x00, 0x00, 0x00, 0x19, 0xCC, 0x1D, 0x02, 0x2D, 0xCC, 0x1D, 0x02, 0x59, 0xCC, 0x1D, 0x02
- .byte 0xF9, 0xCC, 0x1D, 0x02
+ .word 0x00000020, MOD85_021DCC18, MOD85_021DCC2C, MOD85_021DCC58
+ .word MOD85_021DCCF8
.global MOD85_021DF8C0
MOD85_021DF8C0: ; 0x021DF8C0
- .byte 0x30, 0x00, 0x00, 0x00, 0x19, 0xCF, 0x1D, 0x02, 0x39, 0xCF, 0x1D, 0x02, 0x65, 0xCF, 0x1D, 0x02
- .byte 0x85, 0xCF, 0x1D, 0x02
+ .word 0x00000030, MOD85_021DCF18, MOD85_021DCF38, MOD85_021DCF64
+ .word MOD85_021DCF84
.global MOD85_021DF8D4
MOD85_021DF8D4: ; 0x021DF8D4
- .byte 0x48, 0x00, 0x00, 0x00, 0x85, 0xD5, 0x1D, 0x02, 0x99, 0xD5, 0x1D, 0x02, 0x25, 0xD6, 0x1D, 0x02
- .byte 0x81, 0xD9, 0x1D, 0x02
+ .word 0x00000048, MOD85_021DD584, MOD85_021DD598, MOD85_021DD624
+ .word MOD85_021DD980
.global MOD85_021DF8E8
MOD85_021DF8E8: ; 0x021DF8E8
- .byte 0x10, 0x00, 0x00, 0x00, 0xBD, 0xD9, 0x1D, 0x02, 0x09, 0xDA, 0x1D, 0x02, 0x15, 0xDA, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000010, MOD85_021DD9BC, MOD85_021DDA08, MOD85_021DDA14
+ .word FUN_02064794
.global MOD85_021DF8FC
MOD85_021DF8FC: ; 0x021DF8FC
- .byte 0x40, 0x00, 0x00, 0x00, 0x49, 0xDE, 0x1D, 0x02, 0xB1, 0xDE, 0x1D, 0x02, 0xC9, 0xDE, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000040, MOD85_021DDE48, MOD85_021DDEB0, MOD85_021DDEC8
+ .word FUN_02064794
.global MOD85_021DF910
MOD85_021DF910: ; 0x021DF910
- .byte 0x48, 0x00, 0x00, 0x00, 0x91, 0xE2, 0x1D, 0x02, 0xD1, 0xE2, 0x1D, 0x02, 0x11, 0xE3, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000048, MOD85_021DE290, MOD85_021DE2D0, MOD85_021DE310
+ .word FUN_02064794
.global MOD85_021DF924
MOD85_021DF924: ; 0x021DF924
- .byte 0x14, 0x00, 0x00, 0x00, 0x61, 0xDA, 0x1D, 0x02, 0xF1, 0xDA, 0x1D, 0x02, 0xFD, 0xDA, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000014, MOD85_021DDA60, MOD85_021DDAF0, MOD85_021DDAFC
+ .word FUN_02064794
.global MOD85_021DF938
MOD85_021DF938: ; 0x021DF938
- .byte 0x18, 0x00, 0x00, 0x00, 0x69, 0xC1, 0x1D, 0x02, 0xC1, 0xC1, 0x1D, 0x02, 0xCD, 0xC1, 0x1D, 0x02
- .byte 0x49, 0xC2, 0x1D, 0x02
+ .word 0x00000018, MOD85_021DC168, MOD85_021DC1C0, MOD85_021DC1CC
+ .word MOD85_021DC248
.global MOD85_021DF94C
MOD85_021DF94C: ; 0x021DF94C
- .byte 0x18, 0x00, 0x00, 0x00, 0xA1, 0xC2, 0x1D, 0x02, 0xF9, 0xC2, 0x1D, 0x02, 0x05, 0xC3, 0x1D, 0x02
- .byte 0x81, 0xC3, 0x1D, 0x02
+ .word 0x00000018, MOD85_021DC2A0, MOD85_021DC2F8, MOD85_021DC304
+ .word MOD85_021DC380
.global MOD85_021DF960
MOD85_021DF960: ; 0x021DF960
- .byte 0x18, 0x00, 0x00, 0x00, 0xD9, 0xC3, 0x1D, 0x02, 0x31, 0xC4, 0x1D, 0x02, 0x3D, 0xC4, 0x1D, 0x02
- .byte 0xB1, 0xC4, 0x1D, 0x02
+ .word 0x00000018, MOD85_021DC3D8, MOD85_021DC430, MOD85_021DC43C
+ .word MOD85_021DC4B0
.global MOD85_021DF974
MOD85_021DF974: ; 0x021DF974
- .byte 0x48, 0x00, 0x00, 0x00, 0x2D, 0xC5, 0x1D, 0x02, 0x45, 0xC5, 0x1D, 0x02, 0x61, 0xC5, 0x1D, 0x02
- .byte 0x81, 0xC5, 0x1D, 0x02
+ .word 0x00000048, MOD85_021DC52C, MOD85_021DC544, MOD85_021DC560
+ .word MOD85_021DC580
.global MOD85_021DF988
MOD85_021DF988: ; 0x021DF988
- .byte 0x10, 0x00, 0x00, 0x00, 0x49, 0xDB, 0x1D, 0x02, 0x95, 0xDB, 0x1D, 0x02, 0xA1, 0xDB, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000010, MOD85_021DDB48, MOD85_021DDB94, MOD85_021DDBA0
+ .word FUN_02064794
.global MOD85_021DF99C
MOD85_021DF99C: ; 0x021DF99C
- .byte 0x54, 0x00, 0x00, 0x00, 0x6D, 0xDF, 0x1D, 0x02, 0xE1, 0xE0, 0x1D, 0x02, 0x05, 0xE1, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000054, MOD85_021DDF6C, MOD85_021DE0E0, MOD85_021DE104
+ .word FUN_02064794
.global MOD85_021DF9B0
MOD85_021DF9B0: ; 0x021DF9B0
- .byte 0x14, 0x00, 0x00, 0x00, 0xFD, 0xDB, 0x1D, 0x02, 0x8D, 0xDC, 0x1D, 0x02, 0x99, 0xDC, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000014, MOD85_021DDBFC, MOD85_021DDC8C, MOD85_021DDC98
+ .word FUN_02064794
.global MOD85_021DF9C4
MOD85_021DF9C4: ; 0x021DF9C4
- .byte 0x30, 0x00, 0x00, 0x00, 0x5D, 0xE1, 0x1D, 0x02, 0x2D, 0xE2, 0x1D, 0x02, 0x51, 0xE2, 0x1D, 0x02
- .byte 0x95, 0x47, 0x06, 0x02
+ .word 0x00000030, MOD85_021DE15C, MOD85_021DE22C, MOD85_021DE250
+ .word FUN_02064794
.global MOD85_021DF9D8
MOD85_021DF9D8: ; 0x021DF9D8
@@ -16649,8 +16756,8 @@ MOD85_021DF9D8: ; 0x021DF9D8
.global MOD85_021DF9F0
MOD85_021DF9F0: ; 0x021DF9F0
- .byte 0x78, 0xF8, 0x1D, 0x02, 0x88, 0xF8, 0x1D, 0x02, 0x84, 0xF7, 0x1D, 0x02, 0x94, 0xF6, 0x1D, 0x02
- .byte 0x00, 0xF7, 0x1D, 0x02, 0xEC, 0xF5, 0x1D, 0x02, 0xC4, 0xF5, 0x1D, 0x02
+ .word MOD85_021DF878, MOD85_021DF888, MOD85_021DF784, MOD85_021DF694
+ .word MOD85_021DF700, MOD85_021DF5EC, MOD85_021DF5C4
.global MOD85_021DFA0C
MOD85_021DFA0C: ; 0x021DFA0C
@@ -16674,9 +16781,9 @@ MOD85_021DFA6C: ; 0x021DFA6C
.global MOD85_021DFA8C
MOD85_021DFA8C: ; 0x021DFA8C
- .byte 0xDC, 0xF5, 0x1D, 0x02, 0x68, 0xF8, 0x1D, 0x02, 0xC0, 0xF7, 0x1D, 0x02, 0xB4, 0xF5, 0x1D, 0x02
- .byte 0xE4, 0xF5, 0x1D, 0x02, 0xD4, 0xF5, 0x1D, 0x02, 0xCC, 0xF5, 0x1D, 0x02, 0xBC, 0xF5, 0x1D, 0x02
- .byte 0x34, 0xF6, 0x1D, 0x02
+ .word MOD85_021DF5DC, MOD85_021DF868, MOD85_021DF7C0, MOD85_021DF5B4
+ .word MOD85_021DF5E4, MOD85_021DF5D4, MOD85_021DF5CC, MOD85_021DF5BC
+ .word MOD85_021DF634
.global MOD85_021DFAB0
MOD85_021DFAB0: ; 0x021DFAB0
diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s
index 4da0d50e..e5b37065 100644
--- a/arm9/modules/86/asm/module_86.s
+++ b/arm9/modules/86/asm/module_86.s
@@ -184,7 +184,7 @@ _021D765C:
and r0, r1
cmp r0, #2
beq _021D7678
- ldr r0, _021D76AC ; =0x021C48F8
+ ldr r0, _021D76AC ; =UNK_021C48F8
ldrh r0, [r0, #0x20]
cmp r0, #0
beq _021D76A0
@@ -214,7 +214,7 @@ _021D76A0:
pop {r3, r4, r5, r6, pc}
nop
_021D76A8: .word gUnknown21C48B8
-_021D76AC: .word 0x021C48F8
+_021D76AC: .word UNK_021C48F8
thumb_func_end MOD86_021D758C
thumb_func_start MOD86_021D76B0