Toedscools and Toedscruels and Wigletts, oh my!

Also reworded some of the dex entries a bit.

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)

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

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"

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)

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)

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)

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

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
 	

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

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
 

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:

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

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@@@"

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::

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

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"