diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /asm/pokedex.s | |
parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) |
option menu fix conflicts
Diffstat (limited to 'asm/pokedex.s')
-rw-r--r-- | asm/pokedex.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/pokedex.s b/asm/pokedex.s index e4b58a144..8da7d6df0 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -8940,7 +8940,7 @@ _080C0250: b _080C028E .pool _080C028C: - ldr r0, =gUnknown_0856E688 + ldr r0, =sText_TenDashes2 _080C028E: movs r1, 0x84 movs r2, 0x19 |