The Big One.

Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.

text/BrunswickTrail.asm

@@ -10,8 +10,8 @@ _CaveGuy:: ; Used to describe GZap, but the beauty seemed funnier. Needed some l
 	done
 
 _Lover1::
-	text "ALICE: This spot"
-	line "is where she"
+	text "Here's the spot"
+	line "where she first"
 	cont "confessed to me."
 	
 	para "Now it's by far"
@@ -25,7 +25,7 @@ _Lover1::
 	done
 
 _Lover2::
-	text "CHELSIE: I adore"
+	text "I absolutely love"
 	line "visiting this"
 	cont "TRAIL with my"
 	cont "girlfriend!"
@@ -71,7 +71,7 @@ _BrunswickEndBattleText2::
 _BrunswickAfterBattleText2::
 	text "I saw a BIRD"
 	line "#MON with huge"
-	cont "feet sprint past"
+	cont "legs sprint past"
 	cont "me!"
 	
 	para "It almost blew me"
@@ -118,10 +118,10 @@ _FakeTreeAttack::
 	line "to hack away..."
 	
 	para "But it was a"
-	line "CACTUS!"
+	line "CACTORMUS!"
 	
-	para "CACTUS retaliated"
-	line "in a rage!"
+	para "It retaliated in"
+	line "a rage!"
 	prompt
 
 ; Martha can do the text for her things...

text/CopycatsHouse2F.asm

@@ -63,7 +63,7 @@ _TM31NoRoomText::
 	text_end
 
 _CopycatsHouse2FText2::
-	text "It's a JAGG"
+	text "It's a SHARPOON"
 	line "doll with cute,"
 	cont "round eyes!"
 	done

text/GiovannisRoom.asm

@@ -3,38 +3,39 @@ _GiovannisRoomText1::
 	line "EARTH - GIOVANNI"
 	
 	para "In this book, I"
-	line "will reveal"
-	cont "RHYDON's"
-	cont "highest form."
+	line "will reveal the"
+	cont "highest form of"
+	cont "RHYDON."
 	
 	para "Its name is"
 	line "RHYPERIOR."
-	
-	para "However, it"
+	cont "However, it"
 	cont "cannot be"
 	cont "obtained with"
 	cont "items found in"
-	cont "KANTO."
+	cont "KANTO naturally."
 	
-	para "It needs an item"
-	line "called a"
-	cont "PROTECTOR."
+	para "A PROTECTOR is"
+	line "required, which"
+	cont "we managed to"
+	cont "import here."
 	
 	para "It unfortunately"
 	line "fails to address"
 	cont "RHYDON's poor"
-	cont "SPEED."
-	
-	para "Ergo, it cannot"
-	line "use my FISSURE"
-	cont "technique to"
-	cont "its complete"
-	cont "potential."
-	
+	cont "SPEED. Ergo, it"
+	cont "cannot use my"
+	cont "own technique,"
+	cont "FISSURE, to its"
+	cont "full potential."	
 	done
 
 _GiovannisRoomText2::
-	text "Aug 1st, 1975"
+	text "It's a torn-out"
+	line "page from an"
+	cont "old diary..."
+	
+	para "Aug 1st, 1975"
 	line "I managed to"
 	cont "get my first"
 	cont "#MON."
@@ -64,7 +65,7 @@ _GiovannisRoomText3::
 	
 	para "PROTECTOR: ¥3,000"
 
-	para "GUARD SPEC: ¥4,200"
+	para "DIRE HIT: ¥5,200"
 
 	para "DEVELOPMENT OF"
 	line "TM27: ¥15,000"
@@ -86,24 +87,3 @@ _GiovannisRoomText4::
 	para "1977?!"
 	
 	done
-
-_GiovannisRoomBattleText2::
-	text "Hey! Intruders"
-	line "aren't welcome in"
-	cont "the BOSS's room!"
-
-	para "I'm his last"
-	line "line of defence!"
-	done
-
-_GiovannisRoomEndBattleText2::
-	text "Oww!"
-	line "Beaten!"
-	prompt
-
-_GiovannisRoomAfterBattleTxt2::
-	text "What?! Are you"
-	line "serious? TEAM"
-	cont "ROCKET is"
-	cont "disbanding?"
-	done

text/SilphGauntlet1F.asm

@@ -87,7 +87,7 @@ _SilphGauntlet1FEndBattleText5::
 	prompt
 
 _SilphGauntlet1FAfterBattleText5::
-	text "TSUBOMITTO loves"
+	text "BELLIGNAN loves"
 	line "eating bugs, so"
 	cont "it's perfect"
 	cont "for me!"

text/SilphGauntlet2F.asm

@@ -15,39 +15,18 @@ _SilphGauntlet2FAfterBattleText1::
 	cont "application..."
 	done
 
-; I am not sure if Junior should be here.
-; At most, a later floor. He's meant to be Blue's little brother, no?
-; Need a proper discussion on what to do with him, even the OG devs didn't know what to do.
 _SilphGauntlet2FBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "JUNIOR"
-	done
-
-_SilphGauntlet2FEndBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "JUNIOR"
-	prompt
-
-_SilphGauntlet2FAfterBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "JUNIOR"
-	done
-
-_SilphGauntlet2FBattleText3::
 	text "This is no place"
 	line "to hike! Now I'm"
 	cont "mad!"
 	done
 
-_SilphGauntlet2FEndBattleText3::
+_SilphGauntlet2FEndBattleText2::
 	text "Bah!"
 	line "Too much!"
 	prompt
 
-_SilphGauntlet2FAfterBattleText3::
+_SilphGauntlet2FAfterBattleText2::
 	text "That CHIEF!"
 	
 	para "Always cutting"
@@ -55,18 +34,18 @@ _SilphGauntlet2FAfterBattleText3::
 	cont "stand it!"
 	done
 
-_SilphGauntlet2FBattleText4::
+_SilphGauntlet2FBattleText3::
 	text "Umm..."
 	
 	para "Battle me!"
 	done
 
-_SilphGauntlet2FEndBattleText4::
+_SilphGauntlet2FEndBattleText3::
 	text "It's"
 	line "no big deal..."
 	prompt
 
-_SilphGauntlet2FAfterBattleText4::
+_SilphGauntlet2FAfterBattleText3::
 	text "I don't get out"
 	line "much..."
 	
@@ -76,18 +55,18 @@ _SilphGauntlet2FAfterBattleText4::
 	cont "always wanted..."
 	done
 
-_SilphGauntlet2FBattleText5::
+_SilphGauntlet2FBattleText4::
 	text "Hahaha! This is"
 	line "great! So many"
 	cont "rare #MON! Show"
 	cont "me yours, now!"
 	done
 
-_SilphGauntlet2FEndBattleText5::
+_SilphGauntlet2FEndBattleText4::
 	text "Argh!"
 	prompt
 
-_SilphGauntlet2FAfterBattleText5::
+_SilphGauntlet2FAfterBattleText4::
 	text "The second I heard"
 	line "of the #MON"
 	cont "I could meet here,"
@@ -99,6 +78,24 @@ _SilphGauntlet2FAfterBattleText5::
 	cont "though!"
 	done
 
+_SilphGauntlet2FBattleText5::
+	text "If I win this,"
+	line "CHIEF will love"
+	cont "me for sure!"
+	done
+
+_SilphGauntlet2FEndBattleText5::
+	text "No!"
+	line "Not here..."
+	prompt
+
+_SilphGauntlet2FAfterBattleText5::
+	text "Huh? Why CHIEF?"
+	
+	para "I just want his"
+	line "money!" ; hahahahahaha
+	done
+
 _SilphGauntlet2FBattleText6::
 	text "I'm here training"
 	line "become the next"
@@ -120,7 +117,7 @@ _SilphGauntlet2FAfterBattleText6::
 	line "powerful."
 	
 	para "Keep battling,"
-	cont "and you will"
+	line "and you will"
 	cont "surely succeed."
 	done
 	

text/SilphGauntlet3F.asm

@@ -116,22 +116,5 @@ _SilphGauntlet3FAfterBattleText6::
 	cont "this in their"
 	cont "fishing gear?!"
 	done
-	
-_SilphGauntlet3FBattleText7::
-	text "If I win this,"
-	line "CHIEF will love"
-	cont "me for sure!"
-	done
 
-_SilphGauntlet3FEndBattleText7::
-	text "No!"
-	line "Not here..."
-	prompt
-
-_SilphGauntlet3FAfterBattleText7::
-	text "Huh? Why CHIEF?"
-	
-	para "I just want his"
-	line "money!" ; hahahahahaha
-	done
 	

text/SilphGauntlet6F.asm

@@ -0,0 +1,126 @@
+_SilphGauntlet6FBattleText1::
+	text "Comment to be"
+	line "written."
+	cont "BROCK"
+	done
+
+_SilphGauntlet6FEndBattleText1::
+	text "Comment to be"
+	line "written."
+	cont "BROCK"
+	done
+
+_SilphGauntlet6FAfterBattleText1::
+	text "Comment to be"
+	line "written."
+	cont "BROCK"
+	done
+
+_SilphGauntlet6FBattleText2::
+	text "Comment to be"
+	line "written."
+	cont "MISTY"
+	done
+
+_SilphGauntlet6FEndBattleText2::
+	text "Comment to be"
+	line "written."
+	cont "MISTY"
+	done
+
+_SilphGauntlet6FAfterBattleText2::
+	text "Comment to be"
+	line "written."
+	cont "MISTY" ; she idolises Lorelei and is an Elite 4 member in SW 97, a reference to that could be neat
+	done
+
+_SilphGauntlet6FBattleText3::
+	text "Comment to be"
+	line "written."
+	cont "SURGE"
+	done
+
+_SilphGauntlet6FEndBattleText3::
+	text "Comment to be"
+	line "written."
+	cont "SURGE"
+	done
+
+_SilphGauntlet6FAfterBattleText3::
+	text "Comment to be"
+	line "written."
+	cont "SURGE" ; maybe comment on how him and Blaine fought in the war together?
+	done
+
+_SilphGauntlet6FBattleText4::
+	text "Comment to be"
+	line "written."
+	cont "ERIKA"
+	done
+
+_SilphGauntlet6FEndBattleText4::
+	text "Comment to be"
+	line "written."
+	cont "ERIKA"
+	done
+
+_SilphGauntlet6FAfterBattleText4::
+	text "Comment to be"
+	line "written."
+	cont "ERIKA"
+	done
+
+_SilphGauntlet6FBattleText5::
+	text "Comment to be"
+	line "written."
+	cont "KOGA"
+	done
+
+_SilphGauntlet6FEndBattleText5::
+	text "Comment to be"
+	line "written."
+	cont "KOGA"
+	done
+
+_SilphGauntlet6FAfterBattleText5::
+	text "Comment to be"
+	line "written."
+	cont "KOGA" ; have him mention Janine, maybe?
+	done
+
+_SilphGauntlet6FBattleText6::
+	text "Comment to be"
+	line "written."
+	cont "SABRINA"
+	done
+
+_SilphGauntlet6FEndBattleText6::
+	text "Comment to be"
+	line "written."
+	cont "SABRINA"
+	done
+
+_SilphGauntlet6FAfterBattleText6::
+	text "Comment to be"
+	line "written."
+	cont "SABRINA"
+	done
+	
+_SilphGauntlet6FBattleText7::
+	text "Comment to be"
+	line "written."
+	cont "BLAINE"
+	done
+
+_SilphGauntlet6FEndBattleText7::
+	text "Comment to be"
+	line "written."
+	cont "BLAINE"
+	done
+
+_SilphGauntlet6FAfterBattleText7::
+	text "Comment to be"
+	line "written."
+	cont "BLAINE"
+	done
+	

text/SilphGauntlet7F.asm

@@ -96,7 +96,7 @@ _ChiefAfterBattleText::
 _ChiefPCText::
 	text "It's a PC with"
 	line "blueprints for"
-	cont "OMEGA!"
+	cont "OMEGADGE!"
 	
 	para "It was meant"
 	line "for..."
@@ -115,7 +115,7 @@ _ChiefPainting1::
 	done
 
 _ChiefPainting2::
-	text "It's a picture"
-	line "of GYAOON, an"
+	text "It's a painting"
+	line "of GAWARHED, an"
 	cont "extinct #MON!"
 	done

text/VermilionCity.asm

@@ -128,53 +128,6 @@ _VermilionCityText15::
 	line "has returned!"
 	done
 
-_RoingusText:: ; new NPC made as an inside joke, with a slight reference to Mew
-	text "I wanna discover"
-	line "a new species of"
-	cont "#MON someday!"
-
-	para "If I'm the first"
-	line "to discover it, I"
-	cont "could name it!"
-
-	para "I'm gonna call"
-	line "it... ROINGUS!"
-	done
-
-; Text for the new pass system.
-_VermillionCityPassSelectionText::
-	text "Which PASS do you"
-	line "want to present?"
-	prompt
-	
-_VermillionCityOldSeaMap::
-	text "<PLAYER> flashed"
-	line "the OLD SEA MAP!"
-
-	para "My, my. I haven't"
-	line "seen this in a"
-	cont "long time."
-	
-	para "Come. I'll take"
-	line "you there."
-	done
-
-_VermillionCityCitrinePass::
-	text "<PLAYER> flashed"
-	line "the CITRINE PASS!"
-
-	para "Crikey!"
-	
-	para "Right this way!"
-	line "I can't believe"
-	cont "it..."
-	done
-
-_VermillionCityHarborRefuse::
-	text "Alright! Have a"
-	line "nice day!"
-	done
-
 _BeautyText1::
 	text "Hey! Do you like"
 	line "cats or dogs?"