From 01eea396ed25500e15752d7edfe76cb1031bee60 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jun 2020 15:07:54 -0400 Subject: through CalcShininessByOtIdAndPersonality --- arm9/asm/pokemon_s.s | 271 +----------------------------------------------- arm9/asm/scrcmd_12.s | 2 +- arm9/asm/unk_02023C40.s | 4 +- arm9/asm/unk_0204A01C.s | 2 +- arm9/asm/unk_0206F3FC.s | 2 +- arm9/asm/unk_0207550C.s | 2 +- arm9/asm/unk_02079C70.s | 2 +- arm9/asm/unk_02080C38.s | 2 +- 8 files changed, 11 insertions(+), 276 deletions(-) (limited to 'arm9/asm') diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s index a2fb59bb..82548f30 100644 --- a/arm9/asm/pokemon_s.s +++ b/arm9/asm/pokemon_s.s @@ -21,272 +21,7 @@ __local_str_poketool_personal_pms_narc: ; 0x02105FC8 .extern LoadGrowthTable .extern GetExpByGrowthRateAndLevel - thumb_func_start MonApplyFriendshipModEncrypted -MonApplyFriendshipModEncrypted: ; 0x020688E8 - push {r3-r7, lr} - sub sp, #0x8 - add r6, r1, #0x0 - add r5, r0, #0x0 - str r2, [sp, #0x0] - cmp r6, #0x5 - bne _02068900 - bl rand_LC - mov r1, #0x1 - tst r0, r1 - bne _020689D4 -_02068900: - add r0, r5, #0x0 - mov r1, #0xad - mov r2, #0x0 - bl GetMonData - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - beq _020689D4 - ldr r0, _020689D8 ; =SPECIES_EGG - cmp r1, r0 - beq _020689D4 - add r0, r5, #0x0 - mov r1, #0x6 - mov r2, #0x0 - bl GetMonData - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - mov r1, #0x1 - mov r2, #0x0 - bl FUN_0206E7B8 - lsl r0, r0, #0x18 - mov r4, #0x0 - lsr r7, r0, #0x18 - add r0, r5, #0x0 - mov r1, #0x9 - add r2, r4, #0x0 - bl GetMonData - add r1, sp, #0x4 - strh r0, [r1, #0x0] - add r0, r4, #0x0 - ldrsh r1, [r1, r0] - cmp r1, #0x64 - blt _0206894E - add r0, r4, #0x1 - lsl r0, r0, #0x18 - lsr r4, r0, #0x18 -_0206894E: - cmp r1, #0xc8 - blt _02068958 - add r0, r4, #0x1 - lsl r0, r0, #0x18 - lsr r4, r0, #0x18 -_02068958: - lsl r0, r6, #0x1 - add r1, r6, r0 - ldr r0, _020689DC ; =sFriendshipModTable - add r0, r0, r1 - ldrsb r4, [r4, r0] - cmp r4, #0x0 - ble _0206897A - add r0, r5, #0x0 - mov r1, #0x9a - mov r2, #0x0 - bl GetMonData - cmp r0, #0xb - bne _0206897A - add r0, r4, #0x1 - lsl r0, r0, #0x18 - asr r4, r0, #0x18 -_0206897A: - cmp r4, #0x0 - ble _02068994 - add r0, r5, #0x0 - mov r1, #0x97 - mov r2, #0x0 - bl GetMonData - ldr r1, [sp, #0x0] - cmp r1, r0 - bne _02068994 - add r0, r4, #0x1 - lsl r0, r0, #0x18 - asr r4, r0, #0x18 -_02068994: - cmp r4, #0x0 - ble _020689AA - cmp r7, #0x34 - bne _020689AA - mov r0, #0x96 - mul r0, r4 - mov r1, #0x64 - bl _s32_div_f - lsl r0, r0, #0x18 - asr r4, r0, #0x18 -_020689AA: - add r0, sp, #0x4 - mov r1, #0x0 - ldrsh r2, [r0, r1] - add r2, r2, r4 - strh r2, [r0, #0x0] - ldrsh r2, [r0, r1] - cmp r2, #0x0 - bge _020689BC - strh r1, [r0, #0x0] -_020689BC: - add r1, sp, #0x4 - mov r0, #0x0 - ldrsh r0, [r1, r0] - cmp r0, #0xff - ble _020689CA - mov r0, #0xff - strh r0, [r1, #0x0] -_020689CA: - add r0, r5, #0x0 - mov r1, #0x9 - add r2, sp, #0x4 - bl SetMonData -_020689D4: - add sp, #0x8 - pop {r3-r7, pc} - .balign 4 -_020689D8: .word SPECIES_EGG -_020689DC: .word sFriendshipModTable - - thumb_func_start GetMonGenderEncrypted -GetMonGenderEncrypted: ; 0x020689E0 - ldr r3, _020689E4 ; =GetBoxMonGenderEncrypted - bx r3 - .balign 4 -_020689E4: .word GetBoxMonGenderEncrypted - - thumb_func_start GetBoxMonGenderEncrypted -GetBoxMonGenderEncrypted: ; 0x020689E8 - push {r3-r7, lr} - add r5, r0, #0x0 - bl AcquireBoxMonLock - add r6, r0, #0x0 - add r0, r5, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetBoxMonData - lsl r0, r0, #0x10 - mov r1, #0x0 - lsr r4, r0, #0x10 - add r0, r5, #0x0 - add r2, r1, #0x0 - bl GetBoxMonData - add r7, r0, #0x0 - add r0, r5, #0x0 - add r1, r6, #0x0 - bl ReleaseBoxMonLock - add r0, r4, #0x0 - add r1, r7, #0x0 - bl GetGenderBySpeciesAndPersonality - pop {r3-r7, pc} - .balign 4 - - thumb_func_start GetGenderBySpeciesAndPersonality -GetGenderBySpeciesAndPersonality: ; 0x02068A20 - push {r4-r6, lr} - add r4, r1, #0x0 - add r5, r0, #0x0 - mov r1, #0x0 - bl AllocAndLoadMonPersonal - add r6, r0, #0x0 - add r1, r5, #0x0 - add r2, r4, #0x0 - bl GetGenderBySpeciesAndPersonality_PreloadedPersonal - add r4, r0, #0x0 - add r0, r6, #0x0 - bl FreeMonPersonal - add r0, r4, #0x0 - pop {r4-r6, pc} - .balign 4 - - thumb_func_start GetGenderBySpeciesAndPersonality_PreloadedPersonal -GetGenderBySpeciesAndPersonality_PreloadedPersonal: ; 0x02068A44 - push {r4, lr} - mov r1, #0x12 - add r4, r2, #0x0 - bl GetPersonalAttr - lsl r0, r0, #0x18 - lsr r1, r0, #0x18 - beq _02068A5E - cmp r1, #0xfe - beq _02068A62 - cmp r1, #0xff - beq _02068A66 - b _02068A6A -_02068A5E: - mov r0, #0x0 - pop {r4, pc} -_02068A62: - mov r0, #0x1 - pop {r4, pc} -_02068A66: - mov r0, #0x2 - pop {r4, pc} -_02068A6A: - lsl r0, r4, #0x18 - lsr r0, r0, #0x18 - cmp r1, r0 - bls _02068A76 - mov r0, #0x1 - b _02068A78 -_02068A76: - mov r0, #0x0 -_02068A78: - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - pop {r4, pc} - .balign 4 - - thumb_func_start MonIsShiny -MonIsShiny: ; 0x02068A80 - ldr r3, _02068A84 ; =BoxMonIsShiny - bx r3 - .balign 4 -_02068A84: .word BoxMonIsShiny - - thumb_func_start BoxMonIsShiny -BoxMonIsShiny: ; 0x02068A88 - push {r3-r5, lr} - mov r1, #0x7 - mov r2, #0x0 - add r5, r0, #0x0 - bl GetBoxMonData - mov r1, #0x0 - add r4, r0, #0x0 - add r0, r5, #0x0 - add r2, r1, #0x0 - bl GetBoxMonData - add r1, r0, #0x0 - add r0, r4, #0x0 - bl CalcShininessByOtIdAndPersonality - pop {r3-r5, pc} - .balign 4 - - thumb_func_start CalcShininessByOtIdAndPersonality -CalcShininessByOtIdAndPersonality: ; 0x02068AAC - ldr r3, _02068AD4 ; =0xFFFF0000 - lsl r2, r1, #0x10 - and r1, r3 - and r3, r0 - lsl r0, r0, #0x10 - lsr r3, r3, #0x10 - lsr r0, r0, #0x10 - lsr r1, r1, #0x10 - eor r0, r3 - lsr r2, r2, #0x10 - eor r0, r1 - eor r0, r2 - cmp r0, #0x8 - bhs _02068ACC - mov r0, #0x1 - b _02068ACE -_02068ACC: - mov r0, #0x0 -_02068ACE: - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - bx lr - .balign 4 -_02068AD4: .word 0xFFFF0000 + .extern BoxMonIsShiny thumb_func_start GenerateShinyPersonality GenerateShinyPersonality: ; 0x02068AD8 @@ -381,7 +116,7 @@ FUN_02068B70: ; 0x02068B70 lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 - bl GetBoxMonGenderEncrypted + bl GetBoxMonGender str r0, [sp, #0x14] add r0, r5, #0x0 bl BoxMonIsShiny @@ -754,7 +489,7 @@ FUN_02068E1C: ; 0x02068E1C lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 - bl GetBoxMonGenderEncrypted + bl GetBoxMonGender mov r1, #0x0 str r0, [sp, #0x4] add r0, r5, #0x0 diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index a941eb48..3c0ac2f0 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -391,7 +391,7 @@ _02042FE8: add r0, r4, #0x0 bl FUN_0206A23C add r0, r4, #0x0 - bl GetMonGenderEncrypted + bl GetMonGender str r0, [sp, #0x30] add r0, r4, #0x0 mov r1, #0x6f diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s index 480a9e7a..46a01c79 100644 --- a/arm9/asm/unk_02023C40.s +++ b/arm9/asm/unk_02023C40.s @@ -1926,7 +1926,7 @@ FUN_0202498C: ; 0x0202498C bl GetMonData add r7, r0, #0x0 ldr r0, [sp, #0x0] - bl GetMonGenderEncrypted + bl GetMonGender add r6, r0, #0x0 ldr r1, [r5, #0x0] ldr r0, _02024AE4 ; =0xBEEFCAFE @@ -2113,7 +2113,7 @@ FUN_02024AF0: ; 0x02024AF0 bl GetMonData str r0, [sp, #0x4] ldr r0, [sp, #0x0] - bl GetMonGenderEncrypted + bl GetMonGender add r7, r0, #0x0 ldr r1, [r4, #0x0] ldr r0, _02024C78 ; =0xBEEFCAFE diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index 2864246e..5ea5d8c5 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -378,7 +378,7 @@ _0204A2EA: add r0, r5, #0x0 mov r1, #0x7 add r6, r6, #0x1 - bl MonApplyFriendshipModEncrypted + bl MonApplyFriendshipMod _0204A306: add r7, r7, #0x1 _0204A308: diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index eddf119f..984a657d 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1775,7 +1775,7 @@ _0207018E: ldr r0, _020701FC ; =0x0000070E add r6, r5, r0 add r0, r7, #0x0 - bl GetMonGenderEncrypted + bl GetMonGender lsl r0, r0, #0x1e ldrh r2, [r6, r4] ldr r1, _02070204 ; =0xFFFF9FFF diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 879b13ea..ca869d5a 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -3121,7 +3121,7 @@ _02076F98: add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x4 - bl MonApplyFriendshipModEncrypted + bl MonApplyFriendshipMod _02076FA8: add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 978c1f6d..8b972fcc 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -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 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 3437cc36..bf8c6901 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -3748,7 +3748,7 @@ _02082820: lsl r2, r2, #0x10 mov r1, #0x9 lsr r2, r2, #0x10 - bl MonApplyFriendshipModEncrypted + bl MonApplyFriendshipMod _0208283A: add sp, #0xc pop {r4-r7, pc} -- cgit v1.2.3