New Mons

Adds Blissey, Hitmontop, Steelix, Crobat, Politoed and Slowking. Remnants for Porygon2, Lickilicky, Kingdra and Magnezone can be seen but are currently non functional due to wram space.

constants/pokedex_constants.asm

@@ -50,6 +50,7 @@
 	const DEX_BITTYBAT
 	const DEX_ZUBAT      ; 41
 	const DEX_GOLBAT     ; 42
+	const DEX_CROBAT
 	const DEX_ODDISH     ; 43
 	const DEX_GLOOM      ; 44
 	const DEX_VILEPLUME  ; 45
@@ -79,6 +80,7 @@
 	const DEX_POLIWAG    ; 60
 	const DEX_POLIWHIRL  ; 61
 	const DEX_POLIWRATH  ; 62
+	const DEX_POLITOED
 	const DEX_ABRA       ; 63
 	const DEX_KADABRA    ; 64
 	const DEX_ALAKAZAM   ; 65
@@ -101,9 +103,11 @@
 	const DEX_RAPIDASH   ; 78
 	const DEX_SLOWPOKE   ; 79
 	const DEX_SLOWBRO    ; 80
+	const DEX_SLOWKING
 	const DEX_MAGNEMITE  ; 81
 	const DEX_MAGNETITE
 	const DEX_MAGNETON   ; 82
+;	const DEX_MAGNEZONE
 	const DEX_BARUNDA 
 	const DEX_FARFETCHD  ; 83 
 	const DEX_MADAAMU    
@@ -123,6 +127,7 @@
 	const DEX_HAUNTER    ; 93
 	const DEX_GENGAR     ; 94
 	const DEX_ONIX       ; 95
+	const DEX_STEELIX
 	const DEX_DROWZEE    ; 96
 	const DEX_HYPNO      ; 97
 	const DEX_KOTORA
@@ -143,13 +148,16 @@
 	const DEX_KANGASKHAN ; 115
 	const DEX_HITMONLEE  ; 106
 	const DEX_HITMONCHAN ; 107
+	const DEX_HITMONTOP
 	const DEX_LICKITUNG  ; 108
+;	const DEX_LICKILICKY
 	const DEX_KOFFING    ; 109
 	const DEX_WEEZING    ; 110
 	const DEX_RHYHORN    ; 111
 	const DEX_RHYDON     ; 112
 	const DEX_RHYPERIOR
 	const DEX_CHANSEY    ; 113
+	const DEX_BLISSEY
 	const DEX_MONJA
 	const DEX_TANGELA    ; 114 
 	const DEX_DECILLA   
@@ -157,6 +165,7 @@
 	const DEX_OMEGA      
 	const DEX_HORSEA     ; 116
 	const DEX_SEADRA     ; 117
+;	const DEX_KINGDRA
 	const DEX_GYOPIN
 	const DEX_GOLDEEN    ; 118
 	const DEX_SEAKING    ; 119
@@ -192,6 +201,7 @@
 	const DEX_GLACEON
 	const DEX_SYLVEON
 	const DEX_PORYGON    ; 137
+;	const DEX_PORYGON2
 	const DEX_OMANYTE    ; 138
 	const DEX_OMASTAR    ; 139
 	const DEX_KABUTO     ; 140

constants/pokemon_constants.asm

@@ -212,19 +212,19 @@
 	const LEAFEON            ; $CB
 	const GLACEON            ; $CC
 	const SYLVEON            ; $CD
-;	const CROBAT             ; $CE
+	const CROBAT             ; $CE
-;	const POLITOED           ; $CF
+	const POLITOED           ; $CF
-;	const SLOWKING           ; $D0
+	const SLOWKING           ; $D0
-;	const MAGNEZONE          ; $D1
+	const STEELIX            ; $D1
-;	const HITMONTOP          ; $D2
+	const HITMONTOP          ; $D2
+	const BLISSEY            ; $D3
+;	const PORYGON2           ; $D4
+;	const KINGDRA            ; $D5
 ;	const LICKILICKY         ; $D3
-;	const STEELIX            ; $D4
+;	const MAGNEZONE          ; $D4
-;	const BLISSEY            ; $D5
 ;	const TANGROWTH          ; $D6
-;	const KINGDRA            ; $D7
 ;	const ELECTIVIRE         ; $D8
 ;	const MAGMORTAR          ; $D9
-;	const PORYGON2           ; $DA
 ;	const PORYGON-Z          ; $DB
 ;	const KLEAVOR            ; $DC
 ;	const SIRFETCHD          ; $DD

data/pokemon/base_stats.asm

@@ -46,6 +46,7 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
 INCLUDE "data/pokemon/base_stats/bittybat.asm"
 INCLUDE "data/pokemon/base_stats/zubat.asm"
 INCLUDE "data/pokemon/base_stats/golbat.asm"
+INCLUDE "data/pokemon/base_stats/crobat.asm"
 INCLUDE "data/pokemon/base_stats/oddish.asm"
 INCLUDE "data/pokemon/base_stats/gloom.asm"
 INCLUDE "data/pokemon/base_stats/vileplume.asm"
@@ -75,6 +76,7 @@ INCLUDE "data/pokemon/base_stats/arcanine.asm"
 INCLUDE "data/pokemon/base_stats/poliwag.asm"
 INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
 INCLUDE "data/pokemon/base_stats/poliwrath.asm"
+INCLUDE "data/pokemon/base_stats/politoed.asm"
 INCLUDE "data/pokemon/base_stats/abra.asm"
 INCLUDE "data/pokemon/base_stats/kadabra.asm"
 INCLUDE "data/pokemon/base_stats/alakazam.asm"
@@ -97,9 +99,11 @@ INCLUDE "data/pokemon/base_stats/ponyta.asm"
 INCLUDE "data/pokemon/base_stats/rapidash.asm"
 INCLUDE "data/pokemon/base_stats/slowpoke.asm"
 INCLUDE "data/pokemon/base_stats/slowbro.asm"
+INCLUDE "data/pokemon/base_stats/slowking.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
 INCLUDE "data/pokemon/base_stats/magnetite.asm"
 INCLUDE "data/pokemon/base_stats/magneton.asm"
+;INCLUDE "data/pokemon/base_stats/magnezone.asm"
 INCLUDE "data/pokemon/base_stats/barunda.asm"
 INCLUDE "data/pokemon/base_stats/farfetchd.asm"
 INCLUDE "data/pokemon/base_stats/madaamu.asm"
@@ -119,6 +123,7 @@ INCLUDE "data/pokemon/base_stats/gastly.asm"
 INCLUDE "data/pokemon/base_stats/haunter.asm"
 INCLUDE "data/pokemon/base_stats/gengar.asm"
 INCLUDE "data/pokemon/base_stats/onix.asm"
+INCLUDE "data/pokemon/base_stats/steelix.asm"
 INCLUDE "data/pokemon/base_stats/drowzee.asm"
 INCLUDE "data/pokemon/base_stats/hypno.asm"
 INCLUDE "data/pokemon/base_stats/kotora.asm"
@@ -139,13 +144,16 @@ INCLUDE "data/pokemon/base_stats/guardia.asm"
 INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
+INCLUDE "data/pokemon/base_stats/hitmontop.asm"
 INCLUDE "data/pokemon/base_stats/lickitung.asm"
+;INCLUDE "data/pokemon/base_stats/lickilicky.asm"
 INCLUDE "data/pokemon/base_stats/koffing.asm"
 INCLUDE "data/pokemon/base_stats/weezing.asm"
 INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
 INCLUDE "data/pokemon/base_stats/rhydon.asm"
 INCLUDE "data/pokemon/base_stats/rhyperior.asm"
 INCLUDE "data/pokemon/base_stats/chansey.asm"
+INCLUDE "data/pokemon/base_stats/blissey.asm"
 INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
 INCLUDE "data/pokemon/base_stats/decilla.asm"
@@ -153,6 +161,7 @@ INCLUDE "data/pokemon/base_stats/gyaoon.asm"
 INCLUDE "data/pokemon/base_stats/omega.asm"
 INCLUDE "data/pokemon/base_stats/horsea.asm"
 INCLUDE "data/pokemon/base_stats/seadra.asm"
+;INCLUDE "data/pokemon/base_stats/kingdra.asm"
 INCLUDE "data/pokemon/base_stats/gyopin.asm"
 INCLUDE "data/pokemon/base_stats/goldeen.asm"
 INCLUDE "data/pokemon/base_stats/seaking.asm"
@@ -188,6 +197,7 @@ INCLUDE "data/pokemon/base_stats/leafeon.asm"
 INCLUDE "data/pokemon/base_stats/glaceon.asm"
 INCLUDE "data/pokemon/base_stats/sylveon.asm"
 INCLUDE "data/pokemon/base_stats/porygon.asm"
+;INCLUDE "data/pokemon/base_stats/porygon2.asm"
 INCLUDE "data/pokemon/base_stats/omanyte.asm"
 INCLUDE "data/pokemon/base_stats/omastar.asm"
 INCLUDE "data/pokemon/base_stats/kabuto.asm"

data/pokemon/base_stats/blissey.asm

@@ -0,0 +1,28 @@
+	db DEX_BLISSEY ; pokedex id
+
+	db 250,   5,   5,  50, 105
+	;   hp  atk  def  spd  spc
+
+	db NORMAL, NORMAL ; type
+	db 30 ; catch rate
+	db 255 ; base exp
+
+	INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions
+	dw ChanseyPicFront, ChanseyPicBack
+
+	db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     SOLARBEAM,    THUNDERBOLT,  THUNDER,      PSYCHIC_M,    TELEPORT,     \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         METRONOME,    \
+	     EGG_BOMB,     FIRE_BLAST,   SKULL_BASH,   SOFTBOILED,   REST,         \
+	     THUNDER_WAVE, PSYWAVE,      TRI_ATTACK,   SUBSTITUTE,   STRENGTH,     \
+	     FLASH
+	; end
+
+	db BANK(ChanseyPicFront)
+	assert BANK(ChanseyPicFront) == BANK(ChanseyPicBack)

data/pokemon/base_stats/crobat.asm

@@ -0,0 +1,23 @@
+	db DEX_CROBAT ; pokedex id
+
+	db  75,  80,  70,  90,  75
+	;   hp  atk  def  spd  spc
+
+	db POISON, FLYING ; type
+	db 90 ; catch rate
+	db 171 ; base exp
+
+	INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions
+	dw GolbatPicFront, GolbatPicBack
+
+	db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
+	     HYPER_BEAM,   RAGE,         MEGA_DRAIN,   MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SWIFT,        REST,         SUBSTITUTE
+	; end
+
+	db BANK(GolbatPicFront)
+	assert BANK(GolbatPicFront) == BANK(GolbatPicBack)

data/pokemon/base_stats/hitmontop.asm

@@ -0,0 +1,24 @@
+	db DEX_HITMONTOP ; pokedex id
+
+	db  50, 120,  53,  87,  35
+	;   hp  atk  def  spd  spc
+
+	db FIGHTING, FIGHTING ; type
+	db 45 ; catch rate
+	db 139 ; base exp
+
+	INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions
+	dw HitmonleePicFront, HitmonleePicBack
+
+	db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     MIMIC,        DOUBLE_TEAM,  BIDE,         METRONOME,    SWIFT,        \
+	     SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
+	; end
+
+	db BANK(HitmonleePicFront)
+	assert BANK(HitmonleePicFront) == BANK(HitmonleePicBack)

data/pokemon/base_stats/politoed.asm

@@ -0,0 +1,26 @@
+	db DEX_POLITOED ; pokedex id
+
+	db  90,  85,  95,  70,  70
+	;   hp  atk  def  spd  spc
+
+	db WATER, FIGHTING ; type
+	db 45 ; catch rate
+	db 185 ; base exp
+
+	INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions
+	dw PoliwrathPicFront, PoliwrathPicBack
+
+	db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset
+	db GROWTH_MEDIUM_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     EARTHQUAKE,   FISSURE,      PSYCHIC_M,    MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         METRONOME,    SKULL_BASH,   REST,         PSYWAVE,      \
+	     SUBSTITUTE,   SURF,         STRENGTH
+	; end
+
+	db BANK(PoliwrathPicFront)
+	assert BANK(PoliwrathPicFront) == BANK(PoliwrathPicBack)

data/pokemon/base_stats/slowking.asm

@@ -0,0 +1,28 @@
+	db DEX_SLOWKING ; pokedex id
+
+	db  95,  75, 110,  30,  80
+	;   hp  atk  def  spd  spc
+
+	db WATER, PSYCHIC_TYPE ; type
+	db 75 ; catch rate
+	db 164 ; base exp
+
+	INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions
+	dw SlowbroPicFront, SlowbroPicBack
+
+	db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     HYPER_BEAM,   PAY_DAY,      SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         EARTHQUAKE,   FISSURE,      DIG,          PSYCHIC_M,    \
+	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
+	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         THUNDER_WAVE, \
+	     PSYWAVE,      TRI_ATTACK,   SUBSTITUTE,   SURF,         STRENGTH,     \
+	     FLASH
+	; end
+
+	db BANK(SlowbroPicFront)
+	assert BANK(SlowbroPicFront) == BANK(SlowbroPicBack)

data/pokemon/base_stats/steelix.asm

@@ -0,0 +1,24 @@
+	db DEX_STEELIX ; pokedex id
+
+	db  35,  45, 160,  70,  30
+	;   hp  atk  def  spd  spc
+
+	db ROCK, GROUND ; type
+	db 45 ; catch rate
+	db 108 ; base exp
+
+	INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions
+	dw OnixPicFront, OnixPicBack
+
+	db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \
+	     EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SELFDESTRUCT, SKULL_BASH,   REST,         EXPLOSION,    \
+	     ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
+	; end
+
+	db BANK(OnixPicFront)
+	assert BANK(OnixPicFront) == BANK(OnixPicBack)

data/pokemon/cries.asm

@@ -211,4 +211,14 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Leafeon
 	mon_cry SFX_CRY_00, $00, $00 ; Glaceon
 	mon_cry SFX_CRY_00, $00, $00 ; Sylveon
+	mon_cry SFX_CRY_00, $00, $00 ; Crobat
+	mon_cry SFX_CRY_00, $00, $00 ; Politoed
+	mon_cry SFX_CRY_00, $00, $00 ; Slowking
+	mon_cry SFX_CRY_00, $00, $00 ; Steelix
+	mon_cry SFX_CRY_00, $00, $00 ; Hitmontop
+	mon_cry SFX_CRY_00, $00, $00 ; Blissey
+;	mon_cry SFX_CRY_00, $00, $00 ; Porygon2
+;	mon_cry SFX_CRY_00, $00, $00 ; Kingdra
+;	mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
+;	mon_cry SFX_CRY_00, $00, $00 ; Magnezone
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/dex_entries.asm

@@ -205,6 +205,16 @@ PokedexEntryPointers:
 	dw LeafeonDexEntry
 	dw GlaceonDexEntry
 	dw SylveonDexEntry
+	dw CrobatDexEntry
+	dw PolitoedDexEntry
+	dw SlowkingDexEntry
+	dw SteelixDexEntry
+	dw HitmontopDexEntry
+	dw BlisseyDexEntry
+;	dw Porygon2DexEntry
+;	dw KingdraDexEntry
+;	dw LickilickyDexEntry
+;	dw MagnezoneDexEntry
 	assert_table_length NUM_POKEMON_INDEXES
 
 ; string: species name
@@ -1598,3 +1608,72 @@ SylveonDexEntry:
 	text_far _SylveonDexEntry
 	text_end 
 	
+CrobatDexEntry:
+    db "BAT@"
+	db 5,11
+	dw 1653
+	text_far _CrobatDexEntry
+	text_end 
+	
+PolitoedDexEntry:
+    db "FROG@"
+	db 3,7
+	dw 747
+	text_far _PolitoedDexEntry
+	text_end 
+	
+SlowkingDexEntry:
+    db "ROYAL@"
+	db 6,7
+	dw 1753
+	text_far _SlowkingDexEntry
+	text_end 
+	
+SteelixDexEntry:
+    db "IRON SNAKE@"
+	db 30,2
+	dw 8818
+	text_far _SteelixDexEntry
+	text_end 
+	
+HitmontopDexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _HitmontopDexEntry
+	text_end 
+
+BlisseyDexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _BlisseyDexEntry
+	text_end
+
+Porygon2DexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _Porygon2DexEntry
+	text_end
+	
+KingdraDexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _KingdraDexEntry
+	text_end
+	
+LickilickyDexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _LickilickyDexEntry
+	text_end
+	
+MagnezoneDexEntry:
+    db "HANDSTAND@"
+	db 4,7
+	dw 1058
+	text_far _MagnezoneDexEntry
+	text_end

data/pokemon/dex_order.asm

@@ -205,4 +205,14 @@ PokedexOrder:
 	db DEX_LEAFEON
 	db DEX_GLACEON
 	db DEX_SYLVEON
+	db DEX_CROBAT
+	db DEX_POLITOED
+	db DEX_SLOWKING
+	db DEX_STEELIX
+	db DEX_HITMONTOP
+	db DEX_BLISSEY
+;	db DEX_PORYGON2
+;	db DEX_KINGDRA
+;	db DEX_LICKILICKY
+;	db DEX_MAGNEZONE
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/evos_moves.asm

@@ -208,6 +208,16 @@ EvosMovesPointerTable:
 	dw LeafeonEvosMoves
 	dw GlaceonEvosMoves
 	dw SylveonEvosMoves
+	dw CrobatEvosMoves
+	dw PolitoedEvosMoves
+	dw SlowkingEvosMoves
+	dw SteelixEvosMoves
+	dw HitmontopEvosMoves
+	dw BlisseyEvosMoves
+;	dw Porygon2EvosMoves
+;	dw KingdraEvosMoves
+;	dw LickilickyEvosMoves
+;	dw MagnezoneEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
 RhydonEvosMoves:
@@ -2574,6 +2584,7 @@ EspeonEvosMoves:
 	db 37, TAIL_WHIP
 	db 42, TAKE_DOWN
 	db 52, PSYCHIC_M
+	db 0
 	
 UmbreonEvosMoves:
 ; Evolutions
@@ -2586,6 +2597,7 @@ UmbreonEvosMoves:
 	db 36, BITE ; should be Fake Tears but it hasn't been added yet
 	db 42, TAKE_DOWN
 	db 52, NIGHT_SLASH ; should be False Surrender but it hasn't been added yet
+	db 0
 	
 LeafeonEvosMoves:
 ; Evolutions
@@ -2598,6 +2610,7 @@ LeafeonEvosMoves:
 	db 36, RAZOR_LEAF
 	db 42, TAKE_DOWN
 	db 52, SOLARBEAM
+	db 0
 	
 GlaceonEvosMoves:
 ; Evolutions
@@ -2611,6 +2624,7 @@ GlaceonEvosMoves:
 	db 42, TAKE_DOWN
 	db 47, BLIZZARD
 	db 52, BARRIER
+	db 0
 	
 SylveonEvosMoves:
 ; Evolutions
@@ -2622,4 +2636,121 @@ SylveonEvosMoves:
 	db 30, DRAININGKISS
 	db 36, DAZZLE_GLEAM
 	db 42, TAKE_DOWN
-	db 52, DAZZLE_GLEAM ; PvK needs to fix this!!!!!!!!
+	db 0
+
+CrobatEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, GUST
+	db 10, SUPERSONIC
+	db 15, BITE
+	db 17, QUICK_ATTACK
+	db 21, CONFUSE_RAY
+	db 26, SLUDGE
+	db 32, WING_ATTACK
+	db 43, HAZE
+	db 50, AGILITY
+	db 0
+	
+PolitoedEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 0
+
+SlowkingEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, WATER_GUN
+	db 44, AMNESIA
+	db 55, PSYCHIC_M
+	db 0
+
+SteelixEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 8, IRON_DEFENSE
+	db 15, BIND
+	db 19, ROCK_THROW
+	db 25, RAGE
+	db 33, SLAM
+	db 38, IRON_HEAD
+	db 43, HARDEN
+	db 0
+
+HitmontopEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, FOCUS_ENERGY
+	db 33, QUICK_ATTACK
+	db 38, COUNTER
+	db 43, AGILITY
+	db 48, JUMP_KICK
+	db 53, DOUBLE_KICK
+	db 0
+
+BlisseyEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, DOUBLESLAP
+	db 24, SING
+	db 30, GROWL
+	db 38, MINIMIZE
+	db 44, DEFENSE_CURL
+	db 48, LIGHT_SCREEN
+	db 54, DOUBLE_EDGE
+	db 0
+	
+Porygon2EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 23, PSYBEAM
+	db 28, RECOVER
+	db 35, AGILITY
+	db 42, TRI_ATTACK
+	db 0
+	
+KingdraEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 19, SMOKESCREEN
+	db 24, LEER
+	db 30, WATER_GUN
+	db 41, AGILITY
+	db 52, HYDRO_PUMP
+	db 0
+
+LickilickyEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, STOMP
+	db 15, DISABLE
+	db 23, DEFENSE_CURL
+	db 31, SLAM
+	db 39, SCREECH
+	db 0
+
+MagnezoneEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 21, SONICBOOM
+	db 25, THUNDERSHOCK
+	db 29, SUPERSONIC
+	db 38, THUNDER_WAVE
+	db 46, SWIFT
+	db 54, SCREECH
+	db 0

data/pokemon/menu_icons.asm

@@ -46,6 +46,7 @@ MonPartyData:
 	nybble ICON_MON       ; Bittybat
 	nybble ICON_MON       ; Zubat
 	nybble ICON_MON       ; Golbat
+	nybble ICON_MON       ; Crobat
 	nybble ICON_GRASS     ; Oddish
 	nybble ICON_GRASS     ; Gloom
 	nybble ICON_GRASS     ; Vileplume
@@ -75,6 +76,7 @@ MonPartyData:
 	nybble ICON_MON       ; Poliwag
 	nybble ICON_MON       ; Poliwhirl
 	nybble ICON_MON       ; Poliwrath
+	nybble ICON_MON       ; Politoed
 	nybble ICON_MON       ; Abra
 	nybble ICON_MON       ; Kadabra
 	nybble ICON_MON       ; Alakazam
@@ -97,9 +99,11 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Rapidash
 	nybble ICON_QUADRUPED ; Slowpoke
 	nybble ICON_MON       ; Slowbro
+	nybble ICON_MON       ; Slowking
 	nybble ICON_BALL      ; Magnemite
 	nybble ICON_BALL      ; Magnetite
 	nybble ICON_BALL      ; Magneton
+;	nybble ICON_BALL      ; Magnezone
 	nybble ICON_BALL      ; Barunda
 	nybble ICON_BIRD      ; Farfetch'd
 	nybble ICON_BIRD	    ; Madaamu
@@ -119,6 +123,7 @@ MonPartyData:
 	nybble ICON_MON       ; Haunter
 	nybble ICON_MON       ; Gengar
 	nybble ICON_SNAKE     ; Onix
+	nybble ICON_SNAKE     ; Steelix
 	nybble ICON_MON       ; Drowzee
 	nybble ICON_MON       ; Hypno
 	nybble ICON_QUADRUPED ; Kotora
@@ -139,13 +144,16 @@ MonPartyData:
 	nybble ICON_MON	    ; Kangaskhan
 	nybble ICON_MON       ; Hitmonlee
 	nybble ICON_MON       ; Hitmonchan
+	nybble ICON_MON       ; Hitmontop
 	nybble ICON_MON       ; Lickitung
+;	nybble ICON_MON       ; Lickilicky
 	nybble ICON_MON       ; Koffing
 	nybble ICON_MON       ; Weezing
 	nybble ICON_QUADRUPED ; Rhyhorn
 	nybble ICON_MON       ; Rhydon
 	nybble ICON_MON       ; Rhyperior
 	nybble ICON_FAIRY     ; Chansey
+	nybble ICON_FAIRY     ; Blissey
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
 	nybble ICON_MON	    ; Decilla
@@ -153,6 +161,7 @@ MonPartyData:
 	nybble ICON_MON	    ; Omega
 	nybble ICON_WATER     ; Horsea
 	nybble ICON_WATER     ; Seadra
+;	nybble ICON_WATER     ; Kingdra
 	nybble ICON_WATER     ; Gyopin
 	nybble ICON_WATER     ; Goldeen
 	nybble ICON_WATER     ; Seaking
@@ -188,6 +197,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Glaceon
 	nybble ICON_QUADRUPED ; Sylveon
 	nybble ICON_MON       ; Porygon
+;	nybble ICON_MON       ; Porygon2
 	nybble ICON_HELIX     ; Omanyte
 	nybble ICON_HELIX     ; Omastar
 	nybble ICON_HELIX     ; Kabuto

data/pokemon/names.asm

@@ -205,4 +205,14 @@ MonsterNames::
 	db "LEAFEON@@@"
 	db "GLACEON@@@"
 	db "SYLVEON@@@"
+	db "CROBAT@@@@"
+	db "POLITOED@@"
+	db "SLOWKING@@"
+	db "STEELIX@@@"
+	db "HITMONTOP@"
+	db "BLISSEY@@@"
+;	db "PORYGON2@@"
+;	db "KINGDRA@@@"
+;	db "LICKILICKY"
+;	db "MAGNEZONE@"
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/new_dex_text.asm

@@ -508,6 +508,106 @@ _SylveonDexEntry::
 	next "hostile emotions"
 	dex
 
+_CrobatDexEntry::
+	text "It flies silently"
+	next "through the dark"
+	next "on its four wings."
+
+	page "It is often not"
+	next "noticed even"
+	next "when nearby"
+	dex
+
+_PolitoedDexEntry::
+	text "Whenever three or"
+	next "more of these get"
+	next "together, they"
+
+	page "sing in a loud"
+	next "voice that sounds"
+	next "like bellowing"
+	dex
+
+_SlowkingDexEntry::
+	text "Every time it"
+	next "yawns, SHELLDER"
+	next "injects more"
+
+	page "poison into it,"
+	next "which makes it"
+	next "more intelligent"
+	dex
+
+_SteelixDexEntry::
+	text "The many small"
+	next "metal particles"
+	next "that love this"
+
+	page "@MON's body"
+	next "reflect bright"
+	next "light well"
+	dex
+
+_HitmontopDexEntry::
+	text "After doing a"
+	next "handstand to"
+	next "throw off the"
+
+	page "opponent's timing"
+	next "it presents its"
+	next "fancy kick moves"
+	dex
+	
+_BlisseyDexEntry::
+	text "Anyone who takes"
+	next "a bite of its"
+	next "egg becomes"
+
+	page "unfaillingly"
+	next "caring and"
+	next "pleasant to all"
+	dex
+
+_Porygon2DexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+	
+_KingdraDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+	
+_LickilickyDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+	
+_MagnezoneDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
 _MissingNoDexEntry::
 	text "This is a newly"
 	next "discovered"

data/pokemon/palettes.asm

@@ -47,6 +47,7 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
+	db PAL_BLUEMON   ; CROBAT
 	db PAL_GREENMON  ; ODDISH
 	db PAL_REDMON    ; GLOOM
 	db PAL_REDMON    ; VILEPLUME
@@ -76,6 +77,7 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; POLIWAG
 	db PAL_BLUEMON   ; POLIWHIRL
 	db PAL_BLUEMON   ; POLIWRATH
+	db PAL_GREENMON  ; POLITOED
 	db PAL_YELLOWMON ; ABRA
 	db PAL_YELLOWMON ; KADABRA
 	db PAL_YELLOWMON ; ALAKAZAM
@@ -98,9 +100,11 @@ MonsterPalettes:
 	db PAL_REDMON    ; RAPIDASH
 	db PAL_PINKMON   ; SLOWPOKE
 	db PAL_PINKMON   ; SLOWBRO
+	db PAL_PINKMON   ; SLOWKING
 	db PAL_GREYMON   ; MAGNEMITE
 	db PAL_GREYMON   ; MAGNETITE
 	db PAL_GREYMON   ; MAGNETON
+;	db PAL_GREYMON   ; MAGNEZONE
 	db PAL_PINKMON   ; BARUNDA
 	db PAL_BROWNMON  ; FARFETCHD
 	db PAL_BROWNMON  ; MADAAMU
@@ -120,6 +124,7 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; HAUNTER
 	db PAL_PURPLEMON ; GENGAR
 	db PAL_GREYMON   ; ONIX
+	db PAL_GREYMON   ; STEELIX
 	db PAL_YELLOWMON ; DROWZEE
 	db PAL_YELLOWMON ; HYPNO
 	db PAL_YELLOWMON ; KOTORA
@@ -140,13 +145,16 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; KANGASKHAN
 	db PAL_BROWNMON  ; HITMONLEE
 	db PAL_BROWNMON  ; HITMONCHAN
+	db PAL_BROWNMON  ; HITMONTOP
 	db PAL_PINKMON   ; LICKITUNG
+;	db PAL_PINKMON   ; LICKILICKY
 	db PAL_PURPLEMON ; KOFFING
 	db PAL_PURPLEMON ; WEEZING
 	db PAL_GREYMON   ; RHYHORN
 	db PAL_GREYMON   ; RHYDON
 	db PAL_BROWNMON  ; RHYPERIOR
 	db PAL_PINKMON   ; CHANSEY
+	db PAL_PINKMON   ; BLISSEY
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
 	db PAL_GREENMON  ; DECILLA
@@ -154,6 +162,7 @@ MonsterPalettes:
 	db PAL_GREYMON   ; OMEGA
 	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
+;	db PAL_CYANMON   ; KINGDRA
 	db PAL_REDMON    ; GYOPIN
 	db PAL_REDMON    ; GOLDEEN
 	db PAL_REDMON    ; SEAKING
@@ -189,6 +198,7 @@ MonsterPalettes:
 	db PAL_CYANMON   ; GLACEON
 	db PAL_MEWMON    ; SYLVEON
 	db PAL_MEWMON    ; PORYGON
+;	db PAL_MEWMON    ; PORYGON2
 	db PAL_BLUEMON   ; OMANYTE
 	db PAL_BLUEMON   ; OMASTAR
 	db PAL_BROWNMON  ; KABUTO