summaryrefslogtreecommitdiff
path: root/arm9/asm/unk_0206F3FC.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm/unk_0206F3FC.s')
-rw-r--r--arm9/asm/unk_0206F3FC.s70
1 files changed, 35 insertions, 35 deletions
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 2a03ef5f..eddf119f 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1681,7 +1681,7 @@ _020700BC:
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
@@ -1705,42 +1705,42 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701E4 ; =0x00000706
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701E8 ; =0x00000708
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701EC ; =0x0000070A
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x6
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701F0 ; =0x0000070C
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa1
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701F4 ; =0x00000712
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x71
add r2, r5, r6
lsl r1, r1, #0x4
@@ -1748,14 +1748,14 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0x70
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _020701F8 ; =0x00000711
add r2, r5, r6
strb r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xaf
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x1
ldr r0, _020701FC ; =0x0000070E
bne _02070184
@@ -1864,7 +1864,7 @@ _02070256:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _0207026C
add r4, r4, #0x1
@@ -1925,106 +1925,106 @@ _020702BE: ; jump table (using 16-bit offset)
_020702C8:
mov r1, #0x7a
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7b
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7c
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7d
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
b _020703B6
_020702F8:
mov r1, #0x7e
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7f
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x80
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x81
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
b _020703B6
_02070328:
mov r1, #0x82
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x83
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x84
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x85
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
b _020703B6
_02070358:
mov r1, #0x86
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x87
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x88
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x89
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
b _020703B6
_02070388:
mov r1, #0x8a
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8b
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8c
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8d
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r4, r0
_020703B6:
add r0, r4, #0x0
@@ -2839,7 +2839,7 @@ _02070A38:
_02070A3A:
mov r1, #0xa2
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02070A4E
add r0, r4, #0x2
@@ -3790,7 +3790,7 @@ _020711D0:
ldr r0, [sp, #0x8]
add r1, #0x36
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r7, r0, #0x10
beq _02071210
@@ -5249,7 +5249,7 @@ _02071D14:
add r2, sp, #0x0
str r1, [sp, #0x0]
mov r1, #0xa2
- bl SetMonDataEncrypted
+ bl SetMonData
mov r0, #0x1
pop {r3-r7, pc}
_02071D30:
@@ -5670,7 +5670,7 @@ FUN_02072080: ; 0x02072080
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _020720D8 ; =0x00000B25
@@ -5713,7 +5713,7 @@ FUN_020720E0: ; 0x020720E0
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x1c
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02072138 ; =0x00000B25