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.
2026-02-06 16:15:24 +13:00 · 2024-07-27 11:34:14 +01:00 · 2024-07-27 11:34:14 +01:00 · 7114109368
commit 7114109368
parent b7099d8ee8
32 changed files with 286 additions and 42 deletions
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@ -374,17 +374,6 @@ ENDM
 	map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
 	connection north, Route10North, ROUTE_10_NORTH, 0
 	connection south, LavenderTown, LAVENDER_TOWN, 0
-	
-	map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
-	connection west, Route49, ROUTE_49, 0
-	connection east, Route66, ROUTE_66, 0
-	
-	map_attributes Route49, ROUTE_49, $05, EAST | WEST
-	connection east, SilentHills, SILENT_HILLS, $00, 0
-	connection west, Route49_2, ROUTE_49_2, $05, 0
-	
-	map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
-	connection east, Route49, ROUTE_49, $05, 0

 	map_attributes Route23, ROUTE_23, $0f, 0
 	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
@ -815,10 +804,21 @@ ENDM
 	map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
 	connection north, Route66, ROUTE_66, 0
 	
+	map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
+	connection west, Route49, ROUTE_49, 0
+	connection east, Route66, ROUTE_66, 0
+	
+	map_attributes Route49, ROUTE_49, $05, EAST | WEST
+	connection east, SilentHills, SILENT_HILLS, $00, 0
+	connection west, Route49_2, ROUTE_49_2, $05, 0
+	
+	map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
+	connection east, Route49, ROUTE_49, $05, 0
+	
 	map_attributes Route66, ROUTE_66, $05, WEST | SOUTH
 	connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
-	
 	connection west, SilentHills, SILENT_HILLS, 0
+	
 	map_attributes QuietCave, QUIET_CAVE, $76, 0
 	map_attributes BlueLab, BLUE_LAB, $00, 0
 	map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
@ -826,7 +826,11 @@ ENDM
 	map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
 	map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
 	
-	map_attributes OldCity, OLD_CITY, $00, 0 ; will have a west exit.
+	map_attributes OldCity, OLD_CITY, $00, WEST
+	connection west, Route50, ROUTE_50, 4
+	
+	map_attributes Route50, ROUTE_50, $00, EAST
+	connection east, OldCity, OLD_CITY, -4
 	
 	map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
 	map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@ -1273,3 +1273,6 @@ PokemonPagoda4F_Blocks:

 PokemonPagoda5F_Blocks:
 	INCBIN "maps/PokemonPagoda5F.ablk"
+
+Route50_Blocks:
+	INCBIN "maps/Route50.ablk"
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@ -137,6 +137,7 @@ Landmarks:
 	landmark 76, 108, QuietCaveName
 	landmark 76, 100, OldCityName
 	landmark 76, 100, PokemonPagodaName
+	landmark 60, 100, Route50Name
 	landmark 140, 60, BlueForestName
 	landmark 108, 108, Route66Name
 	landmark 124, 108, WhiteCityName
@ -250,6 +251,7 @@ SilentHillsName:     db "SILENT¯HILLS@"
 UnknownName:         db "?????@"
 Route66Name:         db "ROUTE 66@"
 Route49Name:         db "ROUTE 49@"
+Route50Name:		 db "ROUTE 50@"
 QuietCaveName:       db "QUIET¯CAVE@"
 OldCityName:		 db "SEPIA¯CITY@"
 PokemonPagodaName:	 db "#MON¯PAGODA@"
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -714,6 +714,7 @@ MapGroup_OldCity:
 	map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_NONE
 	assert_table_length NUM_OLD_CITY_MAPS

 MapGroup_BlueForest:
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -741,7 +741,7 @@ OldCityGroupSprites:
 	db SPRITE_TWIN
 	db SPRITE_BUG_CATCHER
 	db SPRITE_YOUNGSTER
-	db SPRITE_BEAUTY
+	db SPRITE_SPACEWORLD_GIRL
 	db SPRITE_SUPER_NERD
 	db SPRITE_GRANNY
 	db SPRITE_MONSTER
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@ -600,6 +600,7 @@ INCLUDE "maps/LavenderCryptSet1.asm"
 INCLUDE "maps/LavenderCryptSet2.asm"
 INCLUDE "maps/LavenderCryptSet3.asm"
 INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
+INCLUDE "maps/Route50.asm"

 SECTION "Map Scripts 31", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"
--- a/data/tilesets/nihon_old_attributes.bin
+++ b/data/tilesets/nihon_old_attributes.bin
--- a/data/tilesets/nihon_old_collision.asm
+++ b/data/tilesets/nihon_old_collision.asm
@ -64,3 +64,10 @@
 	tilecoll WALL, WALL, WALL, WALL ; 3f
 	tilecoll WALL, WALL, FLOOR, WALL ; 40
 	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 42
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 43
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 44
+	tilecoll WALL, DOOR, WALL, FLOOR ; 45
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 46
+	tilecoll WALL, WALL, DOOR, WALL ; 47
+	tilecoll WALL, WALL, WALL, WALL ; 48
--- a/data/tilesets/nihon_old_metatiles.bin
+++ b/data/tilesets/nihon_old_metatiles.bin
--- a/data/trainers/attributes.asm
+++ b/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
--- a/data/trainers/class_names.asm
+++ b/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
--- a/data/trainers/dvs.asm
+++ b/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
--- a/data/trainers/encounter_music.asm
+++ b/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
--- a/data/trainers/gendered_trainers.asm
+++ b/data/trainers/gendered_trainers.asm
@ -37,6 +37,7 @@ MaleTrainers:
 	db SPORTSMAN
 	db AEROFOSSIL
 	db ELDER
+	db JACK
 .End

 FemaleTrainers:
--- a/data/trainers/genders.asm
+++ b/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
--- a/data/trainers/palettes.asm
+++ b/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"
--- a/data/trainers/parties.asm
+++ b/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
--- a/data/trainers/parties_new_classes.asm
+++ b/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.
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@ -95,4 +95,5 @@ TrainerGroups:
 	dba ArcherGroup
 	dba ProfBlueGroup
 	dba ElderGroup
+	dba JackGroup
 	assert_table_length NUM_TRAINER_CLASSES
--- a/data/trainers/pic_pointers.asm
+++ b/data/trainers/pic_pointers.asm
@ -95,4 +95,5 @@ TrainerPicPointers::
 	dba ArcherPic
 	dba ProfBluePic
 	dba ElderPic
+	dba JackPic
 	assert_table_length NUM_TRAINER_CLASSES
--- a/data/trainers/sprites.asm
+++ b/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
--- a/data/wild/nihon_grass.asm
+++ b/data/wild/nihon_grass.asm
@ -171,5 +171,33 @@ NihonGrassWildMons:
 	dbw 32, MARILL
 	dbw 35, SKARMORY
 	end_grass_wildmons
-
+	
+	def_grass_wildmons ROUTE_50
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 30, CATERPIE
+	dbw 31, METAPOD
+	dbw 30, CATERPIE
+	dbw 31, METAPOD
+	dbw 32, PIDGEY
+	dbw 32, CATERPIE
+	dbw 35, SUNFLORA
+	; day
+	dbw 30, CATERPIE
+	dbw 31, PIDGEY
+	dbw 30, RATTATA
+	dbw 31, RATTATA
+	dbw 32, RATTATA
+	dbw 32, CATERPIE
+	dbw 35, GIRAFARIG
+	; nite
+	dbw 30, RATTATA
+	dbw 31, HOOTHOOT
+	dbw 30, ODDISH
+	dbw 31, HOOTHOOT
+	dbw 32, ODDISH
+	dbw 32, ODDISH
+	dbw 35, SKARMORY
+	end_grass_wildmons
+	
 	db -1 ; end