diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:00:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:00:24 -0400 |
| commit | 5fc2c964fb002d79a192937afc623555a411980c (patch) | |
| tree | 3217724f4142ff88e1ae10d8375183612396e0bf /asm/battle_message.s | |
| parent | abe72dca47f73231e45f778e6ceafe2e3b7f4158 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into sub_81700F8
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 dec210b25..4688a5add 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: |