summaryrefslogtreecommitdiff
path: root/asm/battle_controller_player.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-22 21:33:49 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-22 21:33:49 +0200
commitd5afb0c6e9566a62ca6d597aeabc173b2c3e7fa5 (patch)
tree4e194dbd475be40df1f584ecf095ddac5a0a3cd0 /asm/battle_controller_player.s
parentcf26b0e125aef07052b333139c33a6bbe1088f96 (diff)
up to x48 and troubles
Diffstat (limited to 'asm/battle_controller_player.s')
-rw-r--r--asm/battle_controller_player.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 0e9318dc9..d9d5c5e6a 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -8913,7 +8913,7 @@ _0805C3BC:
sub_805C3EC: @ 805C3EC
push {lr}
sub sp, 0x4
- bl sub_805EA60
+ bl BattleMusicStop
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -9595,7 +9595,7 @@ sub_805C9B0: @ 805C9B0
ldrb r0, [r0]
cmp r0, 0
beq _0805C9EC
- bl sub_805EA60
+ bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1