The Big One.

Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.

data/pokemon/base_stats/balumba.asm

@@ -1,4 +1,4 @@
-	db DEX_BARUNDA ; pokedex id
+	db DEX_BALUMBA ; pokedex id
 
 	db  90,  50,  30, 125, 100
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 137 ; base exp
 
-	INCBIN "gfx/pokemon/front/barunda.pic", 0, 1 ; sprite dimensions
-	dw BarundaPicFront, BarundaPicBack
+	INCBIN "gfx/pokemon/front/balumba.pic", 0, 1 ; sprite dimensions
+	dw BalumbaPicFront, BalumbaPicBack
 
 	db FAIRY_WIND, GROWL, DRAININGKISS, NO_MOVE ; level 1 learnset
 	db GROWTH_FAST ; growth rate
@@ -22,5 +22,5 @@
 	     FLASH
 	; end
 
-	db BANK(BarundaPicFront)
-	assert BANK(BarundaPicFront) == BANK(BarundaPicBack)
+	db BANK(BalumbaPicFront)
+	assert BANK(BalumbaPicFront) == BANK(BalumbaPicBack)

data/pokemon/base_stats/bellignan.asm

@@ -1,4 +1,4 @@
-	db DEX_TSUBOMITTO ; pokedex id
+	db DEX_BELLIGNAN ; pokedex id
 
 	db  80, 120,  65,  70,  85
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 191 ; base exp
 
-	INCBIN "gfx/pokemon/front/tsubomitto.pic", 0, 1 ; sprite dimensions
-	dw TsubomittoPicFront, TsubomittoPicBack
+	INCBIN "gfx/pokemon/front/bellignan.pic", 0, 1 ; sprite dimensions
+	dw BellignanPicFront, BellignanPicBack
 
 	db SLEEP_POWDER, RAZOR_LEAF, LOVELY_KISS, ACID ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
@@ -20,5 +20,5 @@
 	     CUT
 	; end
 
-	db BANK(TsubomittoPicFront)
-	assert BANK(TsubomittoPicFront) == BANK(TsubomittoPicBack)
+	db BANK(BellignanPicFront)
+	assert BANK(BellignanPicFront) == BANK(BellignanPicBack)

data/pokemon/base_stats/cactormus.asm

@@ -1,4 +1,4 @@
-	db DEX_CACTUS ; pokedex id
+	db DEX_CACTORMUS ; pokedex id
 
 	db  60,  95, 100,  90,  75
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 177 ; base exp
 
-	INCBIN "gfx/pokemon/front/cactus.pic", 0, 1 ; sprite dimensions
-	dw CactusPicFront, CactusPicBack
+	INCBIN "gfx/pokemon/front/cactormus.pic", 0, 1 ; sprite dimensions
+	dw CactormusPicFront, CactormusPicBack
 
 	db BARRAGE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -21,5 +21,5 @@
 	     TRI_ATTACK,   SUBSTITUTE
 	; end
 
-	db BANK(CactusPicFront)
-	assert BANK(CactusPicFront) == BANK(CactusPicBack)
+	db BANK(CactormusPicFront)
+	assert BANK(CactormusPicFront) == BANK(CactormusPicBack)

data/pokemon/base_stats/clefable.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions
 	dw ClefablePicFront, ClefablePicBack
 
-	db THUNDER_WAVE, BODY_SLAM, BLIZZARD, THUNDERBOLT ; level 1 learnset - used for trainers
+	db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset

data/pokemon/base_stats/coinpur.asm

@@ -1,4 +1,4 @@
-	db DEX_KONYA ; pokedex id
+	db DEX_COINPUR ; pokedex id
 
 	db  35,  40,  30,  85,  35
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 53 ; base exp
 
-	INCBIN "gfx/pokemon/front/konya.pic", 0, 1 ; sprite dimensions
-	dw KonyaPicFront, KonyaPicBack
+	INCBIN "gfx/pokemon/front/coinpur.pic", 0, 1 ; sprite dimensions
+	dw CoinpurPicFront, CoinpurPicBack
 
 	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -20,5 +20,5 @@
 	     REST,         SUBSTITUTE
 	; end
 
-	db BANK(KonyaPicFront)
-	assert BANK(KonyaPicFront) == BANK(KonyaPicBack)
+	db BANK(CoinpurPicFront)
+	assert BANK(CoinpurPicFront) == BANK(CoinpurPicBack)

data/pokemon/base_stats/disturban.asm

@@ -1,4 +1,4 @@
-	db DEX_TAABAN ; pokedex id
+	db DEX_DISTURBAN ; pokedex id
 
 	db  70, 125, 145,  50,  70
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 60 ; catch rate
 	db 203 ; base exp
 
-	INCBIN "gfx/pokemon/front/taaban.pic", 0, 1 ; sprite dimensions
-	dw TaabanPicFront, TaabanPicBack
+	INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions
+	dw DisturbanPicFront, DisturbanPicBack
 
 	db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -21,5 +21,5 @@
 	     EXPLOSION,    TRI_ATTACK,   SUBSTITUTE,   SURF, 	     STRENGTH
 	; end
 
-	db BANK(TaabanPicFront)
-	assert BANK(TaabanPicFront) == BANK(TaabanPicBack)
+	db BANK(DisturbanPicFront)
+	assert BANK(DisturbanPicFront) == BANK(DisturbanPicBack)

data/pokemon/base_stats/gavillain.asm

@@ -1,26 +1,26 @@
-	db DEX_CROCKY ; pokedex id
+	db DEX_GAVILLAIN ; pokedex id
 
-	db  80,  90,  75,  95,  80
+	db  80,  80,  75,  95,  90
 	;   hp  atk  def  spd  spc
 
-	db DRAGON, DRAGON ; type
+	db DRAGON, ELECTRIC ; type
 	db 45 ; catch rate
 	db 167 ; base exp
 
-	INCBIN "gfx/pokemon/front/crocky.pic", 0, 1 ; sprite dimensions
-	dw CrockyPicFront, CrockyPicBack
+	INCBIN "gfx/pokemon/front/gavillain.pic", 0, 1 ; sprite dimensions
+	dw GavillainPicFront, GavillainPicBack
 
 	db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
-	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   SUBMISSION,   \
-	     COUNTER,      SEISMIC_TOSS, RAGE,         DRAGON_RAGE,  EARTHQUAKE,   \
+	     WATER_GUN,    HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         DRAGON_RAGE,  THUNDERBOLT,  THUNDER,      EARTHQUAKE,   \
 	     FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         ROCK_SLIDE,   \
 	     SUBSTITUTE,   CUT,          FLASH
 	; end
 
-	db BANK(CrockyPicFront)
-	assert BANK(CrockyPicFront) == BANK(CrockyPicBack)
+	db BANK(GavillainPicFront)
+	assert BANK(GavillainPicFront) == BANK(GavillainPicBack)

data/pokemon/base_stats/gawarhed.asm

@@ -1,4 +1,4 @@
-	db DEX_GYAOON ; pokedex id
+	db DEX_GAWARHED ; pokedex id
 
 	db 101, 124, 100,  30,  95
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 204 ; base exp
 
-	INCBIN "gfx/pokemon/front/gyaoon.pic", 0, 1 ; sprite dimensions
-	dw GyaoonPicFront, GyaoonPicBack
+	INCBIN "gfx/pokemon/front/gawarhed.pic", 0, 1 ; sprite dimensions
+	dw GawarhedPicFront, GawarhedPicBack
 
 	db SUBSTITUTE, GROWL, TACKLE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -22,5 +22,5 @@
 		 ROCK_SLIDE,   SUBSTITUTE,   SURF,         STRENGTH
 	; end
 
-	db BANK(GyaoonPicFront)
-	assert BANK(GyaoonPicFront) == BANK(GyaoonPicBack)
+	db BANK(GawarhedPicFront)
+	assert BANK(GawarhedPicFront) == BANK(GawarhedPicBack)

data/pokemon/base_stats/iguanarch.asm

@@ -1,16 +1,16 @@
-	db DEX_CRYITHAN ; pokedex id
+	db DEX_IGUANARCH ; pokedex id
 
-	db  92,  93,  76, 108, 121
+	db 102,  93,  76, 108, 121
 	;   hp  atk  def  spd  spc
 
 	db DRAGON, DRAGON ; type
 	db 9 ; catch rate
 	db 210 ; base exp
 
-	INCBIN "gfx/pokemon/front/cryithan.pic", 0, 1 ; sprite dimensions
-	dw CryithanPicFront, CryithanPicBack
+	INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions
+	dw IguanarchPicFront, IguanarchPicBack
 
-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
@@ -21,5 +21,5 @@
 	     CUT,          SURF,         STRENGTH
 	; end
 
-	db BANK(CryithanPicFront)
-	assert BANK(CryithanPicFront) == BANK(CryithanPicBack)
+	db BANK(IguanarchPicFront)
+	assert BANK(IguanarchPicFront) == BANK(IguanarchPicBack)

data/pokemon/base_stats/kolta.asm

@@ -1,4 +1,4 @@
-	db DEX_PUCHIKOON ; pokedex id
+	db DEX_KOLTA ; pokedex id
 
 	db  30,  65,  35,  70,  45
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 88 ; base exp
 
-	INCBIN "gfx/pokemon/front/puchikoon.pic", 0, 1 ; sprite dimensions
-	dw PuchikoonPicFront, PuchikoonPicBack
+	INCBIN "gfx/pokemon/front/kolta.pic", 0, 1 ; sprite dimensions
+	dw KoltaPicFront, KoltaPicBack
 
 	db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -19,5 +19,5 @@
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
-	db BANK(PuchikoonPicFront)
-	assert BANK(PuchikoonPicFront) == BANK(PuchikoonPicBack)
+	db BANK(KoltaPicFront)
+	assert BANK(KoltaPicFront) == BANK(KoltaPicBack)

data/pokemon/base_stats/luxwan.asm

@@ -1,4 +1,4 @@
-	db DEX_MADAAMU ; pokedex id
+	db DEX_LUXWAN ; pokedex id
 
 	db  72, 105,  75,  70,  63
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 196 ; base exp
 
-	INCBIN "gfx/pokemon/front/madaamu.pic", 0, 1 ; sprite dimensions
-	dw MadaamuPicFront, MadaamuPicBack
+	INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions
+	dw LuxwanPicFront, LuxwanPicBack
 
 	db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -21,5 +21,5 @@
 	     FLY
 	; end
 
-	db BANK(MadaamuPicFront)
-	assert BANK(MadaamuPicFront) == BANK(MadaamuPicBack)
+	db BANK(LuxwanPicFront)
+	assert BANK(LuxwanPicFront) == BANK(LuxwanPicBack)

data/pokemon/base_stats/mimmeo.asm

@@ -1,4 +1,4 @@
-	db DEX_ANIMON ; pokedex id
+	db DEX_MIMMEO ; pokedex id
 
 	db 100,  55,  50,  150,  50
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 35 ; catch rate
 	db 161 ; base exp
 
-	INCBIN "gfx/pokemon/front/animon.pic", 0, 1 ; sprite dimensions
-	dw AnimonPicFront, AnimonPicBack
+	INCBIN "gfx/pokemon/front/mimmeo.pic", 0, 1 ; sprite dimensions
+	dw MimmeoPicFront, MimmeoPicBack
 
 	db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -17,5 +17,5 @@
 	tmhm
 	; end
 
-	db BANK(AnimonPicFront)
-	assert BANK(AnimonPicFront) == BANK(AnimonPicBack)
+	db BANK(MimmeoPicFront)
+	assert BANK(MimmeoPicFront) == BANK(MimmeoPicBack)

data/pokemon/base_stats/ministare.asm

@@ -1,4 +1,4 @@
-	db DEX_BAWLIGUA ; pokedex id
+	db DEX_MINISTARE ; pokedex id
 
 	db  72,  53,  46,  98,  81
 	;   hp  atk  def  spd  spc
@@ -7,10 +7,10 @@
 	db 45 ; catch rate
 	db 144 ; base exp
 
-	INCBIN "gfx/pokemon/front/bawligua.pic", 0, 1 ; sprite dimensions
-	dw BawliguaPicFront, BawliguaPicBack
+	INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions
+	dw MinistarePicFront, MinistarePicBack
 
-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
@@ -21,5 +21,5 @@
 	     SURF,         STRENGTH
 	; end
 
-	db BANK(BawliguaPicFront)
-	assert BANK(BawliguaPicFront) == BANK(BawliguaPicBack)
+	db BANK(MinistarePicFront)
+	assert BANK(MinistarePicFront) == BANK(MinistarePicBack)

data/pokemon/base_stats/omegadge.asm

@@ -1,4 +1,4 @@
-	db DEX_OMEGA ; pokedex id
+	db DEX_OMEGADGE ; pokedex id
 
 	db 101, 106, 120,  25,  95
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 204 ; base exp
 
-	INCBIN "gfx/pokemon/front/omega.pic", 0, 1 ; sprite dimensions
-	dw OmegaPicFront, OmegaPicBack
+	INCBIN "gfx/pokemon/front/omegadge.pic", 0, 1 ; sprite dimensions
+	dw OmegadgePicFront, OmegadgePicBack
 
 	db SUPERSONIC, METAL_SOUND, TACKLE, MAGNET_BOMB ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -22,5 +22,5 @@
            TRI_ATTACK,   SUBSTITUTE,   STRENGTH,     FLASH
 	; end
 
-	db BANK(OmegaPicFront)
-	assert BANK(OmegaPicFront) == BANK(OmegaPicBack)
+	db BANK(OmegadgePicFront)
+	assert BANK(OmegadgePicFront) == BANK(OmegadgePicBack)

data/pokemon/base_stats/orfry.asm

@@ -1,4 +1,4 @@
-	db DEX_GYOPIN ; pokedex id
+	db DEX_ORFRY ; pokedex id
 
 	db  35,  57,  50,  53,  40
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 57 ; base exp
 
-	INCBIN "gfx/pokemon/front/gyopin.pic", 0, 1 ; sprite dimensions
-	dw GyopinPicFront, GyopinPicBack
+	INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions
+	dw OrfryPicFront, OrfryPicBack
 
 	db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -20,5 +20,5 @@
 	     SUBSTITUTE,   SURF
 	; end
 
-	db BANK(GyopinPicFront)
-	assert BANK(GyopinPicFront) == BANK(GyopinPicBack)
+	db BANK(OrfryPicFront)
+	assert BANK(OrfryPicFront) == BANK(OrfryPicBack)

data/pokemon/base_stats/pupal.asm

@@ -1,4 +1,4 @@
-	db DEX_KASANAGI ; pokedex id
+	db DEX_PUPAL ; pokedex id
 
 	db  45,  20,  50,  40,  30
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 120 ; catch rate
 	db 73 ; base exp
 
-	INCBIN "gfx/pokemon/front/kasanagi.pic", 0, 1 ; sprite dimensions
-	dw KasanagiPicFront, KasanagiPicBack
+	INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions
+	dw PupalPicFront, PupalPicBack
 
 	db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -17,5 +17,5 @@
 	tmhm
 	; end
 
-	db BANK(KasanagiPicFront)
-	assert BANK(KasanagiPicFront) == BANK(KasanagiPicBack)
+	db BANK(PupalPicFront)
+	assert BANK(PupalPicFront) == BANK(PupalPicBack)

data/pokemon/base_stats/ramoose.asm

@@ -1,4 +1,4 @@
-	db DEX_DEER ; pokedex id
+	db DEX_RAMOOSE ; pokedex id
 
 	db  85, 110,  85,  60,  90
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 165 ; base exp
 
-	INCBIN "gfx/pokemon/front/deer.pic", 0, 1 ; sprite dimensions
-	dw DeerPicFront, DeerPicBack
+	INCBIN "gfx/pokemon/front/ramoose.pic", 0, 1 ; sprite dimensions
+	dw RamoosePicFront, RamoosePicBack
 
 	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -21,5 +21,5 @@
 	     FLASH
 	; end
 
-	db BANK(DeerPicFront)
-	assert BANK(DeerPicFront) == BANK(DeerPicBack)
+	db BANK(RamoosePicFront)
+	assert BANK(RamoosePicFront) == BANK(RamoosePicBack)

data/pokemon/base_stats/sharpoon.asm

@@ -1,4 +1,4 @@
-	db DEX_JAGG ; pokedex id
+	db DEX_SHARPOON ; pokedex id
 
 	db  80, 115, 100,  60,  85
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 45 ; catch rate
 	db 204 ; base exp
 
-	INCBIN "gfx/pokemon/front/jagg.pic", 0, 1 ; sprite dimensions
-	dw JaggPicFront, JaggPicBack
+	INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions
+	dw SharpoonPicFront, SharpoonPicBack
 
 	db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -20,5 +20,5 @@
 	     BIDE,         SKULL_BASH,   REST,         SUBSTITUTE,   SURF
 	; end
 
-	db BANK(JaggPicFront)
-	assert BANK(JaggPicFront) == BANK(JaggPicBack)
+	db BANK(SharpoonPicFront)
+	assert BANK(SharpoonPicFront) == BANK(SharpoonPicBack)

data/pokemon/base_stats/squeamata.asm

@@ -1,4 +1,4 @@
-	db DEX_SKIMPER ; pokedex id
+	db DEX_SQUEAMATA ; pokedex id
 
 	db  62,  43,  36,  88,  71
 	;   hp  atk  def  spd  spc
@@ -7,10 +7,10 @@
 	db 60 ; catch rate
 	db 67 ; base exp
 
-	INCBIN "gfx/pokemon/front/skimper.pic", 0, 1 ; sprite dimensions
-	dw SkimperPicFront, SkimperPicBack
+	INCBIN "gfx/pokemon/front/squeamata.pic", 0, 1 ; sprite dimensions
+	dw SqueamataPicFront, SqueamataPicBack
 
-	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
@@ -21,5 +21,5 @@
 	     SURF
 	; end
 
-	db BANK(SkimperPicFront)
-	assert BANK(SkimperPicFront) == BANK(SkimperPicBack)
+	db BANK(SqueamataPicFront)
+	assert BANK(SqueamataPicFront) == BANK(SqueamataPicBack)

data/pokemon/base_stats/tricules.asm

@@ -1,4 +1,4 @@
-	db DEX_PURAKKUSU ; pokedex id
+	db DEX_TRICULES ; pokedex id
 
 	db  65, 125, 140,  85,  55
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 25 ; catch rate
 	db 209 ; base exp
 
-	INCBIN "gfx/pokemon/front/purakkusu.pic", 0, 1 ; sprite dimensions
-	dw PurakkusuPicFront, PurakkusuPicBack
+	INCBIN "gfx/pokemon/front/tricules.pic", 0, 1 ; sprite dimensions
+	dw TriculesPicFront, TriculesPicBack
 
 	db VICEGRIP, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
@@ -20,5 +20,5 @@
 	     REST,         SUBSTITUTE,   CUT,          STRENGTH
 	; end
 
-	db BANK(PurakkusuPicFront)
-	assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack)
+	db BANK(TriculesPicFront)
+	assert BANK(TriculesPicFront) == BANK(TriculesPicBack)

data/pokemon/base_stats/vulpiii.asm

@@ -1,4 +1,4 @@
-	db DEX_MIKON ; pokedex id
+	db DEX_VULPIII ; pokedex id
 
 	db  28,  31,  30,  60,  60
 	;   hp  atk  def  spd  spc
@@ -7,8 +7,8 @@
 	db 255 ; catch rate
 	db 53 ; base exp
 
-	INCBIN "gfx/pokemon/front/mikon.pic", 0, 1 ; sprite dimensions
-	dw MikonPicFront, MikonPicBack
+	INCBIN "gfx/pokemon/front/vulpiii.pic", 0, 1 ; sprite dimensions
+	dw VulpiiiPicFront, VulpiiiPicBack
 
 	db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -19,5 +19,5 @@
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
-	db BANK(MikonPicFront)
-	assert BANK(MikonPicFront) == BANK(MikonPicBack)
+	db BANK(VulpiiiPicFront)
+	assert BANK(VulpiiiPicFront) == BANK(VulpiiiPicBack)

data/pokemon/base_stats/wigglytuff.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions
 	dw WigglytuffPicFront, WigglytuffPicBack
 
-	db SING, BODY_SLAM, HYPER_BEAM, BUBBLEBEAM ; level 1 learnset - used for trainers
+	db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset
 	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset