Trainer variety enhancements

- Toned down a significant amount of "repeats"; times where you repeatedly fight the same Pokemon or an evolution line.
- Integrated beta Pokemon more.
- Also, imported the LGPE retranslation of Bill. In Japanese, he isn't a PokeManiac, but a "Pokemon fanatic".

README.md

@@ -173,7 +173,9 @@ QoL Enhancements
 Bug Fixes
 ====
 Many non-multiplayer, non-battle related bugs have been fixed. Battle-related bugs have been preserved for the sake of the RBY battle experience. Bugs that are fixed are ones that objectively hurt the gameplay experience, so glitches like the Mew Glitch, which arguably add to the gameplay, are preserved. Much of the fixes made here can be attributed to [the tutorials](https://github.com/pret/pokered/wiki/Bugs-and-Glitches) made by the good people at pret.
-- Fixed various translation errors (eg. Route 14 Birdkeeper's "birds of prey" line, Koji and Atsuko in Fuschia.)
+- Fixed various translation errors/retcons (eg. Route 14 Birdkeeper's "birds of prey" line, Koji and Atsuko in Fuschia.)
+- More accurate translations from FRLG/LGPE (eg. Bill not being a PokeManiac, but a "Pokemon fanatic" from LGPE) have been ported.
+- Some grammar tweaks have been made (eg. If a move is disabled, it now has an upper-case D instead of a lower-case one.)
 - Blaine is no longer addicted to Super Potions.
 - CoolTrainerF no longer switches a lot.
 - Transformed Pokemon aren't presumed to be Dittos! Mew and Animon function correctly with this at play.
@@ -206,7 +208,6 @@ and more!
 - Trainer Name Pointers are removed, as the localised games don't need to use the file at all.
 - Dakutens are removed, as the Japanese accents aren't used in English releases.
 - Blank Leader Name code is removed; before, this would only be for the PNGs.
-- Some grammar tweaks have been made (eg. If a move is disabled, it now has an upper-case D instead of a lower-case one.)
 
 Known Bugs
 ====

data/trainers/parties.asm

@@ -63,6 +63,8 @@ TrainerDataPointers:
 	; every next two bytes are a level and species
 	; null-terminated
 
+; Mainly Normal- and Poison-type Pokemon, with a few minor exceptions.
+; To contrast with the Lass, in vanilla, he never uses Pidgey. Only Spearow.
 YoungsterData:
 ; Route 3
 	db 11, RATTATA, EKANS, 0
@@ -73,34 +75,35 @@ YoungsterData:
 	db 14, RATTATA, EKANS, ZUBAT, 0
 ; Route 25
 	db 15, RATTATA, SPEAROW, 0
-	db 17, SLOWPOKE, 0
+	db 17, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. Our changes make em not work anymore, but keep em for the iconography.
 	db 14, EKANS, SANDSHREW, 0
 ; SS Anne 1F Rooms
-	db 21, NIDORAN_M, 0
+	db 21, NIDORINO, 0
 ; Route 11
 	db 21, EKANS, 0
 	db 19, SANDSHREW, ZUBAT, 0
-	db 17, RATTATA, RATTATA, RATICATE, 0
+	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
 
+; Suffers heavily from limited Bug-types. Variety mainly comes from stripping them down and specialising them.
 BugCatcherData:
 ; Viridian Forest
 	db 6, WEEDLE, CATERPIE, 0
 	db 7, CATERPIE, KAKUNA, KOKANA, 0
 	db 9, VENONAT, 0
 ; Route 3
-	db 10, CATERPIE, WEEDLE, KOKANA, 0
+	db 10, KOKANA, KASANAGI, 0 ; trimmed down to create counterpart trainers
-	db 9,  WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
+	db 10, WEEDLE, KAKUNA, 0 
-	db 11, CATERPIE, METAPOD, 0
+	db 10, CATERPIE, METAPOD, 0
 ; Mt. Moon 1F
 	db 12, PARAS, 0 
 	db 10, KASANAGI, PARAS, 0
 ; Route 24
 	db 14, KOKANA, WEEDLE, 0
 ; Route 6
-	db 16, KOKANA, CATERPIE, WEEDLE, 0
+	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, PURAKKUSU, KLEAVOR, 0
@@ -108,37 +111,40 @@ BugCatcherData:
 	db 19, BUTTERFREE, BEEDRILL, 0
 	db 20, KASANAGI, VENONAT, BEEDRILL, 0
 
+; A strange trainer that usually uses "cute" Pokemon, mainly Normal, Flying, and Grass types.
+; Main exception is Pikachu and the Nidorans. I think adding Kotora enhances this nicely.
 LassData:
 ; Route 3
-	db 9, PIDGEY, PIDGEY, 0
+	db 9, PIDGEY, CLEFAIRY, 0
 	db 10, RATTATA, NIDORAN_M, 0
 	db 14, JIGGLYPUFF, 0
 ; Route 4
-	db 31, PARAS, PARAS, PARASECT, 0
+	db 37, PARASECT, CLEFABLE, GOROTORA, 0 ; Random boss fight near Cerulean Cave. Buffed her nicely.
 ; Mt. Moon 1F
 	db 11, ODDISH, BELLSPROUT, 0
 	db 14, CLEFAIRY, 0
 ; Route 24
+	db 16, KOTORA, PIKACHU, 0 ; why was this a carbon copy of the next entry??
 	db 16, PIDGEY, NIDORAN_F, 0
-	db 14, PIDGEY, NIDORAN_F, 0
 ; Route 25
 	db 15, NIDORAN_M, NIDORAN_F, 0
-	db 13, ODDISH, PIDGEY, ODDISH, 0
+	db 13, ODDISH, PIDGEY, BULBASAUR, 0
 ; SS Anne 1F Rooms
 	db 18, PIDGEY, NIDORAN_F, 0
 ; SS Anne 2F Rooms
 	db 18, RATTATA, PIKACHU, 0
 ; Route 8
 	db 23, NIDORAN_F, NIDORINA, 0
-	db 24, MEOWTH, MEOWTH, MEOWTH, 0
+	db 24, JIGGLYPUFF, MEOWTH, IVYSAUR, 0
 	db 19, PIDGEY, RATTATA, NIDORAN_M, MEOWTH, PIKACHU, 0
-	db 22, CLEFAIRY, CLEFAIRY, 0
+	db 22, JIGGLYPUFF, CLEFAIRY, 0
 ; Celadon Gym
 	db 23, LEAFEON, 0
 	db 23, ODDISH, GLOOM, 0
 ; Silph Gauntlet 2F (Mt. Moon)
 	db 63, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0
 
+; Pretty much a Fisher with Machops and the random Vermilion Gym featuring.
 SailorData:
 ; SS Anne Stern
 	db 18, MACHOP, SHELLDER, 0
@@ -147,13 +153,14 @@ SailorData:
 	db 21, SHELLDER, 0
 	db 17, HORSEA, SHELLDER, TENTACOOL, 0
 	db 18, TENTACOOL, STARYU, 0
-	db 17, HORSEA, HORSEA, HORSEA, 0
+	db 17, POLIWAG, RIBBITO, PIKACHU, 0 ; I like the idea of Sailors using Pikachu to "light the way".
 	db 20, MACHOP, 0
 ; Vermilion Gym
 	db 21, KOTORA, GAOTORA, 0
 ; Silph Gauntlet 3F (S.S Anne)
 	db 64, KINGDRA, MACHAMP, TAABAN, STARMIE, GOROTORA, TENTACRUEL, 0
 
+; One of the most varied trainers in the game. No criticisms.
 JrTrainerMData:
 ; Pewter Gym
 	db 11, GEODUDE, SANDSHREW, 0
@@ -162,7 +169,7 @@ JrTrainerMData:
 ; Route 24
 	db 18, MANKEY, 0
 ; Route 6
-	db 20, SQUIRTLE, 0
+	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
@@ -172,16 +179,17 @@ JrTrainerMData:
 ; Route 12
 	db 29, NIDORAN_M, NIDORINO, 0
 
+; As varied as the male counterpart. Improvements come from reducing repeats.
 JrTrainerFData:
 ; Cerulean Gym
 	db 19, GYOPIN, GOLDEEN, 0
 ; Route 6
-	db 16, RATTATA, PIKACHU, 0
+	db 20, CUBONE, 0 ; Giselle from School of Hard Knocks, Indigo League Ep9, featured in Yellow
-	db 16, PIDGEY, PIDGEY, PIDGEY, 0
+	db 16, PIDGEY, SPEAROW, FARFETCHD, 0
 ; Unused
 	db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
 ; Route 9
-	db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0
+	db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 ; This trainer, often called the "Wrapping Lass", is a notorious run-killer. Do not change, she's a benchmark.
 	db 23, MEOWTH, 0
 ; Route 10
 	db 20, PIKACHU, CLEFAIRY, 0
@@ -192,16 +200,16 @@ JrTrainerFData:
 ; Celadon Gym
 	db 24, BULBASAUR, IVYSAUR, 0
 ; Route 13
-	db 24, PIDGEY, MEOWTH, RATTATA, PIKACHU, MEOWTH, 0
+	db 24, PIDGEY, JIGGLYPUFF, RATTATA, PIKACHU, MEOWTH, 0
 	db 30, POLIWAG, POLIWAG, 0
-	db 27, PIDGEY, MEOWTH, PIDGEY, PIDGEOTTO, 0
+	db 27, PIDGEY, MEOWTH, FARFETCHD, PIDGEOTTO, 0
 	db 28, GOLDEEN, POLIWAG, HORSEA, 0
 ; Route 20
 	db 31, GOLDEEN, SEAKING, 0
 ; Rock Tunnel 1F
 	db 22, BELLSPROUT, CLEFAIRY, 0
 	db 20, MEOWTH, ODDISH, PIDGEY, 0
-	db 19, PIDGEY, RATTATA, RATTATA, BELLSPROUT, 0
+	db 19, PIDGEY, RATTATA, CLEFAIRY, BELLSPROUT, 0
 ; Route 15
 	db 28, GLOOM, ODDISH, ODDISH, 0
 	db 29, PIKACHU, RAICHU, 0
@@ -212,21 +220,24 @@ JrTrainerFData:
 ; Silph Gauntlet 1F (Viridian Forest)
 	db 62, TSUBOMITTO, SEAKING, TANGROWTH, MADAAMU, BELLOSSOM, GOROCHU, 0
 
+; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon.
+; Skimper seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
 PokemaniacData:
 ; Route 10
 	db 30, RHYHORN, LICKITUNG, 0
 	db 20, CUBONE, SLOWPOKE, 0
 ; Rock Tunnel B1F
-	db 20, SLOWPOKE, SLOWPOKE, SLOWPOKE, 0
+	db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
 	db 22, CHARMANDER, CUBONE, 0
-	db 25, SLOWPOKE, 0
+	db 25, SKIMPER, 0
 ; Victory Road 2F
-	db 40, CHARMELEON, LAPRAS, LICKITUNG, 0
+	db 40, CHARMELEON, LAPRAS, LICKILICKY, RHYDON, 0
 ; Rock Tunnel 1F
 	db 23, CUBONE, SLOWPOKE, 0
 ; Silph Gauntlet (currently 2F but may move up to 5F)
 	db 63, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
 
+; Feels almost aimless...
 SuperNerdData:
 ; Mt. Moon 1F
 	db 11, MAGNEMITE, VOLTORB, 0
@@ -240,13 +251,16 @@ SuperNerdData:
 	db 30, PORYGON, 0 ; - used in celadon university
 	db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university
 ; Silph Gauntlet 2F (Mt. Moon)
-	db 63, MAGNEZONE, MUK, KABUTOPS, OMASTAR, AERODACTYL, MAGMORTAR, 0
+	db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, MAGMORTAR, 0
 ; Cinnabar Gym
 	db 36, VULPIX, NINETALES, CHARIZARD, 0
 	db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0
 	db 41, FLAREON, 0
 	db 37, CHARMELEON, MAGMAR, 0
 
+; Expanding the Hiker's cast is hard, as Rock-types are actually quite limited.
+; Machop is more of an exception and not the rule, it's just "strong".
+; So, I have added a few Ground-types that you could reasonably expect to see in each area.
 HikerData:
 ; Mt. Moon 1F
 	db 10, GEODUDE, GEODUDE, ONIX, 0
@@ -256,47 +270,56 @@ HikerData:
 	db 17, ONIX, 0
 ; Route 9
 	db 21, GEODUDE, ONIX, 0
-	db 20, GEODUDE, MACHOP, GEODUDE, 0
+	db 20, GEODUDE, MACHOP, DIGLETT, 0
 ; Route 10
-	db 21, GEODUDE, ONIX, 0
+	db 21, CUBONE, ONIX, 0
-	db 19, ONIX, GRAVELER, 0
+	db 19, SANDSHREW, GRAVELER, 0
 ; Rock Tunnel B1F
-	db 21, GEODUDE, GEODUDE, GRAVELER, 0
+	db 21, GEODUDE, GEODUDE, GRAVELER, 0 ; The "Self-Destructing Hiker", fairly notorious and good to keep
-	db 25, GEODUDE, 0
+	db 23, NIDOKING, 0 ; could be a little strong, but I'll give it a go
 ; Route 9/Rock Tunnel B1F
-	db 20, MACHOP, ONIX, 0
+	db 20, MACHOP, RHYHORN, 0
 ; Rock Tunnel 1F
-	db 19, GEODUDE, MACHOP, GEODUDE, GEODUDE, 0
+	db 19, GEODUDE, MACHOP, RHYHORN, 0
-	db 20, ONIX, ONIX, GEODUDE, 0
+	db 20, MACHOP, DIGLETT, ONIX, 0
 	db 21, GEODUDE, GRAVELER, 0
 ; Silph Gauntlet 2F (Mt. Moon)
 	db 63, STEELIX, GOLEM, MACHAMP, CROBAT, CROAKOZUNA, GUARDIA, 0
 
+; Poison Pokemon. Poison Pokemon everywhere.
+; Much of this seems to represent the pollution caused by petrol gas.
+; So while Poison should be here, edits should be made with that in mind.
+; This makes editing the Biker deceptively difficult.
+; GSC adds Smokescreen Fire-types like Flareon, Magmar, and Charmeleon.
+; I think we should do that, as well as add Horsea and Seadra into the mix.
+; This makes for a much better Biker.
+; There seems to be a common "coughing and wheezing" joke here, shifting that around too.
 BikerData:
 ; Route 13
-	db 28, KOFFING, KOFFING, KOFFING, 0
+	db 28, KOFFING, GASTLY, 0
 ; Route 14
-	db 29, KOFFING, GRIMER, 0
+	db 29, GRIMER, KOFFING, 0
 ; Route 15
-	db 25, KOFFING, KOFFING, WEEZING, KOFFING, GRIMER, 0
+	db 25, KOFFING, GRIMER, WEEZING, 0
-	db 28, KOFFING, GRIMER, WEEZING, 0
+	db 28, GASTLY, GRIMER, WEEZING, 0
 ; Route 16
 	db 29, GRIMER, KOFFING, 0
 	db 33, WEEZING, 0
-	db 26, GRIMER, GRIMER, GRIMER, GRIMER, 0
+	db 26, CHARMELEON, 0
-; Route 17
+; Route 17 (Cycling Road)
 	db 28, WEEZING, KOFFING, WEEZING, 0
-	db 33, MUK, 0
+	db 33, FLAREON, 0
-	db 29, VOLTORB, VOLTORB, 0
+	db 29, VOLTORB, GAOTORA, 0
 	db 29, WEEZING, MUK, 0
-	db 25, KOFFING, WEEZING, KOFFING, KOFFING, WEEZING, 0
+	db 25, CHARMANDER, WEEZING, HORSEA, 0
 ; Route 14
 	db 26, KOFFING, KOFFING, GRIMER, KOFFING, 0
-	db 28, GRIMER, GRIMER, KOFFING, 0
+	db 28, GRIMER, GRIMER, SEADRA, 0
-	db 29, KOFFING, MUK, 0
+	db 29, MAGMAR, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, HITMONTOP, MUK_A, WEEZING, RAPIDASH, HYPNO, GOROTORA, 0
+	db 66, GENGAR, 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
@@ -310,80 +333,84 @@ BurglarData:
 ; Mansion 2F
 	db 34, CHARMANDER, CHARMELEON, 0
 ; Mansion 3F
-	db 38, NINETALES, 0
+	db 38, PUCHIKOON, NINETALES, 0
 ; Mansion B1F
 	db 34, GROWLITHE, PONYTA, 0
-; Victory Road - BIG SHOT
-;	db $FF, 47, ANIMON, 47, MADAAMU, 50, CRYITHAN, 50, GUARDIA, 50, TANGROWTH, 53, GYARADOS, 0
 
+; Electric dude with little variety due to not being seen often
 EngineerData:
 ; Unused - used in celadon university
 	db 36, GOLEM, 0
 ; Route 11
-	db 21, MAGNETITE, 0
+	db 21, KOTORA, VOLTORB, 0
 	db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
 ; Silph Gauntlet 3F (S.S Anne)
 	db 64, ELECTRODE, GOLEM_A, MAGNEZONE, 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:
 ; SS Anne 2F Rooms
-	db 17, GOLDEEN, TENTACOOL, GOLDEEN, 0
+	db 17, GOLDEEN, TENTACOOL, KRABBY, 0
 ; SS Anne B1F Rooms
 	db 17, TENTACOOL, STARYU, SHELLDER, 0
 ; Route 12
-	db 22, GOLDEEN, POLIWAG, GOLDEEN, 0
+	db 22, GOLDEEN, POLIWAG, CHEEP, 0
 	db 24, TENTACOOL, GOLDEEN, 0
-	db 27, GOLDEEN, 0
+	db 27, SEADRA, 0 ; You can catch low-level Seadra in places, I like the surprise.
 	db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0
 ; Route 21
-	db 28, SEAKING, GOLDEEN, SEAKING, SEAKING, 0
+	db 28, PSYDUCK, CHEEP, KINGLER, 0
 	db 31, SHELLDER, TAABAN, 0
-	db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0
+	db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0 ; he's too iconic to change
-	db 33, SEAKING, GOLDEEN, 0
+	db 33, SEAKING, JAGG, 0
 ; Route 12
-	db 24, MAGIKARP, MAGIKARP, 0
+	db 24, SKIMPER, WIGLETT, 0
 ; Silph Gauntlet 3F (S.S Anne)
 	db 64, GYARADOS, SEAKING, TAABAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
 
+; God this took forever to remove repeats from
+; Surf encounter extravaganza
 SwimmerData:
 ; Cerulean Gym
 	db 16, HORSEA, SHELLDER, 0
 ; Route 19
 	db 30, TENTACOOL, TAABAN, 0
 	db 29, GOLDEEN, HORSEA, STARYU, 0
-	db 30, POLIWAG, POLIWHIRL, 0
+	db 30, WEIRDUCK, POLIWHIRL, 0
 	db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0
-	db 29, GOLDEEN, SHELLDER, SEAKING, 0
+	db 29, GOLDEEN, SEAKING, BAWLIGUA, 0
-	db 30, HORSEA, HORSEA, 0
+	db 30, WIGLETT, CLOYSTER, 0
-	db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0 ;- removed to free space for oak teams
+	db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0
 ; Route 20
 	db 31, SHELLDER, CLOYSTER, 0
 	db 35, STARYU, 0
-	db 28, HORSEA, HORSEA, SEADRA, HORSEA, 0
+	db 28, HORSEA, BLOTTLE, SEADRA, PENDRAKEN, 0
 ; Route 21
 	db 33, SEADRA, TENTACRUEL, 0
 	db 37, STARMIE, 0
-	db 33, STARYU, WARTORTLE, 0
+	db 33, BLASTYKE, STARYU, WARTORTLE, 0
-	db 32, POLIWHIRL, TENTACOOL, SEADRA, 0
+	db 32, POLIWHIRL, TENTACOOL, GOLDUCK, 0
 ; Silph Gauntlet 5F (Safari Zone)
 	db 66, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0
 
+; Fighting specialist, very odd.
 CueBallData:
 ; Route 16
-	db 28, MACHOP, MANKEY, MACHOP, 0
+	db 28, MACHOP, MANKEY, RATICATE, 0
-	db 29, MANKEY, MACHOP, 0
+	db 29, MANKEY, RIBBITO, 0
-	db 33, MACHOP, 0
+	db 33, CARAPTHOR, 0
 ; Route 17
 	db 29, MANKEY, PRIMEAPE, 0
 	db 29, MACHOP, MACHOKE, 0
-	db 33, MACHOKE, 0
+	db 33, JABETTA, 0
-	db 26, MANKEY, MANKEY, MACHOKE, MACHOP, 0
+	db 26, MANKEY, MACHOKE, CROAKOZUNA, 0
 	db 29, PRIMEAPE, MACHOKE, 0
 ; Route 21
 	db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, CLEFABLE, 0
+	db 66, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, TENTACRUEL, 0
 
+; Big variety, kind of aimless; seems to be a counterparts thing.
 GamblerData:
 ; Route 11
 	db 18, POLIWAG, HORSEA, 0
@@ -391,61 +418,68 @@ GamblerData:
 	db 18, VOLTORB, MAGNEMITE, 0
 	db 18, GROWLITHE, VULPIX, 0
 ; Route 8
-	db 22, POLIWAG, POLIWAG, POLIWHIRL, 0
+	db 22, POLIWAG, RIBBITO, POLIWHIRL, 0
 ; Silph Gauntlet 4F (Lavender Tower)
 	db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
 ; Route 8
-	db 24, GROWLITHE, VULPIX, 0
+	db 24, CACTUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
 
+; Very varied, little criticism outside of minor repeats.
+; Seems to use whatever the route demands of the class, which I enjoy seeing.
+; There is a minor focus on "cute" and "regal" Pokemon.
 BeautyData:
 ; Celadon Gym
 	db 21, ODDISH, BELLSPROUT, WEEPINBELL, 0
 	db 24, TOEDSCOOL, MONJA, 0
 	db 26, DEER, 0
 ; Route 13
-	db 27, RATTATA, PIKACHU, RATTATA, 0
+	db 27, RATTATA, PIKACHU, JIGGLYPUFF, 0
 	db 29, CLEFAIRY, MEOWTH, 0
 ; Route 20
 	db 35, SEAKING, 0
 	db 30, SHELLDER, TAABAN, CLOYSTER, 0
 	db 31, POLIWAG, SEAKING, 0
 ; Route 15
-	db 29, PIDGEOTTO, WIGGLYTUFF, 0
+	db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine
 	db 29, BULBASAUR, IVYSAUR, 0
 ; Silph Gauntlet 3F (S.S Anne)
-	db 64, STARMIE, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
+	db 64, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
 ; Route 19
-	db 27, POLIWAG, GOLDEEN, SEAKING, GOLDEEN, POLIWAG, 0
+	db 27, POLIWAG, GOLDEEN, SEAKING, 0
-	db 30, GOLDEEN, SEAKING, 0
+	db 30, BLASTYKE, GOLDUCK, 0
-	db 29, STARYU, STARYU, STARYU, 0
+	db 29, STARYU, WEIRDUCK, SEAKING, 0
 ; Route 20
-	db 30, SEADRA, HORSEA, SEADRA, 0
+	db 30, KINGDRA, 0 ; Close to the Trader
 
+; yep psychic yep psychic yep psychic
 PsychicData:
 ; Saffron Gym
-	db 31, KADABRA, SLOWPOKE, MR_MIME, KADABRA, 0
+	db 31, KADABRA, SLOWPOKE, MR_MIME, DROWZEE, 0
 	db 34, MR_MIME, KADABRA, 0
-	db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0
+	db 33, SLOWKING, SLOWBRO, 0 ; not as strong as it looks, has no good attacks
-	db 38, SLOWBRO, 0
+	db 38, JYNX, 0
 ; Silph Gauntlet 4F (Lavender Tower)
 	db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 
 
+; Electric specialist with depressingly little representation.
+; Not even a Silph Gauntlet entry! What a joke!
 RockerData:
 ; Vermilion Gym
 	db 20, VOLTORB, MAGNEMITE, MAGNETITE, 0
 ; Route 12
 	db 29, VOLTORB, ELECTRODE, 0
 
+; Psychic, Poison, and a little bit of Voltorb.
 JugglerData:
 ; Silph Co. 5F
 	db 29, KADABRA, MR_MIME, 0
 ; Victory Road 2F
-	db 41, DROWZEE, HYPNO, KADABRA, KADABRA, 0
+	db 41, DROWZEE, HYPNO, ESPEON, KADABRA, 0
 ; Fuchsia Gym
 	db 31, BEEDRILL, HAUNTER, VILEPLUME, 0
-	db 34, TENTACOOL, TENTACRUEL, 0
+	db 34, GOLBAT, TENTACRUEL, 0
 ; Victory Road 2F
-	db 48, MR_MIME, 0
+	db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster
 ; Silph Gauntlet 5F (Safari Zone)
 	db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0
 ; Fuchsia Gym
@@ -453,6 +487,9 @@ JugglerData:
 ; Fuchsia Gym
 	db 34, WEEPINBELL, TSUBOMITTO, 0
 
+; In Japanese, they are called "Fierce Beast users", and in turn use Pokemon
+; based on those "fierce" beasts. Think lions, etc.
+; Basically, Safari Zone extravaganza.
 TamerData:
 ; Fuchsia Gym
 	db 34, NIDOQUEEN, ARBOK, 0
@@ -461,14 +498,17 @@ TamerData:
 	db 43, RHYDON, 0
 	db 39, SANDSLASH, TRAMPEL, 0
 ; Victory Road 2F
-	db 44, TAUROS, GOLDUCK, 0
+	db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
+	db 66, RHYPERIOR, GOLDUCK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
 
+; yep bird yep bird yep bird yep bird
+; If nothing else, just make them less agonising to fight.
+; Namely, reduce the amount of Pokemon on their teams.
 BirdKeeperData:
 ; Route 13
 	db 29, PIDGEY, PIDGEOTTO, 0
-	db 25, SPEAROW, PIDGEY, PIDGEY, SPEAROW, SPEAROW, 0
+	db 25, FARFETCHD, PIDGEY, SPEAROW, 0
 	db 26, PIDGEY, PIDGEOTTO, SPEAROW, FEAROW, 0
 ; Route 14
 	db 33, FARFETCHD, 0
@@ -481,7 +521,7 @@ BirdKeeperData:
 	db 34, DODRIO, 0
 	db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0
 ; Route 20
-	db 30, FEAROW, FEAROW, PIDGEOTTO, 0
+	db 30, FEAROW, MADAAMU, PIDGEOTTO, 0
 ; Unused
 	db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0
 ; Silph Gauntlet 1F (Viridian Forest)
@@ -492,10 +532,12 @@ BirdKeeperData:
 	db 29, PIDGEOTTO, FEAROW, 0
 	db 28, SPEAROW, DODUO, FEAROW, 0
 
+; Uses Silph products and Steel-types
 ChiefData:
 ; Silph Gauntlet 7F
 	db $FF, 73, PORYGON2, 72, LAPRAS, 73, SCIZOR, 73, MAGNEZONE, 75, PORYGONZ, 77, OMEGA, 0
 
+; Poison- and Electric-type Pokemon
 ScientistData:
 ; Silph Gauntlet 4F (Lavender Tower)
 	db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0
@@ -503,27 +545,27 @@ ScientistData:
 	db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
 	db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
 ; Silph Co. 3F/Mansion 1F
-	db 29, ELECTRODE, WEEZING, 0
+	db 29, ELECTRODE, MUK, 0
 ; Silph Co. 4F
-	db 33, ELECTRODE, 0
+	db 33, VOLTORB, ELECTRODE, KOFFING, 0
 ; Silph Co. 5F
 	db 26, MAGNETON, KOFFING, WEEZING, MAGNEMITE, 0
 ; Silph Co. 6F
 	db 25, VOLTORB, KOFFING, MAGNETON, MAGNEMITE, KOFFING, 0
 ; Silph Co. 7F
-	db 29, ELECTRODE, MUK, 0
+	db 29, PORYGON, 0 ; stolen technology!!!
 ; Silph Co. 8F
 	db 29, GRIMER, ELECTRODE, 0
 ; Silph Co. 9F
 	db 28, VOLTORB, KOFFING, MAGNETON, 0
 ; Silph Co. 10F
-	db 29, MAGNEMITE, KOFFING, 0
+	db 29, MAGNETITE, KOFFING, 0
 ; Mansion 3F
-	db 33, MAGNEMITE, MAGNETON, VOLTORB, 0
+	db 33, MAGNETITE, MAGNETON, DITTO, 0
 ; Mansion B1F
 	db 34, MAGNEMITE, ELECTRODE, 0
 
-RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
+RocketData:
 ; Mt. Moon B2F
 	db 13, RATTATA, BITTYBAT, 0
 	db 11, SANDSHREW, RATTATA, BITTYBAT, 0
@@ -535,24 +577,24 @@ RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
 	db 15, EKANS, ZUBAT, 0
 ; Game Corner
 	db 22, ZUBAT, KOFFING, RATICATE, ARBOK, 0
+; Rocket Hideout B1F WHY THE FUCK WAS IT AN L42 HYPNO N SHITE WTFFFFF BRO
+	db 22, DROWZEE, KOFFING, ARBOK, 0
 ; Rocket Hideout B1F
-	db 42, HYPNO, WEEZING, ARBOK, 0
-; Rocket Hideout B1F - all now unused
 	db 21, RATICATE, RATICATE, 0
 	db 20, GRIMER, KOFFING, KOFFING, 0
 	db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0
 	db 22, GRIMER, KOFFING, 0
 ; Rocket Hideout B2F
-	db 17, ZUBAT, KOFFING, GRIMER, ZUBAT, RATICATE, 0
+	db 17, ZUBAT, KOFFING, GRIMER, CUBONE, RATICATE, 0
 ; Rocket Hideout B3F
 	db 20, RATTATA, RATICATE, DROWZEE, 0
-	db 21, MACHOP, MACHOP, 0
+	db 21, MACHOP, DROWZEE, 0
 ; Rocket Hideout B4F
 	db 23, SANDSHREW, EKANS, SANDSLASH, 0
 	db 23, EKANS, SANDSHREW, ARBOK, 0
 	db 21, KOFFING, ZUBAT, 0
 ; Pokémon Tower 7F
-	db 25, ZUBAT, ZUBAT, GOLBAT, 0
+	db 25, ZUBAT, GRIMER, GOLBAT, 0
 	db 26, KOFFING, DROWZEE, 0
 	db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
 ; Silph Gauntlet 4F (Lavender Tower)
@@ -573,7 +615,7 @@ RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
 	db 28, ZUBAT, ZUBAT, GOLBAT, 0
 ; Silph Co. 7F
 	db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0
-	db 29, CUBONE, CUBONE, 0
+	db 29, CUBONE, MACHOKE, 0
 	db 29, SANDSHREW, SANDSLASH, 0
 ; Silph Co. 8F - cut
 	db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0
@@ -584,9 +626,10 @@ RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
 ; Silph Co. 10F - cut
 	db 33, MACHOKE, 0
 ; Silph Co. 11F
-	db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0
+	db 25, RATTATA, ZUBAT, EKANS, RATICATE, 0
 	db 32, CUBONE, DROWZEE, MAROWAK, 0
 
+; Very varied, nothing to say
 CooltrainerMData:
 ; Viridian Gym
 	db 39, MAROWAK, NIDOKING, 0
@@ -605,31 +648,33 @@ CooltrainerMData:
 	db 39, SANDSLASH, DUGTRIO, 0
 	db 43, NIDOKING, 0
 
+; Equally varied, nothing to say
 CooltrainerFData:
 ; Celadon Gym
 	db 24, CACTUS, GLOOM, 0
 ; Victory Road 3F
-	db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0
+	db 43, TSUBOMITTO, VICTREEBEL, 0
 	db 43, PARASECT, DEWGONG, CHANSEY, 0
 ; Silph Gauntlet 5F (Safari Zone)
 	db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
 ; Victory Road 1F
-	db 44, PERSIAN, NINETALES, 0
+	db 44, PERSIAN, NINETALES, BELLOSSOM, 0
 ; Unused
 ;	db 45, IVYSAUR, VENUSAUR, 0
 ;	db 45, NIDORINA, NIDOQUEEN, 0
 ;	db 43, PERSIAN, NINETALES, RAICHU, 0
 
+; "Dignified" Pokemon associated with the privileged class.
 GentlemanData:
 ; SS Anne 1F Rooms
 	db 18, GROWLITHE, CARAPTHOR, 0
-	db 19, NIDORAN_M, NIDORAN_F, 0
+	db 19, NIDORINO, NIDORINA, 0
 ; 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
 ; SS Anne 2F Rooms
-	db 17, GROWLITHE, PONYTA, 0
+	db 17, PUCHIKOON, GROWLITHE, 0
 
 ChannelerData:
 ; Unused
@@ -652,7 +697,7 @@ ChannelerData:
 ; Pokémon Tower 4F, now unused 
 	db 22, GASTLY, 0
 ; Unused
-;	db 24, GASTLY, 0
+	db 24, GASTLY, 0
 ; Pokémon Tower 5F, now unused 
 	db 23, HAUNTER, 0
 ; Unused
@@ -670,15 +715,17 @@ ChannelerData:
 	db 38, ESPEON, 0
 	db 33, JYNX, EXEGGCUTE, KADABRA, 0
 
+; Normal specialists
 StudentData:
 ; Viridian Pre-Gym
 	db 4, PIDGEY, RATTATA, 0
 	db 6, CLEFAIRY, 0
 ; Silph Gauntlet 1F (Viridian Forest)
-	db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0		; may revise
+	db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, NINETALES_A, 0		; may revise
 ; Celadon University
 	db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
 
+; Water specialists
 FirefighterData:
 ; For Cerulean Gym
 	db 15, POLIWAG, CHEEP, SQUIRTLE, 0

text/BillsHouse.asm

@@ -5,9 +5,11 @@ _BillsHouseText_1e865::
 
 	para "Call me BILL!"
 	line "I'm a true blue"
-	cont "#MANIAC! Hey!"
+	cont "#MON fanatic!" ; restoring the more accurate translation from LGPE
-	cont "What's with that"
+	
-	cont "skeptical look?"
+	para "Hey! What's with"
+	line "that skeptical"
+	cont "look?"
 
 	para "I'm not joshing"
 	line "you, I screwed up"

text/CeruleanCity.asm

@@ -43,7 +43,7 @@ _CeruleanCityText_19677::
 
 	para "After all, BILL's"
 	line "world famous as a"
-	cont "#MANIAC!"
+	cont "#MON fanatic!"
 
 	para "He invented the"
 	line "#MON Storage"

text/CeruleanPokecenter.asm

@@ -12,7 +12,8 @@ _CeruleanPokecenterText3::
 	line "about BILL?"
 
 	para "Everyone calls"
-	line "him a #MANIAC!"
+	line "him a #MON"
+	cont "fanatic!"
 
 	para "I think people"
 	line "are just jealous"