diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-06 17:08:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 17:08:27 -0500 |
| commit | dea28a0a236412f267e3da8a7c200d947a9c5fe1 (patch) | |
| tree | 84300b68d6e6402c16edd4e1dc30f0d8d103ab40 /asm/battle_message.s | |
| parent | 1bd7739ea6bf3d4d90e65cb7ea3dcf5e8fe286d4 (diff) | |
| parent | 7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c (diff) | |
Merge pull request #57 from DizzyEggg/decomp_battle2
Decompile battle2
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 96869a350..b114a36f8 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -738,7 +738,7 @@ _0814E730: ldr r5, [sp] ldr r4, [sp, 0x4] movs r3, 0 - ldr r2, =gUnknown_0831BCA8 + ldr r2, =gStatusConditionStringsTable _0814E738: ldr r1, [r2] ldr r0, [r1] @@ -2998,7 +2998,7 @@ sub_814FBAC: @ 814FBAC ldr r0, =gBattleBufferA + 4 adds r1, r0 ldr r4, =gUnknown_08D85620 - ldr r0, =gUnknown_020244B0 + ldr r0, =gMoveSelectionCursor adds r2, r0 ldrb r2, [r2] adds r0, r1, 0 |