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

README.md

@@ -21,7 +21,6 @@ With respect to Pokemon from the May 1998 Sprite Cache, creative liberties based
 Mega Evolutions, Gigantamax forms, etc, are not in active consideration.
 
 # Changes
-## New Features
 - There is now an enby character option named Topaz, purple-themed.
 - There is a new Nihon region, based on the 1998 version before it got scrapped for Johto. 
 - The Fairy-type is now available, though Pokemon are not retroactively changed, per the Kanto Expansion Pak philosophy (you wouldn't want a Fairy-type Granbull pre-split, would you?)
@@ -40,12 +39,12 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration.
 	- 24% SOFT_SAND
 	- 48% PEARL
 	- 64% BRICK_PIECE
-
-# New things
-- 11 new Trainer classes, including;
+- Many new Trainer classes, including;
 	- RBY classes not in GSC, such as the Rocker, Channeler, and even the beta Firefighter
 	- Prototype GSC classes such as the Male Teacher, Sportsman, and Soldier
 	- The Painter from FRLG!
+	- The Elder from HGSS, featuring the NTSC Sage sprite.
+	- Decensor is applied to the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. Let Tully have a puff!
 - Many evolution stones have been added to accomodate the Pokemon featured here, including the Heart and Poison Stones from the SpaceWorld demo, and the Peat Block!
 - The Fairy Feather from Scarlet and Violet has been added to accomodate the Fairy type.
 - The Antique Pot has been added to accomodate a Shuckle evolution!
@@ -104,7 +103,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 ### JEP Developers
 JEP-affiliated spriters require sprites to be used with direct credit for non-commerical purposes. Credit the artist in any case of using them.
 - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, 
-- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
+- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops, Calflac (with inspiration from KmiE_821)
 - zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix
 - Shawesome: Alolan Geodude
 - EyeDonutz: Walking Wake
@@ -115,9 +114,11 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 - nuuk: Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back)
 - Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly: Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
 	- Gorotora is edited from RacieBeep's Yellow sprite in the Helix Chamber PokeThon ROM Hack. A full list of Helix Chamber sprites are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). Helix Chamber spriters have a "must credit" policy.
-- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
+- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage), Trebir (Mallody), Folage (Silkane)
 - SCMidna: Munchlax
-- SageDeoxys: (TBA)
+- SageDeoxys: Iron Bundle, Raging Bolt, Scream Tail, Dudunsparce (both forms)
+- Pokets: Terrados
+- KmiE_821: Calflac design inspiration
 - Tom Wang: Gold/Chris running sprite
 - Seasick: Kris running sprite
 - Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites.

constants/event_flags.asm

@@ -595,7 +595,14 @@
 	const EVENT_BEAT_SAGE_PING
 	const EVENT_BEAT_SAGE_EDMOND
 	const EVENT_BEAT_SAGE_NEAL
-	const EVENT_BEAT_SAGE_LI
+	const EVENT_BEAT_SAGE_MING
+	const EVENT_BEAT_SAGE_WEI
+	const EVENT_BEAT_SAGE_LANG
+	const EVENT_BEAT_SAGE_HUANG
+	const EVENT_BEAT_SAGE_GEN
+	const EVENT_BEAT_SAGE_RAOH
+	const EVENT_BEAT_SAGE_SHUU
+	const EVENT_BEAT_SAGE_SHENG
 ; Camper
 	const EVENT_BEAT_CAMPER_ROLAND
 	const EVENT_BEAT_CAMPER_TODD
@@ -1015,6 +1022,7 @@
 	const EVENT_BEAT_MEDIUM_ETHEL
 	const EVENT_BEAT_MEDIUM_REBECCA
 	const EVENT_BEAT_MEDIUM_DORIS
+	const EVENT_BEAT_MEDIUM_ELSIE
 ; Skier
 	const EVENT_BEAT_SKIER_ROXANNE
 	const EVENT_BEAT_SKIER_CLARISSA
@@ -1091,6 +1099,8 @@
 	const EVENT_BEAT_PAINTER_DALI ; unused
 	const EVENT_BEAT_SOLDIER_PEPPINO ; unused
 	const EVENT_BEAT_SPORTSMAN_JACQUES ; unused
+	const EVENT_BEAT_ELDER_LI
+	const EVENT_BEAT_ELDER_ROEN
 ; Nihon Bosses
 	const EVENT_BEAT_LEADER_WALKER
 	const EVENT_BEAT_LEADER_LORELEI
@@ -1109,8 +1119,7 @@
 	const EVENT_BEAT_ARCHER2
 	const EVENT_BEAT_ARCHER3
 	const EVENT_BEAT_PROFBLUE
-	const EVENT_GOT_TM47_STEEL_WING2
-; Unused: next 86 events
+; Unused: next 77 events
 
 	const_next 1600
 ; Sprite visibility flags
@@ -1538,7 +1547,8 @@
 	const EVENT_PALSSIO_POKEBALL_IN_BLUES_LAB ; to hide
 	const EVENT_GONE_THROUGH_STARTER_DOOR
 	const EVENT_BRIEFED_BY_BLUE
-; Unused: next 40 events
+	const EVENT_GOT_TM47_STEEL_WING2
+; Unused: next 39 events
 
 	const_next 2048
 DEF NUM_EVENTS EQU const_value ; 800

constants/landmark_constants.asm

@@ -132,6 +132,7 @@ DEF NIHON_LANDMARK EQU const_value
 	const LANDMARK_ROUTE_49
 	const LANDMARK_QUIET_CAVE
 	const LANDMARK_OLD_CITY
+	const LANDMARK_POKEMON_PAGODA
 	const LANDMARK_BLUE_FOREST
 	const LANDMARK_ROUTE_66
 	const LANDMARK_WHITE_CITY

constants/map_constants.asm

@@ -391,6 +391,10 @@ ENDM
 	map_const ROUTE_8_SAFFRON_GATE,                         5,  4 ; 13
 	map_const ROUTE_12_SUPER_ROD_HOUSE,                     4,  4 ; 14
 	map_const LAVENDER_CRYPT,							    9, 10 ; 15
+	map_const LAVENDER_CRYPT_SET_1,						   12, 10 ; 16
+	map_const LAVENDER_CRYPT_SET_2,						   12, 10 ; 17
+	map_const LAVENDER_CRYPT_SET_3,						   12, 10 ; 18
+	map_const LAVENDER_CRYPT_DOKUROARS_ROOM,			    7,  8 ; 19
 	endgroup
 
 	newgroup SILVER                                               ; 19
@@ -644,6 +648,12 @@ ENDM
 	map_const OLD_CITY_FAMILY_HOUSE,                  		 4,  4 ; 6
 	map_const SEPIA_SCHOOL,                  			     4,  8 ; 7
 	map_const OLD_CITY_GYM,									 6, 10 ; 8
+	map_const OLD_CITY_MUSEUM,								 8,  3 ; 9
+	map_const POKEMON_PAGODA_1F,							 5,  5 ; 10
+	map_const POKEMON_PAGODA_2F,							 5,  5 ; 10
+	map_const POKEMON_PAGODA_3F,							 5,  5 ; 10
+	map_const POKEMON_PAGODA_4F,							 5,  5 ; 10
+	map_const POKEMON_PAGODA_5F,							 3,  3 ; 10
 	endgroup
 	
 	newgroup BLUE_FOREST                                          ; 37

constants/map_data_constants.asm

@@ -141,6 +141,7 @@ DEF KANTO_FLYPOINT EQU const_value
 	const FLY_INDIGO
 DEF NIHON_FLYPOINT EQU const_value
 	const FLY_SILENT_HILLS
+	const FLY_OLD_CITY
 DEF NUM_FLYPOINTS EQU const_value
 
 DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

constants/trainer_constants.asm

@@ -635,19 +635,31 @@ DEF KRIS EQU __trainer_class__
 	const PING
 	const EDMOND
 	const NEAL
-	const LI
 	const GAKU
 	const MASA
 	const KOJI
 	
+	; New Sages for the Pokemon Pagoda.
+	; Given Li, Chow, Jin, and Ping are Chinese names, I decided to adapt it here.
+	; I also added the French Crystal Wise Trio's names; Raoh, and Shuu, which were Fist of the North Star references. Because it's just kind of cool. Ken already exists, so I instead went with Gen, the name of a Chinese Street Fighter character.
+	const MING
+	const WEI
+	const LANG
+	const HUANG
+	const GEN
+	const RAOH
+	const SHUU
+	const SHENG
+
 	trainerclass MEDIUM ; 39
 	const MARTHA
 	const GRACE
-	const BETHANY ; unused
-	const MARGRET ; unused
-	const ETHEL ; unused
+	const BETHANY ; unused, now Pagoda 2F Medium
+	const MARGRET ; unused, now Pagoda 2F Medium
+	const ETHEL ; unused, now Pagoda 2F Medium
 	const REBECCA
 	const DORIS
+	const ELSIE ; Pagoda 2F Mediums
 
 	trainerclass BOARDER ; 3a
 	const RONALD
@@ -794,5 +806,9 @@ DEF KRIS EQU __trainer_class__
 	trainerclass PROFBLUE
 	const PROFBLUE1
 	
+	trainerclass ELDER
+	const LI
+	const KONG
+
 DEF TOPAZ EQU __trainer_class__
 DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1

data/collision/field_move_blocks.asm

@@ -6,6 +6,8 @@ CutTreeBlockPointers:
 	dbw TILESET_KANTO,        .kanto
 	dbw TILESET_PARK,         .park
 	dbw TILESET_FOREST,       .forest
+	dbw TILESET_NIHON_01,		.nihon01
+	dbw TILESET_NIHON_OLD,		.oldCity
 	db -1 ; end
 
 .johto:
@@ -43,6 +45,16 @@ CutTreeBlockPointers:
 	db $0f, $17, 0
 	db -1 ; end
 
+.nihon01:
+; facing block, replacement block, animation
+	db $03, $02, 1 ; grass
+	db $6d, $88, 0 ; tree
+	db -1 ; end
+
+.oldCity:
+; facing block, replacement block, animation
+	db $17, $41, 0 ; tree
+	db -1 ; end
 
 ; these blocks all use COLL_WHIRLPOOL in one quadrant
 WhirlpoolBlockPointers:
@@ -53,3 +65,4 @@ WhirlpoolBlockPointers:
 ; facing block, replacement block, animation
 	db $07, $36, 0
 	db -1 ; end
+

data/maps/attributes.asm

@@ -732,6 +732,10 @@ ENDM
 	map_attributes JohtoSafariZoneGate, JOHTO_SAFARI_ZONE_GATE, $00, 0 ; Bank 1
 	map_attributes JohtoSafariZone, JOHTO_SAFARI_ZONE, $00, 0 ; Bank 1
 	map_attributes LavenderCrypt, LAVENDER_CRYPT, $00, 0 ; Bank 1
+	map_attributes LavenderCryptSet1, LAVENDER_CRYPT_SET_1, $00, 0 ; Bank 1
+	map_attributes LavenderCryptSet2, LAVENDER_CRYPT_SET_2, $00, 0 ; Bank 1
+	map_attributes LavenderCryptSet3, LAVENDER_CRYPT_SET_3, $00, 0 ; Bank 1
+	map_attributes LavenderCryptDokuroarsRoom, LAVENDER_CRYPT_DOKUROARS_ROOM, $00, 0 ; Bank 1
 	map_attributes UnderwaterTunnel, UNDERWATER_TUNNEL, $00, 0 ; Bank 1
 	map_attributes BillsGarden, BILLS_GARDEN, $00, 0 ; Bank 1
 	map_attributes CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, $00, 0 ; Bank 1
@@ -833,6 +837,12 @@ ENDM
 	map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0
 	map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0
 	map_attributes OldCityGym, OLD_CITY_GYM, $00, 0
+	map_attributes OldCityMuseum, OLD_CITY_MUSEUM, $00, 0
+	map_attributes PokemonPagoda1F, POKEMON_PAGODA_1F, $00, 0
+	map_attributes PokemonPagoda2F, POKEMON_PAGODA_2F, $00, 0
+	map_attributes PokemonPagoda3F, POKEMON_PAGODA_3F, $00, 0
+	map_attributes PokemonPagoda4F, POKEMON_PAGODA_4F, $00, 0
+	map_attributes PokemonPagoda5F, POKEMON_PAGODA_5F, $00, 0
 	
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	

data/maps/blocks.asm

@@ -279,6 +279,18 @@ JohtoSafariZone_Blocks:
 LavenderCrypt_Blocks:
 	INCBIN "maps/LavenderCrypt.ablk"
 
+LavenderCryptSet1_Blocks:
+	INCBIN "maps/LavenderCryptSet1.ablk"
+
+LavenderCryptSet2_Blocks:
+	INCBIN "maps/LavenderCryptSet2.ablk"
+
+LavenderCryptSet3_Blocks:
+	INCBIN "maps/LavenderCryptSet3.ablk"
+
+LavenderCryptDokuroarsRoom_Blocks:
+	INCBIN "maps/LavenderCryptDokuroarsRoom.ablk"
+
 UnderwaterTunnel_Blocks:
 	INCBIN "maps/UnderwaterTunnel.ablk"
 
@@ -1243,3 +1255,21 @@ Route66WhiteCityGate_Blocks:
 	
 OldCityGym_Blocks:
 	INCBIN "maps/OldCityGym.ablk"
+	
+OldCityMuseum_Blocks:
+	INCBIN "maps/OldCityMuseum.ablk"
+	
+PokemonPagoda1F_Blocks:
+	INCBIN "maps/PokemonPagoda1F.ablk"
+
+PokemonPagoda2F_Blocks:
+	INCBIN "maps/PokemonPagoda2F.ablk"
+
+PokemonPagoda3F_Blocks:
+	INCBIN "maps/PokemonPagoda3F.ablk"
+
+PokemonPagoda4F_Blocks:
+	INCBIN "maps/PokemonPagoda4F.ablk"
+
+PokemonPagoda5F_Blocks:
+	INCBIN "maps/PokemonPagoda5F.ablk"

data/maps/landmarks.asm

@@ -136,6 +136,7 @@ Landmarks:
 	landmark 84, 108, Route49Name
 	landmark 76, 108, QuietCaveName
 	landmark 76, 100, OldCityName
+	landmark 76, 100, PokemonPagodaName
 	landmark 140, 60, BlueForestName
 	landmark 108, 108, Route66Name
 	landmark 124, 108, WhiteCityName
@@ -251,6 +252,7 @@ Route66Name:         db "ROUTE 66@"
 Route49Name:         db "ROUTE 49@"
 QuietCaveName:       db "QUIET¯CAVE@"
 OldCityName:		 db "SEPIA¯CITY@"
+PokemonPagodaName:	 db "#MON¯PAGODA@"
 ; High Tech will be called "Vogue City"
 BlueForestName:      db "BLUE¯FOREST@"
 WhiteCityName:       db "WHITE¯CITY@"

data/maps/maps.asm

@@ -431,6 +431,10 @@ MapGroup_Lavender:
 	map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
 	assert_table_length NUM_LAVENDER_MAPS
 
 MapGroup_Silver:
@@ -704,6 +708,12 @@ MapGroup_OldCity:
 	map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map PokemonPagoda1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map PokemonPagoda2F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	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
 	assert_table_length NUM_OLD_CITY_MAPS
 
 MapGroup_BlueForest:

data/maps/outdoor_sprites.asm

@@ -717,6 +717,7 @@ SilentHillsGroupSprites:
 	db SPRITE_BLUE
 	db SPRITE_POKEFAN_M
 	db SPRITE_SUPER_NERD
+	db SPRITE_COOLTRAINER_M
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE

data/maps/scripts.asm

@@ -590,6 +590,16 @@ INCLUDE "maps/Route66WhiteCityGate.asm"
 
 SECTION "Map Scripts 30", ROMX
 INCLUDE "maps/OldCityGym.asm"
+INCLUDE "maps/OldCityMuseum.asm"
+INCLUDE "maps/PokemonPagoda1F.asm"
+INCLUDE "maps/PokemonPagoda2F.asm"
+INCLUDE "maps/PokemonPagoda3F.asm"
+INCLUDE "maps/PokemonPagoda4F.asm"
+INCLUDE "maps/PokemonPagoda5F.asm"
+INCLUDE "maps/LavenderCryptSet1.asm"
+INCLUDE "maps/LavenderCryptSet2.asm"
+INCLUDE "maps/LavenderCryptSet3.asm"
+INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
 
 SECTION "Map Scripts 31", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"

data/pokemon/dex_entries/calflac.asm

@@ -1,10 +1,10 @@
 	db "CALF@" ; species name
-	dw  404, 458 ; height, weight
+	dw  311, 350 ; height, weight
 
-	db   "Formed when"
-	next "BIPULLA's two"
-	next "halves joined"
+	db   "Both of BIPULLA's"
+	next "halves joined to"
+	next "become CALFLAC."
 
-	page "together. However,"
-	next "they still strug-"
-	next "gle to cooperate.@"
+	page "However, its two"
+	next "brains struggle"
+	next "to cooperate.@"

data/pokemon/dex_entries/flutter_mane.asm

@@ -1,10 +1,10 @@
 	db "PARADOX@" ; species name
-	dw 407, 088 ; height, weight
+	dw 407, 80 ; height, weight
 
-	db   "It floats around with"
+	db   "Believed to be the"
+	next "ghost of a ptero-"
+	next "saur. At night, it"
+
+	page "flies around with"
 	next "its writhing hair,"
-	next "scoffing at those"
-
-	page "beneath it. Said"
-	next "to be the ghost"
-	next "of a pterosaur.@"
+	next "cackling wickedly.@"

data/pokemon/dex_entries/great_tusk.asm

@@ -1,5 +1,5 @@
 	db "PARADOX@" ; species name
-	dw 703, 7055 ; height, weight
+	dw 703, 7050 ; height, weight
 
 	db   "A relic of the age"
 	next "of dinosaurs. Its"

data/pokemon/dex_entries/iron_bundle.asm

@@ -1,10 +1,10 @@
 	db "PARADOX@" ; species name
-	dw 200, 243 ; height, weight
+	dw 200, 240 ; height, weight
 
-	db   "It carries a metal"
-	next "device that launches"
-	next "it backward. This,"
+	db   "A strange, robotic"
+	next "#MON that can"
+	next "launch itself by"
 
-	page "and its extendable"
-	next "head, have resulted"
-	next "in much speculation.@"
+	page "firing icy blasts"
+	next "from the round"
+	next "device it holds.@"

data/pokemon/dex_entries/iron_thorns.asm

@@ -1,10 +1,10 @@
 	db "PARADOX@" ; species name
-	dw 503, 668 ; height, weight
+	dw 503, 6680 ; height, weight
 
-	db   "Seemingly OMEGADGE's"
-	next "final version. It"
-	next "only picks fights"
+	db   "Thought to be the"
+	next "final version of"
+	next "OMEGADGE. It's a"
 
-	page "it can win, and"
-	next "attacks using its"
-	next "retractable spikes.@"
+	page "highly intelligent"
+	next "creature, avoiding"
+	next "needless battles.@"

data/pokemon/dex_entries/iron_treads.asm

@@ -1,5 +1,5 @@
 	db "PARADOX@" ; species name
-	dw 211, 5922 ; height, weight
+	dw 211, 5920 ; height, weight
 
 	db   "A creature of the"
 	next "digital age. It"

data/pokemon/dex_entries/sandy_shocks.asm

@@ -1,10 +1,10 @@
 	db "PARADOX@" ; species name
-	dw 707, 1323 ; height, weight
+	dw 707, 1320 ; height, weight
 
-	db   "Its magnets are very"
-	next "dexterous, allowing"
-	next "for easy traversal"
+	db   "It travels across"
+	next "deserts by walking"
+	next "on its dexterous"
 
-	page "across deserts."
-	next "However, it leaves"
-	next "covered in iron.@"
+	page "magnets. The iron"
+	next "filings it picks"
+	next "up adorn its body.@"

data/pokemon/dex_entries/scream_tail.asm

@@ -1,10 +1,10 @@
 	db "PARADOX@" ; species name
-	dw 311, 176 ; height, weight
+	dw 311, 170 ; height, weight
 
-	db   "Its eyes glow yellow"
-	next "when angered. Its"
-	next "aggression prompted"
+	db   "Its eyes glow when"
+	next "angered. Its aggr-"
+	next "essive nature has"
 
-	page "rumours of it being"
-	next "a beast from the"
+	page "sparked rumors of"
+	next "it being from the"
 	next "Cambrian period.@"

data/pokemon/dex_entries/stromen.asm

@@ -1,5 +1,5 @@
 	db "CURSE@" ; species name
-	dw  8, 19 ; height, weight
+	dw 100, 20 ; height, weight
 
 	db   "It lives quietly"
 	next "in places no one"

data/pokemon/dex_entries/terrados.asm

@@ -3,8 +3,8 @@
 
 	db   "It blindly tunnels"
 	next "through the earth,"
-	next "feasting on any,"
+	next "crushing rocks in"
 
-	page "unfortunate GRAVELER"
-	next "or ONIX that it"
-	next "comes across.@"
+	page "its jaws. GRAVELER"
+	next "and ONIX are its"
+	next "favorite prey.@"

data/tilesets/lavendercrypt_collision.asm

@@ -16,96 +16,96 @@
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
 	tilecoll WALL, WALL, DOOR, DOOR ; 11
-	tilecoll FLOOR, WALL, LADDER, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
 	tilecoll WALL, WALL, WALL, FLOOR ; 14
 	tilecoll WALL, WALL, FLOOR, WALL ; 15
-	tilecoll FLOOR, WALL, LADDER, WALL ; 16
+	tilecoll FLOOR, PIT, FLOOR, PIT ; 16
 	tilecoll WALL, WALL, WALL, WALL ; 17
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
 	tilecoll WALL, WALL, WALL, FLOOR ; 19
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a
-	tilecoll WALL, FLOOR, LADDER, FLOOR ; 1b
+	tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1a
+	tilecoll PIT, FLOOR, FLOOR, FLOOR ; 1b
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1f
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 20
 	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 21
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 22
-	tilecoll WALL, WALL, FLOOR, WALL ; 23
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 22
+	tilecoll FLOOR, WALL, WALL, WALL ; 23
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 25
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26
-	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 27
-	tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 28
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
-	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b
-	tilecoll WALL, WALL, WALL, WALL ; 2c
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
-	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, WALL, FLOOR, WALL ; 25
+	tilecoll WALL, WALL, WALL, FLOOR ; 26
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 27
+	tilecoll WALL, FLOOR, WALL, WALL ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll FLOOR, PIT, FLOOR, FLOOR ; 2a
+	tilecoll PIT, FLOOR, PIT, FLOOR ; 2b
+	tilecoll FLOOR, WARP_CARPET_DOWN, WALL, WALL ; 2c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f
 	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll WALL, LADDER, WALL, WALL ; 31
-	tilecoll LADDER, FLOOR, LADDER, FLOOR ; 32
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 31
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 32
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
-	tilecoll WALL, WALL, WALL, WALL ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 37
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 38
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
-	tilecoll WALL, WALL, WALL, FLOOR ; 3a
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, WALL, WALL, WALL ; 3d
-	tilecoll WALL, WALL, WALL, WALL ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll WALL, WALL, PIT, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, WALL ; 36
+	tilecoll PIT, WALL, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, PIT, WALL, WALL ; 38
+	tilecoll WALL, WALL, WALL, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3e
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 3f
-	tilecoll WALL, WALL, WALL, FLOOR ; 40
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
-	tilecoll WALL, WALL, FLOOR, WALL ; 42
-	tilecoll WALL, WALL, WALL, WALL ; 43
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 47
-	tilecoll WALL, FLOOR, WALL, WALL ; 48
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
-	tilecoll FLOOR, WALL, WALL, WALL ; 4a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 4b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 4c
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4e
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4f
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 50
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 51
-	tilecoll WALL, WALL, WALL, WALL ; 52
-	tilecoll WALL, WALL, WALL, WALL ; 53
-	tilecoll WALL, WALL, WALL, WALL ; 54
-	tilecoll WALL, FLOOR, WALL, WALL ; 55
-	tilecoll WALL, WALL, WALL, WALL ; 56
-	tilecoll WALL, FLOOR, WALL, WALL ; 57
-	tilecoll FLOOR, WALL, WALL, WALL ; 58
-	tilecoll WALL, WALL, WALL, WALL ; 59
-	tilecoll WALL, WALL, WALL, WALL ; 5a
-	tilecoll WALL, WALL, WALL, WALL ; 5b
-	tilecoll WALL, WALL, FLOOR, WALL ; 5c
-	tilecoll WALL, WALL, WALL, FLOOR ; 5d
-	tilecoll WALL, WALL, WALL, FLOOR ; 5e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, WALL ; 41
+	tilecoll WALL, WALL, PIT, FLOOR ; 42
+	tilecoll FLOOR, WALL, WALL, PIT ; 43
+	tilecoll WALL, FLOOR, WALL, WALL ; 44
+	tilecoll FLOOR, WALL, WALL, WALL ; 45
+	tilecoll WALL, WALL, FLOOR, WALL ; 46
+	tilecoll WALL, WALL, WALL, FLOOR ; 47
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 48
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 49
+	tilecoll WALL, FLOOR, WALL, WALL ; 4a
+	tilecoll WALL, WALL, WALL, WALL ; 4b
+	tilecoll FLOOR, WALL, WALL, WALL ; 4c
+	tilecoll FLOOR, PIT, FLOOR, FLOOR ; 4d
+	tilecoll FLOOR, PIT, WALL, WALL ; 4e
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 4f
+	tilecoll WALL, FLOOR, WALL, WALL ; 50
+	tilecoll WALL, WALL, WALL, WALL ; 51
+	tilecoll WALL, WALL, FLOOR, PIT ; 52
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 53
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 54
+	tilecoll WALL, WALL, WALL, WALL ; 55
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 56
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 57
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 58
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 59
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5a
+	tilecoll PIT, WALL, WALL, WALL ; 5b
+	tilecoll WALL, FLOOR, FLOOR, WALL ; 5c
+	tilecoll FLOOR, PIT, WALL, PIT ; 5d
+	tilecoll PIT, FLOOR, WALL, WALL ; 5e
 	tilecoll WALL, WALL, FLOOR, WALL ; 5f
-	tilecoll WALL, WALL, WALL, WALL ; 60
-	tilecoll WALL, WALL, WALL, WALL ; 61
-	tilecoll FLOOR, WALL, WALL, WALL ; 62
-	tilecoll WALL, WALL, FLOOR, WALL ; 63
-	tilecoll WALL, WALL, WALL, FLOOR ; 64
-	tilecoll FLOOR, WALL, WALL, FLOOR ; 65
-	tilecoll WALL, FLOOR, FLOOR, WALL ; 66
-	tilecoll WALL, FLOOR, WALL, WALL ; 67
-	tilecoll FLOOR, WALL, WALL, WALL ; 68
-	tilecoll WALL, WALL, WALL, FLOOR ; 69
-	tilecoll WALL, WALL, FLOOR, WALL ; 6a
-	tilecoll WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 60
+	tilecoll FLOOR, PIT, WALL, WALL ; 61
+	tilecoll PIT, FLOOR, WALL, WALL ; 62
+	tilecoll WALL, FLOOR, WALL, WALL ; 63
+	tilecoll WALL, WALL, WALL, WALL ; 64
+	tilecoll WALL, WALL, FLOOR, WALL ; 65
+	tilecoll WALL, WALL, WALL, WALL ; 66
+	tilecoll WALL, WALL, FLOOR, WALL ; 67
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 68
+	tilecoll WALL, WALL, WALL, WALL ; 69
+	tilecoll WALL, WALL, WALL, WALL ; 6a
+	tilecoll WALL, WALL, WALL, WALL ; 6b
 	tilecoll WALL, WALL, WALL, WALL ; 6c
 	tilecoll WALL, WALL, WALL, WALL ; 6d
 	tilecoll WALL, WALL, WALL, WALL ; 6e

data/tilesets/nihon_old_collision.asm

@@ -60,6 +60,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 3b
 	tilecoll WALL, WALL, WALL, WALL ; 3c
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d
-	tilecoll DOOR, WALL, WALL, WALL ; 3e
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
 	tilecoll WALL, WALL, FLOOR, WALL ; 40
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41

data/tilesets/tower_collision.asm

@@ -64,17 +64,28 @@
 	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 40
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 43
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 44
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 45
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 46
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 42
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 43
+	tilecoll WALL, WALL, FLOOR, WALL ; 44
+	tilecoll WALL, WALL, WALL, FLOOR ; 45
+	tilecoll WALL, WALL, FLOOR, WALL ; 46
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 47
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 48
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 49
+	tilecoll WALL, WALL, FLOOR, WALL ; 49
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 4a
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 4b
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4c
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d
 	tilecoll WALL, WALL, FLOOR, WALL ; 4e
 	tilecoll WALL, WALL, WALL, FLOOR ; 4f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 50
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 51
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 52
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 53
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 54
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 55
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 56
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 57
+	tilecoll WALL, WALL, FLOOR, WALL ; 58
+	tilecoll WALL, WALL, LADDER, FLOOR ; 59
+	tilecoll WALL, WALL, LADDER, FLOOR ; 5a

data/tilesets/tower_metatiles.bin

@@ -1,4 +1,4 @@
 
































@ !!A1A1!!!!!!@ A1A1
 A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?
,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^



"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^

		
 GHWX
-GHWXFVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67















































DETU!!!!PPPPPPPPFVGW0123!!4501!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^

!!^^

!!!!!!!!!!!!!!!!
+GHWXFVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67















































DETU!!!!PPPPPPPPFVGW0123!!4501!!2345EFUV55EFUV55IJ]]YZMM55NO^_]]MM!!NO^_KL]][\MM55NO^_KL!![\556789!!5501]]23MM45NO^_!!^^

!!^^

!!!!!!!!!!!!!!!! !!!$%:;!#%'NO^_<=]]>?MM5567<=89>?5555]]]]MMMM]]!!MM]]MM!!]]]]MMMMNO^_]]]]MMMM
]]]]MMMM

data/trainers/attributes.asm

@@ -549,4 +549,10 @@ TrainerClassAttributes:
 	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
 	dw CONTEXT_USE | SWITCH_SOMETIMES
 
+; Elder
+	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

@@ -92,4 +92,5 @@ TrainerClassNames::
 	li "EXECUTIVE"
 	li "EXECUTIVE"
 	li "PROFESSOR"
+	li "ELDER"
 	assert_list_length NUM_TRAINER_CLASSES

data/trainers/dvs.asm

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

data/trainers/encounter_music.asm

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

data/trainers/gendered_trainers.asm

@@ -36,6 +36,7 @@ MaleTrainers:
 	db SOLDIER
 	db SPORTSMAN
 	db AEROFOSSIL
+	db ELDER
 .End
 
 FemaleTrainers:

data/trainers/genders.asm

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

data/trainers/palettes.asm

@@ -101,6 +101,7 @@ 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
 
 EnbyPalette:
 INCLUDE "gfx/player/topaz.pal"

data/trainers/parties.asm

@@ -4876,6 +4876,7 @@ ExecutiveFGroup: ; Ariana
 
 	end_list_items
 
+; Often seen with Hoothoot in media, so there's a few scattered around for variety.
 SageGroup:
 	next_list_item ; SAGE (1)
 	db "CHOW@", TRAINERTYPE_NORMAL
@@ -4894,13 +4895,13 @@ SageGroup:
 	db 3
 	dw BELLSPROUT
 	db 3
-	dw BELLSPROUT
+	dw HOOTHOOT
 	db -1 ; end
 
 	next_list_item ; SAGE (3)
 	db "JIN@", TRAINERTYPE_NORMAL
 	db 6
-	dw BELLSPROUT
+	dw HOOTHOOT
 	db -1 ; end
 
 	next_list_item ; SAGE (4)
@@ -4947,16 +4948,9 @@ SageGroup:
 	dw BELLSPROUT
 	db -1 ; end
 
-	next_list_item ; SAGE (9)
-	db "LI@", TRAINERTYPE_MOVES
-	db 10
-	dw BELLIGNAN
-	dw FLASH, VINE_WHIP, GROWTH, WRAP
-	db -1 ; end
-
 ; So these sages are in the Dragon's Den but end up being the Kimono Girls but again.
 ; Let's give them the Eeveelutions the Kimono Girls don't have!
-	next_list_item ; SAGE (10)
+	next_list_item ; SAGE (9)
 	db "GAKU@", TRAINERTYPE_NORMAL
 	db 42
 	dw NOCTOWL
@@ -4964,7 +4958,7 @@ SageGroup:
 	dw LEAFEON
 	db -1 ; end
 
-	next_list_item ; SAGE (11)
+	next_list_item ; SAGE (10)
 	db "MASA@", TRAINERTYPE_NORMAL
 	db 42
 	dw NOCTOWL
@@ -4972,7 +4966,7 @@ SageGroup:
 	dw GLACEON
 	db -1 ; end
 
-	next_list_item ; SAGE (12)
+	next_list_item ; SAGE (11)
 	db "KOJI@", TRAINERTYPE_NORMAL
 	db 42
 	dw NOCTOWL
@@ -4980,6 +4974,63 @@ SageGroup:
 	dw SYLVEON
 	db -1 ; end
 	
+	; Pokemon Pagoda Sages
+	; 3F
+	next_list_item ; SAGE (12)
+	db "MING@", TRAINERTYPE_NORMAL ; double-references this one super old clam that lived since the ming dynasty and aptly received it as an epithet before dying to trawlers. Since it's the Tentacruel floor, it felt very fitting! https://en.wikipedia.org/wiki/Ming_(clam)
+	db 50
+	dw CLOYSTER
+	db 50
+	dw TENTACRUEL
+	db -1 ; end
+	
+	next_list_item ; SAGE (13)
+	db "WEI@", TRAINERTYPE_NORMAL
+	db 50
+	dw TENTACRUEL
+	db -1 ; end
+	
+	next_list_item ; SAGE (14)
+	db "LANG@", TRAINERTYPE_NORMAL
+	db 50
+	dw TENTACRUEL
+	db -1 ; end
+	
+	next_list_item ; SAGE (15)
+	db "HUANG@", TRAINERTYPE_NORMAL
+	db 50
+	dw NOCTOWL
+	db 50
+	dw TENTACRUEL
+	db -1 ; end
+	
+	; 4F
+	next_list_item ; SAGE (16)
+	db "GEN@", TRAINERTYPE_NORMAL
+	db 50
+	dw FEAROW
+	db -1 ; end
+	
+	next_list_item ; SAGE (17)
+	db "RAOH@", TRAINERTYPE_NORMAL
+	db 50
+	dw FEAROW
+	db -1 ; end
+	
+	next_list_item ; SAGE (18)
+	db "SHUU@", TRAINERTYPE_NORMAL
+	db 50
+	dw FEAROW
+	db -1 ; end
+	
+	next_list_item ; SAGE (19)
+	db "SHENG@", TRAINERTYPE_NORMAL
+	db 50
+	dw NOCTOWL
+	db 50
+	dw FEAROW
+	db -1 ; end
+	
 	end_list_items
 
 MediumGroup:
@@ -5000,21 +5051,23 @@ MediumGroup:
 	db -1 ; end
 
 	next_list_item ; MEDIUM (3)
-	db "BETHANY@", TRAINERTYPE_NORMAL ; Unused?
-	db 25
-	dw HAUNTER
+	db "BETHANY@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
+	db 50
+	dw WISPIRIT
 	db -1 ; end
 
 	next_list_item ; MEDIUM (4)
-	db "MARGRET@", TRAINERTYPE_NORMAL ; unused
-	db 25
-	dw HAUNTER
+	db "MARGRET@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
+	db 50
+	dw STROMEN
+	db 50
+	dw PHANDARIN
 	db -1 ; end
 
 	next_list_item ; MEDIUM (5)
-	db "ETHEL@", TRAINERTYPE_NORMAL ; unused
-	db 25
-	dw HAUNTER
+	db "ETHEL@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
+	db 50
+	dw KITSEN
 	db -1 ; end
 
 	next_list_item ; MEDIUM (6)
@@ -5033,6 +5086,12 @@ MediumGroup:
 	dw SLOWBRO
 	db -1 ; end
 	
+	next_list_item ; MEDIUM (8)
+	db "ELSIE@", TRAINERTYPE_NORMAL ; Pagoda 2F Medium
+	db 50
+	dw WISPIRIT
+	db -1 ; end
+	
 	end_list_items
 
 BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam.
@@ -5263,100 +5322,6 @@ KimonoGirlGroup:
 
 	end_list_items
 
-; No rematches here, just a lot of unused dupes.
-; Potential alt usage? rename a few?
-; See spreadsheet for combinations.
-TwinsGroup:
-	next_list_item ; TWINS (1)
-	db "AMY & MAY@", TRAINERTYPE_NORMAL
-	db 10
-	dw SPINARAK
-	db 10
-	dw LEDYBA
-	db -1 ; end
-
-	next_list_item ; TWINS (2)
-	db "ANN & ANNE@", TRAINERTYPE_MOVES
-	db 16
-	dw CLEFAIRY
-	dw GROWL, ENCORE, DOUBLESLAP, METRONOME
-	db 16
-	dw JIGGLYPUFF
-	dw SING, DEFENSE_CURL, POUND, DISABLE
-	db -1 ; end
-
-	next_list_item ; TWINS (3)
-	db "ANN & ANNE@", TRAINERTYPE_MOVES
-	db 16
-	dw JIGGLYPUFF
-	dw SING, DEFENSE_CURL, POUND, DISABLE
-	db 16
-	dw CLEFAIRY
-	dw GROWL, ENCORE, DOUBLESLAP, METRONOME
-	db -1 ; end
-
-	next_list_item ; TWINS (4)
-	db "AMY & MAY@", TRAINERTYPE_NORMAL
-	db 10
-	dw LEDYBA
-	db 10
-	dw SPINARAK
-	db -1 ; end
-
-	next_list_item ; TWINS (5)
-	db "JO & ZOE@", TRAINERTYPE_NORMAL
-	db 35
-	dw VICTREEBEL
-	db 35
-	dw VILEPLUME
-	db -1 ; end
-
-	next_list_item ; TWINS (6)
-	db "JO & ZOE@", TRAINERTYPE_NORMAL
-	db 35
-	dw VILEPLUME
-	db 35
-	dw VICTREEBEL
-	db -1 ; end
-
-	next_list_item ; TWINS (7)
-	db "MEG & PEG@", TRAINERTYPE_NORMAL
-	db 31
-	dw TEDDIURSA
-	db 31
-	dw PHANPY
-	db -1 ; end
-
-	next_list_item ; TWINS (8)
-	db "MEG & PEG@", TRAINERTYPE_NORMAL
-	db 31
-	dw PHANPY
-	db 31
-	dw TEDDIURSA
-	db -1 ; end
-
-	next_list_item ; TWINS (9)
-	db "LEA & PIA@", TRAINERTYPE_MOVES
-	db 35
-	dw DRATINI
-	dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
-	db 35
-	dw DRATINI
-	dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
-	db -1 ; end
-
-	next_list_item ; TWINS (10)
-	db "LEA & PIA@", TRAINERTYPE_MOVES
-	db 38
-	dw DRATINI
-	dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
-	db 38
-	dw DRATINI
-	dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
-	db -1 ; end
-
-	end_list_items
-
 ; Added this to make room for more stuff. 
 ; Yeah, they filled trainers to max capacity originally. Pretty impressive.
 SECTION "Enemy Trainer Parties 3", ROMX

data/trainers/parties_new_classes.asm

@@ -672,3 +672,125 @@ ProfBlueGroup:
 	dw THUNDERBOLT, CROSS_CHOP, EARTHQUAKE, THIEF
 	db -1 ; end
 	end_list_items
+
+ElderGroup:
+	next_list_item ; originally SAGE (9), now adapted from HGSS
+	db "LI@", TRAINERTYPE_MOVES
+	db 10
+	dw BELLIGNAN
+	dw FLASH, VINE_WHIP, GROWTH, WRAP
+	db -1 ; end
+	
+	; Intended to be just before you fight Shi-Shi (potentially)
+	db "ROEN@", TRAINERTYPE_MOVES ; from Roen, an esteemed priest from The Five-Storied Pagoda by Koda Rohan.
+	db 65
+	dw FEAROW
+	dw DOUBLE_EDGE, DRILL_PECK, MIRROR_MOVE, AGILITY
+	db 65
+	dw TENTACRUEL
+	dw SURF, DOUBLE_EDGE, SLUDGE_BOMB, SWORDS_DANCE
+	db 65
+	dw ALAKAZAM
+	dw PSYCHIC_M, THUNDERPUNCH, FIRE_PUNCH, RECOVER
+	db 65
+	dw ARCANINE
+	dw FIRE_BLAST, BODY_SLAM, DIG, HIDDEN_POWER
+	db 65
+	dw GOROCHU
+	dw BELLY_DRUM, THUNDERBOLT, BODY_SLAM, SUBMISSION
+	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.
+TwinsGroup:
+	next_list_item ; TWINS (1)
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
+	db 10
+	dw SPINARAK
+	db 10
+	dw LEDYBA
+	db -1 ; end
+
+	next_list_item ; TWINS (2)
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16
+	dw CLEFAIRY
+	dw GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db 16
+	dw JIGGLYPUFF
+	dw SING, DEFENSE_CURL, POUND, DISABLE
+	db -1 ; end
+
+	next_list_item ; TWINS (3)
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16
+	dw JIGGLYPUFF
+	dw SING, DEFENSE_CURL, POUND, DISABLE
+	db 16
+	dw CLEFAIRY
+	dw GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db -1 ; end
+
+	next_list_item ; TWINS (4)
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
+	db 10
+	dw LEDYBA
+	db 10
+	dw SPINARAK
+	db -1 ; end
+
+	next_list_item ; TWINS (5)
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
+	db 35
+	dw VICTREEBEL
+	db 35
+	dw VILEPLUME
+	db -1 ; end
+
+	next_list_item ; TWINS (6)
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
+	db 35
+	dw VILEPLUME
+	db 35
+	dw VICTREEBEL
+	db -1 ; end
+
+	next_list_item ; TWINS (7)
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
+	db 31
+	dw TEDDIURSA
+	db 31
+	dw PHANPY
+	db -1 ; end
+
+	next_list_item ; TWINS (8)
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
+	db 31
+	dw PHANPY
+	db 31
+	dw TEDDIURSA
+	db -1 ; end
+
+	next_list_item ; TWINS (9)
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 35
+	dw DRATINI
+	dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db 35
+	dw DRATINI
+	dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db -1 ; end
+
+	next_list_item ; TWINS (10)
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 38
+	dw DRATINI
+	dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db 38
+	dw DRATINI
+	dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db -1 ; end
+
+	end_list_items

data/trainers/party_pointers.asm

@@ -94,4 +94,5 @@ TrainerGroups:
 	dba ArianaGroup
 	dba ArcherGroup
 	dba ProfBlueGroup
+	dba ElderGroup
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/pic_pointers.asm

@@ -94,4 +94,5 @@ TrainerPicPointers::
 	dba ArianaPic
 	dba ArcherPic
 	dba ProfBluePic
+	dba ElderPic
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/sprites.asm

@@ -92,4 +92,5 @@ BTTrainerClassSprites:
 	db SPRITE_RED		; Ariana
 	db SPRITE_RED		; Archer
 	db SPRITE_RED		; Prof.Blue
+	db SPRITE_SAGE		; ELDER
 	assert_table_length NUM_TRAINER_CLASSES

data/wild/kanto_grass.asm

@@ -930,6 +930,118 @@ KantoGrassWildMons:
 	dbw 42, GENGAR
 	end_grass_wildmons
 	
+	def_grass_wildmons LAVENDER_CRYPT_SET_1
+	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 33, GASTLY
+	dbw 36, GASTLY
+	dbw 32, HAUNTER
+	dbw 44, CUBONE
+	dbw 44, WISPIRIT
+	dbw 44, WISPIRIT
+	dbw 44, VULPIX
+	; day
+	dbw 32, GASTLY
+	dbw 34, GASTLY
+	dbw 38, HAUNTER
+	dbw 36, CUBONE
+	dbw 46, WISPIRIT
+	dbw 46, WISPIRIT
+	dbw 46, VULPIX
+	; nite
+	dbw 34, GASTLY
+	dbw 38, MISDREAVUS
+	dbw 36, HAUNTER
+	dbw 32, KITSEN
+	dbw 42, WISPIRIT
+	dbw 42, WISPIRIT
+	dbw 42, GENGAR
+	end_grass_wildmons
+	
+	def_grass_wildmons LAVENDER_CRYPT_SET_2
+	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 33, GASTLY
+	dbw 36, GASTLY
+	dbw 32, HAUNTER
+	dbw 44, CUBONE
+	dbw 44, WISPIRIT
+	dbw 44, WISPIRIT
+	dbw 44, NOCTOWL
+	; day
+	dbw 32, GASTLY
+	dbw 34, GASTLY
+	dbw 38, HAUNTER
+	dbw 36, CUBONE
+	dbw 46, WISPIRIT
+	dbw 46, WISPIRIT
+	dbw 46, NOCTOWL
+	; nite
+	dbw 34, GASTLY
+	dbw 38, MISDREAVUS
+	dbw 36, HAUNTER
+	dbw 32, KITSEN
+	dbw 42, WISPIRIT
+	dbw 42, WISPIRIT
+	dbw 42, GENGAR
+	end_grass_wildmons
+	
+	def_grass_wildmons LAVENDER_CRYPT_SET_3
+	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 33, GASTLY
+	dbw 36, GASTLY
+	dbw 32, HAUNTER
+	dbw 44, CUBONE
+	dbw 44, WISPIRIT
+	dbw 44, WISPIRIT
+	dbw 44, VULPIX
+	; day
+	dbw 32, GASTLY
+	dbw 34, GASTLY
+	dbw 38, HAUNTER
+	dbw 36, CUBONE
+	dbw 46, WISPIRIT
+	dbw 46, WISPIRIT
+	dbw 46, VULPIX
+	; nite
+	dbw 34, GASTLY
+	dbw 38, MISDREAVUS
+	dbw 36, HAUNTER
+	dbw 32, KITSEN
+	dbw 42, WISPIRIT
+	dbw 42, WISPIRIT
+	dbw 42, GENGAR
+	end_grass_wildmons
+	
+	def_grass_wildmons LAVENDER_CRYPT_DOKUROARS_ROOM
+	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 33, CUBONE
+	dbw 36, GASTLY
+	dbw 32, HAUNTER
+	dbw 44, CUBONE
+	dbw 44, WISPIRIT
+	dbw 44, WISPIRIT
+	dbw 44, MAROWAK
+	; day
+	dbw 32, CUBONE
+	dbw 34, GASTLY
+	dbw 38, HAUNTER
+	dbw 36, CUBONE
+	dbw 46, WISPIRIT
+	dbw 46, WISPIRIT
+	dbw 46, MAROWAK
+	; nite
+	dbw 34, CUBONE
+	dbw 38, MISDREAVUS
+	dbw 36, HAUNTER
+	dbw 32, KITSEN
+	dbw 42, WISPIRIT
+	dbw 42, WISPIRIT
+	dbw 42, GENGAR
+	end_grass_wildmons
+
 	def_grass_wildmons ALTERING_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn

engine/pokegear/pokegear.asm

@@ -764,7 +764,7 @@ TownMap_GetKantoLandmarkLimits:
 TownMap_GetNihonLandmarkLimits:
 	ld a, [wStatusFlags]
 	ld d, LANDMARK_SILENT_HILLS
-	ld e, LANDMARK_SILENT_HILLS ; Gonna need another map.
+	ld e, LANDMARK_WHITE_CITY ; Gonna need another map.
 	ret
 
 PokegearRadio_Init:
@@ -2375,12 +2375,12 @@ FlyMap:
 	call HasVisitedSpawn
 	and a
 	jr z, .NoKanto
-; Kanto's map is only loaded if we've visited Indigo Plateau
+; Nihon's map is only loaded if we've visited Silent Hills
 	ld a, NIHON_FLYPOINT ; first Nihon flypoint
 	ld [wStartFlypoint], a
 	ld a, NUM_FLYPOINTS - 1 ; last Nihon flypoint
 	ld [wEndFlypoint], a
-	ld [wTownMapPlayerIconLandmark], a ; last one is default (Indigo Plateau)
+	ld [wTownMapPlayerIconLandmark], a ; last one is default (Silent Hills)
 ; Fill out the map
 	call FillNihonMap
 	call .MapHud

gfx/pics.asm

@@ -742,18 +742,6 @@ TangrowthBackpic:    INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz"
 JungelaFrontpic:     INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz"
 JungelaBackpic:      INCBIN "gfx/pokemon/jungela/back.2bpp.lz"
 
-; RBY/unused trainer Pics
-ChannelerPic:        INCBIN "gfx/trainers/channeler.2bpp.lz"
-CueBallPic:        INCBIN "gfx/trainers/cue_ball.2bpp.lz"
-EngineerPic:        INCBIN "gfx/trainers/engineer.2bpp.lz"
-RockerPic:        INCBIN "gfx/trainers/rocker.2bpp.lz"
-TamerPic:        INCBIN "gfx/trainers/tamer.2bpp.lz"
-FirefighterPic:        INCBIN "gfx/trainers/firefighter.2bpp.lz"
-TeacherMPic:        INCBIN "gfx/trainers/teacherm.2bpp.lz"
-PainterPic:        INCBIN "gfx/trainers/painter.2bpp.lz"
-SoldierPic:        INCBIN "gfx/trainers/soldier.2bpp.lz"
-SportsmanPic:        INCBIN "gfx/trainers/sportsman.2bpp.lz"
-
 
 SECTION "Pics 20", ROMX
 
@@ -1045,3 +1033,18 @@ KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"
 ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz"
 ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz"
 ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz"
+ElderPic: INCBIN "gfx/trainers/elder.2bpp.lz"
+
+SECTION "Pics 26", ROMX
+
+; RBY/unused trainer Pics
+ChannelerPic:        INCBIN "gfx/trainers/channeler.2bpp.lz"
+CueBallPic:        INCBIN "gfx/trainers/cue_ball.2bpp.lz"
+EngineerPic:        INCBIN "gfx/trainers/engineer.2bpp.lz"
+RockerPic:        INCBIN "gfx/trainers/rocker.2bpp.lz"
+TamerPic:        INCBIN "gfx/trainers/tamer.2bpp.lz"
+FirefighterPic:        INCBIN "gfx/trainers/firefighter.2bpp.lz"
+TeacherMPic:        INCBIN "gfx/trainers/teacherm.2bpp.lz"
+PainterPic:        INCBIN "gfx/trainers/painter.2bpp.lz"
+SoldierPic:        INCBIN "gfx/trainers/soldier.2bpp.lz"
+SportsmanPic:        INCBIN "gfx/trainers/sportsman.2bpp.lz"

gfx/pokemon/bipulla/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 16, 17, 30
-	RGB 05, 07, 11
+	RGB 28, 00, 29
+	RGB 16, 09, 28

gfx/pokemon/calflac/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 31, 19, 00
+	RGB 16, 09, 28
+

gfx/pokemon/dudunsparce/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 31, 24, 06
+	RGB 31, 05, 21
+

gfx/pokemon/folage/anim.asm

@@ -1 +1,15 @@
+	frame  0, 08
+	frame  1, 15
+	frame  2, 08
+	frame  3, 15
+	frame  4, 08
+	frame  5, 08
+	frame  6, 08
+	frame  5, 08
+	frame  4, 08
+	frame  2, 08
+	frame  1, 08
+	frame  7, 08
+	frame  1, 08
+	frame  7, 08
 	endanim

gfx/pokemon/folage/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 31, 31, 05
+	RGB 28, 10, 05

gfx/pokemon/iron_bundle/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 18, 21, 30
+	RGB 15, 15, 16

gfx/pokemon/munchlax/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 27, 22, 11
+	RGB 09, 07, 31
+

gfx/pokemon/scream_tail/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 31, 17, 31
+	RGB 18, 06, 21

gfx/pokemon/stromen/anim.asm

@@ -1 +1,21 @@
+	frame 0, 06
+	frame 1, 06
+	frame 2, 12
+	frame 3, 06
+	frame 4, 12
+	frame 5, 06
+	frame 6, 04
+	frame 7, 10
+	frame 7, 06
+	frame 8, 10
+	frame 8, 06
+	frame 7, 10
+	frame 7, 06
+	frame 8, 10
+	frame 8, 06
+	frame 7, 10
+	frame 6, 08
+	frame 4, 08
+	frame 2, 08
+	frame 0, 06
 	endanim

gfx/pokemon/stromen/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 18, 15, 20
+	RGB 11, 08, 12

gfx/pokemon/terrados/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 25, 20, 08
+	RGB 27, 10, 05
+

gfx/pokemon/trebir/anim.asm

@@ -1 +1,15 @@
+	frame  0, 18
+	frame  1, 18
+	frame  2, 10
+	frame  3, 20
+	frame  4, 10
+	frame  5, 10
+	frame  6, 10
+	frame  7, 10
+	frame  8, 10
+	frame  9, 10
+	frame 10, 10
+	frame 11, 10
+	frame  1, 10
+	frame 12, 18
 	endanim

gfx/pokemon/trebir/anim_idle.asm

@@ -1 +1,4 @@
+    frame  0, 18
+	frame  1, 18
+	frame 12, 18
 	endanim

gfx/pokemon/trebir/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 15, 18, 30
+	RGB 31, 06, 04

maps/DebugRoom.asm

@@ -238,7 +238,7 @@ DebugRoom_MapEvents:
 	warp_event  4,  9, PALLET_TOWN, 1 ; left lab/league warp
 	warp_event  5,  9, PALLET_TOWN, 1 ; right lab/league warp
 	warp_event 35, 17, OLD_CITY, 1 ; east warp
-	warp_event  5, 35, BLUE_FOREST, 1 ; southwest warp
+	warp_event  5, 35, LAVENDER_TOWN, 1 ; southwest warp
 	warp_event 19, 34, BLUE_FOREST, 1 ; southern warp
 	warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp
 	warp_event  5,  3, AZALEA_TOWN, 1

maps/LavenderCrypt.asm

@@ -10,6 +10,10 @@ LavenderCrypt_MapEvents:
 
 	def_warp_events
 	warp_event  2, 17, SOUL_HOUSE, 3
+	warp_event 15,  3, LAVENDER_CRYPT_SET_1, 1
+	warp_event  9,  1, LAVENDER_CRYPT_SET_2, 1
+	warp_event  3,  3, LAVENDER_CRYPT_SET_3, 1
+	warp_event  3,  3, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; Exit point for the room; goes through the pit.
 
 	def_coord_events