summaryrefslogtreecommitdiff
path: root/arm9/modules/68
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/68')
-rw-r--r--arm9/modules/68/asm/module_68.s76
1 files changed, 38 insertions, 38 deletions
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index 08507c53..6c2c3772 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -56,7 +56,7 @@ MOD68_021D74E0: ; 0x021D74E0
ldr r0, [r5, r0]
mov r1, #0x24
ldrb r0, [r0, #8]
- bl FUN_02085274
+ bl LoadNutDataSingle
mov r1, #0x7f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -519,7 +519,7 @@ MOD68_021D7904: ; 0x021D7904
ldr r0, [r0]
add r1, r2, #0
add r6, r3, #0
- bl FUN_0200A914
+ bl NewString_ReadMsgData
str r0, [sp, #0x10]
mov r0, #0
ldr r1, [sp, #0x10]
@@ -542,7 +542,7 @@ MOD68_021D7904: ; 0x021D7904
str r1, [sp, #0xc]
bl FUN_0201BDE0
ldr r0, [sp, #0x10]
- bl FUN_02021A20
+ bl String_dtor
add r0, r5, r4
bl FUN_02019220
add sp, #0x14
@@ -674,11 +674,11 @@ MOD68_021D7A18: ; 0x021D7A18
add r0, #0xc4
ldr r0, [r0]
mov r1, #6
- bl FUN_0200A914
+ bl NewString_ReadMsgData
add r7, r0, #0
mov r0, #6
mov r1, #0x24
- bl FUN_020219F4
+ bl String_ctor
mov r3, #2
add r6, r0, #0
mov r2, #0x7e
@@ -699,7 +699,7 @@ MOD68_021D7A18: ; 0x021D7A18
ldr r0, [r0]
add r1, r6, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -712,15 +712,15 @@ MOD68_021D7A18: ; 0x021D7A18
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r7, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r6, #0
- bl FUN_02021A20
+ bl String_dtor
mov r0, #0x7e
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #0x24
ldrb r0, [r0, #8]
- bl FUN_020852E8
+ bl GetNutName
add r5, r0, #0
mov r1, #0
str r1, [sp]
@@ -734,7 +734,7 @@ MOD68_021D7A18: ; 0x021D7A18
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r5, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r4, #0
bl FUN_02019220
add sp, #0x10
@@ -758,7 +758,7 @@ MOD68_021D7AE4: ; 0x021D7AE4
ldr r0, [r4, r0]
mov r1, #0x24
ldrb r0, [r0, #8]
- bl FUN_02085310
+ bl GetNutDesc
mov r1, #0
add r4, r0, #0
str r1, [sp]
@@ -772,7 +772,7 @@ MOD68_021D7AE4: ; 0x021D7AE4
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r4, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r5, #0
bl FUN_02019220
add sp, #0x10
@@ -794,7 +794,7 @@ MOD68_021D7B34: ; 0x021D7B34
add r4, #0xc4
ldr r0, [r4]
mov r1, #0xa
- bl FUN_0200A914
+ bl NewString_ReadMsgData
mov r1, #0
add r4, r0, #0
str r1, [sp]
@@ -808,7 +808,7 @@ MOD68_021D7B34: ; 0x021D7B34
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r4, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r5, #0
bl FUN_02019220
add sp, #0x10
@@ -831,7 +831,7 @@ MOD68_021D7B80: ; 0x021D7B80
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #1
- bl FUN_02085290
+ bl GetNutAttr
add r1, r0, #0
beq _021D7BA4
sub r1, r1, #1
@@ -839,7 +839,7 @@ _021D7BA4:
add r4, #0xc4
ldr r0, [r4]
add r1, #0xb
- bl FUN_0200A914
+ bl NewString_ReadMsgData
mov r1, #0
add r4, r0, #0
str r1, [sp]
@@ -853,7 +853,7 @@ _021D7BA4:
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r4, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r5, #0
bl FUN_02019220
add sp, #0x10
@@ -875,7 +875,7 @@ MOD68_021D7BDC: ; 0x021D7BDC
add r4, #0xc4
ldr r0, [r4]
mov r1, #8
- bl FUN_0200A914
+ bl NewString_ReadMsgData
mov r1, #0
add r4, r0, #0
str r1, [sp]
@@ -889,7 +889,7 @@ MOD68_021D7BDC: ; 0x021D7BDC
str r1, [sp, #0xc]
bl FUN_0201BDE0
add r0, r4, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r5, #0
bl FUN_02019220
add sp, #0x10
@@ -912,7 +912,7 @@ MOD68_021D7C28: ; 0x021D7C28
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #0
- bl FUN_02085290
+ bl GetNutAttr
mov r1, #0xfa
lsl r1, r1, #2
mul r1, r0
@@ -927,11 +927,11 @@ MOD68_021D7C28: ; 0x021D7C28
add r0, #0xc4
ldr r0, [r0]
mov r1, #9
- bl FUN_0200A914
+ bl NewString_ReadMsgData
str r0, [sp, #0x10]
mov r0, #0x20
mov r1, #0x24
- bl FUN_020219F4
+ bl String_ctor
add r4, r0, #0
add r0, r7, #0
mov r1, #0xa
@@ -963,7 +963,7 @@ MOD68_021D7C28: ; 0x021D7C28
ldr r0, [r5]
ldr r2, [sp, #0x10]
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -976,9 +976,9 @@ MOD68_021D7C28: ; 0x021D7C28
str r1, [sp, #0xc]
bl FUN_0201BDE0
ldr r0, [sp, #0x10]
- bl FUN_02021A20
+ bl String_dtor
add r0, r4, #0
- bl FUN_02021A20
+ bl String_dtor
add r0, r6, #0
bl FUN_02019220
add sp, #0x14
@@ -1381,7 +1381,7 @@ MOD68_021D7F98: ; 0x021D7F98
ldr r0, [r4, r0]
mov r1, #0x24
ldrb r0, [r0, #8]
- bl FUN_02085274
+ bl LoadNutDataSingle
mov r1, #0x7f
lsl r1, r1, #2
str r0, [r4, r1]
@@ -2159,7 +2159,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #5
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x65
lsl r1, r1, #2
@@ -2172,7 +2172,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #6
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D8860 ; =0x0000019A
lsl r2, r2, #0x18
@@ -2184,7 +2184,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #7
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D8868 ; =0x000001A6
lsl r2, r2, #0x18
@@ -2202,7 +2202,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #9
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x6b
lsl r1, r1, #2
@@ -2215,7 +2215,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #5
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D8878 ; =0x000001B2
lsl r2, r2, #0x18
@@ -2232,7 +2232,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #8
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x6e
lsl r1, r1, #2
@@ -2245,7 +2245,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #9
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x71
lsl r1, r1, #2
@@ -2263,7 +2263,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #7
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D8898 ; =0x000001D6
lsl r2, r2, #0x18
@@ -2275,7 +2275,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #8
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x1d
lsl r1, r1, #4
@@ -2294,7 +2294,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #6
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D88A8 ; =0x000001E2
lsl r2, r2, #0x18
@@ -2306,7 +2306,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #7
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
ldr r1, _021D88B0 ; =0x000001EE
lsl r2, r2, #0x18
@@ -2318,7 +2318,7 @@ MOD68_021D85F4: ; 0x021D85F4
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #8
- bl FUN_02085290
+ bl GetNutAttr
add r2, r0, #0
mov r1, #0x7a
lsl r1, r1, #2
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 20:02:27 +0000