From 7d6e73c690a71bd6eb6b846beeb3fd9fde6e436c Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 5 Jan 2025 22:10:26 +0000 Subject: [PATCH] 34 or so modified dex entries (&Torpir) This reworks Hippunk into Torpir (well, not entirely internally, it's still HIPPUNK there). I have also done several new dex entries. May need vetting by some of the others, the writing is inconsistent. --- data/pokemon/base_stats/hippunk.asm | 8 ++++---- data/pokemon/dex_entries/balumba.asm | 2 +- data/pokemon/dex_entries/blottle.asm | 12 ++++++------ data/pokemon/dex_entries/diglett.asm | 12 ++++++------ data/pokemon/dex_entries/dodrio.asm | 12 ++++++------ data/pokemon/dex_entries/doduo.asm | 12 ++++++------ data/pokemon/dex_entries/drowzee.asm | 12 ++++++------ data/pokemon/dex_entries/dugtrio.asm | 12 ++++++------ data/pokemon/dex_entries/electrode.asm | 14 ++++++++------ data/pokemon/dex_entries/gengar.asm | 12 ++++++------ data/pokemon/dex_entries/grimer.asm | 12 ++++++------ data/pokemon/dex_entries/haunter.asm | 6 +++--- data/pokemon/dex_entries/hippunk.asm | 17 ++++++++--------- data/pokemon/dex_entries/hypno.asm | 12 ++++++------ data/pokemon/dex_entries/kingler.asm | 12 ++++++------ data/pokemon/dex_entries/koffing.asm | 12 ++++++------ data/pokemon/dex_entries/krabby.asm | 12 ++++++------ data/pokemon/dex_entries/machamp.asm | 2 +- data/pokemon/dex_entries/machoke.asm | 12 ++++++------ data/pokemon/dex_entries/machop.asm | 12 ++++++------ data/pokemon/dex_entries/magnemite.asm | 12 ++++++------ data/pokemon/dex_entries/magneton.asm | 12 ++++++------ data/pokemon/dex_entries/marowak.asm | 12 ++++++------ data/pokemon/dex_entries/muk.asm | 12 ++++++------ data/pokemon/dex_entries/onix.asm | 12 ++++++------ data/pokemon/dex_entries/pendraken.asm | 4 ++-- data/pokemon/dex_entries/ponyta.asm | 12 ++++++------ data/pokemon/dex_entries/slowbro.asm | 12 ++++++------ data/pokemon/dex_entries/slowking.asm | 12 ++++++------ data/pokemon/dex_entries/slowpoke.asm | 12 ++++++------ data/pokemon/dex_entries/smujj.asm | 6 +++--- data/pokemon/dex_entries/steelix.asm | 12 ++++++------ data/pokemon/dex_entries/tentacruel.asm | 12 ++++++------ data/pokemon/dex_entries/weezing.asm | 11 ++++++----- data/pokemon/evos_attacks_johto.asm | 20 +++++++------------- data/pokemon/names.asm | 2 +- 36 files changed, 194 insertions(+), 198 deletions(-) diff --git a/data/pokemon/base_stats/hippunk.asm b/data/pokemon/base_stats/hippunk.asm index e18025f..538bec4 100644 --- a/data/pokemon/base_stats/hippunk.asm +++ b/data/pokemon/base_stats/hippunk.asm @@ -1,9 +1,9 @@ db 0 ; species ID placeholder - db 90, 75, 75, 30, 80, 80 + db 35, 33, 30, 27, 28, 75 ; hp atk def spd sat sdf - db PSYCHIC_TYPE, DARK ; type + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type db 160 ; catch rate db 110 ; base exp db NO_ITEM, NO_ITEM ; items @@ -16,6 +16,6 @@ db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tm/hm learnset - tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, SURF, STRENGTH, FLASH + ; tm/hm learnset - Drowzee minus the punches + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/dex_entries/balumba.asm b/data/pokemon/dex_entries/balumba.asm index 17b0bd3..03afdcd 100644 --- a/data/pokemon/dex_entries/balumba.asm +++ b/data/pokemon/dex_entries/balumba.asm @@ -3,7 +3,7 @@ db "Lives near small" next "villages. Pulling" - next "BALUMBA's shriek" + next "BALUMBA's string" page "causes it great" next "pain, making it" diff --git a/data/pokemon/dex_entries/blottle.asm b/data/pokemon/dex_entries/blottle.asm index 8f5b627..f8c7946 100644 --- a/data/pokemon/dex_entries/blottle.asm +++ b/data/pokemon/dex_entries/blottle.asm @@ -1,10 +1,10 @@ db "INK@" ; species name dw 211, 1000 ; height, weight - temp - db "Recent studies show" - next "BLOTTLE and OMANY-" - next "TE share a common" + db "Recent studies" + next "show BLOTTLE and" + next "OMANYTE share an" - page "ancestor. BLOTTLE" - next "outcompeted it" - next "for food.@" + page "ancestor. It is" + next "thought BLOTTLE" + next "outcompeted it.@" diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm index c2b6c46..8110077 100644 --- a/data/pokemon/dex_entries/diglett.asm +++ b/data/pokemon/dex_entries/diglett.asm @@ -1,10 +1,10 @@ db "MOLE@" ; species name dw 8, 20 ; height, weight - db "It digs under-" - next "ground and chews" - next "on tree roots," + db "Shy and dislikes" + next "sunlight. Because" + next "it flees so quic-" - page "sticking its head" - next "out only when the" - next "sun isn't bright.@" + page "kly, its footprint" + next "has never been" + next "documented.@" ; PMD reference. diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm index 767fd9a..930065d 100644 --- a/data/pokemon/dex_entries/dodrio.asm +++ b/data/pokemon/dex_entries/dodrio.asm @@ -1,10 +1,10 @@ db "TRIPLEBIRD@" ; species name dw 511, 1880 ; height, weight - db "An enemy that" - next "takes its eyes off" - next "any of the three" + db "The weakest head" + next "has returned." + next "Strong and irate," - page "heads--even for a" - next "second--will get" - next "pecked severely.@" + page "it now commands" + next "the others with" + next "bravado.@" diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm index eba6500..c8b0973 100644 --- a/data/pokemon/dex_entries/doduo.asm +++ b/data/pokemon/dex_entries/doduo.asm @@ -1,10 +1,10 @@ db "TWIN BIRD@" ; species name dw 407, 860 ; height, weight - db "It lives on a" - next "grassy plain where" - next "it can see a long" + db "The weakest head" ; Alluding to Dodaerie. + next "has merged into" + next "its body. The two" - page "way. If it sees an" - next "enemy, it runs" - next "away at 60 mph.@" + page "that remain get" + next "tangled up and" + next "panic sometimes.@" ; Carddass reference. diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm index fe6f14b..5f2ff6b 100644 --- a/data/pokemon/dex_entries/drowzee.asm +++ b/data/pokemon/dex_entries/drowzee.asm @@ -1,10 +1,10 @@ db "HYPNOSIS@" ; species name dw 303, 710 ; height, weight - db "When it twitches" - next "its nose, it can" - next "tell where someone" + db "Said to be related" + next "to Baku, DROWZEE" ; Mentioned in illustrated book and KEP. + next "TRAINERs pioneered" ; Referencing anime EP027 - page "is sleeping and" - next "what that person" - next "is dreaming about.@" + page "combination atta-" + next "cks with HYPNOSIS" + next "and DREAM EATER.@" diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm index a12c298..101ba86 100644 --- a/data/pokemon/dex_entries/dugtrio.asm +++ b/data/pokemon/dex_entries/dugtrio.asm @@ -1,10 +1,10 @@ db "MOLE@" ; species name dw 204, 730 ; height, weight - db "These DIGLETT" - next "triplets dig over" - next "60 miles below sea" + db "Considered an" + next "asset to agricul-" + next "ture, DUGTRIO is" - page "level. No one" - next "knows what it's" - next "like underground.@" + page "loved by farmers." + next "It's sometimes se-" + next "en in tree stumps.@" ; Pikachu's Winter Adventure reference, otherwise aggregating outside data. diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm index 2e6378d..d166baa 100644 --- a/data/pokemon/dex_entries/electrode.asm +++ b/data/pokemon/dex_entries/electrode.asm @@ -1,10 +1,12 @@ db "BALL@" ; species name dw 311, 1470 ; height, weight - db "The more energy it" - next "charges up, the" - next "faster it gets." + db "Like a gachapon" + next "capsule, ELECTRODE" + next "is hollow. Resear-" - page "But this also" - next "makes it more" - next "likely to explode.@" + page "ch into this has" + next "stumped even the" + next "best of the best.@" ; Carddass Reference + +; Writing is iffy. Consider revising. diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm index ac85e88..c674d1d 100644 --- a/data/pokemon/dex_entries/gengar.asm +++ b/data/pokemon/dex_entries/gengar.asm @@ -1,10 +1,10 @@ db "SHADOW@" ; species name dw 411, 890 ; height, weight - db "Hiding in people's" - next "shadows at night," - next "it absorbs their" + db "Feeds on dreams." ; Carddass reference. + next "Because SNORLAX" + next "dreams about food," - page "heat. The chill it" - next "causes makes the" - next "victims shake.@" + page "it's GENGAR's fav-" + next "ourite target, but" + next "HYPNO intervenes.@" ; Added Hypno into the mix to worldbuild. diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm index ed76b62..b7aa5cf 100644 --- a/data/pokemon/dex_entries/grimer.asm +++ b/data/pokemon/dex_entries/grimer.asm @@ -1,10 +1,10 @@ db "SLUDGE@" ; species name dw 211, 660 ; height, weight - db "When two of these" - next "#MON's bodies" - next "are combined" + db "It loves taking" + next "in toxic fumes" + next "to spit them" ; Carddass reference - page "together, new" - next "poisons are" - next "created.@" + page "out at onlookers." + next "Nicotine smoke" ; Since KEP's Charmander mentions smokers, Grimer can inhale passive smoke. + next "is a favourite.@" diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm index 37d001e..156aabe 100644 --- a/data/pokemon/dex_entries/haunter.asm +++ b/data/pokemon/dex_entries/haunter.asm @@ -1,10 +1,10 @@ db "GAS@" ; species name dw 503, 2 ; height, weight - db "Is it possible a" + db "It's theorised a" next "HAUNTER that has" next "been to the spi-" page "rit world could" - next "become a GENGAR?" - next "It's possible.@" ; prototype dex entry with incredibly interesting implications. + next "become a GENGAR." + next "Research ongoing.@" ; prototype dex entry with incredibly interesting implications. diff --git a/data/pokemon/dex_entries/hippunk.asm b/data/pokemon/dex_entries/hippunk.asm index 864a6cc..6194246 100644 --- a/data/pokemon/dex_entries/hippunk.asm +++ b/data/pokemon/dex_entries/hippunk.asm @@ -1,11 +1,10 @@ - db "PUNK@" ; species name - dw 304, 2117 ; height, weight + db "HYPNOSIS@" ; species name + dw 204, 2117 ; height, weight - db "It disturbs" - next "SLOWPOKE from" - next "their slumber with" + db "It is too energ-" + next "etic to put most" + next "#MON to sleep," - page "high pitched" - next "squeals before" - next "attacking.@" -; being reworked \ No newline at end of file + page "but SLOWPOKE" + next "are easy enough" + next "targets.@" ; it looks like Slowpoke but CryptoDex among others gave the compelling case of it being Drowzee, so let's keep referencing Slowpoke. diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm index cfdd298..60e1e20 100644 --- a/data/pokemon/dex_entries/hypno.asm +++ b/data/pokemon/dex_entries/hypno.asm @@ -1,10 +1,10 @@ db "HYPNOSIS@" ; species name dw 503, 1670 ; height, weight - db "The longer it" - next "swings its" - next "pendulum, the" + db "Its PSI powers" + next "require a heavy" + next "diet of dreams." - page "longer the effects" - next "of its hypnosis" - next "last.@" + page "When using MEDI-" + next "TATE, a healthy" + next "HYPNO will float.@" ; Carddass reference. diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm index 2c4b17a..64376cb 100644 --- a/data/pokemon/dex_entries/kingler.asm +++ b/data/pokemon/dex_entries/kingler.asm @@ -1,10 +1,10 @@ db "PINCER@" ; species name dw 403, 1320 ; height, weight - db "Its oversized claw" - next "is very powerful," - next "but when it's not" + db "Preys on CLOYSTER" + next "and DISTURBAN by" + next "prying open their" ; Re-contextualised Stadium dex entry, now including Disturban. - page "in battle, the" - next "claw just gets in" - next "the way.@" + page "shells with" + next "10,000 horsepower" + next "of force.@" diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm index a3fc0da..c4b42b4 100644 --- a/data/pokemon/dex_entries/koffing.asm +++ b/data/pokemon/dex_entries/koffing.asm @@ -1,10 +1,10 @@ db "POISON GAS@" ; species name dw 200, 20 ; height, weight - db "If one gets close" - next "enough to it when" - next "it expels poison-" + db "No two KOFFING" ; Referencing early sprites where the face would be in various different places, as well as Weezing. + next "look alike. Its" + next "gas can be igni-" - page "ous gas, the gas" - next "swirling inside it" - next "can be seen.@" + page "ted, prompting" + next "risk of gas EXP-" + next "LOSIONs@" ; Referencing Pokemon Emergency and Carddass. diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm index 0e0081a..127eb1f 100644 --- a/data/pokemon/dex_entries/krabby.asm +++ b/data/pokemon/dex_entries/krabby.asm @@ -1,10 +1,10 @@ db "RIVER CRAB@" ; species name dw 104, 140 ; height, weight - db "If it is unable" - next "to find food, it" - next "will absorb" + db "Hides under rocks" ; Quasi-lore reference with Krabby being a Rock Smash Pokemon. + next "on beaches. If" + next "discovered, it" - page "nutrients by" - next "swallowing a" - next "mouthful of sand.@" + page "will wave its" ; Illustrated book reference. + next "claws before re-" + next "treating.@" diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm index 1db9265..1ecadbb 100644 --- a/data/pokemon/dex_entries/machamp.asm +++ b/data/pokemon/dex_entries/machamp.asm @@ -5,6 +5,6 @@ next "punches a second," next "and thanks to its" - page "sturdy loewer" + page "sturdy lower" next "body, it keeps" next "its balance.@" ; prototype dex entry detail diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm index fa7642e..4b3078e 100644 --- a/data/pokemon/dex_entries/machoke.asm +++ b/data/pokemon/dex_entries/machoke.asm @@ -1,10 +1,10 @@ db "SUPERPOWER@" ; species name dw 411, 1550 ; height, weight - db "This tough #MON" - next "always stays in" - next "the zone. Its" + db "It takes pride in" + next "its appearance." + next "When attacked," - page "muscles become" - next "thicker after" - next "every battle.@" + page "it will check" + next "its face before" + next "returning the blow.@" ; Stadium animation reference, I believe some other media discusses its modest, dainty side as well. diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm index d50eb0a..eea40a9 100644 --- a/data/pokemon/dex_entries/machop.asm +++ b/data/pokemon/dex_entries/machop.asm @@ -1,10 +1,10 @@ db "SUPERPOWER@" ; species name dw 207, 430 ; height, weight - db "It trains by" - next "lifting rocks in" - next "the mountains. It" + db "As it grows more" + next "confident, it will" + next "challenge TYROGUE" ; recontextualising future entries about it fighting Makuhita. - page "can even pick up a" - next "GRAVELER with" - next "ease.@" + page "to fights. It will" + next "decide if it stops" + next "a RHYHORN charge!@" ; writing is missing a slight reference. consider revising. diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm index 7392f0d..0eded60 100644 --- a/data/pokemon/dex_entries/magnemite.asm +++ b/data/pokemon/dex_entries/magnemite.asm @@ -1,10 +1,10 @@ db "MAGNET@" ; species name dw 100, 130 ; height, weight - db "It seems to be" - next "attracted to magn-" - next "etic forces, it's" + db "Seemingly attract-" + next "ed to magnetic" + next "forces, MAGNEMITE" - page "not uncommon for" - next "them to appear at" - next "the MAGNET TRAIN.@" ; prototype dex entry contextualised into them swarming the magnet train + page "are known for swa-" + next "rming around the" + next "MAGNET TRAIN.@" ; prototype dex entry contextualised into them swarming the magnet train diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm index fff66de..74a0927 100644 --- a/data/pokemon/dex_entries/magneton.asm +++ b/data/pokemon/dex_entries/magneton.asm @@ -1,10 +1,10 @@ db "MAGNET@" ; species name dw 303, 1320 ; height, weight - db "When many" - next "MAGNETON gather" - next "together, the" + db "When sleeping," + next "its magnetism" + next "becomes unstable." - page "resulting magnetic" - next "storm disrupts" - next "radio waves.@" + page "Sometimes, a" + next "MAGNEMITE may" + next "unlink.@" ; Pokemon Sleep and Snap dual-reference. However, it could be more explicit. Consider revising. diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm index 18b3f2e..da27514 100644 --- a/data/pokemon/dex_entries/marowak.asm +++ b/data/pokemon/dex_entries/marowak.asm @@ -1,10 +1,10 @@ db "BONEKEEPER@" ; species name dw 303, 990 ; height, weight - db "Somewhere in the" - next "world is a ceme-" - next "tery just for" + db "Its bone gives it" ; GSC doesn't imply the Thick Club boosts Marowak's Attack at all! The nerve! + next "extreme power." + next "Attempts to re-" - page "MAROWAK. It gets" - next "its bones from" - next "those graves.@" + page "search this are" + next "met with furious" + next "resistance.@" diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm index cdb461a..e77efce 100644 --- a/data/pokemon/dex_entries/muk.asm +++ b/data/pokemon/dex_entries/muk.asm @@ -1,10 +1,10 @@ db "SLUDGE@" ; species name dw 311, 660 ; height, weight - db "The toxins in its" - next "body will mix to-" - next "gether to form" + db "Merely touching" + next "MUK causes severe" + next "illness. When" - page "new ones. Doctors" - next "have trouble kee-" - next "ping track.@" + page "pursuing targets," + next "it will pelt them" + next "with its SLUDGE.@" ; Carddass reference that is very fucking scary tbh diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm index 12164c5..6480ac9 100644 --- a/data/pokemon/dex_entries/onix.asm +++ b/data/pokemon/dex_entries/onix.asm @@ -1,10 +1,10 @@ db "ROCK SNAKE@" ; species name dw 2810, 4630 ; height, weight - db "As it digs through" - next "the ground, it" - next "absorbs many hard" + db "Its body segments" + next "become rounder" + next "and more diamond-" - page "objects. This is" - next "what makes its" - next "body so solid.@" + page "like as it ages." + next "If separated, they" + next "can reattach.@" ; Pokemon Adventures and aggregation of general data about its body. diff --git a/data/pokemon/dex_entries/pendraken.asm b/data/pokemon/dex_entries/pendraken.asm index 2680a17..de3fb32 100644 --- a/data/pokemon/dex_entries/pendraken.asm +++ b/data/pokemon/dex_entries/pendraken.asm @@ -6,5 +6,5 @@ next "makes it popular" page "with calligraphers." - next "it can write kanji" ; in a localisation during this time period, I doubt it would pass. - next "with ease!@" ; consider revising. I imagine it would write 水 quite well! + next "It can write kanji" ; in a localisation during this time period, I doubt it would pass, so consider revising. + next "with ease!@" ; I imagine it would write 水 quite well, though! diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm index 0d82b77..a4a33bc 100644 --- a/data/pokemon/dex_entries/ponyta.asm +++ b/data/pokemon/dex_entries/ponyta.asm @@ -1,10 +1,10 @@ db "FIRE HORSE@" ; species name dw 303, 660 ; height, weight - db "Training by" - next "jumping over grass" - next "that grows longer" + db "When leaping into" + next "the sky, PONYTA" + next "cloaks itself with" ; Carddass reference - page "every day has made" - next "it a world-class" - next "jumper.@" + page "FIRE SPIN. It's a" + next "standard circus" ; Circuses tend to have a horse jumping through fire. Why not take it a step further? + next "performance now.@" diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm index f48be67..3957202 100644 --- a/data/pokemon/dex_entries/slowbro.asm +++ b/data/pokemon/dex_entries/slowbro.asm @@ -1,10 +1,10 @@ db "HERMITCRAB@" ; species name dw 503, 1730 ; height, weight - db "An attached" - next "SHELLDER won't let" - next "go because of the" + db "The SHELLDER that" + next "bit it evolved" + next "into DISTURBAN." - page "tasty flavor that" - next "oozes out of its" - next "tail.@" + page "If it falls off," + next "SLOWBRO becomes a" ; Discussing the differences between the Pokemon and how their evolutions work. + next "SLOWPOKE again.@" ; Using RBY dex entries for the Slowbro part. diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm index 07a5c4a..454cd24 100644 --- a/data/pokemon/dex_entries/slowking.asm +++ b/data/pokemon/dex_entries/slowking.asm @@ -1,10 +1,10 @@ db "ROYAL@" ; species name dw 607, 1750 ; height, weight - db "Every time it ya-" - next "wns, SHELLDER" - next "injects more poi-" + db "It is said that" + next "1 in 10,000" + next "SHELLDER bite a" - page "son into it. The" - next "poison makes it" - next "more intelligent.@" + page "SLOWPOKE's head," + next "activating its" + next "brain cells.@" ; Pocket Monsters Official Fanbook. diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm index 0c35e43..14d7f24 100644 --- a/data/pokemon/dex_entries/slowpoke.asm +++ b/data/pokemon/dex_entries/slowpoke.asm @@ -1,10 +1,10 @@ db "DOPEY@" ; species name dw 311, 790 ; height, weight - db "It is always so" - next "absent-minded that" - next "it won't react," + db "Its TAIL is a deli-" + next "cacy in many diffe-" + next "rent countries." ; Referencing various regions that don't have anywhere near as much controversy relating to eating Slowpoketails. - page "even if its" - next "flavorful tail is" - next "bitten.@" + page "Depending on what" + next "it eats, the fla-" + next "vor will change.@" ; Referencing Galarian Slowpoke's entry in Pokemon Journeys. Presumably applies to both. diff --git a/data/pokemon/dex_entries/smujj.asm b/data/pokemon/dex_entries/smujj.asm index b203bdb..a978f6e 100644 --- a/data/pokemon/dex_entries/smujj.asm +++ b/data/pokemon/dex_entries/smujj.asm @@ -1,9 +1,9 @@ db "SLUDGE@" ; species name dw 6, 17 ; height, weight - db "It's often" - next "mistaken for a" - next "wad of chewing gum" + db "It's often mist-" + next "aken for a wad" + next "of chewing gum" page "and stepped on," next "releasing a foul" diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm index 7d9fcc2..03bbb78 100644 --- a/data/pokemon/dex_entries/steelix.asm +++ b/data/pokemon/dex_entries/steelix.asm @@ -1,10 +1,10 @@ db "IRON SNAKE@" ; species name dw 3002, 8820 ; height, weight - db "The many small" - next "metal particles" - next "that cover this" + db "It evolved large" + next "axles to help it" ; Weirdly enough, the Pokedex never talks about these, despite them being a massive part of the design. + next "dig deeper. With" - page "#MON's body" - next "reflect bright" - next "light well.@" + page "these, it can tu-" + next "nnel through the" + next "Earth's mantle.@" ; It's capable of digging to the earth's core, so this works fine, right? diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm index c09f892..b3ebf91 100644 --- a/data/pokemon/dex_entries/tentacruel.asm +++ b/data/pokemon/dex_entries/tentacruel.asm @@ -1,10 +1,10 @@ db "JELLYFISH@" ; species name dw 503, 1210 ; height, weight - db "When its 80 feel-" - next "ers absorb water," - next "it stretches to" + db "The jewels on its" + next "forehead can glow" + next "and shoot beams" ; Fossil TCG Tentacool and anime references. - page "become like a net" - next "to entangle its" - next "prey.@" + page "of light. Some" + next "TENTACRUEL grow" + next "to unusual sizes.@" ; Anime reference diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm index 8e02970..b8b9241 100644 --- a/data/pokemon/dex_entries/weezing.asm +++ b/data/pokemon/dex_entries/weezing.asm @@ -1,10 +1,11 @@ db "POISON GAS@" ; species name dw 311, 210 ; height, weight - db "When it inhales" + db "The effects of its" next "poisonous gases" - next "from garbage, its" + next "have prompted use" - page "body expands, and" - next "its insides smell" - next "much worse.@" + page "of its image in" + next "green energy" + next "campaigns.@" +; Referencing its original localised name, La, whereas Koffing was Ny. These names referenced two of the US's most polluted cities. diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 55b321c..e83304b 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -1135,20 +1135,14 @@ SunfloraEvosAttacks: db 0 ; no more level-up moves HippunkEvosAttacks: + dbbw EVOLVE_HAPPINESS, TR_NITE, DROWZEE ; I could make it anytime, but let's imagine the night making it tired enough to focus its powers. Drowzee was often placed as a nocturnal Pokemon in SW97... db 0; no more evolutions - dbw 1, TACKLE - dbw 1, CONFUSION - dbw 6, GROWL - dbw 10, BITE - dbw 15, SUPERSONIC - dbw 20, STOMP - dbw 25, AMNESIA - dbw 29, ENCORE - dbw 34, BEAT_UP - dbw 39, PSYBEAM - dbw 43, PERISH_SONG - dbw 48, CRUNCH - dbw 54, FUTURE_SIGHT + dbw 1, POUND + dbw 1, CHARM + dbw 4, HYPNOSIS + dbw 8, CONFUSION + dbw 13, REST + dbw 20, PSYWAVE db 0 ; no more level-up moves AercrowEvosAttacks: diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 3b7b34d..cfe86e2 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -274,7 +274,7 @@ PokemonNames:: db "SUNKERN@@@" db "SUNBUD@@@@" db "SUNFLORA@@" - db "HIPPUNK@@@" + db "TORPIR@@@@" db "AERCROW@@@" db "FOXFIRE@@@" db "YANMA@@@@@"