diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
| commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
| tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /asm/battle_controller_linkpartner.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
Diffstat (limited to 'asm/battle_controller_linkpartner.s')
| -rw-r--r-- | asm/battle_controller_linkpartner.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s index 881228279..3a1b21ed7 100644 --- a/asm/battle_controller_linkpartner.s +++ b/asm/battle_controller_linkpartner.s @@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590 bl BufferStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0 - bl battle_show_message_maybe + bl sub_814F9EC ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 @@ -4874,7 +4874,7 @@ sub_814D9D8: @ 814D9D8 ldrb r0, [r0] cmp r0, 0 beq _0814DA14 - bl sub_805EA60 + bl BattleMusicStop ldrb r1, [r5] lsls r1, 9 adds r0, r4, 0x1 |