Very minor fixes

Fixes a few small text issues, updates the readme, and rebalances the fishing rod Pokemon. Also shifted Blottle to earlier in the Pokedex, cause I felt like it.

README.md

@@ -8,8 +8,9 @@ New Pokemon:
 ====
 - The 34 known beta Pokemon that were cut from RBY have been fully implemented.
 - Evolutions or Pre-evolutions of a Kanto Pokemon found in a future generation are included; eg. Kleavor, Glaceon, Annihilape
-- Evolutions or Pre-evolutions of a Kanto Pokemon found in the SpaceWorld '97 demo are included; eg. Madaamu, Pudi
-	- Some Pokemon will also use their SW97 designs!
+- Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo are included; eg. Madaamu, Taaban
+- Meltan and Melmetal have been added due to their introduction in a Kanto-based game, LGPE.
+- All fully-evolved regional variants of Kanto Pokemon have been added.
 
 Johto baby Pokemon and regional pre-evolutions were omitted due to memory constraints. This just barely works.
 
@@ -40,9 +41,10 @@ Type Matchups for Steel and Dark for reference:
 New Items:
 ====
 - The Sun, Ice, Poison and Heart Stones have been added.
-- The Protector and Black Augurite evolution items have been added for Rhyperior and Kleavor, respectively.
+- Additional evolution items include the Protector, Black Augurite, Up-Grade, Dubious Disc, Metal Coat and Candy Jar.
 - The Old Sea Chart has been added, allowing access to Faraway Island and Mew.
 - The Citrine Pass has been added, allowing access to a new post-game area based on the unused "C" map.
+- The Wing Fossil is a new item that allows Aerodactyl to be revived, as the Old Amber was instead used for Decilla.
 
 New areas
 ====
@@ -51,6 +53,12 @@ New areas
 	- New infinitely re-battleable trainers for grinding.
 	- There's a Move Deleter and Move Relearner!
 - Citrine City is a new island city that can be accessed in the postgame.
+	- Contains a house with a Move Tutor that can teach Tradeback moves without the need for GSC!
+	- Contains a Team Rocket house where they will sell you TMs and Evolution Items. Jessie and James are there too!
+	- Will contain a Battle Tower with infinite, randomised trainer parties!
+	- Crimson Cave, located in Citrine City, houses several strong trainers and Pokémon.
+	- Chartreuse Trail, south of Citrine City, is a route that leads to Celeste Hill.
+	- Celeste Hill activates an event where the Galarian Legendary Birds can be fought.
 - Underwater Tunnel connects Route 25 and Route 10.
 - Cinnabar Volcano is a new area that houses Moltres, allowing it to be obtained before Victory Road.
 - Faraway Island from Pokemon Emerald has been added, where you can find Mew. It also has its own wild encounters, as well as an improved translation on its sign, enhancing its appearance from its source material.
@@ -71,12 +79,12 @@ Improved areas
 - Pokemon Tower was shortened, being less intensive and adding room for more maps.
 - Silph Co's pathing was completely overhauled to make navigating it less tedious.
 - Viridian Gym now has a new area once you make Giovanni leave.
-- The S.S. Anne now returns after getting your fourth badge!
+- The S.S. Anne now returns after getting the Marsh Badge!
 - After entering the Hall of Fame, try visiting Route 1!
 
 QoL Enhancements
 ====
-- All 217 (current) Pokemon can be obtained without the use of trading or glitches, including Mew!
+- All 251 (current) Pokemon can be obtained without the use of trading or glitches, including Mew!
 - New Pokedex entries for most Pokemon are available, sourced from the original 1996 Pokedex book by Creatures Inc., restoring a ton of old Kanto lore. Thanks to [Dr. Lava and Nob Ogasawara](http://lavacutcontent.com/1996-creatures-pokedex-translation-1/) for their incredible work translating and writing about it!
 - Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu!
 - Item Descriptions are available!
@@ -106,7 +114,7 @@ QoL Enhancements
 	- 3x 7s now gives 999 coins (used to be 300)
 - Game Corner prizes have been altered;
 	- Version parity is done across prizes, using Blue's superior prices.
-	- New prizes across both versions include: Cubone, Blastyke, and Cactus.
+	- New prizes include: Cubone, Blastyke, and Cactus.
 	- The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is accessible in Celadon University!
 - Bag capacity increased from 20 to 30 items.
 - Spinner tiles move faster.
@@ -154,7 +162,7 @@ Known Bugs
 - Only portions of spinner tiles animate.
 - Occasionally, menu text sets itself to scroll.
 - The lone Rocket in Viridian Gym's basement needs to be directly spoken to to be battled
-- Should be able to fly from Faraway (reposition in map listing)
+- Should be able to fly from Faraway and Citrine (issue with tilesets)
 - Strength boulders don't fall down holes
 - Pokedex is very laggy
 - When fighting Omega in Silph Co., the Rocket you fight beforehand will disappear.
@@ -173,7 +181,6 @@ New Pokemon:
 - Onix -> Steelix | L38 OR use Metal Coat
 - Slowpoke -> Slowking | Use Heart Stone 
 - Chansey -> Blissey | L45
-- Psyduck -> Weirduck | L22, Golduck level remains the same for Weirduck.
 - Magmar -> Magmortar | Use Fire Stone
 - Electabuzz -> Electivire | Use Thunder Stone
 - Magneton -> Magnezone | Use Thunder Stone
@@ -186,8 +193,11 @@ New Pokemon:
 - Marowak -> Guardia | Use Heart Stone
 - Porygon -> Porygon2 | Use Up-Grade
 - Porygon2 -> Porygon-Z | Use Dubious Disc
-- Gloom -> Bellossom | Use Poison Stone
+- Gloom -> Bellossom | Use Leaf Stone
+- Gloom -> Vileplume | Use Poison Stone
 - Weepinbell -> Tsubomitto | Use Poison Stone
+- Shellder -> Taaban | Use Water Stone
+- Shellder -> Cloyster | Use Ice Stone
 
 Kanto Beta Pokemon:
 - Blottle -> Pendraken | L30
@@ -205,13 +215,12 @@ Kanto Beta Pokemon:
 - Gyopin -> Goldeen | L16
 - Kotora -> Gaotora | L16
 - Gaotora -> Gorotora | L36
-- Puchikorn -> Ponyta | L20
+- Puchikoon -> Ponyta | L20
 - Blastyke -> Blastoise | L36
 - Wartortle -> Totartle | L36, replaces Blastoise
-- Pudi -> Growlithe | L16
-- Para -> Paras | L12
-- Hinaazu -> Doduo | L18
-- Betobebii -> Grimer | L20
+- Kokana -> Kasanagi | L7
+- Kasanagi -> Carapthor | L10
+- Psyduck -> Weirduck | L22, Golduck level remains the same for Weirduck.
 - Nidorino OR Nidorina -> Nidoreign | Moon Stone
 - Nidorino -> Nidoking | L36
 - Nidorina -> Nidoqueen | L36
@@ -257,12 +266,12 @@ Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will
 - Indigo Plateau: Exeggutor
 Version exclusivity was factored in, instead moving Raticate and Golem to the cities without a trader.
 
-Galarian and Paldean formes are accessed on the S.S. Anne, which now returns after four badges. Hisuian formes are found in the wild in Bill's Garden, which is accessible in the post-game.
+Galarian and Paldean formes are accessed on the S.S. Anne, which now returns after receiving the Marsh Badge. Hisuian formes are found in the wild in Bill's Garden, which is accessible in the post-game.
 
 Credits
 ====
 * Plague von Karma - Creator of the Showdown Mod, Developer, Maps, and occasional spriter (assisting with Tsubomitto, Carapthor)
-* Martha's Against Humanity - Developer, Pokemon implementation, tweaks of Albatross's sprites.
+* Martha's Against Humanity - Developer, Pokémon implementation, tweaks of Albatross's sprites, a few maps (Citrine City, Cinnabar Volcano)
 * Ema Skye - Developer, Maps, Showdown Mod assistance
 * pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us!
 * ausma - Showdown Mod assistance

constants/pokedex_constants.asm

@@ -46,7 +46,7 @@
 	const DEX_KOKANA     ; 		(040)
 	const DEX_KASANAGI   ; 		(041)
 	const DEX_CARAPTHOR  ; 		(042)
-	const DEX_SPEAROW    ; 21	(043)	- Route 22 + Route 3
+	const DEX_SPEAROW    ; 21	(043)	- Route 3
 	const DEX_FEAROW     ; 22	(044)
 	const DEX_EKANS      ; 23	(045)
 	const DEX_ARBOK      ; 24	(046)
@@ -132,61 +132,61 @@
 	const DEX_TENTACRUEL ; 73	(126)
 	const DEX_TOEDSCOOL  ;		(127)
 	const DEX_TOEDSCRUEL ;		(128)
-	const DEX_RIBBITO    ;		(129)
-	const DEX_CROAKOZUNA ;		(130)
-	const DEX_MAGNEMITE  ; 81	(131)
-	const DEX_MAGNETITE  ;		(132)
-	const DEX_MAGNETON   ; 82	(133)
-	const DEX_MAGNEZONE  ;		(134)
-	const DEX_MACHOP     ; 66	(135)
-	const DEX_MACHOKE    ; 67	(136)
-	const DEX_MACHAMP    ; 68	(137)
-	const DEX_CROCKY     ;		(138)
-	const DEX_KRABBY     ; 98	(139)
-	const DEX_KINGLER    ; 99	(140)
-	const DEX_SLOWPOKE   ; 79	(141)
-	const DEX_SLOWBRO    ; 80	(142)
-	const DEX_SLOWBRO_G  ;  	(143)
-	const DEX_SLOWKING   ;		(144)
-	const DEX_SLOWKING_G ;		(145)
-	const DEX_PUCHIKOON  ;		(146)	- Route 7 + Route 8 + Route 16
-	const DEX_PONYTA     ; 77	(147)
-	const DEX_RAPIDASH   ; 78	(148)
-	const DEX_RAPIDASH_G ;		(149)
-	const DEX_DEER	     ;		(150)
-	const DEX_MONJA	     ;		(151)
-	const DEX_TANGELA    ; 114 	(152)
-	const DEX_TANGROWTH  ;		(153)
-	const DEX_BARUNDA    ;		(154)
-	const DEX_GASTLY     ; 92	(155)	- Lavender Tower
-	const DEX_HAUNTER    ; 93	(156)
-	const DEX_GENGAR     ; 94	(157)
-	const DEX_CUBONE     ; 104	(158)
-	const DEX_MAROWAK    ; 105	(159)
-	const DEX_MAROWAK_A  ;		(160)
-	const DEX_GUARDIA    ;		(161)
-	const DEX_FARFETCHD  ; 83 	(162)	- Routes 13-18
-	const DEX_MADAAMU    ;		(163)
-	const DEX_SIRFETCHD  ;		(164)
-	const DEX_DODUO      ; 84	(165)
-	const DEX_DODRIO     ; 85 	(166)
-	const DEX_GRIMER     ; 88	(167)
-	const DEX_MUK        ; 89	(168)
-	const DEX_MUK_A      ;		(169)
-	const DEX_KOFFING    ; 109	(170)
-	const DEX_WEEZING    ; 110	(171)
-	const DEX_WEEZING_G  ;  	(172)
-	const DEX_DITTO      ; 132	(173)
-	const DEX_ANIMON     ;		(174)
-	const DEX_MR_MIME    ; 122	(175)
-	const DEX_MR_RIME    ;		(176)
-	const DEX_CACTUS     ;		(177)
-	const DEX_HITMONLEE  ; 106	(178)	- Saffron City
-	const DEX_HITMONCHAN ; 107	(179)
-	const DEX_HITMONTOP  ;		(180)
-	const DEX_BLOTTLE    ;		(181)	- Surfing + Seafoam Islands
-	const DEX_PENDRAKEN  ;		(182)
-	const DEX_SHELLDER   ; 90	(183)
+	const DEX_BLOTTLE    ;		(129)
+	const DEX_PENDRAKEN  ;		(130)
+	const DEX_RIBBITO    ;		(131)
+	const DEX_CROAKOZUNA ;		(132)
+	const DEX_MAGNEMITE  ; 81	(133)
+	const DEX_MAGNETITE  ;		(134)
+	const DEX_MAGNETON   ; 82	(135)
+	const DEX_MAGNEZONE  ;		(136)
+	const DEX_MACHOP     ; 66	(137)
+	const DEX_MACHOKE    ; 67	(138)
+	const DEX_MACHAMP    ; 68	(139)
+	const DEX_CROCKY     ;		(140)
+	const DEX_KRABBY     ; 98	(141)
+	const DEX_KINGLER    ; 99	(142)
+	const DEX_SLOWPOKE   ; 79	(143)
+	const DEX_SLOWBRO    ; 80	(144)
+	const DEX_SLOWBRO_G  ;  	(145)
+	const DEX_SLOWKING   ;		(146)
+	const DEX_SLOWKING_G ;		(147)
+	const DEX_PUCHIKOON  ;		(148)	- Route 7 + Route 8
+	const DEX_PONYTA     ; 77	(149)
+	const DEX_RAPIDASH   ; 78	(150)
+	const DEX_RAPIDASH_G ;		(151)
+	const DEX_DEER	     ;		(152)
+	const DEX_MONJA	     ;		(153)
+	const DEX_TANGELA    ; 114 	(154)
+	const DEX_TANGROWTH  ;		(155)
+	const DEX_BARUNDA    ;		(156)
+	const DEX_GASTLY     ; 92	(157)	- Lavender Tower
+	const DEX_HAUNTER    ; 93	(158)
+	const DEX_GENGAR     ; 94	(159)
+	const DEX_CUBONE     ; 104	(160)
+	const DEX_MAROWAK    ; 105	(161)
+	const DEX_MAROWAK_A  ;		(162)
+	const DEX_GUARDIA    ;		(163)
+	const DEX_FARFETCHD  ; 83 	(164)	- Routes 13-18
+	const DEX_MADAAMU    ;		(165)
+	const DEX_SIRFETCHD  ;		(166)
+	const DEX_DODUO      ; 84	(167)
+	const DEX_DODRIO     ; 85 	(168)
+	const DEX_GRIMER     ; 88	(169)
+	const DEX_MUK        ; 89	(170)
+	const DEX_MUK_A      ;		(171)
+	const DEX_KOFFING    ; 109	(172)
+	const DEX_WEEZING    ; 110	(173)
+	const DEX_WEEZING_G  ;  	(174)
+	const DEX_DITTO      ; 132	(175)
+	const DEX_ANIMON     ;		(176)
+	const DEX_MR_MIME    ; 122	(177)
+	const DEX_MR_RIME    ;		(178)
+	const DEX_CACTUS     ;		(179)
+	const DEX_HITMONLEE  ; 106	(180)	- Saffron City
+	const DEX_HITMONCHAN ; 107	(181)
+	const DEX_HITMONTOP  ;		(182)
+	const DEX_SHELLDER   ; 90	(183)	- Surfing, Fishing Rod 3, Seafoam Islands
 	const DEX_CLOYSTER   ; 91	(184)
 	const DEX_TAABAN     ;		(185)
 	const DEX_STARYU     ; 120	(186)

crysaudio/cry_headers.asm

@@ -135,6 +135,8 @@ PokemonCries::
 	mon_cry CRY_VENONAT,     238,  383 ; TENTACRUEL
 	mon_cry CRY_NIDORAN_M,     0,    0 ; TOEDSCOOL	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; TOEDSCRUEL	(incomplete)
+	mon_cry CRY_BLASTOISE,   147,  128 ; BLOTTLE
+	mon_cry CRY_BLASTOISE,    60,  128 ; PENDRAKEN
 	mon_cry CRY_GOLEM,       147,  224 ; RIBBITO
 	mon_cry CRY_GOLEM,        37,  383 ; CROAKOZUNA
 	mon_cry CRY_METAPOD,     128,  224 ; MAGNEMITE
@@ -189,8 +191,6 @@ PokemonCries::
 	mon_cry CRY_GOLEM,       128,  320 ; HITMONLEE
 	mon_cry CRY_SEEL,        238,  320 ; HITMONCHAN
 	mon_cry CRY_SLUGMA,        0,  256 ; HITMONTOP
-	mon_cry CRY_BLASTOISE,   147,  128 ; BLOTTLE
-	mon_cry CRY_BLASTOISE,    60,  128 ; PENDRAKEN
 	mon_cry CRY_FEAROW,        0,  256 ; SHELLDER
 	mon_cry CRY_FEAROW,      111,  352 ; CLOYSTER
 	mon_cry CRY_TOTODILE,    512,  320 ; TAABAN

data/maps/objects/MtMoonB2F.asm

@@ -19,7 +19,7 @@ MtMoonB2F_Object:
 	object_event 12,  6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
 	object_event 13,  6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
 	object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
-	object_event 21,  5, SPRITE_POKE_BALL, STAY, NONE, 9, WING_FOSSIL
+	object_event 21,  5, SPRITE_FOSSIL, STAY, NONE, 9, WING_FOSSIL
 	object_event 29,  7, SPRITE_SCIENTIST, STAY, NONE, 10, ; Crater Guard
 
 	def_warps_to MT_MOON_B2F

data/pokemon/base_stats.asm

@@ -128,6 +128,8 @@ INCLUDE "data/pokemon/base_stats/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
 INCLUDE "data/pokemon/base_stats/toedscool.asm"
 INCLUDE "data/pokemon/base_stats/toedscruel.asm"
+INCLUDE "data/pokemon/base_stats/blottle.asm"
+INCLUDE "data/pokemon/base_stats/pendraken.asm"
 INCLUDE "data/pokemon/base_stats/ribbito.asm"
 INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
@@ -180,8 +182,6 @@ INCLUDE "data/pokemon/base_stats/cactus.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
 INCLUDE "data/pokemon/base_stats/hitmontop.asm"
-INCLUDE "data/pokemon/base_stats/blottle.asm"
-INCLUDE "data/pokemon/base_stats/pendraken.asm"
 INCLUDE "data/pokemon/base_stats/shellder.asm"
 INCLUDE "data/pokemon/base_stats/cloyster.asm"
 INCLUDE "data/pokemon/base_stats/taaban.asm"

data/pokemon/menu_icons.asm

@@ -128,6 +128,8 @@ MonPartyData:
 	nybble ICON_WATER     ; Tentacruel
 	nybble ICON_GRASS     ; Toedscool
 	nybble ICON_GRASS     ; Toedscruel
+	nybble ICON_WATER     ; Blottle
+	nybble ICON_WATER     ; Pendraken
 	nybble ICON_MON       ; Ribbito
 	nybble ICON_MON       ; Croakozuna
 	nybble ICON_BALL      ; Magnemite
@@ -180,8 +182,6 @@ MonPartyData:
 	nybble ICON_MON       ; Hitmonlee
 	nybble ICON_MON       ; Hitmonchan
 	nybble ICON_MON       ; Hitmontop
-	nybble ICON_WATER     ; Blottle
-	nybble ICON_WATER     ; Pendraken
 	nybble ICON_HELIX     ; Shellder
 	nybble ICON_HELIX     ; Cloyster
 	nybble ICON_HELIX     ; Taaban

data/pokemon/new_dex_text.asm

@@ -403,7 +403,7 @@ _KokanaDexEntry::
 	next "WEEDLE. Due to the"
 	next "lack of a horn,"
 
-	para "it hides under"
+	page "it hides under"
 	next "trees, gnawing"
 	next "their roots"
 	dex

data/pokemon/palettes.asm

@@ -129,6 +129,8 @@ MonsterPalettes:
 	db PAL_CYANMON   ; TENTACRUEL
 	db PAL_BROWNMON  ; TOEDSCOOL
 	db PAL_YELLOWMON ; TOEDSCRUEL
+	db PAL_MEWMON    ; BLOTTLE
+	db PAL_MEWMON    ; PENDRAKEN
 	db PAL_GREENMON  ; RIBBITO
 	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_GREYMON   ; MAGNEMITE
@@ -181,8 +183,6 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; HITMONLEE
 	db PAL_BROWNMON  ; HITMONCHAN
 	db PAL_BROWNMON  ; HITMONTOP
-	db PAL_MEWMON    ; BLOTTLE
-	db PAL_MEWMON    ; PENDRAKEN
 	db PAL_PURPLEMON ; SHELLDER
 	db PAL_PURPLEMON ; CLOYSTER
 	db PAL_GREYMON   ; TAABAN

data/pokemon/title_mons.asm

@@ -1,18 +1,21 @@
 TitleMons:
 ; mons on the title screen are randomly chosen from here
-	db TOTARTLE
-	db CHARIZARD
-	db VENUSAUR
+	db TOTARTLE		; New Starters
 	db GOROCHU
-	db CROCKY
-	db TRAMPEL
+	db SYLVEON
+	db CROCKY		; RG Betas
 	db JAGG
-	db RHYPERIOR
-	db OMEGA
-	db MIKON
-	db KLEAVOR
-	db MAGNEZONE
-	db MADAAMU
-	db DEER
+	db CHEEP
 	db GYAOON
+	db TSUBOMITTO	; GS Betas
+	db MADAAMU
+	db PORYGON2		; Post-Gen 1 Evos
+	db MAGNEZONE
 	db ANNIHILAPE
+	db SCREAM_TAIL	; LGPE and SV
+	db WUGTRIO
+	db MELTAN
+	db EXEGGUTOR_A	; Regional Variants
+	db WEEZING_G
+	db ARCANINE_H
+	db TAUROS_PA

data/wild/super_rod.asm

@@ -3,145 +3,162 @@ SuperRodData:
 	; map, fishing group
 	dbw PALLET_TOWN,         		.Group1
 	dbw VIRIDIAN_CITY,       		.Group1
-	dbw CERULEAN_CITY,       		.Group3
-	dbw VERMILION_CITY,      		.Group4
-	dbw CELADON_CITY,        		.Group5
-	dbw FUCHSIA_CITY,        		.Group7
+	dbw CERULEAN_CITY,       		.Group2
+	dbw VERMILION_CITY,      		.Group3
+	dbw CELADON_CITY,        		.Group11
+	dbw FUCHSIA_CITY,        		.Group5
 	dbw CINNABAR_ISLAND,     		.Group8
 	dbw CITRINE_CITY,				.Group9
-	dbw ROUTE_4,             		.Group3
-	dbw ROUTE_6,             		.Group4
-	dbw ROUTE_10,            		.Group5
-	dbw ROUTE_11,            		.Group4
-	dbw ROUTE_12,            		.Group7
-	dbw ROUTE_13,            		.Group7
-	dbw ROUTE_17,            		.Group7
-	dbw ROUTE_18,            		.Group7
+	dbw ROUTE_4,             		.Group2
+	dbw ROUTE_6,             		.Group2
+	dbw ROUTE_10,            		.Group4
+	dbw ROUTE_11,            		.Group3
+	dbw ROUTE_12,            		.Group4
+	dbw ROUTE_13,            		.Group5
+	dbw ROUTE_17,            		.Group5
+	dbw ROUTE_18,            		.Group5
 	dbw ROUTE_19,            		.Group8
 	dbw ROUTE_20,            		.Group8
 	dbw ROUTE_21,            		.Group8
-	dbw ROUTE_22,            		.Group2
-	dbw ROUTE_23,            		.Group9
-	dbw ROUTE_24,            		.Group3
+	dbw ROUTE_22,            		.Group1
+	dbw ROUTE_23,            		.Group8
+	dbw ROUTE_24,            		.Group2
 	dbw ROUTE_25,            		.Group3
-	dbw CERULEAN_GYM,        		.Group3
-	dbw VERMILION_DOCK,      		.Group4
+	dbw CERULEAN_GYM,        		.Group2
+	dbw VERMILION_DOCK,      		.Group3
 	dbw SEAFOAM_ISLANDS_B3F, 		.Group8
 	dbw SEAFOAM_ISLANDS_B4F, 		.Group8
 	dbw SAFARI_ZONE_EAST,    		.Group6
 	dbw SAFARI_ZONE_NORTH,   		.Group6
 	dbw SAFARI_ZONE_WEST,    		.Group6
 	dbw SAFARI_ZONE_CENTER,  		.Group6
-	dbw CERULEAN_CAVE_2F,   		.Group9
+	dbw CERULEAN_CAVE_2F,   		.Group10
 	dbw CERULEAN_CAVE_B1F,  		.Group10
-	dbw CERULEAN_CAVE_1F,   		.Group9
-	dbw SILPH_GAUNTLET_5F,   		.Group10
-	dbw ROCK_TUNNEL_1F,     		.Group5
+	dbw CERULEAN_CAVE_1F,   		.Group10
+	dbw SILPH_GAUNTLET_5F,   		.Group6
+	dbw ROCK_TUNNEL_1F,     		.Group4
 	dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
-	dbw FARAWAY_ISLAND_INSIDE, 		.Group7
+	dbw FARAWAY_ISLAND_INSIDE, 		.Group10
 	dbw MT_MOON_CRATER,				.Group10
 	dbw DIGLETTS_CAVE,				.Group12
-	dbw BILLS_GARDEN,				.Group10
-	dbw UNDERWATER_TUNNEL,			.Group7
+	dbw BILLS_GARDEN,				.Group7
+	dbw UNDERWATER_TUNNEL,			.Group8
 	db -1 ; end
 
 ; fishing groups
 ; number of monsters, followed by level/monster pairs
 
-.Group1:
-	db 2
-	db 10, MAGIKARP
+.Group1:	; Pallet, Viridian & Route 22
+	db 4
+	db 5, MAGIKARP
+	db 7, MAGIKARP
 	db 5, GYOPIN
+	db 7, GYOPIN
 
-.Group2:
-	db 3
-	db 10, MAGIKARP
-	db 7, POLIWAG
-	db 10, GYOPIN
-
-.Group3:
+.Group2:	; Route 4, Cerulean, Route 24, Route 6
+	db 5
+	db 12, MAGIKARP
+	db 12, POLIWAG
+	db 12, GYOPIN
+	db 12, PSYDUCK
+	db 12, CHEEP
+
+.Group3:	; Route 11, Route 25, Vermilion
 	db 5
-	db 15, SKIMPER
-	db 15, MAGIKARP
-	db 15, KRABBY
 	db 15, BLOTTLE
+	db 15, MAGIKARP
+	db 15, SLOWPOKE
+	db 15, TENTACOOL
 	db 15, CHEEP
 
-.Group4:
+.Group4:	; Route 10, Route 12, Rock Tunnel
 	db 5
-	db 20, KRABBY
-	db 20, SHELLDER
+	db 20, SLOWPOKE
+	db 20, PSYDUCK
 	db 20, TENTACOOL
 	db 20, BLOTTLE
-	db 20, HORSEA
+	db 20, MAGIKARP
 
-.Group5:
-	db 5
+.Group5:	; Route 13, Route 17, Route 18, Fuchsia
+	db 7
+	db 25, HORSEA
 	db 25, POLIWHIRL
-	db 25, SLOWPOKE
+	db 25, KRABBY
 	db 20, SKIMPER
 	db 25, CHEEP
 	db 25, BLOTTLE
+	db 25, GOLDEEN
 
-.Group6:
-	db 6
+.Group6:	; Safari Zone
+	db 7
 	db 15, DRATINI
-	db 28, KRABBY
-	db 25, CHEEP
+	db 20, SLOWPOKE
+	db 25, KRABBY
+	db 25, WEIRDUCK
 	db 25, POLIWHIRL
-	db 35, DRAGONAIR
-	db 32, BAWLIGUA
+	db 30, DRAGONAIR
+	db 20, SKIMPER
 
-.Group7:
+.Group7:	; Bill's Garden
 	db 6
-	db 35, TENTACRUEL
-	db 35, KINGLER
-	db 35, SEAKING
-	db 35, GYARADOS
-	db 35, PENDRAKEN
-	db 35, JABETTA
+	db 50, SQUIRTLE
+	db 50, WARTORTLE
+	db 50, TOTARTLE
+	db 50, DRATINI
+	db 50, DRAGONAIR
+	db 55, DRAGONITE
 
-.Group8:
-	db 5
-	db 40, STARYU
-	db 40, SEADRA
-	db 40, SHELLDER
-	db 40, PENDRAKEN
-	db 40, JAGG
+.Group8:	; Sea Routes, Route 23, Seafoam Islands, Underwater Tunnel
+	db 7
+	db 30, STARYU
+	db 30, HORSEA
+	db 30, SHELLDER
+	db 30, PENDRAKEN
+	db 30, JAGG
+	db 30, BLASTYKE
+	db 30, GOLDEEN
 
-.Group9:
-	db 5
+.Group9:	; Citrine, Chartreuse, Crimson
+	db 10
+	db 50, JAGG
+	db 50, SEAKING
+	db 50, KINGLER
+	db 50, SEADRA
+	db 50, PENDRAKEN
 	db 50, GYARADOS
-	db 50, SEAKING
-	db 50, KINGLER
-	db 50, SEADRA
-	db 50, PENDRAKEN
-
-.Group10:
-	db 12
-	db 50, KINGLER
-	db 50, PENDRAKEN
-	db 50, SEAKING
-	db 100, MAGIKARP
-	db 50, SEADRA
-	db 50, STARYU
-	db 50, SHELLDER
-	db 50, SLOWBRO
-	db 50, GOLDUCK
 	db 50, JABETTA
-	db 50, POLIWHIRL
-	db 60, CRYITHAN
+	db 50, CROAKOZUNA
+	db 50, BLASTOISE
+	db 50, LAPRAS
 
-.Group11:
-	db 4
-	db 25, MAGIKARP
+.Group10:	; Cerulean Cave
+	db 10
+	db 50, SLOWBRO
+	db 50, SEAKING
+	db 50, KINGLER
+	db 50, WUGTRIO
+	db 50, SHELLDER
+	db 50, GYARADOS
+	db 50, JABETTA
+	db 50, CROAKOZUNA
+	db 50, GOLDUCK
+	db 100, MAGIKARP 
+
+.Group11:	; Celadon
+	db 7
+	db 5, MAGIKARP
+	db 10, MAGIKARP
+	db 15, MAGIKARP
 	db 20, MAGIKARP
+	db 25, MAGIKARP
 	db 20, GYARADOS
 	db 20, GRIMER
 
-.Group12:
-	db 4
+.Group12:	; Diglett's Cave
+	db 6
 	db 16, WIGLETT
 	db 18, WIGLETT
 	db 19, WIGLETT
+	db 21, WIGLETT
+	db 20, WIGLETT
 	db 28, WUGTRIO

text/CeladonUniversityPokecenter.asm

@@ -54,7 +54,7 @@ _CeladonUniversityPokecenterText8::
 	line "DRAGONAIR can fly"
 	cont "without wings..."
 	
-	text "#MON are strange"
+	para "#MON are strange"
 	line "creatures..."
 	
 	done