diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 13:21:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 13:21:26 -0400 |
| commit | c17af4853c5c5854170702292ebd573bc14b5b0e (patch) | |
| tree | 4b10ee7f38e45cf1c0f74eafb1274afe70405155 /asm/wild_encounter.s | |
| parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
| parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) | |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'asm/wild_encounter.s')
| -rw-r--r-- | asm/wild_encounter.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index 67c159abc..21b97c942 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 sub_8082AB8 + bl GetUnownLetterByPersonality lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -493,8 +493,8 @@ _08082A8E: bx r1 thumb_func_end sub_8082A88 - thumb_func_start sub_8082AB8 -sub_8082AB8: @ 8082AB8 + thumb_func_start GetUnownLetterByPersonality +GetUnownLetterByPersonality: @ 8082AB8 push {lr} adds r2, r0, 0 movs r0, 0xC0 @@ -520,7 +520,7 @@ sub_8082AB8: @ 8082AB8 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8082AB8 + thumb_func_end GetUnownLetterByPersonality thumb_func_start sub_8082AEC sub_8082AEC: @ 8082AEC |