diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 3bd319b8..92d34442 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -85,7 +85,7 @@ YoungsterData:
 	db 17, RATTATA, SPEAROW, RATICATE, 0
 	db 18, NIDORAN_M, NIDORINO, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, RATICATE, ARBOK, SLOWBRO, FEAROW, NIDOKING, VENUSAUR, 0
+	db 56, RATICATE, ARBOK, SLOWBRO, FEAROW, NIDOKING, VENUSAUR, 0
 
 ; Suffers heavily from limited Bug-types. Variety mainly comes from stripping them down and specialising them.
 BugCatcherData:
@@ -106,7 +106,7 @@ BugCatcherData:
 	db 16, VENONAT, PARAS, 0 ; By this point, the player has fought like, 2 "three bugs" trainers. Toning it down.
 	db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, TRICULES, KLEAVOR, 0
+	db 56, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, TRICULES, KLEAVOR, 0
 ; Route 9
 	db 19, BUTTERFREE, BEEDRILL, 0
 	db 20, PUPAL, VENONAT, BEEDRILL, 0
@@ -142,7 +142,7 @@ LassData:
 	db 23, LEAFEON, 0
 	db 23, ODDISH, GLOOM, 0
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0
+	db 57, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0
 
 ; Pretty much a Fisher with Machops and the random Vermilion Gym featuring.
 SailorData:
@@ -158,7 +158,7 @@ SailorData:
 ; Vermilion Gym
 	db 21, KOTORA, GAOTORA, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
+	db 58, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
 
 ; One of the most varied trainers in the game. No criticisms.
 JrTrainerMData:
@@ -172,7 +172,7 @@ JrTrainerMData:
 	db 16, WEEPINBELL, 0 ; Joe from School of Hard Knocks, Indigo League Ep9, featured in Yellow
 	db 16, SPEAROW, RATICATE, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, DUGTRIO, ANNIHILAPE, SANDSLASH, GOLEM, CROBAT, ARCANINE, 0
+	db 56, DUGTRIO, ANNIHILAPE, SANDSLASH, GOLEM, CROBAT, ARCANINE, 0
 ; Route 9
 	db 21, GROWLITHE, CHARMANDER, 0
 	db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0
@@ -218,7 +218,7 @@ JrTrainerFData:
 ; Route 20
 	db 30, TENTACOOL, HORSEA, SEEL, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0
+	db 56, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0
 
 ; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon.
 ; Squeamata seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
@@ -235,7 +235,7 @@ PokemaniacData:
 ; Rock Tunnel 1F
 	db 23, CUBONE, SLOWPOKE, 0
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
+	db 57, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
 
 ; The Super Nerd has some weird choices, but I think they're mostly inorganic Pokemon, except for Fire-types that the Cinnabar Gym Trainers use.
 SuperNerdData:
@@ -251,7 +251,7 @@ SuperNerdData:
 	db 30, PORYGON, 0 ;
 	db 25, GRIMER, KOFFING, KABUTO, OMANYTE, 0 ;
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
+	db 57, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
 ; Cinnabar Gym
 	db 36, VULPIX, NINETALES, CHARIZARD, 0
 	db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0
@@ -285,7 +285,7 @@ HikerData:
 	db 20, ZUBAT, DIGLETT, ONIX, 0
 	db 21, GEODUDE, GRAVELER, 0
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0
+	db 57, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0
 
 ; Poison Pokemon. Poison Pokemon everywhere.
 ; Much of this seems to represent the pollution caused by petrol gas.
@@ -318,12 +318,12 @@ BikerData:
 	db 28, GRIMER, GRIMER, SEADRA, 0
 	db 29, MAGMAR, 0
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
+	db 59, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
 
 ; Fire specialist
 BurglarData:
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, RAPIDASH, CROAKOZUNA, ARCANINE, PERSIAN_A, WEEZING, MAGMORTAR, 0
+	db 59, RAPIDASH, CROAKOZUNA, ARCANINE, PERSIAN_A, WEEZING, MAGMORTAR, 0
 ; Unused
 	db 33, GROWLITHE, 0
 	db 28, VULPIX, CHARMANDER, PONYTA, 0
@@ -346,7 +346,7 @@ EngineerData:
 	db 21, KOTORA, VOLTORB, 0
 	db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, ELECTRODE, SANDSLASH_A, ELECTIVIRE, GOROTORA, PERRSERKER, SCIZOR, 0   ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
+	db 58, ELECTRODE, SANDSLASH_A, ELECTIVIRE, GOROTORA, PERRSERKER, SCIZOR, 0   ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
 
 ; Super Rod encounter showcase, basically
 FisherData:
@@ -367,9 +367,9 @@ FisherData:
 ; Route 12
 	db 24, BLASTYKE, WIGLETT, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
+	db 58, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
 ; Brunswick Trail
-	db 65, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0
+	db 57, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0
 
 ; God this took forever to remove repeats from
 ; Surf encounter extravaganza
@@ -394,7 +394,7 @@ SwimmerData:
 	db 33, BLASTYKE, STARYU, WARTORTLE, 0
 	db 32, POLIWHIRL, TENTACOOL, GOLDUCK, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0
+	db 60, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0
 
 ; Fighting specialist, very odd.
 CueBallData:
@@ -411,7 +411,7 @@ CueBallData:
 ; Route 21
 	db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, TENTACRUEL, 0
+	db 60, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, TENTACRUEL, 0
 
 ; Big variety, kind of aimless; seems to be a counterparts thing.
 GamblerData:
@@ -423,7 +423,7 @@ GamblerData:
 ; Route 8
 	db 22, POLIWAG, RIBBITO, POLIWHIRL, 0
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
+	db 59, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
 ; Route 8
 	db 24, CACTORMUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
 
@@ -446,7 +446,7 @@ BeautyData:
 	db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine
 	db 29, BULBASAUR, IVYSAUR, 0
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
+	db 57, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
 ; Route 19
 	db 27, POLIWAG, GOLDEEN, SEAKING, 0
 	db 30, BLASTYKE, GOLDUCK, 0
@@ -454,11 +454,11 @@ BeautyData:
 ; Route 20
 	db 30, KINGDRA, 0 ; Close to the Trader
 ; Brunswick Trail
-	db 66, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0
+	db 58, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0
 ; Celeste Hill?
-	db 66, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina
-	db 65, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy
-	db 67, MUK, ARBOK, VILEPLUME, 0 ; Ariana
+	db 60, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina
+	db 62, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy
+	db 63, MUK, ARBOK, VILEPLUME, 0 ; Ariana
 
 ; yep psychic yep psychic yep psychic
 PsychicData:
@@ -468,7 +468,7 @@ PsychicData:
 	db 33, SLOWKING, SLOWBRO, 0 ; not as strong as it looks, has no good attacks
 	db 38, JYNX, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 
+	db 60, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 
 
 ; Electric specialist with depressingly little representation.
 RockerData:
@@ -477,7 +477,7 @@ RockerData:
 ; Route 12
 	db 29, VOLTORB, ELECTRODE, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
+	db 58, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
 
 ; Psychic, Poison, and a little bit of Voltorb.
 JugglerData:
@@ -491,7 +491,7 @@ JugglerData:
 ; Victory Road 2F
 	db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0
+	db 60, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0
 ; Fuchsia Gym
 	db 38, UMBREON, 0
 ; Fuchsia Gym
@@ -510,7 +510,7 @@ TamerData:
 ; Victory Road 2F
 	db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
+	db 60, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
 
 ; yep bird yep bird yep bird yep bird
 ; If nothing else, just make them less agonising to fight.
@@ -533,9 +533,9 @@ BirdKeeperData:
 ; Route 20
 	db 30, FEAROW, LUXWAN, PIDGEOTTO, 0
 ; Brunswick Trail
-	db 65, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0
+	db 57, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0
+	db 56, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0
 ; Route 14
 	db 28, PIDGEY, DODUO, PIDGEOTTO, 0
 	db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0
@@ -545,13 +545,13 @@ BirdKeeperData:
 ; Uses Silph products and Steel-types
 ChiefData:
 ; Silph Gauntlet 7F
-	db $FF, 71, ELECTRODE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0
+	db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, OMEGADGE, 0
 ; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
 
 ; Poison- and Electric-type Pokemon
 ScientistData:
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
+	db 59, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
 ; Silph Co. 2F (unused)
 	db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
 	db 28, MAGNETITE, VOLTORB, MAGNETON, 0
@@ -610,7 +610,7 @@ RocketData:
 	db 26, VOLTORB, KOFFING, DROWZEE, 0
 	db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
+	db 59, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
 ; Silph Co. 2F - cut
 	db 29, CUBONE, ZUBAT, 0
 	db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
@@ -649,7 +649,7 @@ CooltrainerMData:
 	db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0
 	db 43, KINGLER, TENTACRUEL, BLASTOISE, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0
+	db 60, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0
 ; Victory Road 1F
 	db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0
 ; Unused
@@ -662,9 +662,9 @@ CooltrainerMData:
 ; Celadon Condominiums Morimoto - Team is LGPE's with +10 Levels each.
 	db 64, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0
 ; Brunswick Trail / Glade 
-	db 68, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo
-	db 67, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace
-	db 63, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will
+	db 60, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo
+	db 57, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace
+	db 60, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will
 
 ; Equally varied, nothing to say
 CooltrainerFData:
@@ -674,7 +674,7 @@ CooltrainerFData:
 	db 43, BELLIGNAN, VICTREEBEL, 0
 	db 43, PARASECT, DEWGONG, CHANSEY, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
+	db 60, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
 ; Victory Road 1F
 	db 44, PERSIAN, NINETALES, BELLOSSOM, 0
 ; Unused - reuse somewhere? celeste, etc?
@@ -682,7 +682,7 @@ CooltrainerFData:
 ;	db 45, NIDORINA, NIDOQUEEN, 0
 ;	db 43, PERSIAN, NINETALES, RAICHU, 0
 ; Brunswick Glade/grotto etc, whatever desired 
-	db 68, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf 
+	db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf 
 
 ; "Dignified" Pokemon associated with the privileged class.
 GentlemanData:
@@ -692,12 +692,12 @@ GentlemanData:
 ; SS Anne 2F Rooms/Vermilion Gym
 	db 23, PIKACHU, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
+	db 58, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
 ; SS Anne 2F Rooms
 	db 17, KOLTA, GROWLITHE, 0
 ; Celeste Hill?
-	db 69, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji
-	db 67, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
+	db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji
+	db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
 
 ChannelerData:
 ; Unused
@@ -709,7 +709,7 @@ ChannelerData:
 	db 23, VULPIII, GASTLY, 0
 	db 24, VULPIX, 0
 ; Silph Gauntlet 4F (Lavender Tower)
-	db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
+	db 59, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
 ; Pokémon Tower 3F
 	db 25, GASTLY, HAUNTER, 0
 ; Pokémon Tower 4F, now unused 
@@ -744,7 +744,7 @@ StudentData:
 	db 4, PIDGEY, RATTATA, 0
 	db 6, CLEFAIRY, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0   ; all Normal types that Yujirou doesn't use
+	db 56, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0   ; all Normal types that Yujirou doesn't use
 ; Celadon University
 	db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
 
@@ -753,7 +753,7 @@ FirefighterData:
 ; Cerulean Gym
 	db 15, POLIWAG, CHEEP, SQUIRTLE, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
+	db 58, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
 ; Cinnabar Volcano
 	db 36, WARTORTLE, MAROWAK, POLITOED, 0
 	db 35, SANDSLASH, OMANYTE, SEAKING, CROAKOZUNA, 0
@@ -766,15 +766,13 @@ JuniorData:
 JackData:
 ; Celadon Mansion Roof House
 	db 25, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru. 
-; Silph Gauntlet 7F (Chief's Office)
-;	db 70, MIMMEO, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0   ; not 100% sure what to do with this guy...
 
 JessieJamesData:
 	db $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon
 	db $FF, 30, MEOWTH, 26, EKANS, 24, LICKITUNG, 26, KOFFING, 0 ; Rocket Hideout
 	db $FF, 34, MEOWTH, 30, ARBOK, 27, LICKITUNG, 30, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower
 	db $FF, 42, MEOWTH, 38, ARBOK, 36, LICKILICKY, 38, WEEZING, 36, VICTREEBEL, 35, GYARADOS, 0 ; Silph Co.
-	db $FF, 80, MEOWTH, 75, ARBOK, 73, LICKILICKY, 75, WEEZING, 73, VICTREEBEL, 71, GYARADOS, 0 ; Citrine Rocket House
+	db $FF, 72, MEOWTH, 67, ARBOK, 65, LICKILICKY, 67, WEEZING, 65, VICTREEBEL, 63, GYARADOS, 0 ; Citrine Rocket House
 
 INCLUDE "data/trainers/scaled_parties.asm"
 INCLUDE "data/trainers/rival_parties.asm"
diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm
index 314ae0a3..60de4e4a 100644
--- a/data/trainers/rival_parties.asm
+++ b/data/trainers/rival_parties.asm
@@ -44,24 +44,24 @@ Green2Data:
 	db $FF, 48, SANDSLASH, 47, EXEGGCUTE, 47, NINETALES, 48, CLOYSTER, 50, ALAKAZAM, 53, GOROCHU, 0
 
 Green3Data:
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
-	db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0
-	db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0
+	db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, ARCANINE, 61, EXEGGUTOR, 63, TOTARTLE, 0
+	db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, GYARADOS, 61, ARCANINE, 63, VENUSAUR, 0
+	db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, EXEGGUTOR, 61, GYARADOS, 63, CHARIZARD, 0
+	db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, MAGNEZONE, 61, NINETALES, 63, UMBREON, 0
+	db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, NINETALES, 61, CLOYSTER, 63, GOROCHU, 0
 ; post-game rematch teams, based on FRLG team
-	db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
-	db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
-	db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
-	db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, MAGNEZONE, 78, NINETALES, 80, UMBREON, 0
-	db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, CLOYSTER, 80, GOROCHU, 0
+	db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, ARCANINE, 73, EXEGGUTOR, 75, TOTARTLE, 0
+	db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, GYARADOS, 73, ARCANINE, 75, VENUSAUR, 0
+	db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, EXEGGUTOR, 73, GYARADOS, 75, CHARIZARD, 0
+	db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, MAGNEZONE, 73, NINETALES, 75, UMBREON, 0
+	db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, NINETALES, 73, CLOYSTER, 75, GOROCHU, 0
 
 ProfOakData:
-	db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0
-	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 70, NIDOKING, 70, VENUSAUR, 0
-	db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 70, NIDOKING, 70, CHARIZARD, 0
-	db $FF, 66, TAUROS, 67, MAGNEZONE, 67, NIDOKING, 70, TOTARTLE, 70, CHARIZARD, 70, VENUSAUR, 0
-	db $FF, 66, TAUROS, 67, MAGNEZONE, 67, NIDOKING, 70, CHARIZARD, 70, VENUSAUR, 70, TOTARTLE, 0
+	db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0
+	db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0
+	db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0
+	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0
+	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 0
 ; with Oak's teams, he uses his original unused team with Nidoking added on.
 ; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen.
 ; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap.
diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm
index 035c618a..d7a7997d 100644
--- a/data/trainers/scaled_parties.asm
+++ b/data/trainers/scaled_parties.asm
@@ -10,7 +10,7 @@ BrockData:
 	db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0                 ; 5
 	db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GAWARHED, 47, STEELIX, 0                 ; 6
 	db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GAWARHED, 48, KLEAVOR, 50, STEELIX, 0    ; 7 (unused)
-	db $FF, 67, GOLEM, 66, GAWARHED, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
+	db $FF, 62, GOLEM, 61, GAWARHED, 61, ARCANINE_H, 62, OMASTAR, 62, KABUTOPS, 65, STEELIX, 0 ; 8 (postgame)
 
 MistyData:
 	db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0                                              ; 0 badges
@@ -21,7 +21,7 @@ MistyData:
 	db $FF, 41, SEADRA, 40, CROAKOZUNA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0                  ; 5
 	db $FF, 45, KINGDRA, 44, CROAKOZUNA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0                 ; 6
 	db $FF, 47, KINGDRA, 46, CROAKOZUNA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0   ; 7 (unused)
-	db $FF, 67, KINGDRA, 67, GOLDUCK, 66, TAUROS_PA, 66, VAPOREON, 67, TOTARTLE, 70, STARMIE, 0  ; 8 (postgame)
+	db $FF, 62, KINGDRA, 62, GOLDUCK, 61, TAUROS_PA, 61, VAPOREON, 62, TOTARTLE, 65, STARMIE, 0  ; 8 (postgame)
 
 LtSurgeData:
 	db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0                                                ; 0 badges
@@ -32,7 +32,7 @@ LtSurgeData:
 	db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0               ; 5
 	db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0              ; 6
 	db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
-	db $FF, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0  ; 8 (postgame)
+	db $FF, 62, GOROTORA, 62, MAGNEZONE, 61, GOLEM_A, 62, ELECTIVIRE, 61, JOLTEON, 65, GOROCHU, 0  ; 8 (postgame)
 
 ErikaData:
 	db $FF, 11, BELLSPROUT, 12, ODDISH, 14, TANGELA, 0                                                  ; 0 badges (unused)
@@ -43,7 +43,7 @@ ErikaData:
 	db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0                ; 5
 	db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0                ; 6
 	db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0   ; 7 (unused)
-	db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
+	db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame)
 
 KogaData:
 	db $FF, 11, VENONAT, 12, ZUBAT, 14, KOFFING, 0                                           ; 0 badges (unused)
@@ -54,7 +54,7 @@ KogaData:
 	db $FF, 41, VENOMOTH, 40, TENTACRUEL, 40, MUK, 41, WEEZING, 43, CROBAT, 0                ; 5
 	db $FF, 45, VENOMOTH, 44, TENTACRUEL, 44, MUK, 45, WEEZING, 47, CROBAT, 0                ; 6
 	db $FF, 47, VENOMOTH, 46, BELLIGNAN, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
-	db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0  ; 8 (postgame)
+	db $FF, 62, VENOMOTH, 61, BELLIGNAN, 61, SLOWBRO_G, 62, MUK, 62, WEEZING, 65, CROBAT, 0  ; 8 (postgame)
 
 SabrinaData:
 	db $FF, 11, SLOWPOKE, 12, DROWZEE, 14, KADABRA, 0                                            ; 0 badges (unused)
@@ -65,7 +65,7 @@ SabrinaData:
 	db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0                    ; 5
 	db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0                    ; 6
 	db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0     ; 7 (unused)
-	db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0  ; 8 (postgame)
+	db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0  ; 8 (postgame)
 
 BlaineData:
 	db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0                                                 ; 0 badges (unused)
@@ -76,7 +76,7 @@ BlaineData:
 	db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0                 ; 5
 	db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0                 ; 6
 	db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0  ; 7 (unused)
-	db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0  ; 8 (postgame)
+	db $FF, 62, RAPIDASH, 62, ARCANINE, 61, TAUROS_PB, 61, FLAREON, 62, CHARIZARD, 65, MAGMORTAR, 0  ; 8 (postgame)
 
 GiovanniData: ; is not scaled as he is always fought last
 ; Rocket Hideout B4F
@@ -87,24 +87,24 @@ GiovanniData: ; is not scaled as he is always fought last
 	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0
 
 LoreleiData:
-	db $FF, 53, DEWGONG, 52, CLOYSTER, 52, BUU, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0
+	db $FF, 51, DEWGONG, 50, CLOYSTER, 50, BUU, 52, JYNX, 52, GLACEON, 54, LAPRAS, 0
 ; post-game rematch team (currently unused)
-	db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
+	db $FF, 63, DEWGONG, 64, CLOYSTER, 63, NINETALES_A, 64, JYNX, 64, GLACEON, 66, LAPRAS, 0
 
 BrunoData:
-	db $FF, 55, JABETTA, 54, STEELIX, 54, TRICULES, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0
+	db $FF, 53, JABETTA, 52, STEELIX, 52, TRICULES, 54, HITMONCHAN, 56, HITMONLEE, 56, MACHAMP, 0
 ; post-game rematch team (currently unused)
-	db $FF, 70, JABETTA, 69, STEELIX, 69, SIRFETCHD, 71, TRICULES, 71, HITMONTOP, 73, MACHAMP, 0
+	db $FF, 65, JABETTA, 66, STEELIX, 65, SIRFETCHD, 66, TRICULES, 66, HITMONTOP, 68, MACHAMP, 0
 
 AgathaData:
-	db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, GENGAR, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0		; Agatha has double Gengars in every single battle in the main-series, it's fine here...
+	db $FF, 55, ANNIHILAPE, 54, CROBAT, 54, GENGAR, 56, ARBOK, 56, UMBREON, 58, GENGAR, 0		; Agatha has double Gengars in every single battle in the main-series, it's fine here...
 ; post-game rematch team (currently unused)
-	db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
+	db $FF, 67, ANNIHILAPE, 68, CROBAT, 67, MAROWAK_A, 68, ARBOK, 68, UMBREON, 70, GENGAR, 0
 
 LanceData:
-	db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, KINGDRA, 60, IGUANARCH, 60, AERODACTYL, 62, DRAGONITE, 0
+	db $FF, 57, GAVILLAIN, 56, GYARADOS, 56, KINGDRA, 58, IGUANARCH, 58, AERODACTYL, 60, DRAGONITE, 0
 ; post-game rematch team (currently unused)
-	db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, IGUANARCH, 77, DRAGONITE, 0
+	db $FF, 69, GAVILLAIN, 70, GYARADOS, 69, EXEGGUTOR_A, 70, KINGDRA, 70, IGUANARCH, 72, DRAGONITE, 0
 
 YujirouData: ; was unused juggler
 	db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0                                           ; 0
@@ -117,7 +117,7 @@ YujirouData: ; was unused juggler
 	db $FF, 45, PERSIAN, 44, TAUROS, 44, CHANSEY, 45, LUXWAN, 47, LICKILICKY, 0               ; 7
 	db $FF, 47, PERSIAN, 46, TAUROS, 46, BLISSEY, 48, LUXWAN, 48, SNORLAX, 50, LICKILICKY, 0  ; 8
 ; post-game rematch team
-	db $FF, 66, PERSIAN, 65, TAUROS, 66, BLISSEY, 65, LUXWAN, 66, SNORLAX, 69, LICKILICKY, 0
+	db $FF, 61, PERSIAN, 60, TAUROS, 60, BLISSEY, 61, LUXWAN, 61, SNORLAX, 64, LICKILICKY, 0
 
 BlackbeltData:
 ; Koichi parties
@@ -129,8 +129,8 @@ BlackbeltData:
 	db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
 	db $FF, 43, MACHAMP, 43, PRIMEAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
 	db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
-	db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
-	db $FF, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
+	db $FF, 50, MACHAMP, 50, CARAPTHOR, 50, ANNIHILAPE, 53, HITMONLEE, 53, HITMONCHAN, 53, HITMONTOP, 0 ; 8
+	db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame
 ; Fighting Dojo Trainers
 	db 31, CHEEP, CHEEP, JABETTA, 0
 	db 32, MACHOKE, MACHAMP, 0
diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm
index 63eba2f3..4104cff5 100644
--- a/data/trainers/special_moves.asm
+++ b/data/trainers/special_moves.asm
@@ -4,159 +4,1038 @@
 ;	db 0
 
 SpecialTrainerMoves:
-	; db BUG_CATCHER, 15
-	; db 2, 2, TACKLE
-	; db 2, 3, STRING_SHOT
-	; db 0
 
-; commenting the Bug Catcher and Youngster out as they don't exist in R/B
-
-	; db YOUNGSTER, 14
-	; db 1, 4, FISSURE
-	; db 0
-
-
-; NOTE: update this to match their new teams
-
-	db BROCK, 1
-	db 5, 3, BIND
-	db 5, 4, BIDE
+	db YUJIROU, 1	; Yujirou 0 badges
+	db 3, 4, LICK
 	db 0
-
-	db MISTY, 1
-	db 5, 4, BUBBLEBEAM
+	
+	db YUJIROU, 2	; Yujirou 1 badge
+	db 3, 4, LICK
 	db 0
-
-	db LT_SURGE, 1
-	db 5, 1, THUNDERBOLT
-	db 5, 2, MEGA_PUNCH
-	db 5, 3, MEGA_KICK
-	db 5, 4, GROWL
+	
+	db YUJIROU, 3	; Yujirou 2 badges
+	db 1, 1, BITE
+	db 3, 4, CUT
+	db 4, 4, LICK
 	db 0
-
-	db ERIKA, 1
-	db 4, 3, MEGA_DRAIN
-	db 1, 1, RAZOR_LEAF
-	db 2, 1, PETAL_DANCE
+	
+	db YUJIROU, 4	; Yujirou 3 badges
+	db 2, 1, DIG
+	db 3, 4, THUNDER_WAVE
+	db 4, 2, PECK
+	db 4, 3, CUT
+	db 5, 3, WRAP
+	db 5, 4, LICK
 	db 0
-
-	db KOGA, 1
-	db 1, 1, TOXIC
-	db 2, 1, TOXIC
-	db 3, 1, TOXIC
-	db 3, 2, DOUBLE_EDGE
-	db 1, 1, LEECH_LIFE
-	db 1, 2, DOUBLE_TEAM
-	db 1, 3, PSYCHIC_M
-	db 1, 4, TOXIC
+	
+	db YUJIROU, 5	; Yujirou 4 badges
+	db 1, 1, BUBBLEBEAM
+	db 1, 3, SCREECH
+	db 1, 4, BODY_SLAM
+	db 2, 4, DIG
+	db 3, 1, SING
+	db 3, 3, THUNDER_WAVE
+	db 4, 2, PECK
+	db 4, 3, CUT
+	db 5, 2, SWORDS_DANCE
+	db 5, 3, WRAP
+	db 5, 4, LICK
 	db 0
-
-	db BLAINE, 1
-	db 2, 2, FLAMETHROWER
-	db 2, 4, CONFUSE_RAY
-	db 3, 2, FLAMETHROWER
-	db 5, 2, FIRE_BLAST
-	db 3, 1, REFLECT
+	
+	db YUJIROU, 6	; Yujirou 5 badges
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, BODY_SLAM
+	db 1, 3, THUNDERBOLT
+	db 2, 2, SUPER_FANG
+	db 2, 4, DIG
+	db 3, 1, SOFTBOILED
+	db 3, 2, EGG_BOMB
+	db 3, 4, PSYCHIC_M
+	db 4, 1, FLY
+	db 4, 2, CUT
+	db 5, 1, WRAP
+	db 5, 2, SWORDS_DANCE
+	db 5, 3, STOMP
+	db 5, 4, LICK
 	db 0
-
-	db SABRINA, 1
-	db 2, 4, PSYWAVE
-	db 3, 1, PSYWAVE
+	
+	db YUJIROU, 7	; Yujirou 6 badges
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, THUNDERBOLT
+	db 2, 1, FIRE_BLAST
+	db 2, 2, TAKE_DOWN
+	db 3, 1, SOFTBOILED
+	db 3, 3, PSYCHIC_M
+	db 3, 4, ICE_BEAM
+	db 4, 1, FLY
+	db 5, 1, WRAP
+	db 5, 2, SWORDS_DANCE
+	db 5, 3, STOMP
+	db 5, 4, LICK
 	db 0
-
-	db GIOVANNI, 3
-	db 2, 3, FISSURE
-	db 2, 2, DOUBLE_TEAM
-	db 3, 1, EARTHQUAKE
-	db 3, 3, THUNDER
-	db 4, 1, SLASH
-	db 4, 2, THUNDER 
-	db 5, 1, EARTHQUAKE
-	db 5, 2, LEER
-	db 5, 3, THUNDER
-	db 6, 1, ROCK_SLIDE
+	
+	db YUJIROU, 8	; Yujirou 7 badges
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, THUNDERBOLT
+	db 2, 1, FIRE_BLAST
+	db 2, 4, TAKE_DOWN
+	db 3, 2, ICE_BEAM
+	db 3, 3, PSYCHIC_M
+	db 3, 4, SOFTBOILED
+	db 5, 1, WRAP
+	db 5, 2, SWORDS_DANCE
+	db 5, 3, STOMP
+	db 5, 4, EARTHQUAKE
+	db 0
+	
+	db YUJIROU, 9	; Yujirou 8 badges
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, THUNDERBOLT
+	db 2, 1, FIRE_BLAST
+	db 2, 4, FISSURE
+	db 3, 2, ICE_BEAM
+	db 3, 3, PSYCHIC_M
+	db 3, 4, SOFTBOILED
+	db 5, 3, BLIZZARD
+	db 5, 4, AMNESIA
+	db 6, 1, WRAP
+	db 6, 2, SWORDS_DANCE
+	db 6, 3, HYPER_BEAM
 	db 6, 4, EARTHQUAKE
 	db 0
 
-	db LORELEI, 1
-	db 1, 2, SURF 
-	db 2, 1, ICE_BEAM
-	db 2, 3, EXPLOSION 
-	db 2, 4, SURF
-	db 3, 1, BLIZZARD 
-	db 4, 1, BLIZZARD 
-	db 4, 2, PSYCHIC_M
-	db 4, 3, LOVELY_KISS 
-	db 5, 2, SUBMISSION
+	db BROCK, 1		; Brock 0 badges
+	db 3, 3, BIND
+	db 3, 4, BIDE
+	db 0
+	
+	db BROCK, 2		; Brock 1 badge
+	db 2, 3, WATER_GUN
+	db 2, 4, ABSORB
+	db 3, 4, BIDE
+	db 4, 1, BIDE
+	db 0
+	
+	db BROCK, 3		; Brock 2 badges
+	db 2, 4, BIDE
+	db 3, 2, BUBBLEBEAM
+	db 3, 4, ABSORB
+	db 4, 4, BIDE
+	db 5, 4, DIG
+	db 0
+	
+	db BROCK, 4		; Brock 3 badges
+	db 1, 4, MEGA_PUNCH
+	db 2, 4, BIDE
+	db 3, 2, BUBBLEBEAM
+	db 3, 4, ABSORB
+	db 4, 3, TAKE_DOWN
+	db 4, 4, BIDE
+	db 5, 3, DIG
+	db 5, 4, ROCK_SLIDE
+	db 0
+	
+	db BROCK, 5		; Brock 4 badges
+	db 1, 3, MEGA_PUNCH
+	db 2, 1, SURF
+	db 2, 4, HORN_ATTACK
+	db 3, 2, BUBBLEBEAM
+	db 4, 1, SUBSTITUTE
+	db 4, 2, TAKE_DOWN
+	db 5, 1, ROCK_SLIDE
+	db 5, 2, DIG
+	db 5, 3, BIND
+	db 0
+	
+	db BROCK, 6		; Brock 5 badges
+	db 1, 1, MEGA_PUNCH
+	db 1, 3, ROCK_SLIDE
+	db 2, 3, SURF
+	db 2, 4, ICE_BEAM
+	db 3, 1, SURF
+	db 3, 3, SWORDS_DANCE
+	db 4, 1, SUBSTITUTE
+	db 4, 4, DOUBLE_EDGE
+	db 5, 1, ROCK_SLIDE
+	db 5, 2, DIG
+	db 5, 4, BIND
+	db 0
+	
+	db BROCK, 7		; Brock 6 badges
+	db 1, 1, MEGA_PUNCH
+	db 1, 2, ROCK_SLIDE
+	db 2, 2, SURF
+	db 2, 3, ICE_BEAM
+	db 3, 1, SURF
+	db 3, 3, SWORDS_DANCE
+	db 4, 1, ROCK_SLIDE
+	db 4, 3, DOUBLE_EDGE
+	db 4, 4, SUBSTITUTE
+	db 5, 1, ROCK_SLIDE
+	db 5, 2, DIG
+	db 5, 4, BIND
+	db 0
+
+	db JESSIE_JAMES, 1	; Mt. Moon J&J
+	db 3, 3, POISON_GAS
+	db 0
+
+	db RIVAL1, 11		; Cerulean City Rival w/Wartortle
+	db 2, 2, THUNDER_WAVE
+	db 0
+
+	db RIVAL1, 12		; Cerulean City Rival w/Ivysaur
+	db 2, 2, THUNDER_WAVE
+	db 0
+
+	db RIVAL1, 13		; Cerulean City Rival w/Charmeleon
+	db 2, 2, THUNDER_WAVE
+	db 0
+
+	db RIVAL1, 15		; Cerulean City Rival w/Pikachu
+	db 4, 1, THUNDERSHOCK
+	db 0
+	
+	db MISTY, 1		; Misty 0 badges
+	db 1, 2, SMOKESCREEN
+	db 1, 3, LEER
+	db 2, 3, PECK
+	db 3, 4, BUBBLEBEAM
+	db 0
+
+	db MISTY, 2		; Misty 1 badge
+	db 1, 3, LEER
+	db 2, 3, PECK
+	db 3, 2, SCRATCH
+	db 4, 1, SWIFT
+	db 4, 4, BUBBLEBEAM
+	db 0
+	
+	db MISTY, 3		; Misty 2 badges
+	db 1, 3, LEER
+	db 2, 2, DOUBLE_TEAM
+	db 3, 2, TAIL_WHIP
+	db 3, 4, PECK
+	db 4, 2, SCRATCH
+	db 5, 1, SWIFT
+	db 5, 4, BUBBLEBEAM
+	db 0
+
+	db RIVAL2, 1		; SS Anne Rival w/Wartortle
+	db 3, 1, THUNDER_WAVE
+	db 0
+
+	db RIVAL2, 2		; SS Anne Rival w/Ivysaur
+	db 3, 1, THUNDER_WAVE
+	db 0
+
+	db RIVAL2, 3		; SS Anne Rival w/Charmeleon
+	db 3, 1, THUNDER_WAVE
+	db 0
+
+	db RIVAL2, 5		; SS Anne Rival w/Pikachu
+	db 4, 2, THUNDERSHOCK
+	db 0
+	
+	db LT_SURGE, 1		; Surge 0 badges
+	db 1, 3, THUNDER_WAVE
+	db 2, 2, THUNDERSHOCK
+	db 3, 4, THUNDERBOLT
+	db 0
+	
+	db LT_SURGE, 2		; Surge 1 badge
+	db 1, 4, THUNDER_WAVE
+	db 2, 1, THUNDERSHOCK
+	db 3, 4, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 5, 4, THUNDER_WAVE
+	db 0
+
+	db LT_SURGE, 3		; Surge 2 badges
+	db 2, 4, THUNDER_WAVE
+	db 3, 1, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 4, 4, THUNDER_WAVE
+	db 5, 1, THUNDERBOLT
+	db 5, 2, MEGA_PUNCH
+	db 5, 4, DOUBLE_TEAM
+	db 0
+	
+	db LT_SURGE, 4		; Surge 3 badges
+	db 1, 2, SWIFT
+	db 2, 1, THUNDERSHOCK
+	db 2, 3, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 4, 4, THUNDER_WAVE
+	db 5, 1, THUNDERBOLT
+	db 5, 2, MEGA_PUNCH
+	db 5, 4, DOUBLE_TEAM
+	db 0
+	
+	db LT_SURGE, 5		; Surge 4 badges
+	db 1, 2, SWIFT
+	db 2, 1, BODY_SLAM
+	db 2, 2, THUNDER_WAVE
+	db 2, 3, THUNDER
+	db 3, 2, SWIFT
+	db 4, 1, PSYCHIC_M
+	db 4, 2, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 5, 1, THUNDERBOLT
+	db 5, 2, MEGA_PUNCH
+	db 5, 4, SURF
+	db 0
+	
+	db LT_SURGE, 6		; Surge 5 badges
+	db 1, 1, SCREECH
+	db 1, 4, THUNDER
+	db 2, 1, BODY_SLAM
+	db 2, 2, THUNDER_WAVE
+	db 3, 1, THUNDERSHOCK
+	db 4, 1, PSYCHIC_M
+	db 4, 2, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 5, 1, THUNDERBOLT
+	db 5, 2, MEGA_PUNCH
+	db 5, 4, SURF
+	db 0
+	
+	db LT_SURGE, 7		; Surge 6 badges
+	db 1, 1, SCREECH
+	db 1, 4, THUNDER
+	db 2, 1, BODY_SLAM
+	db 2, 2, THUNDER_WAVE
+	db 3, 2, SWIFT
+	db 4, 1, PSYCHIC_M
+	db 4, 2, EARTHQUAKE
+	db 4, 4, THUNDERBOLT
+	db 5, 1, THUNDERBOLT
+	db 5, 2, MEGA_PUNCH
+	db 5, 4, SURF
+	db 0
+	
+	db RIVAL2, 6		; Pokemon Tower Rival w/Wartortle
+	db 1, 4, MIMIC
+	db 3, 3, LEECH_SEED
+	db 3, 4, CONFUSION
+	db 4, 1, THUNDER_WAVE
+	db 0
+
+	db RIVAL2, 7		; Pokemon Tower Rival w/Ivysaur
+	db 1, 4, MIMIC
+	db 2, 3, BUBBLEBEAM
+	db 2, 4, BIDE
+	db 4, 1, THUNDER_WAVE
+	db 5, 1, CUT
+	db 0
+
+	db RIVAL2, 8		; Pokemon Tower Rival w/Charmeleon
+	db 1, 4, MIMIC
+	db 2, 3, LEECH_SEED
+	db 2, 4, CONFUSION
+	db 3, 3, BUBBLEBEAM
+	db 3, 4, BIDE
+	db 4, 1, THUNDER_WAVE
+	db 5, 4, CUT
+	db 0
+	
+	db RIVAL2, 9		; Pokemon Tower Rival w/Eevee
+	db 1, 1, PECK
+	db 3, 3, EMBER
+	db 4, 1, CUT
+	db 4, 4, DIG
+	db 5, 4, BODY_SLAM
+	db 0
+
+	db RIVAL2, 10		; Pokemon Tower Rival w/Raichu
+	db 1, 1, PECK
+	db 2, 3, EMBER
+	db 4, 1, CUT
+	db 4, 4, DIG
+	db 5, 2, DOUBLE_TEAM
+	db 5, 4, QUICK_ATTACK
+	db 0
+	
+	db JACK, 1
+	db 1, 4, LEER
+	db 3, 4, MEGA_PUNCH
+	db 4, 3, CUT
+	db 0
+	
+	db JESSIE_JAMES, 2	; Rocket Hideout J&J
+	db 2, 1, WRAP
+	db 3, 1, WRAP
+	db 0
+	
+	db GIOVANNI, 1	; Rocket Hideout Giovanni
+	db 1, 1, FURY_ATTACK
+	db 1, 2, STRING_SHOT
+	DB 1, 4, POISON_STING
+	db 3, 2, MEGA_PUNCH
+	db 3, 4, TAIL_WHIP
+	db 4, 1, TAKE_DOWN
+	db 4, 4, SCREECH
+	db 0
+
+	db ERIKA, 2		; Erika 1 badge
+	db 1, 3, VINE_WHIP
+	db 3, 2, CUT
+	db 4, 4, MEGA_DRAIN
+	db 0
+
+	db ERIKA, 3		; Erika 2 badges
+	db 1, 2, GROWTH
+	db 1, 4, VINE_WHIP
+	db 1, 1, CUT
+	db 4, 2, CUT
+	db 5, 3, MEGA_DRAIN
+	db 0
+	
+	db ERIKA, 4		; Erika 3 badges
+	db 1, 1, GROWTH
+	db 1, 3, VINE_WHIP
+	db 2, 1, MEGA_DRAIN
+	db 2, 2, CUT
+	db 2, 4, SPORE
+	db 3, 3, SAND_ATTACK
+	db 4, 2, MEGA_DRAIN
+	db 5, 2, MEGA_DRAIN
+	db 5, 4, ACID
+	db 0
+	
+	db ERIKA, 5		; Erika 4 badges
+	db 1, 3, ACID
+	db 2, 1, CUT
+	db 2, 3, MEGA_DRAIN
+	db 3, 2, SAND_ATTACK
+	db 3, 4, VINE_WHIP
+	db 4, 2, MEGA_DRAIN
+	db 4, 3, BIND
+	db 5, 2, MEGA_DRAIN
+	db 5, 4, ACID
+	db 0
+	
+	db ERIKA, 6		; Erika 5 badges
+	db 1, 3, ACID
+	db 2, 2, MEGA_DRAIN
+	db 3, 1, EARTHQUAKE
+	db 3, 3, VINE_WHIP
+	db 4, 2, MEGA_DRAIN
+	db 4, 4, ACID
+	db 5, 1, BIND
+	db 5, 2, MEGA_DRAIN
+	db 5, 4, ROCK_SLIDE
+	db 0
+	
+	db ERIKA, 7		; Erika 6 badges
+	db 1, 3, ACID
+	db 2, 2, MEGA_DRAIN
+	db 3, 1, EARTHQUAKE
+	db 3, 3, VINE_WHIP
+	db 4, 2, MEGA_DRAIN
+	db 4, 4, ACID
+	db 5, 1, BIND
+	db 5, 2, MEGA_DRAIN
+	db 5, 4, ROCK_SLIDE
+	db 0
+	
+	db JESSIE_JAMES, 3	; Pokemon Tower J&J
+	db 2, 1, WRAP
+	db 3, 1, WRAP
+	db 5, 3, STUN_SPORE
+	db 5, 4, ACID
+	db 0
+	
+	db KOGA, 2		; Koga 1 badge
+	db 3, 4, SMOKESCREEN
+	db 4, 2, TOXIC
+	db 4, 3, SCREECH
+	db 0
+
+	db KOGA, 3		; Koga 2 badges
+	db 2, 4, WATER_GUN
+	db 3, 2, POUND
+	db 4, 1, TOXIC
+	db 5, 2, TOXIC
+	db 5, 3, SCREECH
+	db 0
+	
+	db KOGA, 4		; Koga 3 badges
+	db 1, 1, CONFUSION
+	db 1, 3, MEGA_DRAIN
+	db 2, 2, TOXIC
+	db 2, 4, ACID
+	db 3, 1, BODY_SLAM
+	db 3, 2, DISABLE
+	db 4, 4, TOXIC
+	db 5, 1, WING_ATTACK
+	db 5, 2, TOXIC
+	db 5, 4, SCREECH
+	db 0
+	
+	db KOGA, 5		; Koga 4 badges
+	db 1, 1, TOXIC
+	db 1, 3, MEGA_DRAIN
+	db 2, 1, TOXIC
+	db 2, 2, SURF
+	db 2, 3, WRAP
+	db 3, 3, BODY_SLAM
+	db 3, 4, TOXIC
+	db 4, 4, TOXIC
+	db 5, 1, TOXIC
+	db 5, 2, FLY
+	db 5, 3, SLUDGE
+	db 0
+	
+	db KOGA, 6		; Koga 5 badges
+	db 1, 1, TOXIC
+	db 1, 3, MEGA_DRAIN
+	db 2, 1, TOXIC
+	db 2, 2, SURF
+	db 2, 4, WRAP
+	db 3, 3, BODY_SLAM
+	db 3, 4, TOXIC
+	db 4, 1, TOXIC
+	db 5, 1, TOXIC
+	db 5, 2, FLY
+	db 0
+	
+	db BLACKBELT, 2		; Koichi 1 badge
+	db 2, 3, TACKLE
+	db 3, 4, TACKLE
+	db 4, 3, TACKLE
+	db 0
+
+	db BLACKBELT, 3		;  Koichi 2 badges
+	db 3, 3, TACKLE
+	db 4, 4, TACKLE
+	db 5, 3, TACKLE
+	db 0
+	
+	db BLACKBELT, 4		; Koichi 3 badges
+	db 2, 3, LEER
+	db 2, 4, UPPERCUT
+	db 3, 3, MEGA_KICK
+	db 3, 4, MIMIC
+	db 4, 4, MEGA_PUNCH
+	db 5, 3, TACKLE
+	db 5, 4, DIG
+	db 0
+	
+	db BLACKBELT, 5		; Koichi 4 badges
+	db 1, 4, ROCK_SLIDE
+	db 2, 2, LEER
+	db 2, 3, DIG
+	db 2, 4, SEISMIC_TOSS
+	db 3, 1, MIMIC
+	db 3, 3, MEGA_KICK
+	db 5, 2, DIG
+	db 0
+	
+	db BLACKBELT, 6		; Koichi 5 badges
+	db 1, 4, ROCK_SLIDE
+	db 2, 1, LOW_KICK
+	db 2, 2, LEER
+	db 2, 3, DIG
+	db 3, 1, MIMIC
+	db 3, 3, MEGA_KICK
+	db 5, 2, DIG
+	db 0
+	
+	db BLACKBELT, 7		; Koichi 6 badges
+	db 1, 3, ROCK_SLIDE
+	db 1, 4, EARTHQUAKE
+	db 2, 1, LOW_KICK
+	db 2, 2, LEER
+	db 2, 3, DIG
+	db 3, 2, MIMIC
+	db 3, 4, MEGA_KICK
+	db 5, 1, ROLLING_KICK
+	db 5, 2, DIG
+	db 0
+	
+	db BLACKBELT, 8		; Koichi 7 badges
+	db 1, 1, ROCK_SLIDE
+	db 1, 2, LOW_KICK
+	db 1, 3, EARTHQUAKE
+	db 2, 1, PIN_MISSILE
+	db 2, 2, UPPERCUT
+	db 3, 1, LOW_KICK
+	db 3, 2, ROCK_SLIDE
+	db 3, 3, DIG
+	db 4, 1, MIMIC
+	db 4, 2, MEGA_KICK
+	db 4, 3, MEDITATE
+	db 5, 1, COUNTER
+	db 5, 4, UPPERCUT
+	db 6, 1, DIG
+	db 0
+	
+	db BLACKBELT, 9		; Koichi 8 badges
+	db 1, 1, ROCK_SLIDE
+	db 1, 2, EARTHQUAKE
+	db 1, 3, SUBMISSION
+	db 2, 1, PIN_MISSILE
+	db 2, 2, UPPERCUT
+	db 3, 1, LOW_KICK
+	db 3, 3, ROCK_SLIDE
+	db 3, 4, DIG
+	db 4, 1, MIMIC
+	db 4, 2, MEDITATE
+	db 5, 3, UPPERCUT
+	db 6, 4, DIG
+	db 0
+	
+	db RIVAL2, 11		; Silph Co. Rival w/Totartle
+	db 1, 3, FLY
+	db 1, 4, MIMIC
+	db 3, 1, DIG
+	db 4, 2, BARRAGE
+	db 4, 4, CONFUSION
+	db 5, 2, THUNDER_WAVE
+	db 6, 1, BODY_SLAM
+	db 6, 2, MEGA_DRAIN
+	db 6, 3, SURF
+	db 0
+
+	db RIVAL2, 12		; Silph Co. Rival w/Venusaur
+	db 1, 3, FLY
+	db 1, 4, MIMIC
+	db 3, 1, SURF
+	db 4, 1, DIG
+	db 5, 2, THUNDER_WAVE
+	db 6, 2, BODY_SLAM
+	db 6, 3, GROWTH
+	db 0
+
+	db RIVAL2, 13		; Silph Co. Rival w/Charizard
+	db 1, 3, FLY
+	db 1, 4, MIMIC
+	db 3, 2, BARRAGE
+	db 3, 4, CONFUSION
+	db 4, 1, SURF
+	db 5, 2, THUNDER_WAVE
+	db 6, 1, FLY
+	db 6, 2, BODY_SLAM
+	db 6, 3, FLAMETHROWER
+	db 0
+	
+	db RIVAL2, 14		; Silph Co. Rival w/Umbreon
+	db 1, 3, DIG
+	db 1, 4, SWORDS_DANCE
+	db 2, 2, BARRAGE
+	db 2, 4, CONFUSION
+	db 3, 2, SWIFT
+	db 4, 1, CONFUSE_RAY
+	db 4, 4, FLAMETHROWER
+	db 5, 2, THUNDER_WAVE
+	db 6, 2, BODY_SLAM
+	db 0
+
+	db RIVAL2, 15		; Silph Co. Rival w/Raichu
+	db 1, 3, DIG
+	db 1, 4, SWORDS_DANCE
+	db 2, 1, BARRAGE
+	db 2, 4, CONFUSION
+	db 3, 1, CONFUSE_RAY
+	db 3, 4, FLAMETHROWER
+	db 5, 2, THUNDER_WAVE
 	db 6, 1, THUNDERBOLT
+	db 6, 2, BODY_SLAM
+	db 6, 4, DOUBLE_TEAM
+	db 0
+	
+	db JESSIE_JAMES, 4	; Silph Co. J&J
+	db 1, 2, SAND_ATTACK
+	db 3, 4, WRAP
+	db 5, 3, ACID
+	db 5, 4, STUN_SPORE
+	db 6, 1, SURF
+	db 0
+	
+	db GIOVANNI, 2	; Silph Co. Giovanni
+	db 1, 2, DOUBLE_EDGE
+	db 1, 3, POISON_STING
+	db 2, 3, MEGA_PUNCH
+	db 3, 1, SUBSTITUTE
+	db 3, 2, SEISMIC_TOSS
+	db 4, 1, DOUBLE_KICK
+	db 5, 1, DOUBLE_KICK
+	db 6, 1, THUNDERBOLT
+	db 6, 2, BUBBLEBEAM
+	db 0
+	
+	db SABRINA, 2		; Sabrina 1 badge
+	db 1, 3, WATER_GUN
+	db 3, 1, PSYWAVE
+	db 4, 3, PSYWAVE
+	db 4, 4, REFLECT
+	db 0
+
+	db SABRINA, 3		; Sabrina 2 badges
+	db 1, 4, WATER_GUN
+	db 3, 3, LEECH_SEED
+	db 3, 4, CONFUSION
+	db 4, 1, PSYWAVE
+	db 5, 3, PSYWAVE
+	db 5, 4, REFLECT
+	db 0
+	
+	db SABRINA, 4		; Sabrina 3 badges
+	db 1, 4, WATER_GUN
+	db 2, 3, PSYWAVE
+	db 2, 4, REFLECT
+	db 3, 3, CONFUSION
+	db 5, 1, REFLECT
+	db 0
+	
+	db SABRINA, 5		; Sabrina 4 badges
+	db 1, 1, QUICK_ATTACK
+	db 1, 4, SAND_ATTACK
+	db 2, 1, PSYWAVE
+	db 2, 3, SUBSTITUTE
+	db 3, 3, PSYCHIC_M
+	db 3, 4, SURF
+	db 4, 1, HYPNOSIS
+	db 4, 3, REFLECT
+	db 5, 1, REFLECT
+	db 0
+	
+	db SABRINA, 6		; Sabrina 5 badges
+	db 1, 1, QUICK_ATTACK
+	db 1, 4, SAND_ATTACK
+	db 2, 2, PSYWAVE
+	db 2, 4, SUBSTITUTE
+	db 3, 3, PSYCHIC_M
+	db 3, 4, SURF
+	db 4, 1, HYPNOSIS
+	db 4, 3, REFLECT
+	db 0
+	
+	db SABRINA, 7		; Sabrina 6 badges
+	db 1, 3, SAND_ATTACK
+	db 1, 4, QUICK_ATTACK
+	db 2, 2, PSYWAVE
+	db 2, 4, SUBSTITUTE
+	db 3, 2, PSYCHIC_M
+	db 3, 3, SURF
+	db 4, 2, HYPNOSIS
+	db 4, 4, REFLECT
+	db 0
+	
+	db BLAINE, 3		; Blaine 2 badges
+	db 2, 3, EMBER
+	db 3, 4, DIG
+	db 4, 1, CUT
+	db 5, 2, LEER
+	db 5, 3, SMOG
+	db 5, 4, FIRE_PUNCH
+	db 0
+	
+	db BLAINE, 4		; Blaine 3 badges
+	db 1, 1, EMBER
+	db 2, 2, EMBER
+	db 3, 2, DIG
+	db 4, 1, CUT
+	db 4, 4, GROWL
+	db 5, 2, LEER
+	db 5, 3, SMOG
+	db 5, 4, FIRE_PUNCH
+	db 0
+	
+	db BLAINE, 5		; Blaine 4 badges
+	db 2, 1, FLAMETHROWER
+	db 2, 2, DOUBLE_TEAM
+	db 2, 4, CONFUSE_RAY
+	db 3, 1, FIRE_BLAST
+	db 3, 2, SAND_ATTACK
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 5, 1, FIRE_BLAST
+	db 5, 2, SMOG
+	db 5, 4, FIRE_PUNCH
+	db 0
+	
+	db BLAINE, 6		; Blaine 5 badges
+	db 1, 2, STOMP
+	db 2, 1, FLAMETHROWER
+	db 2, 2, DOUBLE_TEAM
+	db 2, 4, CONFUSE_RAY
+	db 3, 1, FIRE_BLAST
+	db 3, 2, SAND_ATTACK
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 5, 1, FIRE_BLAST
+	db 5, 2, SMOG
+	db 0
+	
+	db BLAINE, 7		; Blaine 6 badges
+	db 1, 1, FIRE_SPIN
+	db 1, 2, STOMP
+	db 2, 1, FLAMETHROWER
+	db 2, 2, FIRE_SPIN
+	db 2, 4, CONFUSE_RAY
+	db 3, 4, FIRE_BLAST
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 5, 1, FIRE_BLAST
+	db 5, 2, SMOG
+	db 0
+
+	db GIOVANNI, 3		; Gym Leader Giovanni
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, EARTHQUAKE
+	db 2, 1, FISSURE
+	db 2, 2, EARTHQUAKE
+	db 3, 1, FIRE_BLAST
+	db 3, 2, ICE_BEAM
+	db 3, 3, SKULL_BASH
+	db 3, 4, BONEMERANG
+	db 4, 1, ROCK_SLIDE
+	db 4, 3, DOUBLE_KICK
+	db 5, 1, THUNDERBOLT
+	db 5, 3, DOUBLE_KICK
+	db 6, 1, FISSURE
+	db 6, 3, STOMP
+	db 6, 4, EARTHQUAKE
+	db 0
+	
+	db RIVAL2, 16		; Route 22 Rival w/Totartle
+	db 1, 2, SAND_ATTACK
+	db 1, 3, FLY
+	db 1, 4, DOUBLE_EDGE
+	db 2, 2, STRENGTH
+	db 3, 1, FIRE_BLAST
+	db 3, 2, DIG
+	db 4, 1, PSYCHIC_M
+	db 4, 2, SLEEP_POWDER
+	db 4, 4, SOLARBEAM
+	db 5, 1, THUNDER_WAVE
+	db 6, 1, BODY_SLAM
+	db 6, 2, MEGA_DRAIN
+	db 6, 3, SURF
+	db 6, 4, ICE_BEAM
+	db 0
+
+	db RIVAL2, 17		; Route 22 Rival w/Venusaur
+	db 1, 2, SAND_ATTACK
+	db 1, 3, FLY
+	db 1, 4, DOUBLE_EDGE
+	db 2, 2, STRENGTH
+	db 3, 3, SURF
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 5, 1, THUNDER_WAVE
+	db 6, 1, BODY_SLAM
+	db 6, 2, LEECH_SEED
+	db 0
+
+	db RIVAL2, 18		; Route 22 Rival w/Charizard
+	db 1, 2, SAND_ATTACK
+	db 1, 3, FLY
+	db 1, 4, DOUBLE_EDGE
+	db 2, 2, STRENGTH
+	db 3, 2, HYPNOSIS
+	db 3, 3, PSYCHIC_M
+	db 4, 2, ICE_BEAM
+	db 4, 3, SURF
+	db 5, 1, THUNDER_WAVE
+	db 6, 1, FLY
+	db 6, 2, BODY_SLAM
+	db 0
+	
+	db RIVAL2, 19		; Route 22 Rival w/Umbreon
+	db 1, 1, SAND_ATTACK
+	db 1, 2, SLASH
+	db 1, 4, SWORDS_DANCE
+	db 2, 2, HYPNOSIS
+	db 2, 3, PSYCHIC_M
+	db 3, 1, THUNDERBOLT
+	db 3, 2, DOUBLE_TEAM
+	db 4, 1, CONFUSE_RAY
+	db 4, 2, REFLECT
+	db 4, 4, FIRE_BLAST
+	db 5, 1, THUNDER_WAVE
+	db 6, 1, BODY_SLAM
+	db 6, 3, QUICK_ATTACK
+	db 0
+
+	db RIVAL2, 20		; Route 22 Rival w/Raichu
+	db 1, 1, SAND_ATTACK
+	db 1, 2, SLASH
+	db 1, 4, SWORDS_DANCE
+	db 2, 2, HYPNOSIS
+	db 2, 3, PSYCHIC_M
+	db 3, 1, CONFUSE_RAY
+	db 3, 2, REFLECT
+	db 3, 4, FIRE_BLAST
+	db 4, 1, SELFDESTRUCT
+	db 4, 4, ICE_BEAM
+	db 5, 1, THUNDER_WAVE
+	db 6, 1, THUNDERBOLT
+	db 6, 2, BODY_SLAM
+	db 6, 4, SURF
+	db 0
+
+	db LORELEI, 1
+	db 1, 1, SURF 
+	db 1, 3, HORN_DRILL
+	db 2, 1, EXPLOSION 
+	db 2, 3, ICE_BEAM
+	db 3, 1, BLIZZARD
+	db 3, 2, PSYCHIC_M
+	db 3, 1, BODY_SLAM
+	db 3, 2, MIST
+	db 4, 1, LOVELY_KISS 
+	db 4, 3, PSYCHIC_M
+	db 4, 4, COUNTER 
+	db 5, 1, BODY_SLAM
+	db 5, 2, REST
+	db 6, 1, HYPER_BEAM
+	db 6, 2, THUNDERBOLT
 	db 6, 3, BLIZZARD
 	db 0
 
 	db BRUNO, 1
-	db 1, 1, LOW_KICK
-	db 1, 2, ROCK_SLIDE
-	db 2, 1, ROCK_SLIDE
-	db 2, 3, EARTHQUAKE
-	db 3, 1, AMNESIA
-	db 3, 3, SURF
-	db 3, 4, ICE_BEAM
-	db 4, 1, JUMP_KICK
-	db 5, 1, BIND
-	db 5, 2, EARTHQUAKE
-	db 5, 3, SWORDS_DANCE
-	db 6, 2, KARATE_CHOP
-	db 6, 1, EARTHQUAKE
-	db 6, 4, ROCK_SLIDE
+	db 1, 3, MEDITATE
+	db 2, 1, EARTHQUAKE
+	db 2, 2, ROCK_SLIDE
+	db 2, 4, EXPLOSION
+	db 3, 1, SWORDS_DANCE
+	db 3, 2, SMART_STRIKE
+	db 3, 3, HYPER_BEAM
+	db 3, 4, BODY_SLAM
+	db 4, 1, SUBMISSION
+	db 5, 1, BODY_SLAM
+	db 5, 2, MEDITATE
+	db 6, 1, BODY_SLAM
+	db 6, 2, EARTHQUAKE
+	db 6, 3, ROCK_SLIDE
 	db 0
 
 	db AGATHA, 1
-	db 1, 2, HYDRO_PUMP
-	db 1, 3, NIGHT_SLASH
-	db 1, 1, SUBMISSION
-	db 3, 1, WRAP 
-	db 3, 4, SLEEP_POWDER
-	db 4, 1, TOXIC 
-	db 4, 3, DOUBLE_TEAM
-	db 5, 1, EARTHQUAKE
-	db 5, 3, SWORDS_DANCE
+	db 1, 1, LOW_KICK
+	db 1, 2, ROCK_SLIDE
+	db 1, 3, MEGA_PUNCH
+	db 2, 1, MEGA_DRAIN
+	db 2, 3, CONFUSE_RAY
+	db 2, 4, FLY
+	db 3, 1, THUNDERBOLT
+	db 3, 2, EXPLOSION
+	db 4, 1, WRAP
+	db 4, 4, EARTHQUAKE
+	db 5, 1, REST
+	db 5, 3, TOXIC
+	db 6, 1, THUNDERBOLT
+	db 6, 2, MEGA_DRAIN
+	db 6, 4, PSYCHIC_M
 	db 0
 
 	db LANCE, 1
-	db 1, 2, EARTHQUAKE
-	db 2, 3, BLIZZARD
-	db 4, 1, THUNDERBOLT 
-	db 5, 1, EARTHQUAKE
-	db 6, 1, BLIZZARD
+	db 1, 2, THUNDERBOLT
+	db 1, 4, ROCK_SLIDE
+	db 2, 1, BLIZZARD
+	db 2, 2, THUNDERBOLT 
+	db 3, 1, ICE_BEAM
+	db 3, 2, HYPER_BEAM
+	db 4, 1, SLASH
+	db 4, 2, SURF
+	db 4, 4, BODY_SLAM
+	db 5, 1, ROCK_THROW
+	db 5, 2, SKY_ATTACK
+	db 5, 3, DOUBLE_EDGE
+	db 5, 4, FIRE_BLAST
+	db 6, 2, BLIZZARD
+	db 6, 3, FIRE_BLAST
 	db 0
 
-	db RIVAL3, 1
-	db 3, 1, EARTHQUAKE
-	db 3, 2, ROCK_SLIDE
+	db RIVAL3, 1		; Champion Rival w/Totartle
+	db 1, 1, FLY
+	db 1, 2, SKY_ATTACK
+	db 1, 3, DOUBLE_EDGE
+	db 2, 1, THUNDER_WAVE
+	db 3, 2, BODY_SLAM
 	db 4, 1, FIRE_BLAST
-	db 5, 1, SLEEP_POWDER
-	db 5, 2, EXPLOSION 
-	db 5, 3, PSYCHIC_M
-	db 6, 1, BLIZZARD 
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 4, 4, DOUBLE_EDGE
+	db 5, 1, PSYCHIC_M
+	db 5, 2, SLEEP_POWDER
+	db 5, 4, SOLARBEAM
+	db 6, 2, BLIZZARD
+	db 6, 3, BODY_SLAM
 	db 0
 
-	db RIVAL3, 2
-	db 3, 1, EARTHQUAKE
-	db 3, 2, ROCK_SLIDE
-	db 4, 1, THUNDERBOLT
-	db 4, 2, BLIZZARD 
+	db RIVAL3, 2		; Champion Rival w/Venusaur
+	db 1, 1, FLY
+	db 1, 2, SKY_ATTACK
+	db 1, 3, DOUBLE_EDGE
+	db 2, 1, THUNDER_WAVE
+	db 3, 2, BODY_SLAM
+	db 4, 1, BLIZZARD
+	db 4, 2, THUNDERBOLT
 	db 5, 1, FIRE_BLAST
-	db 6, 4, HYPER_BEAM
+	db 5, 2, DIG
+	db 5, 3, AGILITY
+	db 5, 4, DOUBLE_EDGE
+	db 6, 1, SOLARBEAM
+	db 6, 3, BODY_SLAM
 	db 0
 
-	db RIVAL3, 3
-	db 3, 1, EARTHQUAKE
-	db 3, 2, ROCK_SLIDE
-	db 4, 1, SLEEP_POWDER
-	db 4, 2, EXPLOSION 
-	db 4, 3, PSYCHIC_M
-	db 5, 1, THUNDERBOLT
-	db 5, 2, BLIZZARD 
-	db 6, 1, EARTHQUAKE
+	db RIVAL3, 3		; Champion Rival w/Charizard
+	db 1, 1, FLY
+	db 1, 2, SKY_ATTACK
+	db 1, 3, DOUBLE_EDGE
+	db 2, 1, THUNDER_WAVE
+	db 3, 2, BODY_SLAM
+	db 4, 1, PSYCHIC_M
+	db 4, 2, SLEEP_POWDER
+	db 4, 4, SOLARBEAM
+	db 5, 1, BLIZZARD
+	db 5, 2, THUNDERBOLT
+	db 6, 1, FLY
+	db 6, 3, FIRE_BLAST
+	db 6, 4, EARTHQUAKE
+	db 0
+	
+	db RIVAL3, 4		; Champion Rival w/Umbreon
+	db 1, 1, SAND_ATTACK
+	db 1, 2, SLASH
+	db 1, 4, SWORDS_DANCE
+	db 2, 1, THUNDER_WAVE
+	db 3, 1, PSYCHIC_M
+	db 3, 2, SLEEP_POWDER
+	db 3, 4, SOLARBEAM
+	db 4, 1, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 5, 1, CONFUSE_RAY
+	db 5, 2, REFLECT
+	db 5, 4, FIRE_BLAST
+	db 6, 1, BODY_SLAM
+	db 6, 3, QUICK_ATTACK
+	db 0
+
+	db RIVAL3, 5		; Champion Rival w/Raichu
+	db 1, 1, SAND_ATTACK
+	db 1, 2, SLASH
+	db 1, 4, SWORDS_DANCE
+	db 2, 1, THUNDER_WAVE
+	db 3, 1, PSYCHIC_M
+	db 3, 2, SLEEP_POWDER
+	db 3, 4, SOLARBEAM
+	db 4, 1, CONFUSE_RAY
+	db 4, 2, REFLECT
+	db 4, 4, FIRE_BLAST
+	db 5, 1, EXPLOSION
+	db 5, 3, SURF
+	db 5, 4, BLIZZARD
+	db 6, 1, THUNDERBOLT
+	db 6, 2, BODY_SLAM
+	db 6, 3, THUNDER_WAVE
+	db 6, 4, SURF
 	db 0
 
 	db -1 ; end
diff --git a/text/CelesteHillOutside.asm b/text/CelesteHillOutside.asm
index f92a89dc..44d4d50f 100644
--- a/text/CelesteHillOutside.asm
+++ b/text/CelesteHillOutside.asm
@@ -1,7 +1,7 @@
 _CelesteHillOutsideBattleText1:: ; Selphy
-	text "W-what do you"
-	line "intend to do"
-	cont "with me?"
+	text "Huh? What do"
+	line "you intend to"
+	cont "do with me?"
 	done
 
 _CelesteHillOutsideEndBattleText1::
@@ -12,8 +12,8 @@ _CelesteHillOutsideEndBattleText1::
 	prompt
 
 _CelesteHillOutsideAfterBattleText1::
-	text "Oh I'm tired of"
-	line "this. Where is"
+	text "Sigh...I'm tired"
+	line "of this. Where's"
 	cont "my butler?"
 	done
 
@@ -38,11 +38,12 @@ _CelesteHillOutsideAfterBattleText2::
 	done
 
 _CelesteHillOutsideBattleText3:: ; Fan Club Chairman
-	text "I heard that a"
+	text "I've heard that a"
 	line "beautiful #MON"
 	cont "resides here."
-	cont "Do you know"
-	cont "about it?"
+
+	para "Do you know"
+	line "about it?"
 	done
 
 _CelesteHillOutsideEndBattleText3::
@@ -52,12 +53,49 @@ _CelesteHillOutsideEndBattleText3::
 
 _CelesteHillOutsideAfterBattleText3::
 	text "Once, I was a"
-	line "fierce TRAINER!"
-	para "My victory was"
-	line "assured!"
+	line "fierce trainer!"
+	cont "My victory was"
+	cont "assured!"
+	
 	para "...but I'm too"
 	line "rusty. Perhaps"
 	cont "I should try"
 	cont "something else..." ; Contest allusion for RSE
 	done
+	
+_HikerNPC::
+	text "Urgh...hey, kid."
+	line "Hear me out for"
+	cont "a sec, would ya?"
+	
+	para "I used to love"
+	line "climbing up this"
+	cont "hill, but after"
+	cont "getting attacked"
+	cont "by that nasty-"
+	cont "looking bird, I"
+	cont "can't go back!"
+
+	para "It had this real"
+	line "mean look on its"
+	cont "face, and its"
+	cont "huge wings looked"
+	cont "like they were on"
+	cont "fire!"
+
+	para "You look tough."
+	line "If you ever find"
+	cont "a #MON like"
+	cont "that, teach it a"
+	cont "lesson for me,"
+	cont "would ya?"
+	done
+
+_CelesteSign::
+	text "CELESTE HILL"
+	line "BIRDWATCHING"
+	
+	para "The writing is"
+	line "slightly faded."
+	done
 	
\ No newline at end of file