summaryrefslogtreecommitdiff
path: root/arm9/modules/62/asm/module_62.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/62/asm/module_62.s')
-rw-r--r--arm9/modules/62/asm/module_62.s30
1 files changed, 15 insertions, 15 deletions
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 33be95e4..6fff3ef5 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1157,7 +1157,7 @@ MOD62_0222DE00: ; 0x0222DE00
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #5
str r0, [sp, #0x14]
bl FUN_0200A914
@@ -1247,7 +1247,7 @@ MOD62_0222DE00: ; 0x0222DE00
ldr r0, [sp, #0x18]
bl FUN_02021A20
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, sp, #0x1c
bl FUN_02019178
add sp, #0x5c
@@ -1977,7 +1977,7 @@ _0222E442:
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r6, #0
str r0, [sp, #0x20]
cmp r7, #0
@@ -2010,7 +2010,7 @@ _0222E49A:
blt _0222E49A
_0222E4D0:
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r1, #0x67
ldr r0, [sp, #0x1c]
lsl r1, r1, #2
@@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC80:
cmp r7, #0xff
beq _0222EC9A
@@ -3017,7 +3017,7 @@ _0222EC80:
add r0, r1, r0
ldr r0, [r0, #4]
mov r1, #0xa1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC9A:
add r2, r5, #4
ldr r1, [r2, r6]
@@ -3272,7 +3272,7 @@ _0222EE96:
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r6, r0, #0
bl FUN_0200A914
@@ -3293,7 +3293,7 @@ _0222EE96:
add r0, r5, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -3714,7 +3714,7 @@ _0222F226:
mov r1, #0x1a
mov r2, #0xa
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r6, r0, #0
bl FUN_0200A914
@@ -3735,7 +3735,7 @@ _0222F226:
add r0, r5, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -5753,7 +5753,7 @@ MOD62_0223021C: ; 0x0223021C
add r4, r0, #0
ldr r0, _02230268 ; =0x00000428
ldr r0, [r5, r0]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r6, r0, #0
mov r0, #0x6a
lsl r0, r0, #2
@@ -6235,12 +6235,12 @@ _022305E2:
mov r1, #0xa1
ldr r0, [r4, r0]
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02230724 ; =0x00000428
mov r1, #0xaa
ldr r0, [r4, r0]
add r2, sp, #0x64
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x35
add r1, sp, #0x58
bl MOD08_02228218
@@ -6531,7 +6531,7 @@ _02230860:
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_022308A8:
mov r0, #0xf5
mov r1, #8
@@ -7091,7 +7091,7 @@ MOD62_02230D38: ; 0x02230D38
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230D5C:
mov r0, #0xff
str r0, [r4, r6]