summaryrefslogtreecommitdiff
path: root/arm9
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-07-09 20:25:43 +0100
committerGitHub <noreply@github.com>2020-07-09 20:25:43 +0100
commitebf4bb0d6f4e22d1c746582ba9f713ef81018dbd (patch)
treee7446446c207660065020e3c49aeead7791baa8e /arm9
parent32acefa0bc9d38d055c5662694fc9ce966d50844 (diff)
parentf021c94a00fbbf4ef1d5c51cbc16403177d933f1 (diff)
Merge pull request #226 from red031000/master
modules 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 53 and 54 fully shiftable
Diffstat (limited to 'arm9')
-rw-r--r--arm9/global.inc2
-rw-r--r--arm9/modules/24/asm/module_24.s73
-rw-r--r--arm9/modules/25/asm/module_25.s53
-rw-r--r--arm9/modules/26/asm/module_26.s51
-rw-r--r--arm9/modules/27/asm/module_27.s75
-rw-r--r--arm9/modules/28/asm/module_28.s173
-rw-r--r--arm9/modules/29/asm/module_29.s71
-rw-r--r--arm9/modules/30/asm/module_30.s57
-rw-r--r--arm9/modules/32/asm/module_32.s51
-rw-r--r--arm9/modules/33/asm/module_33.s32
-rw-r--r--arm9/modules/34/asm/module_34.s53
-rw-r--r--arm9/modules/35/asm/module_35.s42
-rw-r--r--arm9/modules/36/asm/module_36.s80
-rw-r--r--arm9/modules/37/asm/module_37.s57
-rw-r--r--arm9/modules/38/asm/module_38.s86
-rw-r--r--arm9/modules/39/asm/module_39.s120
-rw-r--r--arm9/modules/40/asm/module_40.s59
-rw-r--r--arm9/modules/41/asm/module_41.s61
-rw-r--r--arm9/modules/42/asm/module_42.s31
-rw-r--r--arm9/modules/43/asm/module_43.s176
-rw-r--r--arm9/modules/44/asm/module_44.s44
-rw-r--r--arm9/modules/45/asm/module_45.s94
-rw-r--r--arm9/modules/46/asm/module_46.s32
-rw-r--r--arm9/modules/47/asm/module_47.s91
-rw-r--r--arm9/modules/48/asm/module_48.s55
-rw-r--r--arm9/modules/49/asm/module_49.s50
-rw-r--r--arm9/modules/50/asm/module_50.s32
-rw-r--r--arm9/modules/53/asm/module_53.s52
-rw-r--r--arm9/modules/54/asm/module_54.s28
29 files changed, 1268 insertions, 613 deletions
diff --git a/arm9/global.inc b/arm9/global.inc
index 1a77046c..d682b675 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2004,6 +2004,7 @@
.extern FUN_0202A170
.extern FUN_0202A1B8
.extern FUN_0202A1C4
+.extern FUN_0202A1E0
.extern FUN_0202A1E4
.extern FUN_0202A240
.extern FUN_0202A2C4
@@ -2145,6 +2146,7 @@
.extern FUN_0202B8B8
.extern FUN_0202B8E4
.extern FUN_0202B8F0
+.extern FUN_0202B934
.extern FUN_0202B9EC
.extern FUN_0202BCF4
.extern FUN_0202BD6C
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s
index 8ec9903c..ccf6c969 100644
--- a/arm9/modules/24/asm/module_24.s
+++ b/arm9/modules/24/asm/module_24.s
@@ -92,7 +92,7 @@ _022548E0:
pop {r3, r4, r5, pc}
.align 2, 0
_022548E4: .word 0x000016F0
-_022548E8: .word 0x022550F8
+_022548E8: .word MOD24_022550F8
_022548EC: .word MOD24_02254960
_022548F0: .word 0x000016FC
thumb_func_end MOD24_0225489C
@@ -131,7 +131,7 @@ MOD24_02254918: ; 0x02254918
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _0225495C ; =0x02255100
+ ldr r1, _0225495C ; =MOD24_02255100
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -147,7 +147,7 @@ _02254954:
pop {r3, r4, r5, pc}
nop
_02254958: .word 0x000016F8
-_0225495C: .word 0x02255100
+_0225495C: .word MOD24_02255100
thumb_func_end MOD24_02254918
thumb_func_start MOD24_02254960
@@ -679,7 +679,7 @@ MOD24_02254D00: ; 0x02254D00
add r1, r0, #0
beq _02254D3C
ldr r0, [r4, #4]
- ldr r2, _02254D40 ; =0x0225510C
+ ldr r2, _02254D40 ; =MOD24_0225510C
bl FUN_02019150
mov r2, #0xbe
ldr r1, [r4]
@@ -701,7 +701,7 @@ _02254D3C:
mov r0, #0
pop {r4, pc}
.align 2, 0
-_02254D40: .word 0x0225510C
+_02254D40: .word MOD24_0225510C
_02254D44: .word 0x000016E8
thumb_func_end MOD24_02254D00
@@ -750,13 +750,13 @@ MOD24_02254D8C: ; 0x02254D8C
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254DAC ; =0x0225516C
+ ldr r0, _02254DAC ; =MOD24_0225516C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254DAC: .word 0x0225516C
+_02254DAC: .word MOD24_0225516C
thumb_func_end MOD24_02254D8C
thumb_func_start MOD24_02254DB0
@@ -804,12 +804,12 @@ _02254DF0:
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254ED0 ; =0x02255114
+ ldr r2, _02254ED0 ; =MOD24_02255114
mov r1, #6
mov r3, #0
bl FUN_02016C18
ldr r0, [r5, #4]
- ldr r2, _02254ED4 ; =0x02255130
+ ldr r2, _02254ED4 ; =MOD24_02255130
mov r1, #7
mov r3, #0
bl FUN_02016C18
@@ -897,8 +897,8 @@ _02254ECC:
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254ED0: .word 0x02255114
-_02254ED4: .word 0x02255130
+_02254ED0: .word MOD24_02255114
+_02254ED4: .word MOD24_02255130
_02254ED8: .word 0x04001000
_02254EDC: .word 0xFFFFE0FF
thumb_func_end MOD24_02254DDC
@@ -1136,7 +1136,7 @@ MOD24_02255078: ; 0x02255078
add r0, r7, #0
str r0, [sp, #0xc]
add r0, #0x54
- ldr r4, _022550D0 ; =0x0225514C
+ ldr r4, _022550D0 ; =MOD24_0225514C
mov r6, #0
add r5, r7, #0
str r0, [sp, #0xc]
@@ -1155,7 +1155,7 @@ _022550CC:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_022550D0: .word 0x0225514C
+_022550D0: .word MOD24_0225514C
thumb_func_end MOD24_02255078
thumb_func_start MOD24_022550D4
@@ -1180,20 +1180,45 @@ _022550DC:
thumb_func_end MOD24_022550D4
.section .rodata
- ; 0x022550F8
- .byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC, 0xAD, 0x49, 0x25, 0x02, 0xF9, 0x49, 0x25, 0x02
- .byte 0x65, 0x4C, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00
+ .global MOD24_022550F8
+MOD24_022550F8: ; 0x022550F8
+ .byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC
+
+ .global MOD24_02255100
+MOD24_02255100: ; 0x02255100
+ .word MOD24_022549AC, MOD24_022549F8, MOD24_02254C64
+
+ .global MOD24_0225510C
+MOD24_0225510C: ; 0x0225510C
+ .byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00
+
+ .global MOD24_02255114
+MOD24_02255114: ; 0x02255114
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD24_02255130
+MOD24_02255130: ; 0x02255130
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD24_0225514C
+MOD24_0225514C: ; 0x0225514C
+ .byte 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x08, 0x00, 0x03, 0x00, 0x00, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x29, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x41, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x51, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD24_0225516C
+MOD24_0225516C: ; 0x0225516C
+ .word 0x00, MOD24_02254DDC, 0x00
+ .word 0x01, MOD24_02254EE0, 0x00
+ .word 0x02, MOD24_02254F28, 0x00
+ .word 0x03, MOD24_02254F40, 0x00
+ .word 0x04, MOD24_02255038, 0x00
+ .word 0x05, MOD24_02255050, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD24_02254840
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s
index cf57dc32..ba331a34 100644
--- a/arm9/modules/25/asm/module_25.s
+++ b/arm9/modules/25/asm/module_25.s
@@ -94,7 +94,7 @@ _022548E6:
strb r0, [r5, #5]
mov r0, #8
str r0, [sp]
- ldr r0, _02254914 ; =0x02254CF8
+ ldr r0, _02254914 ; =MOD25_02254CF8
mov r1, #1
add r3, r5, #0
bl MOD20_02254130
@@ -112,7 +112,7 @@ _0225490A:
pop {r3, r4, r5, pc}
nop
_02254910: .word MOD25_02254974
-_02254914: .word 0x02254CF8
+_02254914: .word MOD25_02254CF8
thumb_func_end MOD25_0225489C
thumb_func_start MOD25_02254918
@@ -142,7 +142,7 @@ MOD25_02254930: ; 0x02254930
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254968 ; =0x02254CFC
+ ldr r1, _02254968 ; =MOD25_02254CFC
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -156,7 +156,7 @@ MOD25_02254930: ; 0x02254930
_02254966:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254968: .word 0x02254CFC
+_02254968: .word MOD25_02254CFC
thumb_func_end MOD25_02254930
thumb_func_start MOD25_0225496C
@@ -389,13 +389,13 @@ MOD25_02254AE4: ; 0x02254AE4
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254B04 ; =0x02254D44
+ ldr r0, _02254B04 ; =MOD25_02254D44
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254B04: .word 0x02254D44
+_02254B04: .word MOD25_02254D44
thumb_func_end MOD25_02254AE4
thumb_func_start MOD25_02254B08
@@ -437,7 +437,7 @@ MOD25_02254B34: ; 0x02254B34
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254BBC ; =0x02254D08
+ ldr r2, _02254BBC ; =MOD25_02254D08
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -491,7 +491,7 @@ MOD25_02254B34: ; 0x02254B34
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254BBC: .word 0x02254D08
+_02254BBC: .word MOD25_02254D08
_02254BC0: .word 0x04001000
_02254BC4: .word 0xFFFFE0FF
thumb_func_end MOD25_02254B34
@@ -613,7 +613,7 @@ MOD25_02254C74: ; 0x02254C74
add r0, r7, #0
str r0, [sp, #0xc]
add r0, #0x34
- ldr r4, _02254CD4 ; =0x02254D24
+ ldr r4, _02254CD4 ; =MOD25_02254D24
mov r6, #0
add r5, r7, #0
str r0, [sp, #0xc]
@@ -636,7 +636,7 @@ _02254CCE:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254CD4: .word 0x02254D24
+_02254CD4: .word MOD25_02254D24
thumb_func_end MOD25_02254C74
thumb_func_start MOD25_02254CD8
@@ -659,16 +659,33 @@ _02254CE6:
thumb_func_end MOD25_02254CD8
.section .rodata
- ; 0x02254CF8
- .byte 0x10, 0xAF, 0x10, 0xCF, 0xA5, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x39, 0x4A, 0x25, 0x02
+
+ .global MOD25_02254CF8
+MOD25_02254CF8: ; 0x02254CF8
+ .byte 0x10, 0xAF, 0x10, 0xCF
+
+ .global MOD25_02254CFC
+MOD25_02254CFC: ; 0x02254CFC
+ .word MOD25_022549A4, MOD25_022549E4, MOD25_02254A38
+
+ .global MOD25_02254D08
+MOD25_02254D08: ; 0x02254D08
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD25_02254D24
+MOD25_02254D24: ; 0x02254D24
+ .byte 0x00, 0x40, 0x07, 0x00
.byte 0x00, 0x40, 0x06, 0x00, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00
- .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x35, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00
+
+ .global MOD25_02254D44
+MOD25_02254D44: ; 0x02254D44
+ .word 0x00, MOD25_02254B34, 0x00
+ .word 0x01, MOD25_02254BC8, 0x00
+ .word 0x02, MOD25_02254BE8, 0x00
+ .word 0x03, MOD25_02254C14, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD25_02254840
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s
index bba03256..12d880aa 100644
--- a/arm9/modules/26/asm/module_26.s
+++ b/arm9/modules/26/asm/module_26.s
@@ -228,7 +228,7 @@ _0225498A:
MOD26_022549DC: ; 0x022549DC
push {r4, r5}
mov r4, #0
- ldr r5, _02254A00 ; =0x02254DF0
+ ldr r5, _02254A00 ; =MOD26_02254DF0
add r2, r4, #0
_022549E4:
add r3, r2, #0
@@ -246,7 +246,7 @@ _022549E6:
pop {r4, r5}
bx lr
nop
-_02254A00: .word 0x02254DF0
+_02254A00: .word MOD26_02254DF0
thumb_func_end MOD26_022549DC
thumb_func_start MOD26_02254A04
@@ -296,7 +296,7 @@ MOD26_02254A4C: ; 0x02254A4C
cmp r1, #3
bhs _02254A7C
lsl r2, r1, #2
- ldr r1, _02254A80 ; =0x02254DE4
+ ldr r1, _02254A80 ; =MOD26_02254DE4
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -313,7 +313,7 @@ MOD26_02254A4C: ; 0x02254A4C
_02254A7C:
pop {r3, r4, r5, pc}
nop
-_02254A80: .word 0x02254DE4
+_02254A80: .word MOD26_02254DE4
thumb_func_end MOD26_02254A4C
thumb_func_start MOD26_02254A84
@@ -552,13 +552,13 @@ MOD26_02254C10: ; 0x02254C10
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254C30 ; =0x02254FF0
+ ldr r0, _02254C30 ; =MOD26_02254FF0
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254C30: .word 0x02254FF0
+_02254C30: .word MOD26_02254FF0
thumb_func_end MOD26_02254C10
thumb_func_start MOD26_02254C34
@@ -599,7 +599,7 @@ MOD26_02254C60: ; 0x02254C60
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254CB8 ; =0x02254FD4
+ ldr r2, _02254CB8 ; =MOD26_02254FD4
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -631,7 +631,7 @@ MOD26_02254C60: ; 0x02254C60
bl MOD26_02254C4C
pop {r3, r4, r5, pc}
.align 2, 0
-_02254CB8: .word 0x02254FD4
+_02254CB8: .word MOD26_02254FD4
_02254CBC: .word 0x04001000
_02254CC0: .word 0xFFFFE0FF
thumb_func_end MOD26_02254C60
@@ -762,7 +762,7 @@ MOD26_02254DAC: ; 0x02254DAC
mov r1, #6
bl FUN_0201886C
mov r5, #0
- ldr r1, _02254DE0 ; =0x02254FD0
+ ldr r1, _02254DE0 ; =MOD26_02254FD0
add r0, #0x84
add r2, r5, #0
_02254DBE:
@@ -785,12 +785,18 @@ _02254DC2:
blt _02254DBE
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254DE0: .word 0x02254FD0
+_02254DE0: .word MOD26_02254FD0
thumb_func_end MOD26_02254DAC
.section .rodata
- ; 0x02254DE4
- .byte 0xA1, 0x4A, 0x25, 0x02, 0xED, 0x4A, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x01, 0x01, 0x01, 0x01
+
+ .global MOD26_02254DE4
+MOD26_02254DE4: ; 0x02254DE4
+ .word MOD26_02254AA0, MOD26_02254AEC, MOD26_02254B98
+
+ .global MOD26_02254DF0
+MOD26_02254DF0: ; 0x02254DF0
+ .byte 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
@@ -820,12 +826,23 @@ _02254DE0: .word 0x02254FD0
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
- .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x0F, 0x08, 0x01
+ .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
+
+ .global MOD26_02254FD0
+MOD26_02254FD0: ; 0x02254FD0
+ .byte 0x04, 0x0F, 0x08, 0x01
+
+ .global MOD26_02254FD4
+MOD26_02254FD4: ; 0x02254FD4
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x61, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x6D, 0x4D, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x91, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD26_02254FF0
+MOD26_02254FF0: ; 0x02254FF0
+ .word 0x00, MOD26_02254C60, 0x00
+ .word 0x01, MOD26_02254D6C, 0x00
+ .word 0x02, MOD26_02254D90, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD26_02254840
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 1b731add..d11eeb44 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -110,7 +110,7 @@ MOD27_022548F8: ; 0x022548F8
cmp r1, #3
bhs _02254924
lsl r2, r1, #2
- ldr r1, _02254928 ; =0x0225533C
+ ldr r1, _02254928 ; =MOD27_0225533C
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -125,7 +125,7 @@ MOD27_022548F8: ; 0x022548F8
_02254924:
pop {r3, r4, r5, pc}
nop
-_02254928: .word 0x0225533C
+_02254928: .word MOD27_0225533C
thumb_func_end MOD27_022548F8
thumb_func_start MOD27_0225492C
@@ -477,13 +477,13 @@ MOD27_02254BB8: ; 0x02254BB8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254BD8 ; =0x02255394
+ ldr r0, _02254BD8 ; =MOD27_02255394
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254BD8: .word 0x02255394
+_02254BD8: .word MOD27_02255394
thumb_func_end MOD27_02254BB8
thumb_func_start MOD27_02254BDC
@@ -525,7 +525,7 @@ MOD27_02254C08: ; 0x02254C08
bl MOD20_022538A0
add r4, r0, #0
ldr r0, [r4, #4]
- ldr r2, _02254CBC ; =0x02255378
+ ldr r2, _02254CBC ; =MOD27_02255378
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -595,7 +595,7 @@ MOD27_02254C08: ; 0x02254C08
add sp, #0x14
pop {r3, r4, r5, r6, pc}
nop
-_02254CBC: .word 0x02255378
+_02254CBC: .word MOD27_02255378
_02254CC0: .word 0x04001000
_02254CC4: .word 0xFFFFE0FF
thumb_func_end MOD27_02254C08
@@ -615,7 +615,7 @@ MOD27_02254CC8: ; 0x02254CC8
ble _02254D54
ldr r4, [sp, #0x14]
ldr r7, [sp, #0x20]
- ldr r5, _02254D5C ; =0x02255360
+ ldr r5, _02254D5C ; =MOD27_02255360
ldr r6, [sp, #0x18]
add r4, #0x3c
_02254CE8:
@@ -673,7 +673,7 @@ _02254D54:
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02254D5C: .word 0x02255360
+_02254D5C: .word MOD27_02255360
thumb_func_end MOD27_02254CC8
thumb_func_start MOD27_02254D60
@@ -927,7 +927,7 @@ MOD27_02254F18: ; 0x02254F18
add r0, r7, #0
str r0, [sp, #0x14]
add r0, #0xe0
- ldr r5, _02254FA8 ; =0x02255348
+ ldr r5, _02254FA8 ; =MOD27_02255348
str r0, [sp, #0x14]
_02254F58:
ldrh r0, [r6, #0xe]
@@ -972,7 +972,7 @@ _02254FA2:
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254FA8: .word 0x02255348
+_02254FA8: .word MOD27_02255348
thumb_func_end MOD27_02254F18
thumb_func_start MOD27_02254FAC
@@ -1013,7 +1013,7 @@ MOD27_02254FAC: ; 0x02254FAC
str r0, [sp, #0x1c]
add r0, #0xcc
ldr r4, [sp, #8]
- ldr r6, _022550C4 ; =0x02255348
+ ldr r6, _022550C4 ; =MOD27_02255348
add r7, #0xff
str r0, [sp, #0x1c]
_02254FFC:
@@ -1112,7 +1112,7 @@ _022550C0:
add sp, #0x34
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_022550C4: .word 0x02255348
+_022550C4: .word MOD27_02255348
thumb_func_end MOD27_02254FAC
thumb_func_start MOD27_022550C8
@@ -1218,8 +1218,8 @@ _02255164:
beq _022551A6
_02255186:
ldrb r0, [r5, #0xa]
- ldr r1, _022551EC ; =0x02255348
- ldr r3, _022551F0 ; =0x0225534A
+ ldr r1, _022551EC ; =MOD27_02255348
+ ldr r3, _022551F0 ; =MOD27_02255348 + 2
lsl r2, r0, #2
add r0, r6, r2
ldrh r1, [r1, r2]
@@ -1237,8 +1237,8 @@ _022551A6:
cmp r0, #0
bne _022551E6
ldrb r0, [r5, #0xa]
- ldr r1, _022551EC ; =0x02255348
- ldr r3, _022551F0 ; =0x0225534A
+ ldr r1, _022551EC ; =MOD27_02255348
+ ldr r3, _022551F0 ; =MOD27_02255348 + 2
lsl r2, r0, #2
add r0, r6, r2
ldrh r1, [r1, r2]
@@ -1271,8 +1271,8 @@ _022551E6:
_022551EA:
pop {r4, r5, r6, pc}
.align 2, 0
-_022551EC: .word 0x02255348
-_022551F0: .word 0x0225534A
+_022551EC: .word MOD27_02255348
+_022551F0: .word MOD27_02255348 + 2
thumb_func_end MOD27_022550F8
thumb_func_start MOD27_022551F4
@@ -1283,7 +1283,7 @@ MOD27_022551F4: ; 0x022551F4
add r7, r2, #0
ldr r6, _02255248 ; =0x00000000
beq _02255242
- ldr r3, _0225524C ; =0x02255348
+ ldr r3, _0225524C ; =MOD27_02255348
_02255202:
ldrh r1, [r3]
ldrh r4, [r3, #2]
@@ -1327,7 +1327,7 @@ _02255242:
pop {r3, r4, r5, r6, r7, pc}
nop
_02255248: .word 0x00000000
-_0225524C: .word 0x02255348
+_0225524C: .word MOD27_02255348
thumb_func_end MOD27_022551F4
thumb_func_start MOD27_02255250
@@ -1449,13 +1449,30 @@ _02255338: .word 0x00000669
thumb_func_end MOD27_022552D0
.section .rodata
- ; 0x0225533C
- .byte 0x49, 0x49, 0x25, 0x02, 0x89, 0x49, 0x25, 0x02, 0x15, 0x4A, 0x25, 0x02, 0x40, 0x00, 0x24, 0x00
- .byte 0xA0, 0x00, 0x24, 0x00, 0x40, 0x00, 0x54, 0x00, 0xA0, 0x00, 0x54, 0x00, 0x40, 0x00, 0x84, 0x00
- .byte 0xA0, 0x00, 0x84, 0x00, 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, 0x00, 0x0E, 0x00
- .byte 0x10, 0x00, 0x0E, 0x00, 0x04, 0x00, 0x14, 0x00, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD27_0225533C
+MOD27_0225533C: ; 0x0225533C
+ .word MOD27_02254948, MOD27_02254988, MOD27_02254A14
+
+ .global MOD27_02255348
+MOD27_02255348: ; 0x02255348
+ .short 0x40, 0x24, 0xA0, 0x24, 0x40, 0x54, 0xA0, 0x54
+ .short 0x40, 0x84, 0xA0, 0x84
+
+ .global MOD27_02255360
+MOD27_02255360: ; 0x02255360
+ .short 0x04, 0x08, 0x10, 0x08, 0x04, 0x0E, 0x10, 0x0E
+ .short 0x04, 0x14, 0x10, 0x14
+
+ .global MOD27_02255378
+MOD27_02255378: ; 0x02255378
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB5, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0xD1, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD27_02255394
+MOD27_02255394: ; 0x02255394
+ .word 0x00, MOD27_02254C08, 0x00
+ .word 0x01, MOD27_022552B4, 0x00
+ .word 0x02, MOD27_022552D0, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 847028e6..dba3ebba 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -176,7 +176,7 @@ _02254986:
thumb_func_start MOD28_0225498C
MOD28_0225498C: ; 0x0225498C
- ldr r3, _022549A8 ; =0x02255E78
+ ldr r3, _022549A8 ; =MOD28_02255E78
mov r2, #0
_02254990:
ldrb r1, [r3]
@@ -192,7 +192,7 @@ _0225499A:
mov r0, #6
bx lr
nop
-_022549A8: .word 0x02255E78
+_022549A8: .word MOD28_02255E78
thumb_func_end MOD28_0225498C
thumb_func_start MOD28_022549AC
@@ -216,7 +216,7 @@ MOD28_022549C0: ; 0x022549C0
cmp r1, #3
bhs _022549EC
lsl r2, r1, #2
- ldr r1, _022549F0 ; =0x02255E80
+ ldr r1, _022549F0 ; =MOD28_02255E80
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -231,7 +231,7 @@ MOD28_022549C0: ; 0x022549C0
_022549EC:
pop {r3, r4, r5, pc}
nop
-_022549F0: .word 0x02255E80
+_022549F0: .word MOD28_02255E80
thumb_func_end MOD28_022549C0
thumb_func_start MOD28_022549F4
@@ -508,13 +508,13 @@ MOD28_02254BC8: ; 0x02254BC8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254BE8 ; =0x02255EF4
+ ldr r0, _02254BE8 ; =MOD28_02255EF4
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254BE8: .word 0x02255EF4
+_02254BE8: .word MOD28_02255EF4
thumb_func_end MOD28_02254BC8
thumb_func_start MOD28_02254BEC
@@ -556,7 +556,7 @@ MOD28_02254C18: ; 0x02254C18
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254CA8 ; =0x02255ED8
+ ldr r2, _02254CA8 ; =MOD28_02255ED8
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -613,7 +613,7 @@ MOD28_02254C18: ; 0x02254C18
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254CA8: .word 0x02255ED8
+_02254CA8: .word MOD28_02255ED8
_02254CAC: .word 0x04001000
_02254CB0: .word 0xFFFFE0FF
thumb_func_end MOD28_02254C18
@@ -673,7 +673,7 @@ _02254D08:
str r0, [sp, #0x28]
add r0, #0x48
ldr r4, [sp, #0x10]
- ldr r6, _02254E4C ; =0x02255EC0
+ ldr r6, _02254E4C ; =MOD28_02255EC0
str r0, [sp, #0x28]
_02254D24:
ldr r0, [sp, #0x1c]
@@ -812,7 +812,7 @@ _02254E46:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254E4C: .word 0x02255EC0
+_02254E4C: .word MOD28_02255EC0
_02254E50: .word 0x00000165
thumb_func_end MOD28_02254CB4
@@ -1062,7 +1062,7 @@ _0225500C:
ldr r2, [r2]
add r0, r5, #0
lsl r3, r2, #2
- ldr r2, _0225503C ; =0x02255E94
+ ldr r2, _0225503C ; =MOD28_02255E94
add r1, r4, #0
ldr r2, [r2, r3]
blx r2
@@ -1080,7 +1080,7 @@ _0225500C:
_02255038:
pop {r3, r4, r5, pc}
nop
-_0225503C: .word 0x02255E94
+_0225503C: .word MOD28_02255E94
thumb_func_end MOD28_02254F84
thumb_func_start MOD28_02255040
@@ -1334,7 +1334,7 @@ _022551D4:
ldr r0, _0225521C ; =0x00000163
strb r1, [r5, r0]
ldrb r2, [r5, r2]
- ldr r0, _02255220 ; =0x02255F20
+ ldr r0, _02255220 ; =MOD28_02255F20
add r1, r4, #0
bl MOD28_022551BC
b _02255208
@@ -1345,7 +1345,7 @@ _022551F4:
ldr r0, [sp]
add r1, r7, #0
lsl r6, r3, #2
- ldr r3, _02255224 ; =0x02255EA8
+ ldr r3, _02255224 ; =MOD28_02255EA8
add r2, r4, #0
ldr r3, [r3, r6]
blx r3
@@ -1356,14 +1356,14 @@ _02255208:
cmp r4, r0
blt _022551D4
_02255212:
- ldr r0, _02255228 ; =0x02255F34
+ ldr r0, _02255228 ; =MOD28_02255F34
bl MOD28_022551BC
pop {r3, r4, r5, r6, r7, pc}
nop
_0225521C: .word 0x00000163
-_02255220: .word 0x02255F20
-_02255224: .word 0x02255EA8
-_02255228: .word 0x02255F34
+_02255220: .word MOD28_02255F20
+_02255224: .word MOD28_02255EA8
+_02255228: .word MOD28_02255F34
thumb_func_end MOD28_022551C4
thumb_func_start MOD28_0225522C
@@ -1594,7 +1594,7 @@ MOD28_022553B4: ; 0x022553B4
add r5, r0, #0
add r4, r2, #0
add r6, r1, #0
- ldr r0, _02255498 ; =0x02255F44
+ ldr r0, _02255498 ; =MOD28_02255F44
add r1, r4, #0
bl MOD28_022551BC
add r0, r6, #0
@@ -1699,7 +1699,7 @@ _0225548A:
_02255494:
pop {r3, r4, r5, r6, r7, pc}
nop
-_02255498: .word 0x02255F44
+_02255498: .word MOD28_02255F44
thumb_func_end MOD28_022553B4
thumb_func_start MOD28_0225549C
@@ -1709,7 +1709,7 @@ MOD28_0225549C: ; 0x0225549C
add r5, r0, #0
add r4, r2, #0
add r6, r1, #0
- ldr r0, _022555AC ; =0x02255F58
+ ldr r0, _022555AC ; =MOD28_02255F58
add r1, r4, #0
bl MOD28_022551BC
add r0, r6, #0
@@ -1787,7 +1787,7 @@ _02255516:
mul r7, r0
add r6, #0xf
ldrb r2, [r6, r7]
- ldr r0, _022555B0 ; =0x02255E90
+ ldr r0, _022555B0 ; =MOD28_02255E90
ldr r1, [sp, #4]
ldrb r0, [r0, r2]
mul r0, r1
@@ -1795,7 +1795,7 @@ _02255516:
bl _s32_div_f
str r0, [sp, #4]
ldrb r2, [r6, r7]
- ldr r0, _022555B0 ; =0x02255E90
+ ldr r0, _022555B0 ; =MOD28_02255E90
ldr r1, [sp, #8]
ldrb r0, [r0, r2]
mul r0, r1
@@ -1835,8 +1835,8 @@ _022555A6:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
-_022555AC: .word 0x02255F58
-_022555B0: .word 0x02255E90
+_022555AC: .word MOD28_02255F58
+_022555B0: .word MOD28_02255E90
thumb_func_end MOD28_0225549C
thumb_func_start MOD28_022555B4
@@ -1846,7 +1846,7 @@ MOD28_022555B4: ; 0x022555B4
add r5, r0, #0
add r6, r2, #0
add r4, r1, #0
- ldr r0, _02255688 ; =0x02255F6C
+ ldr r0, _02255688 ; =MOD28_02255F6C
add r1, r6, #0
bl MOD28_022551BC
add r0, r4, #0
@@ -1895,7 +1895,7 @@ MOD28_022555B4: ; 0x022555B4
mul r7, r0
add r4, #0xf
ldrb r2, [r4, r7]
- ldr r0, _0225568C ; =0x02255E8C
+ ldr r0, _0225568C ; =MOD28_02255E8C
ldr r1, [sp, #4]
ldrb r0, [r0, r2]
mul r0, r1
@@ -1903,7 +1903,7 @@ MOD28_022555B4: ; 0x022555B4
bl _s32_div_f
str r0, [sp, #4]
ldrb r2, [r4, r7]
- ldr r0, _0225568C ; =0x02255E8C
+ ldr r0, _0225568C ; =MOD28_02255E8C
ldr r1, [sp, #8]
ldrb r0, [r0, r2]
mul r0, r1
@@ -1942,8 +1942,8 @@ _0225567A:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02255688: .word 0x02255F6C
-_0225568C: .word 0x02255E8C
+_02255688: .word MOD28_02255F6C
+_0225568C: .word MOD28_02255E8C
thumb_func_end MOD28_022555B4
thumb_func_start MOD28_02255690
@@ -1953,7 +1953,7 @@ MOD28_02255690: ; 0x02255690
add r5, r0, #0
add r7, r2, #0
add r4, r1, #0
- ldr r0, _02255764 ; =0x02255F80
+ ldr r0, _02255764 ; =MOD28_02255F80
add r1, r7, #0
bl MOD28_022551BC
add r4, #0x4c
@@ -2050,7 +2050,7 @@ _02255756:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02255764: .word 0x02255F80
+_02255764: .word MOD28_02255F80
thumb_func_end MOD28_02255690
thumb_func_start MOD28_02255768
@@ -2059,7 +2059,7 @@ MOD28_02255768: ; 0x02255768
add r5, r0, #0
add r7, r2, #0
add r4, r1, #0
- ldr r0, _02255808 ; =0x02255F94
+ ldr r0, _02255808 ; =MOD28_02255F94
add r1, r7, #0
bl MOD28_022551BC
add r4, #0x4c
@@ -2131,7 +2131,7 @@ _022557FA:
bl MOD28_0225522C
pop {r3, r4, r5, r6, r7, pc}
nop
-_02255808: .word 0x02255F94
+_02255808: .word MOD28_02255F94
thumb_func_end MOD28_02255768
thumb_func_start MOD28_0225580C
@@ -2145,7 +2145,7 @@ MOD28_0225580C: ; 0x0225580C
mov r0, #0x38
mul r0, r6
add r4, r1, r0
- ldr r0, _02255918 ; =0x02255FA8
+ ldr r0, _02255918 ; =MOD28_02255FA8
add r1, r6, #0
bl MOD28_022551BC
add r0, r4, #0
@@ -2266,7 +2266,7 @@ _022558A6:
_02255916:
pop {r4, r5, r6, pc}
.align 2, 0
-_02255918: .word 0x02255FA8
+_02255918: .word MOD28_02255FA8
_0225591C: .word 0x00000669
thumb_func_end MOD28_0225580C
@@ -2965,27 +2965,86 @@ _02255E74: .word 0x00000163
thumb_func_end MOD28_02255920
.section .rodata
- ; 0x02255E78
- .byte 0x01, 0x23, 0x46, 0x96, 0xC8, 0xFF, 0x00, 0x00, 0x11, 0x4A, 0x25, 0x02, 0x51, 0x4A, 0x25, 0x02
- .byte 0xC1, 0x4A, 0x25, 0x02, 0x64, 0x96, 0xAF, 0xC8, 0x64, 0x96, 0xAF, 0xC8, 0xC5, 0x50, 0x25, 0x02
- .byte 0xE5, 0x50, 0x25, 0x02, 0x29, 0x51, 0x25, 0x02, 0x3D, 0x51, 0x25, 0x02, 0x89, 0x51, 0x25, 0x02
- .byte 0xB5, 0x53, 0x25, 0x02, 0x9D, 0x54, 0x25, 0x02, 0xB5, 0x55, 0x25, 0x02, 0x91, 0x56, 0x25, 0x02
- .byte 0x69, 0x57, 0x25, 0x02, 0x0D, 0x58, 0x25, 0x02, 0x30, 0x00, 0x2C, 0x00, 0xB0, 0x00, 0x2C, 0x00
- .byte 0x30, 0x00, 0x5C, 0x00, 0xB0, 0x00, 0x5C, 0x00, 0x30, 0x00, 0x8C, 0x00, 0xB0, 0x00, 0x8C, 0x00
+
+ .global MOD28_02255E78
+MOD28_02255E78: ; 0x02255E78
+ .byte 0x01, 0x23, 0x46, 0x96, 0xC8, 0xFF, 0x00, 0x00
+
+ .global MOD28_02255E80
+MOD28_02255E80: ; 0x02255E80
+ .word MOD28_02254A10, MOD28_02254A50, MOD28_02254AC0
+
+ .global MOD28_02255E8C
+MOD28_02255E8C: ; 0x02255E8C
+ .byte 0x64, 0x96, 0xAF, 0xC8
+
+ .global MOD28_02255E90
+MOD28_02255E90: ; 0x02255E90
+ .byte 0x64, 0x96, 0xAF, 0xC8
+
+ .global MOD28_02255E94
+MOD28_02255E94: ; 0x02255E94
+ .word MOD28_022550C4, MOD28_022550E4, MOD28_02255128, MOD28_0225513C
+ .word MOD28_02255188
+
+ .global MOD28_02255EA8
+MOD28_02255EA8: ; 0x02255EA8
+ .word MOD28_022553B4, MOD28_0225549C, MOD28_022555B4, MOD28_02255690
+ .word MOD28_02255768, MOD28_0225580C
+
+ .global MOD28_02255EC0
+MOD28_02255EC0: ; 0x02255EC0
+ .short 0x30, 0x2C, 0xB0, 0x2C, 0x30, 0x5C, 0xB0, 0x5C
+ .short 0x30, 0x8C, 0xB0, 0x8C
+
+ .global MOD28_02255ED8
+MOD28_02255ED8: ; 0x02255ED8
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x19, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD28_02255EF4
+MOD28_02255EF4: ; 0x02255EF4
+ .word 0x00, MOD28_02254C18, 0x00
+ .word 0x01, MOD28_02254F18, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .data
- ; 0x02255F20
- .byte 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x52, 0x45, 0x46, 0x5B, 0x25, 0x64, 0x5D
- .byte 0x0A, 0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D
- .byte 0x0A, 0x00, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x44, 0x65
- .byte 0x66, 0x61, 0x75, 0x6C, 0x74, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64
- .byte 0x5D, 0x20, 0x52, 0x65, 0x61, 0x4C, 0x69, 0x6B, 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F
- .byte 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x52, 0x65, 0x61, 0x48, 0x61, 0x74, 0x65, 0x0A, 0x00, 0x00
- .byte 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x54, 0x63, 0x67, 0x4C, 0x69, 0x6B
- .byte 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x54, 0x63
- .byte 0x68, 0x48, 0x61, 0x74, 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64
- .byte 0x5D, 0x20, 0x52, 0x65, 0x73, 0x65, 0x74, 0x21, 0x21, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD28_02255F20
+MOD28_02255F20: ; 0x02255F20
+ .asciz "icon[%d] REF[%d]\n"
+
+ .balign 4
+ .global MOD28_02255F34
+MOD28_02255F34: ; 0x02255F34
+ .asciz "------------\n"
+
+ .balign 4
+ .global MOD28_02255F44
+MOD28_02255F44: ; 0x02255F44
+ .asciz " icon[%d] Default\n"
+
+ .balign 4
+ .global MOD28_02255F58
+MOD28_02255F58: ; 0x02255F58
+ .asciz " icon[%d] ReaLike\n"
+
+ .balign 4
+ .global MOD28_02255F6C
+MOD28_02255F6C: ; 0x02255F6C
+ .asciz " icon[%d] ReaHate\n"
+
+ .balign 4
+ .global MOD28_02255F80
+MOD28_02255F80: ; 0x02255F80
+ .asciz " icon[%d] TcgLike\n"
+
+ .balign 4
+ .global MOD28_02255F94
+MOD28_02255F94: ; 0x02255F94
+ .asciz " icon[%d] TchHate\n"
+
+ .balign 4
+ .global MOD28_02255FA8
+MOD28_02255FA8: ; 0x02255FA8
+ .asciz " icon[%d] Reset!!\n"
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s
index 80e5d5b9..6473d5da 100644
--- a/arm9/modules/29/asm/module_29.s
+++ b/arm9/modules/29/asm/module_29.s
@@ -101,7 +101,7 @@ MOD29_022548E0: ; 0x022548E0
cmp r1, #3
bhs _0225490C
lsl r2, r1, #2
- ldr r1, _02254910 ; =0x0225509C
+ ldr r1, _02254910 ; =MOD29_0225509C
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -116,7 +116,7 @@ MOD29_022548E0: ; 0x022548E0
_0225490C:
pop {r3, r4, r5, pc}
nop
-_02254910: .word 0x0225509C
+_02254910: .word MOD29_0225509C
thumb_func_end MOD29_022548E0
thumb_func_start MOD29_02254914
@@ -386,7 +386,7 @@ _02254AE0:
bl FX_Sqrt
ldrb r1, [r5, #4]
lsl r2, r1, #2
- ldr r1, _02254B6C ; =0x022550A8
+ ldr r1, _02254B6C ; =MOD29_022550A8
ldr r1, [r1, r2]
cmp r0, r1
bgt _02254B46
@@ -438,7 +438,7 @@ _02254B66:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254B6C: .word 0x022550A8
+_02254B6C: .word MOD29_022550A8
thumb_func_end MOD29_02254AA8
thumb_func_start MOD29_02254B70
@@ -554,7 +554,7 @@ MOD29_02254C08: ; 0x02254C08
bl FUN_02006A34
add r2, r6, #0
ldr r0, [r6, #0x30]
- ldr r1, _02254C7C ; =0x022550C0
+ ldr r1, _02254C7C ; =MOD29_022550C0
add r2, #0x58
bl MOD20_02253E74
mov r1, #1
@@ -566,7 +566,7 @@ MOD29_02254C08: ; 0x02254C08
add r7, #0x58
_02254C54:
ldr r0, [r6, #0x30]
- ldr r1, _02254C80 ; =0x022550D0
+ ldr r1, _02254C80 ; =MOD29_022550D0
add r2, r7, #0
bl MOD20_02253E74
mov r1, #1
@@ -584,8 +584,8 @@ _02254C74:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
-_02254C7C: .word 0x022550C0
-_02254C80: .word 0x022550D0
+_02254C7C: .word MOD29_022550C0
+_02254C80: .word MOD29_022550D0
thumb_func_end MOD29_02254C08
thumb_func_start MOD29_02254C84
@@ -633,13 +633,13 @@ MOD29_02254CC0: ; 0x02254CC0
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254CE0 ; =0x022550FC
+ ldr r0, _02254CE0 ; =MOD29_022550FC
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254CE0: .word 0x022550FC
+_02254CE0: .word MOD29_022550FC
thumb_func_end MOD29_02254CC0
thumb_func_start MOD29_02254CE4
@@ -681,7 +681,7 @@ MOD29_02254D10: ; 0x02254D10
bl MOD20_022538A0
add r4, r0, #0
ldr r0, [r4, #4]
- ldr r2, _02254DE8 ; =0x022550E0
+ ldr r2, _02254DE8 ; =MOD29_022550E0
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -770,7 +770,7 @@ MOD29_02254D10: ; 0x02254D10
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254DE8: .word 0x022550E0
+_02254DE8: .word MOD29_022550E0
_02254DEC: .word 0x04001000
_02254DF0: .word 0xFFFFE0FF
thumb_func_end MOD29_02254D10
@@ -816,13 +816,13 @@ _02254E40:
ldr r2, [r4]
ldr r0, [sp]
lsl r3, r2, #2
- ldr r2, _02254E50 ; =0x022550B4
+ ldr r2, _02254E50 ; =MOD29_022550B4
add r1, r5, #0
ldr r2, [r2, r3]
blx r2
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254E50: .word 0x022550B4
+_02254E50: .word MOD29_022550B4
thumb_func_end MOD29_02254E10
thumb_func_start MOD29_02254E54
@@ -1122,13 +1122,38 @@ MOD29_0225508C: ; 0x0225508C
thumb_func_end MOD29_0225508C
.section .rodata
- ; 0x0225509C
- .byte 0x31, 0x49, 0x25, 0x02, 0x71, 0x49, 0x25, 0x02, 0x8D, 0x4B, 0x25, 0x02, 0x00, 0x80, 0x00, 0x00
- .byte 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x55, 0x4E, 0x25, 0x02, 0xCD, 0x4E, 0x25, 0x02
- .byte 0x41, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
- .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+ .global MOD29_0225509C
+MOD29_0225509C: ; 0x0225509C
+ .word MOD29_02254930, MOD29_02254970, MOD29_02254B8C
+
+ .global MOD29_022550A8
+MOD29_022550A8: ; 0x022550A8
+ .byte 0x00, 0x80, 0x00, 0x00
+ .byte 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00
+
+ .global MOD29_022550B4
+MOD29_022550B4: ; 0x022550B4
+ .word MOD29_02254E54, MOD29_02254ECC, MOD29_02254F40
+
+ .global MOD29_022550C0
+MOD29_022550C0: ; 0x022550C0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+ .byte 0x00, 0x01, 0x00, 0x00
+
+ .global MOD29_022550D0
+MOD29_022550D0: ; 0x022550D0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02
+ .byte 0x01, 0x00, 0x00, 0x00
+
+ .global MOD29_022550E0
+MOD29_022550E0: ; 0x022550E0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0xF5, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x11, 0x4E, 0x25, 0x02
- .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD29_022550FC
+MOD29_022550FC: ; 0x022550FC
+ .word 0x00, MOD29_02254D10, 0x00
+ .word 0x01, MOD29_02254DF4, 0x00
+ .word 0x02, MOD29_02254E10, 0x04
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s
index eadbd751..3be3474f 100644
--- a/arm9/modules/30/asm/module_30.s
+++ b/arm9/modules/30/asm/module_30.s
@@ -86,7 +86,7 @@ _022548BE:
strb r0, [r5, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _022548FC ; =0x02254DA0
+ ldr r0, _022548FC ; =MOD30_02254DA0
ldr r2, _02254900 ; =MOD30_02254904
mov r1, #1
add r3, r5, #0
@@ -101,7 +101,7 @@ _022548F6:
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
nop
-_022548FC: .word 0x02254DA0
+_022548FC: .word MOD30_02254DA0
_02254900: .word MOD30_02254904
thumb_func_end MOD30_0225489C
@@ -146,7 +146,7 @@ MOD30_02254930: ; 0x02254930
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254968 ; =0x02254DA4
+ ldr r1, _02254968 ; =MOD30_02254DA4
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -160,7 +160,7 @@ MOD30_02254930: ; 0x02254930
_02254966:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254968: .word 0x02254DA4
+_02254968: .word MOD30_02254DA4
thumb_func_end MOD30_02254930
thumb_func_start MOD30_0225496C
@@ -418,7 +418,7 @@ MOD30_02254AE0: ; 0x02254AE0
bl MOD20_02253FBC
add r2, r7, #0
ldr r0, [r7, #0x20]
- ldr r1, _02254B8C ; =0x02254DB0
+ ldr r1, _02254B8C ; =MOD30_02254DB0
add r2, #0x38
bl MOD20_02253E74
mov r1, #0x50
@@ -434,7 +434,7 @@ MOD30_02254AE0: ; 0x02254AE0
str r0, [sp, #0x10]
_02254B5C:
ldr r0, [r7, #0x20]
- ldr r1, _02254B90 ; =0x02254DC0
+ ldr r1, _02254B90 ; =MOD30_02254DC0
ldr r2, [sp, #0x10]
bl MOD20_02253E74
mov r2, #1
@@ -455,8 +455,8 @@ _02254B5C:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02254B8C: .word 0x02254DB0
-_02254B90: .word 0x02254DC0
+_02254B8C: .word MOD30_02254DB0
+_02254B90: .word MOD30_02254DC0
thumb_func_end MOD30_02254AE0
thumb_func_start MOD30_02254B94
@@ -497,13 +497,13 @@ MOD30_02254BC8: ; 0x02254BC8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254BE8 ; =0x02254DEC
+ ldr r0, _02254BE8 ; =MOD30_02254DEC
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254BE8: .word 0x02254DEC
+_02254BE8: .word MOD30_02254DEC
thumb_func_end MOD30_02254BC8
thumb_func_start MOD30_02254BEC
@@ -545,7 +545,7 @@ MOD30_02254C18: ; 0x02254C18
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254C9C ; =0x02254DD0
+ ldr r2, _02254C9C ; =MOD30_02254DD0
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -597,7 +597,7 @@ MOD30_02254C18: ; 0x02254C18
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254C9C: .word 0x02254DD0
+_02254C9C: .word MOD30_02254DD0
_02254CA0: .word 0x04001000
_02254CA4: .word 0xFFFFE0FF
thumb_func_end MOD30_02254C18
@@ -730,13 +730,32 @@ _02254D9C: .word 0x040002A8
thumb_func_end MOD30_02254D28
.section .rodata
- ; 0x02254DA0
- .byte 0x64, 0x9C, 0x52, 0x92, 0x89, 0x49, 0x25, 0x02, 0xC9, 0x49, 0x25, 0x02, 0x5D, 0x4A, 0x25, 0x02
+
+ .global MOD30_02254DA0
+MOD30_02254DA0: ; 0x02254DA0
+ .byte 0x64, 0x9C, 0x52, 0x92
+
+ .global MOD30_02254DA4
+MOD30_02254DA4: ; 0x02254DA4
+ .word MOD30_02254988, MOD30_022549C8, MOD30_02254A5C
+
+ .global MOD30_02254DB0
+MOD30_02254DB0: ; 0x02254DB0
.byte 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD30_02254DC0
+MOD30_02254DC0: ; 0x02254DC0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD30_02254DD0
+MOD30_02254DD0: ; 0x02254DD0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x19, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xA9, 0x4C, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xC5, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x05, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD30_02254DEC
+MOD30_02254DEC: ; 0x02254DEC
+ .word 0x00, MOD30_02254C18, 0x00
+ .word 0x01, MOD30_02254CA8, 0x00
+ .word 0x02, MOD30_02254CC4, 0x00
+ .word 0x03, MOD30_02254D04, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s
index 5a5feeea..6b884f10 100644
--- a/arm9/modules/32/asm/module_32.s
+++ b/arm9/modules/32/asm/module_32.s
@@ -84,7 +84,7 @@ _022548BA:
strb r0, [r5, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _022548F8 ; =0x02254C54
+ ldr r0, _022548F8 ; =MOD32_02254C54
ldr r2, _022548FC ; =MOD32_02254918
mov r1, #2
add r3, r5, #0
@@ -101,7 +101,7 @@ _022548F2:
add sp, #8
pop {r4, r5, r6, pc}
.align 2, 0
-_022548F8: .word 0x02254C54
+_022548F8: .word MOD32_02254C54
_022548FC: .word MOD32_02254918
thumb_func_end MOD32_0225489C
@@ -140,7 +140,7 @@ MOD32_02254920: ; 0x02254920
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254958 ; =0x02254C5C
+ ldr r1, _02254958 ; =MOD32_02254C5C
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -154,7 +154,7 @@ MOD32_02254920: ; 0x02254920
_02254956:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254958: .word 0x02254C5C
+_02254958: .word MOD32_02254C5C
thumb_func_end MOD32_02254920
thumb_func_start MOD32_0225495C
@@ -372,7 +372,7 @@ MOD32_02254A9C: ; 0x02254A9C
bl MOD20_02253FBC
add r2, r5, #0
ldr r0, [r5, #0x20]
- ldr r1, _02254AEC ; =0x02254C68
+ ldr r1, _02254AEC ; =MOD32_02254C68
add r2, #0x28
bl MOD20_02253E74
str r0, [r5, #0x24]
@@ -386,7 +386,7 @@ _02254AE6:
add sp, #0xc
pop {r4, r5, pc}
nop
-_02254AEC: .word 0x02254C68
+_02254AEC: .word MOD32_02254C68
thumb_func_end MOD32_02254A9C
thumb_func_start MOD32_02254AF0
@@ -414,13 +414,13 @@ MOD32_02254B08: ; 0x02254B08
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254B28 ; =0x02254C94
+ ldr r0, _02254B28 ; =MOD32_02254C94
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254B28: .word 0x02254C94
+_02254B28: .word MOD32_02254C94
thumb_func_end MOD32_02254B08
thumb_func_start MOD32_02254B2C
@@ -462,7 +462,7 @@ MOD32_02254B58: ; 0x02254B58
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254BDC ; =0x02254C78
+ ldr r2, _02254BDC ; =MOD32_02254C78
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -514,7 +514,7 @@ MOD32_02254B58: ; 0x02254B58
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254BDC: .word 0x02254C78
+_02254BDC: .word MOD32_02254C78
_02254BE0: .word 0x04001000
_02254BE4: .word 0xFFFFE0FF
thumb_func_end MOD32_02254B58
@@ -572,11 +572,28 @@ _02254C50: .word 0x00000663
thumb_func_end MOD32_02254C08
.section .rodata
- ; 0x02254C54
- .byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84, 0x79, 0x49, 0x25, 0x02, 0xB9, 0x49, 0x25, 0x02
- .byte 0x21, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+ .global MOD32_02254C54
+MOD32_02254C54: ; 0x02254C54
+ .byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84
+
+ .global MOD32_02254C5C
+MOD32_02254C5C: ; 0x02254C5C
+ .word MOD32_02254978, MOD32_022549B8, MOD32_02254A20
+
+ .global MOD32_02254C68
+MOD32_02254C68: ; 0x02254C68
+ .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD32_02254C78
+MOD32_02254C78: ; 0x02254C78
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x59, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD32_02254C94
+MOD32_02254C94: ; 0x02254C94
+ .word 0x00, MOD32_02254B58, 0x00
+ .word 0x01, MOD32_02254BE8, 0x00
+ .word 0x02, MOD32_02254C08, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s
index 83b48eba..e7d626bc 100644
--- a/arm9/modules/33/asm/module_33.s
+++ b/arm9/modules/33/asm/module_33.s
@@ -95,7 +95,7 @@ MOD33_022548D4: ; 0x022548D4
cmp r1, #3
bhs _02254900
lsl r2, r1, #2
- ldr r1, _02254904 ; =0x02254AF4
+ ldr r1, _02254904 ; =MOD33_02254AF4
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -110,7 +110,7 @@ MOD33_022548D4: ; 0x022548D4
_02254900:
pop {r3, r4, r5, pc}
nop
-_02254904: .word 0x02254AF4
+_02254904: .word MOD33_02254AF4
thumb_func_end MOD33_022548D4
thumb_func_start MOD33_02254908
@@ -264,13 +264,13 @@ MOD33_022549E8: ; 0x022549E8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254A08 ; =0x02254B1C
+ ldr r0, _02254A08 ; =MOD33_02254B1C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254A08: .word 0x02254B1C
+_02254A08: .word MOD33_02254B1C
thumb_func_end MOD33_022549E8
thumb_func_start MOD33_02254A0C
@@ -312,7 +312,7 @@ MOD33_02254A38: ; 0x02254A38
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254ACC ; =0x02254B00
+ ldr r2, _02254ACC ; =MOD33_02254B00
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -371,7 +371,7 @@ MOD33_02254A38: ; 0x02254A38
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254ACC: .word 0x02254B00
+_02254ACC: .word MOD33_02254B00
_02254AD0: .word 0x04001000
_02254AD4: .word 0xFFFFE0FF
thumb_func_end MOD33_02254A38
@@ -392,12 +392,22 @@ MOD33_02254AD8: ; 0x02254AD8
thumb_func_end MOD33_02254AD8
.section .rodata
- ; 0x02254AF4
- .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD33_02254AF4
+MOD33_02254AF4: ; 0x02254AF4
+ .word MOD33_02254924, MOD33_02254964, MOD33_02254978
+
+ .global MOD33_02254B00
+MOD33_02254B00: ; 0x02254B00
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x4A, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD33_02254B1C
+MOD33_02254B1C: ; 0x02254B1C
+ .word 0x00, MOD33_02254A38, 0x00
+ .word 0x01, MOD33_02254AD8, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD33_02254840
diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index d53be79b..4a439bd8 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -69,7 +69,7 @@ MOD34_0225489C: ; 0x0225489C
str r4, [r5, #0x28]
mov r0, #8
str r0, [sp]
- ldr r0, _022548E0 ; =0x02254C7C
+ ldr r0, _022548E0 ; =MOD34_02254C7C
ldr r2, _022548E4 ; =MOD34_02254904
mov r1, #6
add r3, r5, #0
@@ -89,7 +89,7 @@ _022548DC:
mov r0, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_022548E0: .word 0x02254C7C
+_022548E0: .word MOD34_02254C7C
_022548E4: .word MOD34_02254904
thumb_func_end MOD34_0225489C
@@ -131,7 +131,7 @@ MOD34_0225490C: ; 0x0225490C
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254944 ; =0x02254C70
+ ldr r1, _02254944 ; =MOD34_02254C70
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -145,7 +145,7 @@ MOD34_0225490C: ; 0x0225490C
_02254942:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254944: .word 0x02254C70
+_02254944: .word MOD34_02254C70
thumb_func_end MOD34_0225490C
thumb_func_start MOD34_02254948
@@ -353,13 +353,13 @@ MOD34_02254A98: ; 0x02254A98
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254AB8 ; =0x02254CBC
+ ldr r0, _02254AB8 ; =MOD34_02254CBC
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254AB8: .word 0x02254CBC
+_02254AB8: .word MOD34_02254CBC
thumb_func_end MOD34_02254A98
thumb_func_start MOD34_02254ABC
@@ -404,7 +404,7 @@ MOD34_02254AE8: ; 0x02254AE8
bl MOD20_022538A4
add r5, r0, #0
ldr r0, [r6, #4]
- ldr r2, _02254B8C ; =0x02254CA0
+ ldr r2, _02254B8C ; =MOD34_02254CA0
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -469,7 +469,7 @@ _02254B4A:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254B8C: .word 0x02254CA0
+_02254B8C: .word MOD34_02254CA0
_02254B90: .word 0x04001000
_02254B94: .word 0xFFFFE0FF
thumb_func_end MOD34_02254AE8
@@ -548,7 +548,7 @@ MOD34_02254C1C: ; 0x02254C1C
add r4, r2, #0
add r6, r3, #0
bl FUN_0201886C
- ldr r1, _02254C6C ; =0x02254C94
+ ldr r1, _02254C6C ; =MOD34_02254C94
lsl r2, r5, #1
ldrh r1, [r1, r2]
lsl r1, r1, #1
@@ -585,17 +585,34 @@ _02254C54:
blt _02254C50
pop {r4, r5, r6, pc}
nop
-_02254C6C: .word 0x02254C94
+_02254C6C: .word MOD34_02254C94
thumb_func_end MOD34_02254C1C
.section .rodata
- ; 0x02254C70
- .byte 0x65, 0x49, 0x25, 0x02, 0xA5, 0x49, 0x25, 0x02, 0x29, 0x4A, 0x25, 0x02, 0x10, 0x40, 0x10, 0x40
+
+ .global MOD34_02254C70
+MOD34_02254C70: ; 0x02254C70
+ .word MOD34_02254964, MOD34_022549A4, MOD34_02254A28
+
+ .global MOD34_02254C7C
+MOD34_02254C7C: ; 0x02254C7C
+ .byte 0x10, 0x40, 0x10, 0x40
.byte 0x10, 0x40, 0xA0, 0xD0, 0x48, 0x78, 0x10, 0x40, 0x48, 0x78, 0xA0, 0xD0, 0x80, 0xB0, 0x10, 0x40
- .byte 0x80, 0xB0, 0xA0, 0xD0, 0x42, 0x00, 0x54, 0x00, 0x22, 0x01, 0x34, 0x01, 0x02, 0x02, 0x14, 0x02
+ .byte 0x80, 0xB0, 0xA0, 0xD0
+
+ .global MOD34_02254C94
+MOD34_02254C94: ; 0x02254C94
+ .short 0x42, 0x54, 0x122, 0x134, 0x202, 0x214
+
+ .global MOD34_02254CA0
+MOD34_02254CA0: ; 0x02254CA0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xE9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x99, 0x4B, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD34_02254CBC
+MOD34_02254CBC: ; 0x02254CBC
+ .word 0x00, MOD34_02254AE8, 0x00
+ .word 0x01, MOD34_02254B98, 0x00
+ .word 0x02, MOD34_02254BB4, 0x00
+ .word 0x03, MOD34_02254BE8, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index dfdc8530..48953e9f 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -106,7 +106,7 @@ MOD35_022548F0: ; 0x022548F0
cmp r1, #3
bhs _0225491C
lsl r2, r1, #2
- ldr r1, _02254920 ; =0x022550B8
+ ldr r1, _02254920 ; =MOD35_022550B8
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -121,7 +121,7 @@ MOD35_022548F0: ; 0x022548F0
_0225491C:
pop {r3, r4, r5, pc}
nop
-_02254920: .word 0x022550B8
+_02254920: .word MOD35_022550B8
thumb_func_end MOD35_022548F0
thumb_func_start MOD35_02254924
@@ -474,7 +474,7 @@ MOD35_02254B54: ; 0x02254B54
mov r4, #0
str r0, [sp, #0x18]
add r0, #0x64
- ldr r6, _02254C14 ; =0x02255110
+ ldr r6, _02254C14 ; =MOD35_02255110
add r5, r7, #0
str r4, [sp, #0x10]
str r0, [sp, #0x18]
@@ -517,7 +517,7 @@ _02254BEE:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254C14: .word 0x02255110
+_02254C14: .word MOD35_02255110
thumb_func_end MOD35_02254B54
thumb_func_start MOD35_02254C18
@@ -558,13 +558,13 @@ MOD35_02254C48: ; 0x02254C48
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254C68 ; =0x022550E0
+ ldr r0, _02254C68 ; =MOD35_022550E0
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254C68: .word 0x022550E0
+_02254C68: .word MOD35_022550E0
thumb_func_end MOD35_02254C48
thumb_func_start MOD35_02254C6C
@@ -606,7 +606,7 @@ MOD35_02254C98: ; 0x02254C98
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254D24 ; =0x022550C4
+ ldr r2, _02254D24 ; =MOD35_022550C4
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -662,7 +662,7 @@ MOD35_02254C98: ; 0x02254C98
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254D24: .word 0x022550C4
+_02254D24: .word MOD35_022550C4
_02254D28: .word 0x0400104C
_02254D2C: .word 0xFFFFE0FF
thumb_func_end MOD35_02254C98
@@ -1135,13 +1135,27 @@ _022550B0:
thumb_func_end MOD35_02255094
.section .rodata
- ; 0x022550B8
- .byte 0x41, 0x49, 0x25, 0x02, 0x81, 0x49, 0x25, 0x02, 0xD5, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD35_022550B8
+MOD35_022550B8: ; 0x022550B8
+ .word MOD35_02254940, MOD35_02254980, MOD35_022549D4
+
+ .global MOD35_022550C4
+MOD35_022550C4: ; 0x022550C4
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x4C, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x85, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+
+ .global MOD35_022550E0
+MOD35_022550E0: ; 0x022550E0
+ .word 0x00, MOD35_02254C98, 0x00
+ .word 0x01, MOD35_02254D30, 0x00
+ .word 0x02, MOD35_02254D84, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD35_02255110
+MOD35_02255110: ; 0x02255110
+ .byte 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
.byte 0x07, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x08, 0x00
.byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x08, 0x00
.byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x02, 0x00
diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s
index d5ba87c7..528f376a 100644
--- a/arm9/modules/36/asm/module_36.s
+++ b/arm9/modules/36/asm/module_36.s
@@ -83,7 +83,7 @@ MOD36_022548A0: ; 0x022548A0
bl MOD36_02254E10
mov r0, #8
str r0, [sp]
- ldr r0, _02254908 ; =0x022553E8
+ ldr r0, _02254908 ; =MOD36_022553E8
ldr r2, _0225490C ; =MOD36_02254980
mov r1, #3
add r3, r5, #0
@@ -104,7 +104,7 @@ _022548FC:
pop {r3, r4, r5, r6, pc}
nop
_02254904: .word 0x00005B78
-_02254908: .word 0x022553E8
+_02254908: .word MOD36_022553E8
_0225490C: .word MOD36_02254980
_02254910: .word 0x00005B84
thumb_func_end MOD36_022548A0
@@ -143,7 +143,7 @@ MOD36_02254938: ; 0x02254938
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _0225497C ; =0x022553F4
+ ldr r1, _0225497C ; =MOD36_022553F4
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -159,7 +159,7 @@ _02254974:
pop {r3, r4, r5, pc}
nop
_02254978: .word 0x00005B80
-_0225497C: .word 0x022553F4
+_0225497C: .word MOD36_022553F4
thumb_func_end MOD36_02254938
thumb_func_start MOD36_02254980
@@ -892,7 +892,7 @@ MOD36_02254E8C: ; 0x02254E8C
add r0, r7, #0
str r0, [sp, #0xc]
add r0, #0x34
- ldr r4, _02254EE0 ; =0x02255440
+ ldr r4, _02254EE0 ; =MOD36_02255440
mov r6, #0
add r5, r7, #0
str r0, [sp, #0xc]
@@ -910,7 +910,7 @@ _02254EC6:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254EE0: .word 0x02255440
+_02254EE0: .word MOD36_02255440
thumb_func_end MOD36_02254E8C
thumb_func_start MOD36_02254EE4
@@ -948,13 +948,13 @@ MOD36_02254F0C: ; 0x02254F0C
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254F2C ; =0x02255480
+ ldr r0, _02254F2C ; =MOD36_02255480
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254F2C: .word 0x02255480
+_02254F2C: .word MOD36_02255480
thumb_func_end MOD36_02254F0C
thumb_func_start MOD36_02254F30
@@ -1002,12 +1002,12 @@ _02254F70:
bl MOD20_022538A0
add r4, r0, #0
ldr r0, [r4, #4]
- ldr r2, _0225502C ; =0x02255408
+ ldr r2, _0225502C ; =MOD36_02255408
mov r1, #6
mov r3, #0
bl FUN_02016C18
ldr r0, [r4, #4]
- ldr r2, _02255030 ; =0x02255424
+ ldr r2, _02255030 ; =MOD36_02255424
mov r1, #7
mov r3, #0
bl FUN_02016C18
@@ -1081,8 +1081,8 @@ _02255028:
add sp, #0x14
pop {r3, r4, r5, r6, pc}
.align 2, 0
-_0225502C: .word 0x02255408
-_02255030: .word 0x02255424
+_0225502C: .word MOD36_02255408
+_02255030: .word MOD36_02255424
_02255034: .word 0x04001000
_02255038: .word 0xFFFFE0FF
thumb_func_end MOD36_02254F5C
@@ -1091,7 +1091,7 @@ _02255038: .word 0xFFFFE0FF
MOD36_0225503C: ; 0x0225503C
push {r3, r4, r5, lr}
sub sp, #8
- ldr r3, _02255098 ; =0x02255400
+ ldr r3, _02255098 ; =MOD36_02255400
add r4, r0, #0
ldrh r5, [r3]
add r0, sp, #0
@@ -1131,7 +1131,7 @@ _02255082:
add sp, #8
pop {r3, r4, r5, pc}
nop
-_02255098: .word 0x02255400
+_02255098: .word MOD36_02255400
thumb_func_end MOD36_0225503C
thumb_func_start MOD36_0225509C
@@ -1559,21 +1559,47 @@ _022553E4: .word 0x0000066A
thumb_func_end MOD36_0225539C
.section .rodata
- ; 0x022553E8
- .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF, 0xAD, 0x49, 0x25, 0x02
- .byte 0xF9, 0x49, 0x25, 0x02, 0xD5, 0x4D, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00
+
+ .global MOD36_022553E8
+MOD36_022553E8: ; 0x022553E8
+ .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF
+
+ .global MOD36_022553F4
+MOD36_022553F4: ; 0x022553F4
+ .word MOD36_022549AC, MOD36_022549F8, MOD36_02254DD4
+
+ .global MOD36_02255400
+MOD36_02255400: ; 0x02255400
+ .byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00
+
+ .global MOD36_02255408
+MOD36_02255408: ; 0x02255408
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD36_02255424
+MOD36_02255424: ; 0x02255424
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00
- .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00
+ .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD36_02255440
+MOD36_02255440: ; 0x02255440
+ .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00
.byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x20, 0x03, 0x00
.byte 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00
.byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0xE0, 0x08, 0x00
- .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9D, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0xF5, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x0D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x65, 0x51, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x7D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x06, 0x00, 0x00, 0x00, 0xE1, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
- .byte 0x0D, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x9D, 0x53, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD36_02255480
+MOD36_02255480: ; 0x02255480
+ .word 0x00, MOD36_02254F5C, 0x00
+ .word 0x01, MOD36_0225509C, 0x00
+ .word 0x02, MOD36_022550F4, 0x00
+ .word 0x03, MOD36_0225510C, 0x00
+ .word 0x04, MOD36_02255164, 0x00
+ .word 0x05, MOD36_0225517C, 0x00
+ .word 0x06, MOD36_022551E0, 0x00
+ .word 0x07, MOD36_0225520C, 0x00
+ .word 0x08, MOD36_0225539C, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s
index f4d426db..8135b43b 100644
--- a/arm9/modules/37/asm/module_37.s
+++ b/arm9/modules/37/asm/module_37.s
@@ -116,7 +116,7 @@ MOD37_02254900: ; 0x02254900
cmp r1, #3
bhs _0225492C
lsl r2, r1, #2
- ldr r1, _02254930 ; =0x02254D28
+ ldr r1, _02254930 ; =MOD37_02254D28
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -131,7 +131,7 @@ MOD37_02254900: ; 0x02254900
_0225492C:
pop {r3, r4, r5, pc}
nop
-_02254930: .word 0x02254D28
+_02254930: .word MOD37_02254D28
thumb_func_end MOD37_02254900
thumb_func_start MOD37_02254934
@@ -324,7 +324,7 @@ MOD37_02254A54: ; 0x02254A54
add r0, r4, #0
bl MOD37_02254AA0
ldr r1, _02254A98 ; =0xFFFF5800
- ldr r0, _02254A9C ; =0x02254DA0
+ ldr r0, _02254A9C ; =MOD37_02254DA0
str r1, [r0]
mov r1, #0xb
lsl r1, r1, #8
@@ -337,7 +337,7 @@ _02254A94:
pop {r4, r5, r6, pc}
.align 2, 0
_02254A98: .word 0xFFFF5800
-_02254A9C: .word 0x02254DA0
+_02254A9C: .word MOD37_02254DA0
thumb_func_end MOD37_02254A54
thumb_func_start MOD37_02254AA0
@@ -364,7 +364,7 @@ MOD37_02254AA0: ; 0x02254AA0
bl MOD20_02253FBC
add r2, r4, #0
ldr r0, [r4, #0x20]
- ldr r1, _02254AF0 ; =0x02254D34
+ ldr r1, _02254AF0 ; =MOD37_02254D34
add r2, #0x28
bl MOD20_02253E74
str r0, [r4, #0x24]
@@ -379,7 +379,7 @@ _02254AEA:
add sp, #0xc
pop {r3, r4, pc}
nop
-_02254AF0: .word 0x02254D34
+_02254AF0: .word MOD37_02254D34
thumb_func_end MOD37_02254AA0
thumb_func_start MOD37_02254AF4
@@ -420,13 +420,13 @@ MOD37_02254B20: ; 0x02254B20
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254B40 ; =0x02254D60
+ ldr r0, _02254B40 ; =MOD37_02254D60
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254B40: .word 0x02254D60
+_02254B40: .word MOD37_02254D60
thumb_func_end MOD37_02254B20
thumb_func_start MOD37_02254B44
@@ -468,7 +468,7 @@ MOD37_02254B70: ; 0x02254B70
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254BF4 ; =0x02254D44
+ ldr r2, _02254BF4 ; =MOD37_02254D44
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -520,7 +520,7 @@ MOD37_02254B70: ; 0x02254B70
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254BF4: .word 0x02254D44
+_02254BF4: .word MOD37_02254D44
_02254BF8: .word 0x04001000
_02254BFC: .word 0xFFFFE0FF
thumb_func_end MOD37_02254B70
@@ -588,7 +588,7 @@ _02254C6C:
mov r0, #9
lsl r0, r0, #0x10
str r0, [r4, #0x3c]
- ldr r0, _02254D1C ; =0x02254DA0
+ ldr r0, _02254D1C ; =MOD37_02254DA0
ldr r0, [r0]
str r0, [r4, #0x40]
mov r0, #0
@@ -607,7 +607,7 @@ _02254C9E:
ldr r0, [r4, #0x40]
add r0, r1, r0
str r0, [r4, #0x3c]
- ldr r0, _02254D1C ; =0x02254DA0
+ ldr r0, _02254D1C ; =MOD37_02254DA0
ldr r1, [r4, #0x40]
ldr r0, [r0, #4]
add r1, r1, r0
@@ -664,24 +664,39 @@ _02254D10:
pop {r4, r5, r6, pc}
.align 2, 0
_02254D18: .word 0x00000675
-_02254D1C: .word 0x02254DA0
+_02254D1C: .word MOD37_02254DA0
_02254D20: .word 0xFFFFE000
_02254D24: .word 0x00000676
thumb_func_end MOD37_02254C44
.section .rodata
- ; 0x02254D28
- .byte 0x51, 0x49, 0x25, 0x02, 0x91, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x00, 0x00, 0x07, 0x00
- .byte 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD37_02254D28
+MOD37_02254D28: ; 0x02254D28
+ .word MOD37_02254950, MOD37_02254990, MOD37_022549E4
+
+ .global MOD37_02254D34
+MOD37_02254D34: ; 0x02254D34
+ .byte 0x00, 0x00, 0x07, 0x00
+ .byte 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD37_02254D44
+MOD37_02254D44: ; 0x02254D44
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x4B, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x45, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD37_02254D60
+MOD37_02254D60: ; 0x02254D60
+ .word 0x00, MOD37_02254B70, 0x00
+ .word 0x01, MOD37_02254C00, 0x00
+ .word 0x02, MOD37_02254C44, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD37_02254840
.section .bss
- ; 0x02254DA0
+ .global MOD37_02254DA0
+MOD37_02254DA0: ; 0x02254DA0
.space 8
diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s
index 46391ca3..59871d4a 100644
--- a/arm9/modules/38/asm/module_38.s
+++ b/arm9/modules/38/asm/module_38.s
@@ -85,7 +85,7 @@ _022548C0:
strb r0, [r5, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _02254900 ; =0x0225511C
+ ldr r0, _02254900 ; =MOD38_0225511C
ldr r2, _02254904 ; =MOD38_02254988
mov r1, #6
add r3, r5, #0
@@ -102,7 +102,7 @@ _022548F8:
add sp, #4
pop {r3, r4, r5, r6, pc}
nop
-_02254900: .word 0x0225511C
+_02254900: .word MOD38_0225511C
_02254904: .word MOD38_02254988
thumb_func_end MOD38_0225489C
@@ -157,7 +157,7 @@ MOD38_0225494C: ; 0x0225494C
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254984 ; =0x02255110
+ ldr r1, _02254984 ; =MOD38_02255110
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -171,7 +171,7 @@ MOD38_0225494C: ; 0x0225494C
_02254982:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254984: .word 0x02255110
+_02254984: .word MOD38_02255110
thumb_func_end MOD38_0225494C
thumb_func_start MOD38_02254988
@@ -414,7 +414,7 @@ _02254B26:
thumb_func_start MOD38_02254B2C
MOD38_02254B2C: ; 0x02254B2C
push {r4, r5}
- ldr r5, _02254B68 ; =0x02255134
+ ldr r5, _02254B68 ; =MOD38_02255134
mov r3, #0x12
add r4, r0, #0
mul r4, r3
@@ -447,13 +447,13 @@ _02254B64:
pop {r4, r5}
bx lr
.align 2, 0
-_02254B68: .word 0x02255134
+_02254B68: .word MOD38_02255134
thumb_func_end MOD38_02254B2C
thumb_func_start MOD38_02254B6C
MOD38_02254B6C: ; 0x02254B6C
push {r4, r5}
- ldr r5, _02254BC0 ; =0x02255278
+ ldr r5, _02254BC0 ; =MOD38_02255278
mov r4, #0
_02254B72:
ldrb r3, [r5]
@@ -497,12 +497,12 @@ _02254BA6:
_02254BB4:
mov r4, #0x10
_02254BB6:
- ldr r0, _02254BC0 ; =0x02255278
+ ldr r0, _02254BC0 ; =MOD38_02255278
ldrb r0, [r0, r4]
pop {r4, r5}
bx lr
nop
-_02254BC0: .word 0x02255278
+_02254BC0: .word MOD38_02255278
thumb_func_end MOD38_02254B6C
thumb_func_start MOD38_02254BC4
@@ -583,7 +583,7 @@ MOD38_02254C38: ; 0x02254C38
add r0, r6, #0
str r0, [sp, #0xc]
add r0, #0x60
- ldr r4, _02254CBC ; =0x02255300
+ ldr r4, _02254CBC ; =MOD38_02255300
mov r7, #0
add r5, r6, #0
str r0, [sp, #0xc]
@@ -607,7 +607,7 @@ _02254C72:
str r0, [sp, #0x10]
_02254C96:
ldr r0, [r6, #0x30]
- ldr r1, _02254CC0 ; =0x0225528C
+ ldr r1, _02254CC0 ; =MOD38_0225528C
ldr r2, [sp, #0x10]
bl MOD20_02253E74
mov r2, #3
@@ -623,8 +623,8 @@ _02254C96:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
-_02254CBC: .word 0x02255300
-_02254CC0: .word 0x0225528C
+_02254CBC: .word MOD38_02255300
+_02254CC0: .word MOD38_0225528C
thumb_func_end MOD38_02254C38
thumb_func_start MOD38_02254CC4
@@ -699,13 +699,13 @@ MOD38_02254D34: ; 0x02254D34
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254D54 ; =0x022552B8
+ ldr r0, _02254D54 ; =MOD38_022552B8
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254D54: .word 0x022552B8
+_02254D54: .word MOD38_022552B8
thumb_func_end MOD38_02254D34
thumb_func_start MOD38_02254D58
@@ -750,7 +750,7 @@ MOD38_02254D84: ; 0x02254D84
bl MOD20_022538A4
add r7, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254E1C ; =0x0225529C
+ ldr r2, _02254E1C ; =MOD38_0225529C
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -807,7 +807,7 @@ MOD38_02254D84: ; 0x02254D84
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
-_02254E1C: .word 0x0225529C
+_02254E1C: .word MOD38_0225529C
_02254E20: .word 0x04001000
_02254E24: .word 0xFFFFE0FF
thumb_func_end MOD38_02254D84
@@ -1186,10 +1186,20 @@ _0225510C: .word 0x00000000
thumb_func_end MOD38_022550D0
.section .rodata
- ; 0x02255110
- .byte 0xAD, 0x49, 0x25, 0x02, 0xED, 0x49, 0x25, 0x02, 0xF9, 0x4A, 0x25, 0x02, 0x70, 0x90, 0x10, 0x28
+
+ .global MOD38_02255110
+MOD38_02255110: ; 0x02255110
+ .word MOD38_022549AC, MOD38_022549EC, MOD38_02254AF8
+
+ .global MOD38_0225511C
+MOD38_0225511C: ; 0x0225511C
+ .byte 0x70, 0x90, 0x10, 0x28
.byte 0x70, 0x90, 0x68, 0x80, 0x18, 0x38, 0x60, 0x78, 0x18, 0x38, 0xB8, 0xD0, 0x38, 0x58, 0x60, 0x78
- .byte 0x38, 0x58, 0xB8, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00
+ .byte 0x38, 0x58, 0xB8, 0xD0
+
+ .global MOD38_02255134
+MOD38_02255134: ; 0x02255134
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x01, 0xFF, 0xF6, 0x01, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00
.byte 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF
@@ -1209,15 +1219,35 @@ _0225510C: .word 0x00000000
.byte 0x00, 0xF6, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x01, 0x00
.byte 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03
- .byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x02, 0x00
- .byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF
+
+ .global MOD38_02255278
+MOD38_02255278: ; 0x02255278
+ .byte 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03
+ .byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00
+
+ .global MOD38_0225528C
+MOD38_0225528C: ; 0x0225528C
+ .byte 0x00, 0xC0, 0x02, 0x00
+ .byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD38_0225529C
+MOD38_0225529C: ; 0x0225529C
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x4D, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x39, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x75, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA9, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD38_022552B8
+MOD38_022552B8: ; 0x022552B8
+ .word 0x00, MOD38_02254D84, 0x00
+ .word 0x01, MOD38_02254F18, 0x00
+ .word 0x02, MOD38_02254F38, 0x00
+ .word 0x03, MOD38_02254F74, 0x00
+ .word 0x04, MOD38_02254FA8, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD38_02255300
+MOD38_02255300: ; 0x02255300
.byte 0x00, 0xC0, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x40, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 27675b6d..abd624df 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -131,7 +131,7 @@ _0225491A:
strb r1, [r0, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _0225496C ; =0x02255300
+ ldr r0, _0225496C ; =MOD39_02255300
ldr r2, _02254970 ; =MOD39_0225498C
ldr r3, [sp, #4]
mov r1, #3
@@ -153,7 +153,7 @@ _02254964:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
-_0225496C: .word 0x02255300
+_0225496C: .word MOD39_02255300
_02254970: .word MOD39_0225498C
thumb_func_end MOD39_0225489C
@@ -194,7 +194,7 @@ MOD39_02254998: ; 0x02254998
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _022549D0 ; =0x0225530C
+ ldr r1, _022549D0 ; =MOD39_0225530C
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -208,7 +208,7 @@ MOD39_02254998: ; 0x02254998
_022549CE:
pop {r3, r4, r5, pc}
.align 2, 0
-_022549D0: .word 0x0225530C
+_022549D0: .word MOD39_0225530C
thumb_func_end MOD39_02254998
thumb_func_start MOD39_022549D4
@@ -627,7 +627,7 @@ MOD39_02254C6C: ; 0x02254C6C
add r0, r5, #0
str r0, [sp, #0x10]
add r0, #0x3c
- ldr r7, _02254D74 ; =0x02255408
+ ldr r7, _02254D74 ; =MOD39_02255408
mov r4, #0
add r6, r5, #0
str r0, [sp, #0x10]
@@ -644,7 +644,7 @@ _02254CD6:
blt _02254CD6
cmp r4, #6
bge _02254D18
- ldr r1, _02254D74 ; =0x02255408
+ ldr r1, _02254D74 ; =MOD39_02255408
lsl r0, r4, #4
add r7, r1, r0
lsl r0, r4, #2
@@ -708,7 +708,7 @@ _02254D70:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254D74: .word 0x02255408
+_02254D74: .word MOD39_02255408
thumb_func_end MOD39_02254C6C
thumb_func_start MOD39_02254D78
@@ -747,13 +747,13 @@ MOD39_02254DA4: ; 0x02254DA4
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254DC4 ; =0x022553A8
+ ldr r0, _02254DC4 ; =MOD39_022553A8
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254DC4: .word 0x022553A8
+_02254DC4: .word MOD39_022553A8
thumb_func_end MOD39_02254DA4
thumb_func_start MOD39_02254DC8
@@ -797,7 +797,7 @@ MOD39_02254DF4: ; 0x02254DF4
add r0, r4, #0
bl MOD20_022538A4
ldr r0, [r5, #4]
- ldr r2, _02254E7C ; =0x02255330
+ ldr r2, _02254E7C ; =MOD39_02255330
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -849,7 +849,7 @@ MOD39_02254DF4: ; 0x02254DF4
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254E7C: .word 0x02255330
+_02254E7C: .word MOD39_02255330
_02254E80: .word 0x04001000
_02254E84: .word 0xFFFFE0FF
thumb_func_end MOD39_02254DF4
@@ -1143,25 +1143,25 @@ _022550C4: ; jump table
.short _022550D2 - _022550C4 - 2 ; case 2
.short _022550CC - _022550C4 - 2 ; case 3
_022550CC:
- ldr r0, _02255104 ; =0x02255378
+ ldr r0, _02255104 ; =MOD39_02255378
str r0, [r4, #0x6c]
b _022550FA
_022550D2:
- ldr r0, _02255108 ; =0x02255318
+ ldr r0, _02255108 ; =MOD39_02255318
mov r1, #1
str r0, [r4, #0x6c]
ldr r0, [r4, #0x28]
bl MOD20_02253F28
b _022550FA
_022550E0:
- ldr r0, _0225510C ; =0x0225534C
+ ldr r0, _0225510C ; =MOD39_0225534C
mov r1, #2
str r0, [r4, #0x6c]
ldr r0, [r4, #0x28]
bl MOD20_02253F28
b _022550FA
_022550EE:
- ldr r0, _02255110 ; =0x02255468
+ ldr r0, _02255110 ; =MOD39_02255468
mov r1, #3
str r0, [r4, #0x6c]
ldr r0, [r4, #0x28]
@@ -1172,10 +1172,10 @@ _022550FA:
bl MOD39_02255114
pop {r3, r4, r5, pc}
.align 2, 0
-_02255104: .word 0x02255378
-_02255108: .word 0x02255318
-_0225510C: .word 0x0225534C
-_02255110: .word 0x02255468
+_02255104: .word MOD39_02255378
+_02255108: .word MOD39_02255318
+_0225510C: .word MOD39_0225534C
+_02255110: .word MOD39_02255468
thumb_func_end MOD39_0225509C
thumb_func_start MOD39_02255114
@@ -1445,35 +1445,65 @@ _022552FA:
thumb_func_end MOD39_02255114
.section .rodata
- ; 0x02255300
- .byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8, 0xF1, 0x49, 0x25, 0x02
- .byte 0x31, 0x4A, 0x25, 0x02, 0xE9, 0x4B, 0x25, 0x02, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+
+ .global MOD39_02255300
+MOD39_02255300: ; 0x02255300
+ .byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8
+
+ .global MOD39_0225530C
+MOD39_0225530C: ; 0x0225530C
+ .word MOD39_022549F0, MOD39_02254A30, MOD39_02254BE8
+
+ .global MOD39_02255318
+MOD39_02255318: ; 0x02255318
+ .word -2, 0x10, 0x10, -5
+ .word 0x66B, -1
+
+ .global MOD39_02255330
+MOD39_02255330: ; 0x02255330
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
- .byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00
- .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
- .byte 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFA, 0xFF, 0xFF, 0xFF
- .byte 0xFB, 0xFF, 0xFF, 0xFF, 0x6C, 0x06, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x4D, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0xCD, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0xF9, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1D, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x61, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x06, 0x00, 0x00, 0x00, 0x31, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD39_0225534C
+MOD39_0225534C: ; 0x0225534C
+ .word -2, 0x10, 0x10, -5
+ .word 0x66B, -2, 0x10, 0x10
+ .word -5, 0x66B, -1
+
+ .global MOD39_02255378
+MOD39_02255378: ; 0x02255378
+ .word -2, 0x10, 0x10, -4
+ .word 0x10, -6, -5, 0x66C
+ .word -3, 0x10, 0x10, -1
+
+ .global MOD39_022553A8
+MOD39_022553A8: ; 0x022553A8
+ .word 0x00, MOD39_02254DF4, 0x00
+ .word 0x01, MOD39_02254E88, 0x00
+ .word 0x02, MOD39_02254ECC, 0x00
+ .word 0x03, MOD39_02254EF8, 0x00
+ .word 0x04, MOD39_02254F1C, 0x00
+ .word 0x05, MOD39_02254F60, 0x00
+ .word 0x06, MOD39_02255030, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD39_02255408
+MOD39_02255408: ; 0x02255408
+ .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00
.byte 0x09, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00
.byte 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x05, 0x00
.byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x05, 0x00
.byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xC0, 0x08, 0x00
.byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0xC0, 0x08, 0x00
- .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
- .byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00
- .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
- .byte 0x6B, 0x06, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
- .byte 0x6D, 0x06, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
- .byte 0xF9, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF
- .byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
- .byte 0xFF, 0xFF, 0xFF, 0xFF
+ .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00
+
+ .global MOD39_02255468
+MOD39_02255468: ; 0x02255468
+ .word -2, 0x10, 0x10, -5
+ .word 0x066B, -2, 0x10, 0x10
+ .word -5, 0x66B, -2, 0x10
+ .word 0x10, -5, 0x66B, -4
+ .word 0x10, -5, 0x66D, -7
+ .word 0x02, 0x07, -7, 0x03
+ .word 0x08, -7, 0x01, 0x04
+ .word -4, 0x10, -1
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index 02f648c8..e46b1f2a 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -87,7 +87,7 @@ MOD40_0225489C: ; 0x0225489C
strb r0, [r5, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _02254938 ; =0x02255328
+ ldr r0, _02254938 ; =MOD40_02255328
ldr r2, _0225493C ; =MOD40_02254990
mov r1, #6
add r3, r5, #0
@@ -123,7 +123,7 @@ _02254930:
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
-_02254938: .word 0x02255328
+_02254938: .word MOD40_02255328
_0225493C: .word MOD40_02254990
thumb_func_end MOD40_0225489C
@@ -193,7 +193,7 @@ MOD40_02254998: ; 0x02254998
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _022549D0 ; =0x02255314
+ ldr r1, _022549D0 ; =MOD40_02255314
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -207,7 +207,7 @@ MOD40_02254998: ; 0x02254998
_022549CE:
pop {r3, r4, r5, pc}
.align 2, 0
-_022549D0: .word 0x02255314
+_022549D0: .word MOD40_02255314
thumb_func_end MOD40_02254998
thumb_func_start MOD40_022549D4
@@ -806,7 +806,7 @@ MOD40_02254DBC: ; 0x02254DBC
add r0, r5, #0
str r0, [sp, #0x10]
add r0, #0x7c
- ldr r7, _02254EE0 ; =0x022553B0
+ ldr r7, _02254EE0 ; =MOD40_022553B0
mov r4, #0
add r6, r5, #0
str r0, [sp, #0x10]
@@ -890,7 +890,7 @@ _02254EB2:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254EE0: .word 0x022553B0
+_02254EE0: .word MOD40_022553B0
thumb_func_end MOD40_02254DBC
thumb_func_start MOD40_02254EE4
@@ -999,13 +999,13 @@ MOD40_02254F98: ; 0x02254F98
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254FB8 ; =0x0225535C
+ ldr r0, _02254FB8 ; =MOD40_0225535C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254FB8: .word 0x0225535C
+_02254FB8: .word MOD40_0225535C
thumb_func_end MOD40_02254F98
thumb_func_start MOD40_02254FBC
@@ -1047,7 +1047,7 @@ MOD40_02254FE8: ; 0x02254FE8
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _0225506C ; =0x02255340
+ ldr r2, _0225506C ; =MOD40_02255340
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -1099,7 +1099,7 @@ MOD40_02254FE8: ; 0x02254FE8
add sp, #0x14
pop {r4, r5, pc}
nop
-_0225506C: .word 0x02255340
+_0225506C: .word MOD40_02255340
_02255070: .word 0x04001000
_02255074: .word 0xFFFFE0FF
thumb_func_end MOD40_02254FE8
@@ -1410,17 +1410,36 @@ MOD40_0225530C: ; 0x0225530C
thumb_func_end MOD40_0225530C
.section .rodata
- ; 0x02255314
- .byte 0xF1, 0x49, 0x25, 0x02, 0x41, 0x4A, 0x25, 0x02, 0x51, 0x4B, 0x25, 0x02, 0x1D, 0x4C, 0x25, 0x02
- .byte 0x19, 0x4D, 0x25, 0x02, 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50
- .byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD40_02255314
+MOD40_02255314: ; 0x02255314
+ .word MOD40_022549F0, MOD40_02254A40, MOD40_02254B50, MOD40_02254C1C
+ .word MOD40_02254D18
+
+ .global MOD40_02255328
+MOD40_02255328: ; 0x02255328
+ .byte 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50
+ .byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80
+
+ .global MOD40_02255340
+MOD40_02255340: ; 0x02255340
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x79, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0xC1, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x3D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB9, 0x51, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xF9, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD40_0225535C
+MOD40_0225535C: ; 0x0225535C
+ .word 0x00, MOD40_02254FE8, 0x00
+ .word 0x01, MOD40_02255078, 0x00
+ .word 0x02, MOD40_022550C0, 0x00
+ .word 0x03, MOD40_0225513C, 0x00
+ .word 0x04, MOD40_022551B8, 0x00
+ .word 0x05, MOD40_022551F8, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD40_022553B0
+MOD40_022553B0: ; 0x022553B0
+ .byte 0x00, 0x00, 0x0C, 0x00
.byte 0x00, 0x80, 0x06, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00
diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s
index 0e9851e2..13762a02 100644
--- a/arm9/modules/41/asm/module_41.s
+++ b/arm9/modules/41/asm/module_41.s
@@ -219,7 +219,7 @@ MOD41_02254990: ; 0x02254990
strb r0, [r5, #3]
mov r0, #8
str r0, [sp]
- ldr r0, _02254A30 ; =0x022557B0
+ ldr r0, _02254A30 ; =MOD41_022557B0
ldr r2, _02254A34 ; =MOD41_02254A58
mov r1, #0xb
add r3, r5, #0
@@ -268,7 +268,7 @@ _02254A28:
add sp, #4
pop {r3, r4, r5, r6, pc}
nop
-_02254A30: .word 0x022557B0
+_02254A30: .word MOD41_022557B0
_02254A34: .word MOD41_02254A58
thumb_func_end MOD41_02254990
@@ -339,7 +339,7 @@ _02254AAE:
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254AD4 ; =0x02255794
+ ldr r1, _02254AD4 ; =MOD41_02255794
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -353,7 +353,7 @@ _02254AAE:
_02254AD0:
pop {r3, r4, r5, pc}
nop
-_02254AD4: .word 0x02255794
+_02254AD4: .word MOD41_02255794
thumb_func_end MOD41_02254A88
thumb_func_start MOD41_02254AD8
@@ -1429,7 +1429,7 @@ MOD41_022552A0: ; 0x022552A0
add r0, r7, #0
str r0, [sp, #0x10]
add r0, #0x8c
- ldr r6, _02255370 ; =0x02255864
+ ldr r6, _02255370 ; =MOD41_02255864
mov r4, #0
add r5, r7, #0
str r0, [sp, #0x10]
@@ -1481,7 +1481,7 @@ _0225535E:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
-_02255370: .word 0x02255864
+_02255370: .word MOD41_02255864
thumb_func_end MOD41_022552A0
thumb_func_start MOD41_02255374
@@ -1522,13 +1522,13 @@ MOD41_022553A4: ; 0x022553A4
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _022553C4 ; =0x022557F8
+ ldr r0, _022553C4 ; =MOD41_022557F8
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_022553C4: .word 0x022557F8
+_022553C4: .word MOD41_022557F8
thumb_func_end MOD41_022553A4
thumb_func_start MOD41_022553C8
@@ -1570,7 +1570,7 @@ MOD41_022553F4: ; 0x022553F4
bl MOD20_022538A0
add r4, r0, #0
ldr r0, [r4, #4]
- ldr r2, _022554CC ; =0x022557DC
+ ldr r2, _022554CC ; =MOD41_022557DC
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -1662,7 +1662,7 @@ _022554C0:
add sp, #0x14
pop {r4, r5, pc}
nop
-_022554CC: .word 0x022557DC
+_022554CC: .word MOD41_022557DC
_022554D0: .word 0x04001000
_022554D4: .word 0xFFFFE0FF
thumb_func_end MOD41_022553F4
@@ -2020,20 +2020,39 @@ MOD41_0225578C: ; 0x0225578C
thumb_func_end MOD41_0225578C
.section .rodata
- ; 0x02255794
- .byte 0x59, 0x4B, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x21, 0x4D, 0x25, 0x02, 0x0D, 0x4E, 0x25, 0x02
- .byte 0xB9, 0x4E, 0x25, 0x02, 0x61, 0x4F, 0x25, 0x02, 0x19, 0x50, 0x25, 0x02, 0x90, 0xB0, 0x10, 0x50
+
+ .global MOD41_02255794
+MOD41_02255794: ; 0x02255794
+ .word MOD41_02254B58, MOD41_02254B98, MOD41_02254D20, MOD41_02254E0C
+ .word MOD41_02254EB8, MOD41_02254F60, MOD41_02255018
+
+ .global MOD41_022557B0
+MOD41_022557B0: ; 0x022557B0
+ .byte 0x90, 0xB0, 0x10, 0x50
.byte 0x90, 0xB0, 0x50, 0x90, 0x90, 0xB0, 0x90, 0xD0, 0x50, 0x60, 0x48, 0x58, 0x50, 0x60, 0x58, 0x68
.byte 0x80, 0x90, 0x48, 0x58, 0x80, 0x90, 0x58, 0x68, 0x50, 0x60, 0x78, 0x88, 0x50, 0x60, 0x88, 0x98
- .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98
+
+ .global MOD41_022557DC
+MOD41_022557DC: ; 0x022557DC
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x53, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0xD9, 0x54, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x25, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x59, 0x55, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x8D, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0xB1, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
- .byte 0xD5, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x91, 0x56, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD41_022557F8
+MOD41_022557F8: ; 0x022557F8
+ .word 0x00, MOD41_022553F4, 0x00
+ .word 0x01, MOD41_022554D8, 0x00
+ .word 0x02, MOD41_02255524, 0x00
+ .word 0x03, MOD41_02255558, 0x00
+ .word 0x04, MOD41_0225558C, 0x00
+ .word 0x05, MOD41_022555B0, 0x00
+ .word 0x06, MOD41_022555D4, 0x00
+ .word 0x07, MOD41_02255690, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD41_02255864
+MOD41_02255864: ; 0x02255864
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index f13fb22c..b4e4e4d8 100644
--- a/arm9/modules/42/asm/module_42.s
+++ b/arm9/modules/42/asm/module_42.s
@@ -239,7 +239,7 @@ MOD42_02254A04: ; 0x02254A04
cmp r1, #4
bhs _02254A30
lsl r2, r1, #2
- ldr r1, _02254A34 ; =0x022550CC
+ ldr r1, _02254A34 ; =MOD42_022550CC
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -254,7 +254,7 @@ MOD42_02254A04: ; 0x02254A04
_02254A30:
pop {r3, r4, r5, pc}
nop
-_02254A34: .word 0x022550CC
+_02254A34: .word MOD42_022550CC
thumb_func_end MOD42_02254A04
thumb_func_start MOD42_02254A38
@@ -914,13 +914,13 @@ MOD42_02254EEC: ; 0x02254EEC
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254F0C ; =0x022550F8
+ ldr r0, _02254F0C ; =MOD42_022550F8
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254F0C: .word 0x022550F8
+_02254F0C: .word MOD42_022550F8
thumb_func_end MOD42_02254EEC
thumb_func_start MOD42_02254F10
@@ -962,7 +962,7 @@ MOD42_02254F3C: ; 0x02254F3C
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254FC0 ; =0x022550DC
+ ldr r2, _02254FC0 ; =MOD42_022550DC
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -1014,7 +1014,7 @@ MOD42_02254F3C: ; 0x02254F3C
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254FC0: .word 0x022550DC
+_02254FC0: .word MOD42_022550DC
_02254FC4: .word 0x04001000
_02254FC8: .word 0xFFFFE0FF
thumb_func_end MOD42_02254F3C
@@ -1149,9 +1149,18 @@ _022550C8:
thumb_func_end MOD42_02254FE8
.section .rodata
- ; 0x022550CC
- .byte 0x55, 0x4A, 0x25, 0x02, 0x95, 0x4A, 0x25, 0x02, 0x29, 0x4B, 0x25, 0x02, 0x81, 0x4B, 0x25, 0x02
+
+ .global MOD42_022550CC
+MOD42_022550CC: ; 0x022550CC
+ .word MOD42_02254A54, MOD42_02254A94, MOD42_02254B28, MOD42_02254B80
+
+ .global MOD42_022550DC
+MOD42_022550DC: ; 0x022550DC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x3D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xCD, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD42_022550F8
+MOD42_022550F8: ; 0x022550F8
+ .word 0x00, MOD42_02254F3C, 0x00
+ .word 0x01, MOD42_02254FCC, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s
index b4667463..c9bbedfd 100644
--- a/arm9/modules/43/asm/module_43.s
+++ b/arm9/modules/43/asm/module_43.s
@@ -143,7 +143,7 @@ MOD43_0225493C: ; 0x0225493C
cmp r1, #3
bhs _0225496A
lsl r2, r1, #2
- ldr r1, _0225496C ; =0x022550A8
+ ldr r1, _0225496C ; =MOD43_022550A8
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -159,7 +159,7 @@ MOD43_0225493C: ; 0x0225493C
_0225496A:
pop {r3, r4, r5, pc}
.align 2, 0
-_0225496C: .word 0x022550A8
+_0225496C: .word MOD43_022550A8
thumb_func_end MOD43_0225493C
thumb_func_start MOD43_02254970
@@ -346,9 +346,9 @@ _02254A9E:
bl FUN_02025238
cmp r0, #5
bne _02254AEA
- ldr r1, _02254AF4 ; =0x022550B4
+ ldr r1, _02254AF4 ; =MOD43_022550B4
lsl r0, r4, #1
- ldr r2, _02254AF4 ; =0x022550B4
+ ldr r2, _02254AF4 ; =MOD43_022550B4
add r1, r1, r0
ldrb r0, [r2, r0]
strb r0, [r5, #0x10]
@@ -383,7 +383,7 @@ _02254AF0:
add r0, r7, #0
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254AF4: .word 0x022550B4
+_02254AF4: .word MOD43_022550B4
thumb_func_end MOD43_02254A88
thumb_func_start MOD43_02254AF8
@@ -519,13 +519,13 @@ MOD43_02254BD8: ; 0x02254BD8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254BF8 ; =0x022551BC
+ ldr r0, _02254BF8 ; =MOD43_022551BC
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254BF8: .word 0x022551BC
+_02254BF8: .word MOD43_022551BC
thumb_func_end MOD43_02254BD8
thumb_func_start MOD43_02254BFC
@@ -571,7 +571,7 @@ MOD43_02254C28: ; 0x02254C28
strb r3, [r0]
strb r3, [r0, #1]
ldr r0, [r5, #4]
- ldr r2, _02254CC4 ; =0x022551A0
+ ldr r2, _02254CC4 ; =MOD43_022551A0
mov r1, #6
bl FUN_02016C18
mov r0, #0
@@ -629,7 +629,7 @@ MOD43_02254C28: ; 0x02254C28
pop {r3, r4, r5, r6, pc}
.align 2, 0
_02254CC0: .word 0x0400104C
-_02254CC4: .word 0x022551A0
+_02254CC4: .word MOD43_022551A0
_02254CC8: .word 0x04001000
_02254CCC: .word 0xFFFFE0FF
thumb_func_end MOD43_02254C28
@@ -1128,25 +1128,141 @@ _022550A2:
thumb_func_end MOD43_02255078
.section .rodata
- ; 0x022550A8
- .byte 0x8D, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x51, 0x4A, 0x25, 0x02, 0x05, 0x14, 0x05, 0x14
- .byte 0x06, 0x14, 0x06, 0x14, 0x06, 0x13, 0x06, 0x13, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11
- .byte 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10
- .byte 0x09, 0x13, 0x09, 0x13, 0x09, 0x15, 0x09, 0x15, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16
- .byte 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x10, 0x16, 0x10, 0x16, 0x11, 0x15, 0x11, 0x15
- .byte 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13
- .byte 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10
- .byte 0x0E, 0x18, 0x0E, 0x18, 0x0E, 0x19, 0x0E, 0x19, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A
- .byte 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19
- .byte 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x13, 0x12, 0x13, 0x12, 0x14, 0x12, 0x14, 0x12
- .byte 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C
- .byte 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10
- .byte 0x13, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A
- .byte 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C
- .byte 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E
- .byte 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD43_022550A8
+MOD43_022550A8: ; 0x022550A8
+ .word MOD43_0225498C, MOD43_022549D8, MOD43_02254A50
+
+ .global MOD43_022550B4
+MOD43_022550B4: ; 0x022550B4
+ .byte 0x05, 0x14
+ .byte 0x05, 0x14
+ .byte 0x06, 0x14
+ .byte 0x06, 0x14
+ .byte 0x06, 0x13
+ .byte 0x06, 0x13
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x09, 0x13
+ .byte 0x09, 0x13
+ .byte 0x09, 0x15
+ .byte 0x09, 0x15
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x10, 0x16
+ .byte 0x10, 0x16
+ .byte 0x11, 0x15
+ .byte 0x11, 0x15
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0E, 0x18
+ .byte 0x0E, 0x18
+ .byte 0x0E, 0x19
+ .byte 0x0E, 0x19
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x13, 0x12
+ .byte 0x13, 0x12
+ .byte 0x14, 0x12
+ .byte 0x14, 0x12
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x13, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
+
+ .global MOD43_022551A0
+MOD43_022551A0: ; 0x022551A0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x4D, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0xA9, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x00, 0x00
+
+ .global MOD43_022551BC
+MOD43_022551BC: ; 0x022551BC
+ .word 0x00, MOD43_02254C28, 0x00
+ .word 0x01, MOD43_02254D4C, 0x00
+ .word 0x02, MOD43_02254DA8, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s
index dfb28de6..bcee6542 100644
--- a/arm9/modules/44/asm/module_44.s
+++ b/arm9/modules/44/asm/module_44.s
@@ -105,7 +105,7 @@ MOD44_022548EC: ; 0x022548EC
cmp r1, #3
bhs _02254918
lsl r2, r1, #2
- ldr r1, _0225491C ; =0x02254C54
+ ldr r1, _0225491C ; =MOD44_02254C54
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -120,7 +120,7 @@ MOD44_022548EC: ; 0x022548EC
_02254918:
pop {r3, r4, r5, pc}
nop
-_0225491C: .word 0x02254C54
+_0225491C: .word MOD44_02254C54
thumb_func_end MOD44_022548EC
thumb_func_start MOD44_02254920
@@ -357,7 +357,7 @@ MOD44_02254A90: ; 0x02254A90
bl MOD20_02253FBC
add r2, r5, #0
ldr r0, [r5, #0x20]
- ldr r1, _02254AE0 ; =0x02254C60
+ ldr r1, _02254AE0 ; =MOD44_02254C60
add r2, #0x28
bl MOD20_02253E74
str r0, [r5, #0x24]
@@ -371,7 +371,7 @@ MOD44_02254A90: ; 0x02254A90
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
-_02254AE0: .word 0x02254C60
+_02254AE0: .word MOD44_02254C60
thumb_func_end MOD44_02254A90
thumb_func_start MOD44_02254AE4
@@ -415,13 +415,13 @@ MOD44_02254B14: ; 0x02254B14
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254B34 ; =0x02254C8C
+ ldr r0, _02254B34 ; =MOD44_02254C8C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254B34: .word 0x02254C8C
+_02254B34: .word MOD44_02254C8C
thumb_func_end MOD44_02254B14
thumb_func_start MOD44_02254B38
@@ -465,7 +465,7 @@ MOD44_02254B64: ; 0x02254B64
add r0, r4, #0
bl MOD20_022538A4
ldr r0, [r5, #4]
- ldr r2, _02254BEC ; =0x02254C70
+ ldr r2, _02254BEC ; =MOD44_02254C70
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -517,7 +517,7 @@ MOD44_02254B64: ; 0x02254B64
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254BEC: .word 0x02254C70
+_02254BEC: .word MOD44_02254C70
_02254BF0: .word 0x04001000
_02254BF4: .word 0xFFFFE0FF
thumb_func_end MOD44_02254B64
@@ -568,11 +568,25 @@ _02254C50: .word 0x00000663
thumb_func_end MOD44_02254C14
.section .rodata
- ; 0x02254C54
- .byte 0x3D, 0x49, 0x25, 0x02, 0x7D, 0x49, 0x25, 0x02, 0x21, 0x4A, 0x25, 0x02, 0x00, 0x80, 0x03, 0x00
- .byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD44_02254C54
+MOD44_02254C54: ; 0x02254C54
+ .word MOD44_0225493C, MOD44_0225497C, MOD44_02254A20
+
+ .global MOD44_02254C60
+MOD44_02254C60: ; 0x02254C60
+ .byte 0x00, 0x80, 0x03, 0x00
+ .byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD44_02254C70
+MOD44_02254C70: ; 0x02254C70
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x4B, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD44_02254C8C
+MOD44_02254C8C: ; 0x02254C8C
+ .word 0x00, MOD44_02254B64, 0x00
+ .word 0x01, MOD44_02254BF8, 0x00
+ .word 0x02, MOD44_02254C14, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index 7f47eb2f..effe8de8 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -96,7 +96,7 @@ MOD45_0225489C: ; 0x0225489C
strb r0, [r5, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _02254924 ; =0x02255018
+ ldr r0, _02254924 ; =MOD45_02255018
ldr r2, _02254928 ; =MOD45_022549E0
mov r1, #0x25
add r3, r5, #0
@@ -118,7 +118,7 @@ _0225491C:
add sp, #0x14
pop {r3, r4, r5, r6, pc}
nop
-_02254924: .word 0x02255018
+_02254924: .word MOD45_02255018
_02254928: .word MOD45_022549E0
thumb_func_end MOD45_0225489C
@@ -133,7 +133,7 @@ MOD45_0225492C: ; 0x0225492C
ldr r0, [r4, #8]
str r0, [r6, #8]
ldr r1, [r6]
- ldr r0, _022549BC ; =0x022550AB
+ ldr r0, _022549BC ; =MOD45_022550AB
ldrb r0, [r0, r1]
str r0, [r6, #4]
ldr r0, [r6]
@@ -197,7 +197,7 @@ _0225499A:
_022549BA:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_022549BC: .word 0x022550AB
+_022549BC: .word MOD45_022550AB
thumb_func_end MOD45_0225492C
thumb_func_start MOD45_022549C0
@@ -244,7 +244,7 @@ MOD45_022549EC: ; 0x022549EC
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254A2C ; =0x0225500C
+ ldr r1, _02254A2C ; =MOD45_0225500C
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -259,7 +259,7 @@ MOD45_022549EC: ; 0x022549EC
_02254A2A:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254A2C: .word 0x0225500C
+_02254A2C: .word MOD45_0225500C
thumb_func_end MOD45_022549EC
thumb_func_start MOD45_02254A30
@@ -528,7 +528,7 @@ MOD45_02254BE0: ; 0x02254BE0
bl MOD20_02253FBC
add r2, r5, #0
ldr r0, [r5, #0x20]
- ldr r1, _02254C2C ; =0x022550B8
+ ldr r1, _02254C2C ; =MOD45_022550B8
add r2, #0x28
bl MOD20_02253E74
str r0, [r5, #0x24]
@@ -540,7 +540,7 @@ MOD45_02254BE0: ; 0x02254BE0
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
-_02254C2C: .word 0x022550B8
+_02254C2C: .word MOD45_022550B8
thumb_func_end MOD45_02254BE0
thumb_func_start MOD45_02254C30
@@ -595,13 +595,13 @@ MOD45_02254C7C: ; 0x02254C7C
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254C9C ; =0x02255140
+ ldr r0, _02254C9C ; =MOD45_02255140
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254C9C: .word 0x02255140
+_02254C9C: .word MOD45_02255140
thumb_func_end MOD45_02254C7C
thumb_func_start MOD45_02254CA0
@@ -646,12 +646,12 @@ MOD45_02254CCC: ; 0x02254CCC
bl MOD20_022538A4
add r4, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254D60 ; =0x022550FC
+ ldr r2, _02254D60 ; =MOD45_022550FC
mov r1, #6
mov r3, #0
bl FUN_02016C18
ldr r0, [r5, #4]
- ldr r2, _02254D64 ; =0x022550E0
+ ldr r2, _02254D64 ; =MOD45_022550E0
mov r1, #7
mov r3, #0
bl FUN_02016C18
@@ -700,8 +700,8 @@ MOD45_02254CCC: ; 0x02254CCC
add sp, #0x14
pop {r3, r4, r5, r6, pc}
.align 2, 0
-_02254D60: .word 0x022550FC
-_02254D64: .word 0x022550E0
+_02254D60: .word MOD45_022550FC
+_02254D64: .word MOD45_022550E0
_02254D68: .word 0x04001000
_02254D6C: .word 0xFFFFE0FF
thumb_func_end MOD45_02254CCC
@@ -887,7 +887,7 @@ MOD45_02254EBC: ; 0x02254EBC
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r7, r0, #0
- ldr r0, _02254F10 ; =0x022550C6
+ ldr r0, _02254F10 ; =MOD45_022550C6
lsl r1, r1, #1
ldrh r4, [r0, r1]
mov r0, #0
@@ -927,7 +927,7 @@ _02254ED6:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
-_02254F10: .word 0x022550C6
+_02254F10: .word MOD45_022550C6
thumb_func_end MOD45_02254EBC
thumb_func_start MOD45_02254F14
@@ -970,7 +970,7 @@ _02254F46:
mov r0, #0x14
add r2, r6, #0
mul r2, r0
- ldr r0, _02255008 ; =0x02255118
+ ldr r0, _02255008 ; =MOD45_02255118
lsl r1, r7, #1
add r0, r0, r2
ldrh r7, [r1, r0]
@@ -1010,7 +1010,7 @@ _02254FAE:
add r3, r6, #0
mul r3, r0
ldr r0, [sp, #0x18]
- ldr r2, _02255008 ; =0x02255118
+ ldr r2, _02255008 ; =MOD45_02255118
lsl r1, r0, #1
add r0, r2, r3
ldrh r6, [r1, r0]
@@ -1050,12 +1050,18 @@ _02254FAE:
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02255008: .word 0x02255118
+_02255008: .word MOD45_02255118
thumb_func_end MOD45_02254F14
.section .rodata
- ; 0x0225500C
- .byte 0x4D, 0x4A, 0x25, 0x02, 0x99, 0x4A, 0x25, 0x02, 0x59, 0x4B, 0x25, 0x02, 0x28, 0x38, 0x20, 0x30
+
+ .global MOD45_0225500C
+MOD45_0225500C: ; 0x0225500C
+ .word MOD45_02254A4C, MOD45_02254A98, MOD45_02254B58
+
+ .global MOD45_02255018
+MOD45_02255018: ; 0x02255018
+ .byte 0x28, 0x38, 0x20, 0x30
.byte 0x28, 0x38, 0x38, 0x48, 0x28, 0x38, 0x50, 0x60, 0x28, 0x38, 0x68, 0x78, 0x28, 0x38, 0x80, 0x90
.byte 0x28, 0x38, 0x98, 0xA8, 0x28, 0x38, 0xB0, 0xC0, 0x40, 0x50, 0x20, 0x30, 0x40, 0x50, 0x38, 0x48
.byte 0x40, 0x50, 0x50, 0x60, 0x40, 0x50, 0x68, 0x78, 0x40, 0x50, 0x80, 0x90, 0x40, 0x50, 0x98, 0xA8
@@ -1064,20 +1070,46 @@ _02255008: .word 0x02255118
.byte 0x70, 0x80, 0x20, 0x30, 0x70, 0x80, 0x38, 0x48, 0x70, 0x80, 0x50, 0x60, 0x70, 0x80, 0x68, 0x78
.byte 0x70, 0x80, 0x80, 0x90, 0x70, 0x80, 0x98, 0xA8, 0x70, 0x80, 0xB0, 0xC0, 0x88, 0x98, 0x20, 0x30
.byte 0x88, 0x98, 0x38, 0x48, 0x88, 0x98, 0x50, 0x60, 0x88, 0x98, 0x68, 0x78, 0x88, 0x98, 0x80, 0x90
- .byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38, 0x48
- .byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00
- .byte 0x08, 0x00, 0x18, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x48, 0x00
- .byte 0x4C, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+ .byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38
+
+ .global MOD45_022550AB
+MOD45_022550AB: ; 0x022550AB
+ .byte 0x48
+ .byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F
+
+ .global MOD45_022550B8
+MOD45_022550B8: ; 0x022550B8
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+
+ .global MOD45_022550C6
+MOD45_022550C6: ; 0x022550C6
+ .short 0x00, 0x00, 0x04, 0x08, 0x18, 0x1C, 0x20, 0x30
+ .short 0x34, 0x38, 0x48, 0x4C, 0x50
+
+ .global MOD45_022550E0
+MOD45_022550E0: ; 0x022550E0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD45_022550FC
+MOD45_022550FC: ; 0x022550FC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x61, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD45_02255118
+MOD45_02255118: ; 0x02255118
+ .byte 0x60, 0x00, 0x61, 0x00
.byte 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00
.byte 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00
- .byte 0x80, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x71, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x95, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x80, 0x00, 0x81, 0x00
+
+ .global MOD45_02255140
+MOD45_02255140: ; 0x02255140
+ .word 0x00, MOD45_02254CCC, 0x00
+ .word 0x01, MOD45_02254D70, 0x00
+ .word 0x02, MOD45_02254D94, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD45_02254840
diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s
index fce37ff3..02956d4b 100644
--- a/arm9/modules/46/asm/module_46.s
+++ b/arm9/modules/46/asm/module_46.s
@@ -95,7 +95,7 @@ MOD46_022548D4: ; 0x022548D4
cmp r1, #3
bhs _02254900
lsl r2, r1, #2
- ldr r1, _02254904 ; =0x02254AF4
+ ldr r1, _02254904 ; =MOD46_02254AF4
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -110,7 +110,7 @@ MOD46_022548D4: ; 0x022548D4
_02254900:
pop {r3, r4, r5, pc}
nop
-_02254904: .word 0x02254AF4
+_02254904: .word MOD46_02254AF4
thumb_func_end MOD46_022548D4
thumb_func_start MOD46_02254908
@@ -264,13 +264,13 @@ MOD46_022549E8: ; 0x022549E8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254A08 ; =0x02254B1C
+ ldr r0, _02254A08 ; =MOD46_02254B1C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254A08: .word 0x02254B1C
+_02254A08: .word MOD46_02254B1C
thumb_func_end MOD46_022549E8
thumb_func_start MOD46_02254A0C
@@ -312,7 +312,7 @@ MOD46_02254A38: ; 0x02254A38
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254ACC ; =0x02254B00
+ ldr r2, _02254ACC ; =MOD46_02254B00
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -371,7 +371,7 @@ MOD46_02254A38: ; 0x02254A38
add sp, #0x14
pop {r4, r5, pc}
nop
-_02254ACC: .word 0x02254B00
+_02254ACC: .word MOD46_02254B00
_02254AD0: .word 0x04001000
_02254AD4: .word 0xFFFFE0FF
thumb_func_end MOD46_02254A38
@@ -392,12 +392,22 @@ MOD46_02254AD8: ; 0x02254AD8
thumb_func_end MOD46_02254AD8
.section .rodata
- ; 0x02254AF4
- .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD46_02254AF4
+MOD46_02254AF4: ; 0x02254AF4
+ .word MOD46_02254924, MOD46_02254964, MOD46_02254978
+
+ .global MOD46_02254B00
+MOD46_02254B00: ; 0x02254B00
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x4A, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD46_02254B1C
+MOD46_02254B1C: ; 0x02254B1C
+ .word 0x00, MOD46_02254A38, 0x00
+ .word 0x01, MOD46_02254AD8, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD46_02254840
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 63e10ef6..549b6c3a 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -105,7 +105,7 @@ MOD47_022548E0: ; 0x022548E0
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254918 ; =0x022553B8
+ ldr r1, _02254918 ; =MOD47_022553B8
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -119,7 +119,7 @@ MOD47_022548E0: ; 0x022548E0
_02254914:
pop {r3, r4, r5, pc}
nop
-_02254918: .word 0x022553B8
+_02254918: .word MOD47_022553B8
thumb_func_end MOD47_022548E0
thumb_func_start MOD47_0225491C
@@ -543,7 +543,7 @@ MOD47_02254C1C: ; 0x02254C1C
sub sp, #8
add r7, r0, #0
mov r0, #0
- ldr r5, _02254C68 ; =0x022553D0
+ ldr r5, _02254C68 ; =MOD47_022553D0
str r0, [sp]
str r0, [sp, #4]
_02254C2A:
@@ -580,7 +580,7 @@ _02254C52:
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
-_02254C68: .word 0x022553D0
+_02254C68: .word MOD47_022553D0
thumb_func_end MOD47_02254C1C
thumb_func_start MOD47_02254C6C
@@ -773,7 +773,7 @@ MOD47_02254D8C: ; 0x02254D8C
add r0, r6, #0
str r0, [sp, #0xc]
add r0, #0x44
- ldr r4, _02254DF8 ; =0x02255410
+ ldr r4, _02254DF8 ; =MOD47_02255410
mov r7, #0
add r5, r6, #0
str r0, [sp, #0xc]
@@ -800,7 +800,7 @@ _02254DC6:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254DF8: .word 0x02255410
+_02254DF8: .word MOD47_02255410
thumb_func_end MOD47_02254D8C
thumb_func_start MOD47_02254DFC
@@ -838,13 +838,13 @@ MOD47_02254E24: ; 0x02254E24
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254E44 ; =0x02255450
+ ldr r0, _02254E44 ; =MOD47_02255450
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254E44: .word 0x02255450
+_02254E44: .word MOD47_02255450
thumb_func_end MOD47_02254E24
thumb_func_start MOD47_02254E48
@@ -886,7 +886,7 @@ MOD47_02254E74: ; 0x02254E74
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254F28 ; =0x022553F4
+ ldr r2, _02254F28 ; =MOD47_022553F4
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -960,7 +960,7 @@ MOD47_02254E74: ; 0x02254E74
add sp, #0x18
pop {r4, r5, r6, pc}
.align 2, 0
-_02254F28: .word 0x022553F4
+_02254F28: .word MOD47_022553F4
_02254F2C: .word 0x04001000
_02254F30: .word 0xFFFFE0FF
thumb_func_end MOD47_02254E74
@@ -1481,26 +1481,67 @@ _0225532C:
pop {r3, r4, r5, r6, r7, pc}
nop
_02255398: .word 0x00010104
-_0225539C: .word 0x022553F0
+_0225539C: .word MOD47_022553F0
thumb_func_end MOD47_022552D8
.section .rodata
- ; 0x022553A0
- .byte 0x0A, 0x00, 0x00, 0x00, 0x09, 0x0D, 0x07, 0x12, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00
- .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E, 0x00, 0x00, 0x39, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02
- .byte 0xE5, 0x49, 0x25, 0x02, 0xD5, 0x4A, 0x25, 0x02, 0x39, 0x4B, 0x25, 0x02, 0x89, 0x4B, 0x25, 0x02
- .byte 0xA4, 0x53, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x25, 0x02, 0x01, 0x00, 0x00, 0x00
- .byte 0xA8, 0x53, 0x25, 0x02, 0x05, 0x00, 0x00, 0x00, 0xB0, 0x53, 0x25, 0x02, 0x06, 0x00, 0x00, 0x00
- .byte 0x06, 0x07, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+ .global MOD47_022553A0
+MOD47_022553A0: ; 0x022553A0
+ .byte 0x0A
+
+ .balign 4, 0
+ .global MOD47_022553A4
+MOD47_022553A4: ; 0x022553A4
+ .byte 0x09, 0x0D, 0x07, 0x12
+
+ .balign 4, 0
+ .global MOD47_022553A8
+MOD47_022553A8: ; 0x022553A8
+ .byte 0x01, 0x02, 0x03, 0x04, 0x05
+
+ .balign 4, 0
+ .global MOD47_022553B0
+MOD47_022553B0: ; 0x022553B0
+ .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E
+
+ .balign 4, 0
+ .global MOD47_022553B8
+MOD47_022553B8: ; 0x022553B8
+ .word MOD47_02254938, MOD47_02254978, MOD47_022549E4, MOD47_02254AD4
+ .word MOD47_02254B38, MOD47_02254B88
+
+ .global MOD47_022553D0
+MOD47_022553D0: ; 0x022553D0
+ .word MOD47_022553A4, 0x00000004
+ .word MOD47_022553A0, 0x00000001
+ .word MOD47_022553A8, 0x00000005
+ .word MOD47_022553B0, 0x00000006
+
+ .global MOD47_022553F0
+MOD47_022553F0: ; 0x022553F0
+ .byte 0x06, 0x07, 0x08, 0x09
+
+ .global MOD47_022553F4
+MOD47_022553F4: ; 0x022553F4
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD47_02255410
+MOD47_02255410: ; 0x02255410
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x75, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x35, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x59, 0x4F, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x9D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0xE9, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x35, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x81, 0x50, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD9, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD47_02255450
+MOD47_02255450: ; 0x02255450
+ .word 0x00, MOD47_02254E74, 0x00
+ .word 0x01, MOD47_02254F34, 0x00
+ .word 0x02, MOD47_02254F58, 0x00
+ .word 0x03, MOD47_02254F9C, 0x00
+ .word 0x04, MOD47_02254FE8, 0x00
+ .word 0x05, MOD47_02255034, 0x00
+ .word 0x06, MOD47_02255080, 0x00
+ .word 0x07, MOD47_022550D8, 0x00
+ .word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s
index 661529fd..32b5d3c8 100644
--- a/arm9/modules/48/asm/module_48.s
+++ b/arm9/modules/48/asm/module_48.s
@@ -106,7 +106,7 @@ _022548C8:
strb r0, [r7, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _02254930 ; =0x02254F60
+ ldr r0, _02254930 ; =MOD48_02254F60
ldr r2, _02254934 ; =MOD48_02254994
mov r1, #3
add r3, r7, #0
@@ -125,7 +125,7 @@ _0225492A:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02254930: .word 0x02254F60
+_02254930: .word MOD48_02254F60
_02254934: .word MOD48_02254994
thumb_func_end MOD48_0225489C
@@ -156,7 +156,7 @@ MOD48_02254950: ; 0x02254950
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254988 ; =0x02254F6C
+ ldr r1, _02254988 ; =MOD48_02254F6C
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -170,7 +170,7 @@ MOD48_02254950: ; 0x02254950
_02254986:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254988: .word 0x02254F6C
+_02254988: .word MOD48_02254F6C
thumb_func_end MOD48_02254950
thumb_func_start MOD48_0225498C
@@ -384,13 +384,13 @@ MOD48_02254AE0: ; 0x02254AE0
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254B00 ; =0x02254F94
+ ldr r0, _02254B00 ; =MOD48_02254F94
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254B00: .word 0x02254F94
+_02254B00: .word MOD48_02254F94
thumb_func_end MOD48_02254AE0
thumb_func_start MOD48_02254B04
@@ -435,7 +435,7 @@ MOD48_02254B30: ; 0x02254B30
bl MOD20_022538A4
add r6, r0, #0
ldr r0, [r4, #4]
- ldr r2, _02254BBC ; =0x02254F78
+ ldr r2, _02254BBC ; =MOD48_02254F78
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -487,7 +487,7 @@ MOD48_02254B30: ; 0x02254B30
add sp, #0x14
pop {r3, r4, r5, r6, pc}
nop
-_02254BBC: .word 0x02254F78
+_02254BBC: .word MOD48_02254F78
_02254BC0: .word 0x04001000
_02254BC4: .word 0xFFFFE0FF
thumb_func_end MOD48_02254B30
@@ -750,7 +750,7 @@ _02254DD2:
add r1, r1, #4
cmp r2, #0x10
blt _02254DD2
- ldr r0, _02254EBC ; =0x02254FD0
+ ldr r0, _02254EBC ; =MOD48_02254FD0
str r4, [sp, #0x20]
str r0, [sp, #0x24]
ldr r0, [sp, #0x10]
@@ -779,7 +779,7 @@ _02254DF2:
str r0, [sp, #0x2c]
_02254E16:
add r7, r5, r6
- ldr r1, _02254EBC ; =0x02254FD0
+ ldr r1, _02254EBC ; =MOD48_02254FD0
lsl r2, r7, #4
add r1, r1, r2
ldr r0, [r4, #0x20]
@@ -861,7 +861,7 @@ _02254E8E:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254EBC: .word 0x02254FD0
+_02254EBC: .word MOD48_02254FD0
thumb_func_end MOD48_02254D2C
thumb_func_start MOD48_02254EC0
@@ -953,14 +953,33 @@ _02254F5C: .word 0x000003E7
thumb_func_end MOD48_02254EF4
.section .rodata
- ; 0x02254F60
- .byte 0x3E, 0x62, 0x58, 0x88, 0x4E, 0x72, 0x98, 0xC8, 0x56, 0x7A, 0x18, 0x48, 0xB1, 0x49, 0x25, 0x02
- .byte 0xF1, 0x49, 0x25, 0x02, 0x6D, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD48_02254F60
+MOD48_02254F60: ; 0x02254F60
+ .byte 0x3E, 0x62, 0x58, 0x88
+ .byte 0x4E, 0x72, 0x98, 0xC8
+ .byte 0x56, 0x7A, 0x18, 0x48
+
+ .global MOD48_02254F6C
+MOD48_02254F6C: ; 0x02254F6C
+ .word MOD48_022549B0, MOD48_022549F0, MOD48_02254A6C
+
+ .global MOD48_02254F78
+MOD48_02254F78: ; 0x02254F78
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x61, 0x4C, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD48_02254F94
+MOD48_02254F94: ; 0x02254F94
+ .word 0x00, MOD48_02254B30, 0x00
+ .word 0x01, MOD48_02254BC8, 0x00
+ .word 0x02, MOD48_02254BE8, 0x00
+ .word 0x03, MOD48_02254C60, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD48_02254FD0
+MOD48_02254FD0: ; 0x02254FD0
.byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00
.byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00
diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s
index d829718b..a3ab2dcf 100644
--- a/arm9/modules/49/asm/module_49.s
+++ b/arm9/modules/49/asm/module_49.s
@@ -96,7 +96,7 @@ _022548D8:
strb r0, [r7, #2]
mov r0, #8
str r0, [sp]
- ldr r0, _02254918 ; =0x02254CF0
+ ldr r0, _02254918 ; =MOD49_02254CF0
ldr r2, _0225491C ; =MOD49_0225497C
mov r1, #0xc
add r3, r7, #0
@@ -115,7 +115,7 @@ _02254912:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_02254918: .word 0x02254CF0
+_02254918: .word MOD49_02254CF0
_0225491C: .word MOD49_0225497C
thumb_func_end MOD49_0225489C
@@ -146,7 +146,7 @@ MOD49_02254938: ; 0x02254938
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
- ldr r1, _02254970 ; =0x02254CE4
+ ldr r1, _02254970 ; =MOD49_02254CE4
ldr r1, [r1, r2]
blx r1
cmp r0, #0
@@ -160,7 +160,7 @@ MOD49_02254938: ; 0x02254938
_0225496E:
pop {r3, r4, r5, pc}
.align 2, 0
-_02254970: .word 0x02254CE4
+_02254970: .word MOD49_02254CE4
thumb_func_end MOD49_02254938
thumb_func_start MOD49_02254974
@@ -342,13 +342,13 @@ MOD49_02254A84: ; 0x02254A84
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254AA4 ; =0x02254D3C
+ ldr r0, _02254AA4 ; =MOD49_02254D3C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254AA4: .word 0x02254D3C
+_02254AA4: .word MOD49_02254D3C
thumb_func_end MOD49_02254A84
thumb_func_start MOD49_02254AA8
@@ -393,7 +393,7 @@ MOD49_02254AD4: ; 0x02254AD4
bl MOD20_022538A4
str r0, [sp, #0x14]
ldr r0, [r5, #4]
- ldr r2, _02254BD0 ; =0x02254D20
+ ldr r2, _02254BD0 ; =MOD49_02254D20
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -492,7 +492,7 @@ _02254B94:
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
nop
-_02254BD0: .word 0x02254D20
+_02254BD0: .word MOD49_02254D20
_02254BD4: .word 0x00000197
_02254BD8: .word 0x00010104
_02254BDC: .word 0x04001000
@@ -541,7 +541,7 @@ MOD49_02254C04: ; 0x02254C04
add r0, r5, #0
str r0, [sp, #0x10]
add r0, #0x54
- ldr r7, _02254CB4 ; =0x02254D60
+ ldr r7, _02254CB4 ; =MOD49_02254D60
str r4, [sp, #0xc]
str r0, [sp, #0x10]
_02254C3E:
@@ -601,7 +601,7 @@ _02254C9C:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
-_02254CB4: .word 0x02254D60
+_02254CB4: .word MOD49_02254D60
thumb_func_end MOD49_02254C04
thumb_func_start MOD49_02254CB8
@@ -631,15 +631,33 @@ _02254CD0:
thumb_func_end MOD49_02254CB8
.section .rodata
- ; 0x02254CE4
- .byte 0x99, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x11, 0x4A, 0x25, 0x02, 0x7E, 0xA2, 0x90, 0xC0
+
+ .global MOD49_02254CE4
+MOD49_02254CE4: ; 0x02254CE4
+ .word MOD49_02254998, MOD49_022549D8, MOD49_02254A10
+
+ .global MOD49_02254CF0
+MOD49_02254CF0: ; 0x02254CF0
+ .byte 0x7E, 0xA2, 0x90, 0xC0
.byte 0x7E, 0xA2, 0x68, 0x98, 0x7E, 0xA2, 0x40, 0x70, 0x7E, 0xA2, 0x18, 0x48, 0x4E, 0x72, 0x90, 0xC0
.byte 0x4E, 0x72, 0x68, 0x98, 0x4E, 0x72, 0x40, 0x70, 0x4E, 0x72, 0x18, 0x48, 0x1E, 0x42, 0x90, 0xC0
- .byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48, 0x00, 0x00, 0x00, 0x00
+ .byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48
+
+ .global MOD49_02254D20
+MOD49_02254D20: ; 0x02254D20
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x4A, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD49_02254D3C
+MOD49_02254D3C: ; 0x02254D3C
+ .word 0x00, MOD49_02254AD4, 0x00
+ .word 0x01, MOD49_02254BE4, 0x00
+ .word 0x00, 0x00000000, 0x00
+
+ .global MOD49_02254D60
+MOD49_02254D60: ; 0x02254D60
+ .byte 0x00, 0x00, 0x03, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x80, 0x05, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00
diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s
index 31f6263d..ad870e7a 100644
--- a/arm9/modules/50/asm/module_50.s
+++ b/arm9/modules/50/asm/module_50.s
@@ -96,7 +96,7 @@ MOD50_022548D4: ; 0x022548D4
cmp r1, #3
bhs _02254900
lsl r2, r1, #2
- ldr r1, _02254904 ; =0x02254B04
+ ldr r1, _02254904 ; =MOD50_02254B04
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
@@ -111,7 +111,7 @@ MOD50_022548D4: ; 0x022548D4
_02254900:
pop {r3, r4, r5, pc}
nop
-_02254904: .word 0x02254B04
+_02254904: .word MOD50_02254B04
thumb_func_end MOD50_022548D4
thumb_func_start MOD50_02254908
@@ -273,13 +273,13 @@ MOD50_022549F8: ; 0x022549F8
str r0, [sp, #4]
mov r0, #8
str r0, [sp, #8]
- ldr r0, _02254A18 ; =0x02254B2C
+ ldr r0, _02254A18 ; =MOD50_02254B2C
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
pop {pc}
nop
-_02254A18: .word 0x02254B2C
+_02254A18: .word MOD50_02254B2C
thumb_func_end MOD50_022549F8
thumb_func_start MOD50_02254A1C
@@ -321,7 +321,7 @@ MOD50_02254A48: ; 0x02254A48
bl MOD20_022538A0
add r5, r0, #0
ldr r0, [r5, #4]
- ldr r2, _02254ADC ; =0x02254B10
+ ldr r2, _02254ADC ; =MOD50_02254B10
mov r1, #6
mov r3, #0
bl FUN_02016C18
@@ -381,7 +381,7 @@ MOD50_02254A48: ; 0x02254A48
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
-_02254ADC: .word 0x02254B10
+_02254ADC: .word MOD50_02254B10
_02254AE0: .word 0x04001000
_02254AE4: .word 0xFFFFE0FF
thumb_func_end MOD50_02254A48
@@ -402,12 +402,22 @@ MOD50_02254AE8: ; 0x02254AE8
thumb_func_end MOD50_02254AE8
.section .rodata
- ; 0x02254B04
- .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD50_02254B04
+MOD50_02254B04: ; 0x02254B04
+ .word MOD50_02254924, MOD50_02254964, MOD50_02254978
+
+ .global MOD50_02254B10
+MOD50_02254B10: ; 0x02254B10
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x4A, 0x25, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD50_02254B2C
+MOD50_02254B2C: ; 0x02254B2C
+ .word 0x00, MOD50_02254A48, 0x00
+ .word 0x01, MOD50_02254AE8, 0x00
+ .word 0x00, 0x00000000, 0x00
.section .sinit
.word MOD50_02254840
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s
index 8dfb9b59..d46aaf36 100644
--- a/arm9/modules/53/asm/module_53.s
+++ b/arm9/modules/53/asm/module_53.s
@@ -222,7 +222,7 @@ _021D76D2:
lsl r0, r0, #2
ldr r0, [r4, r0]
lsl r2, r0, #3
- ldr r0, _021D7754 ; =0x021D98A0
+ ldr r0, _021D7754 ; =MOD53_021D98A0
ldr r2, [r0, r2]
cmp r2, #0
beq _021D76E8
@@ -256,11 +256,11 @@ _021D7718:
lsl r0, r0, #2
ldr r0, [r4, r0]
lsl r3, r0, #3
- ldr r0, _021D7754 ; =0x021D98A0
+ ldr r0, _021D7754 ; =MOD53_021D98A0
ldr r2, [r0, r3]
cmp r2, #0
beq _021D7744
- ldr r0, _021D7760 ; =0x021D98A4
+ ldr r0, _021D7760 ; =MOD53_021D98A0 + 4
ldr r0, [r0, r3]
cmp r0, #0
beq _021D7744
@@ -284,7 +284,7 @@ _021D7750: .word 0x000093B4
_021D7754: .word MOD53_021D98A0
_021D7758: .word 0x000E0D0F
_021D775C: .word 0x00004374
-_021D7760: .word MOD53_021D98A4
+_021D7760: .word MOD53_021D98A0 + 4
thumb_func_end MOD53_021D7654
thumb_func_start MOD53_021D7764
@@ -3907,7 +3907,7 @@ MOD53_021D93E8: ; 0x021D93E8
pop {r3, r4}
bx lr
_021D9404:
- ldr r1, _021D9418 ; =0x021D98A4
+ ldr r1, _021D9418 ; =MOD53_021D98A0 + 4
lsl r4, r2, #3
ldr r1, [r1, r4]
cmp r1, #0
@@ -3918,7 +3918,7 @@ _021D9412:
pop {r3, r4}
bx lr
nop
-_021D9418: .word MOD53_021D98A4
+_021D9418: .word MOD53_021D98A0 + 4
thumb_func_end MOD53_021D93E8
thumb_func_start MOD53_021D941C
@@ -4147,21 +4147,29 @@ MOD53_021D9648: ; 0x021D9648
.data
.global MOD53_021D98A0
MOD53_021D98A0: ; 0x021D98A0
- .byte 0x00, 0x00, 0x00, 0x00
-
- .global MOD53_021D98A4
-MOD53_021D98A4: ; 0x021D98A4
- .byte 0x01, 0x00, 0x00, 0x00, 0x95, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xED, 0x84, 0x1D, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0xF9, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x25, 0x84, 0x1D, 0x02
- .byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0x85, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x7D, 0x85, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x86, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x05, 0x87, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x9D, 0x87, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x87, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0xF9, 0x87, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x25, 0x88, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x61, 0x88, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xB1, 0x88, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x6D, 0x89, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xA1, 0x89, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0xC9, 0x89, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x8A, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x0D, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x8A, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0x51, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xB1, 0x8A, 0x1D, 0x02
- .byte 0x01, 0x00, 0x00, 0x00, 0xF9, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00
+ .word 0x00000000, 0x01
+ .word MOD53_021D8494, 0x00
+ .word MOD53_021D84EC, 0x00
+ .word MOD53_021D84F8, 0x00
+ .word MOD53_021D8424, 0x00
+ .word MOD53_021D852C, 0x01
+ .word MOD53_021D857C, 0x01
+ .word MOD53_021D86E0, 0x01
+ .word MOD53_021D8704, 0x01
+ .word MOD53_021D879C, 0x01
+ .word MOD53_021D87D8, 0x01
+ .word MOD53_021D87F8, 0x01
+ .word MOD53_021D8824, 0x01
+ .word MOD53_021D8860, 0x01
+ .word MOD53_021D88B0, 0x01
+ .word MOD53_021D896C, 0x01
+ .word MOD53_021D89A0, 0x01
+ .word MOD53_021D89C8, 0x01
+ .word MOD53_021D8A08, 0x01
+ .word MOD53_021D8A0C, 0x01
+ .word MOD53_021D8A2C, 0x01
+ .word MOD53_021D8A50, 0x01
+ .word MOD53_021D8AB0, 0x01
+ .word MOD53_021D8AF8, 0x01
.bss
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 752e8f3c..132efee7 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -4436,23 +4436,23 @@ MOD54_021D9758: ; 0x021D9758
.global MOD54_021D9780
MOD54_021D9780: ; 0x021D9780
- .byte 0x31, 0x94, 0x1D, 0x02, 0x3D, 0x94, 0x1D, 0x02, 0x65, 0x94, 0x1D, 0x02, 0x7D, 0x94, 0x1D, 0x02
- .byte 0x89, 0x94, 0x1D, 0x02, 0xB5, 0x94, 0x1D, 0x02, 0xB5, 0x91, 0x1D, 0x02, 0x75, 0x92, 0x1D, 0x02
- .byte 0xD1, 0x94, 0x1D, 0x02, 0xBD, 0x91, 0x1D, 0x02, 0xAD, 0x92, 0x1D, 0x02, 0xE9, 0x94, 0x1D, 0x02
- .byte 0xAD, 0x91, 0x1D, 0x02, 0x39, 0x92, 0x1D, 0x02, 0x01, 0x95, 0x1D, 0x02, 0x35, 0xB9, 0x02, 0x02
- .byte 0x19, 0x95, 0x1D, 0x02, 0x21, 0x95, 0x1D, 0x02, 0xE1, 0xA1, 0x02, 0x02, 0x45, 0x95, 0x1D, 0x02
- .byte 0x6D, 0x95, 0x1D, 0x02
+ .word MOD54_021D9430, MOD54_021D943C, MOD54_021D9464, MOD54_021D947C
+ .word MOD54_021D9488, MOD54_021D94B4, MOD54_021D91B4, MOD54_021D9274
+ .word MOD54_021D94D0, MOD54_021D91BC, MOD54_021D92AC, MOD54_021D94E8
+ .word MOD54_021D91AC, MOD54_021D9238, MOD54_021D9500, FUN_0202B934
+ .word MOD54_021D9518, MOD54_021D9520, FUN_0202A1E0, MOD54_021D9544
+ .word MOD54_021D956C
.data
.global MOD54_021D97E0
MOD54_021D97E0: ; 0x021D97E0
- .byte 0x0D, 0x7F, 0x1D, 0x02, 0xA5, 0x80, 0x1D, 0x02, 0xF1, 0x80, 0x1D, 0x02, 0x45, 0x7F, 0x1D, 0x02
- .byte 0x21, 0x81, 0x1D, 0x02, 0x51, 0x81, 0x1D, 0x02, 0x81, 0x82, 0x1D, 0x02, 0x99, 0x82, 0x1D, 0x02
- .byte 0x21, 0x83, 0x1D, 0x02, 0xA5, 0x85, 0x1D, 0x02, 0xC5, 0x85, 0x1D, 0x02, 0x01, 0x86, 0x1D, 0x02
- .byte 0x31, 0x86, 0x1D, 0x02, 0xDD, 0x86, 0x1D, 0x02, 0x2D, 0x87, 0x1D, 0x02, 0x51, 0x87, 0x1D, 0x02
- .byte 0x71, 0x87, 0x1D, 0x02, 0xB1, 0x87, 0x1D, 0x02, 0xD1, 0x87, 0x1D, 0x02, 0xF5, 0x87, 0x1D, 0x02
- .byte 0x4D, 0x88, 0x1D, 0x02, 0x89, 0x88, 0x1D, 0x02, 0x41, 0x83, 0x1D, 0x02, 0x71, 0x83, 0x1D, 0x02
- .byte 0x21, 0x84, 0x1D, 0x02, 0x7D, 0x84, 0x1D, 0x02, 0xAD, 0x84, 0x1D, 0x02, 0xD5, 0x84, 0x1D, 0x02
- .byte 0x19, 0x85, 0x1D, 0x02, 0x89, 0x85, 0x1D, 0x02, 0xCD, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word MOD54_021D7F0C, MOD54_021D80A4, MOD54_021D80F0, MOD54_021D7F44
+ .word MOD54_021D8120, MOD54_021D8150, MOD54_021D8280, MOD54_021D8298
+ .word MOD54_021D8320, MOD54_021D85A4, MOD54_021D85C4, MOD54_021D8600
+ .word MOD54_021D8630, MOD54_021D86DC, MOD54_021D872C, MOD54_021D8750
+ .word MOD54_021D8770, MOD54_021D87B0, MOD54_021D87D0, MOD54_021D87F4
+ .word MOD54_021D884C, MOD54_021D8888, MOD54_021D8340, MOD54_021D8370
+ .word MOD54_021D8420, MOD54_021D847C, MOD54_021D84AC, MOD54_021D84D4
+ .word MOD54_021D8518, MOD54_021D8588, MOD54_021D80CC, 0x00000000
.bss
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 20:38:35 +0000