diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
| commit | 8d5250fdaad7b50abd05cdee2e0cedfef99cdcbc (patch) | |
| tree | 05d6a27744a82014df531be24531d81b4d5f82ed /asm/battle_interface.s | |
| parent | 6f481cceb1b56c5d63ba045f7ca7f1ac7151332b (diff) | |
| parent | e7f91c65d9983ba9944bd7d09f8fe0cf245669d2 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/battle_interface.s')
| -rwxr-xr-x | asm/battle_interface.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index fb6a48194..489366fe8 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3760,7 +3760,7 @@ sub_80741E8: @ 80741E8 lsls r0, 24 lsrs r7, r0, 24 ldr r5, =gDisplayedStringBattle - ldr r1, =gUnknown_085ED228 + ldr r1, =gText_HighlightDarkGrey adds r0, r5, 0 bl StringCopy adds r0, r4, 0 @@ -3802,15 +3802,15 @@ _0807424A: beq _08074268 cmp r6, 0xFE beq _08074270 - ldr r1, =gUnknown_085ED238 + ldr r1, =gText_DynColor2 b _08074272 .pool _08074268: - ldr r1, =gUnknown_085ED22E + ldr r1, =gText_DynColor2Male b _08074272 .pool _08074270: - ldr r1, =gUnknown_085ED233 + ldr r1, =gText_DynColor1Female _08074272: adds r0, r5, 0 bl StringCopy @@ -4375,7 +4375,7 @@ sub_8074770: @ 8074770 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085CCB2C + ldr r0, =gText_SafariBalls add r1, sp, 0x4 str r1, [sp] movs r1, 0 @@ -4419,7 +4419,7 @@ sub_80747D8: @ 80747D8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, =gUnknown_085CCB3C + ldr r1, =gText_SafariBallLeft add r0, sp, 0x4 bl StringCopy ldr r1, =gNumSafariBalls |