diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
| commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
| tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /asm/use_pokeblock.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
Diffstat (limited to 'asm/use_pokeblock.s')
| -rwxr-xr-x | asm/use_pokeblock.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 67441ee8b..20d23a878 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1196,7 +1196,7 @@ sub_8166D44: @ 8166D44 bl GetMonData add r0, sp, 0xC bl StringGetEnd10 - ldr r1, =gUnknown_085EC7A0 + ldr r1, =gText_GetsAPokeBlockQuestion add r0, sp, 0xC bl StringAppend ldr r4, =gStringVar4 @@ -1426,7 +1426,7 @@ sub_8166F50: @ 8166F50 movs r1, 0x97 movs r2, 0xE bl sub_8098858 - ldr r2, =gUnknown_085EC800 + ldr r2, =gText_WontEatAnymore movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1503,13 +1503,13 @@ _08166FEC: ldr r1, [r0] adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_085EC7E1 + ldr r1, =gText_WasEnhanced adds r0, r4, 0 bl StringAppend b _08167018 .pool _08167010: - ldr r1, =gUnknown_085EC7EF + ldr r1, =gText_NothingChanged adds r0, r4, 0 bl StringCopy _08167018: @@ -2895,7 +2895,7 @@ sub_8167BA0: @ 8167BA0 ldr r0, [r7] ldr r6, =0x0000804a adds r0, r6 - ldr r1, =gUnknown_085EBF8D + ldr r1, =gText_NatureSlash bl StringCopy ldr r1, =gNatureNamePointers lsls r4, 2 |