Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

README.md

@@ -2,6 +2,11 @@ Kanto Expansion Pak
 ===================
 This is a ROM Hack of Pokémon Red and Blue, aiming to expand the dex with 
 
+Improved areas
+====
+- Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. 
+- Diglett's Cave has the prototype music and a more detailed map. Plus, if you go back after getting Surf, you'll be able to access a neat little island.
+
 QoL Enhancements
 ====
 - PC added to Celadon Hotel where the event usually is. Why not?

constants/item_constants.asm

@@ -52,7 +52,7 @@ DEF SAFARI_ROCK EQU $16 ; overload
 	const DOME_FOSSIL   ; $29
 	const HELIX_FOSSIL  ; $2A
 	const SECRET_KEY    ; $2B
-	const UNUSED_ITEM   ; $2C "?????"
+	const SUN_STONE     ; $2C
 	const BIKE_VOUCHER  ; $2D
 	const X_ACCURACY    ; $2E
 	const LEAF_STONE    ; $2F

data/items/key_items.asm

@@ -30,7 +30,7 @@ KeyItemFlags:
 	dbit TRUE  ; EARTHBADGE
 	dbit FALSE ; ESCAPE_ROPE
 	dbit FALSE ; REPEL
-	dbit TRUE  ; OLD_AMBER
+	dbit FALSE ; OLD_AMBER
 	dbit FALSE ; FIRE_STONE
 	dbit FALSE ; THUNDER_STONE
 	dbit FALSE ; WATER_STONE
@@ -40,10 +40,10 @@ KeyItemFlags:
 	dbit FALSE ; CARBOS
 	dbit FALSE ; CALCIUM
 	dbit FALSE ; RARE_CANDY
-	dbit TRUE  ; DOME_FOSSIL
+	dbit FALSE ; DOME_FOSSIL
-	dbit TRUE  ; HELIX_FOSSIL
+	dbit FALSE ; HELIX_FOSSIL
 	dbit TRUE  ; SECRET_KEY
-	dbit TRUE  ; UNUSED_ITEM
+	dbit FALSE ; SUN_STONE
 	dbit TRUE  ; BIKE_VOUCHER
 	dbit FALSE ; X_ACCURACY
 	dbit FALSE ; LEAF_STONE

data/items/marts.asm

@@ -26,7 +26,7 @@ CeladonMart2Clerk2Text::
 	script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION
 
 CeladonMart4ClerkText::
-	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
+	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE
 
 CeladonMart5Clerk1Text::
 	script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL

data/items/names.asm

@@ -43,7 +43,7 @@ ItemNames::
 	li "DOME FOSSIL"
 	li "HELIX FOSSIL"
 	li "SECRET KEY"
-	li "?????"
+	li "SUN STONE"
 	li "BIKE VOUCHER"
 	li "X ACCURACY"
 	li "LEAF STONE"

data/items/prices.asm

@@ -43,7 +43,7 @@ ItemPrices::
 	bcd3 0     ; DOME_FOSSIL
 	bcd3 0     ; HELIX_FOSSIL
 	bcd3 0     ; SECRET_KEY
-	bcd3 0     ; XXX
+	bcd3 2100  ; SUN_STONE
 	bcd3 0     ; BIKE_VOUCHER
 	bcd3 950   ; X_ACCURACY
 	bcd3 2100  ; LEAF_STONE

data/items/use_party.asm

@@ -20,6 +20,7 @@ UsableItems_PartyMenu:
 	db CARBOS
 	db CALCIUM
 	db RARE_CANDY
+	db SUN_STONE
 	db LEAF_STONE
 	db FULL_HEAL
 	db REVIVE

data/maps/objects/DiglettsCave.asm

@@ -8,5 +8,6 @@ DiglettsCave_Object:
 	def_bg_events
 
 	def_object_events
+	object_event 30, 15, SPRITE_MONSTER, WALK, DOWN, 1, CROCKY, 40
 
 	def_warps_to DIGLETTS_CAVE

data/maps/objects/RockTunnelB1F.asm

@@ -18,5 +18,9 @@ RockTunnelB1F_Object:
 	object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
 	object_event 33,  5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
 	object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
+	object_event  7, 24, SPRITE_MON, WALK, DOWN, 9, KABUTOPS, 40
+	object_event  7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL
+	object_event  6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL
+	
 
 	def_warps_to ROCK_TUNNEL_B1F

data/pokemon/base_stats.asm

@@ -8,7 +8,7 @@ INCLUDE "data/pokemon/base_stats/charmeleon.asm"
 INCLUDE "data/pokemon/base_stats/charizard.asm"
 INCLUDE "data/pokemon/base_stats/squirtle.asm"
 INCLUDE "data/pokemon/base_stats/wartortle.asm"
-INCLUDE "data/pokemon/base_stats/blastoise.asm"
+INCLUDE "data/pokemon/base_stats/totartle.asm"
 INCLUDE "data/pokemon/base_stats/caterpie.asm"
 INCLUDE "data/pokemon/base_stats/metapod.asm"
 INCLUDE "data/pokemon/base_stats/butterfree.asm"
@@ -26,6 +26,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm"
 INCLUDE "data/pokemon/base_stats/arbok.asm"
 INCLUDE "data/pokemon/base_stats/pikachu.asm"
 INCLUDE "data/pokemon/base_stats/raichu.asm"
+INCLUDE "data/pokemon/base_stats/gorochu.asm"
 INCLUDE "data/pokemon/base_stats/sandshrew.asm"
 INCLUDE "data/pokemon/base_stats/sandslash.asm"
 INCLUDE "data/pokemon/base_stats/nidoranf.asm"
@@ -34,29 +35,41 @@ INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
 INCLUDE "data/pokemon/base_stats/nidoranm.asm"
 INCLUDE "data/pokemon/base_stats/nidorino.asm"
 INCLUDE "data/pokemon/base_stats/nidoking.asm"
+INCLUDE "data/pokemon/base_stats/nidoreign.asm"
 INCLUDE "data/pokemon/base_stats/clefairy.asm"
 INCLUDE "data/pokemon/base_stats/clefable.asm"
+INCLUDE "data/pokemon/base_stats/mikon.asm"
 INCLUDE "data/pokemon/base_stats/vulpix.asm"
 INCLUDE "data/pokemon/base_stats/ninetales.asm"
 INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
 INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
+INCLUDE "data/pokemon/base_stats/bittybat.asm"
 INCLUDE "data/pokemon/base_stats/zubat.asm"
 INCLUDE "data/pokemon/base_stats/golbat.asm"
 INCLUDE "data/pokemon/base_stats/oddish.asm"
 INCLUDE "data/pokemon/base_stats/gloom.asm"
 INCLUDE "data/pokemon/base_stats/vileplume.asm"
+INCLUDE "data/pokemon/base_stats/bellossom.asm"
+INCLUDE "data/pokemon/base_stats/para.asm"
 INCLUDE "data/pokemon/base_stats/paras.asm"
 INCLUDE "data/pokemon/base_stats/parasect.asm"
 INCLUDE "data/pokemon/base_stats/venonat.asm"
 INCLUDE "data/pokemon/base_stats/venomoth.asm"
+INCLUDE "data/pokemon/base_stats/cheep.asm"
+INCLUDE "data/pokemon/base_stats/jabetta.asm"
+INCLUDE "data/pokemon/base_stats/ribbito.asm"
+INCLUDE "data/pokemon/base_stats/croakozuna.asm"
 INCLUDE "data/pokemon/base_stats/diglett.asm"
 INCLUDE "data/pokemon/base_stats/dugtrio.asm"
+INCLUDE "data/pokemon/base_stats/konya.asm"
 INCLUDE "data/pokemon/base_stats/meowth.asm"
 INCLUDE "data/pokemon/base_stats/persian.asm"
 INCLUDE "data/pokemon/base_stats/psyduck.asm"
+INCLUDE "data/pokemon/base_stats/weirduck.asm"
 INCLUDE "data/pokemon/base_stats/golduck.asm"
 INCLUDE "data/pokemon/base_stats/mankey.asm"
 INCLUDE "data/pokemon/base_stats/primeape.asm"
+INCLUDE "data/pokemon/base_stats/pudi.asm"
 INCLUDE "data/pokemon/base_stats/growlithe.asm"
 INCLUDE "data/pokemon/base_stats/arcanine.asm"
 INCLUDE "data/pokemon/base_stats/poliwag.asm"
@@ -71,22 +84,33 @@ INCLUDE "data/pokemon/base_stats/machamp.asm"
 INCLUDE "data/pokemon/base_stats/bellsprout.asm"
 INCLUDE "data/pokemon/base_stats/weepinbell.asm"
 INCLUDE "data/pokemon/base_stats/victreebel.asm"
+INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
 INCLUDE "data/pokemon/base_stats/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
 INCLUDE "data/pokemon/base_stats/geodude.asm"
 INCLUDE "data/pokemon/base_stats/graveler.asm"
 INCLUDE "data/pokemon/base_stats/golem.asm"
+INCLUDE "data/pokemon/base_stats/blottle.asm"
+INCLUDE "data/pokemon/base_stats/pendraken.asm"
+INCLUDE "data/pokemon/base_stats/puchikoon.asm"
 INCLUDE "data/pokemon/base_stats/ponyta.asm"
 INCLUDE "data/pokemon/base_stats/rapidash.asm"
 INCLUDE "data/pokemon/base_stats/slowpoke.asm"
 INCLUDE "data/pokemon/base_stats/slowbro.asm"
 INCLUDE "data/pokemon/base_stats/magnemite.asm"
+INCLUDE "data/pokemon/base_stats/magnetite.asm"
 INCLUDE "data/pokemon/base_stats/magneton.asm"
+INCLUDE "data/pokemon/base_stats/barunda.asm"
 INCLUDE "data/pokemon/base_stats/farfetchd.asm"
+INCLUDE "data/pokemon/base_stats/madaamu.asm"
+INCLUDE "data/pokemon/base_stats/blastyke.asm"
+INCLUDE "data/pokemon/base_stats/blastoise.asm"
+INCLUDE "data/pokemon/base_stats/hinaazu.asm"
 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/betobebii.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
 INCLUDE "data/pokemon/base_stats/muk.asm"
 INCLUDE "data/pokemon/base_stats/shellder.asm"
@@ -97,14 +121,22 @@ INCLUDE "data/pokemon/base_stats/gengar.asm"
 INCLUDE "data/pokemon/base_stats/onix.asm"
 INCLUDE "data/pokemon/base_stats/drowzee.asm"
 INCLUDE "data/pokemon/base_stats/hypno.asm"
+INCLUDE "data/pokemon/base_stats/kotora.asm"
+INCLUDE "data/pokemon/base_stats/gaotora.asm"
+INCLUDE "data/pokemon/base_stats/gorotora.asm"
 INCLUDE "data/pokemon/base_stats/krabby.asm"
 INCLUDE "data/pokemon/base_stats/kingler.asm"
 INCLUDE "data/pokemon/base_stats/voltorb.asm"
 INCLUDE "data/pokemon/base_stats/electrode.asm"
+INCLUDE "data/pokemon/base_stats/cactus.asm"
+INCLUDE "data/pokemon/base_stats/crocky.asm"
+INCLUDE "data/pokemon/base_stats/deer.asm"
 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/kangaskhan.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
 INCLUDE "data/pokemon/base_stats/lickitung.asm"
@@ -113,25 +145,38 @@ 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/chansey.asm"
+INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
-INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
+INCLUDE "data/pokemon/base_stats/decilla.asm"
+INCLUDE "data/pokemon/base_stats/gyaoon.asm"
+INCLUDE "data/pokemon/base_stats/omega.asm"
 INCLUDE "data/pokemon/base_stats/horsea.asm"
 INCLUDE "data/pokemon/base_stats/seadra.asm"
+INCLUDE "data/pokemon/base_stats/gyopin.asm"
 INCLUDE "data/pokemon/base_stats/goldeen.asm"
 INCLUDE "data/pokemon/base_stats/seaking.asm"
+INCLUDE "data/pokemon/base_stats/skimper.asm"
+INCLUDE "data/pokemon/base_stats/bawligua.asm"
+INCLUDE "data/pokemon/base_stats/cryithan.asm"
 INCLUDE "data/pokemon/base_stats/staryu.asm"
 INCLUDE "data/pokemon/base_stats/starmie.asm"
+INCLUDE "data/pokemon/base_stats/jagg.asm"
 INCLUDE "data/pokemon/base_stats/mrmime.asm"
 INCLUDE "data/pokemon/base_stats/scyther.asm"
+INCLUDE "data/pokemon/base_stats/scizor.asm"
+INCLUDE "data/pokemon/base_stats/pinsir.asm"
+INCLUDE "data/pokemon/base_stats/purakkusu.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/magmar.asm"
-INCLUDE "data/pokemon/base_stats/pinsir.asm"
+INCLUDE "data/pokemon/base_stats/trampel.asm"
 INCLUDE "data/pokemon/base_stats/tauros.asm"
 INCLUDE "data/pokemon/base_stats/magikarp.asm"
 INCLUDE "data/pokemon/base_stats/gyarados.asm"
 INCLUDE "data/pokemon/base_stats/lapras.asm"
 INCLUDE "data/pokemon/base_stats/ditto.asm"
+INCLUDE "data/pokemon/base_stats/animon.asm"
 INCLUDE "data/pokemon/base_stats/eevee.asm"
 INCLUDE "data/pokemon/base_stats/vaporeon.asm"
 INCLUDE "data/pokemon/base_stats/jolteon.asm"
@@ -150,4 +195,5 @@ INCLUDE "data/pokemon/base_stats/dratini.asm"
 INCLUDE "data/pokemon/base_stats/dragonair.asm"
 INCLUDE "data/pokemon/base_stats/dragonite.asm"
 INCLUDE "data/pokemon/base_stats/mewtwo.asm"
-	assert_table_length NUM_POKEMON - 1 ; discount Mew
+INCLUDE "data/pokemon/base_stats/mew.asm"
+	assert_table_length NUM_POKEMON

data/pokemon/base_stats/abra.asm

@@ -21,4 +21,5 @@
 	     PSYWAVE,      TRI_ATTACK,   SUBSTITUTE,   FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(AbraPicFront)
+	assert BANK(AbraPicFront) == BANK(AbraPicBack)

data/pokemon/base_stats/aerodactyl.asm

@@ -20,4 +20,5 @@
 	     REST,         SUBSTITUTE,   FLY
 	; end
 
-	db 0 ; padding
+	db BANK(AerodactylPicFront)
+	assert BANK(AerodactylPicFront) == BANK(AerodactylPicBack)

data/pokemon/base_stats/alakazam.asm

@@ -22,4 +22,5 @@
 	     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(AlakazamPicFront)
+	assert BANK(AlakazamPicFront) == BANK(AlakazamPicBack)

data/pokemon/base_stats/animon.asm

@@ -0,0 +1,21 @@
+	db DEX_ANIMON ; pokedex id
+
+	db 100,  55,  50,  150,  50
+	;   hp  atk  def  spd  spc
+
+	db STEEL, STEEL ; type
+	db 35 ; catch rate
+	db 161 ; base exp
+
+	INCBIN "gfx/pokemon/front/animon.pic", 0, 1 ; sprite dimensions
+	dw AnimonPicFront, AnimonPicBack
+
+	db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm
+	; end
+
+	db BANK(AnimonPicFront)
+	assert BANK(AnimonPicFront) == BANK(AnimonPicBack)

data/pokemon/base_stats/arbok.asm

@@ -20,4 +20,5 @@
 	     ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(ArbokPicFront)
+	assert BANK(ArbokPicFront) == BANK(ArbokPicBack)

data/pokemon/base_stats/arcanine.asm

@@ -20,4 +20,5 @@
 	     SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(ArcaninePicFront)
+	assert BANK(ArcaninePicFront) == BANK(ArcaninePicBack)

data/pokemon/base_stats/articuno.asm

@@ -20,4 +20,5 @@
 	     SWIFT,        SKY_ATTACK,   REST,         SUBSTITUTE,   FLY
 	; end
 
-	db 0 ; padding
+	db BANK(ArticunoPicFront)
+	assert BANK(ArticunoPicFront) == BANK(ArticunoPicBack)

data/pokemon/base_stats/barunda.asm

@@ -0,0 +1,26 @@
+	db DEX_BARUNDA ; pokedex id
+
+	db  90,  50,  30, 125, 100
+	;   hp  atk  def  spd  spc
+
+	db FAIRY, FLYING ; type
+	db 45 ; catch rate
+	db 137 ; base exp
+
+	INCBIN "gfx/pokemon/front/barunda.pic", 0, 1 ; sprite dimensions
+	dw BarundaPicFront, BarundaPicBack
+
+	db FAIRY_WIND, GROWL, DRAININGKISS, NO_MOVE ; level 1 learnset
+	db GROWTH_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
+	     HYPER_BEAM,   RAGE,         THUNDERBOLT,  THUNDER,      PSYCHIC_M,    \
+	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
+	     SELFDESTRUCT, SWIFT,        SKULL_BASH,   DREAM_EATER,  REST,         \
+	     PSYWAVE,      EXPLOSION,    TRI_ATTACK,   SUBSTITUTE,   FLY,          \
+	     FLASH
+	; end
+
+	db BANK(BarundaPicFront)
+	assert BANK(BarundaPicFront) == BANK(BarundaPicBack)

data/pokemon/base_stats/bawligua.asm

@@ -0,0 +1,25 @@
+	db DEX_BAWLIGUA ; pokedex id
+
+	db  72,  53,  46,  98,  81
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 45 ; catch rate
+	db 144 ; base exp
+
+	INCBIN "gfx/pokemon/front/bawligua.pic", 0, 1 ; sprite dimensions
+	dw BawliguaPicFront, BawliguaPicBack
+
+	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
+	     WATER_GUN,    RAGE,         DRAGON_RAGE,  THUNDERBOLT,  THUNDER,      \
+	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         SWIFT,        \
+	     SKULL_BASH,   REST,         ROCK_SLIDE,   SUBSTITUTE,   CUT,          \
+	     SURF,         STRENGTH
+	; end
+
+	db BANK(BawliguaPicFront)
+	assert BANK(BawliguaPicFront) == BANK(BawliguaPicBack)

data/pokemon/base_stats/beedrill.asm

@@ -20,4 +20,5 @@
 	     CUT
 	; end
 
-	db 0 ; padding
+	db BANK(BeedrillPicFront)
+	assert BANK(BeedrillPicFront) == BANK(BeedrillPicBack)

data/pokemon/base_stats/bellossom.asm

@@ -0,0 +1,24 @@
+	db DEX_BELLOSSOM ; pokedex id
+
+	db  75,  80,  85,  50, 100
+	;   hp  atk  def  spd  spc
+
+	db GRASS, GRASS ; type
+	db 45 ; catch rate
+	db 184 ; base exp
+
+	INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions
+	dw BellossomPicFront, BellossomPicBack
+
+	db SLEEP_POWDER, ABSORB, ACID, PETAL_DANCE ; level 1 learnset
+	db GROWTH_MEDIUM_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm SWORDS_DANCE, TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
+	     HYPER_BEAM,   RAGE,         MEGA_DRAIN,   SOLARBEAM,    MIMIC,        \
+	     DOUBLE_TEAM,  REFLECT,      BIDE,         REST,         SUBSTITUTE,   \
+	     CUT
+	; end
+
+	db BANK(BellossomPicFront)
+	assert BANK(BellossomPicFront) == BANK(BellossomPicBack)

data/pokemon/base_stats/bellsprout.asm

@@ -19,4 +19,5 @@
 	     BIDE,         REST,         SUBSTITUTE,   CUT
 	; end
 
-	db 0 ; padding
+	db BANK(BellsproutPicFront)
+	assert BANK(BellsproutPicFront) == BANK(BellsproutPicBack)

data/pokemon/base_stats/betobebii.asm

@@ -0,0 +1,23 @@
+	db DEX_BETOBEBII ; pokedex id
+
+	db  65,  65,  35,  10,  25
+	;   hp  atk  def  spd  spc
+
+	db POISON, POISON ; type
+	db 255 ; catch rate
+	db 61 ; base exp
+
+	INCBIN "gfx/pokemon/front/betobebii.pic", 0, 1 ; sprite dimensions
+	dw BetobebiiPicFront, BetobebiiPicBack
+
+	db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    RAGE,         MEGA_DRAIN,   THUNDERBOLT,  \
+	     THUNDER,      MIMIC,        DOUBLE_TEAM,  BIDE,         SELFDESTRUCT, \
+	     FIRE_BLAST,   REST,         EXPLOSION,    SUBSTITUTE
+	; end
+
+	db BANK(BetobebiiPicFront)
+	assert BANK(BetobebiiPicFront) == BANK(BetobebiiPicBack)

data/pokemon/base_stats/bittybat.asm

@@ -0,0 +1,23 @@
+	db DEX_BITTYBAT ; pokedex id
+
+	db  35,  40,  30,  50,  35
+	;   hp  atk  def  spd  spc
+
+	db POISON, FLYING ; type
+	db 255 ; catch rate
+	db 44 ; base exp
+
+	INCBIN "gfx/pokemon/front/bittybat.pic", 0, 1 ; sprite dimensions
+	dw BittybatPicFront, BittybatPicBack
+
+	db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
+	     RAGE,         MEGA_DRAIN,   MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     SWIFT,        REST,         SUBSTITUTE
+	; end
+
+	db BANK(BittybatPicFront)
+	assert BANK(BittybatPicFront) == BANK(BittybatPicBack)

data/pokemon/base_stats/blastoise.asm

@@ -22,4 +22,5 @@
 	     SURF,         STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(BlastoisePicFront)
+	assert BANK(BlastoisePicFront) == BANK(BlastoisePicBack)

data/pokemon/base_stats/blastyke.asm

@@ -0,0 +1,25 @@
+	db DEX_BLASTYKE ; pokedex id
+
+	db  49,  43,  60,  48,  45
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 45 ; catch rate
+	db 66 ; base exp
+
+	INCBIN "gfx/pokemon/front/blastyke.pic", 0, 1 ; sprite dimensions
+	dw BlastykePicFront, BlastykePicBack
+
+	db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         DIG,          \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         SKULL_BASH,   \
+	     REST,         SUBSTITUTE,   SURF,         STRENGTH
+	; end
+
+	db BANK(BlastykePicFront)
+	assert BANK(BlastykePicFront) == BANK(BlastykePicBack)

data/pokemon/base_stats/blottle.asm

@@ -0,0 +1,24 @@
+	db DEX_BLOTTLE ; pokedex id
+
+	db  60,  35,  60,  50,  65
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 190 ; catch rate
+	db 97 ; base exp
+
+	INCBIN "gfx/pokemon/front/blottle.pic", 0, 1 ; sprite dimensions
+	dw BlottlePicFront, BlottlePicBack
+
+	db CONSTRICT, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    \
+	     ICE_BEAM,     BLIZZARD,     RAGE,         MIMIC,        DOUBLE_TEAM,  \
+	     REFLECT,      BIDE,         REST,         SUBSTITUTE,   SURF,         \
+	     FLASH
+	; end
+
+	db BANK(BlottlePicFront)
+	assert BANK(BlottlePicFront) == BANK(BlottlePicBack)

data/pokemon/base_stats/bulbasaur.asm

@@ -19,4 +19,5 @@
 	     REFLECT,      BIDE,         REST,         SUBSTITUTE,   CUT
 	; end
 
-	db 0 ; padding
+	db BANK(BulbasaurPicFront)
+	assert BANK(BulbasaurPicFront) == BANK(BulbasaurPicBack)

data/pokemon/base_stats/butterfree.asm

@@ -20,4 +20,5 @@
 	     SWIFT,        REST,         PSYWAVE,      SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(ButterfreePicFront)
+	assert BANK(ButterfreePicFront) == BANK(ButterfreePicBack)

data/pokemon/base_stats/buu.asm

@@ -0,0 +1,25 @@
+	db DEX_BUU ; pokedex id
+
+	db  65,  93,  57,  95,  85
+	;   hp  atk  def  spd  spc
+
+	db ICE, ICE ; type
+	db 45 ; catch rate
+	db 167 ; base exp
+
+	INCBIN "gfx/pokemon/front/buu.pic", 0, 1 ; sprite dimensions
+	dw BuuPicFront, BuuPicBack
+
+	db AURORA_BEAM, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   SUBMISSION,   \
+	     COUNTER,      SEISMIC_TOSS, RAGE,         PSYCHIC_M,    TELEPORT,     \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         METRONOME,    \
+	     SKULL_BASH,   REST,         PSYWAVE,      SUBSTITUTE,   STRENGTH
+	; end
+
+	db BANK(BuuPicFront)
+	assert BANK(BuuPicFront) == BANK(BuuPicBack)

data/pokemon/base_stats/cactus.asm

@@ -0,0 +1,25 @@
+	db DEX_CACTUS ; pokedex id
+
+	db  60,  95, 100,  90,  75
+	;   hp  atk  def  spd  spc
+
+	db GRASS, GROUND ; type
+	db 45 ; catch rate
+	db 177 ; base exp
+
+	INCBIN "gfx/pokemon/front/cactus.pic", 0, 1 ; sprite dimensions
+	dw CactusPicFront, CactusPicBack
+
+	db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm WHIRLWIND,    MEGA_KICK,    TOXIC,        HORN_DRILL,   BODY_SLAM,    \
+	     TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   RAGE,         MEGA_DRAIN,   \
+	     SOLARBEAM,    EARTHQUAKE,   FISSURE,      MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SELFDESTRUCT, SWIFT,        REST,         EXPLOSION,    \
+	     TRI_ATTACK,   SUBSTITUTE
+	; end
+
+	db BANK(CactusPicFront)
+	assert BANK(CactusPicFront) == BANK(CactusPicBack)

data/pokemon/base_stats/caterpie.asm

@@ -17,4 +17,5 @@
 	tmhm
 	; end
 
-	db 0 ; padding
+	db BANK(CaterpiePicFront)
+	assert BANK(CaterpiePicFront) == BANK(CaterpiePicBack)

data/pokemon/base_stats/chansey.asm

@@ -24,4 +24,5 @@
 	     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(ChanseyPicFront)
+	assert BANK(ChanseyPicFront) == BANK(ChanseyPicBack)

data/pokemon/base_stats/charizard.asm

@@ -22,4 +22,5 @@
 	     CUT,          STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(CharizardPicFront)
+	assert BANK(CharizardPicFront) == BANK(CharizardPicBack)

data/pokemon/base_stats/charmander.asm

@@ -21,4 +21,5 @@
 	     REST,         SUBSTITUTE,   CUT,          STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(CharmanderPicFront)
+	assert BANK(CharmanderPicFront) == BANK(CharmanderPicBack)

data/pokemon/base_stats/charmeleon.asm

@@ -21,4 +21,5 @@
 	     REST,         SUBSTITUTE,   CUT,          STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(CharmeleonPicFront)
+	assert BANK(CharmeleonPicFront) == BANK(CharmeleonPicBack)

data/pokemon/base_stats/cheep.asm

@@ -0,0 +1,24 @@
+	db DEX_CHEEP ; pokedex id
+
+	db  45,  65,  40,  60,  40
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 190 ; catch rate
+	db 84 ; base exp
+
+	INCBIN "gfx/pokemon/front/cheep.pic", 0, 1 ; sprite dimensions
+	dw CheepPicFront, CheepPicBack
+
+	db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     COUNTER,      SEISMIC_TOSS, RAGE,         MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SKY_ATTACK,   REST,         SUBSTITUTE,   SURF
+	; end
+
+	db BANK(CheepPicFront)
+	assert BANK(CheepPicFront) == BANK(CheepPicBack)

data/pokemon/base_stats/clefable.asm

@@ -23,4 +23,5 @@
 	     TRI_ATTACK,   SUBSTITUTE,   STRENGTH,     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(ClefablePicFront)
+	assert BANK(ClefablePicFront) == BANK(ClefablePicBack)

data/pokemon/base_stats/clefairy.asm

@@ -23,4 +23,5 @@
 	     SUBSTITUTE,   STRENGTH,     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(ClefairyPicFront)
+	assert BANK(ClefairyPicFront) == BANK(ClefairyPicBack)

data/pokemon/base_stats/cloyster.asm

@@ -21,4 +21,5 @@
 	     SURF
 	; end
 
-	db 0 ; padding
+	db BANK(CloysterPicFront)
+	assert BANK(CloysterPicFront) == BANK(CloysterPicBack)

data/pokemon/base_stats/croakozuna.asm

@@ -0,0 +1,26 @@
+	db DEX_CROAKOZUNA ; pokedex id
+
+	db 134,  75,  70,  60,  75
+	;   hp  atk  def  spd  spc
+
+	db WATER, DARK ; type
+	db 75 ; catch rate
+	db 174 ; base exp
+
+	INCBIN "gfx/pokemon/front/croakozuna.pic", 0, 1 ; sprite dimensions
+	dw CroakozunaPicFront, CroakozunaPicBack
+
+	db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    TOXIC,        \
+	     BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    \
+	     HYPER_BEAM,   PAY_DAY,      SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         DIG,          TELEPORT,     MIMIC,        DOUBLE_TEAM,  \
+	     REFLECT,      BIDE,         METRONOME,    SWIFT,        REST,         \
+	     PSYWAVE,      SUBSTITUTE,   CUT,          SURF,         FLASH
+	; end
+
+	db BANK(CroakozunaPicFront)
+	assert BANK(CroakozunaPicFront) == BANK(CroakozunaPicBack)

data/pokemon/base_stats/crocky.asm

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

data/pokemon/base_stats/cryithan.asm

@@ -0,0 +1,25 @@
+	db DEX_CRYITHAN ; pokedex id
+
+	db  92,  83,  76, 118, 101
+	;   hp  atk  def  spd  spc
+
+	db WATER, DRAGON ; type
+	db 9 ; catch rate
+	db 210 ; base exp
+
+	INCBIN "gfx/pokemon/front/cryithan.pic", 0, 1 ; sprite dimensions
+	dw CryithanPicFront, CryithanPicBack
+
+	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
+	     WATER_GUN,    HYPER_BEAM,   RAGE,         DRAGON_RAGE,  THUNDERBOLT,  \
+	     THUNDER,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     SWIFT,        SKULL_BASH,   REST,         ROCK_SLIDE,   SUBSTITUTE,   \
+	     CUT,          SURF,         STRENGTH
+	; end
+
+	db BANK(CryithanPicFront)
+	assert BANK(CryithanPicFront) == BANK(CryithanPicBack)

data/pokemon/base_stats/cubone.asm

@@ -21,4 +21,5 @@
 	     FIRE_BLAST,   SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(CubonePicFront)
+	assert BANK(CubonePicFront) == BANK(CubonePicBack)

data/pokemon/base_stats/decilla.asm

@@ -0,0 +1,25 @@
+	db DEX_DECILLA ; pokedex id
+
+	db  61,  90,  70,  15,  40
+	;   hp  atk  def  spd  spc
+
+	db ROCK, ROCK ; type
+	db 45 ; catch rate
+	db 119 ; base exp
+
+	INCBIN "gfx/pokemon/front/decilla.pic", 0, 1 ; sprite dimensions
+	dw DecillaPicFront, DecillaPicBack
+
+	db SUBSTITUTE, GROWL, TACKLE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     DRAGON_RAGE,  EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        \
+	     DOUBLE_TEAM,  BIDE,         SKULL_BASH,   REST,         ROCK_SLIDE,   \
+	     SUBSTITUTE
+	; end
+
+	db BANK(DecillaPicFront)
+	assert BANK(DecillaPicFront) == BANK(DecillaPicBack)

data/pokemon/base_stats/deer.asm

@@ -0,0 +1,25 @@
+	db DEX_DEER ; pokedex id
+
+	db  85, 110,  85,  60,  90
+	;   hp  atk  def  spd  spc
+
+	db NORMAL, GRASS ; type
+	db 45 ; catch rate
+	db 165 ; base exp
+
+	INCBIN "gfx/pokemon/front/deer.pic", 0, 1 ; sprite dimensions
+	dw DeerPicFront, DeerPicBack
+
+	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
+	     RAGE,         MEGA_DRAIN,   SOLARBEAM,    THUNDERBOLT,  THUNDER,      \
+	     PSYCHIC_M,    TELEPORT,     MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     REST,         THUNDER_WAVE, PSYWAVE,      SUBSTITUTE,   STRENGTH,     \
+	     FLASH
+	; end
+
+	db BANK(DeerPicFront)
+	assert BANK(DeerPicFront) == BANK(DeerPicBack)

data/pokemon/base_stats/dewgong.asm

@@ -20,4 +20,5 @@
 	     SKULL_BASH,   REST,         SUBSTITUTE,   SURF,         STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(DewgongPicFront)
+	assert BANK(DewgongPicFront) == BANK(DewgongPicBack)

data/pokemon/base_stats/diglett.asm

@@ -19,4 +19,5 @@
 	     BIDE,         REST,         ROCK_SLIDE,   SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(DiglettPicFront)
+	assert BANK(DiglettPicFront) == BANK(DiglettPicBack)

data/pokemon/base_stats/ditto.asm

@@ -17,4 +17,5 @@
 	tmhm
 	; end
 
-	db 0 ; padding
+	db BANK(DittoPicFront)
+	assert BANK(DittoPicFront) == BANK(DittoPicBack)

data/pokemon/base_stats/dodrio.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE,   FLY
 	; end
 
-	db 0 ; padding
+	db BANK(DodrioPicFront)
+	assert BANK(DodrioPicFront) == BANK(DodrioPicBack)

data/pokemon/base_stats/doduo.asm

@@ -20,4 +20,5 @@
 	     FLY
 	; end
 
-	db 0 ; padding
+	db BANK(DoduoPicFront)
+	assert BANK(DoduoPicFront) == BANK(DoduoPicBack)

data/pokemon/base_stats/dragonair.asm

@@ -21,4 +21,5 @@
 	     REST,         THUNDER_WAVE, SUBSTITUTE,   SURF
 	; end
 
-	db 0 ; padding
+	db BANK(DragonairPicFront)
+	assert BANK(DragonairPicFront) == BANK(DragonairPicBack)

data/pokemon/base_stats/dragonite.asm

@@ -22,4 +22,5 @@
 	     SURF,         STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(DragonitePicFront)
+	assert BANK(DragonitePicFront) == BANK(DragonitePicBack)

data/pokemon/base_stats/dratini.asm

@@ -21,4 +21,5 @@
 	     THUNDER_WAVE, SUBSTITUTE,   SURF
 	; end
 
-	db 0 ; padding
+	db BANK(DratiniPicFront)
+	assert BANK(DratiniPicFront) == BANK(DratiniPicBack)

data/pokemon/base_stats/drowzee.asm

@@ -21,4 +21,5 @@
 	     THUNDER_WAVE, PSYWAVE,      TRI_ATTACK,   SUBSTITUTE,   FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(DrowzeePicFront)
+	assert BANK(DrowzeePicFront) == BANK(DrowzeePicBack)

data/pokemon/base_stats/dugtrio.asm

@@ -19,4 +19,5 @@
 	     DOUBLE_TEAM,  BIDE,         REST,         ROCK_SLIDE,   SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(DugtrioPicFront)
+	assert BANK(DugtrioPicFront) == BANK(DugtrioPicBack)

data/pokemon/base_stats/eevee.asm

@@ -19,4 +19,5 @@
 	     SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(EeveePicFront)
+	assert BANK(EeveePicFront) == BANK(EeveePicBack)

data/pokemon/base_stats/ekans.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(EkansPicFront)
+	assert BANK(EkansPicFront) == BANK(EkansPicBack)

data/pokemon/base_stats/electabuzz.asm

@@ -22,4 +22,5 @@
 	     SUBSTITUTE,   STRENGTH,     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(ElectabuzzPicFront)
+	assert BANK(ElectabuzzPicFront) == BANK(ElectabuzzPicBack)

data/pokemon/base_stats/electrode.asm

@@ -20,4 +20,5 @@
 	     THUNDER_WAVE, EXPLOSION,    SUBSTITUTE,   FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(ElectrodePicFront)
+	assert BANK(ElectrodePicFront) == BANK(ElectrodePicBack)

data/pokemon/base_stats/exeggcute.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(ExeggcutePicFront)
+	assert BANK(ExeggcutePicFront) == BANK(ExeggcutePicBack)

data/pokemon/base_stats/exeggutor.asm

@@ -20,4 +20,5 @@
 	     REST,         PSYWAVE,      EXPLOSION,    SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(ExeggutorPicFront)
+	assert BANK(ExeggutorPicFront) == BANK(ExeggutorPicBack)

data/pokemon/base_stats/farfetchd.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE,   CUT,          FLY
 	; end
 
-	db 0 ; padding
+	db BANK(FarfetchdPicFront)
+	assert BANK(FarfetchdPicFront) == BANK(FarfetchdPicBack)

data/pokemon/base_stats/fearow.asm

@@ -19,4 +19,5 @@
 	     SWIFT,        SKY_ATTACK,   REST,         SUBSTITUTE,   FLY
 	; end
 
-	db 0 ; padding
+	db BANK(FearowPicFront)
+	assert BANK(FearowPicFront) == BANK(FearowPicBack)

data/pokemon/base_stats/flareon.asm

@@ -19,4 +19,5 @@
 	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(FlareonPicFront)
+	assert BANK(FlareonPicFront) == BANK(FlareonPicBack)

data/pokemon/base_stats/gaotora.asm

@@ -0,0 +1,23 @@
+	db DEX_GAOTORA ; pokedex id
+
+	db  65,  80,  65,  60,  75
+	;   hp  atk  def  spd  spc
+
+	db ELECTRIC, ELECTRIC ; type
+	db 90 ; catch rate
+	db 146 ; base exp
+
+	INCBIN "gfx/pokemon/front/gaotora.pic", 0, 1 ; sprite dimensions
+	dw GaotoraPicFront, GaotoraPicBack
+
+	db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \
+	     THUNDERBOLT,  THUNDER,      MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     SWIFT,        SKULL_BASH,   REST,         THUNDER_WAVE, SUBSTITUTE
+	; end
+
+	db BANK(GaotoraPicFront)
+	assert BANK(GaotoraPicFront) == BANK(GaotoraPicBack)

data/pokemon/base_stats/gastly.asm

@@ -19,4 +19,5 @@
 	     DREAM_EATER,  REST,         PSYWAVE,      EXPLOSION,    SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(GastlyPicFront)
+	assert BANK(GastlyPicFront) == BANK(GastlyPicBack)

data/pokemon/base_stats/gengar.asm

@@ -22,4 +22,5 @@
 	     SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GengarPicFront)
+	assert BANK(GengarPicFront) == BANK(GengarPicBack)

data/pokemon/base_stats/geodude.asm

@@ -21,4 +21,5 @@
 	     ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GeodudePicFront)
+	assert BANK(GeodudePicFront) == BANK(GeodudePicBack)

data/pokemon/base_stats/gloom.asm

@@ -19,4 +19,5 @@
 	     BIDE,         REST,         SUBSTITUTE,   CUT
 	; end
 
-	db 0 ; padding
+	db BANK(GloomPicFront)
+	assert BANK(GloomPicFront) == BANK(GloomPicBack)

data/pokemon/base_stats/golbat.asm

@@ -19,4 +19,5 @@
 	     BIDE,         SWIFT,        REST,         SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(GolbatPicFront)
+	assert BANK(GolbatPicFront) == BANK(GolbatPicBack)

data/pokemon/base_stats/goldeen.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE,   SURF
 	; end
 
-	db 0 ; padding
+	db BANK(GoldeenPicFront)
+	assert BANK(GoldeenPicFront) == BANK(GoldeenPicBack)

data/pokemon/base_stats/golduck.asm

@@ -22,4 +22,5 @@
 	     STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GolduckPicFront)
+	assert BANK(GolduckPicFront) == BANK(GolduckPicBack)

data/pokemon/base_stats/golem.asm

@@ -21,4 +21,5 @@
 	     REST,         EXPLOSION,    ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GolemPicFront)
+	assert BANK(GolemPicFront) == BANK(GolemPicBack)

data/pokemon/base_stats/gorochu.asm

@@ -0,0 +1,26 @@
+	db DEX_GOROCHU ; pokedex id
+
+	db  70, 100,  65, 110, 100
+	;   hp  atk  def  spd  spc
+
+	db ELECTRIC, ELECTRIC ; type
+	db 45 ; catch rate
+	db 193 ; base exp
+
+	INCBIN "gfx/pokemon/front/gorochu.pic", 0, 1 ; sprite dimensions
+	dw GorochuPicFront, GorochuPicBack
+
+	db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        HORN_DRILL,   BODY_SLAM,    \
+	     TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   PAY_DAY,      SUBMISSION,   \
+	     COUNTER,      SEISMIC_TOSS, RAGE,         THUNDERBOLT,  THUNDER,      \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         SWIFT,        \
+	     SKULL_BASH,   REST,         THUNDER_WAVE, SUBSTITUTE,   FLY,          \
+	     SURF,         FLASH
+	; end
+
+	db BANK(GorochuPicFront)
+	assert BANK(GorochuPicFront) == BANK(GorochuPicBack)

data/pokemon/base_stats/gorotora.asm

@@ -0,0 +1,24 @@
+	db DEX_GOROTORA ; pokedex id
+
+	db  90, 105,  85,  80,  95
+	;   hp  atk  def  spd  spc
+
+	db ELECTRIC, ELECTRIC ; type
+	db 60 ; catch rate
+	db 197 ; base exp
+
+	INCBIN "gfx/pokemon/front/gorotora.pic", 0, 1 ; sprite dimensions
+	dw GorotoraPicFront, GorotoraPicBack
+
+	db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
+	     RAGE,         THUNDERBOLT,  THUNDER,      EARTHQUAKE,   FISSURE,      \
+	     MIMIC,        DOUBLE_TEAM,  BIDE,         SWIFT,        SKULL_BASH,   \
+	     REST,         THUNDER_WAVE, SUBSTITUTE
+	; end
+
+	db BANK(GorotoraPicFront)
+	assert BANK(GorotoraPicFront) == BANK(GorotoraPicBack)

data/pokemon/base_stats/graveler.asm

@@ -21,4 +21,5 @@
 	     ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GravelerPicFront)
+	assert BANK(GravelerPicFront) == BANK(GravelerPicBack)

data/pokemon/base_stats/grimer.asm

@@ -19,4 +19,5 @@
 	     FIRE_BLAST,   REST,         EXPLOSION,    SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(GrimerPicFront)
+	assert BANK(GrimerPicFront) == BANK(GrimerPicBack)

data/pokemon/base_stats/growlithe.asm

@@ -20,4 +20,5 @@
 	     SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(GrowlithePicFront)
+	assert BANK(GrowlithePicFront) == BANK(GrowlithePicBack)

data/pokemon/base_stats/guardia.asm

@@ -0,0 +1,26 @@
+	db DEX_GUARDIA ; pokedex id
+
+	db  70,  90, 120,  65, 100
+	;   hp  atk  def  spd  spc
+
+	db GROUND, GROUND ; type
+	db 45 ; catch rate
+	db 194 ; base exp
+
+	INCBIN "gfx/pokemon/front/guardia.pic", 0, 1 ; sprite dimensions
+	dw GuardiaPicFront, GuardiaPicBack
+
+	db BONE_CLUB, TAIL_WHIP, GROWL, HEADBUTT ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         FIRE_BLAST,   SKULL_BASH,   REST,         SUBSTITUTE,   \
+	     STRENGTH
+	; end
+
+	db BANK(GuardiaPicFront)
+	assert BANK(GuardiaPicFront) == BANK(GuardiaPicBack)

data/pokemon/base_stats/gyaoon.asm

@@ -0,0 +1,25 @@
+	db DEX_GYAOON ; pokedex id
+
+	db 101, 130, 105,  35,  70
+	;   hp  atk  def  spd  spc
+
+	db ROCK, ROCK ; type
+	db 45 ; catch rate
+	db 204 ; base exp
+
+	INCBIN "gfx/pokemon/front/gyaoon.pic", 0, 1 ; sprite dimensions
+	dw GyaoonPicFront, GyaoonPicBack
+
+	db SUBSTITUTE, GROWL, TACKLE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         DRAGON_RAGE,  EARTHQUAKE,   FISSURE,      DIG,          \
+	     MIMIC,        DOUBLE_TEAM,  BIDE,         FIRE_BLAST,   SKULL_BASH,   \
+	     REST,         ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
+	; end
+
+	db BANK(GyaoonPicFront)
+	assert BANK(GyaoonPicFront) == BANK(GyaoonPicBack)

data/pokemon/base_stats/gyarados.asm

@@ -21,4 +21,5 @@
 	     SUBSTITUTE,   SURF,         STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(GyaradosPicFront)
+	assert BANK(GyaradosPicFront) == BANK(GyaradosPicBack)

data/pokemon/base_stats/gyopin.asm

@@ -0,0 +1,24 @@
+	db DEX_GYOPIN ; pokedex id
+
+	db  35,  57,  50,  53,  40
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 255 ; catch rate
+	db 57 ; base exp
+
+	INCBIN "gfx/pokemon/front/gyopin.pic", 0, 1 ; sprite dimensions
+	dw GyopinPicFront, GyopinPicBack
+
+	db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm TOXIC,        HORN_DRILL,   TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
+	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     RAGE,         MIMIC,        \
+	     DOUBLE_TEAM,  BIDE,         SWIFT,        SKULL_BASH,   REST,         \
+	     SUBSTITUTE,   SURF
+	; end
+
+	ddb BANK(GyopinPicFront)
+	assert BANK(GyopinPicFront) == BANK(GyopinPicBack)

data/pokemon/base_stats/haunter.asm

@@ -19,4 +19,5 @@
 	     DREAM_EATER,  REST,         PSYWAVE,      EXPLOSION,    SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(HaunterPicFront)
+	assert BANK(HaunterPicFront) == BANK(HaunterPicBack)

data/pokemon/base_stats/hinaazu.asm

@@ -0,0 +1,24 @@
+	db DEX_HINAAZU ; pokedex id
+
+	db  20,  70,  30,  20,  60
+	;   hp  atk  def  spd  spc
+
+	db NORMAL, FLYING ; type
+	db 255 ; catch rate
+	db 66 ; base exp
+
+	INCBIN "gfx/pokemon/front/hinaazu.pic", 0, 1 ; sprite dimensions
+	dw HinaazuPicFront, HinaazuPicBack
+
+	db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm WHIRLWIND,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
+	     RAGE,         MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
+	     SKULL_BASH,   SKY_ATTACK,   REST,         TRI_ATTACK,   SUBSTITUTE,   \
+	     FLY
+	; end
+
+	db BANK(HinaazuPicFront)
+	assert BANK(HinaazuPicFront) == BANK(HinaazuPicBack)

data/pokemon/base_stats/hitmonchan.asm

@@ -20,4 +20,5 @@
 	     SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(HitmonchanPicFront)
+	assert BANK(HitmonchanPicFront) == BANK(HitmonchanPicBack)

data/pokemon/base_stats/hitmonlee.asm

@@ -20,4 +20,5 @@
 	     SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(HitmonleePicFront)
+	assert BANK(HitmonleePicFront) == BANK(HitmonleePicBack)

data/pokemon/base_stats/horsea.asm

@@ -20,4 +20,5 @@
 	     SURF
 	; end
 
-	db 0 ; padding
+	db BANK(HorseaPicFront)
+	assert BANK(HorseaPicFront) == BANK(HorseaPicBack)

data/pokemon/base_stats/hypno.asm

@@ -22,4 +22,5 @@
 	     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(HypnoPicFront)
+	assert BANK(HypnoPicFront) == BANK(HypnoPicBack)

data/pokemon/base_stats/ivysaur.asm

@@ -19,4 +19,5 @@
 	     REFLECT,      BIDE,         REST,         SUBSTITUTE,   CUT
 	; end
 
-	db 0 ; padding
+	db BANK(IvysaurPicFront)
+	assert BANK(IvysaurPicFront) == BANK(IvysaurPicBack)

data/pokemon/base_stats/jabetta.asm

@@ -0,0 +1,25 @@
+	db DEX_JABETTA ; pokedex id
+
+	db  80, 125,  70,  80,  80
+	;   hp  atk  def  spd  spc
+
+	db WATER, FIGHTING ; type
+	db 75 ; catch rate
+	db 184 ; base exp
+
+	INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions
+	dw JabettaPicFront, JabettaPicBack
+
+	db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     \
+	     HYPER_BEAM,   COUNTER,      SEISMIC_TOSS, RAGE,         MIMIC,        \
+	     DOUBLE_TEAM,  BIDE,         SKY_ATTACK,   REST,         SUBSTITUTE,   \
+	     SURF,         STRENGTH
+	; end
+
+	db BANK(JabettaPicFront)
+	assert BANK(JabettaPicFront) == BANK(JabettaPicBack)

data/pokemon/base_stats/jagg.asm

@@ -0,0 +1,24 @@
+	db DEX_JAGG ; pokedex id
+
+	db  80, 115, 100,  60,  85
+	;   hp  atk  def  spd  spc
+
+	db WATER, STEEL ; type
+	db 45 ; catch rate
+	db 204 ; base exp
+
+	INCBIN "gfx/pokemon/front/jagg.pic", 0, 1 ; sprite dimensions
+	dw JaggPicFront, JaggPicBack
+
+	db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm SWORDS_DANCE, TOXIC,        HORN_DRILL,   TAKE_DOWN,    DOUBLE_EDGE,  \
+	     BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   \
+	     RAGE,         EARTHQUAKE,   FISSURE,      MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SKULL_BASH,   REST,         SUBSTITUTE,   SURF
+	; end
+
+	db BANK(JaggPicFront)
+	assert BANK(JaggPicFront) == BANK(JaggPicBack)

data/pokemon/base_stats/jigglypuff.asm

@@ -23,4 +23,5 @@
 	     STRENGTH,     FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(JigglypuffPicFront)
+	assert BANK(JigglypuffPicFront) == BANK(JigglypuffPicBack)

data/pokemon/base_stats/jolteon.asm

@@ -20,4 +20,5 @@
 	     THUNDER_WAVE, SUBSTITUTE,   FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(JolteonPicFront)
+	assert BANK(JolteonPicFront) == BANK(JolteonPicBack)

data/pokemon/base_stats/jynx.asm

@@ -22,4 +22,5 @@
 	     SUBSTITUTE
 	; end
 
-	db 0 ; padding
+	db BANK(JynxPicFront)
+	assert BANK(JynxPicFront) == BANK(JynxPicBack)

data/pokemon/base_stats/kabuto.asm

@@ -20,4 +20,5 @@
 	     SURF
 	; end
 
-	db 0 ; padding
+	db BANK(KabutoPicFront)
+	assert BANK(KabutoPicFront) == BANK(KabutoPicBack)

data/pokemon/base_stats/kabutops.asm

@@ -21,4 +21,5 @@
 	     REST,         SUBSTITUTE,   SURF
 	; end
 
-	db 0 ; padding
+	db BANK(KabutopsPicFront)
+	assert BANK(KabutopsPicFront) == BANK(KabutopsPicBack)

data/pokemon/base_stats/kadabra.asm

@@ -21,4 +21,5 @@
 	     THUNDER_WAVE, PSYWAVE,      TRI_ATTACK,   SUBSTITUTE,   FLASH
 	; end
 
-	db 0 ; padding
+	db BANK(KadabraPicFront)
+	assert BANK(KadabraPicFront) == BANK(KadabraPicBack)

data/pokemon/base_stats/kakuna.asm

@@ -17,4 +17,5 @@
 	tmhm
 	; end
 
-	db 0 ; padding
+	db BANK(KakunaPicFront)
+	assert BANK(KakunaPicFront) == BANK(KakunaPicBack)

data/pokemon/base_stats/kangaskhan.asm

@@ -22,4 +22,5 @@
 	     ROCK_SLIDE,   SUBSTITUTE,   SURF,         STRENGTH
 	; end
 
-	db 0 ; padding
+	db BANK(KangaskhanPicFront)
+	assert BANK(KangaskhanPicFront) == BANK(KangaskhanPicBack)