diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
| commit | f1d07acc48e483f00f8d6d573af12199f68123d4 (patch) | |
| tree | 6e9ace8e4822e19224561dc99728d80699eaa635 /asm/battle_controller_player.s | |
| parent | 6d66081be0b1b26ce55a6f1a2a20644e2ae5c7f7 (diff) | |
| parent | 8914645231c9301579ed39bdd9200ad50e5296d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 2 |
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 |