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

README.md

@@ -88,23 +88,25 @@ Additionally, there have been many wild encounter tweaks. View this document for
 - thornAvery (Programming)
 - pret et al (LOTS of [Tutorials](https://github.com/pret/pokecrystal/wiki) that we used to get this off the ground!)
 - Wiz (Nihon Pokemon names)
+- Nob Ogasawara (Many prototype Pokemon names)
 - Rezzo (GSC-specific advice)
 - Old Dance Jacket (GSC-specific advice)
 - Minamitoku (SW97 demo translation commentary [here](https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku))
 - ausma (KEP Developer, legacy)
 
 # Sprite Credits
-- Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, 
+- Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, 
 - Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
-- EyeDonutz: Walking Wake
 - nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer
+- 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
+- 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), Kazeppelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
 - SCMidna: Munchlax
-- Pokemon October et al: Bellignan, Caretorker, Inoshika, Bipulla, Sonegg, Kolta, Coinpur, Dodaerie, Bundra, Kiwooked, Koalyptus, Trebir
+- EyeDonutz: Walking Wake
+- SageDeoxys: (TBA)
 - Tom Wang: Gold/Chris running sprite
 - Seasick: Kris running sprite
 - Ferropexola/aforward9600: Time of day-based tileset palette code
 
-
 Original readme proceeding...
 # 16-bit index expansion for Crystal
 

constants/map_constants.asm

@@ -630,8 +630,9 @@ ENDM
 	map_const CALS_HOUSE_2F,                                5,  4 ; 12
 	map_const SINJOH_RUINS_EXTERIOR,					   10, 10 ; 13
 	map_const SINJOH_RUINS_INTERIOR,					   10, 10 ; 14
-	map_const ROUTE_49_OLD_CITY_GATE,						5,  4 ; 15
-	map_const BLUE_LAB,									   12, 10 ; 16
+	map_const ROUTE_49_OLD_CITY_GATE_1F,					5,  4 ; 15
+	map_const ROUTE_49_OLD_CITY_GATE_2F,					4,  3 ; 16
+	map_const BLUE_LAB,									   12, 10 ; 17
 	endgroup
 	
 	newgroup BLUE_FOREST                                          ; 36

constants/tileset_constants.asm

@@ -48,6 +48,7 @@
 	const TILESET_NIHON_WEST           ; 2E
 	const TILESET_LAVENDER_CRYPT	   ; 2F
 	const TILESET_BLUE_LAB			   ; 30
+	const TILESET_NIHON_GATE		   ; 31
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size

data/maps/attributes.asm

@@ -380,7 +380,7 @@ ENDM
 	connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0
 	
 	map_attributes Route49, ROUTE_49, $05, EAST | WEST
-	connection east, SilentHills, SILENT_HILLS, $05, 0
+	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
@@ -824,4 +824,5 @@ ENDM
 	map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
 	map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
 	map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0
-	map_attributes Route49OldCityGate, ROUTE_49_OLD_CITY_GATE, $00, 0
+	map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
+	map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0

data/maps/blocks.asm

@@ -1210,3 +1210,12 @@ UnnumberedRoute_Blocks:
 	
 BlueLab_Blocks:
 	INCBIN "maps/BlueLab.ablk"
+
+Route49OldCityGate1F_Blocks:
+	INCBIN "maps/NihonGateNorthSouth.ablk" ; 5, 4
+
+Route49OldCityGate2F_Blocks:
+	INCBIN "maps/NihonGate2F.ablk" ; 4, 3
+
+;InsertGateNameHere_Blocks:
+;	INCBIN "maps/NihonGateWestEast.ablk"

data/maps/maps.asm

@@ -687,7 +687,8 @@ MapGroup_SilentHills:
 	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 Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route49OldCityGate2F, TILESET_NIHON_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
 	

data/maps/scripts.asm

@@ -572,7 +572,8 @@ INCLUDE "maps/CanyonEntrance.asm"
 INCLUDE "maps/SevaultCanyon.asm"
 
 SECTION "Map Scripts 29", ROMX
-INCLUDE "maps/Route49OldCityGate.asm"
+INCLUDE "maps/Route49OldCityGate1F.asm"
+INCLUDE "maps/Route49OldCityGate2F.asm"
 INCLUDE "maps/WinnersPath.asm"
 INCLUDE "maps/WinnersPathOutside.asm"
 INCLUDE "maps/UnnumberedRoute.asm"

data/tilesets.asm

@@ -60,4 +60,5 @@ Tilesets::
 	tileset TilesetNihonWest
 	tileset TilesetLavenderCrypt
 	tileset TilesetBlueLab
+	tileset TilesetNihonGate
 	assert_table_length NUM_TILESETS + 1

data/tilesets/cave_collision.asm

@@ -88,3 +88,4 @@
 	tilecoll WALL, WALL, WALL, FLOOR ; 57
 	tilecoll FLOOR, WALL, FLOOR, WARP_CARPET_DOWN ; 58
 	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 59
+	tilecoll WALL, FLOOR, FLOOR, WARP_CARPET_DOWN ; 5a

data/tilesets/nihongate_collision.asm

@@ -0,0 +1,14 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d

data/trainers/parties.asm

@@ -381,25 +381,70 @@ Rival1Group:
 	end_list_items
 
 PokemonProfGroup:
+	next_list_item ; OAK (1)
+	db "OAK@", TRAINERTYPE_MOVES
+	db 60
+	dw KANGASKHAN
+	dw ATTRACT, DIZZY_PUNCH, EARTHQUAKE, SURF
+	db 60
+	dw VENUSAUR
+	dw SLEEP_POWDER, RAZOR_LEAF, SLUDGE_BOMB, SWORDS_DANCE
+	db 60
+	dw CHARIZARD
+	dw BELLY_DRUM, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
+	db 60
+	dw TOTARTLE
+	dw GIGA_DRAIN, HYDRO_PUMP, BODY_SLAM, ICE_BEAM
+	db 60
+	dw NIDOKING
+	dw EARTHQUAKE, ICE_BEAM, THUNDERBOLT, LOVELY_KISS
+	db 60
+	dw TAUROS
+	dw BODY_SLAM, HYPER_BEAM, EARTHQUAKE, BLIZZARD ; Iconic King of Gen 1 set to represent Oak's aging. 
+	db -1 ; end
+
+	end_list_items
 
 WillGroup:
 	next_list_item ; WILL (1)
 	db "WILL@", TRAINERTYPE_MOVES
 	db 40
 	dw XATU
-	dw QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db 41
 	dw JYNX
-	dw DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
+	dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
 	db 41
 	dw ESPEON
 	dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M
 	db 41
 	dw SLOWKING
-	dw CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
+	dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M
 	db 42
-	dw XATU ; FARIGIRAF
-	dw QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	dw FARIGIRAF
+	dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work
+	db -1 ; end
+	
+	next_list_item ; WILL (1)
+	db "WILL@", TRAINERTYPE_MOVES
+	db 65
+	dw XATU
+	dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	db 65
+	dw JYNX
+	dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
+	db 65
+	dw ESPEON
+	dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M
+	db 65
+	dw SLOWKING
+	dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M
+	db 65
+	dw WYRDEER
+	dw SWAGGER, STOMP, PSYCH_UP, PSYCHIC_M ; Check how Return/Frustration work
+	db 65
+	dw FARIGIRAF
+	dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work
 	db -1 ; end
 
 	end_list_items
@@ -441,8 +486,8 @@ BrunoGroup:
 	next_list_item ; BRUNO (1)
 	db "BRUNO@", TRAINERTYPE_MOVES
 	db 42
-	dw HITMONTOP
-	dw PURSUIT, QUICK_ATTACK, DIG, DETECT
+	dw JABETTA
+	dw JUMP_KICK, HYDRO_PUMP, MEDITATE, DRILL_PECK
 	db 42
 	dw HITMONLEE
 	dw SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
@@ -456,7 +501,29 @@ BrunoGroup:
 	dw MACHAMP
 	dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
-
+	
+	next_list_item ; BRUNO (1)
+	db "BRUNO@", TRAINERTYPE_MOVES
+	db 65
+	dw JABETTA
+	dw JUMP_KICK, HYDRO_PUMP, MEDITATE, DRILL_PECK
+	db 65
+	dw HITMONLEE
+	dw SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
+	db 65
+	dw HITMONCHAN
+	dw MEGA_PUNCH, ICE_PUNCH, COUNTER, MACH_PUNCH
+	db 65
+	dw HERACROSS
+	dw MEGAHORN, ENDURE, REVERSAL, FLAIL
+	db 65
+	dw STEELIX
+	dw IRON_TAIL, EARTHQUAKE, EXPLOSION, ROCK_HEAD
+	db 65
+	dw MACHAMP
+	dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
+	db -1 ; end
+	
 	end_list_items
 
 KarenGroup:
@@ -468,11 +535,8 @@ KarenGroup:
 	db 42
 	dw BELLEDAM
 	dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT
-	db 45
-	dw WARUCHU
-	dw PURSUIT, THUNDERBOLT, THUNDER_WAVE, CRUNCH
 	db 44
-	dw MURKROW ; HONCHKROW
+	dw HONCHKROW
 	dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
 	db 47
 	dw HOUNDOOM
@@ -481,6 +545,28 @@ KarenGroup:
 	dw TYRANITAR
 	dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH
 	db -1 ; end
+	
+	next_list_item ; KAREN (1)
+	db "KAREN@", TRAINERTYPE_MOVES
+	db 65
+	dw UMBREON
+	dw SAND_ATTACK, CONFUSE_RAY, PURSUIT, MEAN_LOOK
+	db 65
+	dw BELLEDAM
+	dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT
+	db 65
+	dw WARUCHU
+	dw PURSUIT, THUNDERBOLT, THUNDER_WAVE, CRUNCH
+	db 65
+	dw HONCHKROW
+	dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
+	db 65
+	dw HOUNDOOM
+	dw ROAR, PURSUIT, FLAMETHROWER, CRUNCH
+	db 65
+	dw TYRANITAR
+	dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH
+	db -1 ; end
 
 	end_list_items
 
@@ -488,14 +574,14 @@ KogaGroup:
 	next_list_item ; KOGA (1)
 	db "KOGA@", TRAINERTYPE_MOVES
 	db 43
-	dw FORRETRESS
-	dw PROTECT, SWIFT, EXPLOSION, SPIKES
+	dw QWILFATHER
+	dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE
 	db 40
 	dw ARIADOS
-	dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
+	dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY
 	db 41
 	dw VENOMOTH
-	dw SUPERSONIC, GUST, PSYCHIC_M, TOXIC
+	dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC
 	db 42
 	dw MUK
 	dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
@@ -503,6 +589,28 @@ KogaGroup:
 	dw CROBAT
 	dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
+	
+	next_list_item ; KOGA (1)
+	db "KOGA@", TRAINERTYPE_MOVES
+	db 65
+	dw QWILFATHER
+	dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE
+	db 65
+	dw ARIADOS
+	dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY
+	db 65
+	dw LICKILORD
+	dw SWAGGER, PSYCH_UP, BODY_SLAM, EARTHQUAKE
+	db 65
+	dw VENOMOTH
+	dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC
+	db 65
+	dw MUK
+	dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
+	db 65
+	dw CROBAT
+	dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
+	db -1 ; end
 
 	end_list_items
 
@@ -511,44 +619,69 @@ ChampionGroup:
 	db "LANCE@", TRAINERTYPE_MOVES
 	db 44
 	dw GYARADOS
-	dw FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
+	dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM
 	db 47
-	dw DRAGONITE
-	dw THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
+	dw CHARIZARD
+	dw ROCK_SLIDE, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM
 	db 47
-	dw DRAGONITE
-	dw THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
+	dw GAVILLAIN
+	dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM
 	db 46
 	dw AERODACTYL
-	dw WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
+	dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM ; Now legal!
 	db 46
-	dw CHARIZARD
-	dw FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
+	dw IGUANARCH
+	dw DRAGONBREATH, GLARE, THUNDERBOLT, HYPER_BEAM
 	db 50
 	dw DRAGONITE
 	dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
+	
+	next_list_item ; CHAMPION (1)
+	db "LANCE@", TRAINERTYPE_MOVES
+	db 70
+	dw GYARADOS
+	dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM
+	db 70
+	dw CHARIZARD
+	dw BELLY_DRUM, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM
+	db 70
+	dw GAVILLAIN
+	dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM
+	db 70
+	dw AERODACTYL
+	dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM
+	db 70
+	dw IGUANARCH
+	dw DRAGONBREATH, GLARE, THUNDERBOLT, HYPER_BEAM
+	db 70
+	dw DRAGONITE
+	dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
+	db -1 ; end
 
 	end_list_items
 
 BrockGroup:
 	next_list_item ; BROCK (1)
 	db "BROCK@", TRAINERTYPE_MOVES
-	db 41
-	dw GRAVELER
+	db 60
+	dw GOLEM
 	dw DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
-	db 41
-	dw RHYHORN
-	dw FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
-	db 42
+	db 60
+	dw SUDOWOODO
+	dw MIMIC, ROCK_SLIDE, EARTHQUAKE, SELFDESTRUCT
+	db 60
 	dw OMASTAR
-	dw BITE, SURF, PROTECT, SPIKE_CANNON
-	db 44
-	dw ONIX
-	dw BIND, ROCK_SLIDE, BIDE, SANDSTORM
-	db 42
+	dw BITE, SURF, PROTECT, ICE_BEAM
+	db 60
 	dw KABUTOPS
-	dw SLASH, SURF, ENDURE, GIGA_DRAIN
+	dw SWORDS_DANCE, ANCIENTPOWER, SURF, GIGA_DRAIN
+	db 60
+	dw AERODACTYL
+	dw EARTHQUAKE, ANCIENTPOWER, WING_ATTACK, STEEL_WING
+	db 60
+	dw STEELIX
+	dw IRON_TAIL, EARTHQUAKE, SANDSTORM, FISSURE ; No Explosion, it's his last Pokemon!
 	db -1 ; end
 
 	end_list_items
@@ -556,16 +689,22 @@ BrockGroup:
 MistyGroup:
 	next_list_item ; MISTY (1)
 	db "MISTY@", TRAINERTYPE_MOVES
-	db 42
-	dw GOLDUCK
-	dw SURF, DISABLE, PSYCH_UP, PSYCHIC_M
-	db 42
+	db 60
+	dw POLITOED
+	dw SURF, HYPNOSIS, PERISH_SONG, WHIRLPOOL
+	db 60
 	dw QUAGSIRE
-	dw SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
-	db 44
-	dw LAPRAS
-	dw SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
-	db 47
+	dw BELLY_DRUM, BODY_SLAM, EARTHQUAKE, ANCIENTPOWER
+	db 60
+	dw GRENMAR
+	dw HYDRO_PUMP, FIRE_BLAST, ENCORE, HEADBUTT
+	db 60
+	dw LANTURN
+	dw SURF, CONFUSE_RAY, THUNDERBOLT, ICE_BEAM
+	db 60
+	dw GOLDUCK
+	dw SURF, PSYCHIC_M, BODY_SLAM, ICE_BEAM
+	db 60
 	dw STARMIE
 	dw SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
@@ -575,21 +714,24 @@ MistyGroup:
 LtSurgeGroup:
 	next_list_item ; LT_SURGE (1)
 	db "LT.SURGE@", TRAINERTYPE_MOVES
-	db 44
-	dw RAICHU
-	dw THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
-	db 40
+	db 60
 	dw ELECTRODE
-	dw SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
-	db 40
-	dw MAGNETON
-	dw LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
-	db 40
-	dw ELECTRODE
-	dw SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
-	db 46
-	dw ELECTABUZZ
-	dw QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
+	dw EXPLOSION, THUNDERBOLT, THUNDER_WAVE, MIRROR_COAT
+	db 60
+	dw KAZEPPELIN
+	dw HYDRO_PUMP, PIN_MISSILE, THUNDERBOLT, MINIMIZE
+	db 60
+	dw MAGNEZONE
+	dw THUNDERBOLT, THUNDER_WAVE, RAIN_DANCE, THUNDER
+	db 60
+	dw GOROTORA
+	dw BODY_SLAM, EARTHQUAKE, THUNDERBOLT, THUNDER_WAVE
+	db 60
+	dw ELECTIVIRE
+	dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT
+	db 60
+	dw RAICHU ; GOROCHU
+	dw BELLY_DRUM, THUNDERBOLT, BODY_SLAM, SUBMISSION
 	db -1 ; end
 
 	end_list_items
@@ -641,18 +783,24 @@ ScientistGroup:
 ErikaGroup:
 	next_list_item ; ERIKA (1)
 	db "ERIKA@", TRAINERTYPE_MOVES
-	db 42
-	dw TANGELA
-	dw VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
-	db 41
+	db 60
 	dw JUMPLUFF
-	dw MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
-	db 46
+	dw LEECH_SEED, ENCORE, GIGA_DRAIN, REFLECT
+	db 60
+	dw TOEDSCRUEL
+	dw SPORE, SWORDS_DANCE, EARTHQUAKE, DOUBLE_EDGE
+	db 60
+	dw SAKURAZE
+	dw SUNNY_DAY, SOLARBEAM, FIRE_BLAST, SYNTHESIS
+	db 60
 	dw VICTREEBEL
-	dw SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
-	db 46
-	dw BELLOSSOM
-	dw SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
+	dw SOLARBEAM, SLUDGE_BOMB, SWORDS_DANCE, SLEEP_POWDER
+	db 60
+	dw ELECTIVIRE ; TANGROWTH
+	dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT ; SLEEP_POWDER, SWORDS_DANCE, EARTHQUAKE, GIGA_DRAIN
+	db 60
+	dw BELLOSSOM ; GOROCHU
+	dw SLEEP_POWDER, SOLARBEAM, SUNNY_DAY, GIGA_DRAIN
 	db -1 ; end
 
 	end_list_items
@@ -1159,193 +1307,27 @@ BirdKeeperGroup:
 
 	end_list_items
 
-LassGroup:
-	next_list_item ; LASS (1)
-	db "CARRIE@", TRAINERTYPE_NORMAL
-	db 18
-	dw SNUBBULL
-	db -1 ; end
-
-	next_list_item ; LASS (2)
-	db "BRIDGET@", TRAINERTYPE_NORMAL
-	db 15
-	dw JIGGLYPUFF
-	db 15
-	dw JIGGLYPUFF
-	db 15
-	dw JIGGLYPUFF
-	db -1 ; end
-
-	next_list_item ; LASS (3)
-	db "ALICE@", TRAINERTYPE_NORMAL
-	db 30
-	dw GLOOM
-	db 34
-	dw ARBOK
-	db 30
-	dw GLOOM
-	db -1 ; end
-
-	next_list_item ; LASS (4)
-	db "KRISE@", TRAINERTYPE_NORMAL
-	db 12
-	dw ODDISH
-	db 15
-	dw CUBONE
-	db -1 ; end
-
-	next_list_item ; LASS (5)
-	db "CONNIE@", TRAINERTYPE_NORMAL
-	db 21
-	dw MARILL
-	db -1 ; end
-
-	next_list_item ; LASS (6)
-	db "LINDA@", TRAINERTYPE_NORMAL
-	db 30
-	dw BULBASAUR
-	db 32
-	dw IVYSAUR
-	db 34
-	dw VENUSAUR
-	db -1 ; end
-
-	next_list_item ; LASS (7)
-	db "LAURA@", TRAINERTYPE_NORMAL
-	db 28
-	dw GLOOM
-	db 31
-	dw PIDGEOTTO
-	db 31
-	dw BELLOSSOM
-	db -1 ; end
-
-	next_list_item ; LASS (8)
-	db "SHANNON@", TRAINERTYPE_NORMAL
-	db 29
-	dw PARAS
-	db 29
-	dw PARAS
-	db 32
-	dw PARASECT
-	db -1 ; end
-
-	next_list_item ; LASS (9)
-	db "MICHELLE@", TRAINERTYPE_NORMAL
-	db 32
-	dw SKIPLOOM
-	db 33
-	dw HOPPIP
-	db 34
-	dw JUMPLUFF
-	db -1 ; end
-
-	next_list_item ; LASS (10)
-	db "DANA@", TRAINERTYPE_MOVES
-	db 18
-	dw FLAAFFY
-	dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-	db 18
-	dw PSYDUCK
-	dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-	db -1 ; end
-
-	next_list_item ; LASS (11)
-	db "ELLEN@", TRAINERTYPE_NORMAL
-	db 30
-	dw WIGGLYTUFF
-	db 34
-	dw GRANBULL
-	db -1 ; end
-
-	next_list_item ; LASS (12)
-	db "CONNIE@", TRAINERTYPE_NORMAL
-	db 21
-	dw MARILL
-	db -1 ; end
-
-	next_list_item ; LASS (13)
-	db "CONNIE@", TRAINERTYPE_NORMAL
-	db 21
-	dw MARILL
-	db -1 ; end
-
-	next_list_item ; LASS (14)
-	db "DANA@", TRAINERTYPE_MOVES
-	db 21
-	dw FLAAFFY
-	dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-	db 21
-	dw PSYDUCK
-	dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-	db -1 ; end
-
-	next_list_item ; LASS (15)
-	db "DANA@", TRAINERTYPE_MOVES
-	db 29
-	dw PSYDUCK
-	dw SCRATCH, DISABLE, CONFUSION, SCREECH
-	db 29
-	dw AMPHAROS
-	dw TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
-	db -1 ; end
-
-	next_list_item ; LASS (16)
-	db "DANA@", TRAINERTYPE_MOVES
-	db 32
-	dw PSYDUCK
-	dw SCRATCH, DISABLE, CONFUSION, SCREECH
-	db 32
-	dw AMPHAROS
-	dw TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
-	db -1 ; end
-
-	next_list_item ; LASS (17)
-	db "DANA@", TRAINERTYPE_MOVES
-	db 36
-	dw AMPHAROS
-	dw SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
-	db 36
-	dw GOLDUCK
-	dw DISABLE, SURF, PSYCHIC_M, SCREECH
-	db -1 ; end
-	
-	next_list_item ; LASS (2)
-	db "IKUE@", TRAINERTYPE_ITEM_MOVES
-	db 43
-	dw NIDOQUEEN ; From the Yellow Lass
-	db NO_ITEM
-	db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT
-	db 43
-	dw GOROTORA ; Basically the beta Pikaclone counterpart, right?
-	db NO_ITEM
-	db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT
-	db 45
-	dw PIKACHU ; And a pipe bomb.
-	db LIGHT_BALL
-	db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
-	db -1 ; end
-
-	end_list_items
-
 JanineGroup:
 	next_list_item ; JANINE (1)
 	db "JANINE@", TRAINERTYPE_MOVES
-	db 36
-	dw CROBAT
-	dw SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
-	db 36
-	dw WEEZING
-	dw SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-	db 36
-	dw WEEZING
-	dw SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-	db 33
+	db 60
 	dw ARIADOS
-	dw SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
-	db 39
+	dw SPIDER_WEB, AGILITY, BATON_PASS, DOUBLE_TEAM
+	db 60
 	dw VENOMOTH
-	dw FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
+	dw SLEEP_POWDER, PSYCHIC_M, GIGA_DRAIN, STUN_SPORE
+	db 60
+	dw NIDOQUEEN
+	dw EARTHQUAKE, THUNDERBOLT, ICE_BEAM, BODY_SLAM
+	db 60
+	dw GENGAR
+	dw HYPNOSIS, THUNDERBOLT, PERISH_SONG, PSYCHIC_M
+	db 60
+	dw ELECTIVIRE ; CLODSIRE
+	dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT ; BELLY_DRUM, EARTHQUAKE, SPIKES, BODY_SLAM
+	db 60
+	dw BELLIGNAN ; GOROCHU
+	dw SLEEP_POWDER, SWORDS_DANCE, SLUDGE_BOMB, GIGA_DRAIN
 	db -1 ; end
 
 	end_list_items
@@ -2339,15 +2321,26 @@ TeacherGroup:
 SabrinaGroup:
 	next_list_item ; SABRINA (1)
 	db "SABRINA@", TRAINERTYPE_MOVES
-	db 46
+	db 60
+	dw ARIADOS ; MR_RIME
+	dw SPIDER_WEB, AGILITY, BATON_PASS, DOUBLE_TEAM ; REFLECT, LIGHT_SCREEN, PSYCHIC_M, ICE_BEAM
+	db 60
+	dw HYPNO
+	dw SWAGGER, PSYCH_UP, HEADBUTT, THUNDER_WAVE ; god this is hilarious
+	db 60
+	dw JYNX
+	dw LOVELY_KISS, PSYCHIC_M, ICE_BEAM, MEAN_LOOK
+	db 60
+	dw EXEGGUTOR
+	dw SLEEP_POWDER, GIGA_DRAIN, EXPLOSION, PSYCHIC_M
+	db 60
 	dw ESPEON
-	dw SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
-	db 46
-	dw MR__MIME
-	dw BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
-	db 48
+	dw PSYCHIC_M, MORNING_SUN, BITE, QUICK_ATTACK ; SYNCHRONIZE, keep Bite for Dark attacking options
+	db 60
 	dw ALAKAZAM
-	dw RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	dw PSYCHIC_M, RECOVER, FIRE_PUNCH, THUNDERPUNCH
+	db -1 ; end
+
 	db -1 ; end
 
 	end_list_items

data/trainers/parties_new_classes.asm

@@ -109,3 +109,172 @@ KabufossilGroup:
 	dw KABUTOPS
 	db -1 ; end
 	end_list_items
+
+LassGroup:
+	next_list_item ; LASS (1)
+	db "CARRIE@", TRAINERTYPE_NORMAL
+	db 18
+	dw SNUBBULL
+	db -1 ; end
+
+	next_list_item ; LASS (2)
+	db "BRIDGET@", TRAINERTYPE_NORMAL
+	db 15
+	dw JIGGLYPUFF
+	db 15
+	dw JIGGLYPUFF
+	db 15
+	dw JIGGLYPUFF
+	db -1 ; end
+
+	next_list_item ; LASS (3)
+	db "ALICE@", TRAINERTYPE_NORMAL
+	db 30
+	dw GLOOM
+	db 34
+	dw ARBOK
+	db 30
+	dw GLOOM
+	db -1 ; end
+
+	next_list_item ; LASS (4)
+	db "KRISE@", TRAINERTYPE_NORMAL
+	db 12
+	dw ODDISH
+	db 15
+	dw CUBONE
+	db -1 ; end
+
+	next_list_item ; LASS (5)
+	db "CONNIE@", TRAINERTYPE_NORMAL
+	db 21
+	dw MARILL
+	db -1 ; end
+
+	next_list_item ; LASS (6)
+	db "LINDA@", TRAINERTYPE_NORMAL
+	db 30
+	dw BULBASAUR
+	db 32
+	dw IVYSAUR
+	db 34
+	dw VENUSAUR
+	db -1 ; end
+
+	next_list_item ; LASS (7)
+	db "LAURA@", TRAINERTYPE_NORMAL
+	db 28
+	dw GLOOM
+	db 31
+	dw PIDGEOTTO
+	db 31
+	dw BELLOSSOM
+	db -1 ; end
+
+	next_list_item ; LASS (8)
+	db "SHANNON@", TRAINERTYPE_NORMAL
+	db 29
+	dw PARAS
+	db 29
+	dw PARAS
+	db 32
+	dw PARASECT
+	db -1 ; end
+
+	next_list_item ; LASS (9)
+	db "MICHELLE@", TRAINERTYPE_NORMAL
+	db 32
+	dw SKIPLOOM
+	db 33
+	dw HOPPIP
+	db 34
+	dw JUMPLUFF
+	db -1 ; end
+
+	next_list_item ; LASS (10)
+	db "DANA@", TRAINERTYPE_MOVES
+	db 18
+	dw FLAAFFY
+	dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 18
+	dw PSYDUCK
+	dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db -1 ; end
+
+	next_list_item ; LASS (11)
+	db "ELLEN@", TRAINERTYPE_NORMAL
+	db 30
+	dw WIGGLYTUFF
+	db 34
+	dw GRANBULL
+	db -1 ; end
+
+	next_list_item ; LASS (12)
+	db "CONNIE@", TRAINERTYPE_NORMAL
+	db 21
+	dw MARILL
+	db -1 ; end
+
+	next_list_item ; LASS (13)
+	db "CONNIE@", TRAINERTYPE_NORMAL
+	db 21
+	dw MARILL
+	db -1 ; end
+
+	next_list_item ; LASS (14)
+	db "DANA@", TRAINERTYPE_MOVES
+	db 21
+	dw FLAAFFY
+	dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 21
+	dw PSYDUCK
+	dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db -1 ; end
+
+	next_list_item ; LASS (15)
+	db "DANA@", TRAINERTYPE_MOVES
+	db 29
+	dw PSYDUCK
+	dw SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 29
+	dw AMPHAROS
+	dw TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
+	db -1 ; end
+
+	next_list_item ; LASS (16)
+	db "DANA@", TRAINERTYPE_MOVES
+	db 32
+	dw PSYDUCK
+	dw SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 32
+	dw AMPHAROS
+	dw TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db -1 ; end
+
+	next_list_item ; LASS (17)
+	db "DANA@", TRAINERTYPE_MOVES
+	db 36
+	dw AMPHAROS
+	dw SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db 36
+	dw GOLDUCK
+	dw DISABLE, SURF, PSYCHIC_M, SCREECH
+	db -1 ; end
+	
+	next_list_item ; LASS (2)
+	db "IKUE@", TRAINERTYPE_ITEM_MOVES
+	db 43
+	dw NIDOQUEEN ; From the Yellow Lass
+	db NO_ITEM
+	db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT
+	db 43
+	dw GOROTORA ; Basically the beta Pikaclone counterpart, right?
+	db NO_ITEM
+	db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT
+	db 45
+	dw PIKACHU ; And a pipe bomb.
+	db LIGHT_BALL
+	db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
+	db -1 ; end
+
+	end_list_items

engine/tilesets/tileset_anims.asm

@@ -319,6 +319,7 @@ TilesetAerodactylWordRoomAnim:
 TilesetMuseumAnim:
 TilesetLavenderCryptAnim:
 TilesetBlueLabAnim:
+TilesetNihonGateAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation

gfx/pics.asm

@@ -741,18 +741,19 @@ TangrowthFrontpic:   INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz"
 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"
-MoibelleFrontpic:    INCBIN "gfx/pokemon/moibelle/front.animated.2bpp.lz"
-MoibelleBackpic:     INCBIN "gfx/pokemon/moibelle/back.2bpp.lz"
-BelledamFrontpic:    INCBIN "gfx/pokemon/belledam/front.animated.2bpp.lz"
-BelledamBackpic:     INCBIN "gfx/pokemon/belledam/back.2bpp.lz"
-AercrowFrontpic:     INCBIN "gfx/pokemon/aercrow/front.animated.2bpp.lz"
-AercrowBackpic:      INCBIN "gfx/pokemon/aercrow/back.2bpp.lz"
-MismagiusFrontpic:   INCBIN "gfx/pokemon/mismagius/front.animated.2bpp.lz"
-MismagiusBackpic:    INCBIN "gfx/pokemon/mismagius/back.2bpp.lz"
-StromenFrontpic:     INCBIN "gfx/pokemon/stromen/front.animated.2bpp.lz"
-StromenBackpic:      INCBIN "gfx/pokemon/stromen/back.2bpp.lz"
-PhandarinFrontpic:   INCBIN "gfx/pokemon/phandarin/front.animated.2bpp.lz"
-PhandarinBackpic:    INCBIN "gfx/pokemon/phandarin/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
 
@@ -786,24 +787,6 @@ PupalFrontpic:	 INCBIN "gfx/pokemon/pupal/front.animated.2bpp.lz"
 PupalBackpic:	 INCBIN "gfx/pokemon/pupal/back.2bpp.lz"
 CarapthorFrontpic:	 INCBIN "gfx/pokemon/carapthor/front.animated.2bpp.lz"
 CarapthorBackpic:	 INCBIN "gfx/pokemon/carapthor/back.2bpp.lz"
-KotoraFrontpic:	 INCBIN "gfx/pokemon/kotora/front.animated.2bpp.lz"
-KotoraBackpic:	 INCBIN "gfx/pokemon/kotora/back.2bpp.lz"
-GaotoraFrontpic:	 INCBIN "gfx/pokemon/gaotora/front.animated.2bpp.lz"
-GaotoraBackpic:	 INCBIN "gfx/pokemon/gaotora/back.2bpp.lz"
-GorotoraFrontpic:	 INCBIN "gfx/pokemon/gorotora/front.animated.2bpp.lz"
-GorotoraBackpic:	 INCBIN "gfx/pokemon/gorotora/back.2bpp.lz"
-RaitoraFrontpic:	 INCBIN "gfx/pokemon/raitora/front.animated.2bpp.lz"
-RaitoraBackpic:	 INCBIN "gfx/pokemon/raitora/back.2bpp.lz"
-BittybatFrontpic:	 INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz"
-BittybatBackpic:	 INCBIN "gfx/pokemon/bittybat/back.2bpp.lz"
-ParasporFrontpic:	 INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz"
-ParasporBackpic:	 INCBIN "gfx/pokemon/paraspor/back.2bpp.lz"
-VulpiiiFrontpic:	 INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz"
-VulpiiiBackpic:	 INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz"
-AnnihilapeFrontpic:	 INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz"
-AnnihilapeBackpic:	 INCBIN "gfx/pokemon/annihilape/back.2bpp.lz"
-PupperonFrontpic:	 INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz"
-PupperonBackpic:	 INCBIN "gfx/pokemon/pupperon/back.2bpp.lz"
 
 RagingBoltFrontpic: INCBIN "gfx/pokemon/raging_bolt/front.animated.2bpp.lz"
 RagingBoltBackpic:	 INCBIN "gfx/pokemon/raging_bolt/back.2bpp.lz"
@@ -847,42 +830,6 @@ KiwookedFrontpic:	 INCBIN "gfx/pokemon/kiwooked/front.animated.2bpp.lz"
 KiwookedBackpic::	 INCBIN "gfx/pokemon/kiwooked/back.2bpp.lz"
 CyclorpFrontpic:	 INCBIN "gfx/pokemon/cyclorp/front.animated.2bpp.lz"
 CyclorpBackpic:	 INCBIN "gfx/pokemon/cyclorp/back.2bpp.lz"
-KitsenFrontpic:	 INCBIN "gfx/pokemon/kitsen/front.animated.2bpp.lz"
-KitsenBackpic:	 INCBIN "gfx/pokemon/kitsen/back.2bpp.lz"
-WispiritFrontpic:	 INCBIN "gfx/pokemon/wispirit/front.animated.2bpp.lz"
-WispiritBackpic:	 INCBIN "gfx/pokemon/wispirit/back.2bpp.lz"
-CoatlFrontpic:	 INCBIN "gfx/pokemon/coatl/front.animated.2bpp.lz"
-CoatlBackpic:	 INCBIN "gfx/pokemon/coatl/back.2bpp.lz"
-MimearFrontpic:	 INCBIN "gfx/pokemon/mimear/front.animated.2bpp.lz"
-MimearBackpic:	 INCBIN "gfx/pokemon/mimear/back.2bpp.lz"
-InoshikaFrontpic:	 INCBIN "gfx/pokemon/inoshika/front.animated.2bpp.lz"
-InoshikaBackpic:	 INCBIN "gfx/pokemon/inoshika/back.2bpp.lz"
-RuddernautFrontpic:	 INCBIN "gfx/pokemon/ruddernaut/front.animated.2bpp.lz"
-RuddernautBackpic:	 INCBIN "gfx/pokemon/ruddernaut/back.2bpp.lz"
-XylodonFrontpic:	 INCBIN "gfx/pokemon/xylodon/front.animated.2bpp.lz"
-XylodonBackpic:	 INCBIN "gfx/pokemon/xylodon/back.2bpp.lz"
-XylofinFrontpic:	 INCBIN "gfx/pokemon/xylofin/front.animated.2bpp.lz"
-XylofinBackpic:	 INCBIN "gfx/pokemon/xylofin/back.2bpp.lz"
-DokuroarFrontpic:	 INCBIN "gfx/pokemon/dokuroar/front.animated.2bpp.lz"
-DokuroarBackpic:	 INCBIN "gfx/pokemon/dokuroar/back.2bpp.lz"
-ScreamTailFrontpic:	 INCBIN "gfx/pokemon/scream_tail/front.animated.2bpp.lz"
-ScreamTailBackpic:	 INCBIN "gfx/pokemon/scream_tail/back.2bpp.lz"
-SandyShocksFrontpic:	 INCBIN "gfx/pokemon/sandy_shocks/front.animated.2bpp.lz"
-SandyShocksBackpic:	 INCBIN "gfx/pokemon/sandy_shocks/back.2bpp.lz"
-GreatTuskFrontpic:	 INCBIN "gfx/pokemon/great_tusk/front.animated.2bpp.lz"
-GreatTuskBackpic:	 INCBIN "gfx/pokemon/great_tusk/back.2bpp.lz"
-FlutterManeFrontpic:	 INCBIN "gfx/pokemon/flutter_mane/front.animated.2bpp.lz"
-FlutterManeBackpic:	 INCBIN "gfx/pokemon/flutter_mane/back.2bpp.lz"
-IronTreadsFrontpic:	 INCBIN "gfx/pokemon/iron_treads/front.animated.2bpp.lz"
-IronTreadsBackpic:	 INCBIN "gfx/pokemon/iron_treads/back.2bpp.lz"
-IronBundleFrontpic:	 INCBIN "gfx/pokemon/iron_bundle/front.animated.2bpp.lz"
-IronBundleBackpic:	 INCBIN "gfx/pokemon/iron_bundle/back.2bpp.lz"
-IronThornsFrontpic:	 INCBIN "gfx/pokemon/iron_thorns/front.animated.2bpp.lz"
-IronThornsBackpic:	 INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
-OrfryFrontpic:	 INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
-OrfryBackpic:	 INCBIN "gfx/pokemon/orfry/back.2bpp.lz"
-TogekissFrontpic:	 INCBIN "gfx/pokemon/togekiss/front.animated.2bpp.lz"
-TogekissBackpic:	 INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"
 
 SECTION "Pics 22", ROMX
 CheepFrontpic:	     INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz"
@@ -931,20 +878,6 @@ MagipreyFrontpic:     INCBIN "gfx/pokemon/magiprey/front.animated.2bpp.lz"
 MagipreyBackpic:      INCBIN "gfx/pokemon/magiprey/back.2bpp.lz"
 TerradosFrontpic:     INCBIN "gfx/pokemon/terrados/front.animated.2bpp.lz"
 TerradosBackpic:      INCBIN "gfx/pokemon/terrados/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"
-
-; Back to your regularly scheduled makefile error 1
 ToedscoolFrontpic:	INCBIN "gfx/pokemon/toedscool/front.animated.2bpp.lz"
 ToedscoolBackpic:      INCBIN "gfx/pokemon/toedscool/back.2bpp.lz"
 ToedscruelFrontpic:	INCBIN "gfx/pokemon/toedscruel/front.animated.2bpp.lz"
@@ -970,20 +903,6 @@ GrenmarBackpic:       INCBIN "gfx/pokemon/grenmar/back.2bpp.lz"
 
 SECTION "Pics 23", ROMX
 
-CubburnFrontpic:	 INCBIN "gfx/pokemon/cubburn/front.animated.2bpp.lz"
-CubburnBackpic:	 INCBIN "gfx/pokemon/cubburn/back.2bpp.lz"
-FlambearFrontpic:	 INCBIN "gfx/pokemon/flambear/front.animated.2bpp.lz"
-FlambearBackpic:	 INCBIN "gfx/pokemon/flambear/back.2bpp.lz"
-BruinousFrontpic:	 INCBIN "gfx/pokemon/bruinous/front.animated.2bpp.lz"
-BruinousBackpic:	 INCBIN "gfx/pokemon/bruinous/back.2bpp.lz"
-
-PalssioFrontpic:	 INCBIN "gfx/pokemon/palssio/front.animated.2bpp.lz"
-PalssioBackpic:	 INCBIN "gfx/pokemon/palssio/back.2bpp.lz"
-PressioFrontpic:	 INCBIN "gfx/pokemon/pressio/front.animated.2bpp.lz"
-PressioBackpic:	 INCBIN "gfx/pokemon/pressio/back.2bpp.lz"
-DonmarinFrontpic:	 INCBIN "gfx/pokemon/donmarin/front.animated.2bpp.lz"
-DonmarinBackpic:	 INCBIN "gfx/pokemon/donmarin/back.2bpp.lz"
-
 FolageFrontpic:	 INCBIN "gfx/pokemon/folage/front.animated.2bpp.lz"
 FolageBackpic:	 INCBIN "gfx/pokemon/folage/back.2bpp.lz"
 BarreauFrontpic:	 INCBIN "gfx/pokemon/barreau/front.animated.2bpp.lz"
@@ -1027,4 +946,90 @@ DecillaBackpic:      INCBIN "gfx/pokemon/decilla/back.2bpp.lz"
 GawarhedFrontpic:    INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz"
 GawarhedBackpic:     INCBIN "gfx/pokemon/gawarhed/back.2bpp.lz"
 KabutopsFossilPic:   INCBIN "gfx/trainers/kabutops.2bpp.lz"
-AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz"
+AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz"
+
+SECTION "Pics 24", ROMX
+
+CubburnFrontpic:	 INCBIN "gfx/pokemon/cubburn/front.animated.2bpp.lz"
+CubburnBackpic:	 INCBIN "gfx/pokemon/cubburn/back.2bpp.lz"
+FlambearFrontpic:	 INCBIN "gfx/pokemon/flambear/front.animated.2bpp.lz"
+FlambearBackpic:	 INCBIN "gfx/pokemon/flambear/back.2bpp.lz"
+BruinousFrontpic:	 INCBIN "gfx/pokemon/bruinous/front.animated.2bpp.lz"
+BruinousBackpic:	 INCBIN "gfx/pokemon/bruinous/back.2bpp.lz"
+
+PalssioFrontpic:	 INCBIN "gfx/pokemon/palssio/front.animated.2bpp.lz"
+PalssioBackpic:	 INCBIN "gfx/pokemon/palssio/back.2bpp.lz"
+PressioFrontpic:	 INCBIN "gfx/pokemon/pressio/front.animated.2bpp.lz"
+PressioBackpic:	 INCBIN "gfx/pokemon/pressio/back.2bpp.lz"
+DonmarinFrontpic:	 INCBIN "gfx/pokemon/donmarin/front.animated.2bpp.lz"
+DonmarinBackpic:	 INCBIN "gfx/pokemon/donmarin/back.2bpp.lz"
+
+MoibelleFrontpic:    INCBIN "gfx/pokemon/moibelle/front.animated.2bpp.lz"
+MoibelleBackpic:     INCBIN "gfx/pokemon/moibelle/back.2bpp.lz"
+BelledamFrontpic:    INCBIN "gfx/pokemon/belledam/front.animated.2bpp.lz"
+BelledamBackpic:     INCBIN "gfx/pokemon/belledam/back.2bpp.lz"
+AercrowFrontpic:     INCBIN "gfx/pokemon/aercrow/front.animated.2bpp.lz"
+AercrowBackpic:      INCBIN "gfx/pokemon/aercrow/back.2bpp.lz"
+MismagiusFrontpic:   INCBIN "gfx/pokemon/mismagius/front.animated.2bpp.lz"
+MismagiusBackpic:    INCBIN "gfx/pokemon/mismagius/back.2bpp.lz"
+StromenFrontpic:     INCBIN "gfx/pokemon/stromen/front.animated.2bpp.lz"
+StromenBackpic:      INCBIN "gfx/pokemon/stromen/back.2bpp.lz"
+PhandarinFrontpic:   INCBIN "gfx/pokemon/phandarin/front.animated.2bpp.lz"
+PhandarinBackpic:    INCBIN "gfx/pokemon/phandarin/back.2bpp.lz"
+KotoraFrontpic:	 INCBIN "gfx/pokemon/kotora/front.animated.2bpp.lz"
+KotoraBackpic:	 INCBIN "gfx/pokemon/kotora/back.2bpp.lz"
+GaotoraFrontpic:	 INCBIN "gfx/pokemon/gaotora/front.animated.2bpp.lz"
+GaotoraBackpic:	 INCBIN "gfx/pokemon/gaotora/back.2bpp.lz"
+GorotoraFrontpic:	 INCBIN "gfx/pokemon/gorotora/front.animated.2bpp.lz"
+GorotoraBackpic:	 INCBIN "gfx/pokemon/gorotora/back.2bpp.lz"
+RaitoraFrontpic:	 INCBIN "gfx/pokemon/raitora/front.animated.2bpp.lz"
+RaitoraBackpic:	 INCBIN "gfx/pokemon/raitora/back.2bpp.lz"
+BittybatFrontpic:	 INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz"
+BittybatBackpic:	 INCBIN "gfx/pokemon/bittybat/back.2bpp.lz"
+ParasporFrontpic:	 INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz"
+ParasporBackpic:	 INCBIN "gfx/pokemon/paraspor/back.2bpp.lz"
+VulpiiiFrontpic:	 INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz"
+VulpiiiBackpic:	 INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz"
+AnnihilapeFrontpic:	 INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz"
+AnnihilapeBackpic:	 INCBIN "gfx/pokemon/annihilape/back.2bpp.lz"
+PupperonFrontpic:	 INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz"
+PupperonBackpic:	 INCBIN "gfx/pokemon/pupperon/back.2bpp.lz"
+
+SECTION "Pics 25", ROMX
+
+KitsenFrontpic:	 INCBIN "gfx/pokemon/kitsen/front.animated.2bpp.lz"
+KitsenBackpic:	 INCBIN "gfx/pokemon/kitsen/back.2bpp.lz"
+WispiritFrontpic:	 INCBIN "gfx/pokemon/wispirit/front.animated.2bpp.lz"
+WispiritBackpic:	 INCBIN "gfx/pokemon/wispirit/back.2bpp.lz"
+CoatlFrontpic:	 INCBIN "gfx/pokemon/coatl/front.animated.2bpp.lz"
+CoatlBackpic:	 INCBIN "gfx/pokemon/coatl/back.2bpp.lz"
+MimearFrontpic:	 INCBIN "gfx/pokemon/mimear/front.animated.2bpp.lz"
+MimearBackpic:	 INCBIN "gfx/pokemon/mimear/back.2bpp.lz"
+InoshikaFrontpic:	 INCBIN "gfx/pokemon/inoshika/front.animated.2bpp.lz"
+InoshikaBackpic:	 INCBIN "gfx/pokemon/inoshika/back.2bpp.lz"
+RuddernautFrontpic:	 INCBIN "gfx/pokemon/ruddernaut/front.animated.2bpp.lz"
+RuddernautBackpic:	 INCBIN "gfx/pokemon/ruddernaut/back.2bpp.lz"
+XylodonFrontpic:	 INCBIN "gfx/pokemon/xylodon/front.animated.2bpp.lz"
+XylodonBackpic:	 INCBIN "gfx/pokemon/xylodon/back.2bpp.lz"
+XylofinFrontpic:	 INCBIN "gfx/pokemon/xylofin/front.animated.2bpp.lz"
+XylofinBackpic:	 INCBIN "gfx/pokemon/xylofin/back.2bpp.lz"
+DokuroarFrontpic:	 INCBIN "gfx/pokemon/dokuroar/front.animated.2bpp.lz"
+DokuroarBackpic:	 INCBIN "gfx/pokemon/dokuroar/back.2bpp.lz"
+ScreamTailFrontpic:	 INCBIN "gfx/pokemon/scream_tail/front.animated.2bpp.lz"
+ScreamTailBackpic:	 INCBIN "gfx/pokemon/scream_tail/back.2bpp.lz"
+SandyShocksFrontpic:	 INCBIN "gfx/pokemon/sandy_shocks/front.animated.2bpp.lz"
+SandyShocksBackpic:	 INCBIN "gfx/pokemon/sandy_shocks/back.2bpp.lz"
+GreatTuskFrontpic:	 INCBIN "gfx/pokemon/great_tusk/front.animated.2bpp.lz"
+GreatTuskBackpic:	 INCBIN "gfx/pokemon/great_tusk/back.2bpp.lz"
+FlutterManeFrontpic:	 INCBIN "gfx/pokemon/flutter_mane/front.animated.2bpp.lz"
+FlutterManeBackpic:	 INCBIN "gfx/pokemon/flutter_mane/back.2bpp.lz"
+IronTreadsFrontpic:	 INCBIN "gfx/pokemon/iron_treads/front.animated.2bpp.lz"
+IronTreadsBackpic:	 INCBIN "gfx/pokemon/iron_treads/back.2bpp.lz"
+IronBundleFrontpic:	 INCBIN "gfx/pokemon/iron_bundle/front.animated.2bpp.lz"
+IronBundleBackpic:	 INCBIN "gfx/pokemon/iron_bundle/back.2bpp.lz"
+IronThornsFrontpic:	 INCBIN "gfx/pokemon/iron_thorns/front.animated.2bpp.lz"
+IronThornsBackpic:	 INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
+OrfryFrontpic:	 INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
+OrfryBackpic:	 INCBIN "gfx/pokemon/orfry/back.2bpp.lz"
+TogekissFrontpic:	 INCBIN "gfx/pokemon/togekiss/front.animated.2bpp.lz"
+TogekissBackpic:	 INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"

gfx/pokemon/belledam/anim.asm

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

gfx/pokemon/belledam/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB  26, 7,  2
+	RGB  6,  7, 19

gfx/pokemon/bipulla/anim.asm

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

gfx/pokemon/bipulla/shiny.pal

@@ -1,4 +1,2 @@
-
-	RGB 23, 07, 25
-	RGB 07, 09, 16
-
+	RGB 16, 17, 30
+	RGB 05, 07, 11

gfx/pokemon/blossomole/anim.asm

@@ -0,0 +1,20 @@
+	frame  0, 06
+	frame  1, 06
+	frame  2, 06
+	frame  1, 06
+	frame  3, 06
+	frame  4, 06
+	frame  5, 08
+	frame  4, 08
+	frame  5, 08
+	frame  4, 08
+	frame  5, 08
+	frame  6, 18
+	frame  7, 08
+	frame  8, 08
+	frame  5, 08
+	frame  7, 08
+	frame  8, 08
+	frame  5, 08
+	frame  3, 06
+	endanim

gfx/pokemon/blossomole/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/blossomole/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 28, 22, 16
+	RGB 20, 18, 2

gfx/pokemon/bundra/anim.asm

@@ -0,0 +1,15 @@
+	frame  0, 08
+	frame  1, 08
+	frame  2, 08
+	frame  1, 08
+	frame  3, 12
+	frame  2, 06
+	frame  3, 18
+	frame  2, 06
+	frame  4, 12
+	frame  2, 06
+	frame  4, 12
+	frame  2, 06
+	frame  5, 10
+	frame  2, 08
+	endanim

gfx/pokemon/bundra/anim_idle.asm

@@ -0,0 +1,6 @@
+	frame  0, 07
+	frame  1, 07
+	frame  2, 07
+	frame  1, 07
+	frame  2, 07
+	endanim

gfx/pokemon/bundra/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 15, 18, 30
+	RGB 31, 06, 04

gfx/pokemon/burgela/anim.asm

@@ -1 +1,25 @@
-	endanim
+	frame  0, 06
+	frame  1, 06
+	frame  2, 06
+	frame  3, 04
+	frame  4, 06
+	frame  3, 04
+	frame  5, 10
+	frame  2, 12
+	frame  5, 10
+	frame  6, 06
+	frame  7, 06
+	frame  8, 06
+	frame  9, 06
+	frame  2, 12
+	frame  6, 06
+	frame  7, 06
+	frame  8, 06
+	frame 10, 06
+	frame  3, 04
+	frame  4, 06
+	frame  3, 04
+	frame  2, 12
+	frame  1, 06
+	frame 11, 06
+	endanim

gfx/pokemon/burgela/anim_idle.asm

@@ -1 +1,9 @@
+	frame  0, 06
+	frame  1, 06
+	frame  2, 06
+	frame  3, 03
+	frame  4, 06
+	frame  3, 03
+	frame  2, 06
+	frame  1, 06
 	endanim

gfx/pokemon/burgela/shiny.pal

@@ -1,4 +1,2 @@
-
 	RGB 18, 30, 00
-	RGB 17, 06, 06
-
+	RGB 17, 06, 06

gfx/pokemon/clodsire/anim.asm

@@ -0,0 +1,6 @@
+	frame 0, 08
+	frame 1, 04
+	frame 2, 10
+	frame 3, 05
+	frame 0, 16
+	endanim

gfx/pokemon/clodsire/anim_idle.asm

@@ -0,0 +1,5 @@
+	frame 4, 05
+	frame 0, 05
+	frame 4, 05
+	frame 0, 05
+	endanim

gfx/pokemon/clodsire/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 16, 14, 21
+	RGB 08, 06, 11

gfx/pokemon/coinpur/anim.asm

@@ -1 +1,32 @@
-	endanim
+	frame  0, 06
+	frame  1, 06
+	frame  2, 06
+	frame  3, 04
+	frame  4, 04
+	frame  5, 04
+	frame  3, 04
+	frame  4, 04
+	frame  5, 04
+	frame  6, 06
+	frame  7, 12
+	frame  8, 06
+	frame  9, 06
+	frame 10, 06
+	frame  9, 06
+	frame 10, 06
+	frame  9, 06
+	frame 11, 06
+	frame 12, 06
+	frame 13, 04
+	frame 14, 06
+	frame 15, 06
+	frame 16, 02
+	frame 17, 12
+	frame 18, 08
+	frame 19, 10
+	frame 20, 06
+	frame 21, 04
+	frame  7, 10
+	frame 21, 04
+	frame 22, 06
+	endanim

gfx/pokemon/coinpur/anim_idle.asm

@@ -1 +1,4 @@
+	frame 1, 08
+	frame 0, 08
+	frame 1, 08
 	endanim

gfx/pokemon/coinpur/desktop.ini

@@ -0,0 +1,2 @@
+[.ShellClassInfo]
+LocalizedResourceName=coinpur

gfx/pokemon/coinpur/shiny.pal

@@ -1,4 +1,2 @@
-
-	RGB 31, 28, 10
-	RGB 28, 09, 27
-
+	RGB 31, 22, 12
+	RGB 26, 02, 18

gfx/pokemon/cyclorp/anim.asm

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

gfx/pokemon/cyclorp/anim_idle.asm

@@ -1 +1,5 @@
+    frame  0, 07
+	frame  1, 07
+	frame  2, 07
+	frame  1, 07
 	endanim

gfx/pokemon/cyclorp/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 20, 19, 24
+	RGB 08, 11, 23

gfx/pokemon/disturban/anim.asm

@@ -1 +1,3 @@
-	endanim
+	frame 1, 06
+	frame 2, 18
+	endanim

gfx/pokemon/disturban/anim_idle.asm

@@ -1 +1,5 @@
-	endanim
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim

gfx/pokemon/disturban/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 21, 19, 10
+	RGB 10,  9,  5
+

gfx/pokemon/dodaerie/anim.asm

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

gfx/pokemon/dodaerie/anim_idle.asm

@@ -0,0 +1,5 @@
+    frame  0, 06
+	frame  8, 09
+	frame 12, 09
+	frame  8, 06
+	endanim

gfx/pokemon/dodaerie/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 18, 24, 17
+	RGB  4, 15, 12

gfx/pokemon/donmarin/anim.asm

@@ -1 +1,6 @@
-	endanim
+	frame 0, 04
+	frame 1, 10
+	frame 2, 16
+	frame 3, 36
+	frame 2, 12
+	endanim

gfx/pokemon/donmarin/anim_idle.asm

@@ -1 +1,5 @@
-	endanim
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim

gfx/pokemon/donmarin/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 21, 25, 29
+	RGB 6,  22, 15
+

gfx/pokemon/elebebi/anim.asm

@@ -1 +1,10 @@
-	endanim
+	frame 1, 07
+	setrepeat 7
+	frame 2, 03
+	frame 1, 03
+	dorepeat 2
+	setrepeat 4
+	frame 4, 03
+	frame 3, 03
+	dorepeat 6
+	endanim

gfx/pokemon/elebebi/anim_idle.asm

@@ -1 +1,6 @@
-	endanim
+	setrepeat 2
+	frame 5, 09
+	frame 3, 09
+	dorepeat 1
+	frame 3, 20
+	endanim

gfx/pokemon/elebebi/shiny.pal

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

gfx/pokemon/eucala/anim.asm

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

gfx/pokemon/eucala/anim_idle.asm

@@ -1 +1 @@
-	endanim
+	endanim

gfx/pokemon/eucala/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 23, 19, 18
+	RGB 15, 14, 06

gfx/pokemon/gorotora/anim.asm

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

gfx/pokemon/gorotora/anim_idle.asm

@@ -1 +1,6 @@
+	frame 0, 06
+	frame 5, 07
+	frame 10, 07
+	frame 5, 07
+	frame 10, 07
 	endanim

gfx/pokemon/gorotora/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 29, 18,  9
+	RGB 24,  8,  5

gfx/pokemon/grenmar/anim.asm

@@ -1 +1,8 @@
-	endanim
+	setrepeat 2
+	frame 2, 06
+	frame 3, 06
+	dorepeat 1
+	frame 0, 08
+	frame 1, 08
+	frame 4, 08
+	endanim

gfx/pokemon/grenmar/anim_idle.asm

@@ -1 +1,5 @@
-	endanim
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim

gfx/pokemon/grenmar/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 19, 26, 0
+	RGB  2, 13, 13
+