diff --git a/data/pokemon/base_stats/madaamu.asm b/data/pokemon/base_stats/madaamu.asm index 5d4cc40d..67dd3fb3 100644 --- a/data/pokemon/base_stats/madaamu.asm +++ b/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, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ - CUT, FLY + BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT, \ + FLY ; end db BANK(MadaamuPicFront) diff --git a/data/pokemon/base_stats/sirfetchd.asm b/data/pokemon/base_stats/sirfetchd.asm index 45dc8686..4f0230f7 100644 --- a/data/pokemon/base_stats/sirfetchd.asm +++ b/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, \ - SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ - CUT, FLY + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT, \ + FLY ; end db BANK(SirfetchdPicFront) diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index c14d14de..215e9d05 100644 --- a/data/pokemon/dex_text.asm +++ b/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" - next "TAABAN, causing" - next "it to evolve" + page "a wild DISTURBAN," + next "making it 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" - next "thick skin would" - next "struggle to handle" + text "A THUNDERBOLT from" + next "RAICHU contains" + next "such high voltage" - page "RAICHU's shocks," - next "which can reach" - next "100,000 volts" + page "that a TRAMPEL's" + next "thick skin can't" + 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 diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index c1150307..9049f9ef 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2931,18 +2931,18 @@ ScreamTailEvosMoves: ; Evolutions db 0 ; Learnset - db 51, SCREECH - db 55, DAZZLE_GLEAM - db 55, DRAININGKISS + db 56, SCREECH + db 63, DAZZLE_GLEAM + db 70, DRAININGKISS db 0 SandyShocksEvosMoves: ; Evolutions db 0 ; Learnset - db 51, SUPERSONIC - db 55, SCREECH - db 55, METAL_SOUND + db 56, SUPERSONIC + db 63, SCREECH + 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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 3a42a1a3..71154a04 100644 --- a/data/pokemon/names.asm +++ b/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 "JAGG@@@@@@" + db "CACTORMUS@" + 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 "CRYITHAN@@" + db "MINISTARE@" + 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 "OMEGA@@@@@" + db "COINPUR@@@" + 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@" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index a02ba0fd..79b23a12 100644 --- a/data/pokemon/new_dex_text.asm +++ b/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," - next "this #MON cries" - next "to dishearten the" + text "Highly aggressive," + next "it drives other" + next "#MON away with" - page "enemy. It strikes" - next "once the foe lets" - next "its guard down" + page "its strong tail" + next "before finishing" + next "them with SLASH" dex _BlastykeDexEntry:: @@ -179,13 +179,13 @@ _SkimperDexEntry:: dex _BawliguaDexEntry:: - text "Often basks in" - next "the sunlight. If" - next "its temperature" + text "Often climbs atop" + next "branches to feast" + next "on foliage. When" - page "rises too high," - next "it cries to" - next "cool itself down" + page "under attack, it" + next "stuns foes with an" + 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 "with potent venom" + next "DISTURBAN injects" + 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." diff --git a/gfx/pokemon/back/crobatb.png b/gfx/pokemon/back/crobatb.png index 69e8aa5a..e4fe95ea 100644 Binary files a/gfx/pokemon/back/crobatb.png and b/gfx/pokemon/back/crobatb.png differ diff --git a/gfx/pokemon/back/golemab.png b/gfx/pokemon/back/golemab.png index 026153f8..344d77f6 100644 Binary files a/gfx/pokemon/back/golemab.png and b/gfx/pokemon/back/golemab.png differ diff --git a/gfx/pokemon/back/persianab.png b/gfx/pokemon/back/persianab.png index b95e0041..fb77c039 100644 Binary files a/gfx/pokemon/back/persianab.png and b/gfx/pokemon/back/persianab.png differ diff --git a/gfx/pokemon/back/raticateab.png b/gfx/pokemon/back/raticateab.png index 2b213873..1b0ae21f 100644 Binary files a/gfx/pokemon/back/raticateab.png and b/gfx/pokemon/back/raticateab.png differ diff --git a/gfx/pokemon/back/sandslashab.png b/gfx/pokemon/back/sandslashab.png index 0a0ebc56..11c417d6 100644 Binary files a/gfx/pokemon/back/sandslashab.png and b/gfx/pokemon/back/sandslashab.png differ diff --git a/gfx/pokemon/front/bawligua.png b/gfx/pokemon/front/bawligua.png index e41c1197..06b9596c 100644 Binary files a/gfx/pokemon/front/bawligua.png and b/gfx/pokemon/front/bawligua.png differ diff --git a/gfx/pokemon/front/skimper.png b/gfx/pokemon/front/skimper.png index 74287fd8..b0d96f02 100644 Binary files a/gfx/pokemon/front/skimper.png and b/gfx/pokemon/front/skimper.png differ diff --git a/gfx/pokemon/unused/bawligua.png b/gfx/pokemon/unused/bawligua.png new file mode 100644 index 00000000..e41c1197 Binary files /dev/null and b/gfx/pokemon/unused/bawligua.png differ diff --git a/gfx/pokemon/unused/skimper.png b/gfx/pokemon/unused/skimper.png new file mode 100644 index 00000000..74287fd8 Binary files /dev/null and b/gfx/pokemon/unused/skimper.png differ diff --git a/text/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm index 99edaf4b..b82862fd 100644 --- a/text/IndigoPlateauLobby.asm +++ b/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!" diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 3083e96f..a645b956 100644 --- a/text/SilphCo11F.asm +++ b/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" diff --git a/text/SilphGauntlet4F.asm b/text/SilphGauntlet4F.asm index ea9daa0f..29025fc8 100644 --- a/text/SilphGauntlet4F.asm +++ b/text/SilphGauntlet4F.asm @@ -17,13 +17,14 @@ _SilphGauntlet4FEndBattleText1:: prompt _SilphGauntlet4FAfterBattleText1:: - text "Good job getting" - line "past our OMEGA," - cont "too." - - para "We had trouble" + text "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::