Route 50

This adds Route 50 to the game, as well as Jacky, albeit without the gate or house that you can warp to within.

I decided that the game house will be where Shinjuku Jacky hangs out this time! He'll battle the player and give them uhhh idfk you figure it out

Also I don't know what to call West City. It's a rather sea-blueish colour, sort of like duck egg blue. Sort of a Pacific Teal, right? I need another gay person to give colour ideas.

data/trainers/attributes.asm

@@ -555,4 +555,10 @@ TrainerClassAttributes:
 	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
 	dw CONTEXT_USE | SWITCH_SOMETIMES
 
+; Jack
+	db NO_ITEM, NO_ITEM ; items
+	db 10 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/class_names.asm

@@ -93,4 +93,5 @@ TrainerClassNames::
 	li "EXECUTIVE"
 	li "PROFESSOR"
 	li "ELDER"
+	li "SHINJUKU" ; JACK
 	assert_list_length NUM_TRAINER_CLASSES

data/trainers/dvs.asm

@@ -94,4 +94,5 @@ TrainerClassDVs:
 	dn 13, 12, 13, 13 ; ARCHER
 	dn 13, 12, 13, 13 ; PROF.BLUE
 	dn 12, 15, 13, 13 ; ELDER (HP Ground)
+	dn 12, 15, 13, 13 ; JACK (HP Ground)
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/encounter_music.asm

@@ -96,4 +96,5 @@ TrainerEncounterMusic::
 	db MUSIC_ROCKET_ENCOUNTER     ; ARCHER
 	db MUSIC_OFFICER_ENCOUNTER     ; PROF.BLUE
 	db MUSIC_SAGE_ENCOUNTER        ; ELDER
+	db MUSIC_HIKER_ENCOUNTER       ; JACK
 	assert_table_length NUM_TRAINER_CLASSES + 1

data/trainers/gendered_trainers.asm

@@ -37,6 +37,7 @@ MaleTrainers:
 	db SPORTSMAN
 	db AEROFOSSIL
 	db ELDER
+	db JACK
 .End
 
 FemaleTrainers:

data/trainers/genders.asm

@@ -95,4 +95,5 @@ BTTrainerClassGenders:
 	db FEMALE ; ARCHER
 	db MALE ; PROF.BLUE
 	db MALE ; ELDER
+	db MALE ; JACK
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/palettes.asm

@@ -101,7 +101,8 @@ INCBIN "gfx/trainers/kurt.gbcpal", middle_colors
 INCBIN "gfx/trainers/ariana.gbcpal", middle_colors
 INCBIN "gfx/trainers/archer.gbcpal", middle_colors
 INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors
-INCBIN "gfx/trainers/elder.gbcpal", middle_colors ; elder
+INCBIN "gfx/trainers/elder.gbcpal", middle_colors
+INCBIN "gfx/trainers/jack.gbcpal", middle_colors
 
 EnbyPalette:
 INCLUDE "gfx/player/topaz.pal"

data/trainers/parties.asm

@@ -935,6 +935,26 @@ YoungsterGroup:
 	dw RATICATE
 	dw HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
+	
+	next_list_item ; YOUNGSTER (14)
+	db "LUC@", TRAINERTYPE_MOVES
+	db 45
+	dw ARIADOS
+	dw SLUDGE_BOMB, PSYCHIC_M, PURSUIT, AGILITY
+	db 45
+	dw RATICATE
+	dw HYPER_FANG, QUICK_ATTACK, SUPER_FANG, SHADOW_BALL
+	db -1 ; end
+	
+	next_list_item ; YOUNGSTER (14)
+	db "HUW@", TRAINERTYPE_MOVES
+	db 45
+	dw SANDSLASH
+	dw SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, METAL_CLAW
+	db 45
+	dw QUAGSIRE
+	dw EARTHQUAKE, SURF, HEADBUTT, AMNESIA
+	db -1 ; end
 
 	end_list_items
 
@@ -1903,17 +1923,17 @@ BeautyGroup:
 	dw SENTRET
 	db -1 ; end
 
-	next_list_item ; BEAUTY (12)
-	db "KENDRA@", TRAINERTYPE_NORMAL
-	db 15
-	dw SENTRET
-	db -1 ; end
+;	next_list_item ; BEAUTY (12)
+;	db "KENDRA@", TRAINERTYPE_NORMAL
+;	db 15
+;	dw SENTRET
+;	db -1 ; end
 
-	next_list_item ; BEAUTY (13)
-	db "VERONICA@", TRAINERTYPE_NORMAL
-	db 15
-	dw SENTRET
-	db -1 ; end
+;	next_list_item ; BEAUTY (13)
+;	db "VERONICA@", TRAINERTYPE_NORMAL
+;	db 15
+;	dw SENTRET
+;	db -1 ; end
 
 	next_list_item ; BEAUTY (14)
 	db "JULIA@", TRAINERTYPE_NORMAL

data/trainers/parties_new_classes.asm

@@ -216,10 +216,12 @@ LassGroup:
 	dw MARILL
 	db -1 ; end
 
-	next_list_item ; LASS (13)
-	db "CONNIE@", TRAINERTYPE_NORMAL
-	db 21
-	dw MARILL
+	next_list_item ; LASS (13) - originally Connie 3
+	db "LOWRI@", TRAINERTYPE_NORMAL
+	db 45
+	dw BELLEDAM
+	db 45
+	dw RAITORA
 	db -1 ; end
 
 	next_list_item ; LASS (14)
@@ -701,6 +703,24 @@ ElderGroup:
 	db -1 ; end
 	end_list_items
 
+JackGroup:
+	next_list_item
+	db "JACKY@", TRAINERTYPE_MOVES
+	db 50
+	dw AMANOBI ; Kage-Maru
+	dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE
+	db 50
+	dw ANNIHILAPE
+	dw CROSS_CHOP, ROCK_HEAD, MEDITATE, HEADBUTT
+	db 50
+	dw PORYGON_Z
+	dw LOCK_ON, ZAP_CANNON, RECOVER, TRI_ATTACK
+	db 50
+	dw HITMONCHAN
+	dw MACH_PUNCH, COUNTER, DETECT, HI_JUMP_KICK
+	db -1 ; end
+	end_list_items
+
 ; No rematches here, just a lot of unused dupes.
 ; Potential alt usage? rename a few?
 ; See spreadsheet for combinations.

data/trainers/party_pointers.asm

@@ -95,4 +95,5 @@ TrainerGroups:
 	dba ArcherGroup
 	dba ProfBlueGroup
 	dba ElderGroup
+	dba JackGroup
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/pic_pointers.asm

@@ -95,4 +95,5 @@ TrainerPicPointers::
 	dba ArcherPic
 	dba ProfBluePic
 	dba ElderPic
+	dba JackPic
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/sprites.asm

@@ -93,4 +93,5 @@ BTTrainerClassSprites:
 	db SPRITE_RED		; Archer
 	db SPRITE_RED		; Prof.Blue
 	db SPRITE_SAGE		; ELDER
+	db SPRITE_ROCKER	; JACK
 	assert_table_length NUM_TRAINER_CLASSES