From cf1c50555505f525ede5e2cd426f002312038de0 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 26 Feb 2023 12:28:06 +0100 Subject: [PATCH] GetNicknamenamePointer -> GetNicknamePointer Found this commit on an old drive --- engine/pokemon/stats_screen.asm | 6 +++--- mobile/fixed_words.asm | 2 +- mobile/mobile_5f.asm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index cc7d85616..2b9e0e8a8 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -430,7 +430,7 @@ StatsScreen_InitUpperHalf: hlcoord 14, 0 call PrintLevel ld hl, .NicknamePointers - call GetNicknamenamePointer + call GetNicknamePointer call CopyNickname hlcoord 8, 2 call PlaceString @@ -791,7 +791,7 @@ LoadBluePage: ld de, wTempMonID call PrintNum ld hl, .OTNamePointers - call GetNicknamenamePointer + call GetNicknamePointer call CopyNickname farcall CorrectNickErrors hlcoord 2, 13 @@ -1159,7 +1159,7 @@ CopyNickname: pop de ret -GetNicknamenamePointer: +GetNicknamePointer: ld a, [wMonType] add a ld c, a diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index a347555d3..a736dfaf2 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -414,8 +414,8 @@ EZChat_MasterLoop: depixel 3, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call InitSpriteAnimStruct - depixel 8, 1, 2, 5 + depixel 8, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_VAR1 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index a7f301848..ab5e346a4 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -3866,7 +3866,7 @@ Function17f1d0: call Function17f4f6 add hl, de ld a, [hl] - ld a, $1 + ld a, BANK(wNamedObjectIndex) ldh [rSVBK], a ld [wNamedObjectIndex], a call GetPokemonName