Updated Normal Mode Trainers to HGSS levels

SoupPotato · Dec 28, 2023 · 16bcf6d · 16bcf6d
1 parent d631ff9
commit 16bcf6d
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 259 deletions.
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -555,8 +555,6 @@ DEF KRIS EQU __trainer_class__
 
 	trainerclass FIREBREATHER ; 30
 	const OTIS
-	const DICK
-	const NED
 	const BURT
 	const BILL
 	const WALT1
@@ -573,14 +571,12 @@ DEF KRIS EQU __trainer_class__
 	const HORTON
 
 	trainerclass BLACKBELT_T ; 32
-	const KENJI1
 	const YOSHI
-	const KENJI2
 	const LAO
 	const NOB
 	const KIYO
 	const LUNG
-	const KENJI3
+	const KENJI
 	const WAI
 	const MANFORD
 	const ANDER

diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm
@@ -45,7 +45,7 @@ PhoneContacts:
 	phone PICNICKER,    TIFFANY3,              ROUTE_43,                  ANYTIME, TiffanyPhoneCalleeScript, ANYTIME, TiffanyPhoneCallerScript
 	phone BIRD_KEEPER,  VANCE1,                ROUTE_44,                  ANYTIME, VancePhoneCalleeScript,   ANYTIME, VancePhoneCallerScript
 	phone FISHER,       WILTON1,               ROUTE_44,                  ANYTIME, WiltonPhoneCalleeScript,  ANYTIME, WiltonPhoneCallerScript
-	phone BLACKBELT_T,  KENJI3,                ROUTE_45,                  ANYTIME, KenjiPhoneCalleeScript,   ANYTIME, KenjiPhoneCallerScript
+	phone BLACKBELT_T,  KENJI,                 ROUTE_45,                  ANYTIME, KenjiPhoneCalleeScript,   ANYTIME, KenjiPhoneCallerScript
 	phone HIKER,        PARRY1,                ROUTE_45,                  ANYTIME, ParryPhoneCalleeScript,   ANYTIME, ParryPhoneCallerScript
 	phone PICNICKER,    ERIN1,                 ROUTE_46,                  ANYTIME, ErinPhoneCalleeScript,    ANYTIME, ErinPhoneCallerScript
 	phone BUG_CATCHER,  DOUG1,                 ROUTE_2_SOUTH,             ANYTIME, DougPhoneCalleeScript,    ANYTIME, DougPhoneCallerScript