Merge branch 'master' of https://github.com/ZetaNull/jep-hack

2026-02-06 16:15:24 +13:00 · 2024-07-19 21:30:43 -04:00 · 2024-07-19 21:30:43 -04:00 · cdbaf2fe2a
commit cdbaf2fe2a
parent 28f2bcdcd9 30e57c9e38
94 changed files with 1909 additions and 354 deletions
--- a/data/collision/collision_permissions.asm
+++ b/data/collision/collision_permissions.asm
@ -105,7 +105,7 @@ TileCollisionTable::
 	db LAND_TILE         ; COLL_65
 	db LAND_TILE         ; 66
 	db LAND_TILE         ; 67
-	db LAND_TILE         ; COLL_PIT_68
+	db LAND_TILE         ; COLL_SWITCH
 	db LAND_TILE         ; 69
 	db WALL_TILE         ; 6a
 	db LAND_TILE         ; 6b
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@ -375,8 +375,9 @@ ENDM
 	connection north, Route10North, ROUTE_10_NORTH, 0
 	connection south, LavenderTown, LAVENDER_TOWN, 0
 	
-	map_attributes SilentHills, SILENT_HILLS, $05, WEST ; Add Prince and east connections later
+	map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
 	connection west, Route49, ROUTE_49, 0
+	connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0
 	
 	map_attributes Route49, ROUTE_49, $05, EAST | WEST
 	connection east, SilentHills, SILENT_HILLS, $05, 0
@ -807,7 +808,15 @@ ENDM
 	
 	; Nihon
 	map_attributes WinnersPath, WINNERS_PATH, $00, 0
+	map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
+	connection north, UnnumberedRoute, UNNUMBERED_ROUTE, 0
+	
+	map_attributes UnnumberedRoute, UNNUMBERED_ROUTE, $05, WEST | SOUTH
+	connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
+	connection west, SilentHills, SILENT_HILLS, 0
+	
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
+	map_attributes BlueLab, BLUE_LAB, $00, 0
 	map_attributes QuietCave, QUIET_CAVE, $76, 0
 	map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
 	map_attributes SilversHouse, SILVERS_HOUSE, $00, 0
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@ -1201,3 +1201,12 @@ SinjohRuinsInterior_Blocks:

 WinnersPath_Blocks:
 	INCBIN "maps/WinnersPath.ablk"
+	
+WinnersPathOutside_Blocks:
+	INCBIN "maps/WinnersPathOutside.ablk"
+	
+UnnumberedRoute_Blocks:
+	INCBIN "maps/UnnumberedRoute.ablk"
+	
+BlueLab_Blocks:
+	INCBIN "maps/BlueLab.ablk"
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@ -130,11 +130,12 @@ Landmarks:
 	landmark   0,   0, UnknownName ; Six Island
 	landmark   0,   0, UnknownName ; Seven Island
 	assert_table_length NIHON_LANDMARK
-	landmark  0,   0, WinnersPathName
-	landmark 92, 108, SilentHillsName
+	landmark 108, 116, WinnersPathName
+	landmark 108, 108, UnknownName ; Unnumbered post-Winner's Path Route
+	landmark  92, 108, SilentHillsName
 	landmark 20,  28, UnknownName ; Debug Room 
-	landmark 91, 108, Route49Name ; probably not correct
-	landmark 91, 108, QuietCaveName ; probably not correct
+	landmark 84, 108, Route49Name
+	landmark 76, 108, QuietCaveName
 	landmark 140, 60, BlueForestName
 	assert_table_length NUM_LANDMARKS

@ -164,7 +165,7 @@ WhirlIslandsName:    db "WHIRL¯ISLANDS@"
 MtMortarName:        db "MT.MORTAR@"
 DragonsDenName:      db "DRAGON'S¯DEN@"
 IcePathName:         db "ICE PATH@"
-NotApplicableName:   db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
+HauntedHouseName:    db "HAUNTED¯HOUSE@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 PalletTownName:      db "PALLET TOWN@"
 ViridianCityName:    db "VIRIDIAN¯CITY@"
 PewterCityName:      db "PEWTER CITY@"
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -674,18 +674,21 @@ MapGroup_SevenIsland:	; 34
 MapGroup_SilentHills:
 	table_width MAP_LENGTH, MapGroup_SilentHills
 	map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
-	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map UnnumberedRoute, TILESET_NIHON_01, ROUTE, LANDMARK_UNNUMBERED_ROUTE, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
 	map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
-	map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
+	map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
+	map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SILENT_HILLS_MAPS
 	
 MapGroup_BlueForest:
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -698,23 +698,22 @@ SilentHillsGroupSprites:
 	db SPRITE_FAMICOM
 	db SPRITE_POKEDEX
 	db SPRITE_WILL
-	db SPRITE_KAREN
+	db SPRITE_ROCKER
 	db SPRITE_NURSE
-	db SPRITE_OLD_LINK_RECEPTIONIST
+	db SPRITE_FISHER
 	db SPRITE_BIG_LAPRAS
 	db SPRITE_BIG_ONIX
 	db SPRITE_SUDOWOODO
-	db SPRITE_BIG_SNORLAX
 	db SPRITE_RIVAL
-	db SPRITE_TEACHER
-	db SPRITE_FISHER
 	; 9 walking sprites
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_YOUNGSTER
 	db SPRITE_POKEFAN_F
 	db SPRITE_BEAUTY
 	db SPRITE_BUG_CATCHER
-	db SPRITE_ROCKER
+	db SPRITE_BLUE
+	db SPRITE_POKEFAN_M
+	db SPRITE_SUPER_NERD
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@ -86,4 +86,6 @@ MapScenes::
 	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	scene_var CERULEAN_CAVE_1F,                            wCeruleanCave1FSceneID
 	scene_var PEWTER_MUSEUM_OF_SCIENCE_1F,				   wPewterMuseum1FSceneID
+	scene_var SILENT_HILLS,					   		       wSilentHillsSceneID
+	scene_var BLUE_LAB,									   wBlueLabSceneID
 	db -1 ; end
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@ -494,13 +494,13 @@ INCLUDE "maps/CeruleanCave1F.asm"
 INCLUDE "maps/CeruleanCave2F.asm"
 INCLUDE "maps/CeruleanCaveB1F.asm"
 INCLUDE "maps/SilentHills.asm"
+
+SECTION "Map Scripts 26", ROMX
+
 INCLUDE "maps/LakeOfRageTraderHouse.asm"
 INCLUDE "maps/LakeOfRagePokecenter1F.asm"
 INCLUDE "maps/LakeOfRageMart.asm"
 INCLUDE "maps/LakeOfRagePrycesHouse.asm"
-
-SECTION "Map Scripts 26", ROMX
-
 INCLUDE "maps/DebugRoom.asm"
 INCLUDE "maps/CliffCave.asm"
 INCLUDE "maps/Route49.asm"
@ -514,6 +514,8 @@ INCLUDE "maps/KantoPokecenter2F.asm"
 INCLUDE "maps/CalsHouse1F.asm"
 INCLUDE "maps/CalsHouse2F.asm"
 INCLUDE "maps/CliffEdgeGate.asm"
+
+SECTION "Map Scripts 27", ROMX
 INCLUDE "maps/EmbeddedTower.asm"
 INCLUDE "maps/Route48.asm"
 INCLUDE "maps/JohtoSafariZoneGate.asm"
@ -521,8 +523,6 @@ INCLUDE "maps/JohtoSafariZone.asm"
 INCLUDE "maps/LavenderCrypt.asm"
 INCLUDE "maps/UnderwaterTunnel.asm"
 INCLUDE "maps/BillsGarden.asm"
-
-SECTION "Map Scripts 27", ROMX
 INCLUDE "maps/CeladonUniversityOutside.asm"
 INCLUDE "maps/CeladonUniversityInside.asm"
 INCLUDE "maps/MtMoonCrater.asm"
@ -544,6 +544,8 @@ INCLUDE "maps/MtEmberHiddenPath.asm"
 INCLUDE "maps/TwoIsland.asm"
 INCLUDE "maps/CapeBrink.asm"
 INCLUDE "maps/Route47.asm"
+
+SECTION "Map Scripts 28", ROMX
 INCLUDE "maps/ThreeIsland.asm"
 INCLUDE "maps/BondBridge.asm"
 INCLUDE "maps/BerryForest.asm"
@ -553,8 +555,6 @@ INCLUDE "maps/IcefallCave1F.asm"
 INCLUDE "maps/IcefallCaveB1F.asm"
 INCLUDE "maps/IcefallCaveBack.asm"
 INCLUDE "maps/FiveIsland.asm"
-
-SECTION "Map Scripts 28", ROMX
 INCLUDE "maps/FiveIslandMeadow.asm"
 INCLUDE "maps/MemorialPillar.asm"
 INCLUDE "maps/WaterLabyrinth.asm"
@ -570,6 +570,15 @@ INCLUDE "maps/OutcastIsland.asm"
 INCLUDE "maps/SevenIsland.asm"
 INCLUDE "maps/CanyonEntrance.asm"
 INCLUDE "maps/SevaultCanyon.asm"
+
+SECTION "Map Scripts 29", ROMX
+INCLUDE "maps/Route49OldCityGate.asm"
+INCLUDE "maps/WinnersPath.asm"
+INCLUDE "maps/WinnersPathOutside.asm"
+INCLUDE "maps/UnnumberedRoute.asm"
+INCLUDE "maps/BlueLab.asm"
+
+SECTION "Map Scripts 30", ROMX
 INCLUDE "maps/TanobyRuins.asm"
 INCLUDE "maps/TanobyChambers.asm"
 INCLUDE "maps/NavalRockExterior.asm"
@ -589,7 +598,3 @@ INCLUDE "maps/ThreeIslandPort.asm"
 INCLUDE "maps/AlteringCave.asm"
 INCLUDE "maps/SinjohRuinsExterior.asm"
 INCLUDE "maps/SinjohRuinsInterior.asm"
-
-SECTION "Map Scripts 29", ROMX
-INCLUDE "maps/Route49OldCityGate.asm"
-INCLUDE "maps/WinnersPath.asm"
--- a/data/phone/non_trainer_names.asm
+++ b/data/phone/non_trainer_names.asm
@ -7,6 +7,7 @@ NonTrainerCallerNames:
 	dw .bill
 	dw .elm
 	dw .buena
+	dw .blue
 	assert_table_length NUM_NONTRAINER_PHONECONTACTS + 1

 .none:     db "----------@"
@ -15,3 +16,4 @@ NonTrainerCallerNames:
 .elm:      db "PROF.ELM:@"
 .bikeshop: db "BIKE SHOP:@"
 .buena:    db "BUENA:<LF>   DISC JOCKEY@"
+.blue:	   db "BILL:@"
--- a/data/phone/permanent_numbers.asm
+++ b/data/phone/permanent_numbers.asm
@ -1,4 +1,5 @@
 PermanentNumbers:
 	db PHONECONTACT_MOM
 	db PHONECONTACT_ELM
+	db PHONECONTACT_BLUE
 	db -1 ; end
--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@ -19,7 +19,7 @@ PhoneContacts:
 	phone SCHOOLBOY,    JACK1,                 NATIONAL_PARK,             ANYTIME, JackPhoneCalleeScript,    ANYTIME, JackPhoneCallerScript
 	phone POKEFANF,     BEVERLY1,              NATIONAL_PARK,             ANYTIME, BeverlyPhoneCalleeScript, ANYTIME, BeverlyPhoneCallerScript
 	phone SAILOR,       HUEY1,                 OLIVINE_LIGHTHOUSE_2F,     ANYTIME, HueyPhoneCalleeScript,    ANYTIME, HueyPhoneCallerScript
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BLUE,    BLUE_LAB,                  ANYTIME, BluePhoneCalleeScript,    0,       UnusedPhoneScript
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0,       UnusedPhoneScript,        0,       UnusedPhoneScript
 	phone COOLTRAINERM, GAVEN3,                ROUTE_26,                  ANYTIME, GavenPhoneCalleeScript,   ANYTIME, GavenPhoneCallerScript
--- a/data/phone/text/blue_callee.asm
+++ b/data/phone/text/blue_callee.asm
@ -0,0 +1,17 @@
+; This'll serve as a story progression-ator, like Elm in Johto.
+
+BlueAnswerPhoneRegularText:
+	text "Yes? @"
+	text_ram wStringBuffer3
+	text " here…"
+
+	para "Ah, <PLAYER>."
+	
+	para "Nope, no updates"
+	line "on gramps yet."
+	
+	para "I'll let you know"
+	line "if I turn up any"
+	cont "clues!"
+	done
+
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@ -310,7 +310,7 @@ PokemonCries::
 	mon_cry CRY_TYPHLOSION,  239,  247 ; STEELIX
 	mon_cry CRY_DUNSPARCE,   274,  232 ; SNUBBULL
 	mon_cry CRY_DUNSPARCE,     0,  384 ; GRANBULL
-	mon_cry CRY_NIDORAN_M,     0,    0 ; CARETORKER	(incomplete)
+	mon_cry CRY_RAIKOU,       64,  512 ; CARETORKER
 	mon_cry CRY_SLOWKING,    352,  224 ; QWILFISH
 	mon_cry CRY_NIDORAN_M,     0,    0 ; KAZEPPELIN	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; QWILFATHER	(incomplete)
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@ -59,4 +59,5 @@ Tilesets::
 	tileset TilesetNihonSouth
 	tileset TilesetNihonWest
 	tileset TilesetLavenderCrypt
+	tileset TilesetBlueLab
 	assert_table_length NUM_TILESETS + 1
--- a/data/tilesets/bluelab_attributes.bin
+++ b/data/tilesets/bluelab_attributes.bin
--- a/data/tilesets/bluelab_collision.asm
+++ b/data/tilesets/bluelab_collision.asm
@ -0,0 +1,17 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 02
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 10
--- a/data/tilesets/bluelab_metatiles.bin
+++ b/data/tilesets/bluelab_metatiles.bin
@ -0,0 +1,2 @@
+))))))))))))))))		8989	89	89#""$3224** !01"$
+24
::::::::"""$2224***#"32*
--- a/data/tilesets/cave_attributes.bin
+++ b/data/tilesets/cave_attributes.bin
--- a/data/tilesets/cave_collision.asm
+++ b/data/tilesets/cave_collision.asm
@ -72,12 +72,12 @@
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 48
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 49
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 4a
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4b
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
 	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4d
 	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
+	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 4f
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 50
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 51
 	tilecoll WALL, FLOOR, FLOOR, LADDER ; 52
@ -85,3 +85,6 @@
 	tilecoll WATER, WATER, WATER, WATER ; 54
 	tilecoll WATER, WALL, WATER, WALL ; 55
 	tilecoll WATER, WALL, WALL, WALL ; 56
+	tilecoll WALL, WALL, WALL, FLOOR ; 57
+	tilecoll FLOOR, WALL, FLOOR, WARP_CARPET_DOWN ; 58
+	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 59
--- a/data/tilesets/cave_metatiles.bin
+++ b/data/tilesets/cave_metatiles.bin
--- a/data/tilesets/nihon01_attributes.bin
+++ b/data/tilesets/nihon01_attributes.bin
--- a/data/tilesets/nihon01_collision.asm
+++ b/data/tilesets/nihon01_collision.asm
@ -127,4 +127,17 @@
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 80
-	tilecoll WALL, WALL, WALL, WALL ; 81
+	tilecoll WALL, WALL, DOOR, WALL ; 81
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 82
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85
+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 86
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 87
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 88
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 89
+	tilecoll WATER, WATER, WATER, WATER ; 8a
+	tilecoll WALL, WALL, WALL, DOOR ; 8b
+	tilecoll WALL, WALL, WALL, WALL ; 8c
+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e
--- a/data/tilesets/nihon01_metatiles.bin
+++ b/data/tilesets/nihon01_metatiles.bin
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@ -1161,10 +1161,9 @@ BirdKeeperGroup:

 LassGroup:
 	next_list_item ; LASS (1)
-	db "CARRIE@", TRAINERTYPE_MOVES
+	db "CARRIE@", TRAINERTYPE_NORMAL
 	db 18
 	dw SNUBBULL
-	dw SCARY_FACE, CHARM, BITE, LICK
 	db -1 ; end

 	next_list_item ; LASS (2)
@ -1353,16 +1352,13 @@ JanineGroup:

 CooltrainerMGroup:
 	next_list_item ; COOLTRAINERM (1)
-	db "NICK@", TRAINERTYPE_MOVES
+	db "NICK@", TRAINERTYPE_NORMAL
 	db 26
 	dw CHARMANDER
-	dw EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 	db 26
 	dw SQUIRTLE
-	dw WITHDRAW, WATER_GUN, BITE, CURSE
 	db 26
 	dw BULBASAUR
-	dw LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 	db -1 ; end

 	next_list_item ; COOLTRAINERM (2)
@ -1796,8 +1792,12 @@ BeautyGroup:

 	next_list_item ; BEAUTY (4)
 	db "JACLYN@", TRAINERTYPE_NORMAL
-	db 15
-	dw SENTRET
+	db 53
+	dw FURRET
+	db 53
+	dw MEGANIUM
+	db 55
+	dw EUCALA
 	db -1 ; end

 	next_list_item ; BEAUTY (5)
@ -2833,6 +2833,14 @@ FisherGroup:
 	dw ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end

+	next_list_item ; FISHER (25)
+	db "BRAN@", TRAINERTYPE_NORMAL
+	db 54
+	dw QWILFATHER
+	db 57
+	dw KAZEPPELIN
+	db -1 ; end
+
 	end_list_items

 SwimmerMGroup:
@ -3314,13 +3322,13 @@ SuperNerdGroup:
 	db -1 ; end

 	next_list_item ; SUPER_NERD (3) 
-	db "GREGG@", TRAINERTYPE_NORMAL ; seems to be unused - anything we can do?
-	db 20
-	dw MAGNEMITE
-	db 20
-	dw MAGNEMITE
-	db 20
-	dw MAGNEMITE
+	db "GREGG@", TRAINERTYPE_NORMAL
+	db 50
+	dw ELECTRODE
+	db 51
+	dw PORYGON2
+	db 50
+	dw BELLEDAM
 	db -1 ; end

 	next_list_item ; SUPER_NERD (4)
@ -5475,99 +5483,3 @@ MysticalmanGroup:
 	db -1 ; end
 	end_list_items

-; RBY / unused trainer types. Mostly placeholders.
-ChannelerGroup:
-	next_list_item ; CHANNELER (1)
-	db "SHANNA@", TRAINERTYPE_NORMAL
-	db 23
-	dw GASTLY
-	db -1 ; end
-	end_list_items
-
-CueBallGroup:
-	next_list_item ; CUE_BALL (1)
-	db "KIRBY@", TRAINERTYPE_NORMAL
-	db 23
-	dw CLEFFA
-	db -1 ; end
-	end_list_items
-
-EngineerGroup:
-	next_list_item ; ENGINEER (1)
-	db "DASHU@", TRAINERTYPE_NORMAL
-	db 23
-	dw MAGNEMITE
-	db -1 ; end
-	end_list_items
-
-RockerGroup:
-	next_list_item ; ROCKER (1)
-	db "BOWIE@", TRAINERTYPE_NORMAL
-	db 23
-	dw VOLTORB
-	db -1 ; end
-	end_list_items
-
-TamerGroup:
-	next_list_item ; TAMER (1)
-	db "MOE@", TRAINERTYPE_NORMAL
-	db 23
-	dw TAUROS
-	db -1 ; end
-	end_list_items
-
-FirefighterGroup:
-	next_list_item ; FIREFIGHTER (1)
-	db "REMY@", TRAINERTYPE_NORMAL
-	db 23
-	dw POLIWAG
-	db -1 ; end
-	end_list_items
-
-TeacherMGroup:
-	next_list_item ; TEACHERM (1)
-	db "DORNYEI@", TRAINERTYPE_NORMAL
-	db 23
-	dw BLISSEY
-	db -1 ; end
-	end_list_items
-
-PainterGroup:
-	next_list_item ; PAINTER (1)
-	db "RACHEL@", TRAINERTYPE_NORMAL
-	db 23
-	dw SMEARGLE
-	db -1 ; end
-	end_list_items
-
-SoldierGroup:
-	next_list_item ; SOLDIER (1)
-	db "PEPPINO@", TRAINERTYPE_NORMAL
-	db 23
-	dw FORRETRESS
-	db -1 ; end
-	end_list_items
-
-SportsmanGroup:
-	next_list_item ; SPORTSMAN (1)
-	db "JACQUES@", TRAINERTYPE_NORMAL
-	db 23
-	dw DODUO
-	db -1 ; end
-	end_list_items
-	
-AerofossilGroup:
-	next_list_item ; SPORTSMAN (1)
-	db "???@", TRAINERTYPE_NORMAL
-	db 99
-	dw AERODACTYL
-	db -1 ; end
-	end_list_items
-
-KabufossilGroup:
-	next_list_item ; SPORTSMAN (1)
-	db "???@", TRAINERTYPE_NORMAL
-	db 99
-	dw KABUTOPS
-	db -1 ; end
-	end_list_items
--- a/data/trainers/parties_new_classes.asm
+++ b/data/trainers/parties_new_classes.asm
@ -0,0 +1,111 @@
+SECTION "Enemy Trainer Parties 4", ROMX
+
+; RBY / unused trainer types. Mostly placeholders.
+ChannelerGroup:
+	next_list_item ; CHANNELER (1)
+	db "SHANNA@", TRAINERTYPE_NORMAL
+	db 23
+	dw GASTLY
+	db -1 ; end
+	end_list_items
+
+CueBallGroup:
+	next_list_item ; CUE_BALL (1)
+	db "KIRBY@", TRAINERTYPE_NORMAL
+	db 23
+	dw CLEFFA
+	db -1 ; end
+	end_list_items
+
+EngineerGroup:
+	next_list_item ; ENGINEER (1)
+	db "DASHU@", TRAINERTYPE_NORMAL
+	db 52
+	dw MAGNEZONE
+	db 54
+	dw ELECTIVIRE
+	db -1 ; end
+	end_list_items
+
+RockerGroup:
+	next_list_item ; ROCKER (1)
+	db "BOWIE@", TRAINERTYPE_NORMAL
+	db 23
+	dw VOLTORB
+	db -1 ; end
+	end_list_items
+
+TamerGroup:
+	next_list_item ; TAMER (1)
+	db "MOE@", TRAINERTYPE_NORMAL
+	db 23
+	dw TAUROS
+	db -1 ; end
+	end_list_items
+
+FirefighterGroup:
+	next_list_item ; FIREFIGHTER (1)
+	db "REMY@", TRAINERTYPE_NORMAL
+	db 23
+	dw POLIWAG
+	db -1 ; end
+	end_list_items
+
+TeacherMGroup:
+	next_list_item ; TEACHERM (1)
+	db "DORNYEI@", TRAINERTYPE_NORMAL
+	db 23
+	dw BLISSEY
+	db -1 ; end
+	end_list_items
+
+PainterGroup:
+	next_list_item ; PAINTER (1)
+	db "RACHEL@", TRAINERTYPE_NORMAL
+	db 23
+	dw SMEARGLE
+	db -1 ; end
+	
+	next_list_item ; PAINTER (1)
+	db "DALI@", TRAINERTYPE_MOVES
+	db 50
+	dw NOCTOWL
+	dw REFLECT, HYPNOSIS, WING_ATTACK, FORESIGHT
+	db 53
+	dw SMEARGLE
+	dw EXTREMESPEED, BELLY_DRUM, NO_MOVE, NO_MOVE ; lol
+	db -1 ; end
+	
+	end_list_items
+
+SoldierGroup:
+	next_list_item ; SOLDIER (1)
+	db "PEPPINO@", TRAINERTYPE_NORMAL
+	db 23
+	dw FORRETRESS
+	db -1 ; end
+	end_list_items
+
+SportsmanGroup:
+	next_list_item ; SPORTSMAN (1)
+	db "JACQUES@", TRAINERTYPE_NORMAL
+	db 23
+	dw DODUO
+	db -1 ; end
+	end_list_items
+	
+AerofossilGroup:
+	next_list_item ; SPORTSMAN (1)
+	db "???@", TRAINERTYPE_NORMAL
+	db 99
+	dw AERODACTYL
+	db -1 ; end
+	end_list_items
+
+KabufossilGroup:
+	next_list_item ; SPORTSMAN (1)
+	db "???@", TRAINERTYPE_NORMAL
+	db 99
+	dw KABUTOPS
+	db -1 ; end
+	end_list_items
--- a/data/wild/nihon_grass.asm
+++ b/data/wild/nihon_grass.asm
@ -1,32 +1,93 @@
 NihonGrassWildMons:
+	; Winner's Path is themed around Pokemon found in the PokeWalker map.
+	; Additionally, it features Pokemon known to be successful in Nintendo Cup 2000.
 	def_grass_wildmons WINNERS_PATH
 	db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	dbw 50, MUNCHLAX
 	dbw 51, SKARMORY
-	dbw 50, CHANSEY
+	dbw 56, CHANSEY ; Allows a Repel trick. Thanks for the suggestion Molk!
 	dbw 51, MUNCHLAX
-	dbw 52, TAUROS
+	dbw 52, RHYDON
 	dbw 52, FORRETRESS
 	dbw 55, STEELIX
 	; day
 	dbw 50, MUNCHLAX
 	dbw 51, SKARMORY
-	dbw 50, CHANSEY
+	dbw 56, CHANSEY
 	dbw 51, MUNCHLAX
-	dbw 52, TAUROS
+	dbw 52, RHYDON
 	dbw 52, FORRETRESS
 	dbw 55, STEELIX
 	; nite
-	dbw 50, MUNCHLAX
+	dbw 50, MAROWAK
 	dbw 51, SKARMORY
 	dbw 50, KITSEN
-	dbw 51, MUNCHLAX
+	dbw 51, MAROWAK
 	dbw 52, HAUNTER
 	dbw 52, MISDREAVUS
 	dbw 55, STEELIX
 	end_grass_wildmons
-
+	
+	def_grass_wildmons WINNERS_PATH_OUTSIDE
+	db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 50, MUNCHLAX
+	dbw 51, SKARMORY
+	dbw 50, MILTANK
+	dbw 51, MUNCHLAX
+	dbw 52, TAUROS
+	dbw 52, QUAGSIRE
+	dbw 55, AMPHAROS
+	; day
+	dbw 50, MUNCHLAX
+	dbw 51, SKARMORY
+	dbw 50, MILTANK
+	dbw 51, MUNCHLAX
+	dbw 52, TAUROS
+	dbw 52, QUAGSIRE
+	dbw 55, AMPHAROS
+	; nite
+	dbw 50, KADABRA
+	dbw 51, SKARMORY
+	dbw 50, KITSEN
+	dbw 51, KADABRA
+	dbw 52, HAUNTER
+	dbw 52, MISDREAVUS
+	dbw 55, AMPHAROS
+	end_grass_wildmons
+	
+	; Route east of Silent Hills
+	; Encounter data based on what is in the SW97 demo.
+	; https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Maps
+	def_grass_wildmons UNNUMBERED_ROUTE
+	db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 29, PICHU
+	dbw 29, SMEARGLE
+	dbw 28, PICHU
+	dbw 29, ODDISH
+	dbw 32, GLOOM
+	dbw 27, PIKACHU
+	dbw 27, SMEARGLE
+	; day
+	dbw 29, ODDISH
+	dbw 29, SMEARGLE
+	dbw 28, PICHU
+	dbw 29, MEOWTH
+	dbw 32, RATICATE
+	dbw 27, MEOWTH
+	dbw 27, SMEARGLE
+	; nite
+	dbw 29, RATICATE
+	dbw 29, HOOTHOOT
+	dbw 28, EKANS
+	dbw 29, HOOTHOOT
+	dbw 32, ARBOK
+	dbw 27, NOCTOWL
+	dbw 27, SMEARGLE
+	end_grass_wildmons
+	
 	def_grass_wildmons QUIET_CAVE
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
--- a/data/wild/nihon_water.asm
+++ b/data/wild/nihon_water.asm
@ -6,6 +6,13 @@ NihonWaterWildMons:
 	dbw 40, GRANBO ; SHARPOON
 	end_water_wildmons

+	def_water_wildmons UNNUMBERED_ROUTE
+	db 4 percent ; encounter rates: morn/day/nite
+	dbw 30, MAGIKARP
+	dbw 31, ANGORE
+	dbw 30, MOLAMBINO
+	end_water_wildmons
+
 	; Placeholder
 	def_water_wildmons ROUTE_49_2
 	db 4 percent ; encounter rates: morn/day/nite