Evolutions sprites and a few other minor fixes

constants/pokemon_constants.asm

@@ -200,15 +200,15 @@
 	const MONJA              ; $C1	(new)
 	const PUDI               ; $C4	(new)
 	const SCIZOR             ; $C7	(new)
-	const RHYPERIOR          ; $C8  (dex expansion starts here)
+	const RHYPERIOR          ; $C8	(new)
-	const ESPEON             ; $C9
+	const ESPEON             ; $C9	(new)
-	const UMBREON            ; $CA
+	const UMBREON            ; $CA	(new)
-	const LEAFEON            ; $CB
+	const LEAFEON            ; $CB	(new)
-	const GLACEON            ; $CC
+	const GLACEON            ; $CC	(new)
-	const SYLVEON            ; $CD
+	const SYLVEON            ; $CD	(new)
-	const LICKILICKY         ; $D3
+	const LICKILICKY         ; $CD	(new)
-	const TANGROWTH          ; $D6
+	const TANGROWTH          ; $CE	(new)
-	const KLEAVOR            ; $DC
+	const KLEAVOR            ; $CF	(new)
 
 DEF NUM_POKEMON_INDEXES EQU const_value - 1
 

data/events/prize_mon_levels.asm

@@ -1,19 +1,19 @@
 PrizeMonLevelDictionary:
 IF DEF(_RED)
-	db CUBONE,      12
+	db CUBONE,     12
-	db CLEFAIRY,  12
+	db BLASTYKE,   12
-	db NIDORINA, 18
+	db CLEFAIRY,   18
 
-	db CACTUS,  25
+	db CACTUS,     25
-	db SCYTHER,  25
+	db SCYTHER,    25
-	db PORYGON,  30
+	db PORYGON,    30
 ENDC
 IF DEF(_BLUE)
-	db ABRA,      12
+	db CUBONE,     12
-	db CLEFAIRY, 12
+	db BLASTYKE,   12
-	db NIDORINO, 18
+	db JIGGLYPUFF, 18
 
-	db CACTUS,   25
+	db CACTUS,     25
-	db PINSIR,  25
+	db PINSIR,     25
-	db PORYGON,  30
+	db PORYGON,    30
 ENDC

data/events/prizes.asm

@@ -18,14 +18,8 @@ ENDC
 	db "@"
 
 PrizeMenuMon1Cost:
-IF DEF(_RED)
+	bcd2 200
-	bcd2 180
+	bcd2 700
-	bcd2 500
-ENDC
-IF DEF(_BLUE)
-	bcd2 120
-	bcd2 750
-ENDC
 	bcd2 1200
 	db "@"
 
@@ -41,16 +35,9 @@ ENDC
 	db "@"
 
 PrizeMenuMon2Cost:
-IF DEF(_RED)
 	bcd2 2500
 	bcd2 4600
 	bcd2 6500
-ENDC
-IF DEF(_BLUE)
-	bcd2 2500
-	bcd2 4600
-	bcd2 6500
-ENDC
 	db "@"
 
 PrizeMenuTMsEntries:

data/events/trades.asm

@@ -2,14 +2,14 @@ TradeMons:
 ; entries correspond to TRADE_FOR_* constants
 	table_width 3 + NAME_LENGTH, TradeMons
 	; give mon, get mon, dialog id, nickname
-	db NIDORINO,   NIDORINA,  TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@"
+	db POLIWHIRL,  JYNX,      TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Jynx trade replaces the useless Nidorino one 
 	db ABRA,       MR_MIME,   TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
 	db BUTTERFREE, BEEDRILL,  TRADE_DIALOGSET_HAPPY,  "CHIKUCHIKU@"
 	db PONYTA,     SEEL,      TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@"
 	db SPEAROW,    FARFETCHD, TRADE_DIALOGSET_HAPPY,  "DUX@@@@@@@@"
 	db SLOWBRO,    LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@"
-	db POLIWHIRL,  JYNX,      TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@"
+	db MACHOKE,    HAUNTER,   TRADE_DIALOGSET_POLITE, "GHOSUKE@@@@" ; From JP Blue
-	db RAICHU,     ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@"
+	db KADABRA,    GRAVELER,  TRADE_DIALOGSET_POLITE, "SABURO@@@@@" ; From JP Blue
 	db VENONAT,    TANGELA,   TRADE_DIALOGSET_HAPPY,  "CRINKLES@@@"
 	db NIDORAN_M,  NIDORAN_F, TRADE_DIALOGSET_HAPPY,  "SPOT@@@@@@@"
 	assert_table_length NUM_NPC_TRADES

data/pokemon/base_stats/kleavor.asm

@@ -5,10 +5,10 @@
 
 	db BUG, ROCK ; type
 	db 45 ; catch rate
-	db 187 ; base exp
+	db 204 ; base exp
 
-	INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/kleavor.pic", 0, 1 ; sprite dimensions
-	dw ScytherPicFront, ScytherPicBack
+	dw KleavorPicFront, KleavorPicBack
 
 	db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -19,5 +19,5 @@
 	     SKULL_BASH,   REST,         ROCK_SLIDE,   SUBSTITUTE,   CUT
 	; end
 
-	db BANK(ScytherPicFront)
+	db BANK(KleavorPicFront)
-	assert BANK(ScytherPicFront) == BANK(ScytherPicBack)
+	assert BANK(KleavorPicFront) == BANK(KleavorPicBack)

data/pokemon/base_stats/lickilicky.asm

@@ -1,14 +1,14 @@
 	db DEX_LICKILICKY ; pokedex id
 
-	db 110,  85,  55,  50,  80
+	db 110,  85,  95,  50,  80
 	;   hp  atk  def  spd  spc
 
 	db NORMAL, NORMAL ; type
-	db 45 ; catch rate
+	db 30 ; catch rate
-	db 127 ; base exp
+	db 193 ; base exp
 
-	INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions
-	dw LickitungPicFront, LickitungPicBack
+	dw LickilickyPicFront, LickilickyPicBack
 
 	db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -22,5 +22,5 @@
 	     REST,         SUBSTITUTE,   CUT,          SURF,         STRENGTH
 	; end
 
-	db BANK(LickitungPicFront)
+	db BANK(LickilickyPicFront)
-	assert BANK(LickitungPicFront) == BANK(LickitungPicBack)
+	assert BANK(LickilickyPicFront) == BANK(LickilickyPicBack)

data/pokemon/base_stats/tangrowth.asm

@@ -4,11 +4,11 @@
 	;   hp  atk  def  spd  spc
 
 	db GRASS, GRASS ; type
-	db 45 ; catch rate
+	db 30 ; catch rate
-	db 166 ; base exp
+	db 211 ; base exp
 
-	INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions
-	dw TangelaPicFront, TangelaPicBack
+	dw TangrowthPicFront, TangrowthPicBack
 
 	db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -16,10 +16,10 @@
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   SWORDS_DANCE, TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
 	     DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
-		 RAGE,         MEGA_DRAIN,   SOLARBEAM,    EARTHQUAKE,   FISSURE,      \
+	     RAGE,         MEGA_DRAIN,   SOLARBEAM,    EARTHQUAKE,   FISSURE,      \
-		 MIMIC,        DOUBLE_TEAM,  BIDE,         SKULL_BASH,   REST,         \
+	     MIMIC,        DOUBLE_TEAM,  BIDE,         SKULL_BASH,   REST,         \
-		 ROCK_SLIDE,   SUBSTITUTE,   CUT
+	     ROCK_SLIDE,   SUBSTITUTE,   CUT
 	; end
 
-	db BANK(TangelaPicFront)
+	db BANK(TangrowthPicFront)
-	assert BANK(TangelaPicFront) == BANK(TangelaPicBack)
+	assert BANK(TangrowthPicFront) == BANK(TangrowthPicBack)

gfx/pics.asm

@@ -410,12 +410,12 @@ MadaamuPicFront::      INCBIN "gfx/pokemon/front/madaamu.pic"
 MadaamuPicBack::       INCBIN "gfx/pokemon/back/madaamub.pic"
 PurakkusuPicFront::    INCBIN "gfx/pokemon/front/purakkusu.pic"
 PurakkusuPicBack::     INCBIN "gfx/pokemon/back/purakkusub.pic"
-TsubomittoPicFront::   INCBIN "gfx/pokemon/front/tsubomitto.pic"
-TsubomittoPicBack::    INCBIN "gfx/pokemon/back/tsubomittob.pic"
-AnimonPicFront::       INCBIN "gfx/pokemon/front/animon.pic"
-AnimonPicBack::        INCBIN "gfx/pokemon/back/animonb.pic"
 MonjaPicFront::        INCBIN "gfx/pokemon/front/monja.pic"
 MonjaPicBack::         INCBIN "gfx/pokemon/back/monjab.pic"
+TangrowthPicFront::    INCBIN "gfx/pokemon/front/tangrowth.pic"
+TangrowthPicBack::     INCBIN "gfx/pokemon/back/tangrowthb.pic"
+LickilickyPicFront::   INCBIN "gfx/pokemon/front/lickilicky.pic"
+LickilickyPicBack::    INCBIN "gfx/pokemon/back/lickilickyb.pic"
 
 SECTION "Pics 8", ROMX
 
@@ -455,20 +455,14 @@ GyaoonPicFront::       INCBIN "gfx/pokemon/front/gyaoon.pic"
 GyaoonPicBack::        INCBIN "gfx/pokemon/back/gyaoonb.pic"
 OmegaPicFront::        INCBIN "gfx/pokemon/front/omega.pic"
 OmegaPicBack::         INCBIN "gfx/pokemon/back/omegab.pic"
-ParaPicFront::         INCBIN "gfx/pokemon/front/para.pic"
-ParaPicBack::          INCBIN "gfx/pokemon/back/parab.pic"
-HinaazuPicFront::      INCBIN "gfx/pokemon/front/hinaazu.pic"
-HinaazuPicBack::       INCBIN "gfx/pokemon/back/hinaazub.pic"
 PudiPicFront::         INCBIN "gfx/pokemon/front/pudi.pic"
 PudiPicBack::          INCBIN "gfx/pokemon/back/pudib.pic"
-BetobebiiPicFront::    INCBIN "gfx/pokemon/front/betobebii.pic"
-BetobebiiPicBack::     INCBIN "gfx/pokemon/back/betobebiib.pic"
-BellossomPicFront::    INCBIN "gfx/pokemon/front/bellossom.pic"
-BellossomPicBack::     INCBIN "gfx/pokemon/back/bellossomb.pic"
 ScizorPicFront::       INCBIN "gfx/pokemon/front/scizor.pic"
 ScizorPicBack::        INCBIN "gfx/pokemon/back/scizorb.pic"
 RhyperiorPicFront::    INCBIN "gfx/pokemon/front/rhyperior.pic"
 RhyperiorPicBack::     INCBIN "gfx/pokemon/back/rhyperiorb.pic"
+KleavorPicFront::      INCBIN "gfx/pokemon/front/kleavor.pic"
+KleavorPicBack::       INCBIN "gfx/pokemon/back/kleavorb.pic"
 
 FossilKabutopsPic::   INCBIN "gfx/pokemon/front/fossilkabutops.pic"
 FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
@@ -486,15 +480,3 @@ GlaceonPicFront::      INCBIN "gfx/pokemon/front/glaceon.pic"
 GlaceonPicBack::       INCBIN "gfx/pokemon/back/glaceonb.pic"
 SylveonPicFront::      INCBIN "gfx/pokemon/front/sylveon.pic"
 SylveonPicBack::       INCBIN "gfx/pokemon/back/sylveonb.pic"
-CrobatPicFront::       INCBIN "gfx/pokemon/front/crobat.pic"
-CrobatPicBack::        INCBIN "gfx/pokemon/back/crobatb.pic"
-PolitoedPicFront::     INCBIN "gfx/pokemon/front/politoed.pic"
-PolitoedPicBack::      INCBIN "gfx/pokemon/back/politoedb.pic"
-SlowkingPicFront::     INCBIN "gfx/pokemon/front/slowking.pic"
-SlowkingPicBack::      INCBIN "gfx/pokemon/back/slowkingb.pic"
-SteelixPicFront::      INCBIN "gfx/pokemon/front/steelix.pic"
-SteelixPicBack::       INCBIN "gfx/pokemon/back/steelixb.pic"
-HitmontopPicFront::    INCBIN "gfx/pokemon/front/hitmontop.pic"
-HitmontopPicBack::     INCBIN "gfx/pokemon/back/hitmontopb.pic"
-BlisseyPicFront::      INCBIN "gfx/pokemon/front/blissey.pic"
-BlisseyPicBack::       INCBIN "gfx/pokemon/back/blisseyb.pic"