diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/wild_encounter.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/wild_encounter.s')
| -rw-r--r-- | asm/wild_encounter.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index 21b97c942..e9fb8a630 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -482,7 +482,7 @@ _08082A8E: lsrs r0, 16 orrs r4, r0 adds r0, r4, 0 - bl GetUnownLetterByPersonality + bl GetUnownLetterByPersonalityLoByte lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -493,8 +493,8 @@ _08082A8E: bx r1 thumb_func_end sub_8082A88 - thumb_func_start GetUnownLetterByPersonality -GetUnownLetterByPersonality: @ 8082AB8 + thumb_func_start GetUnownLetterByPersonalityLoByte +GetUnownLetterByPersonalityLoByte: @ 8082AB8 push {lr} adds r2, r0, 0 movs r0, 0xC0 @@ -520,7 +520,7 @@ GetUnownLetterByPersonality: @ 8082AB8 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end GetUnownLetterByPersonality + thumb_func_end GetUnownLetterByPersonalityLoByte thumb_func_start sub_8082AEC sub_8082AEC: @ 8082AEC @@ -1020,8 +1020,8 @@ _08082EB6: _08082EBC: .4byte gSpecialVar_Result thumb_func_end sub_8082E54 - thumb_func_start sub_8082EC0 -sub_8082EC0: @ 8082EC0 + thumb_func_start SweetScentWildEncounter +SweetScentWildEncounter: @ 8082EC0 push {r4,r5,lr} sub sp, 0x4 mov r4, sp @@ -1108,7 +1108,7 @@ _08082F6E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8082EC0 + thumb_func_end SweetScentWildEncounter thumb_func_start sub_8082F78 sub_8082F78: @ 8082F78 |