diff --git a/README.md b/README.md index 13af327..3e36ff1 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration. - Lots of unnecessary, unreferenced code was removed as and when it became necessary. ## QoL Changes +- Fast text and stereo sound are now the default options. - Pokemon learnsets have been given a large upheaval, now being easier to use. A conservative approach was employed to ensure the GSC feel was preserved. Move additions have been made based on prototype and future game material (eg. Sing Pidgeot using proto-RG), but odd ones (eg. Aeroblast Skarmory) were omitted. - A Trader NPC is available in a new Lake of Rage town area, allowing you to access trade evolutions natively. - DVs, Stat Exp., and Hidden Power now display on the stat screen. @@ -143,7 +144,7 @@ Individualised Pokemon sprite credits can be found within the respective Pokemon JEP-affiliated spriters require sprites to be used with direct credit for non-commerical purposes. Credit the artist in any case of using them. - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, Emordrome, Gouging Fire - Martha's Against Humanity: Flutter Mane, Hyoshu-Yang, Hyoshu-Yin, Fossil Aerodactyl, Fossil Kabutops, Hisuian Growlithe -- zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix, Alolan Ninetales, Hirsuswine, Togekiss, Scream Tail, Vulpiii, Happiny +- zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix, Alolan Ninetales, Hirsuswine, Togekiss, Scream Tail, Vulpiii, Happiny, Kotora - Shawesome: Alolan Geodude - EyeDonutz: Walking Wake (front/back, title) - Plague von Karma: Overworld Arbok, Koffing, Voltorb, Gengar, Diglett, and Cat sprites, adapted from the slot machine's sprites (originally made for KEP). diff --git a/data/pokemon/dex_entries/abra.asm b/data/pokemon/dex_entries/abra.asm index 350054c..b92cc45 100644 --- a/data/pokemon/dex_entries/abra.asm +++ b/data/pokemon/dex_entries/abra.asm @@ -6,5 +6,5 @@ next "rinted in its" page "brain, so it can" - next "TELEPORT home any" - next "time.@" + next "TELEPORT home at" + next "any time.@" diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm index 52e592d..7cd6729 100644 --- a/data/pokemon/dex_entries/beedrill.asm +++ b/data/pokemon/dex_entries/beedrill.asm @@ -1,10 +1,12 @@ db "POISON BEE@" ; species name dw 303, 650 ; height, weight - db "When faced with" - next "a fleeing #-" - next "MON, it can shoot" + db "When prey tries" + next "to flee, it fires" + next "its stinger to" - page "its stinger at t-" - next "hem. It grows ba-" - next "ck very quickly.@" ; Referencing Carddass artwork of it using Pin Missile https://archives.bulbagarden.net/media/upload/3/30/Bandai_Beedrill_card.jpg + page "weaken it before" + next "taking it back" + next "to the hive.@" +; Hellish to word this one. The main problem is that the most useful pronouns are 4-letter. Keeping it within line limit is difficult. +; Referencing Carddass artwork of it using Pin Missile https://archives.bulbagarden.net/media/upload/3/30/Bandai_Beedrill_card.jpg diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm index ff066e1..d2908fe 100644 --- a/data/pokemon/dex_entries/bellsprout.asm +++ b/data/pokemon/dex_entries/bellsprout.asm @@ -3,7 +3,7 @@ db "To catch prey, it" next "extends its roots" - next "to constrict them." ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/0/02/Bandai_Bellsprout_card.jpg + next "to constrict it." ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/0/02/Bandai_Bellsprout_card.jpg page "It follows this" next "up with ACID and" diff --git a/data/pokemon/dex_entries/cheep.asm b/data/pokemon/dex_entries/cheep.asm index 4add57f..e998580 100644 --- a/data/pokemon/dex_entries/cheep.asm +++ b/data/pokemon/dex_entries/cheep.asm @@ -1,10 +1,10 @@ db "FLYING FISH@" ; species name dw 10, 120 ; height, weight - db "FISHERs are often" - next "surprised by" - next "CHEEP's strength," + db "Surprises FISHERs" + next "with its power." + next "TRAINERs may" - page "sometimes losing" - next "bait or rods when" - next "one is hooked.@" + page "lose bait or even" + next "RODs if they're" + next "not careful!@" diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm index bb2fe95..2b877eb 100644 --- a/data/pokemon/dex_entries/ekans.asm +++ b/data/pokemon/dex_entries/ekans.asm @@ -1,10 +1,10 @@ db "SNAKE@" ; species name dw 607, 150 ; height, weight - db "It flutters the" - next "tip of its tongue" - next "to seek out the" + db "Common in grassy" + next "areas. Bites from" + next "young ones are not" - page "scent of prey," - next "then swallows the" - next "prey whole.@" + page "venomous making" + next "them popular chu-" + next "gen gifts.@" diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm index b91c66e..9784909 100644 --- a/data/pokemon/dex_entries/fearow.asm +++ b/data/pokemon/dex_entries/fearow.asm @@ -1,10 +1,15 @@ db "BEAK@" ; species name dw 311, 840 ; height, weight - db "It uses its long" - next "beak to attack. It" - next "has a surprisingly" + db "The way this #-" + next "MON swoops down" + next "at prey with an" - page "long reach, so it" - next "must be treated" - next "with caution.@" + page "aileron roll has" + next "inspired pilots" + next "for centuries.@" + +; Carddass reference! +; https://bulbapedia.bulbagarden.net/wiki/Pocket_Monsters_Carddass_Trading_Cards#/media/File:Bandai_Fearow_card.jpg +; Indeed, the spinning motion in the air isn't a barrel roll, but an aileron roll, which I'm dubbing the use of Drill Peck. +; The "centuries" aspect is harkening back to the long-lived nature of Fearow, often referenced in dex entries. diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm index ea3c8b7..828a7f8 100644 --- a/data/pokemon/dex_entries/geodude.asm +++ b/data/pokemon/dex_entries/geodude.asm @@ -1,10 +1,10 @@ db "ROCK@" ; species name dw 104, 440 ; height, weight - db "Proud of their" - next "sturdy bodies," - next "they bash against" + db "To attack, it" + next "throws itself at" + next "the opponent. A" - page "each other in a" - next "contest to prove" - next "whose is harder.@" + page "clean hit is an" + next "instant knock-out" + next "for any foe.@" diff --git a/data/pokemon/dex_entries/glaceon.asm b/data/pokemon/dex_entries/glaceon.asm index 1fdcee6..0f71b0c 100644 --- a/data/pokemon/dex_entries/glaceon.asm +++ b/data/pokemon/dex_entries/glaceon.asm @@ -7,4 +7,4 @@ page "This makes it a" next "popular #MON" - next "at ski resorts.@" + next "at ski resorts.@" ; I believe this was a PokePark reference; note written post-creation. diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm index 6b2e4e5..5b2934c 100644 --- a/data/pokemon/dex_entries/gloom.asm +++ b/data/pokemon/dex_entries/gloom.asm @@ -1,10 +1,12 @@ db "WEED@" ; species name dw 207, 190 ; height, weight - db "The smell from its" - next "drool-like syrup" - next "and the pollen on" + db "Its eyes are usu-" + next "ally closed. If" + next "surprised, they" - page "its petals is so" - next "bad, it may make" - next "opponents faint.@" + page "open wide and the" + next "stench from its" + next "pistil worsens.@" +; Referencing Pokemon Stadium. +; Pistil information taken from the illustrated book and context clues. diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm index d59b940..d40d0c5 100644 --- a/data/pokemon/dex_entries/golbat.asm +++ b/data/pokemon/dex_entries/golbat.asm @@ -1,10 +1,11 @@ db "BAT@" ; species name dw 503, 1210 ; height, weight - db "When it plunges" - next "its fangs into its" - next "prey, it instantly" + db "Its SUPERSONIC" + next "lets it echolocate" + next "through walls." ; Manga reference. - page "draws and gulps" - next "down more than ten" - next "ounces of blood.@" + page "Sometimes, it will" + next "expose its long," + next "purple tongue.@" +; Referencing old sprites and the (albeit toned down) Adventures manga. diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm index 075a9b5..fe11535 100644 --- a/data/pokemon/dex_entries/goldeen.asm +++ b/data/pokemon/dex_entries/goldeen.asm @@ -1,10 +1,10 @@ db "GOLDFISH@" ; species name dw 200, 330 ; height, weight - db "During spawning" - next "season, they swim" - next "gracefully in the" + db "Prideful to a" + next "fault, they will" + next "fight for mates." - page "water, searching" - next "for their perfect" - next "mate.@" + page "Sometimes, they" + next "devolve into SUP-" + next "ERSONIC matches.@" diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm index 921e4dd..db87929 100644 --- a/data/pokemon/dex_entries/golduck.asm +++ b/data/pokemon/dex_entries/golduck.asm @@ -1,10 +1,11 @@ db "DUCK@" ; species name dw 507, 1690 ; height, weight - db "It swims grace-" - next "fully along on the" - next "quiet, slow-moving" + db "It has the power" + next "to use telepathy." + next "When doing so, it" - page "rivers and lakes" - next "of which it is so" - next "fond.@" + page "focuses its power" + next "by pointing at" + next "the recipient.@" +; Reference to the manga and general psychic...ness... diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm index 7d5e9af..e71489a 100644 --- a/data/pokemon/dex_entries/golem.asm +++ b/data/pokemon/dex_entries/golem.asm @@ -1,10 +1,11 @@ db "MEGATON@" ; species name dw 407, 6620 ; height, weight - db "Its rock-like body" - next "is so durable," - next "even high-powered" + db "When using EXPLO-" + next "SION, it is reve-" + next "aled that GOLEM's" - page "dynamite blasts" - next "fail to scratch" - next "its rugged hide.@" + page "body is hollow." + next "It rolls twice as" + next "fast as GRAVELER.@" +; Carddass and illustrated book reference diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm index 26b9db7..36cec79 100644 --- a/data/pokemon/dex_entries/graveler.asm +++ b/data/pokemon/dex_entries/graveler.asm @@ -1,10 +1,11 @@ db "ROCK@" ; species name dw 303, 2320 ; height, weight - db "It travels by rol-" - next "ling on mountain" - next "paths. If it gains" + db "Grips to cliffs" + next "in groups. If" + next "one hears music," - page "too much speed, it" - next "stops by running" - next "into huge rocks.@" + page "they come down" + next "with a thud to" + next "dance.@" +; Pokemon Snap reference! diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm index af5610c..8113165 100644 --- a/data/pokemon/dex_entries/growlithe.asm +++ b/data/pokemon/dex_entries/growlithe.asm @@ -1,10 +1,10 @@ db "PUPPY@" ; species name dw 204, 420 ; height, weight - db "It controls a big" - next "territory. If it" - next "detects an unknown" + db "Its ROAR and EMBER" + next "make it a popular" + next "guard dog. Howev-" - page "smell, it roars" - next "loudly to force" - next "out the intruder.@" + page "er, GRANBULL has" + next "grown more popu" + next "lar as of late.@" diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm index 3f32356..665c60b 100644 --- a/data/pokemon/dex_entries/gyarados.asm +++ b/data/pokemon/dex_entries/gyarados.asm @@ -1,10 +1,12 @@ db "ATROCIOUS@" ; species name dw 2104, 5180 ; height, weight - db "It appears when-" - next "ever there is" - next "world conflict," + db "Its barbels allow" + next "it to detect ear-" + next "thquakes. When" - page "burning down any" - next "place it travels" - next "through.@" + page "one is about to" + next "occur, it goes" + next "on a rampage.@" + +; Referencing Namazu and Lake Biwa considering Lake of Rage context. diff --git a/data/pokemon/dex_entries/hippunk.asm b/data/pokemon/dex_entries/hippunk.asm index ed1af8e..864a6cc 100644 --- a/data/pokemon/dex_entries/hippunk.asm +++ b/data/pokemon/dex_entries/hippunk.asm @@ -8,3 +8,4 @@ page "high pitched" next "squeals before" next "attacking.@" +; being reworked \ No newline at end of file diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm index 27d5a80..df82cf9 100644 --- a/data/pokemon/dex_entries/igglybuff.asm +++ b/data/pokemon/dex_entries/igglybuff.asm @@ -1,10 +1,10 @@ db "BALLOON@" ; species name dw 100, 20 ; height, weight - db "Instead of walking" - next "with its short" - next "legs, it moves" + db "Its legs aren't" + next "yet strong enough" + next "to stand properly," - page "around by bouncing" - next "on its soft," - next "tender body.@" + page "so it bounces and" + next "bumps all over" + next "the place.@" diff --git a/data/pokemon/dex_entries/kotora.asm b/data/pokemon/dex_entries/kotora.asm index 561ead7..72a8286 100644 --- a/data/pokemon/dex_entries/kotora.asm +++ b/data/pokemon/dex_entries/kotora.asm @@ -1,10 +1,10 @@ db "SHOCK CAT@" ; species name dw 200, 620 ; height, weight - db "Its rotund looks" - next "make it a popular" - next "first pet with" + db "Its rotund body" + next "has made it a" + next "popular first" - page "kids. However," + page "pet. However," next "neglect quickly" - next "makes it feral.@" + next "turns it feral.@" diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm index 90a21d4..08dd428 100644 --- a/data/pokemon/dex_entries/ledian.asm +++ b/data/pokemon/dex_entries/ledian.asm @@ -1,10 +1,13 @@ db "FIVE STAR@" ; species name dw 407, 780 ; height, weight - db "In the daytime" - next "when it gets warm," - next "it curls up inside" + db "At night, the" + next "spots on its car-" + next "apace flash red." - page "a big leaf and" - next "drifts off into" - next "a deep slumber.@" + page "The display confu-" + next "ses predators when" + next "done in swarms.@" + +; Referencing Pokemon: Mewtwo Returns +; I'm adding a flair with the idea of confusion here. Ledian usually uses Supersonic, not Confuse Ray, but there's no other reason it would have evolved this trait in my mind. diff --git a/data/pokemon/dex_entries/lickilicky.asm b/data/pokemon/dex_entries/lickilicky.asm index 28b568f..f36786c 100644 --- a/data/pokemon/dex_entries/lickilicky.asm +++ b/data/pokemon/dex_entries/lickilicky.asm @@ -8,3 +8,4 @@ page "can be extended" next "with enough force" next "to crush boulders.@" +; Needs hyphenating to be brought in line; missing a comma due to not using them. diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm index b5aa73a..cd85fbd 100644 --- a/data/pokemon/dex_entries/lickitung.asm +++ b/data/pokemon/dex_entries/lickitung.asm @@ -1,10 +1,10 @@ db "LICKING@" ; species name dw 311, 1440 ; height, weight - db "It has a tongue" - next "that is over 6'6''" - next "long. It uses this" + db "Lives in meadows." + next "Attacks by slamm-" + next "ing foes with its" - page "long tongue to" - next "lick its body" - next "clean.@" + page "long tongue, but" + next "recoils if the" + next "target is sour.@" diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm index 2be156f..72d6c19 100644 --- a/data/pokemon/dex_entries/magikarp.asm +++ b/data/pokemon/dex_entries/magikarp.asm @@ -1,10 +1,10 @@ db "FISH@" ; species name dw 211, 220 ; height, weight - db "This weak and" - next "pathetic #MON" - next "gets easily pushed" + db "No matter the foe" + next "or attack, it will" + next "always SPLASH aro-" - page "along rivers when" - next "there are strong" - next "currents.@" + page "und. However, it" + next "has the cell make-" + next "up of a dragon.@" ; Illustrated book, taken from JEP. diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm index a260cea..3028682 100644 --- a/data/pokemon/dex_entries/nidoking.asm +++ b/data/pokemon/dex_entries/nidoking.asm @@ -1,10 +1,12 @@ db "DRILL@" ; species name dw 407, 1370 ; height, weight - db "It uses its thick" - next "arms, legs and" - next "tail to attack" + db "Unlike NIDOQUEEN," + next "NIDOKING does not" + next "lose its ability" - page "forcefully. Melee" - next "combat is its" - next "specialty.@" + page "to breed. It" + next "spins its horn" + next "before charging.@" + +; Illustrated book and Carddass references. diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm index 5345467..9b8fd6f 100644 --- a/data/pokemon/dex_entries/nidoqueen.asm +++ b/data/pokemon/dex_entries/nidoqueen.asm @@ -1,10 +1,10 @@ db "DRILL@" ; species name dw 403, 1320 ; height, weight - db "The hard scales" - next "that cover its" - next "strong body serve" + db "The spines on its" + next "body are filled" + next "with venom. If" - page "as excellent" - next "protection from" - next "any attack.@" + page "predators try to" + next "attack, it fires" + next "off POISON STING.@" diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm index 9181edc..6ca0b42 100644 --- a/data/pokemon/dex_entries/nidoran_f.asm +++ b/data/pokemon/dex_entries/nidoran_f.asm @@ -1,10 +1,11 @@ db "POISON PIN@" ; species name dw 104, 150 ; height, weight - db "Small and very" - next "docile, it pro-" - next "tects itself with" + db "Baby NIDORAN" + next "are just 10 cm" ; I don't know the orthography for this. + next "long. When threat-" - page "its small, poison-" - next "ous horn when" - next "attacked.@" + page "ened, they GROWL" + next "in hopes the pre-" + next "dator leaves.@" +; Illustrated Book and Carddass references. diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm index 51ec0a5..82b17e8 100644 --- a/data/pokemon/dex_entries/nidoran_m.asm +++ b/data/pokemon/dex_entries/nidoran_m.asm @@ -1,10 +1,12 @@ db "POISON PIN@" ; species name dw 108, 200 ; height, weight - db "It constantly" - next "moves its large" - next "ears in many" + db "In breeding" + next "season, its horn" + next "glows in 7 colors" - page "directions in" - next "order to detect" - next "danger right away.@" + page "to woo females." + next "The larger the" + next "horn, the better.@" +; Illustrated book reference. +; And yes, Nidoran are size queens. diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm index e1670a1..76d8165 100644 --- a/data/pokemon/dex_entries/nidorina.asm +++ b/data/pokemon/dex_entries/nidorina.asm @@ -1,10 +1,11 @@ db "POISON PIN@" ; species name dw 207, 440 ; height, weight - db "It has a docile" - next "nature. If it is" - next "threatened with" + db "Mating seasons for" + next "NIDORINO and NIDO-" + next "RINA last 2 months." - page "attack, it raises" - next "the barbs that are" - next "all over its body.@" + page "NIDORINA can't bre-" + next "ed after evolving" + next "so it acts fast.@" +; Illustrated Book reference. Part about Nidorina losing the ability to breed could be better. diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm index 3f00ac0..596e4bd 100644 --- a/data/pokemon/dex_entries/nidorino.asm +++ b/data/pokemon/dex_entries/nidorino.asm @@ -1,10 +1,13 @@ db "POISON PIN@" ; species name dw 211, 430 ; height, weight - db "It is easily" - next "agitated and uses" - next "its horn for" + db "It begins to" + next "prepare nests for" + next "NIDORINA in the" - page "offense as soon as" - next "it notices an" - next "attacker.@" + page "summer. Before it" + next "battles, it does" + next "deimatic displays.@" ; Focus Energy + +; Dual reference to the illustrated book and Carddass card. +; Slightly choppily written. diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm index c0295e0..c05ecbc 100644 --- a/data/pokemon/dex_entries/ninetales.asm +++ b/data/pokemon/dex_entries/ninetales.asm @@ -1,10 +1,11 @@ db "FOX@" ; species name dw 307, 440 ; height, weight - db "It is said to live" - next "a thousand years," - next "and each of its" + db "Curses resulting" + next "from touching any" + next "of its 9 tails" - page "tails is loaded" - next "with supernatural" - next "powers.@" + page "last 1,000 years." + next "NINETALES itself" + next "can't remove them.@" +; Referencing Pokemon Mystery Dungeon's Ninetales. diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm index e8a63d8..e076f3c 100644 --- a/data/pokemon/dex_entries/oddish.asm +++ b/data/pokemon/dex_entries/oddish.asm @@ -1,10 +1,12 @@ db "WEED@" ; species name dw 108, 120 ; height, weight - db "During the day, it" - next "stays in the cold" - next "underground to" + db "Its leaves are" + next "prehensile, all-" + next "owing it to climb" - page "avoid the sun." - next "It grows by bath-" - next "ing in moonlight.@" + page "surfaces and use" + next "moves like PETAL" + next "DANCE.@" + +; Referencing anime episode "Foul Weather Friends" and its attack animations in the Stadium titles. diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm index 62d473c..df18bb8 100644 --- a/data/pokemon/dex_entries/paras.asm +++ b/data/pokemon/dex_entries/paras.asm @@ -1,10 +1,11 @@ db "MUSHROOM@" ; species name dw 100, 120 ; height, weight - db "The tochukaso" - next "growing on this" - next "#MON's back" + db "The tochukaso on" + next "its back grow" + next "weaker when exp-" - page "orders it to" - next "extract juice from" - next "tree trunks.@" + page "osed to sunlight." + next "PARAS then remov-" + next "es the mushrooms.@" +; Referencing Clefairy and the Moon Stone, also building on the Crystal dex entry implying that the tochukaso is fighting with Paras for control at this stage. diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm index 6fbf4f7..b7f0937 100644 --- a/data/pokemon/dex_entries/parasect.asm +++ b/data/pokemon/dex_entries/parasect.asm @@ -1,10 +1,11 @@ db "MUSHROOM@" ; species name dw 303, 650 ; height, weight - db "When nothing's" - next "left to extract" - next "from the bug, the" + db "As soon as the" + next "tochukaso takes" + next "control, it moves" - page "mushrooms on its" - next "back leave spores" - next "on the bug's egg.@" + page "to marshes and" + next "grasslands. It th-" + next "en spreads spores.@" +; Illustrated book entry. diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm index 30a1cce..dee0274 100644 --- a/data/pokemon/dex_entries/pidgeotto.asm +++ b/data/pokemon/dex_entries/pidgeotto.asm @@ -1,10 +1,13 @@ db "BIRD@" ; species name dw 307, 660 ; height, weight - db "It slowly flies in" - next "a circular pat-" - next "tern, all the" + db "As it grows, it" + next "develops a poor" + next "temperament. It" - page "while keeping a" - next "sharp lookout for" - next "prey.@" + page "lashes out by fi-" + next "ring feathers at" + next "CATERPIE.@" + +; Dual Carddass and anime references. +; I like the idea of mid-stage evolutions referencing teenagehood, which is seen in quite a few Pokemon. Pidgeotto doesn't seem too different. diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm index cde05eb..ff5adf5 100644 --- a/data/pokemon/dex_entries/pidgey.asm +++ b/data/pokemon/dex_entries/pidgey.asm @@ -1,10 +1,13 @@ db "TINY BIRD@" ; species name dw 100, 40 ; height, weight - db "It rapidly flaps" - next "its wings in the" - next "grass, stirring up" + db "Its gentle dispo-" + next "sition makes it" + next "an easy catch," - page "a dust cloud that" - next "drives insect prey" - next "out into the open.@" + page "but new TRAINERs" + next "have trouble with" + next "its SAND-ATTACK.@" + +; Dual Carddass and anime ep1 reference. +; Choppily written, but very possible to work on. diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm index 9183a15..d0e8619 100644 --- a/data/pokemon/dex_entries/poliwag.asm +++ b/data/pokemon/dex_entries/poliwag.asm @@ -1,10 +1,11 @@ db "TADPOLE@" ; species name dw 200, 270 ; height, weight - db "The swirl on its" - next "belly is its" - next "insides showing" + db "Feeds on plants" + next "at the bottoms of" + next "lakes. After doing" - page "through the skin." - next "It looks clearer" - next "after it eats.@" + page "so, the swirl on" + next "its belly becomes" + next "clearer.@" +; Referencing The Stun Spore Detour and various dex entries. diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm index df4e0e6..42eac4e 100644 --- a/data/pokemon/dex_entries/poliwhirl.asm +++ b/data/pokemon/dex_entries/poliwhirl.asm @@ -1,10 +1,11 @@ db "TADPOLE@" ; species name dw 303, 440 ; height, weight - db "Though it is" - next "skilled at walk-" - next "ing, it prefers to" + db "Its anatomy is" + next "popular among am-" + next "ateur biologists." - page "live underwater" - next "where there is" - next "less danger.@" + page "All of its organs" + next "are visible thro-" + next "ugh its spiral.@" +; Referencing Junji Ito Poliwhirl anatomical model and frogs being popular dissection subjects in schools. diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm index 4b4f233..5baa0e2 100644 --- a/data/pokemon/dex_entries/poliwrath.asm +++ b/data/pokemon/dex_entries/poliwrath.asm @@ -1,10 +1,15 @@ db "TADPOLE@" ; species name dw 403, 1190 ; height, weight - db "It can use its" - next "well-developed" - next "arms and legs to" + db "While not easy to" + next "see, its mouth is" + next "above its belly." - page "run on the surface" - next "of the water for a" - next "split second.@" + page "However, it uses" + next "its spiral for" + next "Water attacks.@" + +; Badly written. +; Referencing the Poliwhirl anatomical model and various products that show the mouth is above the spiral. +; No clue how to explain the use of the spiral to be honest with you +; Rework if based diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm index 6a58bc9..fd60cc3 100644 --- a/data/pokemon/dex_entries/psyduck.asm +++ b/data/pokemon/dex_entries/psyduck.asm @@ -1,10 +1,11 @@ db "DUCK@" ; species name dw 207, 430 ; height, weight - db "The only time it" - next "can use its psy-" - next "chic power is when" + db "When its headache" + next "is too much to" + next "bear, it lashes" - page "its sleeping brain" - next "cells happen to" - next "wake.@" + page "out with SCRATCH" + next "before letting" + next "off PSI power.@" +; Referencing the anime, learnset, and carddass cards. Writing could be better. diff --git a/data/pokemon/dex_entries/raitora.asm b/data/pokemon/dex_entries/raitora.asm index 43fc1bf..f59a705 100644 --- a/data/pokemon/dex_entries/raitora.asm +++ b/data/pokemon/dex_entries/raitora.asm @@ -5,6 +5,6 @@ next "KOTORA becomes" next "this #MON." - page "It loves to" - next "play with kids" - next "who groom it.@" + page "Its chubby body" + next "is popular with" + next "kids.@" diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm index 50898dd..fc8a95f 100644 --- a/data/pokemon/dex_entries/raticate.asm +++ b/data/pokemon/dex_entries/raticate.asm @@ -1,10 +1,12 @@ db "RAT@" ; species name dw 204, 410 ; height, weight - db "The webs on its" - next "hind legs enable" - next "it to cross" + db "Its fangs never" + next "stop growing, so" + next "its SUPER FANG is" - page "rivers. It search-" - next "es wide areas for" - next "food.@" + page "especially potent." + next "It even chews logs" + next "in its sleep!@" + +; Dual Carddass and Pokemon Sleep references. diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm index f9e801b..332773a 100644 --- a/data/pokemon/dex_entries/rattata.asm +++ b/data/pokemon/dex_entries/rattata.asm @@ -1,10 +1,12 @@ db "RAT@" ; species name dw 100, 80 ; height, weight - db "This #MON's" - next "impressive vital-" - next "ity allows it to" + db "While small, it" + next "retaliates with" + next "desperation when" ; "Attack of the cornered rat" type of philosophy. - page "live anywhere. It" - next "also multiplies" - next "very quickly.@" + page "cornered. It is" + next "thought FOCUS EN-" + next "ERGY helps this.@" ; Not well-written, could be improved. + +; Referencing Carddass with Focus Energy. diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm index 570907b..2204b86 100644 --- a/data/pokemon/dex_entries/sandshrew.asm +++ b/data/pokemon/dex_entries/sandshrew.asm @@ -1,10 +1,11 @@ db "MOUSE@" ; species name dw 200, 260 ; height, weight - db "It prefers dry," - next "sandy places" - next "because it uses" + db "Because it bu-" + next "rrows far from" + next "lakes and rivers," - page "the sand to" - next "protect itself" - next "when threatened.@" + page "it sometimes" + next "digs deep for" + next "water sources.@" +; Combining Red dex entry with Pokemon Stadium minigame for a new take on Sandshrew's lore. diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm index 1225d0b..98df701 100644 --- a/data/pokemon/dex_entries/seaking.asm +++ b/data/pokemon/dex_entries/seaking.asm @@ -1,10 +1,11 @@ db "GOLDFISH@" ; species name dw 403, 860 ; height, weight - db "When autumn comes," - next "the males patrol" - next "the area around" + db "Highly protective" + next "of baby ORFRY," + next "it will attack" - page "their nests in" - next "order to protect" - next "their offspring.@" + page "any predators" + next "with a powerful" + next "HORN DRILL.@" +; Carddass and integrating Orfry. diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm index 290e721..344c0e3 100644 --- a/data/pokemon/dex_entries/spearow.asm +++ b/data/pokemon/dex_entries/spearow.asm @@ -1,10 +1,12 @@ db "TINY BIRD@" ; species name dw 100, 40 ; height, weight - db "To protect its" - next "territory, it" - next "flies around" + db "Known for its pre-" + next "cision, a trained" + next "messenger SPEAROW" - page "ceaselessly," - next "making high-" - next "pitched cries.@" + page "is seen as a" + next "symbol of an expe-" + next "rienced TRAINER.@" +; Referencing KENYA. +; The wording is a bit choppy... diff --git a/data/pokemon/dex_entries/totartle.asm b/data/pokemon/dex_entries/totartle.asm index 3ab3b48..352d543 100644 --- a/data/pokemon/dex_entries/totartle.asm +++ b/data/pokemon/dex_entries/totartle.asm @@ -3,8 +3,8 @@ db "Living for up to" next "10,000 years," - next "TOTARTLE's" + next "TOTARTLE's shell" - page "shell has grown" - next "seaweed that" - next "formed a tail.@" + page "has grown seaweed" + next "that formed a" + next "tail.@" diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm index 693b631..25832f4 100644 --- a/data/pokemon/dex_entries/vaporeon.asm +++ b/data/pokemon/dex_entries/vaporeon.asm @@ -1,10 +1,10 @@ db "BUBBLE JET@" ; species name dw 303, 640 ; height, weight - db "It can melt into" - next "water using ACID" - next "ARMOR, but if" + db "If water isn't" ; Carddass reference. + next "close by, it uses" + next "MIST to hide from" - page "the area is" - next "muddy, it will" - next "refuse to use it.@" + page "poachers. It is" + next "sometimes mistaken" + next "for a mermaid.@" diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm index 338f0ed..060e519 100644 --- a/data/pokemon/dex_entries/venomoth.asm +++ b/data/pokemon/dex_entries/venomoth.asm @@ -1,10 +1,11 @@ db "POISONMOTH@" ; species name dw 411, 280 ; height, weight - db "The scales it" - next "scatters will" - next "paralyze anyone" + db "It glides through" + next "temperate forests" + next "with clear wings." - page "who touches them," - next "making that person" - next "unable to stand.@" + page "Psychic power em-" + next "anates from its" + next "compound eyes.@" +; Referencing the modern design and Cardass artwork. diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm index b960cf8..1b9b356 100644 --- a/data/pokemon/dex_entries/victreebel.asm +++ b/data/pokemon/dex_entries/victreebel.asm @@ -1,10 +1,13 @@ db "FLYCATCHER@" ; species name dw 507, 340 ; height, weight - db "Once ingested into" - next "this #MON's" - next "body, even the" + db "Its leaves rotate" + next "around its body" + next "to attack. Greedy" - page "hardest object" - next "will melt into" - next "nothing.@" + page "VICTREEBEL sleep" + next "mouth agape to" + next "hoard food.@" + +; Crazy wording I know, the things we do for line-saving... +; Referencing Carddass and that one Pokemon Generations episode. Also subtle Pokemon Sleep usage. \ No newline at end of file diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm index 541fd4d..e390084 100644 --- a/data/pokemon/dex_entries/vileplume.asm +++ b/data/pokemon/dex_entries/vileplume.asm @@ -1,10 +1,13 @@ db "FLOWER@" ; species name dw 311, 410 ; height, weight - db "By shaking its big" - next "petals, it scat-" - next "ters toxic pollen" + db "Its spores cause" + next "severe allergic" + next "reactions, but it" - page "into the air," - next "turning the air" - next "yellow.@" + page "lives in areas" + next "with herbs that" + next "can cure it.@" +; Referencing The Stun Spore Detour. +; The weed is the "Ashire water herb" in Japanese, or "Savleyo weed" in English. +; Can be worded better. I want to make it out to be a Pokemon that isn't problematic despite it being a walking ball of death. \ No newline at end of file diff --git a/data/pokemon/dex_entries/vulpiii.asm b/data/pokemon/dex_entries/vulpiii.asm index e4a014e..20125fc 100644 --- a/data/pokemon/dex_entries/vulpiii.asm +++ b/data/pokemon/dex_entries/vulpiii.asm @@ -3,7 +3,7 @@ db "Small and weak," next "VULPIII prefers" - next "to pacify foes by" + next "to pacify foes" page "by shaking its" next "3 tails instead" diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm index 0409bb9..1e99197 100644 --- a/data/pokemon/dex_entries/vulpix.asm +++ b/data/pokemon/dex_entries/vulpix.asm @@ -1,10 +1,12 @@ db "FOX@" ; species name dw 200, 220 ; height, weight - db "As its body grows" - next "larger, its six" - next "warm tails become" + db "Dislikes fights." + next "When forced into" + next "battle, it blocks" - page "more beautiful," - next "with a more luxur-" - next "ious coat of fur.@" + page "the foe from movi-" + next "ng with FIRE SPIN" + next "before attacking.@" + +; Reference to EP28 dex entry. diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm index f96c6e4..257666b 100644 --- a/data/pokemon/dex_entries/wartortle.asm +++ b/data/pokemon/dex_entries/wartortle.asm @@ -1,10 +1,10 @@ db "TURTLE@" ; species name dw 303, 500 ; height, weight - db "Its long, furry" - next "tail is a symbol" - next "of longevity," + db "Algae builds up" + next "on its shell as" + next "it swims, from" - page "making it quite" - next "popular among" - next "older people.@" + page "which some fish" + next "#MON use for" + next "sustenance.@" diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm index d53be66..2724938 100644 --- a/data/pokemon/dex_entries/weepinbell.asm +++ b/data/pokemon/dex_entries/weepinbell.asm @@ -1,10 +1,13 @@ db "FLYCATCHER@" ; species name dw 303, 140 ; height, weight - db "When it's hungry," - next "it swings its" - next "razor-sharp" + db "It can hunt on the" + next "ground or in trees" + next "with ACID. Its gr-" - page "leaves, slicing up" - next "any unlucky object" - next "nearby for food.@" + page "owth depends on" + next "how much it eats" + next "in this stage.@" + +; Referencing Ruby/Sleep dex entries with the hook, and then going on to explain and justify Bellignan's existence. +; Can be revised for sure. diff --git a/data/pokemon/dex_entries/weirduck.asm b/data/pokemon/dex_entries/weirduck.asm index 267cfcd..bf25799 100644 --- a/data/pokemon/dex_entries/weirduck.asm +++ b/data/pokemon/dex_entries/weirduck.asm @@ -5,6 +5,6 @@ next "its awkward phase," next "its psychic power" - page "has begun to awa-" - next "ken. Mainly lives" + page "has begun to foc-" + next "us. Mainly lives" next "in swamps.@" diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm index 0f54d51..e604573 100644 --- a/data/pokemon/dex_entries/zubat.asm +++ b/data/pokemon/dex_entries/zubat.asm @@ -1,10 +1,11 @@ db "BAT@" ; species name dw 207, 170 ; height, weight - db "During the day, it" - next "gathers with" - next "others and hangs" + db "Sunlight makes it" + next "sick, so it only" + next "leaves caves at" - page "from the ceilings" - next "of old buildings" - next "and caves.@" + page "night. It can be" + next "trained to with-" + next "stand it, though.@" +; Referencing later dex entries, but also noting the discrepency. diff --git a/gfx/pokemon/kotora/anim.asm b/gfx/pokemon/kotora/anim.asm index 875f7be..e67c93f 100644 --- a/gfx/pokemon/kotora/anim.asm +++ b/gfx/pokemon/kotora/anim.asm @@ -1 +1,11 @@ + frame 0, 08 + frame 1, 06 + frame 0, 02 + frame 2, 04 + setrepeat 5 + frame 3, 01 + frame 2, 01 + dorepeat 5 + frame 3, 03 + frame 0, 16 endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/anim_idle.asm b/gfx/pokemon/kotora/anim_idle.asm index 875f7be..74a9d17 100644 --- a/gfx/pokemon/kotora/anim_idle.asm +++ b/gfx/pokemon/kotora/anim_idle.asm @@ -1 +1,3 @@ + frame 4, 08 + frame 0, 16 endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/credit.txt b/gfx/pokemon/kotora/credit.txt new file mode 100644 index 0000000..a72165a --- /dev/null +++ b/gfx/pokemon/kotora/credit.txt @@ -0,0 +1,2 @@ +Sprited by zuperZACH +https://github.com/zuperZACH \ No newline at end of file diff --git a/gfx/pokemon/kotora/front.png b/gfx/pokemon/kotora/front.png index e0a9da9..df1bb2b 100644 Binary files a/gfx/pokemon/kotora/front.png and b/gfx/pokemon/kotora/front.png differ diff --git a/gfx/pokemon/kotora/gif.gif b/gfx/pokemon/kotora/gif.gif new file mode 100644 index 0000000..f28b083 Binary files /dev/null and b/gfx/pokemon/kotora/gif.gif differ