summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/modules/62/asm/module_62.s144
1 files changed, 99 insertions, 45 deletions
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 2504e001..33e331d3 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1444,7 +1444,7 @@ _0222E04A:
stmia r6!, {r0}
cmp r4, #8
blt _0222E04A
- ldr r3, _0222E0C4 ; =0x02231158
+ ldr r3, _0222E0C4 ; =MOD62_02231158
add r2, sp, #4
mov r1, #0x10
_0222E068:
@@ -1489,7 +1489,7 @@ _0222E0B4: .word 0x000066B4
_0222E0B8: .word 0x00006A2C
_0222E0BC: .word 0x00006DB8
_0222E0C0: .word 0x000061A8
-_0222E0C4: .word 0x02231158
+_0222E0C4: .word MOD62_02231158
thumb_func_end MOD62_0222E004
thumb_func_start MOD62_0222E0C8
@@ -1987,13 +1987,13 @@ _0222E49A:
ldr r1, [r5]
ldr r0, [sp, #0x20]
lsl r2, r1, #3
- ldr r1, _0222E538 ; =0x02231358
+ ldr r1, _0222E538 ; =MOD62_02231358
ldr r1, [r1, r2]
bl NewString_ReadMsgData
ldr r2, [r5]
add r4, r0, #0
lsl r3, r2, #3
- ldr r2, _0222E538 ; =0x02231358
+ ldr r2, _0222E538 ; =MOD62_02231358
mov r0, #0x67
add r2, r2, r3
ldr r1, [sp, #0x1c]
@@ -2058,7 +2058,7 @@ _0222E4D0:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
-_0222E538: .word 0x02231358
+_0222E538: .word MOD62_02231358
thumb_func_end MOD62_0222E3C4
thumb_func_start MOD62_0222E53C
@@ -2424,7 +2424,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
mov r0, #0x35
bl FUN_0200BB14
add r2, sp, #0x2c
- ldr r5, _0222E868 ; =0x02231138
+ ldr r5, _0222E868 ; =MOD62_02231138
str r0, [r4, #8]
ldmia r5!, {r0, r1}
add r3, r2, #0
@@ -2434,7 +2434,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
ldmia r5!, {r0, r1}
stmia r2!, {r0, r1}
ldmia r5!, {r0, r1}
- ldr r6, _0222E86C ; =0x0223110C
+ ldr r6, _0222E86C ; =MOD62_0223110C
stmia r2!, {r0, r1}
add r5, sp, #0x18
ldmia r6!, {r0, r1}
@@ -2448,7 +2448,7 @@ MOD62_0222E7E8: ; 0x0222E7E8
ldr r0, [r4, #8]
mov r3, #0x20
bl FUN_0200BB6C
- ldr r3, _0222E870 ; =0x02231120
+ ldr r3, _0222E870 ; =MOD62_02231120
add r2, sp, #0
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
@@ -2478,9 +2478,9 @@ _0222E864:
add sp, #0x4c
pop {r3, r4, r5, r6, pc}
.align 2, 0
-_0222E868: .word 0x02231138
-_0222E86C: .word 0x0223110C
-_0222E870: .word 0x02231120
+_0222E868: .word MOD62_02231138
+_0222E86C: .word MOD62_0223110C
+_0222E870: .word MOD62_02231120
thumb_func_end MOD62_0222E7E8
thumb_func_start MOD62_0222E874
@@ -2553,7 +2553,7 @@ _0222E8F4: .word 0x0000BB80
MOD62_0222E8F8: ; 0x0222E8F8
push {r4, r5, r6, r7, lr}
sub sp, #0x64
- ldr r4, _0222E97C ; =0x02231178
+ ldr r4, _0222E97C ; =MOD62_02231178
add r6, r0, #0
add r3, sp, #0
mov r2, #6
@@ -2618,7 +2618,7 @@ _0222E912:
add sp, #0x64
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_0222E97C: .word 0x02231178
+_0222E97C: .word MOD62_02231178
_0222E980: .word 0x0000AFC8
_0222E984: .word 0x000066B2
_0222E988: .word 0x0000B798
@@ -4237,7 +4237,7 @@ MOD62_0222F5B0: ; 0x0222F5B0
add r1, r5, #0
add r2, sp, #0x6c
bl FUN_0200C154
- ldr r3, _0222F730 ; =0x022311A8
+ ldr r3, _0222F730 ; =MOD62_022311A8
str r0, [r4, #0x30]
add r2, sp, #0x38
mov r1, #0x1a
@@ -4248,7 +4248,7 @@ _0222F676:
add r2, r2, #2
sub r1, r1, #1
bne _0222F676
- ldr r3, _0222F734 ; =0x022311DC
+ ldr r3, _0222F734 ; =MOD62_022311DC
add r2, sp, #4
mov r1, #0x1a
_0222F688:
@@ -4320,8 +4320,8 @@ _0222F720: .word 0x00006DB4
_0222F724: .word 0x000062B6
_0222F728: .word 0x00006A27
_0222F72C: .word 0x00006DB3
-_0222F730: .word 0x022311A8
-_0222F734: .word 0x022311DC
+_0222F730: .word MOD62_022311A8
+_0222F734: .word MOD62_022311DC
thumb_func_end MOD62_0222F5B0
thumb_func_start MOD62_0222F738
@@ -4691,7 +4691,7 @@ MOD62_0222F990: ; 0x0222F990
lsl r1, r1, #2
ldr r1, [r4, r1]
lsl r2, r1, #2
- ldr r1, _0222F9B0 ; =0x02231220
+ ldr r1, _0222F9B0 ; =MOD62_02231220
ldr r1, [r1, r2]
blx r1
add r4, #0xe0
@@ -4701,7 +4701,7 @@ MOD62_0222F990: ; 0x0222F990
add r0, r5, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_0222F9B0: .word 0x02231220
+_0222F9B0: .word MOD62_02231220
thumb_func_end MOD62_0222F990
thumb_func_start MOD62_0222F9B4
@@ -5596,7 +5596,7 @@ MOD62_022300E4: ; 0x022300E4
mov r7, #0x1d
lsl r7, r7, #4
strb r0, [r1, #3]
- ldr r1, _022301A0 ; =0x02231260
+ ldr r1, _022301A0 ; =MOD62_02231260
ldr r2, [sp, #4]
add r3, r7, #1
add r4, r7, #2
@@ -5682,7 +5682,7 @@ _0223017E:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_022301A0: .word 0x02231260
+_022301A0: .word MOD62_02231260
_022301A4: .word 0x000001D2
_022301A8: .word MOD62_0222FE58
thumb_func_end MOD62_022300E4
@@ -7367,7 +7367,7 @@ MOD62_02230F80: ; 0x02230F80
sub sp, #0xfc
add r4, r0, #0
bl FUN_0201E6D8
- ldr r5, _022310B8 ; =0x02231238
+ ldr r5, _022310B8 ; =MOD62_02231238
add r3, sp, #0x10
mov r2, #5
_02230F90:
@@ -7401,7 +7401,7 @@ _02230F90:
lsl r1, r1, #0x14
lsl r2, r2, #0x10
bl MIi_CpuClear32
- ldr r5, _022310BC ; =0x02231210
+ ldr r5, _022310BC ; =MOD62_02231210
add r3, sp, #0
add r2, r3, #0
ldmia r5!, {r0, r1}
@@ -7410,7 +7410,7 @@ _02230F90:
stmia r3!, {r0, r1}
add r0, r2, #0
bl FUN_02016BBC
- ldr r5, _022310C0 ; =0x02231294
+ ldr r5, _022310C0 ; =MOD62_02231294
add r3, sp, #0xa8
mov r2, #0xa
_02230FF0:
@@ -7453,7 +7453,7 @@ _02230FF0:
strh r2, [r1]
add r1, r0, #0
bl FUN_0201E6E4
- ldr r5, _022310C8 ; =0x022312E8
+ ldr r5, _022310C8 ; =MOD62_022312E8
add r3, sp, #0x38
mov r2, #0xe
_02231052:
@@ -7499,11 +7499,11 @@ _02231052:
add sp, #0xfc
pop {r4, r5, pc}
nop
-_022310B8: .word 0x02231238
-_022310BC: .word 0x02231210
-_022310C0: .word 0x02231294
+_022310B8: .word MOD62_02231238
+_022310BC: .word MOD62_02231210
+_022310C0: .word MOD62_02231294
_022310C4: .word 0x04000008
-_022310C8: .word 0x022312E8
+_022310C8: .word MOD62_022312E8
thumb_func_end MOD62_02230F80
thumb_func_start MOD62_022310CC
@@ -7536,47 +7536,101 @@ _02231108: .word 0x00003FF8
thumb_func_end MOD62_022310CC
.section .rodata
- ; 0x0223110C
+
+ .global MOD62_0223110C
+MOD62_0223110C: ; 0x0223110C
.byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00
- .byte 0x10, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
- .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x10, 0x00, 0x00, 0x00
+
+ .global MOD62_02231120
+MOD62_02231120: ; 0x02231120
+ .byte 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
+ .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
+
+ .global MOD62_02231138
+MOD62_02231138: ; 0x02231138
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x13, 0x00, 0x17, 0x00
+ .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
+
+ .global MOD62_02231158
+MOD62_02231158: ; 0x02231158
+ .byte 0x13, 0x00, 0x17, 0x00
.byte 0x4B, 0x00, 0x17, 0x00, 0x13, 0x00, 0x2F, 0x00, 0x4B, 0x00, 0x2F, 0x00, 0x13, 0x00, 0x47, 0x00
- .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00, 0x88, 0x00, 0x00, 0x00
+ .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00
+
+ .global MOD62_02231178
+MOD62_02231178: ; 0x02231178
+ .byte 0x88, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x17, 0x00
+ .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+
+ .global MOD62_022311A8
+MOD62_022311A8: ; 0x022311A8
+ .byte 0x14, 0x00, 0x17, 0x00
.byte 0x14, 0x00, 0x2F, 0x00, 0x14, 0x00, 0x47, 0x00, 0x14, 0x00, 0x5F, 0x00, 0x4C, 0x00, 0x17, 0x00
.byte 0x4C, 0x00, 0x2F, 0x00, 0x4C, 0x00, 0x47, 0x00, 0x4C, 0x00, 0x5F, 0x00, 0x1B, 0x00, 0x7C, 0x00
.byte 0x43, 0x00, 0x7C, 0x00, 0x20, 0x00, 0xAB, 0x00, 0x68, 0x00, 0xAB, 0x00, 0xC0, 0x00, 0xAB, 0x00
+
+ .global MOD62_022311DC
+MOD62_022311DC: ; 0x022311DC
.byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0x0D, 0x00, 0x0A, 0x00, 0x0D, 0x00, 0x0A, 0x00, 0x10, 0x00, 0x0C, 0x00, 0x1C, 0x00, 0x0C, 0x00
- .byte 0x1C, 0x00, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0xB5, 0xFA, 0x22, 0x02, 0xAD, 0x03, 0x23, 0x02, 0xC1, 0x0C, 0x23, 0x02
- .byte 0x6D, 0x0D, 0x23, 0x02, 0xE1, 0x0D, 0x23, 0x02, 0x39, 0x0F, 0x23, 0x02, 0x01, 0x00, 0x00, 0x00
+ .byte 0x1C, 0x00, 0x0C, 0x00
+
+ .global MOD62_02231210
+MOD62_02231210: ; 0x02231210
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x00, 0x00
+
+ .global MOD62_02231220
+MOD62_02231220: ; 0x02231220
+ .word MOD62_0222FAB4, MOD62_022303AC, MOD62_02230CC0, MOD62_02230D6C
+ .word MOD62_02230DE0, MOD62_02230F38
+
+ .global MOD62_02231238
+MOD62_02231238: ; 0x02231238
+ .byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
- .byte 0x60, 0x00, 0x00, 0x00, 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18
+ .byte 0x60, 0x00, 0x00, 0x00
+
+ .global MOD62_02231260
+MOD62_02231260: ; 0x02231260
+ .byte 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18
.byte 0x28, 0x38, 0x40, 0x50, 0x40, 0x50, 0x08, 0x18, 0x40, 0x50, 0x40, 0x50, 0x58, 0x68, 0x08, 0x18
.byte 0x58, 0x68, 0x40, 0x50, 0x68, 0x80, 0x08, 0x30, 0x68, 0x80, 0x38, 0x60, 0xA8, 0xBC, 0x12, 0x4D
- .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED
+
+ .global MOD62_02231294
+MOD62_02231294: ; 0x02231294
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD62_022312E8
+MOD62_022312E8: ; 0x022312E8
+ .byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0D, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x01, 0x00, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0C, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x3D, 0xF9, 0x22, 0x02, 0x01, 0x00, 0x00, 0x00, 0x05, 0xF9, 0x22, 0x02, 0x02, 0x00, 0x00, 0x00
- .byte 0x4D, 0xF9, 0x22, 0x02, 0x03, 0x00, 0x00, 0x00, 0x71, 0xF9, 0x22, 0x02, 0x04, 0x00, 0x00, 0x00
- .byte 0x81, 0xF9, 0x22, 0x02
+ .byte 0x01, 0x00, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD62_02231358
+MOD62_02231358: ; 0x02231358
+ .word 0x00, MOD62_0222F93C
+ .word 0x01, MOD62_0222F904
+ .word 0x02, MOD62_0222F94C
+ .word 0x03, MOD62_0222F970
+ .word 0x04, MOD62_0222F980
.section .sinit
.word MOD62_0222D5C0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 12:30:00 +0000