From 374756eec6b94bf8343e858ba0bf4a802e365227 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 9 Apr 2023 11:36:17 +0100
Subject: [PATCH] Let Traded Pokemon be nicknamed

This comments out the script that makes the Name Rater check the trainer OT before giving his "rating". Therefore, traded Pokemon, including regional ones, can now be nicknamed.
---
 README.md                   |  1 +
 scripts/NameRatersHouse.asm | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0ee7ee9c..38b7f20c 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ QoL Enhancements
 - PP symbol is displayed in the battle menu. PP displayed before, it just looks nicer now. Done by changing a straggler Japanese character.
 - Running Shoes by holding B. Also works with the bike! Surf speed is also doubled.
 - Fast text has no frame delay between text scrolling, doubling the scroll speed. It's also been made the default option, so you don't need to go into the Options menu for it.
+- Traded Pokemon ("Outsiders") can now be nicknamed at the Name Rater's House.
 - Lorelei, Bruno, and Agatha now play the Gym Leader Battle theme.
 - HP bar has been doubled in speed, having a 1 frame delay per pixel rather than 2.
 - Trainer DVs are perfect-15s.
diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm
index cecf97e7..a3f3255e 100644
--- a/scripts/NameRatersHouse.asm
+++ b/scripts/NameRatersHouse.asm
@@ -8,7 +8,7 @@ NameRaterScript_1da15:
 	and a
 	ret
 
-NameRaterScript_1da20:
+NameRaterScript_1da20: ; This shouldn't be necessary now that it's removed, but better safe than sorry.
 	ld hl, wPartyMonOT
 	ld bc, NAME_LENGTH
 	ld a, [wWhichPokemon]
@@ -60,9 +60,9 @@ NameRaterText1:
 	pop af
 	jr c, .asm_1daae
 	call GetPartyMonName2
-	call NameRaterScript_1da20
-	ld hl, NameRaterText_1dad1
-	jr c, .asm_1daa8
+	;call NameRaterScript_1da20 - Removing the OT check, traded Pokemon can be nicknamed.
+	;ld hl, NameRaterText_1dad1
+	;jr c, .asm_1daa8
 	ld hl, NameRaterText_1dabd
 	call NameRaterScript_1da15
 	jr nz, .asm_1daae
@@ -102,6 +102,6 @@ NameRaterText_1dacc:
 	text_far _NameRaterText_1dacc
 	text_end
 
-NameRaterText_1dad1:
-	text_far _NameRaterText_1dad1
-	text_end
+;NameRaterText_1dad1:
+;	text_far _NameRaterText_1dad1
+;	text_end