diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-18 19:21:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-18 19:21:34 -0400 |
| commit | ee73040717ad1c1d8c61c4ffde9ab14ff3719772 (patch) | |
| tree | 34bf2046e49a43abfebb7ee75ade45235042b225 /asm/battle_message.s | |
| parent | 25c7b4cd9243bb32e7d5ebd90d629acf91706133 (diff) | |
| parent | e23fb64dad2f349184c8ec44e38f3c495f346785 (diff) | |
Merge branch 'master' into field_map_obj
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: |