summaryrefslogtreecommitdiff
path: root/asm/battle_controller_player.s
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-09 16:42:21 -0500
committerGitHub <noreply@github.com>2017-10-09 16:42:21 -0500
commit3e72d6748771f83c98be2864e6bb628e161c6cf2 (patch)
tree7edfb8b54fe1e694e946d17399a3099f3ad7b140 /asm/battle_controller_player.s
parent08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff)
parentb6ec90db6192c8405c9fe952aae7f356bcd1b0c3 (diff)
Merge pull request #65 from DizzyEggg/decompile_battle_message
Decompile battle message
Diffstat (limited to 'asm/battle_controller_player.s')
-rw-r--r--asm/battle_controller_player.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 4dbdf3968..94d4cdef0 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -4401,7 +4401,7 @@ sub_8059B3C: @ 8059B3C
ldrb r0, [r0]
cmp r0, 0x1
beq _08059B98
- bl sub_814FBAC
+ bl SetPpNumbersPaletteInMoveSelection
ldrb r1, [r7]
lsls r4, r1, 9
adds r0, r5, 0x4