diff options
Diffstat (limited to 'arm9/asm/scrcmd_5.s')
| -rw-r--r-- | arm9/asm/scrcmd_5.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index bb367973..bb5b7be6 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -75,7 +75,7 @@ FUN_020411C4: ; 0x020411C4 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 ldr r0, _0204133C ; =0x00000000 @@ -87,17 +87,17 @@ _0204123C: 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 _0204127C add r0, r4, #0x0 mov r1, #0x7 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 lsl r1, r1, #0x10 @@ -132,19 +132,19 @@ _02041290: mov r1, #0x5 mov r2, #0x0 add r4, r0, #0x0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0x0 beq _020412E0 add r0, r4, #0x0 mov r1, #0x4c mov r2, #0x0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0x0 bne _020412E0 add r0, r4, #0x0 mov r1, #0x7 mov r2, #0x0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 lsl r1, r1, #0x10 |