diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:08:34 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:08:34 -0500 |
| commit | b9d08ed83b13c875610bd80f17e7275252785654 (patch) | |
| tree | bdfeaca488e96009ef7fd18037717d0ec749c9b5 /asm/use_pokeblock.s | |
| parent | 772da493f9ea0dcd8838dd927f1b70ff63228c21 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into unk_81BAD84
Diffstat (limited to 'asm/use_pokeblock.s')
| -rwxr-xr-x | asm/use_pokeblock.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 3a8b76ab1..3c580654c 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1769,7 +1769,7 @@ _0816721C: adds r0, r6, r0 ldrb r1, [r0] mov r0, r10 - bl GetMonFlavourRelation + bl GetMonFlavorRelation lsls r0, 24 asrs r2, r0, 24 cmp r0, r9 |