New sprites and new names

- All of the new Pokemon have been given their Nob Ogasawara-localised names, where applicable. Skimper, Bawligua, and Cryithan have completely new names, (Squeamata, Ministare and Iguanarch), made by me with a lot of help from Plague Von Karma!

- Squeamata and Ministare have new sprites courtesy of Albatross. Crobat and the Alolan forms of Golem, Persian, Sandslash and Raticate have also been updated.

- Sandy Shocks can no longer learn Metal Sound.

- Luxwan and Sirfetch'd can no longer learn Hyper Beam.

- A handful of Pokedex entries have been rewritten or altered slightly.

data/pokemon/base_stats/madaamu.asm

@@ -15,10 +15,10 @@
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    TOXIC,        HORN_DRILL,   \
-	     BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   RAGE,         \
+	     BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         THUNDERBOLT,  \
-	     THUNDERBOLT,  THUNDER,      MIMIC,        DOUBLE_TEAM,  REFLECT,      \
+	     THUNDER,      MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
-	     BIDE,         SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE,   \
+	     SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE,   CUT,          \
-	     CUT,          FLY
+	     FLY
 	; end
 
 	db BANK(MadaamuPicFront)

data/pokemon/base_stats/sirfetchd.asm

@@ -15,10 +15,10 @@
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    TOXIC,        BODY_SLAM,    \
-	     TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      \
+	     TAKE_DOWN,    DOUBLE_EDGE,  SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
-	     SEISMIC_TOSS, RAGE,         MIMIC,        DOUBLE_TEAM,  REFLECT,      \
+	     RAGE,         MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
-	     BIDE,         SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE,   \
+	     SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE,   CUT,          \
-	     CUT,          FLY
+	     FLY
 	; end
 
 	db BANK(SirfetchdPicFront)

data/pokemon/dex_text.asm

@@ -71,11 +71,11 @@ _NidokingDexEntry:: ; new entry
 _SlowbroDexEntry:: ; new entry
 	text "A SLOWPOKE that"
 	next "hunts in the sea"
-	next "will occasionally"
+	next "may be bitten by"
 	
-	page "be bitten by a"
+	page "a wild DISTURBAN,"
-	next "TAABAN, causing"
+	next "making it evolve"
-	next "it to evolve"
+	next "into SLOWBRO"
 	dex
 
 _IvysaurDexEntry::
@@ -701,13 +701,13 @@ _PikachuDexEntry:: ; new entry
 	dex
 
 _RaichuDexEntry:: ; new entry, reworded since Trampel is a Ground type so cannot be KO'd by an electric move...
-	text "Even a TRAMPEL's"
+	text "A THUNDERBOLT from"
-	next "thick skin would"
+	next "RAICHU contains"
-	next "struggle to handle"
+	next "such high voltage"
 
-	page "RAICHU's shocks,"
+	page "that a TRAMPEL's"
-	next "which can reach"
+	next "thick skin can't"
-	next "100,000 volts"
+	next "withstand it"
 	dex
 
 _DratiniDexEntry:: ; new entry, doctored the entry with the originally intended lore.
@@ -1297,7 +1297,7 @@ _SeakingDexEntry:: ; new entry
 
 	page "boulders to"
 	next "prepare for"
-	next "spawning GYOPIN"
+	next "spawning ORFRY"
 	dex
 
 _PonytaDexEntry:: ; new entry

data/pokemon/evos_moves.asm

@@ -2931,18 +2931,18 @@ ScreamTailEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 51, SCREECH
+	db 56, SCREECH
-	db 55, DAZZLE_GLEAM
+	db 63, DAZZLE_GLEAM
-	db 55, DRAININGKISS
+	db 70, DRAININGKISS
 	db 0
 
 SandyShocksEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 51, SUPERSONIC
+	db 56, SUPERSONIC
-	db 55, SCREECH
+	db 63, SCREECH
-	db 55, METAL_SOUND
+	db 70, EARTHQUAKE
 	db 0
 
 WiglettEvosMoves:
@@ -3169,7 +3169,7 @@ PersianAEvosMoves:
 	db 22, FEINT_ATTACK
 	db 30, PAY_DAY
 	db 33, SLASH
-;	db 38, NASTY_PLOT
+	db 38, NASTY_PLOT
 	db 49, NIGHT_SLASH
 	db 0
 	

data/pokemon/names.asm

@@ -30,7 +30,7 @@ MonsterNames::
 	db "BLASTOISE@"
 	db "PINSIR@@@@"
 	db "TANGELA@@@"
-	db "GYAOON@@@@"
+	db "GAWARHED@@"
 	db "NIDOREIGN@"
 	db "GROWLITHE@"
 	db "ONIX@@@@@@"
@@ -49,25 +49,25 @@ MonsterNames::
 	db "PSYDUCK@@@"
 	db "DROWZEE@@@"
 	db "GOLEM@@@@@"
-	db "BARUNDA@@@"
+	db "BALUMBA@@@"
 	db "MAGMAR@@@@"
 	db "BUU@@@@@@@"
 	db "ELECTABUZZ"
 	db "MAGNETON@@"
 	db "KOFFING@@@"
-	db "DEER@@@@@@"
+	db "RAMOOSE@@@"
 	db "MANKEY@@@@"
 	db "SEEL@@@@@@"
 	db "DIGLETT@@@"
 	db "TAUROS@@@@"
 	db "TRAMPEL@@@"
-	db "CROCKY@@@@"
+	db "GAVILLAIN@"
 	db "BLOTTLE@@@"
 	db "FARFETCH'D"
 	db "VENONAT@@@"
 	db "DRAGONITE@"
-	db "CACTUS@@@@"
+	db "CACTORMUS@"
-	db "JAGG@@@@@@"
+	db "SHARPOON@@"
 	db "BITTYBAT@@"
 	db "DODUO@@@@@"
 	db "POLIWAG@@@"
@@ -80,7 +80,7 @@ MonsterNames::
 	db "KRABBY@@@@"
 	db "CHEEP@@@@@"
 	db "JABETTA@@@"
-	db "MIKON@@@@@"
+	db "VULPIII@@@"
 	db "VULPIX@@@@"
 	db "NINETALES@"
 	db "PIKACHU@@@"
@@ -93,8 +93,8 @@ MonsterNames::
 	db "KABUTOPS@@"
 	db "HORSEA@@@@"
 	db "SEADRA@@@@"
-	db "BAWLIGUA@@"
+	db "MINISTARE@"
-	db "CRYITHAN@@"
+	db "IGUANARCH@"
 	db "SANDSHREW@"
 	db "SANDSLASH@"
 	db "OMANYTE@@@"
@@ -114,13 +114,13 @@ MonsterNames::
 	db "WEEDLE@@@@"
 	db "KAKUNA@@@@"
 	db "BEEDRILL@@"
-	db "MADAAMU@@@"
+	db "LUXWAN@@@@"
 	db "DODRIO@@@@"
 	db "PRIMEAPE@@"
 	db "DUGTRIO@@@"
 	db "VENOMOTH@@"
 	db "DEWGONG@@@"
-	db "PURAKKUSU@"
+	db "TRICULES@@"
 	db "PENDRAKEN@"
 	db "CATERPIE@@"
 	db "METAPOD@@@"
@@ -133,8 +133,8 @@ MonsterNames::
 	db "MEWTWO@@@@"
 	db "SNORLAX@@@"
 	db "MAGIKARP@@"
-	db "KONYA@@@@@"
+	db "COINPUR@@@"
-	db "OMEGA@@@@@"
+	db "OMEGADGE@@"
 	db "MUK@@@@@@@"
 	db "DECILLA@@@"
 	db "KINGLER@@@"
@@ -155,13 +155,13 @@ MonsterNames::
 	db "BULBASAUR@"
 	db "VENUSAUR@@"
 	db "TENTACRUEL"
-	db "GYOPIN@@@@"
+	db "ORFRY@@@@@"
 	db "GOLDEEN@@@"
 	db "SEAKING@@@"
 	db "KOTORA@@@@"
 	db "GAOTORA@@@"
 	db "GOROTORA@@"
-	db "PUCHIKOON@"
+	db "KOLTA@@@@@"
 	db "PONYTA@@@@"
 	db "RAPIDASH@@"
 	db "RATTATA@@@"
@@ -173,7 +173,7 @@ MonsterNames::
 	db "AERODACTYL"
 	db "BLASTYKE@@"
 	db "MAGNEMITE@"
-	db "SKIMPER@@@"
+	db "SQUEAMATA@"
 	db "GOROCHU@@@"
 	db "CHARMANDER"
 	db "SQUIRTLE@@"
@@ -190,7 +190,7 @@ MonsterNames::
 	db "BELLSPROUT"
 	db "WEEPINBELL"
 	db "VICTREEBEL"
-	db "MONJA@@@@@"
+	db "BURGELA@@@" ; changing Monja's even though it's on the chopping block anyway
 	db "SCIZOR@@@@"
 	db "RHYPERIOR@"
 	db "ESPEON@@@@"
@@ -201,12 +201,12 @@ MonsterNames::
 	db "LICKILICKY"
 	db "TANGROWTH@"
 	db "KLEAVOR@@@"
-	db "TSUBOMITTO"
+	db "BELLIGNAN@"
 	db "STEELIX@@@"
 	db "BLISSEY@@@"
 	db "HITMONTOP@"
 	db "CROBAT@@@@"
-	db "ANIMON@@@@"
+	db "MIMMEO@@@@"
 	db "BELLOSSOM@"
 	db "PORYGON2@@"
 	db "KINGDRA@@@"
@@ -214,9 +214,9 @@ MonsterNames::
 	db "SLOWKING@@"
 	db "ELECTIVIRE"
 	db "MAGMORTAR@"
-	db "TAABAN@@@@"
+	db "DISTURBAN@"
 	db "KOKANA@@@@"
-	db "KASANAGI@@"
+	db "PUPAL@@@@@"
 	db "CARAPTHOR@"
 	db "MAGNEZONE@"
 	db "PORYGON-Z@"

data/pokemon/new_dex_text.asm

@@ -69,9 +69,9 @@ _KotoraDexEntry::
 	dex
 
 _JaggDexEntry::
-	text "Known as the"
+	text "Also known as the"
 	next "Sailor's Scourge,"
-	next "it rams its"
+	next "SHARPOON rams its"
 
 	page "proud horn into"
 	next "the hulls of"
@@ -139,13 +139,13 @@ _RibbitoDexEntry::
 	dex
 
 _CryithanDexEntry::
-	text "During a battle,"
+	text "Highly aggressive,"
-	next "this #MON cries"
+	next "it drives other"
-	next "to dishearten the"
+	next "#MON away with"
 
-	page "enemy. It strikes"
+	page "its strong tail"
-	next "once the foe lets"
+	next "before finishing"
-	next "its guard down"
+	next "them with SLASH"
 	dex
 
 _BlastykeDexEntry::
@@ -179,13 +179,13 @@ _SkimperDexEntry::
 	dex
 
 _BawliguaDexEntry::
-	text "Often basks in"
+	text "Often climbs atop"
-	next "the sunlight. If"
+	next "branches to feast"
-	next "its temperature"
+	next "on foliage. When"
 
-	page "rises too high,"
+	page "under attack, it"
-	next "it cries to"
+	next "stuns foes with an"
-	next "cool itself down"
+	next "unnerving GLARE"
 	dex
 
 _PuchikoonDexEntry::		; referenced from various Ponyta entries. Funny how both Vulpix and Ponyta do this...
@@ -283,7 +283,7 @@ _OmegaDexEntry::
 	next "by SILPH CO."
 	next "Modeled after the"
 
-	page "extinct GYAOON,"
+	page "extinct GAWARHED,"
 	next "it's said to pack"
 	next "devastating power"
 	dex
@@ -394,8 +394,8 @@ _TaabanDexEntry::
 	next "While draining its"
 
 	page "host's nutrients,"
-	next "TAABAN injects it"
+	next "DISTURBAN injects"
-	next "with potent venom"
+	next "it with venom"
 	dex
 
 _KokanaDexEntry::
@@ -481,9 +481,9 @@ _UmbreonDexEntry::	; Entry alludes to its scrapped Poison type, and I thought it
 _LeafeonDexEntry::
 	text "It has a distinct"
 	next "aroma that changes"
-	next "with age. A"
+	next "with age. While"
 
-	page "younger LEAFEON"
+	page "it's young, it"
 	next "typically smells"
 	next "like fresh grass"
 	dex
@@ -529,7 +529,7 @@ _PolitoedDexEntry::
 	dex
 
 _SlowkingDexEntry::
-	text "TAABAN's poison"
+	text "DISTURBAN's venom"
 	next "stimulated its"
 	next "brain, making it"
 
@@ -909,17 +909,17 @@ _RapidashGDexEntry::
 	dex
 
 _SlowbroGDexEntry::
-	text "The TAABAN that"
+	text "The DISTUBAN that"
 	next "bit SLOWBRO has"
 	next "made it poisonous."
 	
-	page "TAABAN's tongue"
+	page "DISTURBAN's tongue"
 	next "can be squeezed"
 	next "to spit poison"
 	dex
 
 _SlowkingGDexEntry::
-	text "The TAABAN that"
+	text "The DISTURBAN that"
 	next "bit SLOWKING has"
 	next "assumed control."
 	

text/IndigoPlateauLobby.asm

@@ -41,7 +41,7 @@ _ReceivedCandyJarText::
 	text_end
 
 _CandyJarExplanationText::
-	text "Me and CRYITHAN"
+	text "Me and IGUANARCH"
 	line "are so ready for"
 	cont "the LEAGUE!"
 	

text/SilphCo11F.asm

@@ -4,7 +4,7 @@ _SilphCoPresidentText::
 	cont "SILPH!"
 	
 	para "And...sorry about"
-	line "that OMEGA model."
+	line "that OMEGADGE."
 	cont "It must have seen"
 	cont "you as a threat."
 	
@@ -61,7 +61,7 @@ _SilphCo11Text2::
 	line "you for rescuing"
 	cont "all of us!"
 
-	para "Hmm? OMEGA?"
+	para "Hmm? OMEGADGE?"
 	
 	para "All I know is the"
 	line "CHIEF quickly"

text/SilphGauntlet4F.asm

@@ -17,13 +17,14 @@ _SilphGauntlet4FEndBattleText1::
 	prompt
 
 _SilphGauntlet4FAfterBattleText1::
-	text "Good job getting"
+	text "We had trouble"
-	line "past our OMEGA,"
-	cont "too."
-	
-	para "We had trouble"
 	line "controlling that"
-	cont "brute!"
+	cont "OMEGADGE brute!"
+
+	para "I've noted down"
+	line "some flaws we"
+	cont "must fix in the"
+	cont "next model..."
 	done
 
 _SilphGauntlet4FBattleText2::