From 602a7386d4109f7ba7140916244cf07a06117033 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sun, 11 Dec 2022 23:21:03 +0000 Subject: [PATCH] Toedscools and Toedscruels and Wigletts, oh my! Also reworded some of the dex entries a bit. --- constants/pokedex_constants.asm | 6 +- constants/pokemon_constants.asm | 28 ++- data/pokemon/base_stats.asm | 6 +- data/pokemon/base_stats/toedscool.asm | 24 +++ data/pokemon/base_stats/toedscruel.asm | 24 +++ data/pokemon/base_stats/wiglett.asm | 24 +++ data/pokemon/cries.asm | 8 +- data/pokemon/dex_entries.asm | 42 ++--- data/pokemon/dex_order.asm | 8 +- data/pokemon/dex_text.asm | 242 ++++++++++++------------- data/pokemon/evos_moves.asm | 48 ++++- data/pokemon/menu_icons.asm | 6 +- data/pokemon/names.asm | 8 +- data/pokemon/new_dex_text.asm | 8 +- data/pokemon/palettes.asm | 6 +- gfx/pics.asm | 6 + gfx/pokemon/back/toedscoolb.png | Bin 0 -> 532 bytes gfx/pokemon/back/toedscruelb.png | Bin 0 -> 572 bytes gfx/pokemon/back/wiglettb.png | Bin 0 -> 522 bytes gfx/pokemon/front/toedscool.png | Bin 0 -> 663 bytes gfx/pokemon/front/toedscruel.png | Bin 0 -> 668 bytes gfx/pokemon/front/wiglett.png | Bin 0 -> 510 bytes 22 files changed, 304 insertions(+), 190 deletions(-) create mode 100644 data/pokemon/base_stats/toedscool.asm create mode 100644 data/pokemon/base_stats/toedscruel.asm create mode 100644 data/pokemon/base_stats/wiglett.asm create mode 100644 gfx/pokemon/back/toedscoolb.png create mode 100644 gfx/pokemon/back/toedscruelb.png create mode 100644 gfx/pokemon/back/wiglettb.png create mode 100644 gfx/pokemon/front/toedscool.png create mode 100644 gfx/pokemon/front/toedscruel.png create mode 100644 gfx/pokemon/front/wiglett.png diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 2092540c..5c6382d0 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -98,7 +98,7 @@ const DEX_MADAAMU ; (091) const DEX_DIGLETT ; 50 (092) const DEX_DUGTRIO ; 51 (093) - ; const DEX_WIGLETT ; (094) + const DEX_WIGLETT ; (094) const DEX_WUGTRIO ; (095) const DEX_CROCKY ; (096) const DEX_KOTORA ; (097) @@ -108,8 +108,8 @@ const DEX_ELECTRODE ; 101 (101) const DEX_TENTACOOL ; 72 (102) const DEX_TENTACRUEL ; 73 (103) - ; const DEX_TOEDSCOOL ; (104) - ; const DEX_TOEDSCRUEL ; (105) + const DEX_TOEDSCOOL ; (104) + const DEX_TOEDSCRUEL ; (105) const DEX_DROWZEE ; 96 (106) const DEX_HYPNO ; 97 (107) const DEX_LICKITUNG ; 108 (108) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 7c9480bf..4747b16a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -227,21 +227,19 @@ const BETOBEBII ; $DA const MAGNEZONE ; $DB const PORYGONZ ; $DC - ; const HAPPINY ; $DD - ; const MUNCHLAX ; $DE - const ANNIHILAPE ; $DF - const SCREAM_TAIL ; $E0 - const SANDY_SHOCKS ; $E1 - ; const WIGLETT ; $E2 - const WUGTRIO ; $E3 - ; const TOEDSCOOL ; $E4 - ; const TOEDSCRUEL ; $E5 - ; const PERRSERKER ; $E6 - ; const SIRFETCHD ; $E7 - ; const MR_RIME ; $E8 - ; const MELTAN ; $E9 - ; const MELMETAL ; $EA - const MISSINGNO ; $EB + const ANNIHILAPE ; $DD + const SCREAM_TAIL ; $DE + const SANDY_SHOCKS ; $DF + const WIGLETT ; $E0 + const WUGTRIO ; $E1 + const TOEDSCOOL ; $E2 + const TOEDSCRUEL ; $E3 + ; const PERRSERKER ; $E4 + ; const SIRFETCHD ; $E5 + ; const MR_RIME ; $E6 + ; const MELTAN ; $E7 + ; const MELMETAL ; $E8 + const MISSINGNO ; $E9 DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 305b6ac3..072231e0 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -93,7 +93,7 @@ INCLUDE "data/pokemon/base_stats/farfetchd.asm" INCLUDE "data/pokemon/base_stats/madaamu.asm" INCLUDE "data/pokemon/base_stats/diglett.asm" INCLUDE "data/pokemon/base_stats/dugtrio.asm" -; INCLUDE "data/pokemon/base_stats/wiglett.asm" +INCLUDE "data/pokemon/base_stats/wiglett.asm" INCLUDE "data/pokemon/base_stats/wugtrio.asm" INCLUDE "data/pokemon/base_stats/crocky.asm" INCLUDE "data/pokemon/base_stats/kotora.asm" @@ -103,8 +103,8 @@ INCLUDE "data/pokemon/base_stats/voltorb.asm" INCLUDE "data/pokemon/base_stats/electrode.asm" INCLUDE "data/pokemon/base_stats/tentacool.asm" INCLUDE "data/pokemon/base_stats/tentacruel.asm" -; INCLUDE "data/pokemon/base_stats/toedscool.asm" -; INCLUDE "data/pokemon/base_stats/toedscruel.asm" +INCLUDE "data/pokemon/base_stats/toedscool.asm" +INCLUDE "data/pokemon/base_stats/toedscruel.asm" INCLUDE "data/pokemon/base_stats/drowzee.asm" INCLUDE "data/pokemon/base_stats/hypno.asm" INCLUDE "data/pokemon/base_stats/lickitung.asm" diff --git a/data/pokemon/base_stats/toedscool.asm b/data/pokemon/base_stats/toedscool.asm new file mode 100644 index 00000000..27f51c6f --- /dev/null +++ b/data/pokemon/base_stats/toedscool.asm @@ -0,0 +1,24 @@ + db DEX_TOEDSCOOL ; pokedex id + + db 40, 40, 35, 70, 100 + ; hp atk def spd spc + + db GROUND, GRASS ; type + db 190 ; catch rate + db 105 ; base exp + + INCBIN "gfx/pokemon/front/toedscool.pic", 0, 1 ; sprite dimensions + dw ToedscoolPicFront, ToedscoolPicBack + + db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT + ; end + + db BANK(ToedscoolPicFront) + assert BANK(ToedscoolPicFront) == BANK(ToedscoolPicBack) diff --git a/data/pokemon/base_stats/toedscruel.asm b/data/pokemon/base_stats/toedscruel.asm new file mode 100644 index 00000000..e0a9395c --- /dev/null +++ b/data/pokemon/base_stats/toedscruel.asm @@ -0,0 +1,24 @@ + db DEX_TOEDSCRUEL ; pokedex id + + db 80, 70, 65, 100, 120 + ; hp atk def spd spc + + db GROUND, GRASS ; type + db 60 ; catch rate + db 205 ; base exp + + INCBIN "gfx/pokemon/front/toedscruel.pic", 0, 1 ; sprite dimensions + dw ToedscruelPicFront, ToedscruelPicBack + + db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, SUBSTITUTE, CUT + ; end + + db BANK(ToedscruelPicFront) + assert BANK(ToedscruelPicFront) == BANK(ToedscruelPicBack) diff --git a/data/pokemon/base_stats/wiglett.asm b/data/pokemon/base_stats/wiglett.asm new file mode 100644 index 00000000..be2a061e --- /dev/null +++ b/data/pokemon/base_stats/wiglett.asm @@ -0,0 +1,24 @@ + db DEX_WIGLETT ; pokedex id + + db 10, 55, 25, 95, 35 + ; hp atk def spd spc + + db WATER, WATER ; type + db 255 ; catch rate + db 81 ; base exp + + INCBIN "gfx/pokemon/front/wiglett.pic", 0, 1 ; sprite dimensions + dw WiglettPicFront, WiglettPicBack + + db WATER_GUN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, RAGE, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, \ + SUBSTITUTE, CUT, SURF + ; end + + db BANK(WiglettPicFront) + assert BANK(WiglettPicFront) == BANK(WiglettPicBack) diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index e9a7debb..2bfc302c 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -226,15 +226,13 @@ CryData:: mon_cry SFX_CRY_05, $FF, $40 ; Betobebii mon_cry SFX_CRY_00, $00, $00 ; Magnezone mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z - ; mon_cry SFX_CRY_00, $00, $00 ; Happiny - ; mon_cry SFX_CRY_00, $00, $00 ; Munchlax mon_cry SFX_CRY_20, $00, $1C ; Annihilape mon_cry SFX_CRY_0E, $FA, $80 ; Scream Tail mon_cry SFX_CRY_1C, $1F, $DD ; Sandy Shocks - ; mon_cry SFX_CRY_00, $00, $00 ; Wiglett + mon_cry SFX_CRY_00, $00, $00 ; Wiglett mon_cry SFX_CRY_00, $00, $00 ; Wugtrio - ; mon_cry SFX_CRY_00, $00, $00 ; Toedscool - ; mon_cry SFX_CRY_00, $00, $00 ; Toedscruel + mon_cry SFX_CRY_00, $00, $00 ; Toedscool + mon_cry SFX_CRY_00, $00, $00 ; Toedscruel ; mon_cry SFX_CRY_19, $1A, $40 ; Perrserker ; mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd ; mon_cry SFX_CRY_20, $00, $70 ; Mr. Rime diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index b82e43ad..df2db08e 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -223,10 +223,10 @@ PokedexEntryPointers: dw AnnihilapeDexEntry dw ScreamTailDexEntry dw SandyShocksDexEntry - ; dw WiglettDexEntry + dw WiglettDexEntry dw WugtrioDexEntry - ; dw ToedscoolDexEntry - ; dw ToedscruelDexEntry + dw ToedscoolDexEntry + dw ToedscruelDexEntry dw MissingNoDexEntry assert_table_length NUM_POKEMON_INDEXES @@ -1782,12 +1782,12 @@ SandyShocksDexEntry: text_far _SandyShocksDexEntry text_end -; WiglettDexEntry: - ; db "GARDEN EEL@" - ; db 3,11 - ; dw 40 - ; text_far _WiglettDexEntry - ; text_end +WiglettDexEntry: + db "GARDEN EEL@" + db 3,11 + dw 40 + text_far _WiglettDexEntry + text_end WugtrioDexEntry: db "GARDEN EEL@" @@ -1796,17 +1796,17 @@ WugtrioDexEntry: text_far _WugtrioDexEntry text_end -; ToedscoolDexEntry: - ; db "WOODEAR@" - ; db 2,11 - ; dw 730 - ; text_far _ToedscoolDexEntry - ; text_end +ToedscoolDexEntry: + db "WOODEAR@" + db 2,11 + dw 730 + text_far _ToedscoolDexEntry + text_end -; ToedscruelDexEntry: - ; db "WOODEAR@" - ; db 6,3 - ; dw 1280 - ; text_far _ToedscruelDexEntry - ; text_end +ToedscruelDexEntry: + db "WOODEAR@" + db 6,3 + dw 1280 + text_far _ToedscruelDexEntry + text_end \ No newline at end of file diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 3895d7ba..341d5fa4 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -220,15 +220,13 @@ PokedexOrder: db DEX_BETOBEBII db DEX_MAGNEZONE db DEX_PORYGONZ - ; db DEX_HAPPINY - ; db DEX_MUNCHLAX db DEX_ANNIHILAPE db DEX_SCREAM_TAIL db DEX_SANDY_SHOCKS - ; db DEX_WIGLETT + db DEX_WIGLETT db DEX_WUGTRIO - ; db DEX_TOEDSCOOL - ; db DEX_TOEDSCRUEL + db DEX_TOEDSCOOL + db DEX_TOEDSCRUEL ; db DEX_PERRSERKER ; db DEX_SIRFETCHD ; db DEX_MR_RIME diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index f36c304a..7fa47e1c 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -89,13 +89,13 @@ _IvysaurDexEntry:: dex _ExeggutorDexEntry:: - text "Also known as the" - next "walking tropical" - next "rainforest." + text "Known as The" + next "Walking Tropical" + next "Rainforest, each" - page "Each fruit has" - next "a will of its" - next "own" + page "fruit has a face" + next "and a will of" + next "its own" dex _LickitungDexEntry:: ; new entry @@ -119,13 +119,13 @@ _ExeggcuteDexEntry:: ; new entry dex _GrimerDexEntry:: ; new entry - text "Toxic sludge" - next "mutated by x-rays" - next "from the moon" + text "Sludge mutated by" + next "x-rays from the" + next "moon eventually" - page "eventually" - next "became this" - next "#MON" + page "became GRIMER." + next "Loves to feed on" + next "filthy things" dex _GengarDexEntry:: ; new entry @@ -133,7 +133,7 @@ _GengarDexEntry:: ; new entry next "honoring GENGAR" next "on mountains. It" - page "Is said to appear" + page "is said to appear" next "from the dark to" next "kill lost souls" dex @@ -173,9 +173,9 @@ _RhyhornDexEntry:: ; new entry next "ramming can" next "destroy buildings." - page "They are not" - next "suitable house" - next "pets" + page "Due to this, they" + next "are unsuitable" + next "house pets" dex _LaprasDexEntry:: ; new entry @@ -249,13 +249,13 @@ _GastlyDexEntry:: ; Dex entry from Green, swapping the Indian Elephant for Tram dex _ScytherDexEntry:: ; new entry - text "It can fly with" - next "its wings, but" - next "it is uncommon." - page "Few specimens" next "have ever been" - next "caught" + next "caught. While" + + page "it can fly using" + next "its wings, it" + next "rarely does this" dex _StaryuDexEntry:: ; new entry @@ -313,7 +313,7 @@ _OnixDexEntry:: ; new entry next "underground," next "burrowing at over" - page "80 kilometers per" + page "50 miles per" ; changed to imperial to match other measurements next "hour in search" next "of prey" dex @@ -329,11 +329,11 @@ _FearowDexEntry:: ; new entry dex _PidgeyDexEntry:: ; new entry - text "Dislikes fights." - next "They hide among" - next "tall grass" + text "Does not like to" + next "fight. It prefers" + next "to hide in tall" - page "while feeding on" + page "grass, feeding on" next "CATERPIE and" next "WEEDLE" dex @@ -349,13 +349,13 @@ _SlowpokeDexEntry:: dex _KadabraDexEntry:: ; new entry - text "A short story" - next "about a boy" - next "becoming a" + text "Its popularity has" + next "increased after" + next "the release of a" - page "KADABRA made it" - next "a star for those" - next "in the know" + page "short story about" + next "a boy who turned" + next "into a KADABRA" dex _GravelerDexEntry:: ; new entry @@ -400,12 +400,12 @@ _MrMimeDexEntry:: ; new entry _HitmonleeDexEntry:: ; new entry text "Sometimes called" - next "'The Demon of" - next "Kickboxing'." + next "The Demon of" + next "Kickboxing." - page "Despite this," - next "When not fighting," - next "it is very docile" + page "Despite this, it" + next "is very docile" + next "when not fighting" dex _HitmonchanDexEntry:: ; new entry @@ -413,17 +413,17 @@ _HitmonchanDexEntry:: ; new entry next "by the spirit of" next "a pro boxer." - page "Its punches are" - next "faster than" - next "bullet train" + page "It throws punches" + next "that can outspeed" + next "a bullet train" dex _ArbokDexEntry:: ; new entry text "ARBOK paralyzes" next "prey with its" - next "gaze. It will" + next "gaze. It often" - page "fight viciously" + page "fights viciously" next "with its mortal" next "enemy, RATICATE" dex @@ -436,7 +436,6 @@ _ParasectDexEntry:: ; new entry page "mushroom's toxic" next "spores are used" next "in medicine" - dex _PsyduckDexEntry:: ; new entry, modified from the original. @@ -450,13 +449,13 @@ _PsyduckDexEntry:: ; new entry, modified from the original. dex _DrowzeeDexEntry:: - text "Often seen eerily" - next "muttering to" - next "itself." + text "Said to be a" + next "decendant of the" + next "legendary Baku," - page "It is said to" - next "be a descendent" - next "of Baku" + page "it is often seen" + next "eerily muttering" + next "to itself" dex _GolemDexEntry:: ; new entry @@ -474,9 +473,9 @@ _MagmarDexEntry:: ; new entry, modified from the original next "areas, MAGMAR's" next "body burns at" - page "1200 degrees. It" - next "hides perfectly" - next "in lava" + page "2200 degrees F." ; changed to imperial + next "Hides perfectly" + next "among flames" dex _ElectabuzzDexEntry:: ; new entry @@ -500,9 +499,9 @@ _MagnetonDexEntry:: ; new entry dex _KoffingDexEntry:: ; new entry - text "Getting too close" - next "to KOFFING makes" - next "tears fill eyes." + text "The toxic gases" + next "that it emits can" + next "induce tears." page "It was originally" next "discovered in a" @@ -554,9 +553,9 @@ _FarfetchdDexEntry:: ; new entry next "population has" next "declined due to" - page "being hunted" - next "for the leeks" - next "they carry" + page "being hunted for" + next "their tasty meat" + next "and leeks" dex _VenonatDexEntry:: ; new entry @@ -571,18 +570,18 @@ _VenonatDexEntry:: ; new entry dex _DragoniteDexEntry:: ; new entry - text "Despite its bulk," - next "it can outrun a" - next "jet. It is said" + text "Has the ability to" + next "outspeed a jet," + next "despite its bulk." - page "to represent" - next "a God of" - next "Destruction" + page "Feared as a god" + next "of destruction due" + next "to its strength" dex _DoduoDexEntry:: ; new entry - text "It was found 3" - next "years ago. It" + text "First discovered" + next "3 years ago. It" next "hates flying due" page "to short wings," @@ -595,8 +594,9 @@ _PoliwagDexEntry:: ; new entry next "skin reveals its" next "internal organs." - page "It is genetically" - next "close to tadpoles" + page "Some believe it's" + next "a mutation of" + next "a common tadpole" dex _JynxDexEntry:: ; new entry @@ -635,8 +635,8 @@ _ZapdosDexEntry:: ; new entry next "bird presiding" next "over the heavens," - page "innumerable years" - next "are spent flying" + page "ZAPDOS spends" + next "thousands of years" next "above the clouds" dex @@ -681,13 +681,13 @@ _VulpixDexEntry:: ; Changed to make it not too similar to Mikon's dex entry. ~ dex _NinetalesDexEntry:: ; new entry - text "Elders often say" - next "'NINETALES, 1,000" - next "years, TOTARTLE," + text "A proverb exists" + next "that refers to" + next "its longevity:" - page "10,000 years.'" - next "to refer to its" - next "longevity" + page "'NINETALES, 1,000" + next "years, TOTARTLE," + next "10,000 years." dex _PikachuDexEntry:: ; new entry @@ -756,8 +756,8 @@ _HorseaDexEntry:: ; new entry next "ink. In spring," page "it lays thousands" - next "of eggs, but" - next "GOLDEEN eats many" + next "of eggs, but many" + next "of them are eaten" dex _SeadraDexEntry:: @@ -792,12 +792,12 @@ _SandslashDexEntry:: _OmanyteDexEntry:: ; new entry text "It was related" - next "to mollusks." - next "Feeding on" + next "to mollusks and" + next "fed on small fish" - page "plankton and" - next "small fish, it" - next "swam with 10 feet" + page "and plankton. It" + next "swam by waving" + next "its 10 feet" dex _OmastarDexEntry:: ; new entry @@ -826,8 +826,8 @@ _WigglytuffDexEntry:: ; new entry next "is sold as a" page "luxury item to" + next "a number of rich," next "foreign buyers" - dex _EeveeDexEntry:: ; does not need a n.ew entry @@ -843,11 +843,11 @@ _EeveeDexEntry:: ; does not need a n.ew entry _FlareonDexEntry:: ; new entry, sort of modified off the original text "It stores fire" next "in a flame sac." - next "It looses it at" + next "It blows out" - page "temperatures over" - next "1,700 degrees" - next "celsius" + page "flames at nearly" + next "3,100 degrees" + next "Fahrenheit" ; changed to imperial dex _JolteonDexEntry:: ; new entry @@ -926,7 +926,7 @@ _PoliwrathDexEntry:: ; new entry, modified from original. next "and butterfly." page "Why it remains a" - next "tadpole is" + next "tadpole is still" next "unknown" dex @@ -966,7 +966,7 @@ _DodrioDexEntry:: ; new entry next "in Central" page "America revered" - next "DODRIO as a" + next "DODRIO as their" next "symbol" dex @@ -982,8 +982,8 @@ _PrimeapeDexEntry:: ; this entry is just like the pokedex, so no new one _DugtrioDexEntry:: ; new entry, modified from the original text "A team of DIGLETT" - next "triplets." - next "They burrow" + next "triplets. They" + next "burrow deep" page "underground to" next "hide themselves" @@ -1002,7 +1002,7 @@ _VenomothDexEntry:: ; does not need a n.ew entry _DewgongDexEntry:: ; new entry text "Its blubber can" - next "be up to 30 cm" + next "be up to 12 inches" next "thick. Unusually," page "they are more" @@ -1075,9 +1075,9 @@ _GolbatDexEntry:: ; new entry next "fangs, GOLBAT can" next "suck up to" - page "300 milliliters" - next "of blood in one" - next "bite" + page "10 ounces of" + next "blood in a" + next "single bite" dex _MewtwoDexEntry:: ; does not need a n.ew entry @@ -1090,14 +1090,14 @@ _MewtwoDexEntry:: ; does not need a n.ew entry next "experiments" dex -_SnorlaxDexEntry:: ; new entry, could be improved. - text "It eats 400 kilos" - next "of food a day. As" - next "soon as it is" +_SnorlaxDexEntry:: ; new entry + text "Isn't satisfied" + next "unless it eats" + next "over 880 lbs of" - page "done, it falls" - next "asleep. It is the" - next "heaviest #MON" + page "food every day." + next "When done, it" + next "falls asleep" dex _MagikarpDexEntry:: ; new entry @@ -1147,7 +1147,7 @@ _ElectrodeDexEntry:: ; new entry page "provocation, it" next "has been called" - next "the 'Bomb Ball'" + next "the Bomb Ball" dex _ClefableDexEntry:: ; new entry @@ -1232,11 +1232,11 @@ _PidgeottoDexEntry:: ; new entry _PidgeotDexEntry:: ; new entry text "Flies at speeds of" - next "up to Mach-2 at" - next "1200 meters." + next "up to Mach-2." + next "They spread their" - page "They spread their" - next "wings for" + page "gorgeous wings" + next "widely for" next "intimidation" dex @@ -1256,8 +1256,8 @@ _BulbasaurDexEntry:: ; new entry next "about whether" page "BULBASAUR is a" - next "plant or a" - next "mammal" + next "type of plant" + next "or a mammal" dex _VenusaurDexEntry:: ; new entry @@ -1272,8 +1272,8 @@ _VenusaurDexEntry:: ; new entry _TentacruelDexEntry:: ; new entry text "Also known as the" - next "'Gangster of the" - next "Sea', it uses its" + next "Gangster of the" + next "Sea, it uses its" page "80 tentacles to" next "ensnare and" @@ -1343,7 +1343,7 @@ _RaticateDexEntry:: ; new entry _NidorinoDexEntry:: ; new entry text "Its horn can" next "pierce diamonds." - next "While evolved," + next "Unlike NIDORINA," page "it does not lose" next "the ability to" @@ -1441,13 +1441,13 @@ _WartortleDexEntry:: ; new entry dex _CharizardDexEntry:: ; new entry - text "Because its dung" - next "is found on Mt." - next "Fuji, it is" + text "Thought to be" + next "capable of flying" + next "up to 4,500 feet" - page "thought to FLY up" - next "to 1,400 meters" - next "in altitude" + page "in altitude after" + next "its droppings were" + next "found on Mt. Fuji" dex _OddishDexEntry:: ; new entry @@ -1465,8 +1465,8 @@ _GloomDexEntry:: ; new entry next "emits a foul" next "stench that makes" - page "foes faint up to" - next "2 kilometers" + page "foes faint more" + next "than a mile" next "away" dex diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 67b61abf..2ea315a1 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -226,7 +226,10 @@ EvosMovesPointerTable: dw AnnihilapeEvosMoves dw ScreamTailEvosMoves dw SandyShocksEvosMoves - dw WugtrioEvosMoves + dw WiglettEvosMoves + dw WugtrioEvosMoves + dw ToedscoolEvosMoves + dw ToedscruelEvosMoves dw MissingNoEvosMoves assert_table_length NUM_POKEMON_INDEXES @@ -2863,6 +2866,18 @@ SandyShocksEvosMoves: db 55, METAL_SOUND db 0 +WiglettEvosMoves: +; Evolutions + db EV_LEVEL, 28, WUGTRIO + db 0 +; Learnset + db 15, SAND_ATTACK + db 19, WRAP + db 24, HEADBUTT + db 31, DIG + db 40, HYDRO_PUMP + db 0 + WugtrioEvosMoves: ; Evolutions db 0 @@ -2871,7 +2886,36 @@ WugtrioEvosMoves: db 19, WRAP db 24, HEADBUTT db 31, DIG - db 37, HYDRO_PUMP + db 40, HYDRO_PUMP + db 0 + +ToedscoolEvosMoves: +; Evolutions + db EV_LEVEL, 30, TOEDSCRUEL + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISONPOWDER + db 22, STUN_SPORE + db 27, CONSTRICT + db 33, SOLARBEAM + db 40, SCREECH + db 48, SPORE + db 0 + +ToedscruelEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISONPOWDER + db 22, STUN_SPORE + db 27, CONSTRICT + db 35, SOLARBEAM + db 43, SCREECH + db 50, SPORE db 0 MissingNoEvosMoves: diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index a747d393..4c0b5d09 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -93,7 +93,7 @@ MonPartyData: nybble ICON_BIRD ; Madaamu nybble ICON_MON ; Diglett nybble ICON_MON ; Dugtrio - ; nybble ICON_WATER ; Wiglett + nybble ICON_WATER ; Wiglett nybble ICON_WATER ; Wugtrio nybble ICON_MON ; Crocky nybble ICON_QUADRUPED ; Kotora @@ -103,8 +103,8 @@ MonPartyData: nybble ICON_BALL ; Electrode nybble ICON_WATER ; Tentacool nybble ICON_WATER ; Tentacruel - ; nybble ICON_GRASS ; Toedscool - ; nybble ICON_GRASS ; Toedscruel + nybble ICON_GRASS ; Toedscool + nybble ICON_GRASS ; Toedscruel nybble ICON_MON ; Drowzee nybble ICON_MON ; Hypno nybble ICON_MON ; Lickitung diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 90ad37d1..a1ae849f 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -220,15 +220,13 @@ MonsterNames:: db "BETOBEBII@" db "MAGNEZONE@" db "PORYGON-Z@" - ; db "HAPPINY@@@" - ; db "MUNCHLAX@@" db "ANNIHILAPE" db "SCREAMTAIL" db "SANDY SHOX" - ; db "WIGLETT@@@" + db "WIGLETT@@@" db "WUGTRIO@@@" - ; db "TOEDSCOOL@" - ; db "TOEDSCRUEL" + db "TOEDSCOOL@" + db "TOEDSCRUEL" ; db "PERRSERKER" ; db "SIRFETCH'D" ; db "MR.RIME@@@" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 71882236..f2e600e0 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -198,7 +198,7 @@ _PuchikoonDexEntry:: next "is very hot" dex -_GyopinDexEntry:: +_GyopinDexEntry:: ; may rework, I just reused PokeThon's version text "It was once scarce" next "and rarely seen," next "but thanks to a" @@ -243,9 +243,9 @@ _TotartleDexEntry:: next "of living for" next "10,000 years." - page "Its algae-covered" - next "tail is a symbol" - next "of its longevity" + page "The shells of old" + next "TURTIDAL are fully" + next "covered in algae" dex _WeirduckDexEntry:: diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 705d1e02..877b0bfc 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -94,7 +94,7 @@ MonsterPalettes: db PAL_BROWNMON ; MADAAMU db PAL_BROWNMON ; DIGLETT db PAL_BROWNMON ; DUGTRIO - ; db PAL_PINKMON ; WIGLETT + db PAL_PINKMON ; WIGLETT db PAL_PINKMON ; WUGTRIO db PAL_GREENMON ; CROCKY db PAL_YELLOWMON ; KOTORA @@ -104,8 +104,8 @@ MonsterPalettes: db PAL_REDMON ; ELECTRODE db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACRUEL - ; db PAL_BROWNMON ; TOEDSCOOL - ; db PAL_YELLOWMON ; TOEDSCRUEL + db PAL_BROWNMON ; TOEDSCOOL + db PAL_YELLOWMON ; TOEDSCRUEL - Yellow doesn't really look right... db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO db PAL_PINKMON ; LICKITUNG diff --git a/gfx/pics.asm b/gfx/pics.asm index 86fe0812..bdd1b13f 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -522,7 +522,13 @@ ScreamTailPicFront:: INCBIN "gfx/pokemon/front/screamtail.pic" ScreamTailPicBack:: INCBIN "gfx/pokemon/back/screamtailb.pic" SandyShocksPicFront:: INCBIN "gfx/pokemon/front/sandyshocks.pic" SandyShocksPicBack:: INCBIN "gfx/pokemon/back/sandyshocksb.pic" +WiglettPicFront:: INCBIN "gfx/pokemon/front/wiglett.pic" +WiglettPicBack:: INCBIN "gfx/pokemon/back/wiglettb.pic" WugtrioPicFront:: INCBIN "gfx/pokemon/front/wugtrio.pic" WugtrioPicBack:: INCBIN "gfx/pokemon/back/wugtriob.pic" +ToedscoolPicFront:: INCBIN "gfx/pokemon/front/toedscool.pic" +ToedscoolPicBack:: INCBIN "gfx/pokemon/back/toedscoolb.pic" +ToedscruelPicFront:: INCBIN "gfx/pokemon/front/toedscruel.pic" +ToedscruelPicBack:: INCBIN "gfx/pokemon/back/toedscruelb.pic" MissingNoPicFront:: INCBIN "gfx/pokemon/front/missingno.pic" MissingNoPicBack:: INCBIN "gfx/pokemon/back/missingnob.pic" \ No newline at end of file diff --git a/gfx/pokemon/back/toedscoolb.png b/gfx/pokemon/back/toedscoolb.png new file mode 100644 index 0000000000000000000000000000000000000000..dc282006537ae7b93fd5a3b3396741393793f3fb GIT binary patch literal 532 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_GdiYVlpNN1N=mRLX7!Eej$wK7nRQfa#TxPBT7;d zOH!?pi&B9UgOP!ek**;S8HN}cSs7VanHp&u7+4t?@T6kVo1c=IR*6M}Aw+}! zq`xbG8lqAoJkxxA8MJ_G4hB|6AqHk3ixCJJ7^N6MUIwxlycnh7>>x%Bs2X5EF$p8o z1J!|m2M~kwfNA-l?Tl|^ z8UFkC|6@LD$H(XY`@#i|?HBjn+^|Y=-~K2=Q?4UF_GC@Xkl=cJc~$7zg?|N(wFK00 zC{H;ke^K&>;8CVbW{9okY#?etIa)M(kyBBAZ#J~TNc5NM- n+SoXlU7ehnoMY#9ellW+@HlL7EdOg4(0vS^u6{1-oD!MNSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_GdiYVlt-N!t0uWLX7!Eej$wK7nRQfa#TxPBT7;d zOH!?pi&B9UgOP!ek**;S8HN}cSs7VanHp&u7+4t?@T6kVo1c=IR*6M}Aw+}! zq`xbG8lqAoJkxxA8MJ_G4hB|6AqHk3ixCJJ7^N6MUIwxlycnh7>>x%Bs2X5EF$p8o z1J!|m2M~kwfNA-l?W|cHrwnB2K$ag z!B-FdOCAZ}N!{?DG38GtZ(>JXDt}7HE`t`gugsDQnRpf@IvhJLz|M9tK;dzQ0yDFA zN8ypy#zsSt6%hdqjg5{XCmI_58?eQ+{I@^MXwdxA{xD~o&jN;kCoNZ3sphTv djii_vOlM5qI&-$cIiNonJYD@<);T3K0RS_Vomv0@ literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/wiglettb.png b/gfx/pokemon/back/wiglettb.png new file mode 100644 index 0000000000000000000000000000000000000000..9e6a1bcbc216ea5b8cfb5c7a5e13275c6e42167f GIT binary patch literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_GdiYVzLsiCJS!|3Nhvv`Gqi^UsOH|$WbkEjVMV; zEJ?LWE=mPb3`PbvU|?ln;1g~pg`y!hKP5A*61N6huD)eJ z4N<8Po@u_m3|c@o2Lmgk5Cb!i#R!B9j8Y6BF9TT&UX0Rkb`YZmR1Gkon1m7Pf$BiO z1BgL-z_fhOcM~AH%hSa%MB;Mo8AHB920W|*+|%-8ckp_g6|@lH$+2bOJ|!A4Bl3`? zM8u}X+x`1r^XRyAeU_<@WU!ee`mnm#=h}Cdt=oi-E?}7)<|3HD@>%W>$1jy5>m04~$n|!$P;N0K!4Hoqu ZSlz2`=K8$SdkAzDgQu&X%Q~loCIAf%hO+5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&v>}S#N-~Zm*WaON$jwj5OsmAyU}Oo=kT^?A z9;hKIHNrE^*Ox&H$mU>RWfWpy2C^7|kbzN(0pw*Mi@}Rg8qN-4)PSl11{9MpLOoC& z2zUT7NDr8n5BhEbAKAUzrrJ4{^ex-om^0sd41hd zu_xDVxfTeYFN(XTvZM56+>(#>0yJ!q zpZPsj@y@G<93Qo}^~)@@vbWo!WA@#9|HH^5>iW&A_Z{8E)qJ||=&Q{lf+=4ZpBf)A zV3HSPKmWlcb8pq+?i(%a1&*>GCcOV3u&LOk=FS_zd&e$XPmTR7aB4;wi}{}J>3+-{ ze1-1f3$HAD!8%#^kjrX)7o{!h6qg*-~kkKWADm&t7nF_OEHV?xH@EjvINTmSwGvYg@Zg+^RV#Eq3Fd?UUQ>w?6%F UK51skMo_qUy85}Sb4q9e01M#OF#rGn literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/toedscruel.png b/gfx/pokemon/front/toedscruel.png new file mode 100644 index 0000000000000000000000000000000000000000..a8dad95bcb7dc7311b354412ed5f7cab0d8ba91c GIT binary patch literal 668 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiAZZZR<(jmvf?fkKS=MSdZS=NFaF0dU*Yohw$)3T3l~*=<=*i_(}i8UNz*%BFe&J_;G75_ zj^^#Vubg<)F(=T8Ps{23t)x9q-%a21l#xN*sdq1h~4Y^p&6NG_9#$V zdcxB=wpFeTw&&KbOlElUO7Ug$(&bT>BA=e#yYzHgjr6CR8yzmKE<4fKe3`-2adlc# z$`Yr(wajb0)mmg89*sW47WI+SsEseoFvatH1?z`9e;BlLIPaz$k54+mVoOrkRa`H)r;74f?(e)7 zs>eO2YO_zHE~)3>)U_c$DVl_1-b5f&@wSC#CYjs)|C%FOz*k;J#+6(-XGTl zt2+WLA57k};{KV5M$eUO_QmvAUQh^kMk%5tst|1T^h8P)H0g;J`wt<0_fx-6rUr$gp5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&v>}S#8_n0rWpf;81sw#LKx34DxU@9Jn?jK4AD5h z^^zgiAp;SH3+wY@H|;Jt|6svlr*#S%^Bk+#9Bmx;y0rh}lRL1mS~H~JE8jFX0TtC{ zzOzaM4jy#ykW;ij`JeG-_6KIY2LZ;G8+NRESAJvlIo?-kB5eF_S6VU)!d7@LEX)qy z;l{V`=8_H7hV7DVLGA%Fk|OvnD)dVT&d4gzSh^(hqEiExuYYSbzi-uv3IDlG9?s_% zy|LS`b)|EenSaKuCwj8aR&G#Tnd?-Nwd3e!{=Cbph2J{lh=v3n3QUd-e!nAj4UbmO zvG%QworMCqyIxmF968OW${_Ib?fX59GoAiUEHi!e9q3=x64!{5l*E!$tK_0oAjM#0 zU}U6g2t