From fcc94f9722609ffa67c045cf8a7539690a68b080 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 19 Sep 2017 19:31:53 -0500 Subject: Extract baseroms from battle_message and rename strings --- asm/battle_interface.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/battle_interface.s') diff --git a/asm/battle_interface.s b/asm/battle_interface.s index fb6a48194..e5f031962 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -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 -- cgit v1.2.3 From 9ed9f7de941d5b89a1c6d6241b3bbb5726aa99e8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 20 Sep 2017 14:38:05 -0500 Subject: Finish renaming strings in strings.s --- asm/battle_interface.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'asm/battle_interface.s') diff --git a/asm/battle_interface.s b/asm/battle_interface.s index e5f031962..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 -- cgit v1.2.3