summaryrefslogtreecommitdiff
path: root/arm9/asm/scrcmd_18.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm/scrcmd_18.s')
-rw-r--r--arm9/asm/scrcmd_18.s204
1 files changed, 102 insertions, 102 deletions
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index f52aaf69..bcd4dc70 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -91,17 +91,17 @@ FUN_0204434C: ; 0x0204434C
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
ldrh r1, [r6, #0x0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _020443A0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
b _020443A2
_020443A0:
mov r0, #0x0
@@ -138,10 +138,10 @@ FUN_020443A8: ; 0x020443A8
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
ldrh r1, [r6, #0x0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x7
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r7, #0x0
@@ -187,7 +187,7 @@ FUN_02044414: ; 0x02044414
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
add r6, r0, #0x0
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #0x6
@@ -289,12 +289,12 @@ FUN_020444F4: ; 0x020444F4
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r4, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r2, #0x0
mov r1, #0x4c
add r4, r0, #0x0
strh r2, [r6, #0x0]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044556
mov r0, #0x0
@@ -303,25 +303,25 @@ _02044556:
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
bne _02044592
_0204458E:
@@ -358,7 +358,7 @@ FUN_02044598: ; 0x02044598
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r7, r0, #0x18
ldr r1, _02044650 ; =0x00000006
@@ -371,35 +371,35 @@ _020445E4:
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _0204463E
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r5, r0
bne _0204463E
_02044638:
@@ -444,7 +444,7 @@ FUN_02044658: ; 0x02044658
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_0204A32C
strh r0, [r4, #0x0]
mov r0, #0x0
@@ -474,7 +474,7 @@ FUN_0204469C: ; 0x0204469C
str r0, [sp, #0x0]
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x8]
@@ -489,17 +489,17 @@ _020446EA:
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r4, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _0204471A
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0x0]
cmp r0, r1
bhi _0204471A
@@ -544,18 +544,18 @@ FUN_02044730: ; 0x02044730
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r2, #0x0
mov r1, #0x4c
add r5, r0, #0x0
strh r2, [r4, #0x0]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044786
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x0]
_02044786:
mov r0, #0x0
@@ -585,7 +585,7 @@ FUN_0204478C: ; 0x0204478C
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r6, r0
@@ -597,11 +597,11 @@ _020447D2:
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _020447F2
mov r0, #0x0
@@ -609,7 +609,7 @@ _020447D2:
pop {r4-r6, pc}
_020447F2:
add r0, r5, #0x0
- bl GetMonNatureEncrypted
+ bl GetMonNature
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -639,7 +639,7 @@ FUN_02044800: ; 0x02044800
str r0, [sp, #0x0]
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r1, _02044884 ; =0x000000FF
@@ -651,15 +651,15 @@ _02044848:
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044874
add r0, r4, #0x0
- bl GetMonNatureEncrypted
+ bl GetMonNature
ldr r1, [sp, #0x0]
cmp r1, r0
bne _02044874
@@ -704,10 +704,10 @@ FUN_0204488C: ; 0x0204488C
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x9
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -744,11 +744,11 @@ FUN_020448D4: ; 0x020448D4
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
ldr r1, [sp, #0x0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, sp, #0x4
strh r0, [r1, #0x0]
cmp r4, #0x0
@@ -756,7 +756,7 @@ FUN_020448D4: ; 0x020448D4
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
@@ -774,7 +774,7 @@ _0204495A:
add r0, r5, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0xb
bne _0204496E
add r0, r4, #0x1
@@ -784,7 +784,7 @@ _0204496E:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r7, r0
bne _02044982
add r0, r4, #0x1
@@ -804,7 +804,7 @@ _02044994:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl SetMonDataEncrypted
+ bl SetMonData
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -834,11 +834,11 @@ FUN_020449A4: ; 0x020449A4
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, sp, #0x0
strh r0, [r1, #0x0]
ldrh r0, [r1, #0x0]
@@ -853,7 +853,7 @@ _020449FA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x0
- bl SetMonDataEncrypted
+ bl SetMonData
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -890,11 +890,11 @@ FUN_02044A0C: ; 0x02044A0C
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r7, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, #0x13
add r1, r4, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -952,16 +952,16 @@ FUN_02044A94: ; 0x02044A94
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0x0
mov r1, #0xb0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x0]
add r0, r4, #0x0
mov r1, #0xb1
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -982,7 +982,7 @@ FUN_02044B00: ; 0x02044B00
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -1003,7 +1003,7 @@ FUN_02044B2C: ; 0x02044B2C
str r0, [sp, #0x0]
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r5, #0x0
add r7, r0, #0x0
add r4, r5, #0x0
@@ -1013,10 +1013,10 @@ _02044B5A:
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044B74
add r4, r4, #0x1
@@ -1055,7 +1055,7 @@ FUN_02044B84: ; 0x02044B84
str r0, [sp, #0x0]
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r5, #0x0
add r4, r5, #0x0
str r0, [sp, #0x8]
@@ -1068,17 +1068,17 @@ _02044BC8:
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044BF8
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044BF8
add r4, r4, #0x1
@@ -1114,7 +1114,7 @@ FUN_02044C0C: ; 0x02044C0C
str r0, [sp, #0x4]
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r5, #0x0
add r4, r5, #0x0
str r0, [sp, #0x8]
@@ -1124,17 +1124,17 @@ _02044C44:
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044C6E
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044C6E
add r4, r4, #0x1
@@ -1168,7 +1168,7 @@ FUN_02044C88: ; 0x02044C88
str r0, [sp, #0x0]
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r5, #0x0
add r7, r0, #0x0
add r4, r5, #0x0
@@ -1178,10 +1178,10 @@ _02044CB6:
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044CD0
add r4, r4, #0x1
@@ -1211,7 +1211,7 @@ FUN_02044CE0: ; 0x02044CE0
str r0, [sp, #0x0]
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r4, _02044D40 ; =0x00000000
@@ -1223,10 +1223,10 @@ _02044D12:
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
add r1, r4, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r7, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044D32
ldr r0, [sp, #0x0]
@@ -1269,10 +1269,10 @@ FUN_02044D44: ; 0x02044D44
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x6f
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1301,11 +1301,11 @@ FUN_02044D8C: ; 0x02044D8C
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
add r1, r4, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044DDA
mov r0, #0x0
@@ -1316,7 +1316,7 @@ _02044DDA:
add r0, r6, #0x0
mov r1, #0x36
add r2, r4, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044DF0
add r0, r4, #0x1
@@ -1326,7 +1326,7 @@ _02044DF0:
add r0, r6, #0x0
mov r1, #0x37
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044E04
add r0, r4, #0x1
@@ -1336,7 +1336,7 @@ _02044E04:
add r0, r6, #0x0
mov r1, #0x38
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044E18
add r0, r4, #0x1
@@ -1346,7 +1346,7 @@ _02044E18:
add r0, r6, #0x0
mov r1, #0x39
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02044E2C
add r0, r4, #0x1
@@ -1382,7 +1382,7 @@ FUN_02044E34: ; 0x02044E34
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r4, #0x0
bl FUN_020699A4
mov r0, #0x0
@@ -1420,11 +1420,11 @@ FUN_02044E78: ; 0x02044E78
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
add r1, r7, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1454,10 +1454,10 @@ FUN_02044ED8: ; 0x02044ED8
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x6
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1478,13 +1478,13 @@ FUN_02044F20: ; 0x02044F20
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r2, #0x0
add r1, sp, #0x0
strh r2, [r1, #0x0]
mov r1, #0x6
add r2, sp, #0x0
- bl SetMonDataEncrypted
+ bl SetMonData
mov r0, #0x0
pop {r3-r5, pc}
@@ -1512,7 +1512,7 @@ FUN_02044F58: ; 0x02044F58
str r0, [sp, #0x0]
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r5, _02044FE4 ; =0x00000000
@@ -1523,17 +1523,17 @@ _02044F9E:
ldr r0, [r7, #0xc]
bl FUN_0206BB1C
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _02044FD4
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
ldr r0, [sp, #0x0]
@@ -1580,7 +1580,7 @@ FUN_02044FE8: ; 0x02044FE8
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r4, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r4, #0x0
add r6, r0, #0x0
add r5, r4, #0x0
@@ -1593,7 +1593,7 @@ _0204502A:
add r1, r0, #0x0
add r0, r6, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02045048
add r0, r5, #0x1
@@ -1628,7 +1628,7 @@ FUN_0204505C: ; 0x0204505C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x10
add r4, #0x80
lsr r6, r0, #0x10
@@ -1649,11 +1649,11 @@ _0204509A:
_020450A6:
ldr r0, [sp, #0xc]
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
bne _020450E8
add r0, r7, #0x0
@@ -1662,7 +1662,7 @@ _020450A6:
add r1, r0, #0x0
add r0, r4, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _020450DE
ldr r0, [sp, #0x4]
@@ -1725,7 +1725,7 @@ FUN_02045104: ; 0x02045104
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r7, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r5, r0, #0x0
lsl r0, r6, #0x18
lsr r0, r0, #0x18
@@ -1734,7 +1734,7 @@ FUN_02045104: ; 0x02045104
add r1, r0, #0x0
add r0, r5, #0x0
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1768,7 +1768,7 @@ FUN_02045170: ; 0x02045170
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
add r1, r6, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r5, r0, #0x0
lsl r0, r4, #0x18
lsr r0, r0, #0x18
@@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170
add r1, r0, #0x0
add r0, r5, #0x0
add r2, sp, #0x0
- bl SetMonDataEncrypted
+ bl SetMonData
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -1800,7 +1800,7 @@ FUN_020451D0: ; 0x020451D0
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x10
add r4, #0x80
lsr r6, r0, #0x10
@@ -1817,17 +1817,17 @@ _0204520C:
_02045212:
add r0, r7, #0x0
add r1, r5, #0x0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02045242
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x0
beq _02045242
ldr r0, [sp, #0x0]