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/battle_util.s | |
parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/battle_util.s')
-rw-r--r-- | asm/battle_util.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_util.s b/asm/battle_util.s index 04202e9da..50f5210aa 100644 --- a/asm/battle_util.s +++ b/asm/battle_util.s @@ -5775,7 +5775,7 @@ _08019C40: mov r8, r0 _08019C66: adds r0, r7, 0 - bl sub_8043620 + bl GetLinkTrainerFlankId lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 1 |