From a1e009abb3c5043c744eb12415d94181d21abbc3 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 31 Aug 2022 19:26:41 +0100 Subject: [PATCH] Dex entries! --- data/pokemon/dex_entries.asm | 2173 +++++++++++++++++++-------------- data/pokemon/dex_text.asm | 32 +- data/pokemon/new_dex_text.asm | 459 +++++++ main.asm | 8 +- text.asm | 1 + 5 files changed, 1712 insertions(+), 961 deletions(-) create mode 100644 data/pokemon/new_dex_text.asm diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index c99087e2..116de3c5 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -30,8 +30,8 @@ PokedexEntryPointers: dw BlastoiseDexEntry dw PinsirDexEntry dw TangelaDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw GyaoonDexEntry + dw NidoreignDexEntry dw GrowlitheDexEntry dw OnixDexEntry dw FearowDexEntry @@ -49,26 +49,26 @@ PokedexEntryPointers: dw PsyduckDexEntry dw DrowzeeDexEntry dw GolemDexEntry - dw MissingNoDexEntry + dw BarundaDexEntry dw MagmarDexEntry - dw MissingNoDexEntry + dw BuuDexEntry dw ElectabuzzDexEntry dw MagnetonDexEntry dw KoffingDexEntry - dw MissingNoDexEntry + dw DeerDexEntry dw MankeyDexEntry dw SeelDexEntry dw DiglettDexEntry dw TaurosDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw TrampelDexEntry + dw CrockyDexEntry + dw BlottleDexEntry dw FarfetchdDexEntry dw VenonatDexEntry dw DragoniteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw CactusDexEntry + dw JaggDexEntry + dw BittybatDexEntry dw DoduoDexEntry dw PoliwagDexEntry dw JynxDexEntry @@ -78,23 +78,23 @@ PokedexEntryPointers: dw DittoDexEntry dw MeowthDexEntry dw KrabbyDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw CheepDexEntry + dw JabettaDexEntry + dw MikonDexEntry dw VulpixDexEntry dw NinetalesDexEntry dw PikachuDexEntry dw RaichuDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw RibbitoDexEntry + dw CroakozunaDexEntry dw DratiniDexEntry dw DragonairDexEntry dw KabutoDexEntry dw KabutopsDexEntry dw HorseaDexEntry dw SeadraDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw BawliguaDexEntry + dw CryithanDexEntry dw SandshrewDexEntry dw SandslashDexEntry dw OmanyteDexEntry @@ -114,38 +114,38 @@ PokedexEntryPointers: dw WeedleDexEntry dw KakunaDexEntry dw BeedrillDexEntry - dw MissingNoDexEntry + dw MadaamuDexEntry dw DodrioDexEntry dw PrimeapeDexEntry dw DugtrioDexEntry dw VenomothDexEntry dw DewgongDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw PurakkusuDexEntry + dw PendrakenDexEntry dw CaterpieDexEntry dw MetapodDexEntry dw ButterfreeDexEntry dw MachampDexEntry - dw MissingNoDexEntry + dw WeirduckDexEntry dw GolduckDexEntry dw HypnoDexEntry dw GolbatDexEntry dw MewtwoDexEntry dw SnorlaxDexEntry dw MagikarpDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw KonyaDexEntry + dw OmegaDexEntry dw MukDexEntry - dw MissingNoDexEntry + dw DecillaDexEntry dw KinglerDexEntry dw CloysterDexEntry - dw MissingNoDexEntry + dw MagnetiteDexEntry dw ElectrodeDexEntry dw ClefableDexEntry dw WeezingDexEntry dw PersianDexEntry dw MarowakDexEntry - dw MissingNoDexEntry + dw GuardiaDexEntry dw HaunterDexEntry dw AbraDexEntry dw AlakazamDexEntry @@ -155,13 +155,13 @@ PokedexEntryPointers: dw BulbasaurDexEntry dw VenusaurDexEntry dw TentacruelDexEntry - dw MissingNoDexEntry + dw GyopinDexEntry dw GoldeenDexEntry dw SeakingDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw KotoraDexEntry + dw GaotoraDexEntry + dw GorotoraDexEntry + dw PuchikoonDexEntry dw PonytaDexEntry dw RapidashDexEntry dw RattataDexEntry @@ -171,16 +171,16 @@ PokedexEntryPointers: dw GeodudeDexEntry dw PorygonDexEntry dw AerodactylDexEntry - dw MissingNoDexEntry + dw BlastykeDexEntry dw MagnemiteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw SkimperDexEntry + dw GorochuDexEntry dw CharmanderDexEntry dw SquirtleDexEntry dw CharmeleonDexEntry dw WartortleDexEntry dw CharizardDexEntry - dw MissingNoDexEntry + dw TotartleDexEntry dw MissingNoDexEntry dw MissingNoDexEntry dw MissingNoDexEntry @@ -190,6 +190,15 @@ PokedexEntryPointers: dw BellsproutDexEntry dw WeepinbellDexEntry dw VictreebelDexEntry + dw TsubomittoDexEntry + dw AnimonDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw BellossomDexEntry + dw ScizorDexEntry assert_table_length NUM_POKEMON_INDEXES ; string: species name @@ -197,60 +206,11 @@ PokedexEntryPointers: ; weight in pounds ; text entry -RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 - text_far _RhydonDexEntry - text_end - -KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 - text_far _KangaskhanDexEntry - text_end - -NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 - text_far _NidoranMDexEntry - text_end - -ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 - text_far _ClefairyDexEntry - text_end - -SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _SpearowDexEntry - text_end - -VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 - text_far _VoltorbDexEntry - text_end - -NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 - text_far _NidokingDexEntry - text_end - -SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 - text_far _SlowbroDexEntry +BulbasaurDexEntry: + db "SEED@" + db 2,4 + dw 150 + text_far _BulbasaurDexEntry text_end IvysaurDexEntry: @@ -260,130 +220,46 @@ IvysaurDexEntry: text_far _IvysaurDexEntry text_end -ExeggutorDexEntry: - db "COCONUT@" +VenusaurDexEntry: + db "SEED@" db 6,7 - dw 2650 - text_far _ExeggutorDexEntry + dw 2210 + text_far _VenusaurDexEntry text_end -LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 - text_far _LickitungDexEntry +CharmanderDexEntry: + db "LIZARD@" + db 2,0 + dw 190 + text_far _CharmanderDexEntry text_end -ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 - text_far _ExeggcuteDexEntry +CharmeleonDexEntry: + db "FLAME@" + db 3,7 + dw 420 + text_far _CharmeleonDexEntry text_end -GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 - text_far _GrimerDexEntry +CharizardDexEntry: + db "FLAME@" + db 5,7 + dw 2000 + text_far _CharizardDexEntry text_end -GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 - text_far _GengarDexEntry +SquirtleDexEntry: + db "TINYTURTLE@" + db 1,8 + dw 200 + text_far _SquirtleDexEntry text_end -NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 - text_far _NidoranFDexEntry - text_end - -NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 - text_far _NidoqueenDexEntry - text_end - -CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 - text_far _CuboneDexEntry - text_end - -RhyhornDexEntry: - db "SPIKES@" +WartortleDexEntry: + db "TURTLE@" db 3,3 - dw 2540 - text_far _RhyhornDexEntry - text_end - -LaprasDexEntry: - db "TRANSPORT@" - db 8,2 - dw 4850 - text_far _LaprasDexEntry - text_end - -ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 - text_far _ArcanineDexEntry - text_end - -MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 - text_far _MewDexEntry - text_end - -GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 - text_far _GyaradosDexEntry - text_end - -ShellderDexEntry: - db "BIVALVE@" - db 1,0 - dw 90 - text_far _ShellderDexEntry - text_end - -TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 - text_far _TentacoolDexEntry - text_end - -GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 - text_far _GastlyDexEntry - text_end - -ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 - text_far _ScytherDexEntry - text_end - -StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 - text_far _StaryuDexEntry + dw 500 + text_far _WartortleDexEntry text_end BlastoiseDexEntry: @@ -393,517 +269,6 @@ BlastoiseDexEntry: text_far _BlastoiseDexEntry text_end -PinsirDexEntry: - db "STAGBEETLE@" - db 4,11 - dw 1210 - text_far _PinsirDexEntry - text_end - -TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 - text_far _TangelaDexEntry - text_end - -GrowlitheDexEntry: - db "PUPPY@" - db 2,4 - dw 420 - text_far _GrowlitheDexEntry - text_end - -OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 - text_far _OnixDexEntry - text_end - -FearowDexEntry: - db "BEAK@" - db 3,11 - dw 840 - text_far _FearowDexEntry - text_end - -PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _PidgeyDexEntry - text_end - -SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 - text_far _SlowpokeDexEntry - text_end - -KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 - text_far _KadabraDexEntry - text_end - -GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 - text_far _GravelerDexEntry - text_end - -ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 - text_far _ChanseyDexEntry - text_end - -MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 - text_far _MachokeDexEntry - text_end - -MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 - text_far _MrMimeDexEntry - text_end - -HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 - text_far _HitmonleeDexEntry - text_end - -HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 - text_far _HitmonchanDexEntry - text_end - -ArbokDexEntry: - db "COBRA@" - db 11,6 - dw 1430 - text_far _ArbokDexEntry - text_end - -ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 - text_far _ParasectDexEntry - text_end - -PsyduckDexEntry: - db "DUCK@" - db 2,7 - dw 430 - text_far _PsyduckDexEntry - text_end - -DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 - text_far _DrowzeeDexEntry - text_end - -GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 - text_far _GolemDexEntry - text_end - -MagmarDexEntry: - db "SPITFIRE@" - db 4,3 - dw 980 - text_far _MagmarDexEntry - text_end - -ElectabuzzDexEntry: - db "ELECTRIC@" - db 3,7 - dw 660 - text_far _ElectabuzzDexEntry - text_end - -MagnetonDexEntry: - db "MAGNET@" - db 3,3 - dw 1320 - text_far _MagnetonDexEntry - text_end - -KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 - text_far _KoffingDexEntry - text_end - -MankeyDexEntry: - db "PIG MONKEY@" - db 1,8 - dw 620 - text_far _MankeyDexEntry - text_end - -SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 - text_far _SeelDexEntry - text_end - -DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 - text_far _DiglettDexEntry - text_end - -TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 - text_far _TaurosDexEntry - text_end - -FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 - text_far _FarfetchdDexEntry - text_end - -VenonatDexEntry: - db "INSECT@" - db 3,3 - dw 660 - text_far _VenonatDexEntry - text_end - -DragoniteDexEntry: - db "DRAGON@" - db 7,3 - dw 4630 - text_far _DragoniteDexEntry - text_end - -DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 - text_far _DoduoDexEntry - text_end - -PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 - text_far _PoliwagDexEntry - text_end - -JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 - text_far _JynxDexEntry - text_end - -MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 - text_far _MoltresDexEntry - text_end - -ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 - text_far _ArticunoDexEntry - text_end - -ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 - text_far _ZapdosDexEntry - text_end - -DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 - text_far _DittoDexEntry - text_end - -MeowthDexEntry: - db "SCRATCHCAT@" - db 1,4 - dw 90 - text_far _MeowthDexEntry - text_end - -KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 - text_far _KrabbyDexEntry - text_end - -VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 - text_far _VulpixDexEntry - text_end - -NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 - text_far _NinetalesDexEntry - text_end - -PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 - text_far _PikachuDexEntry - text_end - -RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 - text_far _RaichuDexEntry - text_end - -DratiniDexEntry: - db "DRAGON@" - db 5,11 - dw 70 - text_far _DratiniDexEntry - text_end - -DragonairDexEntry: - db "DRAGON@" - db 13,1 - dw 360 - text_far _DragonairDexEntry - text_end - -KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 - text_far _KabutoDexEntry - text_end - -KabutopsDexEntry: - db "SHELLFISH@" - db 4,3 - dw 890 - text_far _KabutopsDexEntry - text_end - -HorseaDexEntry: - db "DRAGON@" - db 1,4 - dw 180 - text_far _HorseaDexEntry - text_end - -SeadraDexEntry: - db "DRAGON@" - db 3,11 - dw 550 - text_far _SeadraDexEntry - text_end - -SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 - text_far _SandshrewDexEntry - text_end - -SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 - text_far _SandslashDexEntry - text_end - -OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 - text_far _OmanyteDexEntry - text_end - -OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 - text_far _OmastarDexEntry - text_end - -JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 - text_far _JigglypuffDexEntry - text_end - -WigglytuffDexEntry: - db "BALLOON@" - db 3,3 - dw 260 - text_far _WigglytuffDexEntry - text_end - -EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 - text_far _EeveeDexEntry - text_end - -FlareonDexEntry: - db "FLAME@" - db 2,11 - dw 550 - text_far _FlareonDexEntry - text_end - -JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 - text_far _JolteonDexEntry - text_end - -VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 - text_far _VaporeonDexEntry - text_end - -MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 - text_far _MachopDexEntry - text_end - -ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 - text_far _ZubatDexEntry - text_end - -EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 - text_far _EkansDexEntry - text_end - -ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 - text_far _ParasDexEntry - text_end - -PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 - text_far _PoliwhirlDexEntry - text_end - -PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 - text_far _PoliwrathDexEntry - text_end - -WeedleDexEntry: - db "HAIRY BUG@" - db 1,0 - dw 70 - text_far _WeedleDexEntry - text_end - -KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 - text_far _KakunaDexEntry - text_end - -BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 - text_far _BeedrillDexEntry - text_end - -DodrioDexEntry: - db "TRIPLEBIRD@" - db 5,11 - dw 1880 - text_far _DodrioDexEntry - text_end - -PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 - text_far _PrimeapeDexEntry - text_end - -DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 - text_far _DugtrioDexEntry - text_end - -VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 - text_far _VenomothDexEntry - text_end - -DewgongDexEntry: - db "SEA LION@" - db 5,7 - dw 2650 - text_far _DewgongDexEntry - text_end - CaterpieDexEntry: db "WORM@" db 1,0 @@ -925,130 +290,32 @@ ButterfreeDexEntry: text_far _ButterfreeDexEntry text_end -MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 - text_far _MachampDexEntry +WeedleDexEntry: + db "HAIRY BUG@" + db 1,0 + dw 70 + text_far _WeedleDexEntry text_end -GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 - text_far _GolduckDexEntry - text_end - -HypnoDexEntry: - db "HYPNOSIS@" - db 5,3 - dw 1670 - text_far _HypnoDexEntry - text_end - -GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 - text_far _GolbatDexEntry - text_end - -MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 - text_far _MewtwoDexEntry - text_end - -SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 - text_far _SnorlaxDexEntry - text_end - -MagikarpDexEntry: - db "FISH@" - db 2,11 +KakunaDexEntry: + db "COCOON@" + db 2,0 dw 220 - text_far _MagikarpDexEntry + text_far _KakunaDexEntry text_end -MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 - text_far _MukDexEntry - text_end - -KinglerDexEntry: - db "PINCER@" - db 4,3 - dw 1320 - text_far _KinglerDexEntry - text_end - -CloysterDexEntry: - db "BIVALVE@" - db 4,11 - dw 2920 - text_far _CloysterDexEntry - text_end - -ElectrodeDexEntry: - db "BALL@" - db 3,11 - dw 1470 - text_far _ElectrodeDexEntry - text_end - -ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 - text_far _ClefableDexEntry - text_end - -WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 - text_far _WeezingDexEntry - text_end - -PersianDexEntry: - db "CLASSY CAT@" +BeedrillDexEntry: + db "POISON BEE@" db 3,3 - dw 710 - text_far _PersianDexEntry + dw 650 + text_far _BeedrillDexEntry text_end -MarowakDexEntry: - db "BONEKEEPER@" - db 3,3 - dw 990 - text_far _MarowakDexEntry - text_end - -HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 - text_far _HaunterDexEntry - text_end - -AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 - text_far _AbraDexEntry - text_end - -AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 - text_far _AlakazamDexEntry +PidgeyDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _PidgeyDexEntry text_end PidgeottoDexEntry: @@ -1065,62 +332,6 @@ PidgeotDexEntry: text_far _PidgeotDexEntry text_end -StarmieDexEntry: - db "MYSTERIOUS@" - db 3,7 - dw 1760 - text_far _StarmieDexEntry - text_end - -BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 - text_far _BulbasaurDexEntry - text_end - -VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 - text_far _VenusaurDexEntry - text_end - -TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 - text_far _TentacruelDexEntry - text_end - -GoldeenDexEntry: - db "GOLDFISH@" - db 2,0 - dw 330 - text_far _GoldeenDexEntry - text_end - -SeakingDexEntry: - db "GOLDFISH@" - db 4,3 - dw 860 - text_far _SeakingDexEntry - text_end - -PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 - dw 660 - text_far _PonytaDexEntry - text_end - -RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 - text_far _RapidashDexEntry - text_end - RattataDexEntry: db "RAT@" db 1,0 @@ -1135,11 +346,67 @@ RaticateDexEntry: text_far _RaticateDexEntry text_end -NidorinoDexEntry: +SpearowDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _SpearowDexEntry + text_end + +FearowDexEntry: + db "BEAK@" + db 3,11 + dw 840 + text_far _FearowDexEntry + text_end + +EkansDexEntry: + db "SNAKE@" + db 6,7 + dw 150 + text_far _EkansDexEntry + text_end + +ArbokDexEntry: + db "COBRA@" + db 11,6 + dw 1430 + text_far _ArbokDexEntry + text_end + +PikachuDexEntry: + db "MOUSE@" + db 1,4 + dw 130 + text_far _PikachuDexEntry + text_end + +RaichuDexEntry: + db "MOUSE@" + db 2,7 + dw 660 + text_far _RaichuDexEntry + text_end + +SandshrewDexEntry: + db "MOUSE@" + db 2,0 + dw 260 + text_far _SandshrewDexEntry + text_end + +SandslashDexEntry: + db "MOUSE@" + db 3,3 + dw 650 + text_far _SandslashDexEntry + text_end + +NidoranFDexEntry: db "POISON PIN@" - db 2,11 - dw 430 - text_far _NidorinoDexEntry + db 1,4 + dw 150 + text_far _NidoranFDexEntry text_end NidorinaDexEntry: @@ -1149,67 +416,88 @@ NidorinaDexEntry: text_far _NidorinaDexEntry text_end -GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 - text_far _GeodudeDexEntry +NidoqueenDexEntry: + db "DRILL@" + db 4,3 + dw 1320 + text_far _NidoqueenDexEntry text_end -PorygonDexEntry: - db "VIRTUAL@" - db 2,7 - dw 800 - text_far _PorygonDexEntry - text_end - -AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 - text_far _AerodactylDexEntry - text_end - -MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 - text_far _MagnemiteDexEntry - text_end - -CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 - text_far _CharmanderDexEntry - text_end - -SquirtleDexEntry: - db "TINYTURTLE@" +NidoranMDexEntry: + db "POISON PIN@" db 1,8 dw 200 - text_far _SquirtleDexEntry + text_far _NidoranMDexEntry text_end -CharmeleonDexEntry: - db "FLAME@" +NidorinoDexEntry: + db "POISON PIN@" + db 2,11 + dw 430 + text_far _NidorinoDexEntry + text_end + +NidokingDexEntry: + db "DRILL@" + db 4,7 + dw 1370 + text_far _NidokingDexEntry + text_end + +ClefairyDexEntry: + db "FAIRY@" + db 2,0 + dw 170 + text_far _ClefairyDexEntry + text_end + +ClefableDexEntry: + db "FAIRY@" + db 4,3 + dw 880 + text_far _ClefableDexEntry + text_end + +VulpixDexEntry: + db "FOX@" + db 2,0 + dw 220 + text_far _VulpixDexEntry + text_end + +NinetalesDexEntry: + db "FOX@" db 3,7 - dw 420 - text_far _CharmeleonDexEntry + dw 440 + text_far _NinetalesDexEntry text_end -WartortleDexEntry: - db "TURTLE@" +JigglypuffDexEntry: + db "BALLOON@" + db 1,8 + dw 120 + text_far _JigglypuffDexEntry + text_end + +WigglytuffDexEntry: + db "BALLOON@" db 3,3 - dw 500 - text_far _WartortleDexEntry + dw 260 + text_far _WigglytuffDexEntry text_end -CharizardDexEntry: - db "FLAME@" - db 5,7 - dw 2000 - text_far _CharizardDexEntry +ZubatDexEntry: + db "BAT@" + db 2,7 + dw 170 + text_far _ZubatDexEntry + text_end + +GolbatDexEntry: + db "BAT@" + db 5,3 + dw 1210 + text_far _GolbatDexEntry text_end OddishDexEntry: @@ -1233,6 +521,167 @@ VileplumeDexEntry: text_far _VileplumeDexEntry text_end +ParasDexEntry: + db "MUSHROOM@" + db 1,0 + dw 120 + text_far _ParasDexEntry + text_end + +ParasectDexEntry: + db "MUSHROOM@" + db 3,3 + dw 650 + text_far _ParasectDexEntry + text_end + +VenonatDexEntry: + db "INSECT@" + db 3,3 + dw 660 + text_far _VenonatDexEntry + text_end + +VenomothDexEntry: + db "POISONMOTH@" + db 4,11 + dw 280 + text_far _VenomothDexEntry + text_end + +DiglettDexEntry: + db "MOLE@" + db 0,8 + dw 20 + text_far _DiglettDexEntry + text_end + +DugtrioDexEntry: + db "MOLE@" + db 2,4 + dw 730 + text_far _DugtrioDexEntry + text_end + +MeowthDexEntry: + db "SCRATCHCAT@" + db 1,4 + dw 90 + text_far _MeowthDexEntry + text_end + +PersianDexEntry: + db "CLASSY CAT@" + db 3,3 + dw 710 + text_far _PersianDexEntry + text_end + +PsyduckDexEntry: + db "DUCK@" + db 2,7 + dw 430 + text_far _PsyduckDexEntry + text_end + +GolduckDexEntry: + db "DUCK@" + db 5,7 + dw 1690 + text_far _GolduckDexEntry + text_end + +MankeyDexEntry: + db "PIG MONKEY@" + db 1,8 + dw 620 + text_far _MankeyDexEntry + text_end + +PrimeapeDexEntry: + db "PIG MONKEY@" + db 3,3 + dw 710 + text_far _PrimeapeDexEntry + text_end + +GrowlitheDexEntry: + db "PUPPY@" + db 2,4 + dw 420 + text_far _GrowlitheDexEntry + text_end + +ArcanineDexEntry: + db "LEGENDARY@" + db 6,3 + dw 3420 + text_far _ArcanineDexEntry + text_end + +PoliwagDexEntry: + db "TADPOLE@" + db 2,0 + dw 270 + text_far _PoliwagDexEntry + text_end + +PoliwhirlDexEntry: + db "TADPOLE@" + db 3,3 + dw 440 + text_far _PoliwhirlDexEntry + text_end + +PoliwrathDexEntry: + db "TADPOLE@" + db 4,3 + dw 1190 + text_far _PoliwrathDexEntry + text_end + +AbraDexEntry: + db "PSI@" + db 2,11 + dw 430 + text_far _AbraDexEntry + text_end + +KadabraDexEntry: + db "PSI@" + db 4,3 + dw 1250 + text_far _KadabraDexEntry + text_end + +AlakazamDexEntry: + db "PSI@" + db 4,11 + dw 1060 + text_far _AlakazamDexEntry + text_end + +MachopDexEntry: + db "SUPERPOWER@" + db 2,7 + dw 430 + text_far _MachopDexEntry + text_end + +MachokeDexEntry: + db "SUPERPOWER@" + db 4,11 + dw 1550 + text_far _MachokeDexEntry + text_end + +MachampDexEntry: + db "SUPERPOWER@" + db 5,3 + dw 2870 + text_far _MachampDexEntry + text_end + BellsproutDexEntry: db "FLOWER@" db 2,4 @@ -1254,8 +703,850 @@ VictreebelDexEntry: text_far _VictreebelDexEntry text_end +TentacoolDexEntry: + db "JELLYFISH@" + db 2,11 + dw 1000 + text_far _TentacoolDexEntry + text_end + +TentacruelDexEntry: + db "JELLYFISH@" + db 5,3 + dw 1210 + text_far _TentacruelDexEntry + text_end + +GeodudeDexEntry: + db "ROCK@" + db 1,4 + dw 440 + text_far _GeodudeDexEntry + text_end + +GravelerDexEntry: + db "ROCK@" + db 3,3 + dw 2320 + text_far _GravelerDexEntry + text_end + +GolemDexEntry: + db "MEGATON@" + db 4,7 + dw 6620 + text_far _GolemDexEntry + text_end + +PonytaDexEntry: + db "FIRE HORSE@" + db 3,3 + dw 660 + text_far _PonytaDexEntry + text_end + +RapidashDexEntry: + db "FIRE HORSE@" + db 5,7 + dw 2090 + text_far _RapidashDexEntry + text_end + +SlowpokeDexEntry: + db "DOPEY@" + db 3,11 + dw 790 + text_far _SlowpokeDexEntry + text_end + +SlowbroDexEntry: + db "HERMITCRAB@" + db 5,3 + dw 1730 + text_far _SlowbroDexEntry + text_end + +MagnemiteDexEntry: + db "MAGNET@" + db 1,0 + dw 130 + text_far _MagnemiteDexEntry + text_end + +MagnetonDexEntry: + db "MAGNET@" + db 3,3 + dw 1320 + text_far _MagnetonDexEntry + text_end + +FarfetchdDexEntry: + db "WILD DUCK@" + db 2,7 + dw 330 + text_far _FarfetchdDexEntry + text_end + +DoduoDexEntry: + db "TWIN BIRD@" + db 4,7 + dw 860 + text_far _DoduoDexEntry + text_end + +DodrioDexEntry: + db "TRIPLEBIRD@" + db 5,11 + dw 1880 + text_far _DodrioDexEntry + text_end + +SeelDexEntry: + db "SEA LION@" + db 3,7 + dw 1980 + text_far _SeelDexEntry + text_end + +DewgongDexEntry: + db "SEA LION@" + db 5,7 + dw 2650 + text_far _DewgongDexEntry + text_end + +GrimerDexEntry: + db "SLUDGE@" + db 2,11 + dw 660 + text_far _GrimerDexEntry + text_end + +MukDexEntry: + db "SLUDGE@" + db 3,11 + dw 660 + text_far _MukDexEntry + text_end + +ShellderDexEntry: + db "BIVALVE@" + db 1,0 + dw 90 + text_far _ShellderDexEntry + text_end + +CloysterDexEntry: + db "BIVALVE@" + db 4,11 + dw 2920 + text_far _CloysterDexEntry + text_end + +GastlyDexEntry: + db "GAS@" + db 4,3 + dw 2 + text_far _GastlyDexEntry + text_end + +HaunterDexEntry: + db "GAS@" + db 5,3 + dw 2 + text_far _HaunterDexEntry + text_end + +GengarDexEntry: + db "SHADOW@" + db 4,11 + dw 890 + text_far _GengarDexEntry + text_end + +OnixDexEntry: + db "ROCK SNAKE@" + db 28,10 + dw 4630 + text_far _OnixDexEntry + text_end + +DrowzeeDexEntry: + db "HYPNOSIS@" + db 3,3 + dw 710 + text_far _DrowzeeDexEntry + text_end + +HypnoDexEntry: + db "HYPNOSIS@" + db 5,3 + dw 1670 + text_far _HypnoDexEntry + text_end + +KrabbyDexEntry: + db "RIVER CRAB@" + db 1,4 + dw 140 + text_far _KrabbyDexEntry + text_end + +KinglerDexEntry: + db "PINCER@" + db 4,3 + dw 1320 + text_far _KinglerDexEntry + text_end + +VoltorbDexEntry: + db "BALL@" + db 1,8 + dw 230 + text_far _VoltorbDexEntry + text_end + +ElectrodeDexEntry: + db "BALL@" + db 3,11 + dw 1470 + text_far _ElectrodeDexEntry + text_end + +ExeggcuteDexEntry: + db "EGG@" + db 1,4 + dw 60 + text_far _ExeggcuteDexEntry + text_end + +ExeggutorDexEntry: + db "COCONUT@" + db 6,7 + dw 2650 + text_far _ExeggutorDexEntry + text_end + +CuboneDexEntry: + db "LONELY@" + db 1,4 + dw 140 + text_far _CuboneDexEntry + text_end + +MarowakDexEntry: + db "BONEKEEPER@" + db 3,3 + dw 990 + text_far _MarowakDexEntry + text_end + +HitmonleeDexEntry: + db "KICKING@" + db 4,11 + dw 1100 + text_far _HitmonleeDexEntry + text_end + +HitmonchanDexEntry: + db "PUNCHING@" + db 4,7 + dw 1110 + text_far _HitmonchanDexEntry + text_end + +LickitungDexEntry: + db "LICKING@" + db 3,11 + dw 1440 + text_far _LickitungDexEntry + text_end + +KoffingDexEntry: + db "POISON GAS@" + db 2,0 + dw 20 + text_far _KoffingDexEntry + text_end + +WeezingDexEntry: + db "POISON GAS@" + db 3,11 + dw 210 + text_far _WeezingDexEntry + text_end + +RhyhornDexEntry: + db "SPIKES@" + db 3,3 + dw 2540 + text_far _RhyhornDexEntry + text_end + +RhydonDexEntry: + db "DRILL@" + db 6,3 + dw 2650 + text_far _RhydonDexEntry + text_end + +ChanseyDexEntry: + db "EGG@" + db 3,7 + dw 760 + text_far _ChanseyDexEntry + text_end + +TangelaDexEntry: + db "VINE@" + db 3,3 + dw 770 + text_far _TangelaDexEntry + text_end + +KangaskhanDexEntry: + db "PARENT@" + db 7,3 + dw 1760 + text_far _KangaskhanDexEntry + text_end + +HorseaDexEntry: + db "DRAGON@" + db 1,4 + dw 180 + text_far _HorseaDexEntry + text_end + +SeadraDexEntry: + db "DRAGON@" + db 3,11 + dw 550 + text_far _SeadraDexEntry + text_end + +GoldeenDexEntry: + db "GOLDFISH@" + db 2,0 + dw 330 + text_far _GoldeenDexEntry + text_end + +SeakingDexEntry: + db "GOLDFISH@" + db 4,3 + dw 860 + text_far _SeakingDexEntry + text_end + +StaryuDexEntry: + db "STARSHAPE@" + db 2,7 + dw 760 + text_far _StaryuDexEntry + text_end + +StarmieDexEntry: + db "MYSTERIOUS@" + db 3,7 + dw 1760 + text_far _StarmieDexEntry + text_end + +MrMimeDexEntry: + db "BARRIER@" + db 4,3 + dw 1200 + text_far _MrMimeDexEntry + text_end + +ScytherDexEntry: + db "MANTIS@" + db 4,11 + dw 1230 + text_far _ScytherDexEntry + text_end + +JynxDexEntry: + db "HUMANSHAPE@" + db 4,7 + dw 900 + text_far _JynxDexEntry + text_end + +ElectabuzzDexEntry: + db "ELECTRIC@" + db 3,7 + dw 660 + text_far _ElectabuzzDexEntry + text_end + +MagmarDexEntry: + db "SPITFIRE@" + db 4,3 + dw 980 + text_far _MagmarDexEntry + text_end + +PinsirDexEntry: + db "STAGBEETLE@" + db 4,11 + dw 1210 + text_far _PinsirDexEntry + text_end + +TaurosDexEntry: + db "WILD BULL@" + db 4,7 + dw 1950 + text_far _TaurosDexEntry + text_end + +MagikarpDexEntry: + db "FISH@" + db 2,11 + dw 220 + text_far _MagikarpDexEntry + text_end + +GyaradosDexEntry: + db "ATROCIOUS@" + db 21,4 + dw 5180 + text_far _GyaradosDexEntry + text_end + +LaprasDexEntry: + db "TRANSPORT@" + db 8,2 + dw 4850 + text_far _LaprasDexEntry + text_end + +DittoDexEntry: + db "TRANSFORM@" + db 1,0 + dw 90 + text_far _DittoDexEntry + text_end + +EeveeDexEntry: + db "EVOLUTION@" + db 1,0 + dw 140 + text_far _EeveeDexEntry + text_end + +VaporeonDexEntry: + db "BUBBLE JET@" + db 3,3 + dw 640 + text_far _VaporeonDexEntry + text_end + +JolteonDexEntry: + db "LIGHTNING@" + db 2,7 + dw 540 + text_far _JolteonDexEntry + text_end + +FlareonDexEntry: + db "FLAME@" + db 2,11 + dw 550 + text_far _FlareonDexEntry + text_end + +PorygonDexEntry: + db "VIRTUAL@" + db 2,7 + dw 800 + text_far _PorygonDexEntry + text_end + +OmanyteDexEntry: + db "SPIRAL@" + db 1,4 + dw 170 + text_far _OmanyteDexEntry + text_end + +OmastarDexEntry: + db "SPIRAL@" + db 3,3 + dw 770 + text_far _OmastarDexEntry + text_end + +KabutoDexEntry: + db "SHELLFISH@" + db 1,8 + dw 250 + text_far _KabutoDexEntry + text_end + +KabutopsDexEntry: + db "SHELLFISH@" + db 4,3 + dw 890 + text_far _KabutopsDexEntry + text_end + +AerodactylDexEntry: + db "FOSSIL@" + db 5,11 + dw 1300 + text_far _AerodactylDexEntry + text_end + +SnorlaxDexEntry: + db "SLEEPING@" + db 6,11 + dw 10140 + text_far _SnorlaxDexEntry + text_end + +ArticunoDexEntry: + db "FREEZE@" + db 5,7 + dw 1220 + text_far _ArticunoDexEntry + text_end + +ZapdosDexEntry: + db "ELECTRIC@" + db 5,3 + dw 1160 + text_far _ZapdosDexEntry + text_end + +MoltresDexEntry: + db "FLAME@" + db 6,7 + dw 1320 + text_far _MoltresDexEntry + text_end + +DratiniDexEntry: + db "DRAGON@" + db 5,11 + dw 70 + text_far _DratiniDexEntry + text_end + +DragonairDexEntry: + db "DRAGON@" + db 13,1 + dw 360 + text_far _DragonairDexEntry + text_end + +DragoniteDexEntry: + db "DRAGON@" + db 7,3 + dw 4630 + text_far _DragoniteDexEntry + text_end + +MewtwoDexEntry: + db "GENETIC@" + db 6,7 + dw 2690 + text_far _MewtwoDexEntry + text_end + +MewDexEntry: + db "NEW SPECIE@" + db 1,4 + dw 90 + text_far _MewDexEntry + text_end + MissingNoDexEntry: db "???@" - db 10 ; 1.0 m - dw 100 ; 10.0 kg - db "コメント　さくせいちゅう@" ; コメント作成中 (Comment to be written) + db 0,0 + dw 00 + text_far _MissingNoDexEntry + text_end + +GyaoonDexEntry: + db "CALAMITY@" + db 8,2 + dw 6900 + text_far _GyaoonDexEntry + text_end + +GuardiaDexEntry: + db "PROTECTIVE@" + db 6,11 + dw 3260 + text_far _GuardiaDexEntry + text_end + +DeerDexEntry: + db "BIG HORN@" + db 4,11 + dw 1230 + text_far _DeerDexEntry + text_end + +MadaamuDexEntry: + db "WILD DUCK@" + db 3,11 + dw 590 + text_far _MadaamuDexEntry + text_end + +DecillaDexEntry: + db "SHRIEKING@" + db 3,7 + dw 1400 + text_far _DecillaDexEntry + text_end + +BlottleDexEntry: + db "INK@" + db 2,11 + dw 400 + text_far _BlottleDexEntry + text_end + +KotoraDexEntry: + db "SHOCK CAT@" + db 2,0 + dw 420 + text_far _KotoraDexEntry + text_end + +JaggDexEntry: + db "IRON HORN@" + db 9,7 + dw 3120 + text_far _JaggDexEntry + text_end + +JabettaDexEntry: + db "COMBATIVE@" + db 5,3 + dw 950 + text_far _JabettaDexEntry + text_end + +GaotoraDexEntry: + db "SHOCK CAT@" + db 3,7 + dw 1020 + text_far _GaotoraDexEntry + text_end + +CactusDexEntry: + db "NEEDLE@" + db 2,11 + dw 520 + text_far _CactusDexEntry + text_end + +KonyaDexEntry: + db "KITTEN@" + db 1,0 + dw 60 + text_far _KonyaDexEntry + text_end + +BittybatDexEntry: + db "TINY BAT@" + db 1,0 + dw 80 + text_far _BittybatDexEntry + text_end + +RibbitoDexEntry: + db "SUMO@" + db 2,3 + dw 1020 + text_far _RibbitoDexEntry + text_end + +CryithanDexEntry: + db "WEEPING@" + db 7,3 + dw 3130 + text_far _CryithanDexEntry + text_end + +BlastykeDexEntry: + db "BUBBLE@" + db 2,7 + dw 760 + text_far _BlastykeDexEntry + text_end + +BuuDexEntry: + db "ICE BEAST@" + db 4,7 + dw 900 + text_far _BuuDexEntry + text_end + +SkimperDexEntry: + db "TIMID@" + db 1,4 + dw 90 + text_far _SkimperDexEntry + text_end + +BawliguaDexEntry: + db "TIMID@" + db 3,7 + dw 550 + text_far _BawliguaDexEntry + text_end + +PuchikoonDexEntry: + db "FIRE HORSE@" + db 1,4 + dw 280 + text_far _PuchikoonDexEntry + text_end + +GyopinDexEntry: + db "GOLDFISH@" + db 0,8 + dw 50 + text_far _GyopinDexEntry + text_end + +GorochuDexEntry: + db "VOLTAGE@" + db 5,11 + dw 1960 + text_far _GorochuDexEntry + text_end + +MikonDexEntry: + db "FOX@" + db 1,4 + dw 120 + text_far _MikonDexEntry + text_end + +CheepDexEntry: + db "FLYINGFISH@" + db 1,0 + dw 120 + text_far _CheepDexEntry + text_end + +TotartleDexEntry: + db "TURTLE@" + db 5,11 + dw 2190 + text_far _TotartleDexEntry + text_end + +WeirduckDexEntry: + db "DUCK@" + db 3,3 + dw 710 + text_far _WeirduckDexEntry + text_end + +CroakozunaDexEntry: + db "SUMO@" + db 4,11 + dw 4150 + text_far _CroakozunaDexEntry + text_end + +GorotoraDexEntry: + db "SHOCK CAT@" + db 5,11 + dw 3670 + text_far _GorotoraDexEntry + text_end + +OmegaDexEntry: + db "ARTIFICIAL@" + db 8,6 + dw 8260 + text_far _OmegaDexEntry + text_end + +NidoreignDexEntry: + db "POISON PIN@" + db 3,7 + dw 800 + text_far _NidoreignDexEntry + text_end + +TrampelDexEntry: + db "TUSK@" + db 6,11 + dw 3470 + text_far _TrampelDexEntry + text_end + +CrockyDexEntry: + db "GLARING@" + db 2,11 + dw 520 + text_far _CrockyDexEntry + text_end + +PendrakenDexEntry: + db "INK@" + db 5,11 + dw 1980 + text_far _PendrakenDexEntry + text_end + +MagnetiteDexEntry: + db "MAGNET@" + db 2,4 + dw 400 + text_far _MagnetiteDexEntry + text_end + +PurakkusuDexEntry: + db "BIG HORN@" + db 5,11 + dw 2540 + text_far _PurakkusuDexEntry + text_end + +BarundaDexEntry: + db "BALLOON@" + db 1,4 + dw 10 + text_far _BarundaDexEntry + text_end + +TsubomittoDexEntry: + db "SPROUT@" + db 4,3 + dw 160 + text_far _TsubomittoDexEntry + text_end + +AnimonDexEntry: + db "TRANSFORM@" + db 2,0 + dw 360 + text_far _AnimonDexEntry + text_end + +BellossomDexEntry: + db "FLOWER@" + db 1,4 + dw 130 + text_far _BellossomDexEntry + text_end + +ScizorDexEntry: + db "SCISSORS@" + db 5,11 + dw 2600 + text_far _ScizorDexEntry + text_end + diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index cdb7e179..04ae0c6c 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -238,14 +238,14 @@ _TentacoolDexEntry:: next "its stinging acid" dex -_GastlyDexEntry:: - text "Almost invisible," - next "this gaseous" - next "#MON cloaks" - - page "the target and" - next "puts it to sleep" - next "without notice" +_GastlyDexEntry:: ; Dex entry from Green, swapping the Indian Elephant for Trampel. ~M + text "A being that" + next "exists as a thin" + next "gas. The gas is" + + page "potent enough to" + next "fell a TRAMPEL" + next "in two seconds" dex _ScytherDexEntry:: @@ -668,14 +668,14 @@ _KrabbyDexEntry:: next "sideways" dex -_VulpixDexEntry:: - text "At the time of" - next "birth, it has" - next "just one tail." - - page "The tail splits" - next "from its tip as" - next "it grows older" +_VulpixDexEntry:: ; Changed to make it not too similar to Mikon's dex entry. ~M + text "As each tail" + next "grows, its fur" + next "becomes softer." + + page "When held, it" + next "gives off a" + next "slight warmth" dex _NinetalesDexEntry:: diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm new file mode 100644 index 00000000..081d39bd --- /dev/null +++ b/data/pokemon/new_dex_text.asm @@ -0,0 +1,459 @@ +_GyaoonDexEntry:: + text "Very dangerous" + next "and frequently" + next "rampages wildly." + + page "It can crush" + next "anything within" + next "its huge jaws" + dex + +_GuardiaDexEntry:: + text "A caring #MON" + next "that adopts" + next "orphaned CUBONE" + + page "and raises them" + next "until they're" + next "ready to evolve" + dex + +_DeerDexEntry:: + text "Once hunted" + next "in the past for" + next "its impressive" + + page "antlers, it's" + next "now under strict" + next "protection" + dex + +_MadaamuDexEntry:: + text "A species that is" + next "rarely seen. It" + next "always holds a" + + page "spring onion" + next "flower, according" + next "to studies" + dex + +_DecillaDexEntry:: + text "A timid #MON," + next "DECILLA loudly" + next "cries out for" + + page "its parents" + next "if it ever feels" + next "threatened" + dex + +_BlottleDexEntry:: + text "A descendant of" + next "the ancient" + next "OMANYTE. It" + + page "secretes ink" + next "from the tips of" + next "its tentacles" + dex + +_KotoraDexEntry:: + text "As it builds up" + next "electricity in" + next "its fur, touching" + + page "it is risky. It's" + next "a very popular" + next "pet regardless" + dex + +_JaggDexEntry:: + text "Known as the" + next "Sailors' Scourge," + next "it rams its" + + page "proud horn into" + next "the hulls of" + next "approaching ships" + dex + +_JabettaDexEntry:: + text "An ill-tempered" + next "#MON, they" + next "frequently pick" + + page "fights with" + next "each other to" + next "claim territory" + dex + +_GaotoraDexEntry:: + text "An endangered" + next "species, due to" + next "hunters targeting" + + page "it for its soft" + next "yellow fur and" + next "tough fangs" + dex + +_CactusDexEntry:: + text "Found in arid" + next "regions. Its legs" + next "are adapted for" + + page "maneuverability" + next "on sandy and" + next "rocky terrain" + dex + +_KonyaDexEntry:: + text "Its eyesight is" + next "still developing," + next "so it cannot see" + + page "very well. KONYA" + next "are drawn to very" + next "shiny objects" + dex + +_BittybatDexEntry:: + text "Due to their tiny" + next "size, several of" + next "these #MON may" + + page "swarm a victim" + next "at once to" + next "prey on it" + dex + +_RibbitoDexEntry:: + text "Despite its small" + next "size, it likes" + next "to challenge" + + page "others. It puffs" + next "up its chest to" + next "appear larger" + dex + +_CryithanDexEntry:: + text "During a battle," + next "this #MON cries" + next "to dishearten the" + + page "enemy. It strikes" + next "once the foe lets" + next "their guard down" + dex + +_BlastykeDexEntry:: + text "It spews bubbles" + next "from the ports" + next "on its shell." + + page "This #MON and" + next "SQUIRTLE are" + next "related species" + dex + +_BuuDexEntry:: + text "Long thought to" + next "be an urban myth" + next "until one was" + + page "found hiding in" + next "a secluded cave" + next "in the tundra" + dex + +_SkimperDexEntry:: + text "Incredibly timid," + next "it flees at the" + next "smallest sign of" + + page "danger. Gaining" + next "its trust is a" + next "difficult task" + dex + +_BawliguaDexEntry:: + text "Often basks in" + next "the sunlight. If" + next "its temperature" + + page "rises too high," + next "it cries to" + next "cool itself down" + dex + +_PuchikoonDexEntry:: + text "At this stage, it" + next "struggles to" + next "keep up with" + + page "its parent. Its" + next "flame-covered mane" + next "is very hot" + dex + +_GyopinDexEntry:: + text "It was once scarce" + next "and rarely seen," + next "but thanks to a" + + page "dedicated breeder," + next "it has since" + next "flourished" + dex + +_GorochuDexEntry:: + text "Energizes itself" + next "by drawing in" + next "electricity. It" + + page "boasts incredible" + next "electrical and" + next "physical strength" + dex + +_MikonDexEntry:: + text "While young, it" + next "has three soft," + next "gorgeous tails." + + page "More tails form" + next "the older it" + next "becomes" + dex + +_CheepDexEntry:: + text "It can be seen" + next "leaping out of" + next "the water and" + + page "quickly flapping" + next "its fins in an" + next "attempt to fly" + dex + +_TotartleDexEntry:: + text "Known for its" + next "longevity, the" + next "oldest known" + + page "TOTARTLE lived" + next "to be almost" + next "1,000 years old" + dex + +_WeirduckDexEntry:: + text "It exhibits odd" + next "mannerisms as" + next "it attempts to" + + page "control its" + next "developing" + next "psychic powers" + dex + +_CroakozunaDexEntry:: + text "It intimidates" + next "foes by puffing" + next "up and stomping." + + page "These stomps can" + next "even shake the" + next "ground sometimes" + dex + +_GorotoraDexEntry:: + text "Its growls sound" + next "like rolling" + next "thunder. It can" + + page "only be tamed" + next "by the bravest" + next "#MON TRAINERs" + dex + +_OmegaDexEntry:: + text "A mechanical" + next "#MON, it was" + next "created during" + + page "SILPH CO.'s first" + next "efforts to revive" + next "a GYAOON" + dex + +_PurakkusuDexEntry:: + text "Withstands foes'" + next "attacks with its" + next "sturdy body, then" + + page "pinches them in" + next "its horns before" + next "flipping them" + dex + +_TrampelDexEntry:: + text "A rare species," + next "this #MON" + next "possesses great" + + page "bulk, and also" + next "high dexterity" + next "using its trunk" + dex + +_CrockyDexEntry:: + text "Its huge eyes can" + next "glow to brighten" + next "its surroundings." + + page "Those who gaze at" + next "it for too long" + next "become immobile" + dex + +_PendrakenDexEntry:: + text "Often clashes" + next "with TENTACRUEL." + next "Though it lacks" + + page "poison, it can" + next "blind foes using" + next "its ink" + dex + +_MagnetiteDexEntry:: + text "Its magnetic" + next "field attracts" + next "lots of metal," + + page "but this can" + next "cause it to be" + next "unable to float" + dex + +_NidoreignDexEntry:: + text "Born from a" + next "MOON STONE, it" + next "has the combined" + + page "traits of both" + next "NIDORINA and" + next "NIDORINO" + dex + +_BarundaDexEntry:: + text "If it ever feels" + next "threatened, it" + next "will inflate its" + + page "body to a gigantic" + next "size to intimidate" + next "attackers" + dex + +_TsubomittoDexEntry:: + text "By digging its" + next "root-like feet" + next "into the earth," + + page "it can absorb" + next "useful nutrients" + next "found in the soil" + dex + +_AnimonDexEntry:: + text "A sudden mutation" + next "of DITTO, its" + next "mimicry skills" + + page "have improved. It" + next "can copy anything" + next "in an instant" + dex + +_MonjaDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex + +_ParaDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex + +_HinaazuDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex + +_PudiDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex + +_BetobebiiDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex + +_ScizorDexEntry:: + text "It swings its eye-" + next "patterned pincers" + next "up to scare its" + + page "foes. This makes" + next "it look like it" + next "has three heads" + dex + +_BellossomDexEntry:: + text "BELLOSSOM gather" + next "at times and" + next "appear to dance." + + page "They say that the" + next "dance is a ritual" + next "to summon the sun" + dex + +_MissingNoDexEntry:: + text "This is a newly" + next "discovered" + next "#MON. It is" + + page "currently under" + next "investigation. No" + next "info is available" + dex diff --git a/main.asm b/main.asm index 9abef6bb..05fe3f8f 100644 --- a/main.asm +++ b/main.asm @@ -189,15 +189,11 @@ SECTION "Battle Engine 7", ROMX INCLUDE "data/moves/moves.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/cries.asm" -INCLUDE "engine/battle/unused_stats_functions.asm" INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" -INCLUDE "gfx/trade.asm" INCLUDE "engine/pokemon/evos_moves.asm" INCLUDE "engine/battle/move_effects/heal.asm" -INCLUDE "engine/battle/move_effects/transform.asm" -INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" SECTION "Battle Core", ROMX @@ -212,6 +208,10 @@ INCLUDE "engine/menus/pokedex.asm" INCLUDE "engine/movie/trade.asm" INCLUDE "engine/movie/intro.asm" INCLUDE "engine/movie/trade2.asm" +INCLUDE "gfx/trade.asm" +INCLUDE "engine/battle/unused_stats_functions.asm" +INCLUDE "engine/battle/move_effects/transform.asm" +INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" SECTION "Pokédex Rating", ROMX diff --git a/text.asm b/text.asm index 47a39280..94dc33de 100644 --- a/text.asm +++ b/text.asm @@ -270,6 +270,7 @@ INCLUDE "data/text/text_6.asm" SECTION "Text 11", ROMX INCLUDE "data/text/text_7.asm" +INCLUDE "data/pokemon/new_dex_text.asm" SECTION "Pokédex Text", ROMX