Myriad of changes!

This is a pretty hefty commit, so let's break it down.
- Fixes Pokedex entries for Bittybat, Bulbasaur, and Shellder.
- ...presumably fixes the options menu.
- Adds a Fishing Group and water wild data to Diglett's Cave, also reduces the encounter rate. More to come.
- Modifies parties, including evolving Rival 2's starter.
- Attempts to fix the Ultra and Safari Balls by making `BallFactor` 4, which appears to be the intended number. Tests yielded positive results.
- Restores a ton of Japanese references that got removed in localisation, including some errors.

data/pokemon/dex_text.asm

@@ -219,7 +219,7 @@ _GyaradosDexEntry:: ; new entry
 	dex
 
 _ShellderDexEntry:: ; new entry
-	text "Its shell is as"
+	text "Its shell is"
 	next "harder than" 
 	next "diamonds. It"
 
@@ -1256,8 +1256,8 @@ _BulbasaurDexEntry:: ; new entry
 	next "about whether"
 	
 	page "BULBASAUR is a"
-	next "plant or"
-	next "a mammal"
+	next "plant or a"
+	next "mammal"
 	dex
 
 _VenusaurDexEntry:: ; new entry

data/pokemon/new_dex_text.asm

@@ -124,8 +124,8 @@ _BittybatDexEntry::
 	next "these #MON may"
 
 	page "swarm a victim"
-	next "at once to"
-	next "prey on it"
+	next "at once to prey"
+	next "on it"
 	dex
 
 _RibbitoDexEntry::

data/text/text_2.asm

@@ -819,8 +819,7 @@ _PokemonBooksText::
 	done
 
 _DiglettSculptureText::
-	text "It's a sculpture"
-	line "of DIGLETT."
+	text "It's a butsudan!" ; restored JP elemement
 	done
 
 _ElevatorText::

data/trainers/parties.asm

@@ -61,7 +61,7 @@ YoungsterData:
 	db 11, RATTATA, EKANS, 0
 	db 14, SPEAROW, 0
 ; Mt. Moon 1F
-	db 10, RATTATA, RATTATA, ZUBAT, 0
+	db 10, RATTATA, SPEAROW, BITTYBAT, 0
 ; Route 24
 	db 14, RATTATA, EKANS, ZUBAT, 0
 ; Route 25
@@ -94,12 +94,12 @@ BugCatcherData:
 	db 14, CATERPIE, WEEDLE, 0
 ; Route 6
 	db 16, WEEDLE, CATERPIE, WEEDLE, 0
-	db 20, BUTTERFREE, 0
+	db 20, BUTTERFREE, 0 ; this is that one boss fight-like one
 ; Unused - this will be used in the Silph Gauntlet
 	db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
 ; Route 9
-	db 19, BEEDRILL, BEEDRILL, 0
-	db 20, CATERPIE, WEEDLE, VENONAT, 0
+	db 19, BUTTERFREE, BEEDRILL, 0
+	db 20, WEEDLE, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable...
 
 LassData:
 ; Route 3
@@ -320,7 +320,7 @@ EngineerData:
 	db 36, GOLEM, 0
 ; Route 11
 	db 21, MAGNEMITE, 0
-	db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0
+	db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
 
 UnusedJugglerData:
 	; db $FF, 7, KONYA, 7, EEVEE, 10, LICKITUNG, 0
@@ -507,10 +507,10 @@ Green1Data:
 	db $FF, 9, PIDGEY, 8, SQUIRTLE, 0
 	db $FF, 9, PIDGEY, 8, BULBASAUR, 0
 	db $FF, 9, PIDGEY, 8, CHARMANDER, 0
-; Cerulean City
-	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, SQUIRTLE, 0
-	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, BULBASAUR, 0
-	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMANDER, 0
+; Cerulean City - starter is now evolved
+	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, WARTORTLE, 0
+	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, IVYSAUR, 0
+	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMELEON, 0
 
 ProfOakData:
 ; Unused
@@ -559,9 +559,9 @@ GiovanniData:
 
 RocketData:
 ; Mt. Moon B2F
-	db 13, RATTATA, ZUBAT, 0
-	db 11, SANDSHREW, RATTATA, ZUBAT, 0
-	db 12, ZUBAT, EKANS, 0
+	db 13, RATTATA, BITTYBAT, 0
+	db 11, SANDSHREW, RATTATA, BITTYBAT, 0
+	db 12, BITTYBAT, EKANS, 0
 	db 16, RATICATE, 0
 ; Cerulean City
 	db 17, MACHOP, DROWZEE, 0

data/wild/maps/DiglettsCave.asm

@@ -1,5 +1,5 @@
 DiglettsCaveWildMons:
-	def_grass_wildmons 20 ; encounter rate
+	def_grass_wildmons 15 ; encounter rate, lowered a tad to match other routes - PvK
 	db 18, DIGLETT
 	db 19, DIGLETT
 	db 17, ONIX
@@ -12,5 +12,15 @@ DiglettsCaveWildMons:
 	db 31, DUGTRIO
 	end_grass_wildmons
 
-	def_water_wildmons 0 ; encounter rate
+	def_water_wildmons 5 ; encounter rate
+	db 18, WIGLETT
+	db 19, WIGLETT
+	db 17, WIGLETT
+	db 20, WIGLETT
+	db 16, WIGLETT
+	db 15, WIGLETT
+	db 21, WIGLETT
+	db 22, WIGLETT
+	db 29, WUGTRIO
+	db 31, WUGTRIO
 	end_water_wildmons

data/wild/super_rod.asm

@@ -39,6 +39,7 @@ SuperRodData:
 	dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
 	dbw FARAWAY_ISLAND_INSIDE, 		.Group7
 	dbw MT_MOON_CRATER,				.Group10
+	dbw DIGLETTS_CAVE,				.Group12
 	db -1 ; end
 
 ; fishing groups
@@ -134,3 +135,10 @@ SuperRodData:
 	db 20, MAGIKARP
 	db 20, GYARADOS
 	db 20, GRIMER
+
+.Group12:
+	db 4
+	db 16, WIGLETT
+	db 18, WIGLETT
+	db 19, WIGLETT
+	db 28, WUGTRIO