diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
| commit | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch) | |
| tree | 9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /asm/use_pokeblock.s | |
| parent | 9840be1f0041e697f1aefbdc839a5227b7100112 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into clock
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 |