diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
commit | d273493cbb1ef8ecda5c87908d07fffc1d68cd6f (patch) | |
tree | a08642a5b0d91c17f1ccf7bf2d69c321ddd653d4 /asm/battle_message.s | |
parent | fcc94f9722609ffa67c045cf8a7539690a68b080 (diff) | |
parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/battle_message.s')
-rw-r--r-- | asm/battle_message.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index 60051a8f5..ef5ecbf9c 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1349,7 +1349,7 @@ _0814ED5E: bl _0814F5BE .pool _0814ED70: - ldr r5, =gUnknown_0202420E + ldr r5, =gEffectBank ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -1695,7 +1695,7 @@ _0814F0A8: .pool _0814F0B8: ldr r1, =gAbilitiesPerBank - ldr r0, =gUnknown_0202420E + ldr r0, =gEffectBank _0814F0BC: ldrb r0, [r0] _0814F0BE: |