From 1e1bbbbf8c82364dcfb8e64ad22c4ce3e9988c75 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 5 Apr 2018 00:04:53 -0400 Subject: [PATCH] =?UTF-8?q?check=5Fnick=5Ferrors=20=E2=86=92=20correct=5Fn?= =?UTF-8?q?ick=5Ferrors;=20matches=20correct=5Fparty=5Ferrors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokemon/{check_nick_errors.asm => correct_nick_errors.asm} | 2 +- engine/pokemon/stats_screen.asm | 2 +- home.asm | 2 +- main.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename engine/pokemon/{check_nick_errors.asm => correct_nick_errors.asm} (97%) diff --git a/engine/pokemon/check_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm similarity index 97% rename from engine/pokemon/check_nick_errors.asm rename to engine/pokemon/correct_nick_errors.asm index 87ebd6bb3..5d44846bf 100644 --- a/engine/pokemon/check_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -1,4 +1,4 @@ -CheckNickErrors:: ; 669f +CorrectNickErrors:: ; 669f ; error-check monster nick before use ; must be a peace offering to gamesharkers diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 59d96999f..7e44cb96e 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -772,7 +772,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) ld hl, .OTNamePointers call GetNicknamePointer call CopyNickname - farcall CheckNickErrors + farcall CorrectNickErrors hlcoord 2, 13 call PlaceString ld a, [wTempMonCaughtGender] diff --git a/home.asm b/home.asm index fe44e3d31..75b5bf283 100644 --- a/home.asm +++ b/home.asm @@ -1211,7 +1211,7 @@ GetNick:: ; 38a2 call CopyBytes pop de - callfar CheckNickErrors + callfar CorrectNickErrors pop bc pop hl diff --git a/main.asm b/main.asm index fac1b8f3f..93a530079 100644 --- a/main.asm +++ b/main.asm @@ -9,7 +9,7 @@ INCLUDE "engine/overworld/map_objects.asm" INCLUDE "engine/menus/intro_menu.asm" INCLUDE "engine/overworld/init_map.asm" INCLUDE "engine/pokemon/learn.asm" -INCLUDE "engine/pokemon/check_nick_errors.asm" +INCLUDE "engine/pokemon/correct_nick_errors.asm" INCLUDE "engine/math/math.asm" INCLUDE "data/items/attributes.asm" INCLUDE "engine/overworld/npc_movement.asm"