diff options
Diffstat (limited to 'arm9/asm/unk_02079C70.s')
| -rw-r--r-- | arm9/asm/unk_02079C70.s | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 11d65c38..9da982ce 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -1555,7 +1555,7 @@ _0207A8C0: mov r1, #0x13 ldrb r6, [r5, r0] add r0, r4, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0207AA08 ; =0x00000295 strb r0, [r5, r1] ldrb r0, [r5, r1] @@ -1572,7 +1572,7 @@ _0207A8F4: ldrb r6, [r5, r0] add r0, r4, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0207AA0C ; =0x00000296 strb r0, [r5, r1] ldrb r0, [r5, r1] @@ -1589,7 +1589,7 @@ _0207A916: ldrb r6, [r5, r0] add r0, r4, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0207AA10 ; =0x00000297 strb r0, [r5, r1] ldrb r0, [r5, r1] @@ -1607,7 +1607,7 @@ _0207A938: add r0, r4, #0x0 mov r1, #0x16 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xa6 lsl r1, r1, #0x2 strb r0, [r5, r1] @@ -1625,7 +1625,7 @@ _0207A95E: ldrb r6, [r5, r0] add r0, r4, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0207AA14 ; =0x00000299 strb r0, [r5, r1] ldrb r0, [r5, r1] @@ -1640,7 +1640,7 @@ _0207A980: add r0, r4, #0x0 mov r1, #0x18 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0207AA18 ; =0x0000029A strb r0, [r5, r1] sub r1, #0x4e @@ -1843,12 +1843,12 @@ FUN_0207AB0C: ; 0x0207AB0C add r7, r0, #0x0 add r0, r6, #0x0 add r5, r2, #0x0 - bl TryDecryptMon + bl AcquireMonLock str r0, [sp, #0x4] add r0, r6, #0x0 mov r1, #0x5 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0xc] add r0, r6, #0x0 bl FUN_020690E4 @@ -1913,12 +1913,12 @@ FUN_0207AB0C: ; 0x0207AB0C add r0, r6, #0x0 mov r1, #0x6 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0xe] add r0, r6, #0x0 mov r1, #0xa0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldrb r1, [r5, #0x12] mov r2, #0x7f lsl r0, r0, #0x18 @@ -1931,7 +1931,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r0, r6, #0x0 mov r1, #0x4c mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x1f ldr r2, [r5, #0x50] ldr r1, _0207AEB4 ; =0xEFFFFFFF @@ -1942,7 +1942,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r0, r6, #0x0 mov r1, #0xaf mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x1 bne _0207AC16 ldr r0, [r5, #0x50] @@ -1961,7 +1961,7 @@ _0207AC16: strb r0, [r5, #0x12] _0207AC1E: add r0, r6, #0x0 - bl GetMonGenderEncrypted + bl GetMonGender ldrb r1, [r5, #0x13] mov r2, #0x3 bic r1, r2 @@ -1972,7 +1972,7 @@ _0207AC1E: add r0, r6, #0x0 mov r1, #0x9a mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsl r0, r0, #0x1a @@ -1985,27 +1985,27 @@ _0207AC1E: add r0, r6, #0x0 mov r1, #0xb0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r5, #0x10] add r0, r6, #0x0 mov r1, #0xb1 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r5, #0x11] add r0, r6, #0x0 mov r1, #0x7 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [r5, #0x14] add r0, r6, #0x0 mov r1, #0x8 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [r5, #0x18] add r0, r6, #0x0 mov r1, #0x9c mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x44 strb r0, [r1, #0x0] @@ -2013,7 +2013,7 @@ _0207AC1E: ldrh r0, [r5, #0xc] lsl r1, r1, #0x19 lsr r1, r1, #0x19 - bl GetMonExpByLevel + bl GetMonExpBySpeciesAndLevel str r0, [r5, #0x1c] ldrb r0, [r5, #0x12] lsl r0, r0, #0x19 @@ -2025,53 +2025,53 @@ _0207AC1E: _0207ACAA: ldrh r0, [r5, #0xc] add r1, r1, #0x1 - bl GetMonExpByLevel + bl GetMonExpBySpeciesAndLevel _0207ACB2: str r0, [r5, #0x20] add r0, r6, #0x0 mov r1, #0xa2 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x24] add r0, r6, #0x0 mov r1, #0xa3 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x26] add r0, r6, #0x0 mov r1, #0xa4 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x28] add r0, r6, #0x0 mov r1, #0xa5 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x2a] add r0, r6, #0x0 mov r1, #0xa7 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x2c] add r0, r6, #0x0 mov r1, #0xa8 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x2e] add r0, r6, #0x0 mov r1, #0xa6 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x30] add r0, r6, #0x0 mov r1, #0xa mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x32 strb r0, [r1, #0x0] add r0, r6, #0x0 - bl GetMonNatureEncrypted + bl GetMonNature add r1, r5, #0x0 add r1, #0x33 strb r0, [r1, #0x0] @@ -2084,14 +2084,14 @@ _0207AD26: add r0, r6, #0x0 add r1, #0x36 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #0x0] mov r2, #0x0 strh r0, [r1, #0x34] add r1, r4, #0x0 add r0, r6, #0x0 add r1, #0x3a - bl GetMonDataEncrypted + bl GetMonData add r1, r5, r4 add r1, #0x3c strb r0, [r1, #0x0] @@ -2099,7 +2099,7 @@ _0207AD26: add r0, r6, #0x0 add r1, #0x3e mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r1, r0, #0x18 ldr r0, [sp, #0x0] @@ -2116,42 +2116,42 @@ _0207AD26: add r0, r6, #0x0 mov r1, #0x13 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x45 strb r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x14 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x46 strb r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x15 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x47 strb r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x16 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x48 strb r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x17 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x49 strb r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x18 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x4a strb r0, [r1, #0x0] @@ -2180,14 +2180,14 @@ _0207ADFE: add r0, r6, #0x0 mov r1, #0xb mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x4c strh r0, [r1, #0x0] add r0, r6, #0x0 mov r1, #0x70 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r5, #0x0 add r1, #0x4e strh r0, [r1, #0x0] @@ -2243,7 +2243,7 @@ _0207AE7C: str r0, [r5, #0x50] _0207AE84: add r0, r6, #0x0 - bl FUN_02068A80 + bl MonIsShiny cmp r0, #0x1 ldr r1, [r5, #0x50] bne _0207AE98 @@ -2281,7 +2281,7 @@ _0207AECC: add r1, r0, #0x0 add r0, r6, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _0207AF04 lsr r0, r4, #0x5 @@ -2308,7 +2308,7 @@ _0207AF04: blo _0207AECC ldr r1, [sp, #0x4] add r0, r6, #0x0 - bl TryEncryptMon + bl ReleaseMonLock add sp, #0x8 pop {r3-r7, pc} nop @@ -3123,13 +3123,13 @@ _0207B528: add r0, r6, r7 mov r1, #0x5 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _0207B50C add r0, r6, r7 mov r1, #0x4c mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _0207B55E add r0, r5, #0x0 @@ -3169,17 +3169,17 @@ _0207B588: _0207B58E: ldr r0, [r1, #0x0] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r6, r0, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _0207B574 add r0, r6, #0x0 mov r1, #0x4c mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _0207B5BC add r0, r5, #0x0 @@ -3227,13 +3227,13 @@ _0207B5EC: add r0, r6, r7 mov r1, #0x5 mov r2, #0x0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0x0 beq _0207B5D0 add r0, r6, r7 mov r1, #0x4c mov r2, #0x0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0x0 beq _0207B622 add r0, r5, #0x0 @@ -3269,7 +3269,7 @@ _0207B640: _0207B64E: ldrb r1, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex pop {r4, pc} _0207B658: bl FUN_020690C8 @@ -4814,12 +4814,12 @@ FUN_0207C2D4: ; 0x0207C2D4 add r5, r0, #0x0 mov r1, #0x9f mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xa2 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 bne _0207C2F4 mov r0, #0x6 |