Gambling, Breeding, and Ressurection: My Kinda Night

constants/item_constants.asm

@@ -181,7 +181,7 @@
 	const BERRY        ; ad
 	const GOLD_BERRY   ; ae
 	const SQUIRTBOTTLE ; af
-	const ITEM_B0      ; b0
+	const DUBIOUS_DISK ; b0
 	const PARK_BALL    ; b1
 	const RAINBOW_WING ; b2
 	const ITEM_B3      ; b3

constants/pokemon_constants.asm

@@ -139,6 +139,7 @@
 	const DODRIO     ; 55
 	const SEEL       ; 56
 	const DEWGONG    ; 57
+	const SMUJJ
 	const GRIMER     ; 58
 	const MUK        ; 59
 	const SHELLDER   ; 5a
@@ -158,6 +159,7 @@
 	const EXEGGUTOR  ; 67
 	const CUBONE     ; 68
 	const MAROWAK    ; 69
+	const GUARDIA
 	const HITMONLEE  ; 6a
 	const HITMONCHAN ; 6b
 	const LICKITUNG  ; 6c
@@ -167,6 +169,7 @@
 	const WEEZING    ; 6e
 	const RHYHORN    ; 6f
 	const RHYDON     ; 70
+	const HAPPINY
 	const CHANSEY    ; 71
 	const BURGELA
 	const TANGELA    ; 72
@@ -182,13 +185,16 @@
 	const SEAKING    ; 77
 	const STARYU     ; 78
 	const STARMIE    ; 79
+	const MIME_JR_
 	const MR__MIME   ; 7a
 	const SCYTHER    ; 7b
 	const KLEAVOR
 	const JYNX       ; 7c
 	const BUU
 	const ELECTABUZZ ; 7d
+	const ELECTIVIRE
 	const MAGMAR     ; 7e
+	const MAGMORTAR
 	const PINSIR     ; 7f
 	const TRICULES
 	const TAUROS     ; 80
@@ -198,6 +204,7 @@
 	const TERRADOS
 	const LAPRAS     ; 83
 	const DITTO      ; 84
+	const MIMMEO
 	const EEVEE      ; 85
 	const VAPOREON   ; 86
 	const JOLTEON    ; 87
@@ -207,12 +214,18 @@
 	const OMASTAR    ; 8b
 	const KABUTO     ; 8c
 	const KABUTOPS   ; 8d
+	const FERADACTYL
 	const AERODACTYL ; 8e
+	const DECILLA
+	const GAWARHED
 	const MUNCHLAX
 	const SNORLAX    ; 8f
 	const ARTICUNO   ; 90
 	const ZAPDOS     ; 91
 	const MOLTRES    ; 92
+	const SQUEAMATA
+	const MINISTARE
+	const IGUANARCH
 	const DRATINI    ; 93
 	const DRAGONAIR  ; 94
 	const DRAGONITE  ; 95
@@ -266,6 +279,7 @@ DEF JOHTO_POKEMON EQU const_value
 	const AZURILL
 	const MARILL     ; b7
 	const AZUMARILL  ; b8
+	const BONSLY
 	const SUDOWOODO  ; b9
 	const POLITOED   ; ba
 	const HOPPIP     ; bb
@@ -289,6 +303,7 @@ DEF JOHTO_POKEMON EQU const_value
 	const GLACEON
 	const SYLVEON
 	const MURKROW    ; c6
+	const HONCHKROW
 	const SLOWKING   ; c7
 	const MISDREAVUS ; c8
 	const MISMAGIUS  
@@ -309,6 +324,7 @@ DEF JOHTO_POKEMON EQU const_value
 	const STEELIX    ; d0
 	const SNUBBULL   ; d1
 	const GRANBULL   ; d2
+	const CARETORKER
 	const QWILFISH   ; d3
 	const KAZEPPELIN
 	const QWILFATHER
@@ -339,12 +355,15 @@ DEF JOHTO_POKEMON EQU const_value
 	const PHANPY     ; e7
 	const DONPHAN    ; e8
 	const PORYGON2   ; e9
+	const PORYGON_Z
 	const STANTLER   ; ea
+	const WYRDEER
 	const SMEARGLE   ; eb
 	const GRENMAR
 	const TYROGUE    ; ec
 	const HITMONTOP  ; ed
 	const SMOOCHUM   ; ee
+	const ELEBEBI
 	const ELEKID     ; ef
 	const MAGBY      ; f0
 	const MILTANK    ; f1

data/items/attributes.asm

@@ -358,8 +358,8 @@ ItemAttributes:
 	item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; SQUIRTBOTTLE
 	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
-; ITEM_B0
+; DUBIOUS_DISK
-	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PARK_BALL
 	item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; RAINBOW_WING

data/items/descriptions.asm

@@ -176,7 +176,7 @@ ItemDescriptions:
 	dw BerryDesc
 	dw GoldBerryDesc
 	dw SquirtBottleDesc
-	dw QuestionMarkDesc
+	dw DubiousDiscDesc
 	dw ParkBallDesc
 	dw RainbowWingDesc
 	dw QuestionMarkDesc
@@ -869,6 +869,10 @@ SquirtBottleDesc:
 	db   "A bottle used for"
 	next "watering plants.@"
 
+DubiousDiscDesc:
+	db   "A mysterious box"
+	next "of dubious data.@"
+
 ParkBallDesc:
 	db   "The Bug-Catching"
 	next "Contest BALL.@"

data/items/names.asm

@@ -175,7 +175,7 @@ ItemNames::
 	li "BERRY"
 	li "GOLD BERRY"
 	li "SQUIRTBOTTLE"
-	li "TERU-SAMA"
+	li "DUBIOUS DISK"
 	li "PARK BALL"
 	li "RAINBOW WING"
 	li "TERU-SAMA"

data/pokemon/base_stats.asm

@@ -147,6 +147,7 @@ INCLUDE "data/pokemon/base_stats/doduo.asm"
 INCLUDE "data/pokemon/base_stats/dodrio.asm"
 INCLUDE "data/pokemon/base_stats/seel.asm"
 INCLUDE "data/pokemon/base_stats/dewgong.asm"
+INCLUDE "data/pokemon/base_stats/smujj.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
 INCLUDE "data/pokemon/base_stats/muk.asm"
 INCLUDE "data/pokemon/base_stats/shellder.asm"
@@ -166,6 +167,7 @@ INCLUDE "data/pokemon/base_stats/exeggcute.asm"
 INCLUDE "data/pokemon/base_stats/exeggutor.asm"
 INCLUDE "data/pokemon/base_stats/cubone.asm"
 INCLUDE "data/pokemon/base_stats/marowak.asm"
+INCLUDE "data/pokemon/base_stats/guardia.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
 INCLUDE "data/pokemon/base_stats/lickitung.asm"
@@ -175,6 +177,7 @@ 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/happiny.asm"
 INCLUDE "data/pokemon/base_stats/chansey.asm"
 INCLUDE "data/pokemon/base_stats/burgela.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
@@ -190,13 +193,16 @@ INCLUDE "data/pokemon/base_stats/goldeen.asm"
 INCLUDE "data/pokemon/base_stats/seaking.asm"
 INCLUDE "data/pokemon/base_stats/staryu.asm"
 INCLUDE "data/pokemon/base_stats/starmie.asm"
+INCLUDE "data/pokemon/base_stats/mime_jr_.asm"
 INCLUDE "data/pokemon/base_stats/mr__mime.asm"
 INCLUDE "data/pokemon/base_stats/scyther.asm"
 INCLUDE "data/pokemon/base_stats/kleavor.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
+INCLUDE "data/pokemon/base_stats/electivire.asm"
 INCLUDE "data/pokemon/base_stats/magmar.asm"
+INCLUDE "data/pokemon/base_stats/magmortar.asm"
 INCLUDE "data/pokemon/base_stats/pinsir.asm"
 INCLUDE "data/pokemon/base_stats/tricules.asm"
 INCLUDE "data/pokemon/base_stats/tauros.asm"
@@ -206,6 +212,7 @@ INCLUDE "data/pokemon/base_stats/magiprey.asm"
 INCLUDE "data/pokemon/base_stats/terrados.asm"
 INCLUDE "data/pokemon/base_stats/lapras.asm"
 INCLUDE "data/pokemon/base_stats/ditto.asm"
+INCLUDE "data/pokemon/base_stats/mimmeo.asm"
 INCLUDE "data/pokemon/base_stats/eevee.asm"
 INCLUDE "data/pokemon/base_stats/vaporeon.asm"
 INCLUDE "data/pokemon/base_stats/jolteon.asm"
@@ -215,12 +222,18 @@ INCLUDE "data/pokemon/base_stats/omanyte.asm"
 INCLUDE "data/pokemon/base_stats/omastar.asm"
 INCLUDE "data/pokemon/base_stats/kabuto.asm"
 INCLUDE "data/pokemon/base_stats/kabutops.asm"
+INCLUDE "data/pokemon/base_stats/feradactyl.asm"
 INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
+INCLUDE "data/pokemon/base_stats/decilla.asm"
+INCLUDE "data/pokemon/base_stats/gawarhed.asm"
 INCLUDE "data/pokemon/base_stats/munchlax.asm"
 INCLUDE "data/pokemon/base_stats/snorlax.asm"
 INCLUDE "data/pokemon/base_stats/articuno.asm"
 INCLUDE "data/pokemon/base_stats/zapdos.asm"
 INCLUDE "data/pokemon/base_stats/moltres.asm"
+INCLUDE "data/pokemon/base_stats/squeamata.asm"
+INCLUDE "data/pokemon/base_stats/ministare.asm"
+INCLUDE "data/pokemon/base_stats/iguanarch.asm"
 INCLUDE "data/pokemon/base_stats/dratini.asm"
 INCLUDE "data/pokemon/base_stats/dragonair.asm"
 INCLUDE "data/pokemon/base_stats/dragonite.asm"
@@ -273,6 +286,7 @@ INCLUDE "data/pokemon/base_stats/bellossom.asm"
 INCLUDE "data/pokemon/base_stats/azurill.asm"
 INCLUDE "data/pokemon/base_stats/marill.asm"
 INCLUDE "data/pokemon/base_stats/azumarill.asm"
+INCLUDE "data/pokemon/base_stats/bonsly.asm"
 INCLUDE "data/pokemon/base_stats/sudowoodo.asm"
 INCLUDE "data/pokemon/base_stats/politoed.asm"
 INCLUDE "data/pokemon/base_stats/hoppip.asm"
@@ -296,6 +310,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/murkrow.asm"
+INCLUDE "data/pokemon/base_stats/honchkrow.asm"
 INCLUDE "data/pokemon/base_stats/slowking.asm"
 INCLUDE "data/pokemon/base_stats/misdreavus.asm"
 INCLUDE "data/pokemon/base_stats/mismagius.asm"
@@ -316,6 +331,7 @@ INCLUDE "data/pokemon/base_stats/gligar.asm"
 INCLUDE "data/pokemon/base_stats/steelix.asm"
 INCLUDE "data/pokemon/base_stats/snubbull.asm"
 INCLUDE "data/pokemon/base_stats/granbull.asm"
+INCLUDE "data/pokemon/base_stats/caretorker.asm"
 INCLUDE "data/pokemon/base_stats/qwilfish.asm"
 INCLUDE "data/pokemon/base_stats/kazeppelin.asm"
 INCLUDE "data/pokemon/base_stats/qwilfather.asm"
@@ -346,12 +362,15 @@ INCLUDE "data/pokemon/base_stats/kingdra.asm"
 INCLUDE "data/pokemon/base_stats/phanpy.asm"
 INCLUDE "data/pokemon/base_stats/donphan.asm"
 INCLUDE "data/pokemon/base_stats/porygon2.asm"
+INCLUDE "data/pokemon/base_stats/porygon_z.asm"
 INCLUDE "data/pokemon/base_stats/stantler.asm"
+INCLUDE "data/pokemon/base_stats/wyrdeer.asm"
 INCLUDE "data/pokemon/base_stats/smeargle.asm"
 INCLUDE "data/pokemon/base_stats/grenmar.asm"
 INCLUDE "data/pokemon/base_stats/tyrogue.asm"
 INCLUDE "data/pokemon/base_stats/hitmontop.asm"
 INCLUDE "data/pokemon/base_stats/smoochum.asm"
+INCLUDE "data/pokemon/base_stats/elebebi.asm"
 INCLUDE "data/pokemon/base_stats/elekid.asm"
 INCLUDE "data/pokemon/base_stats/magby.asm"
 INCLUDE "data/pokemon/base_stats/miltank.asm"

data/pokemon/base_stats/feradactyl.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/ferodactyl/front.dimensions"
+	INCBIN "gfx/pokemon/feradactyl/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_SLOW ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/happiny.asm

@@ -17,5 +17,5 @@
 	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/cries.asm

@@ -126,6 +126,7 @@ PokemonCries::
 	mon_cry CRY_DIGLETT,     153,  160 ; DODRIO
 	mon_cry CRY_SEEL,        136,  320 ; SEEL
 	mon_cry CRY_SEEL,         35,  383 ; DEWGONG
+	mon_cry CRY_NIDORAN_M,     0,    0 ; SMUJJ	(incomplete)
 	mon_cry CRY_GRIMER,        0,  256 ; GRIMER
 	mon_cry CRY_MUK,         239,  383 ; MUK
 	mon_cry CRY_FEAROW,        0,  256 ; SHELLDER
@@ -145,6 +146,7 @@ PokemonCries::
 	mon_cry CRY_DROWZEE,       0,  256 ; EXEGGUTOR
 	mon_cry CRY_CLEFAIRY,      0,  256 ; CUBONE
 	mon_cry CRY_ODDISH,       79,  224 ; MAROWAK
+	mon_cry CRY_NIDORAN_M,     0,    0 ; GUARDIA	(incomplete)
 	mon_cry CRY_GOLEM,       128,  320 ; HITMONLEE
 	mon_cry CRY_SEEL,        238,  320 ; HITMONCHAN
 	mon_cry CRY_SEEL,          0,  256 ; LICKITUNG
@@ -154,6 +156,7 @@ PokemonCries::
 	mon_cry CRY_GOLEM,       255,  383 ; WEEZING
 	mon_cry CRY_CHARMANDER,    0,  256 ; RHYHORN
 	mon_cry CRY_RHYDON,        0,  256 ; RHYDON
+	mon_cry CRY_NIDORAN_M,     0,    0 ; HAPPINY	(incomplete)
 	mon_cry CRY_PIDGEOTTO,    10,  320 ; CHANSEY
 	mon_cry CRY_GOLEM,        50,  140 ; BURGELA, tentative
 	mon_cry CRY_GOLEM,         0,  256 ; TANGELA
@@ -169,13 +172,16 @@ PokemonCries::
 	mon_cry CRY_CATERPIE,     16,  383 ; SEAKING
 	mon_cry CRY_PARAS,         2,  160 ; STARYU
 	mon_cry CRY_PARAS,         0,  256 ; STARMIE
+	mon_cry CRY_NIDORAN_M,     0,    0 ; MIME_JR	(incomplete)
 	mon_cry CRY_KRABBY,        8,  192 ; MR__MIME
 	mon_cry CRY_CATERPIE,      0,  256 ; SCYTHER
 	mon_cry CRY_CATERPIE,   -512,  383 ; KLEAVOR
 	mon_cry CRY_DROWZEE,     255,  383 ; JYNX
 	mon_cry CRY_NIDORAN_M,     0,    0 ; BUU
 	mon_cry CRY_VOLTORB,     143,  383 ; ELECTABUZZ
+	mon_cry CRY_NIDORAN_M,     0,    0 ; ELECTIVIRE	(incomplete)
 	mon_cry CRY_CHARMANDER,  255,  176 ; MAGMAR
+	mon_cry CRY_NIDORAN_M,     0,    0 ; MAGMORTAR	(incomplete)
 	mon_cry CRY_PIDGEOTTO,     0,  256 ; PINSIR
 	mon_cry CRY_RAICHU,      291,  256 ; TRICULES
 	mon_cry CRY_SQUIRTLE,     17,  192 ; TAUROS
@@ -185,6 +191,7 @@ PokemonCries::
 	mon_cry CRY_EKANS,         0,  256 ; TERRADOS (incomplete)
 	mon_cry CRY_LAPRAS,        0,  256 ; LAPRAS
 	mon_cry CRY_PIDGEY,      255,  383 ; DITTO
+	mon_cry CRY_NIDORAN_M,     0,    0 ; MIMMEO	(incomplete)
 	mon_cry CRY_VENONAT,     136,  224 ; EEVEE
 	mon_cry CRY_VENONAT,     170,  383 ; VAPOREON
 	mon_cry CRY_VENONAT,      61,  256 ; JOLTEON
@@ -194,12 +201,18 @@ PokemonCries::
 	mon_cry CRY_GROWLITHE,   255,  192 ; OMASTAR
 	mon_cry CRY_CATERPIE,    187,  192 ; KABUTO
 	mon_cry CRY_FEAROW,      238,  129 ; KABUTOPS
+	mon_cry CRY_NIDORAN_M,     0,    0 ; FERADACTYL	(incomplete)
 	mon_cry CRY_VILEPLUME,    32,  368 ; AERODACTYL
+	mon_cry CRY_NIDORAN_M,     0,    0 ; DECILLA	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; GAWARHED	(incomplete)
 	mon_cry CRY_GRIMER,     101,   128 ; MUNCHLAX
 	mon_cry CRY_GRIMER,       85,  129 ; SNORLAX
 	mon_cry CRY_RAICHU,      128,  192 ; ARTICUNO
 	mon_cry CRY_FEAROW,      255,  256 ; ZAPDOS
 	mon_cry CRY_RAICHU,      248,  192 ; MOLTRES
+	mon_cry CRY_NIDORAN_M,     0,    0 ; SQUEAMATA	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; MINISTARE	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; IGUANARCH	(incomplete)
 	mon_cry CRY_BULBASAUR,    96,  192 ; DRATINI
 	mon_cry CRY_BULBASAUR,    64,  256 ; DRAGONAIR
 	mon_cry CRY_BULBASAUR,    60,  320 ; DRAGONITE
@@ -252,6 +265,7 @@ PokemonCries::
 	mon_cry CRY_NIDORAN_M,     0,    0 ; AZURILL	(incomplete)
 	mon_cry CRY_MARILL,      283,  288 ; MARILL
 	mon_cry CRY_MARILL,      182,  384 ; AZUMARILL
+	mon_cry CRY_NIDORAN_M,     0,    0 ; BONSLY	(incomplete)
 	mon_cry CRY_CLEFFA,     3904,  384 ; SUDOWOODO
 	mon_cry CRY_CLEFFA,     -675,  456 ; POLITOED
 	mon_cry CRY_CLEFFA,       59,  200 ; HOPPIP
@@ -275,6 +289,7 @@ PokemonCries::
 	mon_cry CRY_NIDORAN_M,     0,    0 ; GLACEON	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; SYLVEON	(incomplete)
 	mon_cry CRY_MARILL,      -31,  384 ; MURKROW
+	mon_cry CRY_NIDORAN_M,     0,    0 ; HONCHKROW	(incomplete)
 	mon_cry CRY_SLOWKING,    260,  512 ; SLOWKING
 	mon_cry CRY_HOOTHOOT,    304,  232 ; MISDREAVUS
 	mon_cry CRY_NIDORAN_M,     0,    0 ; MISMAGIUS	(incomplete)
@@ -295,6 +310,7 @@ PokemonCries::
 	mon_cry CRY_TYPHLOSION,  239,  247 ; STEELIX
 	mon_cry CRY_DUNSPARCE,   274,  232 ; SNUBBULL
 	mon_cry CRY_DUNSPARCE,     0,  384 ; GRANBULL
+	mon_cry CRY_NIDORAN_M,     0,    0 ; CARETORKER	(incomplete)
 	mon_cry CRY_SLOWKING,    352,  224 ; QWILFISH
 	mon_cry CRY_NIDORAN_M,     0,    0 ; KAZEPPELIN	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; QWILFATHER	(incomplete)
@@ -325,12 +341,15 @@ PokemonCries::
 	mon_cry CRY_SENTRET,      72,  560 ; PHANPY
 	mon_cry CRY_DONPHAN,       0,  416 ; DONPHAN
 	mon_cry CRY_GIRAFARIG,   115,  576 ; PORYGON2
+	mon_cry CRY_NIDORAN_M,     0,    0 ; PORYGON_Z	(incomplete)
 	mon_cry CRY_AIPOM,      -352,  384 ; STANTLER
+	mon_cry CRY_NIDORAN_M,     0,    0 ; WYRDEER	(incomplete)
 	mon_cry CRY_PICHU,      -538,  496 ; SMEARGLE
 	mon_cry CRY_NIDORAN_M,     0,    0 ; GRENMAR
 	mon_cry CRY_AIPOM,        44,  264 ; TYROGUE
 	mon_cry CRY_SLUGMA,        0,  256 ; HITMONTOP
 	mon_cry CRY_MARILL,      104,  256 ; SMOOCHUM
+	mon_cry CRY_NIDORAN_M,     0,    0 ; ELEBEBI	(incomplete)
 	mon_cry CRY_SUNFLORA,   -728,  180 ; ELEKID
 	mon_cry CRY_TEDDIURSA,   374,   58 ; MAGBY
 	mon_cry CRY_GLIGAR,     -461,  416 ; MILTANK

data/pokemon/dex_entries.asm

@@ -115,6 +115,7 @@ DoduoPokedexEntry::      INCLUDE "data/pokemon/dex_entries/doduo.asm"
 DodrioPokedexEntry::     INCLUDE "data/pokemon/dex_entries/dodrio.asm"
 SeelPokedexEntry::       INCLUDE "data/pokemon/dex_entries/seel.asm"
 DewgongPokedexEntry::    INCLUDE "data/pokemon/dex_entries/dewgong.asm"
+SmujjPokedexEntry::      INCLUDE "data/pokemon/dex_entries/smujj.asm"
 GrimerPokedexEntry::     INCLUDE "data/pokemon/dex_entries/grimer.asm"
 MukPokedexEntry::        INCLUDE "data/pokemon/dex_entries/muk.asm"
 ShellderPokedexEntry::   INCLUDE "data/pokemon/dex_entries/shellder.asm"
@@ -134,6 +135,7 @@ ExeggcutePokedexEntry::  INCLUDE "data/pokemon/dex_entries/exeggcute.asm"
 ExeggutorPokedexEntry::  INCLUDE "data/pokemon/dex_entries/exeggutor.asm"
 CubonePokedexEntry::     INCLUDE "data/pokemon/dex_entries/cubone.asm"
 MarowakPokedexEntry::    INCLUDE "data/pokemon/dex_entries/marowak.asm"
+GuardiaPokedexEntry::    INCLUDE "data/pokemon/dex_entries/guardia.asm"
 HitmonleePokedexEntry::  INCLUDE "data/pokemon/dex_entries/hitmonlee.asm"
 HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonchan.asm"
 LickitungPokedexEntry::  INCLUDE "data/pokemon/dex_entries/lickitung.asm"
@@ -143,6 +145,7 @@ KoffingPokedexEntry::    INCLUDE "data/pokemon/dex_entries/koffing.asm"
 WeezingPokedexEntry::    INCLUDE "data/pokemon/dex_entries/weezing.asm"
 RhyhornPokedexEntry::    INCLUDE "data/pokemon/dex_entries/rhyhorn.asm"
 RhydonPokedexEntry::     INCLUDE "data/pokemon/dex_entries/rhydon.asm"
+HappinyPokedexEntry::    INCLUDE "data/pokemon/dex_entries/happiny.asm"
 ChanseyPokedexEntry::    INCLUDE "data/pokemon/dex_entries/chansey.asm"
 BurgelaPokedexEntry::    INCLUDE "data/pokemon/dex_entries/burgela.asm"
 TangelaPokedexEntry::    INCLUDE "data/pokemon/dex_entries/tangela.asm"
@@ -158,12 +161,15 @@ GoldeenPokedexEntry::    INCLUDE "data/pokemon/dex_entries/goldeen.asm"
 SeakingPokedexEntry::    INCLUDE "data/pokemon/dex_entries/seaking.asm"
 StaryuPokedexEntry::     INCLUDE "data/pokemon/dex_entries/staryu.asm"
 StarmiePokedexEntry::    INCLUDE "data/pokemon/dex_entries/starmie.asm"
+MimeJrPokedexEntry::     INCLUDE "data/pokemon/dex_entries/mime_jr_.asm"
 MrMimePokedexEntry::     INCLUDE "data/pokemon/dex_entries/mr__mime.asm"
 ScytherPokedexEntry::    INCLUDE "data/pokemon/dex_entries/scyther.asm"
 KleavorPokedexEntry::    INCLUDE "data/pokemon/dex_entries/kleavor.asm"
 JynxPokedexEntry::       INCLUDE "data/pokemon/dex_entries/jynx.asm"
 ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm"
+ElectivirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/electivire.asm"
 MagmarPokedexEntry::     INCLUDE "data/pokemon/dex_entries/magmar.asm"
+MagmortarPokedexEntry::  INCLUDE "data/pokemon/dex_entries/magmortar.asm"
 PinsirPokedexEntry::     INCLUDE "data/pokemon/dex_entries/pinsir.asm"
 TriculesPokedexEntry::   INCLUDE "data/pokemon/dex_entries/tricules.asm"
 TaurosPokedexEntry::     INCLUDE "data/pokemon/dex_entries/tauros.asm"
@@ -175,6 +181,7 @@ MagikarpPokedexEntry::   INCLUDE "data/pokemon/dex_entries/magikarp.asm"
 GyaradosPokedexEntry::   INCLUDE "data/pokemon/dex_entries/gyarados.asm"
 LaprasPokedexEntry::     INCLUDE "data/pokemon/dex_entries/lapras.asm"
 DittoPokedexEntry::      INCLUDE "data/pokemon/dex_entries/ditto.asm"
+MimmeoPokedexEntry::     INCLUDE "data/pokemon/dex_entries/mimmeo.asm"
 EeveePokedexEntry::      INCLUDE "data/pokemon/dex_entries/eevee.asm"
 VaporeonPokedexEntry::   INCLUDE "data/pokemon/dex_entries/vaporeon.asm"
 JolteonPokedexEntry::    INCLUDE "data/pokemon/dex_entries/jolteon.asm"
@@ -184,12 +191,18 @@ OmanytePokedexEntry::    INCLUDE "data/pokemon/dex_entries/omanyte.asm"
 OmastarPokedexEntry::    INCLUDE "data/pokemon/dex_entries/omastar.asm"
 KabutoPokedexEntry::     INCLUDE "data/pokemon/dex_entries/kabuto.asm"
 KabutopsPokedexEntry::   INCLUDE "data/pokemon/dex_entries/kabutops.asm"
+FeradactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/feradactyl.asm"
 AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aerodactyl.asm"
+DecillaPokedexEntry::    INCLUDE "data/pokemon/dex_entries/decilla.asm"
+GawarhedPokedexEntry::   INCLUDE "data/pokemon/dex_entries/gawarhed.asm"
 MunchlaxPokedexEntry::    INCLUDE "data/pokemon/dex_entries/munchlax.asm"
 SnorlaxPokedexEntry::    INCLUDE "data/pokemon/dex_entries/snorlax.asm"
 ArticunoPokedexEntry::   INCLUDE "data/pokemon/dex_entries/articuno.asm"
 ZapdosPokedexEntry::     INCLUDE "data/pokemon/dex_entries/zapdos.asm"
 MoltresPokedexEntry::    INCLUDE "data/pokemon/dex_entries/moltres.asm"
+SqueamataPokedexEntry::  INCLUDE "data/pokemon/dex_entries/squeamata.asm"
+MinistarePokedexEntry::  INCLUDE "data/pokemon/dex_entries/ministare.asm"
+IguanarchPokedexEntry::  INCLUDE "data/pokemon/dex_entries/iguanarch.asm"
 DratiniPokedexEntry::    INCLUDE "data/pokemon/dex_entries/dratini.asm"
 DragonairPokedexEntry::  INCLUDE "data/pokemon/dex_entries/dragonair.asm"
 DragonitePokedexEntry::  INCLUDE "data/pokemon/dex_entries/dragonite.asm"
@@ -242,6 +255,7 @@ BellossomPokedexEntry::  INCLUDE "data/pokemon/dex_entries/bellossom.asm"
 AzurillPokedexEntry::    INCLUDE "data/pokemon/dex_entries/azurill.asm"
 MarillPokedexEntry::     INCLUDE "data/pokemon/dex_entries/marill.asm"
 AzumarillPokedexEntry::  INCLUDE "data/pokemon/dex_entries/azumarill.asm"
+BonslyPokedexEntry::     INCLUDE "data/pokemon/dex_entries/bonsly.asm"
 SudowoodoPokedexEntry::  INCLUDE "data/pokemon/dex_entries/sudowoodo.asm"
 PolitoedPokedexEntry::   INCLUDE "data/pokemon/dex_entries/politoed.asm"
 HoppipPokedexEntry::     INCLUDE "data/pokemon/dex_entries/hoppip.asm"
@@ -269,6 +283,7 @@ LeafeonPokedexEntry::     INCLUDE "data/pokemon/dex_entries/leafeon.asm"
 GlaceonPokedexEntry::    INCLUDE "data/pokemon/dex_entries/glaceon.asm"
 SylveonPokedexEntry::     INCLUDE "data/pokemon/dex_entries/sylveon.asm"
 MurkrowPokedexEntry::    INCLUDE "data/pokemon/dex_entries/murkrow.asm"
+HonchkrowPokedexEntry::  INCLUDE "data/pokemon/dex_entries/honchkrow.asm"
 SlowkingPokedexEntry::   INCLUDE "data/pokemon/dex_entries/slowking.asm"
 MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm"
 MismagiusPokedexEntry::  INCLUDE "data/pokemon/dex_entries/mismagius.asm"
@@ -289,6 +304,7 @@ GligarPokedexEntry::     INCLUDE "data/pokemon/dex_entries/gligar.asm"
 SteelixPokedexEntry::    INCLUDE "data/pokemon/dex_entries/steelix.asm"
 SnubbullPokedexEntry::   INCLUDE "data/pokemon/dex_entries/snubbull.asm"
 GranbullPokedexEntry::   INCLUDE "data/pokemon/dex_entries/granbull.asm"
+CaretorkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/caretorker.asm"
 QwilfishPokedexEntry::   INCLUDE "data/pokemon/dex_entries/qwilfish.asm"
 KazeppelinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kazeppelin.asm"
 QwilfatherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfather.asm"
@@ -319,11 +335,14 @@ KingdraPokedexEntry::    INCLUDE "data/pokemon/dex_entries/kingdra.asm"
 PhanpyPokedexEntry::     INCLUDE "data/pokemon/dex_entries/phanpy.asm"
 DonphanPokedexEntry::    INCLUDE "data/pokemon/dex_entries/donphan.asm"
 Porygon2PokedexEntry::   INCLUDE "data/pokemon/dex_entries/porygon2.asm"
+PorygonZPokedexEntry::   INCLUDE "data/pokemon/dex_entries/porygon_z.asm"
 StantlerPokedexEntry::   INCLUDE "data/pokemon/dex_entries/stantler.asm"
+WyrdeerPokedexEntry::    INCLUDE "data/pokemon/dex_entries/wyrdeer.asm"
 SmearglePokedexEntry::   INCLUDE "data/pokemon/dex_entries/smeargle.asm"
 TyroguePokedexEntry::    INCLUDE "data/pokemon/dex_entries/tyrogue.asm"
 HitmontopPokedexEntry::  INCLUDE "data/pokemon/dex_entries/hitmontop.asm"
 SmoochumPokedexEntry::   INCLUDE "data/pokemon/dex_entries/smoochum.asm"
+ElebebiPokedexEntry::    INCLUDE "data/pokemon/dex_entries/elebebi.asm"
 ElekidPokedexEntry::     INCLUDE "data/pokemon/dex_entries/elekid.asm"
 MagbyPokedexEntry::      INCLUDE "data/pokemon/dex_entries/magby.asm"
 MiltankPokedexEntry::    INCLUDE "data/pokemon/dex_entries/miltank.asm"

data/pokemon/dex_entries/decilla.asm

@@ -0,0 +1,10 @@
+	db "SHRIEKING@" ; species name
+	dw 37, 1400 ; height, weight
+
+	db   "It once fed on"
+	next "weaker mammals."
+	next "When hungry,"
+
+	page "it lets out an"
+	next "ear-piercing"
+	next "shriek.@"

data/pokemon/dex_entries/feradactyl.asm

@@ -0,0 +1,10 @@
+	db "FLIGHTLESS@" ; species name
+	dw 32, 760 ; height, weight
+
+	db   "A flightless"
+	next "reptile from"
+	next "ancient times."
+
+	page "Fossils of it were"
+	next "used to create the"
+	next "first gargoyles.@"

data/pokemon/dex_entries/gawarhed.asm

@@ -0,0 +1,10 @@
+	db "CALAMITY@" ; species name
+	dw 82, 6900 ; height, weight
+
+	db   "Research is being"
+	next "conducted into"
+	next "restoring"
+
+	page "GAWARHED fossils"
+	next "by harnessing"
+	next "nuclear energy.@"

data/pokemon/dex_entry_pointers.asm

@@ -121,6 +121,7 @@ PokedexDataPointerTable:
 	dba DodrioPokedexEntry
 	dba SeelPokedexEntry
 	dba DewgongPokedexEntry
+	dba SmujjPokedexEntry
 	dba GrimerPokedexEntry
 	dba MukPokedexEntry
 	dba ShellderPokedexEntry
@@ -140,6 +141,7 @@ PokedexDataPointerTable:
 	dba ExeggutorPokedexEntry
 	dba CubonePokedexEntry
 	dba MarowakPokedexEntry
+	dba GuardiaPokedexEntry
 	dba HitmonleePokedexEntry
 	dba HitmonchanPokedexEntry
 	dba LickitungPokedexEntry
@@ -149,6 +151,7 @@ PokedexDataPointerTable:
 	dba WeezingPokedexEntry
 	dba RhyhornPokedexEntry
 	dba RhydonPokedexEntry
+	dba HappinyPokedexEntry
 	dba ChanseyPokedexEntry
 	dba BurgelaPokedexEntry
 	dba TangelaPokedexEntry
@@ -164,13 +167,16 @@ PokedexDataPointerTable:
 	dba SeakingPokedexEntry
 	dba StaryuPokedexEntry
 	dba StarmiePokedexEntry
+	dba MimeJrPokedexEntry
 	dba MrMimePokedexEntry
 	dba ScytherPokedexEntry
 	dba KleavorPokedexEntry
 	dba JynxPokedexEntry
 	dba BuuPokedexEntry
 	dba ElectabuzzPokedexEntry
+	dba ElectivirePokedexEntry
 	dba MagmarPokedexEntry
+	dba MagmortarPokedexEntry
 	dba PinsirPokedexEntry
 	dba TriculesPokedexEntry
 	dba TaurosPokedexEntry
@@ -180,6 +186,7 @@ PokedexDataPointerTable:
 	dba TerradosPokedexEntry
 	dba LaprasPokedexEntry
 	dba DittoPokedexEntry
+	dba MimmeoPokedexEntry
 	dba EeveePokedexEntry
 	dba VaporeonPokedexEntry
 	dba JolteonPokedexEntry
@@ -189,12 +196,18 @@ PokedexDataPointerTable:
 	dba OmastarPokedexEntry
 	dba KabutoPokedexEntry
 	dba KabutopsPokedexEntry
+	dba FeradactylPokedexEntry
 	dba AerodactylPokedexEntry
+	dba DecillaPokedexEntry
+	dba GawarhedPokedexEntry
 	dba MunchlaxPokedexEntry
 	dba SnorlaxPokedexEntry
 	dba ArticunoPokedexEntry
 	dba ZapdosPokedexEntry
 	dba MoltresPokedexEntry
+	dba SqueamataPokedexEntry
+	dba MinistarePokedexEntry
+	dba IguanarchPokedexEntry
 	dba DratiniPokedexEntry
 	dba DragonairPokedexEntry
 	dba DragonitePokedexEntry
@@ -247,6 +260,7 @@ PokedexDataPointerTable:
 	dba AzurillPokedexEntry
 	dba MarillPokedexEntry
 	dba AzumarillPokedexEntry
+	dba BonslyPokedexEntry
 	dba SudowoodoPokedexEntry
 	dba PolitoedPokedexEntry
 	dba HoppipPokedexEntry
@@ -270,6 +284,7 @@ PokedexDataPointerTable:
 	dba GlaceonPokedexEntry
 	dba SylveonPokedexEntry
 	dba MurkrowPokedexEntry
+	dba HonchkrowPokedexEntry
 	dba SlowkingPokedexEntry
 	dba MisdreavusPokedexEntry
 	dba MismagiusPokedexEntry
@@ -290,6 +305,7 @@ PokedexDataPointerTable:
 	dba SteelixPokedexEntry
 	dba SnubbullPokedexEntry
 	dba GranbullPokedexEntry
+	dba CaretorkerPokedexEntry
 	dba QwilfishPokedexEntry
 	dba KazeppelinPokedexEntry
 	dba QwilfatherPokedexEntry
@@ -320,12 +336,15 @@ PokedexDataPointerTable:
 	dba PhanpyPokedexEntry
 	dba DonphanPokedexEntry
 	dba Porygon2PokedexEntry
+	dba PorygonZPokedexEntry
 	dba StantlerPokedexEntry
+	dba WyrdeerPokedexEntry
 	dba SmearglePokedexEntry
 	dba GrenmarPokedexEntry
 	dba TyroguePokedexEntry
 	dba HitmontopPokedexEntry
 	dba SmoochumPokedexEntry
+	dba ElebebiPokedexEntry
 	dba ElekidPokedexEntry
 	dba MagbyPokedexEntry
 	dba MiltankPokedexEntry

data/pokemon/dex_order_alpha.asm

@@ -32,6 +32,7 @@ AlphabeticalPokedexOrder:
 	dw BLASTYKE
 	dw BLISSEY
 	dw BLOTTLE
+	dw BONSLY
 	dw BRUINOUS
 	dw BULBASAUR
 	dw BURGELA
@@ -40,6 +41,7 @@ AlphabeticalPokedexOrder:
 	dw CACAWPHONY
 	dw CALFLAC
 	dw CARAPTHOR
+	dw CARETORKER
 	dw CATERPIE
 	dw CELEBI
 	dw CHANSEY
@@ -64,6 +66,7 @@ AlphabeticalPokedexOrder:
 	dw CUBONE
 	dw CYCLORP
 	dw CYNDAQUIL
+	dw DECILLA
 	dw DELIBIRD
 	dw DEWGONG
 	dw DIGLETT
@@ -83,7 +86,9 @@ AlphabeticalPokedexOrder:
 	dw DUNSPARCE
 	dw EEVEE
 	dw EKANS
+	dw ELEBEBI
 	dw ELECTABUZZ
+	dw ELECTIVIRE
 	dw ELECTRODE
 	dw ELEKID
 	dw ENTEI
@@ -94,6 +99,7 @@ AlphabeticalPokedexOrder:
 	dw FARFETCH_D
 	dw FARIGIRAF
 	dw FEAROW
+	dw FERADACTYL
 	dw FERALIGATR
 	dw FLAAFFY
 	dw FLAMBEAR
@@ -106,6 +112,7 @@ AlphabeticalPokedexOrder:
 	dw GASTLY
 	dw GAOTORA
 	dw GAVILLAIN
+	dw GAWARHED
 	dw GENGAR
 	dw GENTLARVA
 	dw GEODUDE
@@ -127,7 +134,9 @@ AlphabeticalPokedexOrder:
 	dw GRENMAR
 	dw GRIMER
 	dw GROWLITHE
+	dw GUARDIA
 	dw GYARADOS
+	dw HAPPINY
 	dw HAUNTER
 	dw HERACROSS
 	dw HIPPUNK
@@ -135,6 +144,7 @@ AlphabeticalPokedexOrder:
 	dw HITMONLEE
 	dw HITMONTOP
 	dw HO_OH
+	dw HONCHKROW
 	dw HOOTHOOT
 	dw HOPPIP
 	dw HORSEA
@@ -142,6 +152,7 @@ AlphabeticalPokedexOrder:
 	dw HOUNDOUR
 	dw HYPNO
 	dw IGGLYBUFF
+	dw IGUANARCH
 	dw INOSHIKA
 	dw IRON_TREADS
 	dw IRON_BUNDLE
@@ -190,6 +201,7 @@ AlphabeticalPokedexOrder:
 	dw MAGIKARP
 	dw MAGIPREY
 	dw MAGMAR
+	dw MAGMORTAR
 	dw MAGNEMITE
 	dw MAGNETON
 	dw MAGNETITE
@@ -205,8 +217,11 @@ AlphabeticalPokedexOrder:
 	dw METAPOD
 	dw MEW
 	dw MEWTWO
-	dw MIMEAR
 	dw MILTANK
+	dw MIME_JR_
+	dw MIMEAR
+	dw MIMMEO
+	dw MINISTARE
 	dw MISDREAVUS
 	dw MISMAGIUS
 	dw MOIBELLE
@@ -256,6 +271,7 @@ AlphabeticalPokedexOrder:
 	dw POLIWRATH
 	dw PONYTA
 	dw PORYGON
+	dw PORYGON_Z
 	dw PORYGON2
 	dw PRESSIO
 	dw PRIMEAPE
@@ -304,12 +320,14 @@ AlphabeticalPokedexOrder:
 	dw SLUGMA
 	dw SMEARGLE
 	dw SMOOCHUM
+	dw SMUJJ
 	dw SNEASEL
 	dw SNORLAX
 	dw SNUBBULL
 	dw SONEGG
 	dw SPEAROW
 	dw SPINARAK
+	dw SQUEAMATA
 	dw SQUIRTLE
 	dw STANTLER
 	dw STARMIE
@@ -370,6 +388,7 @@ AlphabeticalPokedexOrder:
 	dw WOBBUFFET
 	dw WOOPER
 	dw WYNAUT
+	dw WYRDEER
 	dw XATU
 	dw XYLODON
 	dw XYLOFIN

data/pokemon/dex_order_new.asm

@@ -120,6 +120,7 @@ NewPokedexOrder:
 	dw KADABRA
 	dw ALAKAZAM
 	dw DITTO
+	dw MIMMEO
 	dw PINECO
 	dw FORRETRESS
 	dw NIDORAN_F
@@ -136,6 +137,7 @@ NewPokedexOrder:
 	dw SUNFLORA
 	dw EXEGGCUTE
 	dw EXEGGUTOR
+	dw BONSLY
 	dw SUDOWOODO
 	dw WYNAUT
 	dw WOBBUFFET
@@ -149,6 +151,7 @@ NewPokedexOrder:
 	dw HERACROSS
 	dw KOFFING
 	dw WEEZING
+	dw SMUJJ
 	dw GRIMER
 	dw MUK
 	dw MAGNEMITE
@@ -162,6 +165,7 @@ NewPokedexOrder:
 	dw AMBIPOM
 	dw SNUBBULL
 	dw GRANBULL
+	dw CARETORKER
 	dw VULPIII
 	dw VULPIX
 	dw NINETALES
@@ -169,6 +173,7 @@ NewPokedexOrder:
 	dw GROWLITHE
 	dw ARCANINE
 	dw STANTLER
+	dw WYRDEER
 	dw AZURILL
 	dw MARILL
 	dw AZUMARILL
@@ -201,11 +206,15 @@ NewPokedexOrder:
 	dw MILTANK
 	dw MAGBY
 	dw MAGMAR
+	dw MAGMORTAR
 	dw SMOOCHUM
 	dw JYNX
 	dw BUU
+	dw ELEBEBI
 	dw ELEKID
 	dw ELECTABUZZ
+	dw ELECTIVIRE
+	dw MIME_JR_
 	dw MR__MIME
 	dw SMEARGLE
 	dw GRENMAR
@@ -288,10 +297,12 @@ NewPokedexOrder:
 	dw BALUMBA
 	dw CUBONE
 	dw MAROWAK
+	dw GUARDIA
 	dw KANGASKHAN
 	dw RHYHORN
 	dw RHYDON
 	dw MURKROW
+	dw HONCHKROW
 	dw HOUNDOUR
 	dw HOUNDOOM
 	dw SLUGMA
@@ -303,6 +314,8 @@ NewPokedexOrder:
 	dw PHANDARIN
 	dw PORYGON
 	dw PORYGON2
+	dw PORYGON_Z
+	dw HAPPINY
 	dw CHANSEY
 	dw BLISSEY
 	dw WARUCHU
@@ -335,7 +348,10 @@ NewPokedexOrder:
 	dw OMASTAR
 	dw KABUTO
 	dw KABUTOPS
+	dw FERADACTYL
 	dw AERODACTYL
+	dw DECILLA
+	dw GAWARHED
 	dw MUNCHLAX
 	dw SNORLAX
 	dw BULBASAUR
@@ -364,6 +380,9 @@ NewPokedexOrder:
 	dw RAIKOU
 	dw ENTEI
 	dw SUICUNE
+	dw SQUEAMATA
+	dw MINISTARE
+	dw IGUANARCH
 	dw DRATINI
 	dw DRAGONAIR
 	dw DRAGONITE

data/pokemon/egg_moves_johto.asm

@@ -48,7 +48,8 @@ EggMovePointers2::
 	dw AzurillEggMoves
 	dw NoEggMoves2
 	dw NoEggMoves2
-	dw SudowoodoEggMoves
+	dw BonslyEggMoves
+	dw NoEggMoves2
 	dw NoEggMoves2
 	dw HoppipEggMoves
 	dw NoEggMoves2
@@ -71,7 +72,7 @@ EggMovePointers2::
 	dw NoEggMoves2 ; Glaceon
 	dw NoEggMoves2 ; Sylveon
 	dw MurkrowEggMoves
-	; dw NoEggMoves2 ; Honchkrow
+	dw NoEggMoves2 ; Honchkrow
 	dw NoEggMoves2
 	dw MisdreavusEggMoves
 	dw NoEggMoves2 ; Mismagius
@@ -92,6 +93,7 @@ EggMovePointers2::
 	dw NoEggMoves2
 	dw SnubbullEggMoves
 	dw NoEggMoves2
+	dw CaretorkerEggMoves
 	dw QwilfishEggMoves
 	dw NoEggMoves2 ; Kazeppelin
 	dw NoEggMoves2 ; Qwilfather
@@ -122,13 +124,16 @@ EggMovePointers2::
 	dw PhanpyEggMoves
 	dw NoEggMoves2
 	dw NoEggMoves2
+	dw NoEggMoves2 ; Porygon-Z
 	dw StantlerEggMoves
+	dw NoEggMoves2 ; Wyrdeer
 	dw NoEggMoves2
 	dw GrenmarEggMoves
 	dw TyrogueEggMoves
 	dw NoEggMoves2
 	dw SmoochumEggMoves
-	dw ElekidEggMoves
+	dw ElebebiEggMoves
+	dw NoEggMoves2 ; Elekid
 	dw MagbyEggMoves
 	dw MiltankEggMoves
 	dw NoEggMoves2 ; Blissey
@@ -332,7 +337,8 @@ AzurillEggMoves:
 	dw FORESIGHT
 	dw -1 ; end
 
-SudowoodoEggMoves:
+BonslyEggMoves:
+	dw ROCK_HEAD
 	dw SELFDESTRUCT
 	dw -1 ; end
 
@@ -454,6 +460,14 @@ SnubbullEggMoves:
 	dw LEER
 	dw -1 ; end
 	
+CaretorkerEggMoves:
+	dw DRILL_PECK
+	dw FOCUS_ENERGY
+	dw FORESIGHT
+	dw HEAL_BELL
+	dw PRESENT
+	dw -1 ; end
+
 QwilfishEggMoves:
 	dw FLAIL
 	dw HAZE
@@ -590,7 +604,7 @@ SmoochumEggMoves:
 	dw MEDITATE
 	dw -1 ; end
 
-ElekidEggMoves:
+ElebebiEggMoves:
 	dw KARATE_CHOP
 	dw BARRIER
 	dw ROLLING_KICK

data/pokemon/egg_moves_kanto.asm

@@ -121,7 +121,8 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw SeelEggMoves
 	dw NoEggMoves1
-	dw GrimerEggMoves
+	dw SmujjEggMoves
+	dw NoEggMoves1 ; Grimer
 	dw NoEggMoves1
 	dw ShellderEggMoves
 	dw NoEggMoves1
@@ -140,6 +141,7 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw CuboneEggMoves
 	dw NoEggMoves1
+	dw NoEggMoves1 ; Guardia
 	dw NoEggMoves1
 	dw NoEggMoves1
 	dw LickitungEggMoves
@@ -149,7 +151,8 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw RhyhornEggMoves
 	dw NoEggMoves1
-	dw ChanseyEggMoves
+	dw HappinyEggMoves
+	dw NoEggMoves1 ; Chansey
 	dw BurgelaEggMoves ; Burgela
 	dw NoEggMoves1
 	dw NoEggMoves1 ; Tangrowth
@@ -164,13 +167,16 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw NoEggMoves1
 	dw NoEggMoves1
-	dw MrMimeEggMoves
+	dw MimeJrEggMoves
+	dw NoEggMoves1 ; Mr. Mime
 	dw ScytherEggMoves
 	dw NoEggMoves1 ; Kleavor
 	dw NoEggMoves1
 	dw BuuEggMoves
 	dw NoEggMoves1
+	dw NoEggMoves1 ; Electivire
 	dw NoEggMoves1
+	dw NoEggMoves1 ; Magmortar
 	dw PinsirEggMoves
 	dw NoEggMoves1 ; Tricules
 	dw NoEggMoves1
@@ -180,6 +186,7 @@ EggMovePointers1:
 	dw NoEggMoves1 ; Terrados
 	dw LaprasEggMoves
 	dw NoEggMoves1
+	dw NoEggMoves1 ; Mimmeo
 	dw EeveeEggMoves
 	dw NoEggMoves1
 	dw NoEggMoves1
@@ -189,12 +196,18 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw KabutoEggMoves
 	dw NoEggMoves1
-	dw AerodactylEggMoves
+	dw FeradactylEggMoves
+	dw NoEggMoves1 ; Aerodactyl
+	dw DecillaEggMoves
+	dw NoEggMoves1 ; Gawarhed
 	dw MunchlaxEggMoves ; Munchlax
 	dw NoEggMoves1 ; Should this even exist?
 	dw NoEggMoves1
 	dw NoEggMoves1
 	dw NoEggMoves1
+	dw SqueamataEggMoves
+	dw NoEggMoves1 ; Ministare
+	dw NoEggMoves1 ; Iguanarch
 	dw DratiniEggMoves
 	dw NoEggMoves1
 	dw NoEggMoves1
@@ -503,7 +516,7 @@ SeelEggMoves:
 	dw ENCORE
 	dw -1 ; end
 
-GrimerEggMoves:
+SmujjEggMoves:
 	dw HAZE
 	dw MEAN_LOOK
 	dw LICK
@@ -585,7 +598,7 @@ RhyhornEggMoves:
 	dw MAGNITUDE
 	dw -1 ; end
 
-ChanseyEggMoves:
+HappinyEggMoves:
 	dw PRESENT
 	dw METRONOME
 	dw HEAL_BELL
@@ -631,7 +644,7 @@ OrfryEggMoves:
 	dw HYDRO_PUMP
 	dw -1 ; end
 
-MrMimeEggMoves:
+MimeJrEggMoves:
 	dw FUTURE_SIGHT
 	dw HYPNOSIS
 	dw MIMIC
@@ -686,16 +699,31 @@ KabutoEggMoves:
 	dw FLAIL
 	dw -1 ; end
 
-AerodactylEggMoves:
+FeradactylEggMoves:
 	dw WHIRLWIND
 	dw PURSUIT
 	dw FORESIGHT
 	dw -1 ; end
 	
+DecillaEggMoves:
+	dw CRUNCH
+	dw STOMP
+	dw THRASH
+	dw LICK
+	dw -1 ; end
+
 MunchlaxEggMoves:
 	dw LICK
 	dw -1 ; end
 
+SqueamataEggMoves:
+	dw THRASH
+	dw MIST
+	dw QUICK_ATTACK
+	dw BUBBLE
+	dw BUBBLEBEAM
+	dw -1 ; end
+
 DratiniEggMoves:
 	dw LIGHT_SCREEN
 	dw MIST

data/pokemon/evos_attacks_johto.asm

@@ -48,6 +48,7 @@ EvosAttacksPointers2::
 	dw AzurillEvosAttacks
 	dw MarillEvosAttacks
 	dw AzumarillEvosAttacks
+	dw BonslyEvosAttacks
 	dw SudowoodoEvosAttacks
 	dw PolitoedEvosAttacks
 	dw HoppipEvosAttacks
@@ -71,6 +72,7 @@ EvosAttacksPointers2::
 	dw GlaceonEvosAttacks
 	dw SylveonEvosAttacks
 	dw MurkrowEvosAttacks
+	dw HonchkrowEvosAttacks
 	dw SlowkingEvosAttacks
 	dw MisdreavusEvosAttacks
 	dw MismagiusEvosAttacks
@@ -91,6 +93,7 @@ EvosAttacksPointers2::
 	dw SteelixEvosAttacks
 	dw SnubbullEvosAttacks
 	dw GranbullEvosAttacks
+	dw CaretorkerEvosAttacks
 	dw QwilfishEvosAttacks
 	dw KazeppelinEvosAttacks
 	dw QwilfatherEvosAttacks
@@ -121,12 +124,15 @@ EvosAttacksPointers2::
 	dw PhanpyEvosAttacks
 	dw DonphanEvosAttacks
 	dw Porygon2EvosAttacks
+	dw PorygonZEvosAttacks
 	dw StantlerEvosAttacks
+	dw WyrdeerEvosAttacks
 	dw SmeargleEvosAttacks
 	dw GrenmarEvosAttacks
 	dw TyrogueEvosAttacks
 	dw HitmontopEvosAttacks
 	dw SmoochumEvosAttacks
+	dw ElebebiEvosAttacks
 	dw ElekidEvosAttacks
 	dw MagbyEvosAttacks
 	dw MiltankEvosAttacks
@@ -802,6 +808,18 @@ AzumarillEvosAttacks:
 	dbw 48, RAIN_DANCE
 	db 0 ; no more level-up moves
 
+BonslyEvosAttacks:
+	dbbw EVOLVE_LEVEL, 17, SUDOWOODO ; tentative
+	db 0 ; no more evolutions
+	dbw 1, ROCK_THROW
+	dbw 9, FLAIL
+	dbw 16, LOW_KICK
+	dbw 17, MIMIC
+	dbw 23, ROCK_SLIDE
+	dbw 30, FAINT_ATTACK
+	dbw 37, SLAM
+	db 0 ; no more level-up moves
+
 SudowoodoEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, ROCK_THROW
@@ -1097,6 +1115,7 @@ SylveonEvosAttacks:
 	db 0 ; no more level-up moves
 
 MurkrowEvosAttacks:
+	dbbw EVOLVE_ITEM, DUSK_STONE, HONCHKROW
 	db 0 ; no more evolutions
 	dbw 1, PECK
 	dbw 11, PURSUIT
@@ -1106,6 +1125,16 @@ MurkrowEvosAttacks:
 	dbw 41, MEAN_LOOK
 	db 0 ; no more level-up moves
 	
+HonchkrowEvosAttacks:
+	dbbw EVOLVE_ITEM, DUSK_STONE, HONCHKROW
+	db 0 ; no more evolutions
+	dbw 1, PECK
+	dbw 1, PURSUIT
+	dbw 1, HAZE
+	dbw 1, WING_ATTACK
+	dbw 25, SWAGGER
+	db 0 ; no more level-up moves
+
 SlowkingEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, CURSE
@@ -1358,6 +1387,19 @@ GranbullEvosAttacks:
 	dbw 51, TAKE_DOWN
 	db 0 ; no more level-up moves
 	
+CaretorkerEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, GUST
+	dbw 1, GROWL
+	dbw 10, SING
+	dbw 19, FLAIL
+	dbw 23, SAFEGUARD
+	; dbw 29, DISARMING_VOICE
+	dbw 35, WHIRLWIND
+	dbw 41, SOFTBOILED
+	; dbw 47, DAZZLING_GLEAM
+	db 0 ; no more level-up moves
+
 QwilfishEvosAttacks:
 	dbbw EVOLVE_ITEM, THUNDERSTONE, KAZEPPELIN
 	dbbw EVOLVE_ITEM, POISON_STONE, QWILFATHER
@@ -1735,6 +1777,7 @@ DonphanEvosAttacks:
 	db 0 ; no more level-up moves
 
 Porygon2EvosAttacks:
+	dbbw EVOLVE_TRADE, DUBIOUS_DISK, PORYGON_Z
 	db 0 ; no more evolutions
 	dbw 1, CONVERSION2
 	dbw 1, TACKLE
@@ -1748,7 +1791,22 @@ Porygon2EvosAttacks:
 	dbw 44, ZAP_CANNON
 	db 0 ; no more level-up moves
 	
+PorygonZEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, CONVERSION2
+	dbw 1, TACKLE
+	dbw 1, CONVERSION
+	dbw 9, AGILITY
+	dbw 12, PSYBEAM
+	dbw 20, RECOVER
+	dbw 24, METRONOME
+	dbw 32, LOCK_ON
+	dbw 36, TRI_ATTACK
+	dbw 44, ZAP_CANNON
+	db 0 ; no more level-up moves
+
 StantlerEvosAttacks:
+	dbbw EVOLVE_ITEM, HEART_STONE, WYRDEER
 	db 0 ; no more evolutions
 	dbw 1, TACKLE
 	dbw 8, LEER
@@ -1759,6 +1817,19 @@ StantlerEvosAttacks:
 	dbw 49, CONFUSE_RAY
 	db 0 ; no more level-up moves
 	
+WyrdeerEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, TACKLE
+	dbw 8, LEER
+	dbw 15, HYPNOSIS
+	dbw 23, STOMP
+	dbw 31, SAND_ATTACK
+	dbw 40, TAKE_DOWN
+	dbw 49, CONFUSE_RAY
+	dbw 55, PSYBEAM
+	dbw 62, MEGAHORN
+	db 0 ; no more level-up moves
+
 SmeargleEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, SKETCH
@@ -1822,6 +1893,16 @@ SmoochumEvosAttacks:
 	dbw 49, BLIZZARD
 	db 0 ; no more level-up moves
 
+ElebebiEvosAttacks:
+	dbbw EVOLVE_HAPPINESS, TR_ANYTIME, ELEKID
+	db 0 ; no more evolutions
+	dbw 1, QUICK_ATTACK
+	dbw 1, CHARM
+	dbw 5, THUNDER_WAVE
+	dbw 9, LOW_KICK
+	dbw 12, SWEET_KISS
+	db 0 ; no more level-up moves
+
 ElekidEvosAttacks:
 	dbbw EVOLVE_LEVEL, 30, ELECTABUZZ
 	db 0 ; no more evolutions

data/pokemon/evos_attacks_kanto.asm

@@ -121,6 +121,7 @@ EvosAttacksPointers1::
 	dw DodrioEvosAttacks
 	dw SeelEvosAttacks
 	dw DewgongEvosAttacks
+	dw SmujjEvosAttacks
 	dw GrimerEvosAttacks
 	dw MukEvosAttacks
 	dw ShellderEvosAttacks
@@ -140,6 +141,7 @@ EvosAttacksPointers1::
 	dw ExeggutorEvosAttacks
 	dw CuboneEvosAttacks
 	dw MarowakEvosAttacks
+	dw GuardiaEvosAttacks
 	dw HitmonleeEvosAttacks
 	dw HitmonchanEvosAttacks
 	dw LickitungEvosAttacks
@@ -149,6 +151,7 @@ EvosAttacksPointers1::
 	dw WeezingEvosAttacks
 	dw RhyhornEvosAttacks
 	dw RhydonEvosAttacks
+	dw HappinyEvosAttacks
 	dw ChanseyEvosAttacks
 	dw BurgelaEvosAttacks
 	dw TangelaEvosAttacks
@@ -164,13 +167,16 @@ EvosAttacksPointers1::
 	dw SeakingEvosAttacks
 	dw StaryuEvosAttacks
 	dw StarmieEvosAttacks
+	dw MimeJrEvosAttacks
 	dw MrMimeEvosAttacks
 	dw ScytherEvosAttacks
 	dw KleavorEvosAttacks
 	dw JynxEvosAttacks
 	dw BuuEvosAttacks
 	dw ElectabuzzEvosAttacks
+	dw ElectivireEvosAttacks
 	dw MagmarEvosAttacks
+	dw MagmortarEvosAttacks
 	dw PinsirEvosAttacks
 	dw TriculesEvosAttacks
 	dw TaurosEvosAttacks
@@ -180,6 +186,7 @@ EvosAttacksPointers1::
 	dw TerradosEvosAttacks
 	dw LaprasEvosAttacks
 	dw DittoEvosAttacks
+	dw MimmeoEvosAttacks
 	dw EeveeEvosAttacks
 	dw VaporeonEvosAttacks
 	dw JolteonEvosAttacks
@@ -189,12 +196,18 @@ EvosAttacksPointers1::
 	dw OmastarEvosAttacks
 	dw KabutoEvosAttacks
 	dw KabutopsEvosAttacks
+	dw FeradactylEvosAttacks
 	dw AerodactylEvosAttacks
+	dw DecillaEvosAttacks
+	dw GawarhedEvosAttacks
 	dw MunchlaxEvosAttacks
 	dw SnorlaxEvosAttacks
 	dw ArticunoEvosAttacks
 	dw ZapdosEvosAttacks
 	dw MoltresEvosAttacks
+	dw SqueamataEvosAttacks
+	dw MinistareEvosAttacks
+	dw IguanarchEvosAttacks
 	dw DratiniEvosAttacks
 	dw DragonairEvosAttacks
 	dw DragoniteEvosAttacks
@@ -1848,6 +1861,20 @@ DewgongEvosAttacks:
 	dbw 60, SAFEGUARD
 	db 0 ; no more level-up moves
 
+SmujjEvosAttacks:
+	dbbw EVOLVE_LEVEL, 20, GRIMER
+	db 0 ; no more evolutions
+	dbw 1, POISON_GAS
+	dbw 1, POUND
+	dbw 5, HARDEN
+	dbw 10, DISABLE
+	dbw 16, SLUDGE
+	dbw 21, MINIMIZE
+	dbw 27, SCREECH
+	dbw 34, ACID_ARMOR
+	dbw 42, SLUDGE_BOMB
+	db 0 ; no more level-up moves
+
 GrimerEvosAttacks:
 	dbbw EVOLVE_LEVEL, 38, MUK
 	db 0 ; no more evolutions
@@ -1867,9 +1894,9 @@ MukEvosAttacks:
 	dbw 1, POISON_GAS
 	dbw 1, POUND
 	dbw 1, HARDEN
-	dbw 33, HARDEN
+	dbw 5, HARDEN
-	dbw 37, DISABLE
+	dbw 10, DISABLE
-	dbw 45, SLUDGE
+	dbw 16, SLUDGE
 	dbw 23, MINIMIZE
 	dbw 31, SCREECH
 	dbw 45, ACID_ARMOR
@@ -2096,6 +2123,25 @@ CuboneEvosAttacks:
 	db 0 ; no more level-up moves
 
 MarowakEvosAttacks:
+	dbbw EVOLVE_ITEM, HEART_STONE, GUARDIA
+	db 0 ; no more evolutions
+	dbw 1, GROWL
+	dbw 1, TAIL_WHIP
+	dbw 1, BONE_CLUB
+	dbw 1, HEADBUTT
+	dbw 5, TAIL_WHIP
+	dbw 9, BONE_CLUB
+	dbw 13, HEADBUTT
+	dbw 17, LEER
+	dbw 21, FOCUS_ENERGY
+	dbw 25, BONEMERANG
+	dbw 32, RAGE
+	dbw 39, FALSE_SWIPE
+	dbw 46, THRASH
+	dbw 53, BONE_RUSH
+	db 0 ; no more level-up moves
+	
+GuardiaEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, GROWL
 	dbw 1, TAIL_WHIP
@@ -2237,8 +2283,18 @@ RhydonEvosAttacks:
 	dbw 65, EARTHQUAKE
 	db 0 ; no more level-up moves
 
+HappinyEvosAttacks:
+	dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CHANSEY
+	db 0 ; no more evolutions
+	dbw 1, POUND
+	dbw 1, CHARM
+	dbw 5, MIMIC
+	dbw 9, HEAL_BELL
+	dbw 12, SWEET_KISS
+	db 0 ; no more level-up moves
+
 ChanseyEvosAttacks:
-	dbbw EVOLVE_HAPPINESS, TR_ANYTIME, BLISSEY
+	dbbw EVOLVE_LEVEL, 45, BLISSEY
 	db 0 ; no more evolutions
 	dbw 1, POUND
 	dbw 5, GROWL
@@ -2446,6 +2502,23 @@ StarmieEvosAttacks:
 	dbw 37, CONFUSE_RAY
 	db 0 ; no more level-up moves
 
+MimeJrEvosAttacks:
+	dbbw EVOLVE_LEVEL, 18, MR__MIME ; tentative
+	db 0 ; no more evolutions
+	dbw 1, BARRIER
+	dbw 6, CONFUSION
+	dbw 11, SUBSTITUTE
+	dbw 16, MEDITATE
+	dbw 18, MIMIC
+	dbw 21, DOUBLESLAP
+	dbw 26, LIGHT_SCREEN
+	dbw 26, REFLECT
+	dbw 31, ENCORE
+	dbw 36, PSYBEAM
+	dbw 41, BATON_PASS
+	dbw 46, SAFEGUARD
+	db 0 ; no more level-up moves
+
 MrMimeEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, BARRIER
@@ -2524,6 +2597,7 @@ BuuEvosAttacks:
 	db 0
 
 ElectabuzzEvosAttacks:
+	dbbw EVOLVE_ITEM, THUNDERSTONE, ELECTIVIRE
 	db 0 ; no more evolutions
 	dbw 1, QUICK_ATTACK
 	dbw 1, LEER
@@ -2536,7 +2610,37 @@ ElectabuzzEvosAttacks:
 	dbw 58, THUNDER
 	db 0 ; no more level-up moves
 	
+ElectivireEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, QUICK_ATTACK
+	dbw 1, LEER
+	dbw 1, LOW_KICK
+	dbw 9, THUNDERPUNCH
+	dbw 17, LIGHT_SCREEN
+	dbw 25, SWIFT
+	dbw 36, SCREECH
+	dbw 47, THUNDERBOLT
+	dbw 58, THUNDER
+	db 0 ; no more level-up moves
+
 MagmarEvosAttacks:
+	dbbw EVOLVE_ITEM, FIRE_STONE, MAGMORTAR
+	db 0 ; no more evolutions
+	dbw 1, EMBER
+	dbw 1, LEER
+	dbw 1, SMOG
+	dbw 1, FIRE_PUNCH
+	dbw 7, LEER
+	dbw 13, SMOG
+	dbw 19, FIRE_PUNCH
+	dbw 25, SMOKESCREEN
+	dbw 33, SUNNY_DAY
+	dbw 41, FLAMETHROWER
+	dbw 49, CONFUSE_RAY
+	dbw 57, FIRE_BLAST
+	db 0 ; no more level-up moves
+	
+MagmortarEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, EMBER
 	dbw 1, LEER
@@ -2650,10 +2754,19 @@ LaprasEvosAttacks:
 	db 0 ; no more level-up moves
 
 DittoEvosAttacks:
+	dbbw EVOLVE_TRADE, METAL_COAT, MIMMEO
 	db 0 ; no more evolutions
 	dbw 1, TRANSFORM
 	db 0 ; no more level-up moves
 	
+MimmeoEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, TRANSFORM
+	dbw 30, MIST
+	dbw 40, LIGHT_SCREEN
+	dbw 50, REFLECT
+	db 0 ; no more level-up moves
+
 EeveeEvosAttacks:
 	dbbw EVOLVE_ITEM, THUNDERSTONE, JOLTEON
 	dbbw EVOLVE_ITEM, WATER_STONE, VAPOREON
@@ -2786,6 +2899,19 @@ KabutopsEvosAttacks:
 	dbw 65, ANCIENTPOWER
 	db 0 ; no more level-up moves
 
+FeradactylEvosAttacks:
+	dbbw EVOLVE_LEVEL, 40, AERODACTYL
+	db 0 ; no more evolutions
+	dbw 1, TAKE_DOWN
+	dbw 8, AGILITY
+	dbw 15, BITE
+	dbw 22, SUPERSONIC
+	dbw 28, ANCIENTPOWER
+	dbw 36, SCARY_FACE
+	dbw 43, ROCK_HEAD
+	dbw 50, HYPER_BEAM
+	db 0 ; no more level-up moves
+
 AerodactylEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, TAKE_DOWN
@@ -2799,6 +2925,34 @@ AerodactylEvosAttacks:
 	dbw 60, HYPER_BEAM
 	db 0 ; no more level-up moves
 	
+DecillaEvosAttacks:
+	dbbw EVOLVE_LEVEL, 40, GAWARHED
+	db 0 ; no more evolutions
+	dbw 1, TACKLE
+	dbw 1, GROWL
+	dbw 8, SUBSTITUTE
+	dbw 17, SCREECH
+	dbw 26, ROCK_THROW
+	dbw 35, ROAR
+	dbw 46, ROCK_SLIDE
+	dbw 51, ROCK_SLASH
+	dbw 57, HYPER_BEAM
+	db 0 ; no more level-up moves
+
+GawarhedEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, TACKLE
+	dbw 1, GROWL
+	dbw 8, SUBSTITUTE
+	dbw 17, SCREECH
+	dbw 26, ROCK_THROW
+	dbw 35, ROAR
+	dbw 40, OUTRAGE
+	dbw 51, ROCK_SLIDE
+	dbw 61, ROCK_SLASH
+	dbw 67, HYPER_BEAM
+	db 0 ; no more level-up moves
+
 MunchlaxEvosAttacks:
 	db EVOLVE_HAPPINESS, TR_ANYTIME, SNORLAX
 	db 0 ; no more evolutions
@@ -2865,6 +3019,50 @@ MoltresEvosAttacks:
 	dbw 73, SKY_ATTACK
 	db 0 ; no more level-up moves
 
+SqueamataEvosAttacks:
+	dbbw EVOLVE_LEVEL, 30, MINISTARE
+	db 0 ; no more evolutions
+	dbw 1, SCRATCH
+	dbw 1, TAIL_WHIP
+	dbw 8, LEER
+	dbw 15, BITE
+	dbw 22, DRAGON_RAGE
+	dbw 29, DRAGONBREATH
+	dbw 36, GLARE
+	dbw 43, CRUNCH
+	dbw 50, SLASH
+	dbw 57, OUTRAGE
+	db 0 ; no more level-up moves
+
+MinistareEvosAttacks:
+	dbbw EVOLVE_LEVEL, 50, IGUANARCH
+	db 0 ; no more evolutions
+	dbw 1, SCRATCH
+	dbw 1, TAIL_WHIP
+	dbw 8, LEER
+	dbw 15, BITE
+	dbw 22, DRAGON_RAGE
+	dbw 29, DRAGONBREATH
+	dbw 38, GLARE
+	dbw 47, CRUNCH
+	dbw 56, SLASH
+	dbw 65, OUTRAGE
+	db 0 ; no more level-up moves
+
+IguanarchEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, SCRATCH
+	dbw 1, TAIL_WHIP
+	dbw 8, LEER
+	dbw 15, BITE
+	dbw 22, DRAGON_RAGE
+	dbw 29, DRAGONBREATH
+	dbw 38, GLARE
+	dbw 47, CRUNCH
+	dbw 61, SLASH
+	dbw 75, OUTRAGE
+	db 0 ; no more level-up moves
+
 DratiniEvosAttacks:
 	dbbw EVOLVE_LEVEL, 30, DRAGONAIR
 	db 0 ; no more evolutions

data/pokemon/first_stages.asm

@@ -121,8 +121,9 @@ FirstEvoStages::
 	dw DODUO
 	dw SEEL
 	dw SEEL
-	dw GRIMER     ;58
+	dw SMUJJ
-	dw GRIMER
+	dw SMUJJ     ;58
+	dw SMUJJ
 	dw SHELLDER
 	dw SHELLDER
 	dw SHELLDER
@@ -140,6 +141,7 @@ FirstEvoStages::
 	dw EXEGGCUTE
 	dw CUBONE     ;68
 	dw CUBONE
+	dw CUBONE
 	dw TYROGUE
 	dw TYROGUE
 	dw LICKITUNG
@@ -149,7 +151,8 @@ FirstEvoStages::
 	dw KOFFING
 	dw RHYHORN
 	dw RHYHORN    ;70
-	dw CHANSEY
+	dw HAPPINY
+	dw HAPPINY
 	dw BURGELA
 	dw BURGELA
 	dw BURGELA
@@ -164,12 +167,15 @@ FirstEvoStages::
 	dw ORFRY
 	dw STARYU     ;78
 	dw STARYU
-	dw MR__MIME
+	dw MIME_JR_
+	dw MIME_JR_
 	dw SCYTHER
 	dw SCYTHER
 	dw SMOOCHUM
 	dw BUU
-	dw ELEKID
+	dw ELEBEBI
+	dw ELEBEBI
+	dw MAGBY
 	dw MAGBY
 	dw PINSIR
 	dw PINSIR
@@ -180,6 +186,7 @@ FirstEvoStages::
 	dw MAGIPREY
 	dw LAPRAS
 	dw DITTO
+	dw DITTO
 	dw EEVEE
 	dw EEVEE
 	dw EEVEE
@@ -189,12 +196,18 @@ FirstEvoStages::
 	dw OMANYTE
 	dw KABUTO
 	dw KABUTO
-	dw AERODACTYL
+	dw FERADACTYL
+	dw FERADACTYL
+	dw DECILLA
+	dw DECILLA
 	dw MUNCHLAX
 	dw MUNCHLAX
 	dw ARTICUNO   ;90
 	dw ZAPDOS
 	dw MOLTRES
+	dw SQUEAMATA
+	dw SQUEAMATA
+	dw SQUEAMATA
 	dw DRATINI
 	dw DRATINI
 	dw DRATINI
@@ -247,7 +260,8 @@ FirstEvoStages::
 	dw AZURILL
 	dw AZURILL
 	dw AZURILL     ;b8
-	dw SUDOWOODO
+	dw BONSLY
+	dw BONSLY
 	dw POLIWAG
 	dw HOPPIP
 	dw HOPPIP
@@ -270,6 +284,7 @@ FirstEvoStages::
 	dw EEVEE
 	dw EEVEE
 	dw MURKROW
+	dw MURKROW
 	dw SLOWPOKE
 	dw MISDREAVUS ;c8
 	dw MISDREAVUS
@@ -290,6 +305,7 @@ FirstEvoStages::
 	dw ONIX       ;d0
 	dw SNUBBULL
 	dw SNUBBULL
+	dw CARETORKER
 	dw QWILFISH
 	dw QWILFISH
 	dw QWILFISH
@@ -320,13 +336,16 @@ FirstEvoStages::
 	dw PHANPY
 	dw PHANPY     ;e8
 	dw PORYGON
+	dw PORYGON
+	dw STANTLER
 	dw STANTLER
 	dw SMEARGLE
 	dw GRENMAR
 	dw TYROGUE
 	dw TYROGUE
 	dw SMOOCHUM
-	dw ELEKID
+	dw ELEBEBI
+	dw ELEBEBI
 	dw MAGBY      ;f0
 	dw MILTANK
 	dw CHANSEY

data/pokemon/gen1_base_special.asm

@@ -122,6 +122,7 @@ KantoMonSpecials:
 	db  60 ; DODRIO
 	db  70 ; SEEL
 	db  95 ; DEWGONG
+	db  20 ; SMUJJ
 	db  40 ; GRIMER
 	db  65 ; MUK
 	db  45 ; SHELLDER
@@ -141,6 +142,7 @@ KantoMonSpecials:
 	db 125 ; EXEGGUTOR
 	db  40 ; CUBONE
 	db  50 ; MAROWAK
+	db 100 ; GUARDIA
 	db  35 ; HITMONLEE
 	db  35 ; HITMONCHAN
 	db  60 ; LICKITUNG
@@ -150,6 +152,7 @@ KantoMonSpecials:
 	db  85 ; WEEZING
 	db  30 ; RHYHORN
 	db  45 ; RHYDON
+	db  65 ; HAPPINY
 	db 105 ; CHANSEY
 	db  80 ; BURGELA
 	db 100 ; TANGELA
@@ -165,13 +168,16 @@ KantoMonSpecials:
 	db  80 ; SEAKING
 	db  70 ; STARYU
 	db 100 ; STARMIE
+	db  70 ; MIME_JR_
 	db 100 ; MR__MIME
 	db  55 ; SCYTHER
 	db  45 ; KLEAVOR
 	db  95 ; JYNX
 	db  85 ; BUU
 	db  85 ; ELECTABUZZ
+	db  85 ; ELECTIVIRE
 	db  85 ; MAGMAR
+	db  95 ; MAGMORTAR
 	db  55 ; PINSIR
 	db  55 ; TRICULES
 	db  70 ; TAUROS
@@ -181,6 +187,7 @@ KantoMonSpecials:
 	db 100 ; TERRADOS
 	db  95 ; LAPRAS
 	db  48 ; DITTO
+	db  50 ; MIMMEO
 	db  65 ; EEVEE
 	db 110 ; VAPOREON
 	db 110 ; JOLTEON
@@ -190,12 +197,18 @@ KantoMonSpecials:
 	db 115 ; OMASTAR
 	db  45 ; KABUTO
 	db  70 ; KABUTOPS
+	db  40 ; FERADACTYL
 	db  60 ; AERODACTYL
+	db  40 ; DECILLA
+	db  95 ; GAWARHED
 	db  40 ; MUNCHLAX
 	db  65 ; SNORLAX
 	db 125 ; ARTICUNO
 	db 125 ; ZAPDOS
 	db 125 ; MOLTRES
+	db  71 ; SQUEAMATA
+	db  81 ; MINISTARE
+	db 121 ; IGUANARCH
 	db  50 ; DRATINI
 	db  70 ; DRAGONAIR
 	db 100 ; DRAGONITE

data/pokemon/gen1_order.asm

@@ -374,4 +374,23 @@ Pokered_MonIndices:
 	db GAVILLAIN
 	db BUU
 	db GRENMAR
+	db SMUJJ
+	db GUARDIA
+	db HAPPINY
+	db MIME_JR_
+	db ELECTIVIRE
+	db MAGMORTAR
+	db MIMMEO
+	db SQUEAMATA
+	db MINISTARE
+	db IGUANARCH
+	db BONSLY
+	db HONCHKROW
+	db CARETORKER
+	db PORYGON_Z
+	db WYRDEER
+	db ELEBEBI
+	db FERADACTYL
+	db DECILLA
+	db GAWARHED
 	assert_table_length NUM_POKEMON - 1

data/pokemon/menu_icons.asm

@@ -122,6 +122,7 @@ MonMenuIcons:
 	db ICON_BIRD        ; DODRIO
 	db ICON_LAPRAS      ; SEEL
 	db ICON_LAPRAS      ; DEWGONG
+	db ICON_BLOB        ; SMUJJ
 	db ICON_BLOB        ; GRIMER
 	db ICON_BLOB        ; MUK
 	db ICON_SHELL       ; SHELLDER
@@ -141,6 +142,7 @@ MonMenuIcons:
 	db ICON_ODDISH      ; EXEGGUTOR
 	db ICON_MONSTER     ; CUBONE
 	db ICON_MONSTER     ; MAROWAK
+	db ICON_MONSTER     ; GUARDIA
 	db ICON_FIGHTER     ; HITMONLEE
 	db ICON_FIGHTER     ; HITMONCHAN
 	db ICON_MONSTER     ; LICKITUNG
@@ -150,6 +152,7 @@ MonMenuIcons:
 	db ICON_BLOB        ; WEEZING
 	db ICON_EQUINE      ; RHYHORN
 	db ICON_MONSTER     ; RHYDON
+	db ICON_CLEFAIRY    ; HAPPINY
 	db ICON_CLEFAIRY    ; CHANSEY
 	db ICON_ODDISH      ; BURGELA
 	db ICON_ODDISH      ; TANGELA
@@ -165,13 +168,16 @@ MonMenuIcons:
 	db ICON_FISH        ; SEAKING
 	db ICON_STARYU      ; STARYU
 	db ICON_STARYU      ; STARMIE
+	db ICON_HUMANSHAPE  ; MIME_JR_
 	db ICON_HUMANSHAPE  ; MR__MIME
 	db ICON_BUG         ; SCYTHER
 	db ICON_BUG         ; KLEAVOR
 	db ICON_HUMANSHAPE  ; JYNX
 	db ICON_HUMANSHAPE  ; BUU
 	db ICON_HUMANSHAPE  ; ELECTABUZZ
+	db ICON_HUMANSHAPE  ; ELECTIVIRE
 	db ICON_HUMANSHAPE  ; MAGMAR
+	db ICON_HUMANSHAPE  ; MAGMORTAR
 	db ICON_BUG         ; PINSIR
 	db ICON_BUG         ; TRICULES
 	db ICON_EQUINE      ; TAUROS
@@ -181,6 +187,7 @@ MonMenuIcons:
 	db ICON_GYARADOS    ; TERRADOS
 	db ICON_LAPRAS      ; LAPRAS
 	db ICON_BLOB        ; DITTO
+	db ICON_BLOB        ; MIMMEO
 	db ICON_FOX         ; EEVEE
 	db ICON_FOX         ; VAPOREON
 	db ICON_FOX         ; JOLTEON
@@ -190,12 +197,18 @@ MonMenuIcons:
 	db ICON_SHELL       ; OMASTAR
 	db ICON_SHELL       ; KABUTO
 	db ICON_SHELL       ; KABUTOPS
+	db ICON_MONSTER     ; FERADACTYL
 	db ICON_BIRD        ; AERODACTYL
+	db ICON_MONSTER     ; DECILLA
+	db ICON_MONSTER     ; GAWARHED
 	db ICON_SNORLAX     ; MUNCHLAX
 	db ICON_SNORLAX     ; SNORLAX
 	db ICON_BIRD        ; ARTICUNO
 	db ICON_BIRD        ; ZAPDOS
 	db ICON_BIRD        ; MOLTRES
+	db ICON_SERPENT     ; SQUEAMATA
+	db ICON_SERPENT     ; MINISTARE
+	db ICON_SERPENT     ; IGUANARCH
 	db ICON_SERPENT     ; DRATINI
 	db ICON_SERPENT     ; DRAGONAIR
 	db ICON_BIGMON      ; DRAGONITE
@@ -248,6 +261,7 @@ MonMenuIcons:
 	db ICON_JIGGLYPUFF  ; AZURILL
 	db ICON_JIGGLYPUFF  ; MARILL
 	db ICON_JIGGLYPUFF  ; AZUMARILL
+	db ICON_SUDOWOODO   ; BONSLY
 	db ICON_SUDOWOODO   ; SUDOWOODO
 	db ICON_POLIWAG     ; POLITOED
 	db ICON_ODDISH      ; HOPPIP
@@ -271,6 +285,7 @@ MonMenuIcons:
 	db ICON_FOX         ; GLACEON
 	db ICON_FOX         ; SYLVEON
 	db ICON_BIRD        ; MURKROW
+	db ICON_BIRD        ; HONCHKROW
 	db ICON_SLOWPOKE    ; SLOWKING
 	db ICON_GHOST       ; MISDREAVUS
 	db ICON_GHOST       ; MISMAGIUS
@@ -291,6 +306,7 @@ MonMenuIcons:
 	db ICON_SERPENT     ; STEELIX
 	db ICON_MONSTER     ; SNUBBULL
 	db ICON_MONSTER     ; GRANBULL
+	db ICON_BIRD        ; CARETORKER
 	db ICON_FISH        ; QWILFISH
 	db ICON_FISH        ; KAZEPPELIN
 	db ICON_FISH        ; QWILFATHER
@@ -321,12 +337,15 @@ MonMenuIcons:
 	db ICON_EQUINE      ; PHANPY
 	db ICON_EQUINE      ; DONPHAN
 	db ICON_VOLTORB     ; PORYGON2
+	db ICON_VOLTORB     ; PORYGON_Z
 	db ICON_EQUINE      ; STANTLER
+	db ICON_EQUINE      ; WYRDEER
 	db ICON_MONSTER     ; SMEARGLE
 	db ICON_LAPRAS      ; GRENMAR
 	db ICON_FIGHTER     ; TYROGUE
 	db ICON_FIGHTER     ; HITMONTOP
 	db ICON_HUMANSHAPE  ; SMOOCHUM
+	db ICON_HUMANSHAPE  ; ELEBEBI
 	db ICON_HUMANSHAPE  ; ELEKID
 	db ICON_HUMANSHAPE  ; MAGBY
 	db ICON_EQUINE      ; MILTANK

data/pokemon/names.asm

@@ -124,6 +124,7 @@ PokemonNames::
 	db "DODRIO@@@@"
 	db "SEEL@@@@@@"
 	db "DEWGONG@@@"
+	db "SMUJJ@@@@@"
 	db "GRIMER@@@@"
 	db "MUK@@@@@@@"
 	db "SHELLDER@@"
@@ -143,6 +144,7 @@ PokemonNames::
 	db "EXEGGUTOR@"
 	db "CUBONE@@@@"
 	db "MAROWAK@@@"
+	db "GUARDIA@@@"
 	db "HITMONLEE@"
 	db "HITMONCHAN"
 	db "LICKITUNG@"
@@ -152,6 +154,7 @@ PokemonNames::
 	db "WEEZING@@@"
 	db "RHYHORN@@@"
 	db "RHYDON@@@@"
+	db "HAPPINY@@@"
 	db "CHANSEY@@@"
 	db "BURGELA@@@"
 	db "TANGELA@@@"
@@ -167,13 +170,16 @@ PokemonNames::
 	db "SEAKING@@@"
 	db "STARYU@@@@"
 	db "STARMIE@@@"
+	db "MIME JR.@@"
 	db "MR.MIME@@@"
 	db "SCYTHER@@@"
 	db "KLEAVOR@@@"
 	db "JYNX@@@@@@"
 	db "BUU@@@@@@@"
 	db "ELECTABUZZ"
+	db "ELECTIVIRE"
 	db "MAGMAR@@@@"
+	db "MAGMORTAR@"
 	db "PINSIR@@@@"
 	db "TRICULES@@"
 	db "TAUROS@@@@"
@@ -183,6 +189,7 @@ PokemonNames::
 	db "TERRADOS@@"
 	db "LAPRAS@@@@"
 	db "DITTO@@@@@"
+	db "MIMMEO@@@@"
 	db "EEVEE@@@@@"
 	db "VAPOREON@@"
 	db "JOLTEON@@@"
@@ -192,12 +199,18 @@ PokemonNames::
 	db "OMASTAR@@@"
 	db "KABUTO@@@@"
 	db "KABUTOPS@@"
+	db "FERADACTYL"
 	db "AERODACTYL"
+	db "DECILLA@@@"
+	db "GAWARHED@@"
 	db "MUNCHLAX@@"
 	db "SNORLAX@@@"
 	db "ARTICUNO@@"
 	db "ZAPDOS@@@@"
 	db "MOLTRES@@@"
+	db "SQUEAMATA@"
+	db "MINISTARE@"
+	db "IGUANARCH@"
 	db "DRATINI@@@"
 	db "DRAGONAIR@"
 	db "DRAGONITE@"
@@ -250,6 +263,7 @@ PokemonNames::
 	db "AZURILL@@@"
 	db "MARILL@@@@"
 	db "AZUMARILL@"
+	db "BONSLY@@@@"
 	db "SUDOWOODO@"
 	db "POLITOED@@"
 	db "HOPPIP@@@@"
@@ -273,6 +287,7 @@ PokemonNames::
 	db "GLACEON@@@"
 	db "SYLVEON@@@"
 	db "MURKROW@@@"
+	db "HONCHKROW@"
 	db "SLOWKING@@"
 	db "MISDREAVUS"
 	db "MISMAGIUS@"
@@ -293,6 +308,7 @@ PokemonNames::
 	db "STEELIX@@@"
 	db "SNUBBULL@@"
 	db "GRANBULL@@"
+	db "CARETORKER"
 	db "QWILFISH@@"
 	db "KAZEPPELIN"
 	db "QWILFATHER"
@@ -323,12 +339,15 @@ PokemonNames::
 	db "PHANPY@@@@"
 	db "DONPHAN@@@"
 	db "PORYGON2@@"
+	db "PORYGON-Z@"
 	db "STANTLER@@"
+	db "WYRDEER@@@"
 	db "SMEARGLE@@"
 	db "GRENMAR@@@"
 	db "TYROGUE@@@"
 	db "HITMONTOP@"
 	db "SMOOCHUM@@"
+	db "ELEBEBI@@@"
 	db "ELEKID@@@@"
 	db "MAGBY@@@@@"
 	db "MILTANK@@@"

data/pokemon/palettes.asm

@@ -273,6 +273,8 @@ INCBIN "gfx/pokemon/seel/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/seel/shiny.pal"
 INCBIN "gfx/pokemon/dewgong/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/dewgong/shiny.pal"
+INCBIN "gfx/pokemon/smujj/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/smujj/shiny.pal"
 INCBIN "gfx/pokemon/grimer/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/grimer/shiny.pal"
 INCBIN "gfx/pokemon/muk/front.gbcpal", middle_colors
@@ -311,6 +313,8 @@ INCBIN "gfx/pokemon/cubone/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/cubone/shiny.pal"
 INCBIN "gfx/pokemon/marowak/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/marowak/shiny.pal"
+INCBIN "gfx/pokemon/guardia/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/guardia/shiny.pal"
 INCBIN "gfx/pokemon/hitmonlee/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/hitmonlee/shiny.pal"
 INCBIN "gfx/pokemon/hitmonchan/front.gbcpal", middle_colors
@@ -329,6 +333,8 @@ INCBIN "gfx/pokemon/rhyhorn/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/rhyhorn/shiny.pal"
 INCBIN "gfx/pokemon/rhydon/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/rhydon/shiny.pal"
+INCBIN "gfx/pokemon/happiny/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/happiny/shiny.pal"
 INCBIN "gfx/pokemon/chansey/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/chansey/shiny.pal"
 INCBIN "gfx/pokemon/burgela/front.gbcpal", middle_colors
@@ -359,6 +365,8 @@ INCBIN "gfx/pokemon/staryu/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/staryu/shiny.pal"
 INCBIN "gfx/pokemon/starmie/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/starmie/shiny.pal"
+INCBIN "gfx/pokemon/mime_jr_/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/mime_jr_/shiny.pal"
 INCBIN "gfx/pokemon/mr__mime/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/mr__mime/shiny.pal"
 INCBIN "gfx/pokemon/scyther/front.gbcpal", middle_colors
@@ -371,8 +379,12 @@ INCBIN "gfx/pokemon/buu/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/buu/shiny.pal"
 INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/electabuzz/shiny.pal"
+INCBIN "gfx/pokemon/electivire/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/electivire/shiny.pal"
 INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/magmar/shiny.pal"
+INCBIN "gfx/pokemon/magmortar/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/magmortar/shiny.pal"
 INCBIN "gfx/pokemon/pinsir/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/pinsir/shiny.pal"
 INCBIN "gfx/pokemon/tricules/front.gbcpal", middle_colors
@@ -391,6 +403,8 @@ INCBIN "gfx/pokemon/lapras/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/lapras/shiny.pal"
 INCBIN "gfx/pokemon/ditto/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/ditto/shiny.pal"
+INCBIN "gfx/pokemon/mimmeo/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/mimmeo/shiny.pal"
 INCBIN "gfx/pokemon/eevee/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/eevee/shiny.pal"
 INCBIN "gfx/pokemon/vaporeon/front.gbcpal", middle_colors
@@ -409,8 +423,14 @@ INCBIN "gfx/pokemon/kabuto/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/kabuto/shiny.pal"
 INCBIN "gfx/pokemon/kabutops/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/kabutops/shiny.pal"
+INCBIN "gfx/pokemon/feradactyl/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/feradactyl/shiny.pal"
 INCBIN "gfx/pokemon/aerodactyl/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/aerodactyl/shiny.pal"
+INCBIN "gfx/pokemon/decilla/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/decilla/shiny.pal"
+INCBIN "gfx/pokemon/gawarhed/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/gawarhed/shiny.pal"
 INCBIN "gfx/pokemon/munchlax/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/munchlax/shiny.pal"
 INCBIN "gfx/pokemon/snorlax/front.gbcpal", middle_colors
@@ -421,6 +441,12 @@ INCBIN "gfx/pokemon/zapdos/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/zapdos/shiny.pal"
 INCBIN "gfx/pokemon/moltres/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/moltres/shiny.pal"
+INCBIN "gfx/pokemon/squeamata/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/squeamata/shiny.pal"
+INCBIN "gfx/pokemon/ministare/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/ministare/shiny.pal"
+INCBIN "gfx/pokemon/iguanarch/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/iguanarch/shiny.pal"
 INCBIN "gfx/pokemon/dratini/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/dratini/shiny.pal"
 INCBIN "gfx/pokemon/dragonair/front.gbcpal", middle_colors
@@ -525,6 +551,8 @@ INCBIN "gfx/pokemon/marill/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/marill/shiny.pal"
 INCBIN "gfx/pokemon/azumarill/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/azumarill/shiny.pal"
+INCBIN "gfx/pokemon/bonsly/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/bonsly/shiny.pal"
 INCBIN "gfx/pokemon/sudowoodo/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sudowoodo/shiny.pal"
 INCBIN "gfx/pokemon/politoed/front.gbcpal", middle_colors
@@ -571,6 +599,8 @@ INCBIN "gfx/pokemon/sylveon/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sylveon/shiny.pal"
 INCBIN "gfx/pokemon/murkrow/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/murkrow/shiny.pal"
+INCBIN "gfx/pokemon/honchkrow/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/honchkrow/shiny.pal"
 INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/slowking/shiny.pal"
 INCBIN "gfx/pokemon/misdreavus/front.gbcpal", middle_colors
@@ -611,6 +641,8 @@ INCBIN "gfx/pokemon/snubbull/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/snubbull/shiny.pal"
 INCBIN "gfx/pokemon/granbull/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/granbull/shiny.pal"
+INCBIN "gfx/pokemon/caretorker/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/caretorker/shiny.pal"
 INCBIN "gfx/pokemon/qwilfish/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/qwilfish/shiny.pal"
 INCBIN "gfx/pokemon/kazeppelin/front.gbcpal", middle_colors
@@ -671,8 +703,12 @@ INCBIN "gfx/pokemon/donphan/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/donphan/shiny.pal"
 INCBIN "gfx/pokemon/porygon2/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/porygon2/shiny.pal"
+INCBIN "gfx/pokemon/porygon_z/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/porygon_z/shiny.pal"
 INCBIN "gfx/pokemon/stantler/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/stantler/shiny.pal"
+INCBIN "gfx/pokemon/wyrdeer/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/wyrdeer/shiny.pal"
 INCBIN "gfx/pokemon/smeargle/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/smeargle/shiny.pal"
 INCBIN "gfx/pokemon/grenmar/front.gbcpal", middle_colors
@@ -683,6 +719,8 @@ INCBIN "gfx/pokemon/hitmontop/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/hitmontop/shiny.pal"
 INCBIN "gfx/pokemon/smoochum/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/smoochum/shiny.pal"
+INCBIN "gfx/pokemon/elebebi/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/elebebi/shiny.pal"
 INCBIN "gfx/pokemon/elekid/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/elekid/shiny.pal"
 INCBIN "gfx/pokemon/magby/front.gbcpal", middle_colors

data/pokemon/pic_pointers.asm

@@ -253,6 +253,8 @@ PokemonPicPointers::
 	dba SeelBackpic
 	dba DewgongFrontpic
 	dba DewgongBackpic
+	dba SmujjFrontpic
+	dba SmujjBackpic
 	dba GrimerFrontpic
 	dba GrimerBackpic
 	dba MukFrontpic
@@ -291,6 +293,8 @@ PokemonPicPointers::
 	dba CuboneBackpic
 	dba MarowakFrontpic
 	dba MarowakBackpic
+	dba GuardiaBackpic
+	dba GuardiaBackpic
 	dba HitmonleeFrontpic
 	dba HitmonleeBackpic
 	dba HitmonchanFrontpic
@@ -309,6 +313,8 @@ PokemonPicPointers::
 	dba RhyhornBackpic
 	dba RhydonFrontpic
 	dba RhydonBackpic
+	dba HappinyFrontpic
+	dba HappinyBackpic
 	dba ChanseyFrontpic
 	dba ChanseyBackpic
 	dba BurgelaFrontpic
@@ -339,6 +345,8 @@ PokemonPicPointers::
 	dba StaryuBackpic
 	dba StarmieFrontpic
 	dba StarmieBackpic
+	dba MimeJrFrontpic
+	dba MimeJrBackpic
 	dba MrMimeFrontpic
 	dba MrMimeBackpic
 	dba ScytherFrontpic
@@ -351,8 +359,12 @@ PokemonPicPointers::
 	dba BuuBackpic
 	dba ElectabuzzFrontpic
 	dba ElectabuzzBackpic
+	dba ElectivireFrontpic
+	dba ElectivireBackpic
 	dba MagmarFrontpic
 	dba MagmarBackpic
+	dba MagmortarFrontpic
+	dba MagmortarBackpic
 	dba PinsirFrontpic
 	dba PinsirBackpic
 	dba TriculesFrontpic
@@ -371,6 +383,8 @@ PokemonPicPointers::
 	dba LaprasBackpic
 	dba DittoFrontpic
 	dba DittoBackpic
+	dba MimmeoFrontpic
+	dba MimmeoBackpic
 	dba EeveeFrontpic
 	dba EeveeBackpic
 	dba VaporeonFrontpic
@@ -389,8 +403,14 @@ PokemonPicPointers::
 	dba KabutoBackpic
 	dba KabutopsFrontpic
 	dba KabutopsBackpic
+	dba FeradactylFrontpic
+	dba FeradactylBackpic
 	dba AerodactylFrontpic
 	dba AerodactylBackpic
+	dba DecillaFrontpic
+	dba DecillaBackpic
+	dba GawarhedFrontpic
+	dba GawarhedBackpic
 	dba MunchlaxFrontpic
 	dba MunchlaxBackpic
 	dba SnorlaxFrontpic
@@ -401,6 +421,12 @@ PokemonPicPointers::
 	dba ZapdosBackpic
 	dba MoltresFrontpic
 	dba MoltresBackpic
+	dba SqueamataFrontpic
+	dba SqueamataBackpic
+	dba MinistareFrontpic
+	dba MinistareBackpic
+	dba IguanarchFrontpic
+	dba IguanarchBackpic
 	dba DratiniFrontpic
 	dba DratiniBackpic
 	dba DragonairFrontpic
@@ -505,6 +531,8 @@ PokemonPicPointers::
 	dba MarillBackpic
 	dba AzumarillFrontpic
 	dba AzumarillBackpic
+	dba BonslyFrontpic
+	dba BonslyBackpic
 	dba SudowoodoFrontpic
 	dba SudowoodoBackpic
 	dba PolitoedFrontpic
@@ -551,6 +579,8 @@ PokemonPicPointers::
 	dba SylveonBackpic
 	dba MurkrowFrontpic
 	dba MurkrowBackpic
+	dba HonchkrowFrontpic
+	dba HonchkrowBackpic
 	dba SlowkingFrontpic
 	dba SlowkingBackpic
 	dba MisdreavusFrontpic
@@ -594,6 +624,8 @@ PokemonPicPointers::
 	dba SnubbullBackpic
 	dba GranbullFrontpic
 	dba GranbullBackpic
+	dba CaretorkerFrontpic
+	dba CaretorkerBackpic
 	dba QwilfishFrontpic
 	dba QwilfishBackpic
 	dba KazeppelinFrontpic
@@ -654,8 +686,12 @@ PokemonPicPointers::
 	dba DonphanBackpic
 	dba Porygon2Frontpic
 	dba Porygon2Backpic
+	dba PorygonZFrontpic
+	dba PorygonZBackpic
 	dba StantlerFrontpic
 	dba StantlerBackpic
+	dba WyrdeerFrontpic
+	dba WyrdeerBackpic
 	dba SmeargleFrontpic
 	dba SmeargleBackpic
 	dba GrenmarFrontpic
@@ -666,6 +702,8 @@ PokemonPicPointers::
 	dba HitmontopBackpic
 	dba SmoochumFrontpic
 	dba SmoochumBackpic
+	dba ElebebiFrontpic
+	dba ElebebiBackpic
 	dba ElekidFrontpic
 	dba ElekidBackpic
 	dba MagbyFrontpic

data/wild/johto_grass.asm

@@ -298,57 +298,57 @@ JohtoGrassWildMons:
 	def_grass_wildmons BURNED_TOWER_1F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 13, VULPIII
+	dbw 16, VULPIII
-	dbw 14, KOFFING
+	dbw 17, KOFFING
-	dbw 15, VULPIII
+	dbw 17, VULPIII
-	dbw 14, ZUBAT
+	dbw 16, ZUBAT
-	dbw 16, KOFFING
+	dbw 18, KOFFING
-	dbw 15, KOLTA
+	dbw 18, KOLTA
-	dbw 15, KOLTA
+	dbw 16, KOLTA
 	; day
-	dbw 13, VULPIII
+	dbw 16, VULPIII
-	dbw 14, KOFFING
+	dbw 17, KOFFING
-	dbw 15, VULPIII
+	dbw 17, VULPIII
-	dbw 14, ZUBAT
+	dbw 16, ZUBAT
-	dbw 16, KOFFING
+	dbw 18, KOFFING
-	dbw 15, KOLTA
+	dbw 18, KOLTA
-	dbw 15, KOLTA
+	dbw 16, KOLTA
 	; nite
-	dbw 13, VULPIII
-	dbw 14, KOFFING
 	dbw 15, VULPIII
-	dbw 14, ZUBAT
+	dbw 17, KOFFING
-	dbw 16, KOFFING
+	dbw 16, VULPIII
-	dbw 15, HOUNDOUR
+	dbw 16, ZUBAT
-	dbw 15, HOUNDOUR
+	dbw 18, KOFFING
+	dbw 17, HOUNDOUR
+	dbw 18, HOUNDOUR
 	end_grass_wildmons
 
 	def_grass_wildmons BURNED_TOWER_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 14, PUPPERON
-	dbw 14, SLUGMA
-	dbw 16, SLUGMA
 	dbw 16, PUPPERON
-	dbw 15, ZUBAT
+	dbw 17, SLUGMA
-	dbw 14, MAGBY
+	dbw 18, SLUGMA
-	dbw 14, MAGBY
+	dbw 15, PUPPERON
+	dbw 18, ZUBAT
+	dbw 18, MAGBY
+	dbw 19, MAGBY
 	; day
-	dbw 14, PUPPERON
-	dbw 14, SLUGMA
-	dbw 16, SLUGMA
 	dbw 16, PUPPERON
-	dbw 15, ZUBAT
+	dbw 17, SLUGMA
-	dbw 14, MAGBY
+	dbw 18, SLUGMA
-	dbw 14, MAGBY
+	dbw 15, PUPPERON
+	dbw 18, ZUBAT
+	dbw 18, MAGBY
+	dbw 19, MAGBY
 	; nite
-	dbw 14, PUPPERON
+	dbw 17, HOUNDOUR
-	dbw 14, SLUGMA
 	dbw 16, SLUGMA
-	dbw 16, PUPPERON
+	dbw 17, SLUGMA
-	dbw 15, ZUBAT
+	dbw 18, HOUNDOUR
-	dbw 14, MAGMAR
+	dbw 16, ZUBAT
-	dbw 14, MAGMAR
+	dbw 18, MAGMAR
+	dbw 19, MAGMAR
 	end_grass_wildmons
 
 	def_grass_wildmons NATIONAL_PARK
@@ -370,11 +370,11 @@ JohtoGrassWildMons:
 	dbw 16, WEEDLE
 	dbw 16, BALUMBA
 	; nite
-	dbw 15, PSYDUCK
+	dbw 15, NIDORAN_M
-	dbw 15, HOOTHOOT
+	dbw 15, NIDORAN_F
 	dbw 14, SPINARAK
 	dbw 14, HOOTHOOT
-	dbw 15, VENONAT
+	dbw 15, PSYDUCK
 	dbw 16, VENONAT
 	dbw 16, VENONAT
 	end_grass_wildmons
@@ -1408,29 +1408,29 @@ JohtoGrassWildMons:
 	def_grass_wildmons ROUTE_34
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 10, SNUBBULL
+	dbw 11, SNUBBULL
 	dbw 11, PICHU
-	dbw 12, SNUBBULL
+	dbw 13, SNUBBULL
-	dbw 10, ABRA
+	dbw 11, ABRA
-	dbw 12, JIGGLYPUFF
+	dbw 12, HAPPINY
-	dbw 10, DITTO ; HAPPINY
+	dbw 12, CARETORKER
-	dbw 10, DITTO ; CARETORKER
+	dbw 13, CARETORKER
 	; day
-	dbw 10, SNUBBULL
+	dbw 11, SNUBBULL
 	dbw 11, PICHU
-	dbw 12, SNUBBULL
+	dbw 13, SNUBBULL
-	dbw 10, ABRA
+	dbw 11, ABRA
-	dbw 12, JIGGLYPUFF
+	dbw 12, HAPPINY
-	dbw 10, DITTO ; HAPPINY
+	dbw 12, CARETORKER
-	dbw 10, DITTO ; CARETORKER
+	dbw 13, CARETORKER
 	; nite
 	dbw 12, DROWZEE
 	dbw 11, CLEFFA
+	dbw 13, HOOTHOOT
+	dbw 11, ABRA
 	dbw 12, HOOTHOOT
-	dbw 10, ABRA
+	dbw 12, DITTO
-	dbw 12, HOOTHOOT
+	dbw 13, DITTO
-	dbw 10, DITTO
-	dbw 10, DITTO
 	end_grass_wildmons
 
 	def_grass_wildmons ROUTE_35
@@ -1440,54 +1440,53 @@ JohtoGrassWildMons:
 	dbw 14, PUPPERON
 	dbw 13, SNUBBULL
 	dbw 12, ABRA
-	dbw 12, JIGGLYPUFF
+	dbw 12, PUPPERON
-	dbw 12, ELEKID ; ELEBEBI
+	dbw 12, ELEBEBI
 	dbw 15, YANMA
 	; day
 	dbw 12, SNUBBULL
 	dbw 14, PUPPERON
 	dbw 13, SNUBBULL
 	dbw 12, ABRA
-	dbw 12, JIGGLYPUFF
+	dbw 12, PUPPERON
-	dbw 12, ELEKID ; ELEBEBI
+	dbw 12, ELEBEBI
 	dbw 15, YANMA
 	; nite
 	dbw 12, DROWZEE
 	dbw 14, VULPIII
 	dbw 13, DROWZEE
-	dbw 12, ABRA ; MIME_JR
+	dbw 12, MIME_JR_
 	dbw 13, HOOTHOOT
 	dbw 12, HOOTHOOT
 	dbw 15, ARIADOS ; Crystal has these laying around Ecruteak and it seemed cool alongside Yanma
 	end_grass_wildmons
 
-; uhh what's happening here?
 	def_grass_wildmons ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 4, LEDYBA
+	dbw 14, LEDYBA
-	dbw 4, PIDGEY
+	dbw 16, FARFETCH_D
-	dbw 5, BELLSPROUT
+	dbw 15, AERCROW
-	dbw 5, PUPPERON
+	dbw 15, KOTORA
-	dbw 5, PIDGEY
+	dbw 17, KOTORA
-	dbw 6, PIDGEY
+	dbw 14, NATU
-	dbw 6, PIDGEY
+	dbw 16, NATU
 	; day
-	dbw 4, PIDGEY
+	dbw 15, FARFETCH_D
-	dbw 4, PIDGEY
+	dbw 14, KOTORA
-	dbw 5, BELLSPROUT
+	dbw 15, BELLSPROUT
-	dbw 5, PUPPERON
+	dbw 16, AERCROW
-	dbw 5, PIDGEY
+	dbw 17, AERCROW
-	dbw 6, PIDGEY
+	dbw 15, NATU
-	dbw 6, PIDGEY
+	dbw 16, NATU
 	; nite
-	dbw 4, SPINARAK
+	dbw 15, SPINARAK
-	dbw 4, HOOTHOOT
+	dbw 14, HOOTHOOT
-	dbw 5, BELLSPROUT
+	dbw 16, BELLSPROUT
-	dbw 5, VULPIII ; Silver data, but specifically at night
+	dbw 14, VULPIII ; Silver data, but specifically at night
-	dbw 5, HOOTHOOT
+	dbw 15, HOOTHOOT
-	dbw 5, MISDREAVUS
+	dbw 16, MISDREAVUS
-	dbw 5, MISDREAVUS
+	dbw 17, MISDREAVUS
 	end_grass_wildmons
 
 ; Restored the 30% Stantler from GS.
@@ -1496,29 +1495,29 @@ JohtoGrassWildMons:
 	def_grass_wildmons ROUTE_37
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 15, PUPPERON
-	dbw 16, STANTLER
-	dbw 16, PIDGEY
 	dbw 16, GROWLITHE
-	dbw 15, PIDGEOTTO
+	dbw 18, STANTLER
-	dbw 15, LEDIAN
+	dbw 17, PIDGEOTTO
-	dbw 15, LEDIAN
+	dbw 17, GROWLITHE
+	dbw 15, BONSLY
+	dbw 18, LEDIAN
+	dbw 19, LEDIAN
 	; day
-	dbw 15, PUPPERON
-	dbw 16, STANTLER
-	dbw 15, PIDGEY
 	dbw 16, GROWLITHE
-	dbw 15, PIDGEOTTO
+	dbw 17, STANTLER
-	dbw 15, PIDGEY
+	dbw 17, PIDGEOTTO
-	dbw 15, PIDGEY
+	dbw 18, GROWLITHE
+	dbw 15, BONSLY
+	dbw 17, KOLTA
+	dbw 18, KOLTA
 	; nite
-	dbw 15, SPINARAK
+	dbw 16, VULPIX
-	dbw 16, STANTLER
+	dbw 18, STANTLER
-	dbw 15, HOOTHOOT
+	dbw 17, HOOTHOOT
 	dbw 16, MURKROW
-	dbw 15, MURKROW
+	dbw 18, MURKROW
-	dbw 15, ARIADOS
+	dbw 16, ARIADOS
-	dbw 15, ARIADOS
+	dbw 19, ARIADOS
 	end_grass_wildmons
 
 ; Made Murkrow a 10% night time encounter for increased Johto frequency.
@@ -1556,23 +1555,23 @@ JohtoGrassWildMons:
 	; morn
 	dbw 21, FURRET
 	dbw 22, FURRET
-	dbw 21, MAGNEMITE
+	dbw 21, MAGNETITE
-	dbw 23, PIDGEOTTO
+	dbw 23, SUNBUD
 	dbw 24, MILTANK
 	dbw 24, TAUROS
 	dbw 24, TAUROS
 	; day
 	dbw 21, FURRET
 	dbw 22, FURRET
-	dbw 21, MAGNEMITE
+	dbw 21, MAGNETITE
-	dbw 23, PIDGEOTTO
+	dbw 23, SUNBUD
 	dbw 24, MILTANK
 	dbw 24, TAUROS
 	dbw 24, TAUROS
 	; nite
 	dbw 23, MOIBELLE
 	dbw 21, RATICATE
-	dbw 22, MAGNEMITE
+	dbw 22, MAGNETITE
 	dbw 22, MOIBELLE
 	dbw 21, MURKROW
 	dbw 21, MURKROW

data/wild/johto_water.asm

@@ -13,14 +13,14 @@ JohtoWaterWildMons:
 	db 2 percent ; encounter rate
 	dbw 15, WOOPER
 	dbw 20, QUAGSIRE
-	dbw 15, QUAGSIRE
+	dbw 15, RIBBITO
 	end_water_wildmons
 
 	def_water_wildmons UNION_CAVE_B1F
 	db 2 percent ; encounter rate
 	dbw 15, WOOPER
 	dbw 20, QUAGSIRE
-	dbw 15, QUAGSIRE
+	dbw 15, RIBBITO
 	end_water_wildmons
 
 	def_water_wildmons UNION_CAVE_B2F
@@ -151,14 +151,14 @@ JohtoWaterWildMons:
 
 	def_water_wildmons ROUTE_34
 	db 6 percent ; encounter rate
-	dbw 20, TENTACOOL ; MANTYKE
+	dbw 20, MANTYKE
-	dbw 15, TENTACOOL
+	dbw 15, CHINCHOU
-	dbw 20, TENTACRUEL
+	dbw 20, TENTACOOL
 	end_water_wildmons
 
 	def_water_wildmons ROUTE_35
 	db 4 percent ; encounter rate
-	dbw 20, PSYDUCK
+	dbw 20, MANTYKE
 	dbw 25, WEIRDUCK
 	dbw 35, GOLDUCK
 	end_water_wildmons

engine/items/item_effects.asm

@@ -189,7 +189,7 @@ ItemEffects:
 	dw RestoreHPEffect     ; BERRY
 	dw RestoreHPEffect     ; GOLD_BERRY
 	dw SquirtbottleEffect  ; SQUIRTBOTTLE
-	dw NoEffect            ; ITEM_B0
+	dw NoEffect            ; DUBIOUS_DISK
 	dw PokeBallEffect      ; PARK_BALL
 	dw NoEffect            ; RAINBOW_WING
 	dw NoEffect            ; ITEM_B3

gfx/footprints.asm

@@ -121,6 +121,7 @@ INCBIN "gfx/footprints/doduo.1bpp"
 INCBIN "gfx/footprints/dodrio.1bpp"
 INCBIN "gfx/footprints/seel.1bpp"
 INCBIN "gfx/footprints/dewgong.1bpp"
+INCBIN "gfx/footprints/smujj.1bpp"
 INCBIN "gfx/footprints/grimer.1bpp"
 INCBIN "gfx/footprints/muk.1bpp"
 INCBIN "gfx/footprints/shellder.1bpp"
@@ -140,6 +141,7 @@ INCBIN "gfx/footprints/exeggcute.1bpp"
 INCBIN "gfx/footprints/exeggutor.1bpp"
 INCBIN "gfx/footprints/cubone.1bpp"
 INCBIN "gfx/footprints/marowak.1bpp"
+INCBIN "gfx/footprints/guardia.1bpp"
 INCBIN "gfx/footprints/hitmonlee.1bpp"
 INCBIN "gfx/footprints/hitmonchan.1bpp"
 INCBIN "gfx/footprints/lickitung.1bpp"
@@ -149,6 +151,7 @@ INCBIN "gfx/footprints/koffing.1bpp"
 INCBIN "gfx/footprints/weezing.1bpp"
 INCBIN "gfx/footprints/rhyhorn.1bpp"
 INCBIN "gfx/footprints/rhydon.1bpp"
+INCBIN "gfx/footprints/happiny.1bpp"
 INCBIN "gfx/footprints/chansey.1bpp"
 INCBIN "gfx/footprints/burgela.1bpp"
 INCBIN "gfx/footprints/tangela.1bpp"
@@ -164,13 +167,16 @@ INCBIN "gfx/footprints/goldeen.1bpp"
 INCBIN "gfx/footprints/seaking.1bpp"
 INCBIN "gfx/footprints/staryu.1bpp"
 INCBIN "gfx/footprints/starmie.1bpp"
+INCBIN "gfx/footprints/mime_jr_.1bpp"
 INCBIN "gfx/footprints/mr__mime.1bpp"
 INCBIN "gfx/footprints/scyther.1bpp"
 INCBIN "gfx/footprints/kleavor.1bpp"
 INCBIN "gfx/footprints/jynx.1bpp"
 INCBIN "gfx/footprints/buu.1bpp"
 INCBIN "gfx/footprints/electabuzz.1bpp"
+INCBIN "gfx/footprints/electivire.1bpp"
 INCBIN "gfx/footprints/magmar.1bpp"
+INCBIN "gfx/footprints/magmortar.1bpp"
 INCBIN "gfx/footprints/pinsir.1bpp"
 INCBIN "gfx/footprints/tricules.1bpp"
 INCBIN "gfx/footprints/tauros.1bpp"
@@ -180,6 +186,7 @@ INCBIN "gfx/footprints/magiprey.1bpp"
 INCBIN "gfx/footprints/terrados.1bpp"
 INCBIN "gfx/footprints/lapras.1bpp"
 INCBIN "gfx/footprints/ditto.1bpp"
+INCBIN "gfx/footprints/mimmeo.1bpp"
 INCBIN "gfx/footprints/eevee.1bpp"
 INCBIN "gfx/footprints/vaporeon.1bpp"
 INCBIN "gfx/footprints/jolteon.1bpp"
@@ -189,12 +196,18 @@ INCBIN "gfx/footprints/omanyte.1bpp"
 INCBIN "gfx/footprints/omastar.1bpp"
 INCBIN "gfx/footprints/kabuto.1bpp"
 INCBIN "gfx/footprints/kabutops.1bpp"
+INCBIN "gfx/footprints/feradactyl.1bpp"
 INCBIN "gfx/footprints/aerodactyl.1bpp"
+INCBIN "gfx/footprints/decilla.1bpp"
+INCBIN "gfx/footprints/gawarhed.1bpp"
 INCBIN "gfx/footprints/munchlax.1bpp"
 INCBIN "gfx/footprints/snorlax.1bpp"
 INCBIN "gfx/footprints/articuno.1bpp"
 INCBIN "gfx/footprints/zapdos.1bpp"
 INCBIN "gfx/footprints/moltres.1bpp"
+INCBIN "gfx/footprints/squeamata.1bpp"
+INCBIN "gfx/footprints/ministare.1bpp"
+INCBIN "gfx/footprints/iguanarch.1bpp"
 INCBIN "gfx/footprints/dratini.1bpp"
 INCBIN "gfx/footprints/dragonair.1bpp"
 INCBIN "gfx/footprints/dragonite.1bpp"
@@ -247,6 +260,7 @@ INCBIN "gfx/footprints/bellossom.1bpp"
 INCBIN "gfx/footprints/azurill.1bpp"
 INCBIN "gfx/footprints/marill.1bpp"
 INCBIN "gfx/footprints/azumarill.1bpp"
+INCBIN "gfx/footprints/bonsly.1bpp"
 INCBIN "gfx/footprints/sudowoodo.1bpp"
 INCBIN "gfx/footprints/politoed.1bpp"
 INCBIN "gfx/footprints/hoppip.1bpp"
@@ -270,6 +284,7 @@ INCBIN "gfx/footprints/leafeon.1bpp"
 INCBIN "gfx/footprints/glaceon.1bpp"
 INCBIN "gfx/footprints/sylveon.1bpp"
 INCBIN "gfx/footprints/murkrow.1bpp"
+INCBIN "gfx/footprints/honchkrow.1bpp"
 INCBIN "gfx/footprints/slowking.1bpp"
 INCBIN "gfx/footprints/misdreavus.1bpp"
 INCBIN "gfx/footprints/mismagius.1bpp"
@@ -290,6 +305,7 @@ INCBIN "gfx/footprints/gligar.1bpp"
 INCBIN "gfx/footprints/steelix.1bpp"
 INCBIN "gfx/footprints/snubbull.1bpp"
 INCBIN "gfx/footprints/granbull.1bpp"
+INCBIN "gfx/footprints/caretorker.1bpp"
 INCBIN "gfx/footprints/qwilfish.1bpp"
 INCBIN "gfx/footprints/kazeppelin.1bpp"
 INCBIN "gfx/footprints/qwilfather.1bpp"
@@ -320,12 +336,15 @@ INCBIN "gfx/footprints/kingdra.1bpp"
 INCBIN "gfx/footprints/phanpy.1bpp"
 INCBIN "gfx/footprints/donphan.1bpp"
 INCBIN "gfx/footprints/porygon2.1bpp"
+INCBIN "gfx/footprints/porygon_z.1bpp"
 INCBIN "gfx/footprints/stantler.1bpp"
+INCBIN "gfx/footprints/wyrdeer.1bpp"
 INCBIN "gfx/footprints/smeargle.1bpp"
 INCBIN "gfx/footprints/grenmar.1bpp"
 INCBIN "gfx/footprints/tyrogue.1bpp"
 INCBIN "gfx/footprints/hitmontop.1bpp"
 INCBIN "gfx/footprints/smoochum.1bpp"
+INCBIN "gfx/footprints/elebebi.1bpp"
 INCBIN "gfx/footprints/elekid.1bpp"
 INCBIN "gfx/footprints/magby.1bpp"
 INCBIN "gfx/footprints/miltank.1bpp"

gfx/pics.asm

@@ -986,3 +986,44 @@ BuuFrontpic:	INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz"
 BuuBackpic:       INCBIN "gfx/pokemon/buu/back.2bpp.lz"
 GrenmarFrontpic:	INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz"
 GrenmarBackpic:       INCBIN "gfx/pokemon/grenmar/back.2bpp.lz"
+
+SECTION "Pics 23", ROMX
+
+SmujjFrontpic:       INCBIN "gfx/pokemon/smujj/front.animated.2bpp.lz"
+SmujjBackpic:        INCBIN "gfx/pokemon/smujj/back.2bpp.lz"
+GuardiaFrontpic:     INCBIN "gfx/pokemon/guardia/front.animated.2bpp.lz"
+GuardiaBackpic:      INCBIN "gfx/pokemon/guardia/back.2bpp.lz"
+HappinyFrontpic:     INCBIN "gfx/pokemon/happiny/front.animated.2bpp.lz"
+HappinyBackpic:      INCBIN "gfx/pokemon/happiny/back.2bpp.lz"
+MimeJrFrontpic:      INCBIN "gfx/pokemon/mime_jr_/front.animated.2bpp.lz"
+MimeJrBackpic:       INCBIN "gfx/pokemon/mime_jr_/back.2bpp.lz"
+ElectivireFrontpic:  INCBIN "gfx/pokemon/electivire/front.animated.2bpp.lz"
+ElectivireBackpic:   INCBIN "gfx/pokemon/electivire/back.2bpp.lz"
+MagmortarFrontpic:   INCBIN "gfx/pokemon/magmortar/front.animated.2bpp.lz"
+MagmortarBackpic:    INCBIN "gfx/pokemon/magmortar/back.2bpp.lz"
+MimmeoFrontpic:      INCBIN "gfx/pokemon/mimmeo/front.animated.2bpp.lz"
+MimmeoBackpic:       INCBIN "gfx/pokemon/mimmeo/back.2bpp.lz"
+SqueamataFrontpic:   INCBIN "gfx/pokemon/squeamata/front.animated.2bpp.lz"
+SqueamataBackpic:    INCBIN "gfx/pokemon/squeamata/back.2bpp.lz"
+MinistareFrontpic:   INCBIN "gfx/pokemon/ministare/front.animated.2bpp.lz"
+MinistareBackpic:    INCBIN "gfx/pokemon/ministare/back.2bpp.lz"
+IguanarchFrontpic:   INCBIN "gfx/pokemon/iguanarch/front.animated.2bpp.lz"
+IguanarchBackpic:    INCBIN "gfx/pokemon/iguanarch/back.2bpp.lz"
+BonslyFrontpic:      INCBIN "gfx/pokemon/bonsly/front.animated.2bpp.lz"
+BonslyBackpic:       INCBIN "gfx/pokemon/bonsly/back.2bpp.lz"
+HonchkrowFrontpic:   INCBIN "gfx/pokemon/honchkrow/front.animated.2bpp.lz"
+HonchkrowBackpic:    INCBIN "gfx/pokemon/honchkrow/back.2bpp.lz"
+CaretorkerFrontpic:  INCBIN "gfx/pokemon/caretorker/front.animated.2bpp.lz"
+CaretorkerBackpic:   INCBIN "gfx/pokemon/caretorker/back.2bpp.lz"
+PorygonZFrontpic:    INCBIN "gfx/pokemon/porygon_z/front.animated.2bpp.lz"
+PorygonZBackpic:     INCBIN "gfx/pokemon/porygon_z/back.2bpp.lz"
+WyrdeerFrontpic:     INCBIN "gfx/pokemon/wyrdeer/front.animated.2bpp.lz"
+WyrdeerBackpic:      INCBIN "gfx/pokemon/wyrdeer/back.2bpp.lz"
+ElebebiFrontpic:     INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz"
+ElebebiBackpic:      INCBIN "gfx/pokemon/elebebi/back.2bpp.lz"
+FeradactylFrontpic:  INCBIN "gfx/pokemon/feradactyl/front.animated.2bpp.lz"
+FeradactylBackpic:   INCBIN "gfx/pokemon/feradactyl/back.2bpp.lz"
+DecillaFrontpic:     INCBIN "gfx/pokemon/decilla/front.animated.2bpp.lz"
+DecillaBackpic:      INCBIN "gfx/pokemon/decilla/back.2bpp.lz"
+GawarhedFrontpic:    INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz"
+GawarhedBackpic:     INCBIN "gfx/pokemon/gawarhed/back.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -120,6 +120,7 @@ AnimationPointers:
 	dw DodrioAnimation
 	dw SeelAnimation
 	dw DewgongAnimation
+	dw SmujjAnimation
 	dw GrimerAnimation
 	dw MukAnimation
 	dw ShellderAnimation
@@ -139,6 +140,7 @@ AnimationPointers:
 	dw ExeggutorAnimation
 	dw CuboneAnimation
 	dw MarowakAnimation
+	dw GuardiaAnimation
 	dw HitmonleeAnimation
 	dw HitmonchanAnimation
 	dw LickitungAnimation
@@ -148,6 +150,7 @@ AnimationPointers:
 	dw WeezingAnimation
 	dw RhyhornAnimation
 	dw RhydonAnimation
+	dw HappinyAnimation
 	dw ChanseyAnimation
 	dw BurgelaAnimation
 	dw TangelaAnimation
@@ -163,13 +166,16 @@ AnimationPointers:
 	dw SeakingAnimation
 	dw StaryuAnimation
 	dw StarmieAnimation
+	dw MimeJrAnimation
 	dw MrMimeAnimation
 	dw ScytherAnimation
 	dw KleavorAnimation
 	dw JynxAnimation
 	dw BuuAnimation
 	dw ElectabuzzAnimation
+	dw ElectivireAnimation
 	dw MagmarAnimation
+	dw MagmortarAnimation
 	dw PinsirAnimation
 	dw TriculesAnimation
 	dw TaurosAnimation
@@ -179,6 +185,7 @@ AnimationPointers:
 	dw TerradosAnimation
 	dw LaprasAnimation
 	dw DittoAnimation
+	dw MimmeoAnimation
 	dw EeveeAnimation
 	dw VaporeonAnimation
 	dw JolteonAnimation
@@ -188,12 +195,18 @@ AnimationPointers:
 	dw OmastarAnimation
 	dw KabutoAnimation
 	dw KabutopsAnimation
+	dw FeradactylAnimation
 	dw AerodactylAnimation
+	dw DecillaAnimation
+	dw GawarhedAnimation
 	dw MunchlaxAnimation
 	dw SnorlaxAnimation
 	dw ArticunoAnimation
 	dw ZapdosAnimation
 	dw MoltresAnimation
+	dw SqueamataAnimation
+	dw MinistareAnimation
+	dw IguanarchAnimation
 	dw DratiniAnimation
 	dw DragonairAnimation
 	dw DragoniteAnimation
@@ -246,6 +259,7 @@ AnimationPointers:
 	dw AzurillAnimation
 	dw MarillAnimation
 	dw AzumarillAnimation
+	dw BonslyAnimation
 	dw SudowoodoAnimation
 	dw PolitoedAnimation
 	dw HoppipAnimation
@@ -269,6 +283,7 @@ AnimationPointers:
 	dw GlaceonAnimation
 	dw SylveonAnimation
 	dw MurkrowAnimation
+	dw HonchkrowAnimation
 	dw SlowkingAnimation
 	dw MisdreavusAnimation
 	dw MismagiusAnimation
@@ -289,6 +304,7 @@ AnimationPointers:
 	dw SteelixAnimation
 	dw SnubbullAnimation
 	dw GranbullAnimation
+	dw CaretorkerAnimation
 	dw QwilfishAnimation
 	dw KazeppelinAnimation
 	dw QwilfatherAnimation
@@ -319,12 +335,15 @@ AnimationPointers:
 	dw PhanpyAnimation
 	dw DonphanAnimation
 	dw Porygon2Animation
+	dw PorygonZAnimation
 	dw StantlerAnimation
+	dw WyrdeerAnimation
 	dw SmeargleAnimation
 	dw GrenmarAnimation
 	dw TyrogueAnimation
 	dw HitmontopAnimation
 	dw SmoochumAnimation
+	dw ElebebiAnimation
 	dw ElekidAnimation
 	dw MagbyAnimation
 	dw MiltankAnimation

gfx/pokemon/anims.asm

@@ -118,6 +118,7 @@ DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim.asm"
 DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim.asm"
 SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim.asm"
 DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim.asm"
+SmujjAnimation:      INCLUDE "gfx/pokemon/smujj/anim.asm"
 GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim.asm"
 MukAnimation:        INCLUDE "gfx/pokemon/muk/anim.asm"
 ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim.asm"
@@ -137,6 +138,7 @@ ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim.asm"
 ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim.asm"
 CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim.asm"
 MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim.asm"
+GuardiaAnimation:    INCLUDE "gfx/pokemon/guardia/anim.asm"
 HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim.asm"
 HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim.asm"
 LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim.asm"
@@ -146,6 +148,7 @@ KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim.asm"
 WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim.asm"
 RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim.asm"
 RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim.asm"
+HappinyAnimation:    INCLUDE "gfx/pokemon/happiny/anim.asm"
 ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim.asm"
 BurgelaAnimation:    INCLUDE "gfx/pokemon/burgela/anim.asm"
 TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim.asm"
@@ -161,13 +164,16 @@ GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim.asm"
 SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim.asm"
 StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim.asm"
 StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim.asm"
+MimeJrAnimation:     INCLUDE "gfx/pokemon/mime_jr_/anim.asm"
 MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim.asm"
 ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim.asm"
 KleavorAnimation:    INCLUDE "gfx/pokemon/kleavor/anim.asm"
 JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim.asm"
 BuuAnimation:       INCLUDE "gfx/pokemon/buu/anim.asm"
 ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm"
+ElectivireAnimation: INCLUDE "gfx/pokemon/electivire/anim.asm"
 MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim.asm"
+MagmortarAnimation:  INCLUDE "gfx/pokemon/magmortar/anim.asm"
 PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim.asm"
 TriculesAnimation:   INCLUDE "gfx/pokemon/tricules/anim.asm"
 TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim.asm"
@@ -177,6 +183,7 @@ MagipreyAnimation:   INCLUDE "gfx/pokemon/magiprey/anim.asm"
 TerradosAnimation:   INCLUDE "gfx/pokemon/terrados/anim.asm"
 LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim.asm"
 DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim.asm"
+MimmeoAnimation:     INCLUDE "gfx/pokemon/mimmeo/anim.asm"
 EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim.asm"
 VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim.asm"
 JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim.asm"
@@ -186,12 +193,18 @@ OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim.asm"
 OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim.asm"
 KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim.asm"
 KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim.asm"
+FeradactylAnimation: INCLUDE "gfx/pokemon/feradactyl/anim.asm"
 AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim.asm"
+DecillaAnimation:    INCLUDE "gfx/pokemon/decilla/anim.asm"
+GawarhedAnimation:   INCLUDE "gfx/pokemon/gawarhed/anim.asm"
 MunchlaxAnimation:   INCLUDE "gfx/pokemon/munchlax/anim.asm"
 SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim.asm"
 ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim.asm"
 ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim.asm"
 MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim.asm"
+SqueamataAnimation:  INCLUDE "gfx/pokemon/squeamata/anim.asm"
+MinistareAnimation:  INCLUDE "gfx/pokemon/ministare/anim.asm"
+IguanarchAnimation:  INCLUDE "gfx/pokemon/iguanarch/anim.asm"
 DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim.asm"
 DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim.asm"
 DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim.asm"
@@ -244,6 +257,7 @@ BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim.asm"
 AzurillAnimation:    INCLUDE "gfx/pokemon/azurill/anim.asm"
 MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim.asm"
 AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim.asm"
+BonslyAnimation:     INCLUDE "gfx/pokemon/bonsly/anim.asm"
 SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim.asm"
 PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim.asm"
 HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim.asm"
@@ -267,6 +281,7 @@ LeafeonAnimation:   INCLUDE "gfx/pokemon/leafeon/anim.asm"
 GlaceonAnimation:   INCLUDE "gfx/pokemon/glaceon/anim.asm"
 SylveonAnimation:   INCLUDE "gfx/pokemon/sylveon/anim.asm"
 MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim.asm"
+HonchkrowAnimation:  INCLUDE "gfx/pokemon/honchkrow/anim.asm"
 SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim.asm"
 MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm"
 MismagiusAnimation:  INCLUDE "gfx/pokemon/mismagius/anim.asm"
@@ -287,6 +302,7 @@ GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim.asm"
 SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim.asm"
 SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim.asm"
 GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim.asm"
+CaretorkerAnimation: INCLUDE "gfx/pokemon/caretorker/anim.asm"
 QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim.asm"
 KazeppelinAnimation: INCLUDE "gfx/pokemon/kazeppelin/anim.asm"
 QwilfatherAnimation: INCLUDE "gfx/pokemon/qwilfather/anim.asm"
@@ -317,12 +333,15 @@ KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim.asm"
 PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim.asm"
 DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim.asm"
 Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim.asm"
+PorygonZAnimation:   INCLUDE "gfx/pokemon/porygon_z/anim.asm"
 StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim.asm"
+WyrdeerAnimation:    INCLUDE "gfx/pokemon/wyrdeer/anim.asm"
 SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim.asm"
 GrenmarAnimation:       INCLUDE "gfx/pokemon/grenmar/anim.asm"
 TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim.asm"
 HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim.asm"
 SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim.asm"
+ElebebiAnimation:    INCLUDE "gfx/pokemon/elebebi/anim.asm"
 ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim.asm"
 MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim.asm"
 MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -120,6 +120,7 @@ BitmasksPointers:
 	dw DodrioBitmasks
 	dw SeelBitmasks
 	dw DewgongBitmasks
+	dw SmujjBitmasks
 	dw GrimerBitmasks
 	dw MukBitmasks
 	dw ShellderBitmasks
@@ -139,6 +140,7 @@ BitmasksPointers:
 	dw ExeggutorBitmasks
 	dw CuboneBitmasks
 	dw MarowakBitmasks
+	dw GuardiaBitmasks
 	dw HitmonleeBitmasks
 	dw HitmonchanBitmasks
 	dw LickitungBitmasks
@@ -148,6 +150,7 @@ BitmasksPointers:
 	dw WeezingBitmasks
 	dw RhyhornBitmasks
 	dw RhydonBitmasks
+	dw HappinyBitmasks
 	dw ChanseyBitmasks
 	dw BurgelaBitmasks
 	dw TangelaBitmasks
@@ -163,13 +166,16 @@ BitmasksPointers:
 	dw SeakingBitmasks
 	dw StaryuBitmasks
 	dw StarmieBitmasks
+	dw MimeJrBitmasks
 	dw MrMimeBitmasks
 	dw ScytherBitmasks
 	dw KleavorBitmasks
 	dw JynxBitmasks
 	dw BuuBitmasks
 	dw ElectabuzzBitmasks
+	dw ElectivireBitmasks
 	dw MagmarBitmasks
+	dw MagmortarBitmasks
 	dw PinsirBitmasks
 	dw TriculesBitmasks
 	dw TaurosBitmasks
@@ -179,6 +185,7 @@ BitmasksPointers:
 	dw TerradosBitmasks
 	dw LaprasBitmasks
 	dw DittoBitmasks
+	dw MimmeoBitmasks
 	dw EeveeBitmasks
 	dw VaporeonBitmasks
 	dw JolteonBitmasks
@@ -188,12 +195,18 @@ BitmasksPointers:
 	dw OmastarBitmasks
 	dw KabutoBitmasks
 	dw KabutopsBitmasks
+	dw FeradactylBitmasks
 	dw AerodactylBitmasks
+	dw DecillaBitmasks
+	dw GawarhedBitmasks
 	dw MunchlaxBitmasks
 	dw SnorlaxBitmasks
 	dw ArticunoBitmasks
 	dw ZapdosBitmasks
 	dw MoltresBitmasks
+	dw SqueamataBitmasks
+	dw MinistareBitmasks
+	dw IguanarchBitmasks
 	dw DratiniBitmasks
 	dw DragonairBitmasks
 	dw DragoniteBitmasks
@@ -246,6 +259,7 @@ BitmasksPointers:
 	dw AzurillBitmasks
 	dw MarillBitmasks
 	dw AzumarillBitmasks
+	dw BonslyBitmasks
 	dw SudowoodoBitmasks
 	dw PolitoedBitmasks
 	dw HoppipBitmasks
@@ -269,6 +283,7 @@ BitmasksPointers:
 	dw GlaceonBitmasks
 	dw SylveonBitmasks
 	dw MurkrowBitmasks
+	dw HonchkrowBitmasks
 	dw SlowkingBitmasks
 	dw MisdreavusBitmasks
 	dw MismagiusBitmasks
@@ -289,6 +304,7 @@ BitmasksPointers:
 	dw SteelixBitmasks
 	dw SnubbullBitmasks
 	dw GranbullBitmasks
+	dw CaretorkerBitmasks
 	dw QwilfishBitmasks
 	dw KazeppelinBitmasks
 	dw QwilfatherBitmasks
@@ -319,12 +335,15 @@ BitmasksPointers:
 	dw PhanpyBitmasks
 	dw DonphanBitmasks
 	dw Porygon2Bitmasks
+	dw PorygonZBitmasks
 	dw StantlerBitmasks
+	dw WyrdeerBitmasks
 	dw SmeargleBitmasks
 	dw GrenmarBitmasks
 	dw TyrogueBitmasks
 	dw HitmontopBitmasks
 	dw SmoochumBitmasks
+	dw ElebebiBitmasks
 	dw ElekidBitmasks
 	dw MagbyBitmasks
 	dw MiltankBitmasks

gfx/pokemon/bitmasks.asm

@@ -118,6 +118,7 @@ DoduoBitmasks:      INCLUDE "gfx/pokemon/doduo/bitmask.asm"
 DodrioBitmasks:     INCLUDE "gfx/pokemon/dodrio/bitmask.asm"
 SeelBitmasks:       INCLUDE "gfx/pokemon/seel/bitmask.asm"
 DewgongBitmasks:    INCLUDE "gfx/pokemon/dewgong/bitmask.asm"
+SmujjBitmasks:      INCLUDE "gfx/pokemon/smujj/bitmask.asm"
 GrimerBitmasks:     INCLUDE "gfx/pokemon/grimer/bitmask.asm"
 MukBitmasks:        INCLUDE "gfx/pokemon/muk/bitmask.asm"
 ShellderBitmasks:   INCLUDE "gfx/pokemon/shellder/bitmask.asm"
@@ -137,6 +138,7 @@ ExeggcuteBitmasks:  INCLUDE "gfx/pokemon/exeggcute/bitmask.asm"
 ExeggutorBitmasks:  INCLUDE "gfx/pokemon/exeggutor/bitmask.asm"
 CuboneBitmasks:     INCLUDE "gfx/pokemon/cubone/bitmask.asm"
 MarowakBitmasks:    INCLUDE "gfx/pokemon/marowak/bitmask.asm"
+GuardiaBitmasks:    INCLUDE "gfx/pokemon/guardia/bitmask.asm"
 HitmonleeBitmasks:  INCLUDE "gfx/pokemon/hitmonlee/bitmask.asm"
 HitmonchanBitmasks: INCLUDE "gfx/pokemon/hitmonchan/bitmask.asm"
 LickitungBitmasks:  INCLUDE "gfx/pokemon/lickitung/bitmask.asm"
@@ -146,6 +148,7 @@ KoffingBitmasks:    INCLUDE "gfx/pokemon/koffing/bitmask.asm"
 WeezingBitmasks:    INCLUDE "gfx/pokemon/weezing/bitmask.asm"
 RhyhornBitmasks:    INCLUDE "gfx/pokemon/rhyhorn/bitmask.asm"
 RhydonBitmasks:     INCLUDE "gfx/pokemon/rhydon/bitmask.asm"
+HappinyBitmasks:    INCLUDE "gfx/pokemon/happiny/bitmask.asm"
 ChanseyBitmasks:    INCLUDE "gfx/pokemon/chansey/bitmask.asm"
 BurgelaBitmasks:    INCLUDE "gfx/pokemon/burgela/bitmask.asm"
 TangelaBitmasks:    INCLUDE "gfx/pokemon/tangela/bitmask.asm"
@@ -161,13 +164,16 @@ GoldeenBitmasks:    INCLUDE "gfx/pokemon/goldeen/bitmask.asm"
 SeakingBitmasks:    INCLUDE "gfx/pokemon/seaking/bitmask.asm"
 StaryuBitmasks:     INCLUDE "gfx/pokemon/staryu/bitmask.asm"
 StarmieBitmasks:    INCLUDE "gfx/pokemon/starmie/bitmask.asm"
+MimeJrBitmasks:     INCLUDE "gfx/pokemon/mime_jr_/bitmask.asm"
 MrMimeBitmasks:     INCLUDE "gfx/pokemon/mr__mime/bitmask.asm"
 ScytherBitmasks:    INCLUDE "gfx/pokemon/scyther/bitmask.asm"
 KleavorBitmasks:    INCLUDE "gfx/pokemon/kleavor/bitmask.asm"
 JynxBitmasks:       INCLUDE "gfx/pokemon/jynx/bitmask.asm"
 BuuBitmasks: INCLUDE "gfx/pokemon/buu/bitmask.asm"
 ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm"
+ElectivireBitmasks: INCLUDE "gfx/pokemon/electivire/bitmask.asm"
 MagmarBitmasks:     INCLUDE "gfx/pokemon/magmar/bitmask.asm"
+MagmortarBitmasks:  INCLUDE "gfx/pokemon/magmortar/bitmask.asm"
 PinsirBitmasks:     INCLUDE "gfx/pokemon/pinsir/bitmask.asm"
 TriculesBitmasks:   INCLUDE "gfx/pokemon/tricules/bitmask.asm"
 TaurosBitmasks:     INCLUDE "gfx/pokemon/tauros/bitmask.asm"
@@ -177,6 +183,7 @@ MagipreyBitmasks:   INCLUDE "gfx/pokemon/magiprey/bitmask.asm"
 TerradosBitmasks:   INCLUDE "gfx/pokemon/terrados/bitmask.asm"
 LaprasBitmasks:     INCLUDE "gfx/pokemon/lapras/bitmask.asm"
 DittoBitmasks:      INCLUDE "gfx/pokemon/ditto/bitmask.asm"
+MimmeoBitmasks:     INCLUDE "gfx/pokemon/mimmeo/bitmask.asm"
 EeveeBitmasks:      INCLUDE "gfx/pokemon/eevee/bitmask.asm"
 VaporeonBitmasks:   INCLUDE "gfx/pokemon/vaporeon/bitmask.asm"
 JolteonBitmasks:    INCLUDE "gfx/pokemon/jolteon/bitmask.asm"
@@ -186,12 +193,18 @@ OmanyteBitmasks:    INCLUDE "gfx/pokemon/omanyte/bitmask.asm"
 OmastarBitmasks:    INCLUDE "gfx/pokemon/omastar/bitmask.asm"
 KabutoBitmasks:     INCLUDE "gfx/pokemon/kabuto/bitmask.asm"
 KabutopsBitmasks:   INCLUDE "gfx/pokemon/kabutops/bitmask.asm"
+FeradactylBitmasks: INCLUDE "gfx/pokemon/feradactyl/bitmask.asm"
 AerodactylBitmasks: INCLUDE "gfx/pokemon/aerodactyl/bitmask.asm"
+DecillaBitmasks:    INCLUDE "gfx/pokemon/decilla/bitmask.asm"
+GawarhedBitmasks:   INCLUDE "gfx/pokemon/gawarhed/bitmask.asm"
 MunchlaxBitmasks:    INCLUDE "gfx/pokemon/munchlax/bitmask.asm"
 SnorlaxBitmasks:    INCLUDE "gfx/pokemon/snorlax/bitmask.asm"
 ArticunoBitmasks:   INCLUDE "gfx/pokemon/articuno/bitmask.asm"
 ZapdosBitmasks:     INCLUDE "gfx/pokemon/zapdos/bitmask.asm"
 MoltresBitmasks:    INCLUDE "gfx/pokemon/moltres/bitmask.asm"
+SqueamataBitmasks:  INCLUDE "gfx/pokemon/squeamata/bitmask.asm"
+MinistareBitmasks:  INCLUDE "gfx/pokemon/ministare/bitmask.asm"
+IguanarchBitmasks:  INCLUDE "gfx/pokemon/iguanarch/bitmask.asm"
 DratiniBitmasks:    INCLUDE "gfx/pokemon/dratini/bitmask.asm"
 DragonairBitmasks:  INCLUDE "gfx/pokemon/dragonair/bitmask.asm"
 DragoniteBitmasks:  INCLUDE "gfx/pokemon/dragonite/bitmask.asm"
@@ -244,6 +257,7 @@ BellossomBitmasks:  INCLUDE "gfx/pokemon/bellossom/bitmask.asm"
 AzurillBitmasks:    INCLUDE "gfx/pokemon/azurill/bitmask.asm"
 MarillBitmasks:     INCLUDE "gfx/pokemon/marill/bitmask.asm"
 AzumarillBitmasks:  INCLUDE "gfx/pokemon/azumarill/bitmask.asm"
+BonslyBitmasks:     INCLUDE "gfx/pokemon/bonsly/bitmask.asm"
 SudowoodoBitmasks:  INCLUDE "gfx/pokemon/sudowoodo/bitmask.asm"
 PolitoedBitmasks:   INCLUDE "gfx/pokemon/politoed/bitmask.asm"
 HoppipBitmasks:     INCLUDE "gfx/pokemon/hoppip/bitmask.asm"
@@ -267,6 +281,7 @@ LeafeonBitmasks:   INCLUDE "gfx/pokemon/leafeon/bitmask.asm"
 GlaceonBitmasks:   INCLUDE "gfx/pokemon/glaceon/bitmask.asm"
 SylveonBitmasks:   INCLUDE "gfx/pokemon/sylveon/bitmask.asm"
 MurkrowBitmasks:    INCLUDE "gfx/pokemon/murkrow/bitmask.asm"
+HonchkrowBitmasks:  INCLUDE "gfx/pokemon/honchkrow/bitmask.asm"
 SlowkingBitmasks:   INCLUDE "gfx/pokemon/slowking/bitmask.asm"
 MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm"
 MismagiusBitmasks:  INCLUDE "gfx/pokemon/mismagius/bitmask.asm"
@@ -287,6 +302,7 @@ GligarBitmasks:     INCLUDE "gfx/pokemon/gligar/bitmask.asm"
 SteelixBitmasks:    INCLUDE "gfx/pokemon/steelix/bitmask.asm"
 SnubbullBitmasks:   INCLUDE "gfx/pokemon/snubbull/bitmask.asm"
 GranbullBitmasks:   INCLUDE "gfx/pokemon/granbull/bitmask.asm"
+CaretorkerBitmasks: INCLUDE "gfx/pokemon/caretorker/bitmask.asm"
 QwilfishBitmasks:   INCLUDE "gfx/pokemon/qwilfish/bitmask.asm"
 KazeppelinBitmasks: INCLUDE "gfx/pokemon/kazeppelin/bitmask.asm"
 QwilfatherBitmasks: INCLUDE "gfx/pokemon/qwilfather/bitmask.asm"
@@ -317,12 +333,15 @@ KingdraBitmasks:    INCLUDE "gfx/pokemon/kingdra/bitmask.asm"
 PhanpyBitmasks:     INCLUDE "gfx/pokemon/phanpy/bitmask.asm"
 DonphanBitmasks:    INCLUDE "gfx/pokemon/donphan/bitmask.asm"
 Porygon2Bitmasks:   INCLUDE "gfx/pokemon/porygon2/bitmask.asm"
+PorygonZBitmasks:   INCLUDE "gfx/pokemon/porygon_z/bitmask.asm"
 StantlerBitmasks:   INCLUDE "gfx/pokemon/stantler/bitmask.asm"
+WyrdeerBitmasks:    INCLUDE "gfx/pokemon/wyrdeer/bitmask.asm"
 SmeargleBitmasks:   INCLUDE "gfx/pokemon/smeargle/bitmask.asm"
 GrenmarBitmasks: INCLUDE "gfx/pokemon/grenmar/bitmask.asm"
 TyrogueBitmasks:    INCLUDE "gfx/pokemon/tyrogue/bitmask.asm"
 HitmontopBitmasks:  INCLUDE "gfx/pokemon/hitmontop/bitmask.asm"
 SmoochumBitmasks:   INCLUDE "gfx/pokemon/smoochum/bitmask.asm"
+ElebebiBitmasks:    INCLUDE "gfx/pokemon/elebebi/bitmask.asm"
 ElekidBitmasks:     INCLUDE "gfx/pokemon/elekid/bitmask.asm"
 MagbyBitmasks:      INCLUDE "gfx/pokemon/magby/bitmask.asm"
 MiltankBitmasks:    INCLUDE "gfx/pokemon/miltank/bitmask.asm"

gfx/pokemon/bonsly/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/bonsly/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/bonsly/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/caretorker/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/caretorker/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/caretorker/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/decilla/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/decilla/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/decilla/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/elebebi/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/elebebi/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/elebebi/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/electivire/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/electivire/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/electivire/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/feradactyl/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/feradactyl/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/feradactyl/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/frame_pointers.asm

@@ -120,6 +120,7 @@ FramesPointers:
 	dba DodrioFrames
 	dba SeelFrames
 	dba DewgongFrames
+	dba SmujjFrames
 	dba GrimerFrames
 	dba MukFrames
 	dba ShellderFrames
@@ -139,6 +140,7 @@ FramesPointers:
 	dba ExeggutorFrames
 	dba CuboneFrames
 	dba MarowakFrames
+	dba GuardiaFrames
 	dba HitmonleeFrames
 	dba HitmonchanFrames
 	dba LickitungFrames
@@ -148,6 +150,7 @@ FramesPointers:
 	dba WeezingFrames
 	dba RhyhornFrames
 	dba RhydonFrames
+	dba HappinyFrames
 	dba ChanseyFrames
 	dba BurgelaFrames
 	dba TangelaFrames
@@ -163,13 +166,16 @@ FramesPointers:
 	dba SeakingFrames
 	dba StaryuFrames
 	dba StarmieFrames
+	dba MimeJrFrames
 	dba MrMimeFrames
 	dba ScytherFrames
 	dba KleavorFrames
 	dba JynxFrames
 	dba BuuFrames
 	dba ElectabuzzFrames
+	dba ElectivireFrames
 	dba MagmarFrames
+	dba MagmortarFrames
 	dba PinsirFrames
 	dba TriculesFrames
 	dba TaurosFrames
@@ -179,6 +185,7 @@ FramesPointers:
 	dba TerradosFrames
 	dba LaprasFrames
 	dba DittoFrames
+	dba MimmeoFrames
 	dba EeveeFrames
 	dba VaporeonFrames
 	dba JolteonFrames
@@ -188,12 +195,18 @@ FramesPointers:
 	dba OmastarFrames
 	dba KabutoFrames
 	dba KabutopsFrames
+	dba FeradactylFrames
 	dba AerodactylFrames
+	dba DecillaFrames
+	dba GawarhedFrames
 	dba MunchlaxFrames
 	dba SnorlaxFrames
 	dba ArticunoFrames
 	dba ZapdosFrames
 	dba MoltresFrames
+	dba SqueamataFrames
+	dba MinistareFrames
+	dba IguanarchFrames
 	dba DratiniFrames
 	dba DragonairFrames
 	dba DragoniteFrames
@@ -246,6 +259,7 @@ FramesPointers:
 	dba AzurillFrames
 	dba MarillFrames
 	dba AzumarillFrames
+	dba BonslyFrames
 	dba SudowoodoFrames
 	dba PolitoedFrames
 	dba HoppipFrames
@@ -269,6 +283,7 @@ FramesPointers:
 	dba GlaceonFrames
 	dba SylveonFrames
 	dba MurkrowFrames
+	dba HonchkrowFrames
 	dba SlowkingFrames
 	dba MisdreavusFrames
 	dba MismagiusFrames
@@ -289,6 +304,7 @@ FramesPointers:
 	dba SteelixFrames
 	dba SnubbullFrames
 	dba GranbullFrames
+	dba CaretorkerFrames
 	dba QwilfishFrames
 	dba KazeppelinFrames
 	dba QwilfatherFrames
@@ -319,12 +335,15 @@ FramesPointers:
 	dba PhanpyFrames
 	dba DonphanFrames
 	dba Porygon2Frames
+	dba PorygonZFrames
 	dba StantlerFrames
+	dba WyrdeerFrames
 	dba SmeargleFrames
 	dba GrenmarFrames
 	dba TyrogueFrames
 	dba HitmontopFrames
 	dba SmoochumFrames
+	dba ElebebiFrames
 	dba ElekidFrames
 	dba MagbyFrames
 	dba MiltankFrames

gfx/pokemon/gawarhed/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/gawarhed/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/gawarhed/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/guardia/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/guardia/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/guardia/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/happiny/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/happiny/anim_idle.asm

@@ -0,0 +1 @@
+	endanim