diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
| commit | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (patch) | |
| tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /asm/battle_message.s | |
| parent | ae06c13e99162cebd3617f5aafb135bdd8b3f237 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
Merge remote-tracking branch 'pret/master' into baserom_extraction
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 |