diff --git a/README.md b/README.md index 4feaa580..e6b25da1 100644 --- a/README.md +++ b/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? diff --git a/constants/item_constants.asm b/constants/item_constants.asm index edd70379..e8aff382 100644 --- a/constants/item_constants.asm +++ b/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 diff --git a/data/items/key_items.asm b/data/items/key_items.asm index b0c4b1ad..6b11e2b4 100644 --- a/data/items/key_items.asm +++ b/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 TRUE ; HELIX_FOSSIL + dbit FALSE ; DOME_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 diff --git a/data/items/marts.asm b/data/items/marts.asm index c6a80de5..00870412 100644 --- a/data/items/marts.asm +++ b/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 diff --git a/data/items/names.asm b/data/items/names.asm index af51446b..a10a57bd 100644 --- a/data/items/names.asm +++ b/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" diff --git a/data/items/prices.asm b/data/items/prices.asm index 6c1c2891..3ddfeac3 100644 --- a/data/items/prices.asm +++ b/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 diff --git a/data/items/use_party.asm b/data/items/use_party.asm index e8da68be..a3c666ae 100644 --- a/data/items/use_party.asm +++ b/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 diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index 8ada664a..e587ba36 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/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 diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index a34a1a25..f610cbec 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/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 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 691e75b0..e5129dc1 100644 --- a/data/pokemon/base_stats.asm +++ b/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 diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 3c69c7c7..6de19271 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/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) diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index aad1aff5..9b014610 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/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) diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 0064416f..aa5ec6a1 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -22,4 +22,5 @@ FLASH ; end - db 0 ; padding + db BANK(AlakazamPicFront) + assert BANK(AlakazamPicFront) == BANK(AlakazamPicBack) diff --git a/data/pokemon/base_stats/animon.asm b/data/pokemon/base_stats/animon.asm new file mode 100644 index 00000000..e2496ef9 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index c34316ce..209ecc78 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/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) diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index d21ec31b..3076d948 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/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) diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index c40d5326..265a7c2f 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/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) diff --git a/data/pokemon/base_stats/barunda.asm b/data/pokemon/base_stats/barunda.asm new file mode 100644 index 00000000..24cb6794 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/bawligua.asm b/data/pokemon/base_stats/bawligua.asm new file mode 100644 index 00000000..aa7e61b2 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 328538a3..1335e22b 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -20,4 +20,5 @@ CUT ; end - db 0 ; padding + db BANK(BeedrillPicFront) + assert BANK(BeedrillPicFront) == BANK(BeedrillPicBack) diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm new file mode 100644 index 00000000..385568f3 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 075598db..a379d6a7 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/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) diff --git a/data/pokemon/base_stats/betobebii.asm b/data/pokemon/base_stats/betobebii.asm new file mode 100644 index 00000000..afe60e30 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/bittybat.asm new file mode 100644 index 00000000..5aeb223d --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 512c66a3..adbbab33 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -22,4 +22,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(BlastoisePicFront) + assert BANK(BlastoisePicFront) == BANK(BlastoisePicBack) diff --git a/data/pokemon/base_stats/blastyke.asm b/data/pokemon/base_stats/blastyke.asm new file mode 100644 index 00000000..37acc266 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/blottle.asm b/data/pokemon/base_stats/blottle.asm new file mode 100644 index 00000000..7e1e79ff --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index e2796f9e..de3c2950 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/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) diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index f18cf5e9..e94cdad1 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/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) diff --git a/data/pokemon/base_stats/buu.asm b/data/pokemon/base_stats/buu.asm new file mode 100644 index 00000000..da10a264 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/cactus.asm b/data/pokemon/base_stats/cactus.asm new file mode 100644 index 00000000..73336db6 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index e9c196ab..91f201e8 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(CaterpiePicFront) + assert BANK(CaterpiePicFront) == BANK(CaterpiePicBack) diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index fc1fcb71..ddc0d83d 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -24,4 +24,5 @@ FLASH ; end - db 0 ; padding + db BANK(ChanseyPicFront) + assert BANK(ChanseyPicFront) == BANK(ChanseyPicBack) diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 715e0f7f..e9a146de 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -22,4 +22,5 @@ CUT, STRENGTH ; end - db 0 ; padding + db BANK(CharizardPicFront) + assert BANK(CharizardPicFront) == BANK(CharizardPicBack) diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index acf364ed..e131031b 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/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) diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 0305197e..390dd902 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/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) diff --git a/data/pokemon/base_stats/cheep.asm b/data/pokemon/base_stats/cheep.asm new file mode 100644 index 00000000..7772833e --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 0aef8405..5a1df5c2 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/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) diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 136b30be..706a8b4d 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/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) diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 8b75cb0e..b57cc892 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -21,4 +21,5 @@ SURF ; end - db 0 ; padding + db BANK(CloysterPicFront) + assert BANK(CloysterPicFront) == BANK(CloysterPicBack) diff --git a/data/pokemon/base_stats/croakozuna.asm b/data/pokemon/base_stats/croakozuna.asm new file mode 100644 index 00000000..d302e842 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/crocky.asm b/data/pokemon/base_stats/crocky.asm new file mode 100644 index 00000000..8ab121b4 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/cryithan.asm b/data/pokemon/base_stats/cryithan.asm new file mode 100644 index 00000000..b962733f --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 6a813ab6..365a6816 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/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) diff --git a/data/pokemon/base_stats/decilla.asm b/data/pokemon/base_stats/decilla.asm new file mode 100644 index 00000000..1d8db584 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/deer.asm b/data/pokemon/base_stats/deer.asm new file mode 100644 index 00000000..7275051e --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 822189a9..30a4b609 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/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) diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index c8ee014b..d0075605 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/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) diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index a3d919f4..39903bc4 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(DittoPicFront) + assert BANK(DittoPicFront) == BANK(DittoPicBack) diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index a3e95545..103ccc5c 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -20,4 +20,5 @@ SUBSTITUTE, FLY ; end - db 0 ; padding + db BANK(DodrioPicFront) + assert BANK(DodrioPicFront) == BANK(DodrioPicBack) diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 9803960b..5616ff69 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -20,4 +20,5 @@ FLY ; end - db 0 ; padding + db BANK(DoduoPicFront) + assert BANK(DoduoPicFront) == BANK(DoduoPicBack) diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 1178ebcc..04bab83f 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/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) diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index 968d53b6..ffd0781b 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -22,4 +22,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(DragonitePicFront) + assert BANK(DragonitePicFront) == BANK(DragonitePicBack) diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 42a93822..0cc5dbce 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/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) diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 047b9f8e..8230e77e 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/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) diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index cffc8750..d974d510 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/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) diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index a3a6ed4c..bff0c68c 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/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) diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 878d223f..e64ee9c1 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -20,4 +20,5 @@ SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(EkansPicFront) + assert BANK(EkansPicFront) == BANK(EkansPicBack) diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 8378cc52..eb0e9c12 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/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) diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 59f21767..8e29c2ca 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/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) diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 8eea9e3a..fa24b197 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -20,4 +20,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(ExeggcutePicFront) + assert BANK(ExeggcutePicFront) == BANK(ExeggcutePicBack) diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index cb4d3ee6..2c4fe11e 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/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) diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm index 8e0d79e4..0e45b851 100644 --- a/data/pokemon/base_stats/farfetchd.asm +++ b/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) diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 33ad5c5a..e0130b93 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/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) diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 5ccf33ef..d044b74a 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/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) diff --git a/data/pokemon/base_stats/gaotora.asm b/data/pokemon/base_stats/gaotora.asm new file mode 100644 index 00000000..260e60af --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index f48b4234..6865c4e8 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/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) diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 3a07a441..2cfec128 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -22,4 +22,5 @@ SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(GengarPicFront) + assert BANK(GengarPicFront) == BANK(GengarPicBack) diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 849e1234..660f02fd 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/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) diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 7526d5ef..192755c5 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/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) diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 9c852c91..90230067 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/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) diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 35ea2418..024512c6 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -20,4 +20,5 @@ SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(GoldeenPicFront) + assert BANK(GoldeenPicFront) == BANK(GoldeenPicBack) diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index eb79d100..3314c452 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -22,4 +22,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(GolduckPicFront) + assert BANK(GolduckPicFront) == BANK(GolduckPicBack) diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index adcefb3f..9454588b 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/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) diff --git a/data/pokemon/base_stats/gorochu.asm b/data/pokemon/base_stats/gorochu.asm new file mode 100644 index 00000000..86d6931f --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/gorotora.asm b/data/pokemon/base_stats/gorotora.asm new file mode 100644 index 00000000..bd4d0247 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index af0b3dcc..fa6ec9f0 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/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) diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 24e972ce..7eb80096 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/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) diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index efc1059f..da2526a9 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -20,4 +20,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(GrowlithePicFront) + assert BANK(GrowlithePicFront) == BANK(GrowlithePicBack) diff --git a/data/pokemon/base_stats/guardia.asm b/data/pokemon/base_stats/guardia.asm new file mode 100644 index 00000000..43a63497 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/gyaoon.asm b/data/pokemon/base_stats/gyaoon.asm new file mode 100644 index 00000000..002c90a2 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index f08d29c9..f1ecaaaa 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/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) diff --git a/data/pokemon/base_stats/gyopin.asm b/data/pokemon/base_stats/gyopin.asm new file mode 100644 index 00000000..f1a1d074 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 71e94347..d3c037d5 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/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) diff --git a/data/pokemon/base_stats/hinaazu.asm b/data/pokemon/base_stats/hinaazu.asm new file mode 100644 index 00000000..bb225a87 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 407e5e32..ef28aad6 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/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) diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index e39ceecd..3ab09fae 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/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) diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 9520ad59..7a3fec0b 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -20,4 +20,5 @@ SURF ; end - db 0 ; padding + db BANK(HorseaPicFront) + assert BANK(HorseaPicFront) == BANK(HorseaPicBack) diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 760276db..b9ce4a7f 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -22,4 +22,5 @@ FLASH ; end - db 0 ; padding + db BANK(HypnoPicFront) + assert BANK(HypnoPicFront) == BANK(HypnoPicBack) diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 3601a924..37b60c0a 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/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) diff --git a/data/pokemon/base_stats/jabetta.asm b/data/pokemon/base_stats/jabetta.asm new file mode 100644 index 00000000..e89e89d2 --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/jagg.asm b/data/pokemon/base_stats/jagg.asm new file mode 100644 index 00000000..0ba7313e --- /dev/null +++ b/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) diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index c249d93d..99ad737c 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -23,4 +23,5 @@ STRENGTH, FLASH ; end - db 0 ; padding + db BANK(JigglypuffPicFront) + assert BANK(JigglypuffPicFront) == BANK(JigglypuffPicBack) diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index cb7e989e..b7471924 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/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) diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 1700c890..e9e4218a 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -22,4 +22,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(JynxPicFront) + assert BANK(JynxPicFront) == BANK(JynxPicBack) diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 407c78f5..67439dea 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -20,4 +20,5 @@ SURF ; end - db 0 ; padding + db BANK(KabutoPicFront) + assert BANK(KabutoPicFront) == BANK(KabutoPicBack) diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 62585d70..86a23b63 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/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) diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 51fc6a91..0475b7c4 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/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) diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index c0cfb63c..eb46ee62 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(KakunaPicFront) + assert BANK(KakunaPicFront) == BANK(KakunaPicBack) diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index ccd36041..4878cb2b 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/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) diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index d3b3b80e..c78809ca 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -20,4 +20,5 @@ SUBSTITUTE, CUT, SURF, STRENGTH ; end - db 0 ; padding + db BANK(KinglerPicFront) + assert BANK(KinglerPicFront) == BANK(KinglerPicBack) diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index b9b63812..29c98934 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -19,4 +19,5 @@ EXPLOSION, SUBSTITUTE ; end - db 0 ; padding + db BANK(KoffingPicFront) + assert BANK(KoffingPicFront) == BANK(KoffingPicBack) diff --git a/data/pokemon/base_stats/konya.asm b/data/pokemon/base_stats/konya.asm new file mode 100644 index 00000000..fd9abf36 --- /dev/null +++ b/data/pokemon/base_stats/konya.asm @@ -0,0 +1,24 @@ + db DEX_KONYA ; pokedex id + + db 35, 40, 30, 85, 35 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 255 ; catch rate + db 53 ; base exp + + INCBIN "gfx/pokemon/front/konya.pic", 0, 1 ; sprite dimensions + dw KonyaPicFront, KonyaPicBack + + db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE + ; end + + db BANK(KonyaPicFront) + assert BANK(KonyaPicFront) == BANK(KonyaPicBack) diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.asm new file mode 100644 index 00000000..74379a34 --- /dev/null +++ b/data/pokemon/base_stats/kotora.asm @@ -0,0 +1,23 @@ + db DEX_KOTORA ; pokedex id + + db 50, 65, 45, 40, 55 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 180 ; catch rate + db 88 ; base exp + + INCBIN "gfx/pokemon/front/kotora.pic", 0, 1 ; sprite dimensions + dw KotoraPicFront, KotoraPicBack + + db THUNDERSHOCK, 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, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE + ; end + + db BANK(KotoraPicFront) + assert BANK(KotoraPicFront) == BANK(KotoraPicBack) diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index 6bd1c197..c3a70f5c 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -20,4 +20,5 @@ CUT, SURF, STRENGTH ; end - db 0 ; padding + db BANK(KrabbyPicFront) + assert BANK(KrabbyPicFront) == BANK(KrabbyPicBack) diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 5e31f7f5..5f494e95 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -22,4 +22,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(LaprasPicFront) + assert BANK(LaprasPicFront) == BANK(LaprasPicBack) diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 45826b40..ec2fdf9c 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -22,4 +22,5 @@ REST, SUBSTITUTE, CUT, SURF, STRENGTH ; end - db 0 ; padding + db BANK(LickitungPicFront) + assert BANK(LickitungPicFront) == BANK(LickitungPicBack) diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index f750f9fa..41e80d74 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -21,4 +21,5 @@ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(MachampPicFront) + assert BANK(MachampPicFront) == BANK(MachampPicBack) diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index b52772ef..e33e3789 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -21,4 +21,5 @@ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(MachokePicFront) + assert BANK(MachokePicFront) == BANK(MachokePicBack) diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 20fe0e6e..1b70b5d1 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -21,4 +21,5 @@ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(MachopPicFront) + assert BANK(MachopPicFront) == BANK(MachopPicBack) diff --git a/data/pokemon/base_stats/madaamu.asm b/data/pokemon/base_stats/madaamu.asm new file mode 100644 index 00000000..67dd3fb3 --- /dev/null +++ b/data/pokemon/base_stats/madaamu.asm @@ -0,0 +1,25 @@ + db DEX_MADAAMU ; pokedex id + + db 72, 105, 75, 70, 63 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 25 ; catch rate + db 196 ; base exp + + INCBIN "gfx/pokemon/front/madaamu.pic", 0, 1 ; sprite dimensions + dw MadaamuPicFront, MadaamuPicBack + + db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, HORN_DRILL, \ + BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT, \ + FLY + ; end + + db BANK(MadaamuPicFront) + assert BANK(MadaamuPicFront) == BANK(MadaamuPicBack) diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index c2c2f8c2..ea896964 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(MagikarpPicFront) + assert BANK(MagikarpPicFront) == BANK(MagikarpPicBack) diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index b402cfa3..de082677 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -21,4 +21,5 @@ PSYWAVE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(MagmarPicFront) + assert BANK(MagmarPicFront) == BANK(MagmarPicBack) diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 6242d692..aa40962e 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -20,4 +20,5 @@ FLASH ; end - db 0 ; padding + db BANK(MagnemitePicFront) + assert BANK(MagnemitePicFront) == BANK(MagnemitePicBack) diff --git a/data/pokemon/base_stats/magnetite.asm b/data/pokemon/base_stats/magnetite.asm new file mode 100644 index 00000000..a15e6512 --- /dev/null +++ b/data/pokemon/base_stats/magnetite.asm @@ -0,0 +1,24 @@ + db DEX_MAGNETITE ; pokedex id + + db 30, 40, 75, 50, 100 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 90 ; catch rate + db 118 ; base exp + + INCBIN "gfx/pokemon/front/magnetite.pic", 0, 1 ; sprite dimensions + dw MagnetitePicFront, MagnetitePicBack + + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + FLASH + ; end + + db BANK(MagnetitePicFront) + assert BANK(MagnetitePicFront) == BANK(MagnetitePicBack) diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 13d2e595..29a80d5f 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -20,4 +20,5 @@ SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(MagnetonPicFront) + assert BANK(MagnetonPicFront) == BANK(MagnetonPicBack) diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index ea529243..07cad4e1 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -21,4 +21,5 @@ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(MankeyPicFront) + assert BANK(MankeyPicFront) == BANK(MankeyPicBack) diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index 3d22e68a..315f9feb 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -22,4 +22,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(MarowakPicFront) + assert BANK(MarowakPicFront) == BANK(MarowakPicBack) diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 31a59bd5..63c89a6e 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -20,4 +20,5 @@ REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(MeowthPicFront) + assert BANK(MeowthPicFront) == BANK(MeowthPicBack) diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index e20b08bf..515d53d8 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(MetapodPicFront) + assert BANK(MetapodPicFront) == BANK(MetapodPicBack) diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 82a7ec47..e235384b 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -28,4 +28,5 @@ UNUSED ; end - db %11111111 ; padding + db BANK(MewPicFront) + assert BANK(MewPicFront) == BANK(MewPicBack) diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 5b276291..2bf6a8ef 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -24,4 +24,5 @@ FLASH ; end - db 0 ; padding + db BANK(MewtwoPicFront) + assert BANK(MewtwoPicFront) == BANK(MewtwoPicBack) diff --git a/data/pokemon/base_stats/mikon.asm b/data/pokemon/base_stats/mikon.asm new file mode 100644 index 00000000..29054f72 --- /dev/null +++ b/data/pokemon/base_stats/mikon.asm @@ -0,0 +1,23 @@ + db DEX_MIKON ; pokedex id + + db 28, 31, 30, 60, 60 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 255 ; catch rate + db 53 ; base exp + + INCBIN "gfx/pokemon/front/mikon.pic", 0, 1 ; sprite dimensions + dw MikonPicFront, MikonPicBack + + db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db BANK(MikonPicFront) + assert BANK(MikonPicFront) == BANK(MikonPicBack) diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 58745a29..13795ae9 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -20,4 +20,5 @@ SUBSTITUTE, FLY ; end - db 0 ; padding + db BANK(MoltresPicFront) + assert BANK(MoltresPicFront) == BANK(MoltresPicBack) diff --git a/data/pokemon/base_stats/monja.asm b/data/pokemon/base_stats/monja.asm new file mode 100644 index 00000000..833da92b --- /dev/null +++ b/data/pokemon/base_stats/monja.asm @@ -0,0 +1,23 @@ + db DEX_MONJA ; pokedex id + + db 45, 35, 85, 40, 80 + ; hp atk def spd spc + + db GRASS, GRASS ; type + db 190 ; catch rate + db 63 ; base exp + + INCBIN "gfx/pokemon/front/monja.pic", 0, 1 ; sprite dimensions + dw MonjaPicFront, MonjaPicBack + + db CONSTRICT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + BIDE, SKULL_BASH, REST, SUBSTITUTE, CUT + ; end + + db BANK(MonjaPicFront) + assert BANK(MonjaPicFront) == BANK(MonjaPicBack) diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm index 20c96508..c951804d 100644 --- a/data/pokemon/base_stats/mrmime.asm +++ b/data/pokemon/base_stats/mrmime.asm @@ -22,4 +22,5 @@ SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(MrMimePicFront) + assert BANK(MrMimePicFront) == BANK(MrMimePicBack) diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 901421ec..7fad0b55 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -19,4 +19,5 @@ SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end - db 0 ; padding + db BANK(MukPicFront) + assert BANK(MukPicFront) == BANK(MukPicBack) diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 2e0d4177..e0094618 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -23,4 +23,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(NidokingPicFront) + assert BANK(NidokingPicFront) == BANK(NidokingPicBack) diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 9b249f98..bfb912a3 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -23,4 +23,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(NidoqueenPicFront) + assert BANK(NidoqueenPicFront) == BANK(NidoqueenPicBack) diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm index 8ba4316c..eab93a8d 100644 --- a/data/pokemon/base_stats/nidoranf.asm +++ b/data/pokemon/base_stats/nidoranf.asm @@ -19,4 +19,5 @@ REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(NidoranFPicFront) + assert BANK(NidoranFPicFront) == BANK(NidoranFPicBack) diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm index 2b412640..519cd807 100644 --- a/data/pokemon/base_stats/nidoranm.asm +++ b/data/pokemon/base_stats/nidoranm.asm @@ -20,4 +20,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(NidoranMPicFront) + assert BANK(NidoranMPicFront) == BANK(NidoranMPicBack) diff --git a/data/pokemon/base_stats/nidoreign.asm b/data/pokemon/base_stats/nidoreign.asm new file mode 100644 index 00000000..f527c2d1 --- /dev/null +++ b/data/pokemon/base_stats/nidoreign.asm @@ -0,0 +1,27 @@ + db DEX_NIDOREIGN ; pokedex id + + db 90, 92, 87, 85, 75 + ; hp atk def spd spc + + db POISON, ROCK ; type + db 45 ; catch rate + db 201 ; base exp + + INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions + dw NidoreignPicFront, NidoreignPicBack + + db SCRATCH, GROWL, TAIL_WHIP, BITE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db BANK(NidoreignPicFront) + assert BANK(NidoreignPicFront) == BANK(NidoreignPicBack) diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 4345aeb7..36498d69 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -20,4 +20,5 @@ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(NidorinaPicFront) + assert BANK(NidorinaPicFront) == BANK(NidorinaPicBack) diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 44a11559..d5a5038d 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -20,4 +20,5 @@ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(NidorinoPicFront) + assert BANK(NidorinoPicFront) == BANK(NidorinoPicBack) diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 2c2bc615..af04230b 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -20,4 +20,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(NinetalesPicFront) + assert BANK(NinetalesPicFront) == BANK(NinetalesPicBack) diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 60172ea4..6386ccf7 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -19,4 +19,5 @@ BIDE, REST, SUBSTITUTE, CUT ; end - db 0 ; padding + db BANK(OddishPicFront) + assert BANK(OddishPicFront) == BANK(OddishPicBack) diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 258b2706..4301e267 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -20,4 +20,5 @@ SURF ; end - db 0 ; padding + db BANK(OmanytePicFront) + assert BANK(OmanytePicFront) == BANK(OmanytePicBack) diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 8ba4113e..13118b68 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -21,4 +21,5 @@ SURF ; end - db 0 ; padding + db BANK(OmastarPicFront) + assert BANK(OmastarPicFront) == BANK(OmastarPicBack) diff --git a/data/pokemon/base_stats/omega.asm b/data/pokemon/base_stats/omega.asm new file mode 100644 index 00000000..5434dd26 --- /dev/null +++ b/data/pokemon/base_stats/omega.asm @@ -0,0 +1,26 @@ + db DEX_OMEGA ; pokedex id + + db 101, 100, 120, 25, 95 + ; hp atk def spd spc + + db STEEL, STEEL ; type + db 25 ; catch rate + db 204 ; base exp + + INCBIN "gfx/pokemon/front/omega.pic", 0, 1 ; sprite dimensions + dw OmegaPicFront, OmegaPicBack + + db SUPERSONIC, METAL_SOUND, TACKLE, MAGNET_BOMB ; level 1 learnset + db GROWTH_SLOW ; 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, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ + FIRE_BLAST, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ + TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH + ; end + + db BANK(OmegaPicFront) + assert BANK(OmegaPicFront) == BANK(OmegaPicBack) diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 29d2f677..a34a9638 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -20,4 +20,5 @@ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(OnixPicFront) + assert BANK(OnixPicFront) == BANK(OnixPicBack) diff --git a/data/pokemon/base_stats/para.asm b/data/pokemon/base_stats/para.asm new file mode 100644 index 00000000..5ac548c2 --- /dev/null +++ b/data/pokemon/base_stats/para.asm @@ -0,0 +1,24 @@ + db DEX_PARA ; pokedex id + + db 20, 55, 40, 10, 40 + ; hp atk def spd spc + + db BUG, GRASS ; type + db 255 ; catch rate + db 53 ; base exp + + INCBIN "gfx/pokemon/front/para.pic", 0, 1 ; sprite dimensions + dw ParaPicFront, ParaPicBack + + db SCRATCH, ABSORB, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + SUBSTITUTE, CUT + ; end + + db BANK(ParaPicFront) + assert BANK(ParaPicFront) == BANK(ParaPicBack) diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 0a36e229..7ec34b8e 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -20,4 +20,5 @@ SUBSTITUTE, CUT ; end - db 0 ; padding + db BANK(ParasPicFront) + assert BANK(ParasPicFront) == BANK(ParasPicBack) diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index 5fa09fc9..e4a6ea3b 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -20,4 +20,5 @@ REST, SUBSTITUTE, CUT ; end - db 0 ; padding + db BANK(ParasectPicFront) + assert BANK(ParasectPicFront) == BANK(ParasectPicBack) diff --git a/data/pokemon/base_stats/pendraken.asm b/data/pokemon/base_stats/pendraken.asm new file mode 100644 index 00000000..276a275a --- /dev/null +++ b/data/pokemon/base_stats/pendraken.asm @@ -0,0 +1,25 @@ + db DEX_PENDRAKEN ; pokedex id + + db 80, 60, 85, 90, 95 + ; hp atk def spd spc + + db WATER, FAIRY ; type + db 45 ; catch rate + db 180 ; base exp + + INCBIN "gfx/pokemon/front/pendraken.pic", 0, 1 ; sprite dimensions + dw PendrakenPicFront, PendrakenPicBack + + 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, HYPER_BEAM, RAGE, DRAGON_RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, PSYWAVE, SUBSTITUTE, SURF, \ + FLASH + ; end + + db BANK(PendrakenPicFront) + assert BANK(PendrakenPicFront) == BANK(PendrakenPicBack) diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index ec214ead..afb7fd0b 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -20,4 +20,5 @@ SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(PersianPicFront) + assert BANK(PersianPicFront) == BANK(PersianPicBack) diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 9be82174..b7579182 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -20,4 +20,5 @@ FLY ; end - db 0 ; padding + db BANK(PidgeotPicFront) + assert BANK(PidgeotPicFront) == BANK(PidgeotPicBack) diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 2b99e4a6..4425d074 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -19,4 +19,5 @@ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end - db 0 ; padding + db BANK(PidgeottoPicFront) + assert BANK(PidgeottoPicFront) == BANK(PidgeottoPicBack) diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 04d23804..3b16625e 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -19,4 +19,5 @@ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end - db 0 ; padding + db BANK(PidgeyPicFront) + assert BANK(PidgeyPicFront) == BANK(PidgeyPicBack) diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 4a7f5e80..f242fc70 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -21,4 +21,5 @@ SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(PikachuPicFront) + assert BANK(PikachuPicFront) == BANK(PikachuPicBack) diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 946feaf1..ddf32be5 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -20,4 +20,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(PinsirPicFront) + assert BANK(PinsirPicFront) == BANK(PinsirPicBack) diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index f13b4c85..45b052e9 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -20,4 +20,5 @@ PSYWAVE, SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(PoliwagPicFront) + assert BANK(PoliwagPicFront) == BANK(PoliwagPicBack) diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index 8055d5ff..bd27aa4b 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -22,4 +22,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(PoliwhirlPicFront) + assert BANK(PoliwhirlPicFront) == BANK(PoliwhirlPicBack) diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index cd89c1ed..7fd62f0d 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -22,4 +22,5 @@ SUBSTITUTE, SURF, STRENGTH ; end - db 0 ; padding + db BANK(PoliwrathPicFront) + assert BANK(PoliwrathPicFront) == BANK(PoliwrathPicBack) diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 71d51956..a17fc6a3 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -19,4 +19,5 @@ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(PonytaPicFront) + assert BANK(PonytaPicFront) == BANK(PonytaPicBack) diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index bfec59ef..fe191216 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -21,4 +21,5 @@ TRI_ATTACK, SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(PorygonPicFront) + assert BANK(PorygonPicFront) == BANK(PorygonPicBack) diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 12f8bb01..a45c79d3 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -21,4 +21,5 @@ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(PrimeapePicFront) + assert BANK(PrimeapePicFront) == BANK(PrimeapePicBack) diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index b3fb9f41..51bd916b 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -21,4 +21,5 @@ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end - db 0 ; padding + db BANK(PsyduckPicFront) + assert BANK(PsyduckPicFront) == BANK(PsyduckPicBack) diff --git a/data/pokemon/base_stats/puchikoon.asm b/data/pokemon/base_stats/puchikoon.asm new file mode 100644 index 00000000..9f6529f3 --- /dev/null +++ b/data/pokemon/base_stats/puchikoon.asm @@ -0,0 +1,23 @@ + db DEX_PUCHIKOON ; pokedex id + + db 30, 65, 35, 70, 45 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 255 ; catch rate + db 88 ; base exp + + INCBIN "gfx/pokemon/front/puchikoon.pic", 0, 1 ; sprite dimensions + dw PuchikoonPicFront, PuchikoonPicBack + + db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db BANK(PuchikoonPicFront) + assert BANK(PuchikoonPicFront) == BANK(PuchikoonPicBack) diff --git a/data/pokemon/base_stats/pudi.asm b/data/pokemon/base_stats/pudi.asm new file mode 100644 index 00000000..b524e16d --- /dev/null +++ b/data/pokemon/base_stats/pudi.asm @@ -0,0 +1,24 @@ + db DEX_PUDI ; pokedex id + + db 40, 55, 30, 45, 35 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 255 ; catch rate + db 61 ; base exp + + INCBIN "gfx/pokemon/front/pudi.pic", 0, 1 ; sprite dimensions + dw PudiPicFront, PudiPicBack + + db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db BANK(PudiPicFront) + assert BANK(PudiPicFront) == BANK(PudiPicBack) diff --git a/data/pokemon/base_stats/purakkusu.asm b/data/pokemon/base_stats/purakkusu.asm new file mode 100644 index 00000000..76324a5a --- /dev/null +++ b/data/pokemon/base_stats/purakkusu.asm @@ -0,0 +1,24 @@ + db DEX_PURAKKUSU ; pokedex id + + db 65, 125, 140, 85, 55 + ; hp atk def spd spc + + db BUG, STEEL ; type + db 25 ; catch rate + db 209 ; base exp + + INCBIN "gfx/pokemon/front/purakkusu.pic", 0, 1 ; sprite dimensions + dw PurakkusuPicFront, PurakkusuPicBack + + db VICEGRIP, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + REST, SUBSTITUTE, CUT, STRENGTH + ; end + + ddb BANK(PurakkusuPicFront) + assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack) diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index a5c5acea..6ac71eb6 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -21,4 +21,5 @@ THUNDER_WAVE, SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(RaichuPicFront) + assert BANK(RaichuPicFront) == BANK(RaichuPicBack) diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index dbe16ab0..ac37a04a 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -20,4 +20,5 @@ SUBSTITUTE ; end - db 0 ; padding + db BANK(RapidashPicFront) + assert BANK(RapidashPicFront) == BANK(RapidashPicBack) diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index b33adf4d..910f4d15 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -20,4 +20,5 @@ BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(RaticatePicFront) + assert BANK(RaticatePicFront) == BANK(RaticatePicBack) diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index d6e263a1..78eb75b4 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -20,4 +20,5 @@ SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(RattataPicFront) + assert BANK(RattataPicFront) == BANK(RattataPicBack) diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index c6b17500..52205f3c 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -23,4 +23,5 @@ SURF, STRENGTH ; end - db 0 ; padding + db BANK(RhydonPicFront) + assert BANK(RhydonPicFront) == BANK(RhydonPicBack) diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index 6f4bb31b..90858f6d 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -20,4 +20,5 @@ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end - db 0 ; padding + db BANK(RhyhornPicFront) + assert BANK(RhyhornPicFront) == BANK(RhyhornPicBack) diff --git a/data/pokemon/base_stats/ribbito.asm b/data/pokemon/base_stats/ribbito.asm new file mode 100644 index 00000000..e84592ee --- /dev/null +++ b/data/pokemon/base_stats/ribbito.asm @@ -0,0 +1,26 @@ + db DEX_RIBBITO ; pokedex id + + db 94, 55, 50, 40, 55 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 88 ; base exp + + INCBIN "gfx/pokemon/front/ribbito.pic", 0, 1 ; sprite dimensions + dw RibbitoPicFront, RibbitoPicBack + + db DOUBLE_TEAM, DOUBLESLAP, NO_MOVE, 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, \ + 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(RibbitoPicFront) + assert BANK(RibbitoPicFront) == BANK(RibbitoPicBack) diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index a05f516f..8992a4e1 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -21,4 +21,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(SandshrewPicFront) + assert BANK(SandshrewPicFront) == BANK(SandshrewPicBack) diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 5a50dd25..6f28f93c 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -21,4 +21,5 @@ CUT, STRENGTH ; end - db 0 ; padding + db BANK(SandslashPicFront) + assert BANK(SandslashPicFront) == BANK(SandslashPicBack) diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm new file mode 100644 index 00000000..b4fd0e69 --- /dev/null +++ b/data/pokemon/base_stats/scizor.asm @@ -0,0 +1,23 @@ + db DEX_SCIZOR ; pokedex id + + db 70, 130, 100, 60, 55 + ; hp atk def spd spc + + db BUG, STEEL ; type + db 45 ; catch rate + db 204 ; base exp + + INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions + dw ScizorPicFront, ScizorPicBack + + db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, CUT + ; end + + db BANK(ScizorPicFront) + assert BANK(ScizorPicFront) == BANK(ScizorPicBack) diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index 044a2baf..c20abc8e 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -19,4 +19,5 @@ SKULL_BASH, REST, SUBSTITUTE, CUT ; end - db 0 ; padding + db BANK(ScytherPicFront) + assert BANK(ScytherPicFront) == BANK(ScytherPicBack) diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 6e3fb7ef..4008f0b6 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -20,4 +20,5 @@ SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(SeadraPicFront) + assert BANK(SeadraPicFront) == BANK(SeadraPicBack) diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 532a4c70..61a75f79 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -20,4 +20,5 @@ REST, SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(SeakingPicFront) + assert BANK(SeakingPicFront) == BANK(SeakingPicBack) diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index e2fe02ec..216856be 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -20,4 +20,5 @@ REST, SUBSTITUTE, SURF, STRENGTH ; end - db 0 ; padding + db BANK(SeelPicFront) + assert BANK(SeelPicFront) == BANK(SeelPicBack) diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index b52f7cb4..dec700ff 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -20,4 +20,5 @@ REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(ShellderPicFront) + assert BANK(ShellderPicFront) == BANK(ShellderPicBack) diff --git a/data/pokemon/base_stats/skimper.asm b/data/pokemon/base_stats/skimper.asm new file mode 100644 index 00000000..62273d2d --- /dev/null +++ b/data/pokemon/base_stats/skimper.asm @@ -0,0 +1,25 @@ + db DEX_SKIMPER ; pokedex id + + db 62, 43, 36, 88, 71 + ; hp atk def spd spc + + db WATER, WATER ; type + db 60 ; catch rate + db 67 ; base exp + + INCBIN "gfx/pokemon/front/skimper.pic", 0, 1 ; sprite dimensions + dw SkimperPicFront, SkimperPicBack + + 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 + ; end + + db BANK(SkimperPicFront) + assert BANK(SkimperPicFront) == BANK(SkimperPicBack) diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index 77483e91..0c76b0fa 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -24,4 +24,5 @@ FLASH ; end - db 0 ; padding + db BANK(SlowbroPicFront) + assert BANK(SlowbroPicFront) == BANK(SlowbroPicBack) diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 0ae2ef0a..c3f61de3 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -22,4 +22,5 @@ TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH ; end - db 0 ; padding + db BANK(SlowpokePicFront) + assert BANK(SlowpokePicFront) == BANK(SlowpokePicBack) diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9b6ccd3e..c7f1ddd1 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -24,4 +24,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(SnorlaxPicFront) + assert BANK(SnorlaxPicFront) == BANK(SnorlaxPicBack) diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 161f4100..740bbe09 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -19,4 +19,5 @@ SKY_ATTACK, REST, SUBSTITUTE, FLY ; end - db 0 ; padding + db BANK(SpearowPicFront) + assert BANK(SpearowPicFront) == BANK(SpearowPicBack) diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index e844ac6e..a3ffdbdb 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -21,4 +21,5 @@ REST, SUBSTITUTE, SURF, STRENGTH ; end - db 0 ; padding + db BANK(SquirtlePicFront) + assert BANK(SquirtlePicFront) == BANK(SquirtlePicBack) diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 1ec43ca8..11f8ef8f 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -22,4 +22,5 @@ FLASH ; end - db 0 ; padding + db BANK(StarmiePicFront) + assert BANK(StarmiePicFront) == BANK(StarmiePicBack) diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 198f552f..d4006e13 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -21,4 +21,5 @@ PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH ; end - db 0 ; padding + db BANK(StaryuPicFront) + assert BANK(StaryuPicFront) == BANK(StaryuPicBack) diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 5380a4a7..0eda0551 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -20,4 +20,5 @@ CUT ; end - db 0 ; padding + db BANK(TangelaPicFront) + assert BANK(TangelaPicFront) == BANK(TangelaPicBack) diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 9aba3e22..15f7751e 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -21,4 +21,5 @@ STRENGTH ; end - db 0 ; padding + db BANK(TaurosPicFront) + assert BANK(TaurosPicFront) == BANK(TaurosPicBack) diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index e8296d61..b7c26a33 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -20,4 +20,5 @@ REST, SUBSTITUTE, CUT, SURF ; end - db 0 ; padding + db BANK(TentacoolPicFront) + assert BANK(TentacoolPicFront) == BANK(TentacoolPicBack) diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index ad8f773e..22bf1881 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -20,4 +20,5 @@ SKULL_BASH, REST, SUBSTITUTE, CUT, SURF ; end - db 0 ; padding + db BANK(TentacruelPicFront) + assert BANK(TentacruelPicFront) == BANK(TentacruelPicBack) diff --git a/data/pokemon/base_stats/totartle.asm b/data/pokemon/base_stats/totartle.asm new file mode 100644 index 00000000..4f393bb6 --- /dev/null +++ b/data/pokemon/base_stats/totartle.asm @@ -0,0 +1,26 @@ + db DEX_TOTARTLE ; pokedex id + + db 70, 100, 65, 78, 100 + ; hp atk def spd spc + + db WATER, GRASS ; type + db 45 ; catch rate + db 209 ; base exp + + INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions + dw TotartlePicFront, TotartlePicBack + + db TACKLE, TAIL_WHIP, BUBBLE, 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, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db BANK(TotartlePicFront) + assert BANK(TotartlePicFront) == BANK(TotartlePicBack) diff --git a/data/pokemon/base_stats/trampel.asm b/data/pokemon/base_stats/trampel.asm new file mode 100644 index 00000000..0df1c958 --- /dev/null +++ b/data/pokemon/base_stats/trampel.asm @@ -0,0 +1,26 @@ + db DEX_TRAMPEL ; pokedex id + + db 130, 100, 90, 56, 64 + ; hp atk def spd spc + + db NORMAL, GROUND ; type + db 45 ; catch rate + db 204 ; base exp + + INCBIN "gfx/pokemon/front/trampel.pic", 0, 1 ; sprite dimensions + dw TrampelPicFront, TrampelPicBack + + db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db BANK(TrampelPicFront) + assert BANK(TrampelPicFront) == BANK(TrampelPicBack) diff --git a/data/pokemon/base_stats/tsubomitto.asm b/data/pokemon/base_stats/tsubomitto.asm new file mode 100644 index 00000000..b8d6329f --- /dev/null +++ b/data/pokemon/base_stats/tsubomitto.asm @@ -0,0 +1,24 @@ + db DEX_TSUBOMITTO ; pokedex id + + db 80, 120, 65, 70, 85 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 191 ; base exp + + INCBIN "gfx/pokemon/front/tsubomitto.pic", 0, 1 ; sprite dimensions + dw TsubomittoPicFront, TsubomittoPicBack + + db VINE_WHIP, GROWTH, LOVELY_KISS, RAZOR_LEAF ; 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(TsubomittoPicFront) + assert BANK(TsubomittoPicFront) == BANK(TsubomittoPicBack) diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index ec5c01d2..c57e6761 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -20,4 +20,5 @@ SKULL_BASH, REST, SUBSTITUTE, SURF ; end - db 0 ; padding + db BANK(VaporeonPicFront) + assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c01ee263..cfd9478b 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -20,4 +20,5 @@ SWIFT, REST, PSYWAVE, SUBSTITUTE ; end - db 0 ; padding + db BANK(VenomothPicFront) + assert BANK(VenomothPicFront) == BANK(VenomothPicBack) diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 9c9ff071..a4bec49a 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -19,4 +19,5 @@ BIDE, REST, PSYWAVE, SUBSTITUTE ; end - db 0 ; padding + db BANK(VenonatPicFront) + assert BANK(VenonatPicFront) == BANK(VenonatPicBack) diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 414590d8..4d46fa91 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -20,4 +20,5 @@ CUT ; end - db 0 ; padding + db BANK(VenusaurPicFront) + assert BANK(VenusaurPicFront) == BANK(VenusaurPicBack) diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 5b958297..1068791c 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -20,4 +20,5 @@ CUT ; end - db 0 ; padding + db BANK(VictreebelPicFront) + assert BANK(VictreebelPicFront) == BANK(VictreebelPicBack) diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 10ae05da..dc703c90 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -20,4 +20,5 @@ CUT ; end - db 0 ; padding + db BANK(VileplumePicFront) + assert BANK(VileplumePicFront) == BANK(VileplumePicBack) diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 4ad65701..5b507324 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -20,4 +20,5 @@ SUBSTITUTE, FLASH ; end - db 0 ; padding + db BANK(VoltorbPicFront) + assert BANK(VoltorbPicFront) == BANK(VoltorbPicBack) diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index c112b97d..bdb53318 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -19,4 +19,5 @@ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(VulpixPicFront) + assert BANK(VulpixPicFront) == BANK(VulpixPicBack) diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index d430bcdc..4fa7a053 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -21,4 +21,5 @@ REST, SUBSTITUTE, SURF, STRENGTH ; end - db 0 ; padding + db BANK(WartortlePicFront) + assert BANK(WartortlePicFront) == BANK(WartortlePicBack) diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index f6aba236..02b36121 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -17,4 +17,5 @@ tmhm ; end - db 0 ; padding + db BANK(WeedlePicFront) + assert BANK(WeedlePicFront) == BANK(WeedlePicBack) diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 513de8f8..27d2459e 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -19,4 +19,5 @@ BIDE, REST, SUBSTITUTE, CUT ; end - db 0 ; padding + db BANK(WeepinbellPicFront) + assert BANK(WeepinbellPicFront) == BANK(WeepinbellPicBack) diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index d605f15a..0c946fed 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -19,4 +19,5 @@ REST, EXPLOSION, SUBSTITUTE ; end - db 0 ; padding + db BANK(WeezingPicFront) + assert BANK(WeezingPicFront) == BANK(WeezingPicBack) diff --git a/data/pokemon/base_stats/weirduck.asm b/data/pokemon/base_stats/weirduck.asm new file mode 100644 index 00000000..d24e0534 --- /dev/null +++ b/data/pokemon/base_stats/weirduck.asm @@ -0,0 +1,25 @@ + db DEX_WEIRDUCK ; pokedex id + + db 65, 67, 63, 70, 65 + ; hp atk def spd spc + + db WATER, WATER ; type + db 120 ; catch rate + db 122 ; base exp + + INCBIN "gfx/pokemon/front/weirduck.pic", 0, 1 ; sprite dimensions + dw WeirduckPicFront, WeirduckPicBack + + db SCRATCH, TAIL_WHIP, AMNESIA, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db BANK(WeirduckPicFront) + assert BANK(WeirduckPicFront) == BANK(WeirduckPicBack) diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 7249badf..65e70844 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -23,4 +23,5 @@ SUBSTITUTE, STRENGTH, FLASH ; end - db 0 ; padding + db BANK(WigglytuffPicFront) + assert BANK(WigglytuffPicFront) == BANK(WigglytuffPicBack) diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 6571d286..21577754 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -20,4 +20,5 @@ REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH ; end - db 0 ; padding + db BANK(ZapdosPicFront) + assert BANK(ZapdosPicFront) == BANK(ZapdosPicBack) diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index ddae33cb..cc8fe9a2 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -19,4 +19,5 @@ SWIFT, REST, SUBSTITUTE ; end - db 0 ; padding + db BANK(ZubatPicFront) + assert BANK(ZubatPicFront) == BANK(ZubatPicBack) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index c5fcc292..cb36eb06 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -33,8 +33,8 @@ EvosMovesPointerTable: dw BlastoiseEvosMoves dw PinsirEvosMoves dw TangelaEvosMoves - dw MissingNo1FEvosMoves - dw MissingNo20EvosMoves + dw GyaoonEvosMoves + dw NidoreignEvosMoves dw GrowlitheEvosMoves dw OnixEvosMoves dw FearowEvosMoves @@ -52,26 +52,26 @@ EvosMovesPointerTable: dw PsyduckEvosMoves dw DrowzeeEvosMoves dw GolemEvosMoves - dw MissingNo32EvosMoves + dw BarundaEvosMoves dw MagmarEvosMoves - dw MissingNo34EvosMoves + dw BuuEvosMoves dw ElectabuzzEvosMoves dw MagnetonEvosMoves dw KoffingEvosMoves - dw MissingNo38EvosMoves + dw DeerEvosMoves dw MankeyEvosMoves dw SeelEvosMoves dw DiglettEvosMoves dw TaurosEvosMoves - dw MissingNo3DEvosMoves - dw MissingNo3EEvosMoves - dw MissingNo3FEvosMoves + dw TrampelEvosMoves + dw CrockyEvosMoves + dw BlottleEvosMoves dw FarfetchdEvosMoves dw VenonatEvosMoves dw DragoniteEvosMoves - dw MissingNo43EvosMoves - dw MissingNo44EvosMoves - dw MissingNo45EvosMoves + dw CactusEvosMoves + dw JaggEvosMoves + dw BittybatEvosMoves dw DoduoEvosMoves dw PoliwagEvosMoves dw JynxEvosMoves @@ -81,23 +81,23 @@ EvosMovesPointerTable: dw DittoEvosMoves dw MeowthEvosMoves dw KrabbyEvosMoves - dw MissingNo4FEvosMoves - dw MissingNo50EvosMoves - dw MissingNo51EvosMoves + dw CheepEvosMoves + dw JabettaEvosMoves + dw MikonEvosMoves dw VulpixEvosMoves dw NinetalesEvosMoves dw PikachuEvosMoves dw RaichuEvosMoves - dw MissingNo56EvosMoves - dw MissingNo57EvosMoves + dw RibbitoEvosMoves + dw CroakozunaEvosMoves dw DratiniEvosMoves dw DragonairEvosMoves dw KabutoEvosMoves dw KabutopsEvosMoves dw HorseaEvosMoves dw SeadraEvosMoves - dw MissingNo5EEvosMoves - dw MissingNo5FEvosMoves + dw BawliguaEvosMoves + dw CryithanEvosMoves dw SandshrewEvosMoves dw SandslashEvosMoves dw OmanyteEvosMoves @@ -117,38 +117,38 @@ EvosMovesPointerTable: dw WeedleEvosMoves dw KakunaEvosMoves dw BeedrillEvosMoves - dw MissingNo73EvosMoves + dw MadaamuEvosMoves dw DodrioEvosMoves dw PrimeapeEvosMoves dw DugtrioEvosMoves dw VenomothEvosMoves dw DewgongEvosMoves - dw MissingNo79EvosMoves - dw MissingNo7AEvosMoves + dw PurakkusuEvosMoves + dw PendrakenEvosMoves dw CaterpieEvosMoves dw MetapodEvosMoves dw ButterfreeEvosMoves dw MachampEvosMoves - dw MissingNo7FEvosMoves + dw WeirduckEvosMoves dw GolduckEvosMoves dw HypnoEvosMoves dw GolbatEvosMoves dw MewtwoEvosMoves dw SnorlaxEvosMoves dw MagikarpEvosMoves - dw MissingNo86EvosMoves - dw MissingNo87EvosMoves + dw KonyaEvosMoves + dw OmegaEvosMoves dw MukEvosMoves - dw MissingNo8AEvosMoves + dw DecillaEvosMoves dw KinglerEvosMoves dw CloysterEvosMoves - dw MissingNo8CEvosMoves + dw MagnetiteEvosMoves dw ElectrodeEvosMoves dw ClefableEvosMoves dw WeezingEvosMoves dw PersianEvosMoves dw MarowakEvosMoves - dw MissingNo92EvosMoves + dw GuardiaEvosMoves dw HaunterEvosMoves dw AbraEvosMoves dw AlakazamEvosMoves @@ -158,13 +158,13 @@ EvosMovesPointerTable: dw BulbasaurEvosMoves dw VenusaurEvosMoves dw TentacruelEvosMoves - dw MissingNo9CEvosMoves + dw GyopinEvosMoves dw GoldeenEvosMoves dw SeakingEvosMoves - dw MissingNo9FEvosMoves - dw MissingNoA0EvosMoves - dw MissingNoA1EvosMoves - dw MissingNoA2EvosMoves + dw KotoraEvosMoves + dw GaotoraEvosMoves + dw GorotoraEvosMoves + dw PuchikoonEvosMoves dw PonytaEvosMoves dw RapidashEvosMoves dw RattataEvosMoves @@ -174,16 +174,16 @@ EvosMovesPointerTable: dw GeodudeEvosMoves dw PorygonEvosMoves dw AerodactylEvosMoves - dw MissingNoACEvosMoves + dw BlastykeEvosMoves dw MagnemiteEvosMoves - dw MissingNoAEEvosMoves - dw MissingNoAFEvosMoves + dw SkimperEvosMoves + dw GorochuEvosMoves dw CharmanderEvosMoves dw SquirtleEvosMoves dw CharmeleonEvosMoves dw WartortleEvosMoves dw CharizardEvosMoves - dw MissingNoB5EvosMoves + dw TotartleEvosMoves dw FossilKabutopsEvosMoves dw FossilAerodactylEvosMoves dw MonGhostEvosMoves @@ -193,6 +193,15 @@ EvosMovesPointerTable: dw BellsproutEvosMoves dw WeepinbellEvosMoves dw VictreebelEvosMoves + dw TsubomittoEvosMoves + dw AnimonEvosMoves + dw MonjaEvosMoves + dw ParaEvosMoves + dw HinaazuEvosMoves + dw PudiEvosMoves + dw BetobebiiEvosMoves + dw BellossomEvosMoves + dw ScizorEvosMoves assert_table_length NUM_POKEMON_INDEXES RhydonEvosMoves: @@ -224,11 +233,11 @@ NidoranMEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 21, FOCUS_ENERGY - db 29, FURY_ATTACK - db 36, HORN_DRILL - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, FOCUS_ENERGY + db 30, FURY_ATTACK + db 38, HORN_DRILL db 0 ClefairyEvosMoves: @@ -273,8 +282,12 @@ NidokingEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 23, THRASH + db 12, DOUBLE_KICK + db 19, POISON_STING + db 26, FOCUS_ENERGY + db 34, FURY_ATTACK + db 41, THRASH + db 46, HORN_DRILL db 0 SlowbroEvosMoves: @@ -362,11 +375,11 @@ NidoranFEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 21, TAIL_WHIP - db 29, BITE - db 36, FURY_SWIPES - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, TAIL_WHIP + db 30, BITE + db 38, FURY_SWIPES db 0 NidoqueenEvosMoves: @@ -374,8 +387,12 @@ NidoqueenEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 23, BODY_SLAM + db 12, DOUBLE_KICK + db 19, POISON_STING + db 25, TAIL_WHIP + db 34, BITE + db 41, BODY_SLAM + db 46, FURY_SWIPES db 0 CuboneEvosMoves: @@ -383,6 +400,9 @@ CuboneEvosMoves: db EV_LEVEL, 28, MAROWAK db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 31, FOCUS_ENERGY db 38, THRASH @@ -480,6 +500,7 @@ GastlyEvosMoves: ScytherEvosMoves: ; Evolutions + db EV_LEVEL, 41, SCIZOR db 0 ; Learnset db 17, LEER @@ -488,6 +509,7 @@ ScytherEvosMoves: db 29, SLASH db 35, SWORDS_DANCE db 42, AGILITY + db 50, WING_ATTACK db 0 StaryuEvosMoves: @@ -518,8 +540,10 @@ BlastoiseEvosMoves: PinsirEvosMoves: ; Evolutions + db EV_LEVEL, 42, PURAKKUSU db 0 ; Learnset + db 21, BIND db 25, SEISMIC_TOSS db 30, GUILLOTINE db 36, FOCUS_ENERGY @@ -532,24 +556,31 @@ TangelaEvosMoves: ; Evolutions db 0 ; Learnset - db 29, ABSORB + db 24, BIND + db 27, ABSORB + db 29, VINE_WHIP db 32, POISONPOWDER db 36, STUN_SPORE db 39, SLEEP_POWDER db 45, SLAM - db 49, GROWTH + db 48, GROWTH db 0 -MissingNo1FEvosMoves: +GyaoonEvosMoves: ; Evolutions db 0 ; Learnset + db 35, SCREECH + db 38, ROCK_THROW + db 40, ROAR + db 47, ROCK_SLIDE db 0 -MissingNo20EvosMoves: +NidoreignEvosMoves: ; Evolutions db 0 ; Learnset + db 50, THRASH db 0 GrowlitheEvosMoves: @@ -642,6 +673,7 @@ ChanseyEvosMoves: ; Evolutions db 0 ; Learnset + db 12, DOUBLESLAP db 24, SING db 30, GROWL db 38, MINIMIZE @@ -719,14 +751,14 @@ ParasectEvosMoves: PsyduckEvosMoves: ; Evolutions - db EV_LEVEL, 33, GOLDUCK + db EV_LEVEL, 22, WEIRDUCK db 0 ; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 36, CONFUSION - db 43, FURY_SWIPES - db 52, HYDRO_PUMP + db 14, TAIL_WHIP + db 18, DISABLE + db 26, CONFUSION + db 32, FURY_SWIPES + db 39, HYDRO_PUMP db 0 DrowzeeEvosMoves: @@ -754,10 +786,14 @@ GolemEvosMoves: db 43, EXPLOSION db 0 -MissingNo32EvosMoves: +BarundaEvosMoves: ; Evolutions db 0 ; Learnset + db 25, SWEET_KISS + db 31, CONFUSE_RAY + db 37, CHARM + db 43, DAZZLE_GLEAM db 0 MagmarEvosMoves: @@ -772,10 +808,15 @@ MagmarEvosMoves: db 55, FLAMETHROWER db 0 -MissingNo34EvosMoves: +BuuEvosMoves: ; Evolutions db 0 ; Learnset + db 35, MIST + db 38, DISABLE + db 42, ICE_PUNCH + db 48, HAZE + db 54, ICE_BEAM db 0 ElectabuzzEvosMoves: @@ -813,10 +854,20 @@ KoffingEvosMoves: db 48, EXPLOSION db 0 -MissingNo38EvosMoves: +DeerEvosMoves: ; Evolutions db 0 ; Learnset + db 14, SAND_ATTACK + db 16, JUMP_KICK + db 18, CONFUSION + db 22, RAZOR_LEAF + db 26, SUPERSONIC + db 33, QUICK_ATTACK + db 37, LEER + db 41, AGILITY + db 45, THRASH + db 50, GROWTH db 0 MankeyEvosMoves: @@ -824,11 +875,13 @@ MankeyEvosMoves: db EV_LEVEL, 28, PRIMEAPE db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY db 33, SEISMIC_TOSS db 39, THRASH + db 45, SCREECH db 0 SeelEvosMoves: @@ -866,26 +919,49 @@ TaurosEvosMoves: db 51, TAKE_DOWN db 0 -MissingNo3DEvosMoves: +TrampelEvosMoves: ; Evolutions db 0 ; Learnset + db 10, HORN_ATTACK + db 23, STOMP + db 30, RAGE + db 38, FURY_ATTACK + db 44, LEER + db 50, ROAR db 0 -MissingNo3EEvosMoves: +CrockyEvosMoves: ; Evolutions db 0 ; Learnset + db 7, SUPERSONIC + db 12, BITE + db 20, DRAGON_RAGE + db 24, SLASH + db 30, SCREECH + db 38, GLARE + db 46, CONFUSE_RAY db 0 -MissingNo3FEvosMoves: +BlottleEvosMoves: ; Evolutions + db EV_LEVEL, 30, PENDRAKEN db 0 ; Learnset + db 8, BUBBLE + db 13, WRAP + db 19, FAIRY_WIND + db 23, HYPNOSIS + db 27, SUPERSONIC + db 32, DAZZLE_GLEAM + db 38, HAZE + db 43, HYDRO_PUMP db 0 FarfetchdEvosMoves: ; Evolutions + db EV_LEVEL, 24, MADAAMU db 0 ; Learnset db 7, LEER @@ -900,7 +976,9 @@ VenonatEvosMoves: db EV_LEVEL, 31, VENOMOTH db 0 ; Learnset - db 24, POISONPOWDER + db 11, SUPERSONIC + db 19, CONFUSION + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 35, PSYBEAM @@ -919,22 +997,46 @@ DragoniteEvosMoves: db 60, HYPER_BEAM db 0 -MissingNo43EvosMoves: +CactusEvosMoves: ; Evolutions db 0 ; Learnset + db 7, VINE_WHIP + db 17, HORN_ATTACK + db 21, GROWTH + db 25, PIN_MISSILE + db 31, FURY_ATTACK + db 39, FEINT_ATTACK + db 45, SPIKE_CANNON + db 50, EXPLOSION db 0 -MissingNo44EvosMoves: +JaggEvosMoves: ; Evolutions db 0 ; Learnset + db 15, WATER_GUN + db 24, SCREECH + db 29, HORN_ATTACK + db 34, FURY_ATTACK + db 38, BRUTAL_SWING + db 42, IRON_HEAD + db 49, HYDRO_PUMP + db 55, HORN_DRILL db 0 -MissingNo45EvosMoves: +BittybatEvosMoves: ; Evolutions + db EV_LEVEL, 15, ZUBAT db 0 ; Learnset + db 7, WING_ATTACK + db 14, GUST + db 18, CONFUSE_RAY + db 22, BITE + db 26, TACKLE + db 30, DISABLE + db 34, HAZE db 0 DoduoEvosMoves: @@ -1004,6 +1106,7 @@ ZapdosEvosMoves: DittoEvosMoves: ; Evolutions + db EV_ITEM, MOON_STONE, 1, ANIMON db 0 ; Learnset db 0 @@ -1032,22 +1135,46 @@ KrabbyEvosMoves: db 40, HARDEN db 0 -MissingNo4FEvosMoves: +CheepEvosMoves: ; Evolutions + db EV_LEVEL, 30, JABETTA db 0 ; Learnset + db 17, COUNTER + db 21, BUBBLEBEAM + db 25, LOW_KICK + db 30, JUMP_KICK + db 34, SEISMIC_TOSS + db 36, WATERFALL + db 40, HI_JUMP_KICK + db 48, HYDRO_PUMP db 0 -MissingNo50EvosMoves: +JabettaEvosMoves: ; Evolutions db 0 ; Learnset + db 17, COUNTER + db 21, BUBBLEBEAM + db 25, LOW_KICK + db 30, JUMP_KICK + db 34, SEISMIC_TOSS + db 36, WATERFALL + db 40, HI_JUMP_KICK + db 48, HYDRO_PUMP db 0 -MissingNo51EvosMoves: +MikonEvosMoves: ; Evolutions + db EV_LEVEL, 15, VULPIX db 0 ; Learnset + db 7, QUICK_ATTACK + db 14, ROAR + db 21, DOUBLE_TEAM + db 28, CONFUSE_RAY + db 35, FLAMETHROWER + db 42, FIRE_SPIN db 0 VulpixEvosMoves: @@ -1070,32 +1197,62 @@ NinetalesEvosMoves: PikachuEvosMoves: ; Evolutions - db EV_ITEM, THUNDER_STONE, 1, RAICHU + db EV_LEVEL, 23, RAICHU db 0 ; Learnset - db 9, THUNDER_WAVE - db 16, QUICK_ATTACK - db 26, SWIFT + db 6, TAIL_WHIP + db 8, THUNDER_WAVE + db 11, QUICK_ATTACK + db 15, DOUBLE_TEAM + db 20, SLAM + db 26, THUNDERBOLT db 33, AGILITY - db 43, THUNDER + db 41, THUNDER + db 50, LIGHT_SCREEN db 0 RaichuEvosMoves: ; Evolutions + db EV_ITEM, THUNDER_STONE, 1, GOROCHU db 0 ; Learnset + db 6, TAIL_WHIP + db 8, THUNDER_WAVE + db 11, QUICK_ATTACK + db 15, DOUBLE_TEAM + db 20, SLAM + db 26, AGILITY + db 33, THUNDERBOLT + db 41, LIGHT_SCREEN + db 50, THUNDER db 0 -MissingNo56EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo57EvosMoves: +RibbitoEvosMoves: +; Evolutions + db EV_LEVEL, 30, CROAKOZUNA + db 0 +; Learnset + db 7, BUBBLE + db 13, MEDITATE + db 19, WATER_GUN + db 27, SWIFT + db 32, FEINT_ATTACK + db 41, SUBSTITUTE + db 49, HYDRO_PUMP + db 53, NIGHT_SLASH + db 0 + +CroakozunaEvosMoves: ; Evolutions db 0 ; Learnset + db 13, MEDITATE + db 19, WATER_GUN + db 31, SWIFT + db 35, FEINT_ATTACK + db 46, SUBSTITUTE + db 53, HYDRO_PUMP + db 58, NIGHT_SLASH db 0 DratiniEvosMoves: @@ -1166,16 +1323,27 @@ SeadraEvosMoves: db 52, HYDRO_PUMP db 0 -MissingNo5EEvosMoves: +BawliguaEvosMoves: ; Evolutions + db EV_LEVEL, 50, CRYITHAN db 0 ; Learnset + db 10, GLARE + db 20, WATER_GUN + db 30, SLASH + db 40, DRAGON_RAGE + db 50, HYDRO_PUMP db 0 -MissingNo5FEvosMoves: +CryithanEvosMoves: ; Evolutions db 0 ; Learnset + db 10, GLARE + db 20, WATER_GUN + db 30, SLASH + db 40, DRAGON_RAGE + db 50, HYDRO_PUMP db 0 SandshrewEvosMoves: @@ -1249,10 +1417,12 @@ EeveeEvosMoves: db EV_ITEM, WATER_STONE, 1, VAPOREON db 0 ; Learnset + db 8, SAND_ATTACK + db 16, GROWL db 27, QUICK_ATTACK - db 31, TAIL_WHIP - db 37, BITE - db 45, TAKE_DOWN + db 30, BITE + db 36, FOCUS_ENERGY + db 42, TAKE_DOWN db 0 FlareonEvosMoves: @@ -1263,9 +1433,9 @@ FlareonEvosMoves: db 31, EMBER db 37, TAIL_WHIP db 40, BITE - db 42, LEER + db 42, SMOG db 44, FIRE_SPIN - db 48, RAGE + db 48, LEER db 54, FLAMETHROWER db 0 @@ -1289,13 +1459,13 @@ VaporeonEvosMoves: ; Learnset db 27, QUICK_ATTACK db 31, WATER_GUN + db 34, AURORA_BEAM db 37, TAIL_WHIP db 40, BITE db 42, ACID_ARMOR db 44, HAZE db 48, MIST db 54, HYDRO_PUMP - db 0 MachopEvosMoves: ; Evolutions @@ -1311,7 +1481,7 @@ MachopEvosMoves: ZubatEvosMoves: ; Evolutions - db EV_LEVEL, 22, GOLBAT + db EV_LEVEL, 24, GOLBAT db 0 ; Learnset db 10, SUPERSONIC @@ -1392,10 +1562,16 @@ BeedrillEvosMoves: db 35, AGILITY db 0 -MissingNo73EvosMoves: +MadaamuEvosMoves: ; Evolutions db 0 ; Learnset + db 13, LEER + db 19, FURY_ATTACK + db 25, SWORDS_DANCE + db 33, AGILITY + db 41, SLASH + db 45, DRILL_PECK db 0 DodrioEvosMoves: @@ -1414,11 +1590,14 @@ PrimeapeEvosMoves: ; Evolutions db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY + db 28, RAGE db 37, SEISMIC_TOSS db 46, THRASH + db 45, SCREECH db 0 DugtrioEvosMoves: @@ -1436,7 +1615,7 @@ VenomothEvosMoves: ; Evolutions db 0 ; Learnset - db 24, POISONPOWDER + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 38, PSYBEAM @@ -1455,16 +1634,31 @@ DewgongEvosMoves: db 56, ICE_BEAM db 0 -MissingNo79EvosMoves: +PurakkusuEvosMoves: ; Evolutions db 0 ; Learnset + db 21, BIND + db 25, SEISMIC_TOSS + db 30, GUILLOTINE + db 36, FOCUS_ENERGY + db 43, HEADBUTT + db 49, SLASH + db 54, SWORDS_DANCE db 0 -MissingNo7AEvosMoves: +PendrakenEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BUBBLE + db 14, WRAP + db 24, FAIRY_WIND + db 29, HYPNOSIS + db 32, SUPERSONIC + db 44, DAZZLE_GLEAM + db 50, HAZE + db 54, HYDRO_PUMP db 0 CaterpieEvosMoves: @@ -1479,19 +1673,21 @@ MetapodEvosMoves: db EV_LEVEL, 10, BUTTERFREE db 0 ; Learnset + db 7, HARDEN db 0 ButterfreeEvosMoves: ; Evolutions db 0 ; Learnset - db 12, CONFUSION - db 15, POISONPOWDER - db 16, STUN_SPORE - db 17, SLEEP_POWDER - db 21, SUPERSONIC - db 26, WHIRLWIND - db 32, PSYBEAM + db 10, CONFUSION + db 13, POISONPOWDER + db 14, STUN_SPORE + db 15, SLEEP_POWDER + db 18, SUPERSONIC + db 23, WHIRLWIND + db 28, GUST + db 34, PSYBEAM db 0 MachampEvosMoves: @@ -1505,10 +1701,18 @@ MachampEvosMoves: db 52, SUBMISSION db 0 -MissingNo7FEvosMoves: +WeirduckEvosMoves: ; Evolutions + db EV_LEVEL, 35, GOLDUCK db 0 ; Learnset + db 22, SUPERSONIC + db 25, DISABLE + db 29, CONFUSION + db 34, GLARE + db 39, FURY_SWIPES + db 41, PSYBEAM + db 55, HYDRO_PUMP db 0 GolduckEvosMoves: @@ -1574,16 +1778,27 @@ MagikarpEvosMoves: db 15, TACKLE db 0 -MissingNo86EvosMoves: +KonyaEvosMoves: ; Evolutions + db EV_LEVEL, 14, MEOWTH db 0 ; Learnset + db 7, TAIL_WHIP + db 12, SAND_ATTACK + db 16, PAY_DAY + db 19, BITE + db 24, FURY_SWIPES + db 30, SCREECH + db 35, SLASH db 0 -MissingNo87EvosMoves: +OmegaEvosMoves: ; Evolutions db 0 ; Learnset + db 48, SLAM + db 50, IRON_HEAD + db 55, IRON_DEFENSE db 0 MukEvosMoves: @@ -1598,10 +1813,15 @@ MukEvosMoves: db 60, ACID_ARMOR db 0 -MissingNo8AEvosMoves: +DecillaEvosMoves: ; Evolutions + db EV_LEVEL, 40, GYAOON db 0 ; Learnset + db 35, SCREECH + db 38, ROCK_THROW + db 40, ROAR + db 43, ROCK_SLIDE db 0 KinglerEvosMoves: @@ -1622,10 +1842,17 @@ CloysterEvosMoves: db 50, SPIKE_CANNON db 0 -MissingNo8CEvosMoves: +MagnetiteEvosMoves: ; Evolutions + db EV_LEVEL, 30, MAGNETON db 0 ; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 35, THUNDER_WAVE + db 41, SWIFT + db 47, SCREECH db 0 ElectrodeEvosMoves: @@ -1669,8 +1896,12 @@ PersianEvosMoves: MarowakEvosMoves: ; Evolutions + db EV_LEVEL, 40, GUARDIA db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 33, FOCUS_ENERGY db 41, THRASH @@ -1678,10 +1909,15 @@ MarowakEvosMoves: db 55, RAGE db 0 -MissingNo92EvosMoves: +GuardiaEvosMoves: ; Evolutions db 0 ; Learnset + db 25, LEER + db 33, FOCUS_ENERGY + db 41, THRASH + db 48, BONEMERANG + db 55, RAGE db 0 HaunterEvosMoves: @@ -1784,10 +2020,17 @@ TentacruelEvosMoves: db 50, HYDRO_PUMP db 0 -MissingNo9CEvosMoves: +GyopinEvosMoves: ; Evolutions + db EV_LEVEL, 22, GOLDEEN db 0 ; Learnset + db 7, SUPERSONIC + db 12, HORN_ATTACK + db 16, FURY_ATTACK + db 26, WATERFALL + db 30, HORN_DRILL + db 34, AGILITY db 0 GoldeenEvosMoves: @@ -1815,28 +2058,52 @@ SeakingEvosMoves: db 54, AGILITY db 0 -MissingNo9FEvosMoves: +KotoraEvosMoves: ; Evolutions + db EV_LEVEL, 16, GAOTORA db 0 ; Learnset + db 6, LEER + db 11, ROAR + db 17, QUICK_ATTACK + db 28, BITE + db 34, THUNDER + db 43, AGILITY db 0 -MissingNoA0EvosMoves: +GaotoraEvosMoves: ; Evolutions + db EV_LEVEL, 36, GOROTORA db 0 ; Learnset + db 14, ROAR + db 23, QUICK_ATTACK + db 30, BITE + db 37, THUNDER + db 45, AGILITY db 0 -MissingNoA1EvosMoves: +GorotoraEvosMoves: ; Evolutions db 0 ; Learnset + db 30, QUICK_ATTACK + db 34, BITE + db 40, THUNDER + db 48, AGILITY db 0 -MissingNoA2EvosMoves: +PuchikoonEvosMoves: ; Evolutions + db EV_LEVEL, 25, PONYTA db 0 ; Learnset + db 7, QUICK_ATTACK + db 14, GROWL + db 21, STOMP + db 28, AGILITY + db 35, FIRE_SPIN + db 42, TAKE_DOWN db 0 PonytaEvosMoves: @@ -1887,28 +2154,30 @@ RaticateEvosMoves: NidorinoEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOKING + db EV_ITEM, MOON_STONE, 1, NIDOREIGN + db EV_LEVEL, 36, NIDOKING db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 23, FOCUS_ENERGY - db 32, FURY_ATTACK - db 41, HORN_DRILL - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, FOCUS_ENERGY + db 36, FURY_ATTACK + db 46, HORN_DRILL db 0 NidorinaEvosMoves: ; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOQUEEN + db EV_ITEM, MOON_STONE, 1, NIDOREIGN + db EV_LEVEL, 36, NIDOQUEEN db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 23, TAIL_WHIP - db 32, BITE - db 41, FURY_SWIPES - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, TAIL_WHIP + db 36, BITE + db 46, FURY_SWIPES db 0 GeodudeEvosMoves: @@ -1944,15 +2213,22 @@ AerodactylEvosMoves: db 54, HYPER_BEAM db 0 -MissingNoACEvosMoves: +BlastykeEvosMoves: ; Evolutions + db EV_LEVEL, 36, BLASTOISE db 0 ; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 22, BITE + db 28, WITHDRAW + db 35, SKULL_BASH + db 42, HYDRO_PUMP db 0 MagnemiteEvosMoves: ; Evolutions - db EV_LEVEL, 30, MAGNETON + db EV_LEVEL, 20, MAGNETITE db 0 ; Learnset db 21, SONICBOOM @@ -1963,16 +2239,26 @@ MagnemiteEvosMoves: db 47, SCREECH db 0 -MissingNoAEEvosMoves: +SkimperEvosMoves: ; Evolutions + db EV_LEVEL, 30, BAWLIGUA db 0 ; Learnset + db 10, GLARE + db 20, WATER_GUN + db 30, SLASH + db 40, DRAGON_RAGE + db 50, HYDRO_PUMP db 0 -MissingNoAFEvosMoves: +GorochuEvosMoves: ; Evolutions db 0 ; Learnset + db 53, SAND_ATTACK + db 57, FOCUS_ENERGY + db 60, LEER + db 65, HORN_DRILL db 0 CharmanderEvosMoves: @@ -2016,7 +2302,7 @@ CharmeleonEvosMoves: WartortleEvosMoves: ; Evolutions - db EV_LEVEL, 36, BLASTOISE + db EV_LEVEL, 36, TOTARTLE db 0 ; Learnset db 8, BUBBLE @@ -2039,10 +2325,18 @@ CharizardEvosMoves: db 55, FIRE_SPIN db 0 -MissingNoB5EvosMoves: +TotartleEvosMoves: ; Evolutions db 0 ; Learnset + db 18, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 42, SKULL_BASH + db 46, HYDRO_PUMP + db 50, COMET_PUNCH + db 54, LEER + db 60, PETAL_DANCE db 0 FossilKabutopsEvosMoves: @@ -2079,6 +2373,7 @@ OddishEvosMoves: GloomEvosMoves: ; Evolutions db EV_ITEM, LEAF_STONE, 1, VILEPLUME + db EV_ITEM, SUN_STONE, 1, BELLOSSOM db 0 ; Learnset db 15, POISONPOWDER @@ -2115,6 +2410,7 @@ BellsproutEvosMoves: WeepinbellEvosMoves: ; Evolutions db EV_ITEM, LEAF_STONE, 1, VICTREEBEL + db EV_ITEM, SUN_STONE, 1, TSUBOMITTO db 0 ; Learnset db 13, WRAP @@ -2134,3 +2430,111 @@ VictreebelEvosMoves: db 15, POISONPOWDER db 18, SLEEP_POWDER db 0 + +TsubomittoEvosMoves: +; Evolutions + db 0 +; Learnset + db 48, SOLARBEAM + db 0 + +AnimonEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, MIST + db 40, LIGHT_SCREEN + db 50, REFLECT + db 0 + +MonjaEvosMoves: +; Evolutions + db EV_LEVEL, 18, TANGELA + db 0 +; Learnset + db 5, BIND + db 9, ABSORB + db 13, VINE_WHIP + db 19, POISONPOWDER + db 22, STUN_SPORE + db 25, SLEEP_POWDER + db 29, SLAM + db 35, GROWTH + db 40, NIGHT_SHADE + db 0 + +ParaEvosMoves: +; Evolutions + db EV_LEVEL, 12, PARAS + db 0 +; Learnset + db 3, STUN_SPORE + db 6, LEECH_LIFE + db 10, POISONPOWDER + db 15, FURY_SWIPES + db 21, SPORE + db 25, GROWTH + db 29, SLASH + db 0 + +HinaazuEvosMoves: +; Evolutions + db EV_LEVEL, 18, DODUO + db 0 +; Learnset + db 5, QUICK_ATTACK + db 11, FURY_ATTACK + db 20, DRILL_PECK + db 23, RAGE + db 27, TRI_ATTACK + db 32, AGILITY + db 0 + +PudiEvosMoves: +; Evolutions + db EV_LEVEL, 14, GROWLITHE + db 0 +; Learnset + db 9, EMBER + db 12, LEER + db 15, TAKE_DOWN + db 21, AGILITY + db 30, FLAMETHROWER + db 0 + +BetobebiiEvosMoves: +; Evolutions + db EV_LEVEL, 20, GRIMER + db 0 +; Learnset + db 13, POISON_GAS + db 16, ACID + db 19, MINIMIZE + db 22, SLUDGE + db 28, HARDEN + db 33, SCREECH + db 37, ACID_ARMOR + db 0 + +BellossomEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 0 + +ScizorEvosMoves: +; Evolutions + db 0 +; Learnset + db 17, LEER + db 20, FOCUS_ENERGY + db 24, IRON_HEAD + db 29, SLASH + db 35, SWORDS_DANCE + db 42, AGILITY + db 50, BULLET_PUNCH + db 0 + diff --git a/data/pokemon/mew.asm b/data/pokemon/mew.asm deleted file mode 100644 index c68867ee..00000000 --- a/data/pokemon/mew.asm +++ /dev/null @@ -1,15 +0,0 @@ -; Mew's pics and base data are not grouped with the other Pokémon -; because it was a last-minute addition "as a kind of prank". -; Shigeki Morimoto explained in an Iwata Asks interview: -; "We put Mew in right at the very end. The cartridge was really full and -; there wasn't room for much more on there. Then the debug features which -; weren't going to be included in the final version of the game were removed, -; creating a miniscule 300 bytes of free space. So we thought that we could -; slot Mew in there. What we did would be unthinkable nowadays!" -; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0 - -MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" -MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" - -MewBaseStats:: -INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 66f8e512..7cabeb8c 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -60,7 +60,7 @@ ItemUsePtrTable: dw UnusableItem ; DOME_FOSSIL dw UnusableItem ; HELIX_FOSSIL dw UnusableItem ; SECRET_KEY - dw UnusableItem + dw ItemUseEvoStone ; SUN_STONE dw UnusableItem ; BIKE_VOUCHER dw ItemUseXAccuracy ; X_ACCURACY dw ItemUseEvoStone ; LEAF_STONE diff --git a/gfx/pics.asm b/gfx/pics.asm index 134516cd..27d17754 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -40,6 +40,8 @@ LaprasPicFront:: INCBIN "gfx/pokemon/front/lapras.pic" LaprasPicBack:: INCBIN "gfx/pokemon/back/laprasb.pic" ArcaninePicFront:: INCBIN "gfx/pokemon/front/arcanine.pic" ArcaninePicBack:: INCBIN "gfx/pokemon/back/arcanineb.pic" +MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" +MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" GyaradosPicFront:: INCBIN "gfx/pokemon/front/gyarados.pic" GyaradosPicBack:: INCBIN "gfx/pokemon/back/gyaradosb.pic" ShellderPicFront:: INCBIN "gfx/pokemon/front/shellder.pic" @@ -192,18 +194,16 @@ PoliwhirlPicFront:: INCBIN "gfx/pokemon/front/poliwhirl.pic" PoliwhirlPicBack:: INCBIN "gfx/pokemon/back/poliwhirlb.pic" PoliwrathPicFront:: INCBIN "gfx/pokemon/front/poliwrath.pic" PoliwrathPicBack:: INCBIN "gfx/pokemon/back/poliwrathb.pic" + + +SECTION "Pics 4", ROMX + WeedlePicFront:: INCBIN "gfx/pokemon/front/weedle.pic" WeedlePicBack:: INCBIN "gfx/pokemon/back/weedleb.pic" KakunaPicFront:: INCBIN "gfx/pokemon/front/kakuna.pic" KakunaPicBack:: INCBIN "gfx/pokemon/back/kakunab.pic" BeedrillPicFront:: INCBIN "gfx/pokemon/front/beedrill.pic" BeedrillPicBack:: INCBIN "gfx/pokemon/back/beedrillb.pic" - -FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" - - -SECTION "Pics 4", ROMX - DodrioPicFront:: INCBIN "gfx/pokemon/front/dodrio.pic" DodrioPicBack:: INCBIN "gfx/pokemon/back/dodriob.pic" PrimeapePicFront:: INCBIN "gfx/pokemon/front/primeape.pic" @@ -258,10 +258,6 @@ AlakazamPicFront:: INCBIN "gfx/pokemon/front/alakazam.pic" AlakazamPicBack:: INCBIN "gfx/pokemon/back/alakazamb.pic" PidgeottoPicFront:: INCBIN "gfx/pokemon/front/pidgeotto.pic" PidgeottoPicBack:: INCBIN "gfx/pokemon/back/pidgeottob.pic" -PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" -PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" -StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" -StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" RedPicBack:: INCBIN "gfx/player/redb.pic" OldManPicBack:: INCBIN "gfx/battle/oldmanb.pic" @@ -269,6 +265,10 @@ OldManPicBack:: INCBIN "gfx/battle/oldmanb.pic" SECTION "Pics 5", ROMX +PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" +PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" +StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" +StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" BulbasaurPicFront:: INCBIN "gfx/pokemon/front/bulbasaur.pic" BulbasaurPicBack:: INCBIN "gfx/pokemon/back/bulbasaurb.pic" VenusaurPicFront:: INCBIN "gfx/pokemon/front/venusaur.pic" @@ -309,8 +309,6 @@ WartortlePicFront:: INCBIN "gfx/pokemon/front/wartortle.pic" WartortlePicBack:: INCBIN "gfx/pokemon/back/wartortleb.pic" CharizardPicFront:: INCBIN "gfx/pokemon/front/charizard.pic" CharizardPicBack:: INCBIN "gfx/pokemon/back/charizardb.pic" -FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" -GhostPic:: INCBIN "gfx/battle/ghost.pic" OddishPicFront:: INCBIN "gfx/pokemon/front/oddish.pic" OddishPicBack:: INCBIN "gfx/pokemon/back/oddishb.pic" GloomPicFront:: INCBIN "gfx/pokemon/front/gloom.pic" @@ -319,10 +317,6 @@ VileplumePicFront:: INCBIN "gfx/pokemon/front/vileplume.pic" VileplumePicBack:: INCBIN "gfx/pokemon/back/vileplumeb.pic" BellsproutPicFront:: INCBIN "gfx/pokemon/front/bellsprout.pic" BellsproutPicBack:: INCBIN "gfx/pokemon/back/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" -WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" -VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" -VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" SECTION "Pics 6", ROMX @@ -373,3 +367,107 @@ LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic" ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" AgathaPic:: INCBIN "gfx/trainers/agatha.pic" LancePic:: INCBIN "gfx/trainers/lance.pic" + +SECTION "Pics 7", ROMX + +WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" +WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" +VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" +VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" +CheepPicFront:: INCBIN "gfx/pokemon/front/cheep.pic" +CheepPicBack:: INCBIN "gfx/pokemon/back/cheepb.pic" +JabettaPicFront:: INCBIN "gfx/pokemon/front/jabetta.pic" +JabettaPicBack:: INCBIN "gfx/pokemon/back/jabettab.pic" +RibbitoPicFront:: INCBIN "gfx/pokemon/front/ribbito.pic" +RibbitoPicBack:: INCBIN "gfx/pokemon/back/ribbitob.pic" +CroakozunaPicFront:: INCBIN "gfx/pokemon/front/croakozuna.pic" +CroakozunaPicBack:: INCBIN "gfx/pokemon/back/croakozunab.pic" +BlottlePicFront:: INCBIN "gfx/pokemon/front/blottle.pic" +BlottlePicBack:: INCBIN "gfx/pokemon/back/blottleb.pic" +PendrakenPicFront:: INCBIN "gfx/pokemon/front/pendraken.pic" +PendrakenPicBack:: INCBIN "gfx/pokemon/back/pendrakenb.pic" +KonyaPicFront:: INCBIN "gfx/pokemon/front/konya.pic" +KonyaPicBack:: INCBIN "gfx/pokemon/back/konyab.pic" +MikonPicFront:: INCBIN "gfx/pokemon/front/mikon.pic" +MikonPicBack:: INCBIN "gfx/pokemon/back/mikonb.pic" +GyopinPicFront:: INCBIN "gfx/pokemon/front/gyopin.pic" +GyopinPicBack:: INCBIN "gfx/pokemon/back/gyopinb.pic" +PuchikoonPicFront:: INCBIN "gfx/pokemon/front/puchikoon.pic" +PuchikoonPicBack:: INCBIN "gfx/pokemon/back/puchikoonb.pic" +WeirduckPicFront:: INCBIN "gfx/pokemon/front/weirduck.pic" +WeirduckPicBack:: INCBIN "gfx/pokemon/back/weirduckb.pic" +BlastykePicFront:: INCBIN "gfx/pokemon/front/blastyke.pic" +BlastykePicBack:: INCBIN "gfx/pokemon/back/blastykeb.pic" +TotartlePicFront:: INCBIN "gfx/pokemon/front/totartle.pic" +TotartlePicBack:: INCBIN "gfx/pokemon/back/totartleb.pic" +MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic" +MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic" +BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic" +BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic" +GuardiaPicFront:: INCBIN "gfx/pokemon/front/guardia.pic" +GuardiaPicBack:: INCBIN "gfx/pokemon/back/guardiab.pic" +MadaamuPicFront:: INCBIN "gfx/pokemon/front/madaamu.pic" +MadaamuPicBack:: INCBIN "gfx/pokemon/back/madaamub.pic" +PurakkusuPicFront:: INCBIN "gfx/pokemon/front/purakkusu.pic" +PurakkusuPicBack:: INCBIN "gfx/pokemon/back/purakkusub.pic" +TsubomittoPicFront:: INCBIN "gfx/pokemon/front/tsubomitto.pic" +TsubomittoPicBack:: INCBIN "gfx/pokemon/back/tsubomittob.pic" +AnimonPicFront:: INCBIN "gfx/pokemon/front/animon.pic" +AnimonPicBack:: INCBIN "gfx/pokemon/back/animonb.pic" +MonjaPicFront:: INCBIN "gfx/pokemon/front/monja.pic" +MonjaPicBack:: INCBIN "gfx/pokemon/back/monjab.pic" + +SECTION "Pics 8", ROMX + +BarundaPicFront:: INCBIN "gfx/pokemon/front/barunda.pic" +BarundaPicBack:: INCBIN "gfx/pokemon/back/barundab.pic" +CactusPicFront:: INCBIN "gfx/pokemon/front/cactus.pic" +CactusPicBack:: INCBIN "gfx/pokemon/back/cactusb.pic" +CrockyPicFront:: INCBIN "gfx/pokemon/front/crocky.pic" +CrockyPicBack:: INCBIN "gfx/pokemon/back/crockyb.pic" +TrampelPicFront:: INCBIN "gfx/pokemon/front/trampel.pic" +TrampelPicBack:: INCBIN "gfx/pokemon/back/trampelb.pic" +DeerPicFront:: INCBIN "gfx/pokemon/front/deer.pic" +DeerPicBack:: INCBIN "gfx/pokemon/back/deerb.pic" +BuuPicFront:: INCBIN "gfx/pokemon/front/buu.pic" +BuuPicBack:: INCBIN "gfx/pokemon/back/buub.pic" +JaggPicFront:: INCBIN "gfx/pokemon/front/jagg.pic" +JaggPicBack:: INCBIN "gfx/pokemon/back/jaggb.pic" +NidoreignPicFront:: INCBIN "gfx/pokemon/front/nidoreign.pic" +NidoreignPicBack:: INCBIN "gfx/pokemon/back/nidoreignb.pic" +KotoraPicFront:: INCBIN "gfx/pokemon/front/kotora.pic" +KotoraPicBack:: INCBIN "gfx/pokemon/back/kotorab.pic" +GaotoraPicFront:: INCBIN "gfx/pokemon/front/gaotora.pic" +GaotoraPicBack:: INCBIN "gfx/pokemon/back/gaotorab.pic" +GorotoraPicFront:: INCBIN "gfx/pokemon/front/gorotora.pic" +GorotoraPicBack:: INCBIN "gfx/pokemon/back/gorotorab.pic" +SkimperPicFront:: INCBIN "gfx/pokemon/front/skimper.pic" +SkimperPicBack:: INCBIN "gfx/pokemon/back/skimperb.pic" +BawliguaPicFront:: INCBIN "gfx/pokemon/front/bawligua.pic" +BawliguaPicBack:: INCBIN "gfx/pokemon/back/bawliguab.pic" +CryithanPicFront:: INCBIN "gfx/pokemon/front/cryithan.pic" +CryithanPicBack:: INCBIN "gfx/pokemon/back/cryithanb.pic" +GorochuPicFront:: INCBIN "gfx/pokemon/front/gorochu.pic" +GorochuPicBack:: INCBIN "gfx/pokemon/back/gorochub.pic" +DecillaPicFront:: INCBIN "gfx/pokemon/front/decilla.pic" +DecillaPicBack:: INCBIN "gfx/pokemon/back/decillab.pic" +GyaoonPicFront:: INCBIN "gfx/pokemon/front/gyaoon.pic" +GyaoonPicBack:: INCBIN "gfx/pokemon/back/gyaoonb.pic" +OmegaPicFront:: INCBIN "gfx/pokemon/front/omega.pic" +OmegaPicBack:: INCBIN "gfx/pokemon/back/omegab.pic" +ParaPicFront:: INCBIN "gfx/pokemon/front/para.pic" +ParaPicBack:: INCBIN "gfx/pokemon/back/parab.pic" +HinaazuPicFront:: INCBIN "gfx/pokemon/front/hinaazu.pic" +HinaazuPicBack:: INCBIN "gfx/pokemon/back/hinaazub.pic" +PudiPicFront:: INCBIN "gfx/pokemon/front/pudi.pic" +PudiPicBack:: INCBIN "gfx/pokemon/back/pudib.pic" +BetobebiiPicFront:: INCBIN "gfx/pokemon/front/betobebii.pic" +BetobebiiPicBack:: INCBIN "gfx/pokemon/back/betobebiib.pic" +BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic" +BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic" +ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" +ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic" + +FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" +GhostPic:: INCBIN "gfx/battle/ghost.pic" diff --git a/gfx/pokemon/back/animonb.png b/gfx/pokemon/back/animonb.png new file mode 100644 index 00000000..b7d41561 Binary files /dev/null and b/gfx/pokemon/back/animonb.png differ diff --git a/gfx/pokemon/back/barundab.png b/gfx/pokemon/back/barundab.png new file mode 100644 index 00000000..18e4f1e5 Binary files /dev/null and b/gfx/pokemon/back/barundab.png differ diff --git a/gfx/pokemon/back/bawliguab.png b/gfx/pokemon/back/bawliguab.png new file mode 100644 index 00000000..b24e5c9f Binary files /dev/null and b/gfx/pokemon/back/bawliguab.png differ diff --git a/gfx/pokemon/back/bellossomb.png b/gfx/pokemon/back/bellossomb.png new file mode 100644 index 00000000..d3899a83 Binary files /dev/null and b/gfx/pokemon/back/bellossomb.png differ diff --git a/gfx/pokemon/back/betobebiib.png b/gfx/pokemon/back/betobebiib.png new file mode 100644 index 00000000..58350992 Binary files /dev/null and b/gfx/pokemon/back/betobebiib.png differ diff --git a/gfx/pokemon/back/bittybatb.png b/gfx/pokemon/back/bittybatb.png new file mode 100644 index 00000000..c2e0b1b8 Binary files /dev/null and b/gfx/pokemon/back/bittybatb.png differ diff --git a/gfx/pokemon/back/blastykeb.png b/gfx/pokemon/back/blastykeb.png new file mode 100644 index 00000000..fe58dfc0 Binary files /dev/null and b/gfx/pokemon/back/blastykeb.png differ diff --git a/gfx/pokemon/back/blottleb.png b/gfx/pokemon/back/blottleb.png new file mode 100644 index 00000000..38646d3e Binary files /dev/null and b/gfx/pokemon/back/blottleb.png differ diff --git a/gfx/pokemon/back/buub.png b/gfx/pokemon/back/buub.png new file mode 100644 index 00000000..23e0fb53 Binary files /dev/null and b/gfx/pokemon/back/buub.png differ diff --git a/gfx/pokemon/back/cactusb.png b/gfx/pokemon/back/cactusb.png new file mode 100644 index 00000000..0255be22 Binary files /dev/null and b/gfx/pokemon/back/cactusb.png differ diff --git a/gfx/pokemon/back/cheepb.png b/gfx/pokemon/back/cheepb.png new file mode 100644 index 00000000..8185bb34 Binary files /dev/null and b/gfx/pokemon/back/cheepb.png differ diff --git a/gfx/pokemon/back/croakozunab.png b/gfx/pokemon/back/croakozunab.png new file mode 100644 index 00000000..d1bcd3f9 Binary files /dev/null and b/gfx/pokemon/back/croakozunab.png differ diff --git a/gfx/pokemon/back/crockyb.png b/gfx/pokemon/back/crockyb.png new file mode 100644 index 00000000..afc60e12 Binary files /dev/null and b/gfx/pokemon/back/crockyb.png differ diff --git a/gfx/pokemon/back/cryithanb.png b/gfx/pokemon/back/cryithanb.png new file mode 100644 index 00000000..cbf19712 Binary files /dev/null and b/gfx/pokemon/back/cryithanb.png differ diff --git a/gfx/pokemon/back/decillab.png b/gfx/pokemon/back/decillab.png new file mode 100644 index 00000000..f31eec41 Binary files /dev/null and b/gfx/pokemon/back/decillab.png differ diff --git a/gfx/pokemon/back/deerb.png b/gfx/pokemon/back/deerb.png new file mode 100644 index 00000000..c802282b Binary files /dev/null and b/gfx/pokemon/back/deerb.png differ diff --git a/gfx/pokemon/back/gaotorab.png b/gfx/pokemon/back/gaotorab.png new file mode 100644 index 00000000..ec680432 Binary files /dev/null and b/gfx/pokemon/back/gaotorab.png differ diff --git a/gfx/pokemon/back/gorochub.png b/gfx/pokemon/back/gorochub.png new file mode 100644 index 00000000..9f217f48 Binary files /dev/null and b/gfx/pokemon/back/gorochub.png differ diff --git a/gfx/pokemon/back/gorotorab.png b/gfx/pokemon/back/gorotorab.png new file mode 100644 index 00000000..c2890a59 Binary files /dev/null and b/gfx/pokemon/back/gorotorab.png differ diff --git a/gfx/pokemon/back/guardiab.png b/gfx/pokemon/back/guardiab.png new file mode 100644 index 00000000..47a4fe18 Binary files /dev/null and b/gfx/pokemon/back/guardiab.png differ diff --git a/gfx/pokemon/back/gyaoonb.png b/gfx/pokemon/back/gyaoonb.png new file mode 100644 index 00000000..f0610b36 Binary files /dev/null and b/gfx/pokemon/back/gyaoonb.png differ diff --git a/gfx/pokemon/back/gyopinb.png b/gfx/pokemon/back/gyopinb.png new file mode 100644 index 00000000..9f70f8a3 Binary files /dev/null and b/gfx/pokemon/back/gyopinb.png differ diff --git a/gfx/pokemon/back/hinaazub.png b/gfx/pokemon/back/hinaazub.png new file mode 100644 index 00000000..61553bf1 Binary files /dev/null and b/gfx/pokemon/back/hinaazub.png differ diff --git a/gfx/pokemon/back/jabettab.png b/gfx/pokemon/back/jabettab.png new file mode 100644 index 00000000..b3ba096c Binary files /dev/null and b/gfx/pokemon/back/jabettab.png differ diff --git a/gfx/pokemon/back/jaggb.png b/gfx/pokemon/back/jaggb.png new file mode 100644 index 00000000..2cab8178 Binary files /dev/null and b/gfx/pokemon/back/jaggb.png differ diff --git a/gfx/pokemon/back/konyab.png b/gfx/pokemon/back/konyab.png new file mode 100644 index 00000000..eb6f74b8 Binary files /dev/null and b/gfx/pokemon/back/konyab.png differ diff --git a/gfx/pokemon/back/kotorab.png b/gfx/pokemon/back/kotorab.png new file mode 100644 index 00000000..ec7fd174 Binary files /dev/null and b/gfx/pokemon/back/kotorab.png differ diff --git a/gfx/pokemon/back/madaamub.png b/gfx/pokemon/back/madaamub.png new file mode 100644 index 00000000..206058a5 Binary files /dev/null and b/gfx/pokemon/back/madaamub.png differ diff --git a/gfx/pokemon/back/magnetiteb.png b/gfx/pokemon/back/magnetiteb.png new file mode 100644 index 00000000..b5195bc9 Binary files /dev/null and b/gfx/pokemon/back/magnetiteb.png differ diff --git a/gfx/pokemon/back/mikonb.png b/gfx/pokemon/back/mikonb.png new file mode 100644 index 00000000..56d2f135 Binary files /dev/null and b/gfx/pokemon/back/mikonb.png differ diff --git a/gfx/pokemon/back/monjab.png b/gfx/pokemon/back/monjab.png new file mode 100644 index 00000000..819e4543 Binary files /dev/null and b/gfx/pokemon/back/monjab.png differ diff --git a/gfx/pokemon/back/nidoreignb.png b/gfx/pokemon/back/nidoreignb.png new file mode 100644 index 00000000..ebded48f Binary files /dev/null and b/gfx/pokemon/back/nidoreignb.png differ diff --git a/gfx/pokemon/back/omegab.png b/gfx/pokemon/back/omegab.png new file mode 100644 index 00000000..ef890db5 Binary files /dev/null and b/gfx/pokemon/back/omegab.png differ diff --git a/gfx/pokemon/back/parab.png b/gfx/pokemon/back/parab.png new file mode 100644 index 00000000..e7979555 Binary files /dev/null and b/gfx/pokemon/back/parab.png differ diff --git a/gfx/pokemon/back/pendrakenb.png b/gfx/pokemon/back/pendrakenb.png new file mode 100644 index 00000000..e9a6ede8 Binary files /dev/null and b/gfx/pokemon/back/pendrakenb.png differ diff --git a/gfx/pokemon/back/puchikoonb.png b/gfx/pokemon/back/puchikoonb.png new file mode 100644 index 00000000..62fa0eff Binary files /dev/null and b/gfx/pokemon/back/puchikoonb.png differ diff --git a/gfx/pokemon/back/pudib.png b/gfx/pokemon/back/pudib.png new file mode 100644 index 00000000..b99f2cf4 Binary files /dev/null and b/gfx/pokemon/back/pudib.png differ diff --git a/gfx/pokemon/back/purakkusub.png b/gfx/pokemon/back/purakkusub.png new file mode 100644 index 00000000..0d872e52 Binary files /dev/null and b/gfx/pokemon/back/purakkusub.png differ diff --git a/gfx/pokemon/back/ribbitob.png b/gfx/pokemon/back/ribbitob.png new file mode 100644 index 00000000..1fe26abc Binary files /dev/null and b/gfx/pokemon/back/ribbitob.png differ diff --git a/gfx/pokemon/back/scizorb.png b/gfx/pokemon/back/scizorb.png new file mode 100644 index 00000000..91ebfc85 Binary files /dev/null and b/gfx/pokemon/back/scizorb.png differ diff --git a/gfx/pokemon/back/skimperb.png b/gfx/pokemon/back/skimperb.png new file mode 100644 index 00000000..34c70b12 Binary files /dev/null and b/gfx/pokemon/back/skimperb.png differ diff --git a/gfx/pokemon/back/totartleb.png b/gfx/pokemon/back/totartleb.png new file mode 100644 index 00000000..3d33f107 Binary files /dev/null and b/gfx/pokemon/back/totartleb.png differ diff --git a/gfx/pokemon/back/trampelb.png b/gfx/pokemon/back/trampelb.png new file mode 100644 index 00000000..b95c0443 Binary files /dev/null and b/gfx/pokemon/back/trampelb.png differ diff --git a/gfx/pokemon/back/tsubomittob.png b/gfx/pokemon/back/tsubomittob.png new file mode 100644 index 00000000..ccf8927e Binary files /dev/null and b/gfx/pokemon/back/tsubomittob.png differ diff --git a/gfx/pokemon/back/weirduckb.png b/gfx/pokemon/back/weirduckb.png new file mode 100644 index 00000000..83d41132 Binary files /dev/null and b/gfx/pokemon/back/weirduckb.png differ diff --git a/gfx/pokemon/front/abra.png b/gfx/pokemon/front/abra.png index 12045ee3..3573a040 100644 Binary files a/gfx/pokemon/front/abra.png and b/gfx/pokemon/front/abra.png differ diff --git a/gfx/pokemon/front/aerodactyl.png b/gfx/pokemon/front/aerodactyl.png index 4cbfdeeb..cf0212a0 100644 Binary files a/gfx/pokemon/front/aerodactyl.png and b/gfx/pokemon/front/aerodactyl.png differ diff --git a/gfx/pokemon/front/alakazam.png b/gfx/pokemon/front/alakazam.png index 9c379b6a..613ae5ad 100644 Binary files a/gfx/pokemon/front/alakazam.png and b/gfx/pokemon/front/alakazam.png differ diff --git a/gfx/pokemon/front/arbok.png b/gfx/pokemon/front/arbok.png index bd8da001..45df87b1 100644 Binary files a/gfx/pokemon/front/arbok.png and b/gfx/pokemon/front/arbok.png differ diff --git a/gfx/pokemon/front/arcanine.png b/gfx/pokemon/front/arcanine.png index 5d25961d..77bb89b0 100644 Binary files a/gfx/pokemon/front/arcanine.png and b/gfx/pokemon/front/arcanine.png differ diff --git a/gfx/pokemon/front/articuno.png b/gfx/pokemon/front/articuno.png index 66986add..e8ae875e 100644 Binary files a/gfx/pokemon/front/articuno.png and b/gfx/pokemon/front/articuno.png differ diff --git a/gfx/pokemon/front/beedrill.png b/gfx/pokemon/front/beedrill.png index 36b4a06f..bc9ca73d 100644 Binary files a/gfx/pokemon/front/beedrill.png and b/gfx/pokemon/front/beedrill.png differ diff --git a/gfx/pokemon/front/bellsprout.png b/gfx/pokemon/front/bellsprout.png index e4fc5e18..f3d2ff1c 100644 Binary files a/gfx/pokemon/front/bellsprout.png and b/gfx/pokemon/front/bellsprout.png differ diff --git a/gfx/pokemon/front/blastoise.png b/gfx/pokemon/front/blastoise.png index 2192b43a..6cdd8e30 100644 Binary files a/gfx/pokemon/front/blastoise.png and b/gfx/pokemon/front/blastoise.png differ diff --git a/gfx/pokemon/front/bulbasaur.png b/gfx/pokemon/front/bulbasaur.png index a2a924c7..27abe273 100644 Binary files a/gfx/pokemon/front/bulbasaur.png and b/gfx/pokemon/front/bulbasaur.png differ diff --git a/gfx/pokemon/front/butterfree.png b/gfx/pokemon/front/butterfree.png index 8f1a69aa..951ae4c4 100644 Binary files a/gfx/pokemon/front/butterfree.png and b/gfx/pokemon/front/butterfree.png differ diff --git a/gfx/pokemon/front/caterpie.png b/gfx/pokemon/front/caterpie.png index 8e1a49dd..8e3205c9 100644 Binary files a/gfx/pokemon/front/caterpie.png and b/gfx/pokemon/front/caterpie.png differ diff --git a/gfx/pokemon/front/chansey.png b/gfx/pokemon/front/chansey.png index 832ba27c..d517535a 100644 Binary files a/gfx/pokemon/front/chansey.png and b/gfx/pokemon/front/chansey.png differ diff --git a/gfx/pokemon/front/charizard.png b/gfx/pokemon/front/charizard.png index ad29e489..100416d4 100644 Binary files a/gfx/pokemon/front/charizard.png and b/gfx/pokemon/front/charizard.png differ diff --git a/gfx/pokemon/front/charmander.png b/gfx/pokemon/front/charmander.png index 12d16f01..155a68a4 100644 Binary files a/gfx/pokemon/front/charmander.png and b/gfx/pokemon/front/charmander.png differ diff --git a/gfx/pokemon/front/charmeleon.png b/gfx/pokemon/front/charmeleon.png index a5cff72f..63808b25 100644 Binary files a/gfx/pokemon/front/charmeleon.png and b/gfx/pokemon/front/charmeleon.png differ diff --git a/gfx/pokemon/front/clefable.png b/gfx/pokemon/front/clefable.png index 2fcfac0a..8e5111f9 100644 Binary files a/gfx/pokemon/front/clefable.png and b/gfx/pokemon/front/clefable.png differ diff --git a/gfx/pokemon/front/clefairy.png b/gfx/pokemon/front/clefairy.png index 5a7f3721..4a26be0b 100644 Binary files a/gfx/pokemon/front/clefairy.png and b/gfx/pokemon/front/clefairy.png differ diff --git a/gfx/pokemon/front/cloyster.png b/gfx/pokemon/front/cloyster.png index 71f63a7f..67542d93 100644 Binary files a/gfx/pokemon/front/cloyster.png and b/gfx/pokemon/front/cloyster.png differ diff --git a/gfx/pokemon/front/cubone.png b/gfx/pokemon/front/cubone.png index 23e3a23a..c5dec329 100644 Binary files a/gfx/pokemon/front/cubone.png and b/gfx/pokemon/front/cubone.png differ diff --git a/gfx/pokemon/front/dewgong.png b/gfx/pokemon/front/dewgong.png index aac4e65c..c7bb5424 100644 Binary files a/gfx/pokemon/front/dewgong.png and b/gfx/pokemon/front/dewgong.png differ diff --git a/gfx/pokemon/front/diglett.png b/gfx/pokemon/front/diglett.png index f92ae5bc..a9becda8 100644 Binary files a/gfx/pokemon/front/diglett.png and b/gfx/pokemon/front/diglett.png differ diff --git a/gfx/pokemon/front/ditto.png b/gfx/pokemon/front/ditto.png index 4485e6ec..3c662491 100644 Binary files a/gfx/pokemon/front/ditto.png and b/gfx/pokemon/front/ditto.png differ diff --git a/gfx/pokemon/front/dodrio.png b/gfx/pokemon/front/dodrio.png index 92e6839d..45606e63 100644 Binary files a/gfx/pokemon/front/dodrio.png and b/gfx/pokemon/front/dodrio.png differ diff --git a/gfx/pokemon/front/doduo.png b/gfx/pokemon/front/doduo.png index 20cba7ba..0aa722c0 100644 Binary files a/gfx/pokemon/front/doduo.png and b/gfx/pokemon/front/doduo.png differ diff --git a/gfx/pokemon/front/dragonair.png b/gfx/pokemon/front/dragonair.png index 55d1ef5b..e7fc1448 100644 Binary files a/gfx/pokemon/front/dragonair.png and b/gfx/pokemon/front/dragonair.png differ diff --git a/gfx/pokemon/front/dragonite.png b/gfx/pokemon/front/dragonite.png index 4c387c3e..7ac78924 100644 Binary files a/gfx/pokemon/front/dragonite.png and b/gfx/pokemon/front/dragonite.png differ diff --git a/gfx/pokemon/front/dratini.png b/gfx/pokemon/front/dratini.png index 9df332e4..5a1a880f 100644 Binary files a/gfx/pokemon/front/dratini.png and b/gfx/pokemon/front/dratini.png differ diff --git a/gfx/pokemon/front/drowzee.png b/gfx/pokemon/front/drowzee.png index cc85510b..16d3edfc 100644 Binary files a/gfx/pokemon/front/drowzee.png and b/gfx/pokemon/front/drowzee.png differ diff --git a/gfx/pokemon/front/dugtrio.png b/gfx/pokemon/front/dugtrio.png index 433f95ef..c20d01b6 100644 Binary files a/gfx/pokemon/front/dugtrio.png and b/gfx/pokemon/front/dugtrio.png differ diff --git a/gfx/pokemon/front/eevee.png b/gfx/pokemon/front/eevee.png index 956f8ce0..7bc62ae9 100644 Binary files a/gfx/pokemon/front/eevee.png and b/gfx/pokemon/front/eevee.png differ diff --git a/gfx/pokemon/front/ekans.png b/gfx/pokemon/front/ekans.png index 6dffaf84..1d454a13 100644 Binary files a/gfx/pokemon/front/ekans.png and b/gfx/pokemon/front/ekans.png differ diff --git a/gfx/pokemon/front/electabuzz.png b/gfx/pokemon/front/electabuzz.png index 0ddccbe1..77647d26 100644 Binary files a/gfx/pokemon/front/electabuzz.png and b/gfx/pokemon/front/electabuzz.png differ diff --git a/gfx/pokemon/front/electrode.png b/gfx/pokemon/front/electrode.png index 8df79e6a..f5e05464 100644 Binary files a/gfx/pokemon/front/electrode.png and b/gfx/pokemon/front/electrode.png differ diff --git a/gfx/pokemon/front/exeggcute.png b/gfx/pokemon/front/exeggcute.png index 0ddf8e32..901e2244 100644 Binary files a/gfx/pokemon/front/exeggcute.png and b/gfx/pokemon/front/exeggcute.png differ diff --git a/gfx/pokemon/front/exeggutor.png b/gfx/pokemon/front/exeggutor.png index 89ccbdc4..3e8d37cb 100644 Binary files a/gfx/pokemon/front/exeggutor.png and b/gfx/pokemon/front/exeggutor.png differ diff --git a/gfx/pokemon/front/farfetchd.png b/gfx/pokemon/front/farfetchd.png index 490e2b7c..8412e767 100644 Binary files a/gfx/pokemon/front/farfetchd.png and b/gfx/pokemon/front/farfetchd.png differ diff --git a/gfx/pokemon/front/fearow.png b/gfx/pokemon/front/fearow.png index c2c65257..7b54a854 100644 Binary files a/gfx/pokemon/front/fearow.png and b/gfx/pokemon/front/fearow.png differ diff --git a/gfx/pokemon/front/flareon.png b/gfx/pokemon/front/flareon.png index eadebd27..5b0e5376 100644 Binary files a/gfx/pokemon/front/flareon.png and b/gfx/pokemon/front/flareon.png differ diff --git a/gfx/pokemon/front/gastly.png b/gfx/pokemon/front/gastly.png index 081b121d..9d236e5a 100644 Binary files a/gfx/pokemon/front/gastly.png and b/gfx/pokemon/front/gastly.png differ diff --git a/gfx/pokemon/front/gengar.png b/gfx/pokemon/front/gengar.png index 450662d7..1993bcfc 100644 Binary files a/gfx/pokemon/front/gengar.png and b/gfx/pokemon/front/gengar.png differ diff --git a/gfx/pokemon/front/geodude.png b/gfx/pokemon/front/geodude.png index 4202192a..c28db680 100644 Binary files a/gfx/pokemon/front/geodude.png and b/gfx/pokemon/front/geodude.png differ diff --git a/gfx/pokemon/front/gloom.png b/gfx/pokemon/front/gloom.png index c2ea9ba4..6071ea5d 100644 Binary files a/gfx/pokemon/front/gloom.png and b/gfx/pokemon/front/gloom.png differ diff --git a/gfx/pokemon/front/golbat.png b/gfx/pokemon/front/golbat.png index 6abc6f0a..7d2b17da 100644 Binary files a/gfx/pokemon/front/golbat.png and b/gfx/pokemon/front/golbat.png differ diff --git a/gfx/pokemon/front/goldeen.png b/gfx/pokemon/front/goldeen.png index e8cbfddc..c6bbeae5 100644 Binary files a/gfx/pokemon/front/goldeen.png and b/gfx/pokemon/front/goldeen.png differ diff --git a/gfx/pokemon/front/golduck.png b/gfx/pokemon/front/golduck.png index 5448f7c8..299b6300 100644 Binary files a/gfx/pokemon/front/golduck.png and b/gfx/pokemon/front/golduck.png differ diff --git a/gfx/pokemon/front/golem.png b/gfx/pokemon/front/golem.png index 1dba6a67..7d317b7d 100644 Binary files a/gfx/pokemon/front/golem.png and b/gfx/pokemon/front/golem.png differ diff --git a/gfx/pokemon/front/graveler.png b/gfx/pokemon/front/graveler.png index 0d9da672..26d4b0a1 100644 Binary files a/gfx/pokemon/front/graveler.png and b/gfx/pokemon/front/graveler.png differ diff --git a/gfx/pokemon/front/grimer.png b/gfx/pokemon/front/grimer.png index 255b10b9..a72c9e45 100644 Binary files a/gfx/pokemon/front/grimer.png and b/gfx/pokemon/front/grimer.png differ diff --git a/gfx/pokemon/front/growlithe.png b/gfx/pokemon/front/growlithe.png index b753bce7..e75173cf 100644 Binary files a/gfx/pokemon/front/growlithe.png and b/gfx/pokemon/front/growlithe.png differ diff --git a/gfx/pokemon/front/gyarados.png b/gfx/pokemon/front/gyarados.png index a7ed0c17..387c2725 100644 Binary files a/gfx/pokemon/front/gyarados.png and b/gfx/pokemon/front/gyarados.png differ diff --git a/gfx/pokemon/front/haunter.png b/gfx/pokemon/front/haunter.png index 4d6c758d..d7f96e3d 100644 Binary files a/gfx/pokemon/front/haunter.png and b/gfx/pokemon/front/haunter.png differ diff --git a/gfx/pokemon/front/hitmonchan.png b/gfx/pokemon/front/hitmonchan.png index d8a6ffd3..2fb7122b 100644 Binary files a/gfx/pokemon/front/hitmonchan.png and b/gfx/pokemon/front/hitmonchan.png differ diff --git a/gfx/pokemon/front/hitmonlee.png b/gfx/pokemon/front/hitmonlee.png index 36042c68..acbe68ff 100644 Binary files a/gfx/pokemon/front/hitmonlee.png and b/gfx/pokemon/front/hitmonlee.png differ diff --git a/gfx/pokemon/front/horsea.png b/gfx/pokemon/front/horsea.png index cd28df8c..390c419d 100644 Binary files a/gfx/pokemon/front/horsea.png and b/gfx/pokemon/front/horsea.png differ diff --git a/gfx/pokemon/front/hypno.png b/gfx/pokemon/front/hypno.png index e7434ea4..ed100f66 100644 Binary files a/gfx/pokemon/front/hypno.png and b/gfx/pokemon/front/hypno.png differ diff --git a/gfx/pokemon/front/ivysaur.png b/gfx/pokemon/front/ivysaur.png index dad10ae0..4da5664b 100644 Binary files a/gfx/pokemon/front/ivysaur.png and b/gfx/pokemon/front/ivysaur.png differ diff --git a/gfx/pokemon/front/jigglypuff.png b/gfx/pokemon/front/jigglypuff.png index a5475777..d11ec165 100644 Binary files a/gfx/pokemon/front/jigglypuff.png and b/gfx/pokemon/front/jigglypuff.png differ diff --git a/gfx/pokemon/front/jolteon.png b/gfx/pokemon/front/jolteon.png index 7ecd6fbb..a1942ec6 100644 Binary files a/gfx/pokemon/front/jolteon.png and b/gfx/pokemon/front/jolteon.png differ diff --git a/gfx/pokemon/front/jynx.png b/gfx/pokemon/front/jynx.png index 583bd5da..699ab3f5 100644 Binary files a/gfx/pokemon/front/jynx.png and b/gfx/pokemon/front/jynx.png differ diff --git a/gfx/pokemon/front/kabuto.png b/gfx/pokemon/front/kabuto.png index e8e44e15..58f27e0f 100644 Binary files a/gfx/pokemon/front/kabuto.png and b/gfx/pokemon/front/kabuto.png differ diff --git a/gfx/pokemon/front/kabutops.png b/gfx/pokemon/front/kabutops.png index 39fcb900..e898ca12 100644 Binary files a/gfx/pokemon/front/kabutops.png and b/gfx/pokemon/front/kabutops.png differ diff --git a/gfx/pokemon/front/kadabra.png b/gfx/pokemon/front/kadabra.png index 36589440..58aff19a 100644 Binary files a/gfx/pokemon/front/kadabra.png and b/gfx/pokemon/front/kadabra.png differ diff --git a/gfx/pokemon/front/kakuna.png b/gfx/pokemon/front/kakuna.png index ee350ffd..fb4ec863 100644 Binary files a/gfx/pokemon/front/kakuna.png and b/gfx/pokemon/front/kakuna.png differ diff --git a/gfx/pokemon/front/kangaskhan.png b/gfx/pokemon/front/kangaskhan.png index 1c0ba99c..56ab2619 100644 Binary files a/gfx/pokemon/front/kangaskhan.png and b/gfx/pokemon/front/kangaskhan.png differ diff --git a/gfx/pokemon/front/kingler.png b/gfx/pokemon/front/kingler.png index b2bd7418..c7610d11 100644 Binary files a/gfx/pokemon/front/kingler.png and b/gfx/pokemon/front/kingler.png differ diff --git a/gfx/pokemon/front/koffing.png b/gfx/pokemon/front/koffing.png index 36961502..9d394cdc 100644 Binary files a/gfx/pokemon/front/koffing.png and b/gfx/pokemon/front/koffing.png differ diff --git a/gfx/pokemon/front/krabby.png b/gfx/pokemon/front/krabby.png index b280e8db..fe463732 100644 Binary files a/gfx/pokemon/front/krabby.png and b/gfx/pokemon/front/krabby.png differ diff --git a/gfx/pokemon/front/lapras.png b/gfx/pokemon/front/lapras.png index 822c00e9..ee954079 100644 Binary files a/gfx/pokemon/front/lapras.png and b/gfx/pokemon/front/lapras.png differ diff --git a/gfx/pokemon/front/lickitung.png b/gfx/pokemon/front/lickitung.png index 050f7d23..3b480655 100644 Binary files a/gfx/pokemon/front/lickitung.png and b/gfx/pokemon/front/lickitung.png differ diff --git a/gfx/pokemon/front/machamp.png b/gfx/pokemon/front/machamp.png index c854a2cf..f2bf5a0b 100644 Binary files a/gfx/pokemon/front/machamp.png and b/gfx/pokemon/front/machamp.png differ diff --git a/gfx/pokemon/front/machoke.png b/gfx/pokemon/front/machoke.png index 317dad96..7079a52b 100644 Binary files a/gfx/pokemon/front/machoke.png and b/gfx/pokemon/front/machoke.png differ diff --git a/gfx/pokemon/front/machop.png b/gfx/pokemon/front/machop.png index 63909c11..cd6d6891 100644 Binary files a/gfx/pokemon/front/machop.png and b/gfx/pokemon/front/machop.png differ diff --git a/gfx/pokemon/front/magikarp.png b/gfx/pokemon/front/magikarp.png index e71402f8..881aa50a 100644 Binary files a/gfx/pokemon/front/magikarp.png and b/gfx/pokemon/front/magikarp.png differ diff --git a/gfx/pokemon/front/magmar.png b/gfx/pokemon/front/magmar.png index 9bc1d929..839fa204 100644 Binary files a/gfx/pokemon/front/magmar.png and b/gfx/pokemon/front/magmar.png differ diff --git a/gfx/pokemon/front/magnemite.png b/gfx/pokemon/front/magnemite.png index f2254bed..4cb5e3da 100644 Binary files a/gfx/pokemon/front/magnemite.png and b/gfx/pokemon/front/magnemite.png differ diff --git a/gfx/pokemon/front/magneton.png b/gfx/pokemon/front/magneton.png index 4d0f2cc7..5d2a3eaa 100644 Binary files a/gfx/pokemon/front/magneton.png and b/gfx/pokemon/front/magneton.png differ diff --git a/gfx/pokemon/front/mankey.png b/gfx/pokemon/front/mankey.png index 303ce1f2..f3266f29 100644 Binary files a/gfx/pokemon/front/mankey.png and b/gfx/pokemon/front/mankey.png differ diff --git a/gfx/pokemon/front/marowak.png b/gfx/pokemon/front/marowak.png index b2d18437..d90e4627 100644 Binary files a/gfx/pokemon/front/marowak.png and b/gfx/pokemon/front/marowak.png differ diff --git a/gfx/pokemon/front/meowth.png b/gfx/pokemon/front/meowth.png index 0e706c35..fb76519d 100644 Binary files a/gfx/pokemon/front/meowth.png and b/gfx/pokemon/front/meowth.png differ diff --git a/gfx/pokemon/front/metapod.png b/gfx/pokemon/front/metapod.png index cbfa6e1e..6268ed9a 100644 Binary files a/gfx/pokemon/front/metapod.png and b/gfx/pokemon/front/metapod.png differ diff --git a/gfx/pokemon/front/mew.png b/gfx/pokemon/front/mew.png index 7e25a96d..a00783a9 100644 Binary files a/gfx/pokemon/front/mew.png and b/gfx/pokemon/front/mew.png differ diff --git a/gfx/pokemon/front/mewtwo.png b/gfx/pokemon/front/mewtwo.png index b7a31296..40c6f217 100644 Binary files a/gfx/pokemon/front/mewtwo.png and b/gfx/pokemon/front/mewtwo.png differ diff --git a/gfx/pokemon/front/moltres.png b/gfx/pokemon/front/moltres.png index 7c153998..e5e3d02e 100644 Binary files a/gfx/pokemon/front/moltres.png and b/gfx/pokemon/front/moltres.png differ diff --git a/gfx/pokemon/front/mr.mime.png b/gfx/pokemon/front/mr.mime.png index d9085ec6..5a3642d3 100644 Binary files a/gfx/pokemon/front/mr.mime.png and b/gfx/pokemon/front/mr.mime.png differ diff --git a/gfx/pokemon/front/muk.png b/gfx/pokemon/front/muk.png index f69b83b7..d7d98e37 100644 Binary files a/gfx/pokemon/front/muk.png and b/gfx/pokemon/front/muk.png differ diff --git a/gfx/pokemon/front/nidoking.png b/gfx/pokemon/front/nidoking.png index 24330538..785adc67 100644 Binary files a/gfx/pokemon/front/nidoking.png and b/gfx/pokemon/front/nidoking.png differ diff --git a/gfx/pokemon/front/nidoqueen.png b/gfx/pokemon/front/nidoqueen.png index c0043e1b..24f786c7 100644 Binary files a/gfx/pokemon/front/nidoqueen.png and b/gfx/pokemon/front/nidoqueen.png differ diff --git a/gfx/pokemon/front/nidoranf.png b/gfx/pokemon/front/nidoranf.png index 6b58b274..1f6532d2 100644 Binary files a/gfx/pokemon/front/nidoranf.png and b/gfx/pokemon/front/nidoranf.png differ diff --git a/gfx/pokemon/front/nidoranm.png b/gfx/pokemon/front/nidoranm.png index 92d0cb49..bb960e01 100644 Binary files a/gfx/pokemon/front/nidoranm.png and b/gfx/pokemon/front/nidoranm.png differ diff --git a/gfx/pokemon/front/nidorina.png b/gfx/pokemon/front/nidorina.png index 68aca7c4..76edf719 100644 Binary files a/gfx/pokemon/front/nidorina.png and b/gfx/pokemon/front/nidorina.png differ diff --git a/gfx/pokemon/front/nidorino.png b/gfx/pokemon/front/nidorino.png index 795bf0c5..c68dbdd1 100644 Binary files a/gfx/pokemon/front/nidorino.png and b/gfx/pokemon/front/nidorino.png differ diff --git a/gfx/pokemon/front/ninetales.png b/gfx/pokemon/front/ninetales.png index ed6bb398..f7ff9ff6 100644 Binary files a/gfx/pokemon/front/ninetales.png and b/gfx/pokemon/front/ninetales.png differ diff --git a/gfx/pokemon/front/oddish.png b/gfx/pokemon/front/oddish.png index e47dabe1..17281e3b 100644 Binary files a/gfx/pokemon/front/oddish.png and b/gfx/pokemon/front/oddish.png differ diff --git a/gfx/pokemon/front/omanyte.png b/gfx/pokemon/front/omanyte.png index bdfa5440..eafbd593 100644 Binary files a/gfx/pokemon/front/omanyte.png and b/gfx/pokemon/front/omanyte.png differ diff --git a/gfx/pokemon/front/omastar.png b/gfx/pokemon/front/omastar.png index 3221d3d8..2eb40d37 100644 Binary files a/gfx/pokemon/front/omastar.png and b/gfx/pokemon/front/omastar.png differ diff --git a/gfx/pokemon/front/onix.png b/gfx/pokemon/front/onix.png index 44a21a61..1e49634f 100644 Binary files a/gfx/pokemon/front/onix.png and b/gfx/pokemon/front/onix.png differ diff --git a/gfx/pokemon/front/paras.png b/gfx/pokemon/front/paras.png index f4909bbd..73c805c8 100644 Binary files a/gfx/pokemon/front/paras.png and b/gfx/pokemon/front/paras.png differ diff --git a/gfx/pokemon/front/parasect.png b/gfx/pokemon/front/parasect.png index 938bf53b..def9e493 100644 Binary files a/gfx/pokemon/front/parasect.png and b/gfx/pokemon/front/parasect.png differ diff --git a/gfx/pokemon/front/persian.png b/gfx/pokemon/front/persian.png index cc15677a..831a9da8 100644 Binary files a/gfx/pokemon/front/persian.png and b/gfx/pokemon/front/persian.png differ diff --git a/gfx/pokemon/front/pidgeot.png b/gfx/pokemon/front/pidgeot.png index 7daf609f..4bb98422 100644 Binary files a/gfx/pokemon/front/pidgeot.png and b/gfx/pokemon/front/pidgeot.png differ diff --git a/gfx/pokemon/front/pidgeotto.png b/gfx/pokemon/front/pidgeotto.png index c86b86f1..0490003c 100644 Binary files a/gfx/pokemon/front/pidgeotto.png and b/gfx/pokemon/front/pidgeotto.png differ diff --git a/gfx/pokemon/front/pidgey.png b/gfx/pokemon/front/pidgey.png index 70d9dd4a..fe507e6d 100644 Binary files a/gfx/pokemon/front/pidgey.png and b/gfx/pokemon/front/pidgey.png differ diff --git a/gfx/pokemon/front/pikachu.png b/gfx/pokemon/front/pikachu.png index 159e47e9..4fc61c87 100644 Binary files a/gfx/pokemon/front/pikachu.png and b/gfx/pokemon/front/pikachu.png differ diff --git a/gfx/pokemon/front/pinsir.png b/gfx/pokemon/front/pinsir.png index 320c79cb..0f8d8639 100644 Binary files a/gfx/pokemon/front/pinsir.png and b/gfx/pokemon/front/pinsir.png differ diff --git a/gfx/pokemon/front/poliwag.png b/gfx/pokemon/front/poliwag.png index 397d2e66..1c19fd1c 100644 Binary files a/gfx/pokemon/front/poliwag.png and b/gfx/pokemon/front/poliwag.png differ diff --git a/gfx/pokemon/front/poliwhirl.png b/gfx/pokemon/front/poliwhirl.png index a7039145..f56f75df 100644 Binary files a/gfx/pokemon/front/poliwhirl.png and b/gfx/pokemon/front/poliwhirl.png differ diff --git a/gfx/pokemon/front/poliwrath.png b/gfx/pokemon/front/poliwrath.png index f31d0680..20fe9e6c 100644 Binary files a/gfx/pokemon/front/poliwrath.png and b/gfx/pokemon/front/poliwrath.png differ diff --git a/gfx/pokemon/front/ponyta.png b/gfx/pokemon/front/ponyta.png index 4d8c1bee..b4ec63b2 100644 Binary files a/gfx/pokemon/front/ponyta.png and b/gfx/pokemon/front/ponyta.png differ diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index ba3500c6..f991dd6e 100644 Binary files a/gfx/pokemon/front/porygon.png and b/gfx/pokemon/front/porygon.png differ diff --git a/gfx/pokemon/front/primeape.png b/gfx/pokemon/front/primeape.png index 7c5a1a09..a14234f5 100644 Binary files a/gfx/pokemon/front/primeape.png and b/gfx/pokemon/front/primeape.png differ diff --git a/gfx/pokemon/front/psyduck.png b/gfx/pokemon/front/psyduck.png index 86772256..75cd2f17 100644 Binary files a/gfx/pokemon/front/psyduck.png and b/gfx/pokemon/front/psyduck.png differ diff --git a/gfx/pokemon/front/raichu.png b/gfx/pokemon/front/raichu.png index a29731e5..1ef39dc9 100644 Binary files a/gfx/pokemon/front/raichu.png and b/gfx/pokemon/front/raichu.png differ diff --git a/gfx/pokemon/front/rapidash.png b/gfx/pokemon/front/rapidash.png index 62d47506..804e7829 100644 Binary files a/gfx/pokemon/front/rapidash.png and b/gfx/pokemon/front/rapidash.png differ diff --git a/gfx/pokemon/front/raticate.png b/gfx/pokemon/front/raticate.png index 64340846..95018e0b 100644 Binary files a/gfx/pokemon/front/raticate.png and b/gfx/pokemon/front/raticate.png differ diff --git a/gfx/pokemon/front/rattata.png b/gfx/pokemon/front/rattata.png index 9b391cca..423299bb 100644 Binary files a/gfx/pokemon/front/rattata.png and b/gfx/pokemon/front/rattata.png differ diff --git a/gfx/pokemon/front/rhydon.png b/gfx/pokemon/front/rhydon.png index 92406476..6d75e4be 100644 Binary files a/gfx/pokemon/front/rhydon.png and b/gfx/pokemon/front/rhydon.png differ diff --git a/gfx/pokemon/front/rhyhorn.png b/gfx/pokemon/front/rhyhorn.png index 9452b701..dcf9dd6a 100644 Binary files a/gfx/pokemon/front/rhyhorn.png and b/gfx/pokemon/front/rhyhorn.png differ diff --git a/gfx/pokemon/front/sandshrew.png b/gfx/pokemon/front/sandshrew.png index bcf52215..010908fd 100644 Binary files a/gfx/pokemon/front/sandshrew.png and b/gfx/pokemon/front/sandshrew.png differ diff --git a/gfx/pokemon/front/sandslash.png b/gfx/pokemon/front/sandslash.png index 3b212a60..d37a8de1 100644 Binary files a/gfx/pokemon/front/sandslash.png and b/gfx/pokemon/front/sandslash.png differ diff --git a/gfx/pokemon/front/scyther.png b/gfx/pokemon/front/scyther.png index 3fe6eeae..51663342 100644 Binary files a/gfx/pokemon/front/scyther.png and b/gfx/pokemon/front/scyther.png differ diff --git a/gfx/pokemon/front/seadra.png b/gfx/pokemon/front/seadra.png index e8af292f..150416dc 100644 Binary files a/gfx/pokemon/front/seadra.png and b/gfx/pokemon/front/seadra.png differ diff --git a/gfx/pokemon/front/seaking.png b/gfx/pokemon/front/seaking.png index ebe70c7e..75060461 100644 Binary files a/gfx/pokemon/front/seaking.png and b/gfx/pokemon/front/seaking.png differ diff --git a/gfx/pokemon/front/seel.png b/gfx/pokemon/front/seel.png index c4b2315a..ef3574b0 100644 Binary files a/gfx/pokemon/front/seel.png and b/gfx/pokemon/front/seel.png differ diff --git a/gfx/pokemon/front/shellder.png b/gfx/pokemon/front/shellder.png index cf44a7fe..d7ddfa48 100644 Binary files a/gfx/pokemon/front/shellder.png and b/gfx/pokemon/front/shellder.png differ diff --git a/gfx/pokemon/front/slowbro.png b/gfx/pokemon/front/slowbro.png index e61ad34b..e506c9ec 100644 Binary files a/gfx/pokemon/front/slowbro.png and b/gfx/pokemon/front/slowbro.png differ diff --git a/gfx/pokemon/front/slowpoke.png b/gfx/pokemon/front/slowpoke.png index fdf701d7..1328f4a0 100644 Binary files a/gfx/pokemon/front/slowpoke.png and b/gfx/pokemon/front/slowpoke.png differ diff --git a/gfx/pokemon/front/snorlax.png b/gfx/pokemon/front/snorlax.png index 5b571a18..00c78d27 100644 Binary files a/gfx/pokemon/front/snorlax.png and b/gfx/pokemon/front/snorlax.png differ diff --git a/gfx/pokemon/front/spearow.png b/gfx/pokemon/front/spearow.png index 835800a5..d9349987 100644 Binary files a/gfx/pokemon/front/spearow.png and b/gfx/pokemon/front/spearow.png differ diff --git a/gfx/pokemon/front/squirtle.png b/gfx/pokemon/front/squirtle.png index bc0c9979..db7aa6c7 100644 Binary files a/gfx/pokemon/front/squirtle.png and b/gfx/pokemon/front/squirtle.png differ diff --git a/gfx/pokemon/front/starmie.png b/gfx/pokemon/front/starmie.png index 24025ddf..2ed93b4d 100644 Binary files a/gfx/pokemon/front/starmie.png and b/gfx/pokemon/front/starmie.png differ diff --git a/gfx/pokemon/front/staryu.png b/gfx/pokemon/front/staryu.png index 394732e9..320fb6a6 100644 Binary files a/gfx/pokemon/front/staryu.png and b/gfx/pokemon/front/staryu.png differ diff --git a/gfx/pokemon/front/tangela.png b/gfx/pokemon/front/tangela.png index eff9c5a5..43d04726 100644 Binary files a/gfx/pokemon/front/tangela.png and b/gfx/pokemon/front/tangela.png differ diff --git a/gfx/pokemon/front/tauros.png b/gfx/pokemon/front/tauros.png index 3a4edfee..8086fd13 100644 Binary files a/gfx/pokemon/front/tauros.png and b/gfx/pokemon/front/tauros.png differ diff --git a/gfx/pokemon/front/tentacool.png b/gfx/pokemon/front/tentacool.png index 534e5496..88d7fde3 100644 Binary files a/gfx/pokemon/front/tentacool.png and b/gfx/pokemon/front/tentacool.png differ diff --git a/gfx/pokemon/front/tentacruel.png b/gfx/pokemon/front/tentacruel.png index 7a26a305..47383372 100644 Binary files a/gfx/pokemon/front/tentacruel.png and b/gfx/pokemon/front/tentacruel.png differ diff --git a/gfx/pokemon/front/vaporeon.png b/gfx/pokemon/front/vaporeon.png index 48dafce6..2c35af22 100644 Binary files a/gfx/pokemon/front/vaporeon.png and b/gfx/pokemon/front/vaporeon.png differ diff --git a/gfx/pokemon/front/venomoth.png b/gfx/pokemon/front/venomoth.png index e28b1017..9d801497 100644 Binary files a/gfx/pokemon/front/venomoth.png and b/gfx/pokemon/front/venomoth.png differ diff --git a/gfx/pokemon/front/venonat.png b/gfx/pokemon/front/venonat.png index edf15889..574ed26b 100644 Binary files a/gfx/pokemon/front/venonat.png and b/gfx/pokemon/front/venonat.png differ diff --git a/gfx/pokemon/front/venusaur.png b/gfx/pokemon/front/venusaur.png index dd39184a..f6a964e3 100644 Binary files a/gfx/pokemon/front/venusaur.png and b/gfx/pokemon/front/venusaur.png differ diff --git a/gfx/pokemon/front/victreebel.png b/gfx/pokemon/front/victreebel.png index 29a471c8..115c45a3 100644 Binary files a/gfx/pokemon/front/victreebel.png and b/gfx/pokemon/front/victreebel.png differ diff --git a/gfx/pokemon/front/vileplume.png b/gfx/pokemon/front/vileplume.png index e788425e..af4f0862 100644 Binary files a/gfx/pokemon/front/vileplume.png and b/gfx/pokemon/front/vileplume.png differ diff --git a/gfx/pokemon/front/voltorb.png b/gfx/pokemon/front/voltorb.png index 22d0c675..8b4bc64d 100644 Binary files a/gfx/pokemon/front/voltorb.png and b/gfx/pokemon/front/voltorb.png differ diff --git a/gfx/pokemon/front/vulpix.png b/gfx/pokemon/front/vulpix.png index f4780ef2..cef8fbd8 100644 Binary files a/gfx/pokemon/front/vulpix.png and b/gfx/pokemon/front/vulpix.png differ diff --git a/gfx/pokemon/front/wartortle.png b/gfx/pokemon/front/wartortle.png index bd844562..961aaf4f 100644 Binary files a/gfx/pokemon/front/wartortle.png and b/gfx/pokemon/front/wartortle.png differ diff --git a/gfx/pokemon/front/weedle.png b/gfx/pokemon/front/weedle.png index 445fe8f3..989b57b5 100644 Binary files a/gfx/pokemon/front/weedle.png and b/gfx/pokemon/front/weedle.png differ diff --git a/gfx/pokemon/front/weepinbell.png b/gfx/pokemon/front/weepinbell.png index 6ee57334..8dd8fc34 100644 Binary files a/gfx/pokemon/front/weepinbell.png and b/gfx/pokemon/front/weepinbell.png differ diff --git a/gfx/pokemon/front/weezing.png b/gfx/pokemon/front/weezing.png index deb2a623..445556b3 100644 Binary files a/gfx/pokemon/front/weezing.png and b/gfx/pokemon/front/weezing.png differ diff --git a/gfx/pokemon/front/wigglytuff.png b/gfx/pokemon/front/wigglytuff.png index c7cd495b..c9ae89ad 100644 Binary files a/gfx/pokemon/front/wigglytuff.png and b/gfx/pokemon/front/wigglytuff.png differ diff --git a/gfx/pokemon/front/zapdos.png b/gfx/pokemon/front/zapdos.png index 0bd71f4e..47b63d6a 100644 Binary files a/gfx/pokemon/front/zapdos.png and b/gfx/pokemon/front/zapdos.png differ diff --git a/gfx/pokemon/front/zubat.png b/gfx/pokemon/front/zubat.png index 73078725..86ac4710 100644 Binary files a/gfx/pokemon/front/zubat.png and b/gfx/pokemon/front/zubat.png differ diff --git a/home/pics.asm b/home/pics.asm index 3bce1532..cb77bcd8 100644 --- a/home/pics.asm +++ b/home/pics.asm @@ -8,40 +8,17 @@ UncompressMonSprite:: ld [wSpriteInputPtr], a ; fetch sprite input pointer ld a, [hl] ld [wSpriteInputPtr+1], a -; define (by index number) the bank that a pokemon's image is in -; index = MEW: bank $1 -; index = FOSSIL_KABUTOPS: bank $B -; index < $1F: bank $9 ("Pics 1") -; $1F ≤ index < $4A: bank $A ("Pics 2") -; $4A ≤ index < $74: bank $B ("Pics 3") -; $74 ≤ index < $99: bank $C ("Pics 4") -; $99 ≤ index: bank $D ("Pics 5") ld a, [wcf91] - ld b, a - cp MEW - ld a, BANK(MewPicFront) - jr z, .GotBank - ld a, b cp FOSSIL_KABUTOPS + jr z, .RecallBank + cp FOSSIL_AERODACTYL + jr z, .RecallBank + cp MON_GHOST + jr z, .RecallBank + ld a, [wMonHPicBank] + jr .GotBank +.RecallBank ld a, BANK(FossilKabutopsPic) - jr z, .GotBank - ld a, b - cp TANGELA + 1 - ld a, BANK("Pics 1") - jr c, .GotBank - ld a, b - cp MOLTRES + 1 - ld a, BANK("Pics 2") - jr c, .GotBank - ld a, b - cp BEEDRILL + 2 - ld a, BANK("Pics 3") - jr c, .GotBank - ld a, b - cp STARMIE + 1 - ld a, BANK("Pics 4") - jr c, .GotBank - ld a, BANK("Pics 5") .GotBank jp UncompressSpriteData diff --git a/layout.link b/layout.link index 0c7096cb..eb6f231c 100644 --- a/layout.link +++ b/layout.link @@ -177,6 +177,10 @@ ROMX $2B "Pokédex Text" ROMX $2C "Move Names" +ROMX $2D + "Pics 7" +ROMX $2E + "Pics 8" WRAM0 "Audio RAM" org $c100 diff --git a/main.asm b/main.asm index 31506a29..9abef6bb 100644 --- a/main.asm +++ b/main.asm @@ -5,7 +5,6 @@ SECTION "bank1", ROMX INCLUDE "data/sprites/facings.asm" INCLUDE "engine/events/black_out.asm" -INCLUDE "data/pokemon/mew.asm" INCLUDE "engine/battle/safari_zone.asm" INCLUDE "engine/movie/title.asm" INCLUDE "engine/pokemon/load_mon_data.asm" diff --git a/maps/DiglettsCave.blk b/maps/DiglettsCave.blk index ff81fc7d..8b2e7c19 100644 --- a/maps/DiglettsCave.blk +++ b/maps/DiglettsCave.blk @@ -1 +1 @@ -,+>++++> \ No newline at end of file +,++,+>,@AAB+0vv+vvnn+vvL+v)vztvvvvvvrujosTWUUUU2sts+pjkkk[o>~[[[[o \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 5c0c5e34..25aa5a99 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1532,7 +1532,7 @@ wMonHBackSprite:: dw wMonHMoves:: ds NUM_MOVES wMonHGrowthRate:: db wMonHLearnset:: flag_array NUM_TMS + NUM_HMS - ds 1 +wMonHPicBank:: db wMonHeaderEnd:: ; saved at the start of a battle and then written back at the end of the battle diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm index f9f2e590..c9f25272 100644 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm @@ -4,3 +4,25 @@ DiglettsCave_Script: DiglettsCave_TextPointers: text_end ; unused + +; Edited from Articuno - PvK + def_trainers 1 +CrockyTrainerHeader: + trainer EVENT_BEAT_CROCKY, 0, CrockyBattleText, CrockyBattleText, CrockyBattleText + db -1 ; end + +CrockyText: + text_asm + ld hl, CrockyTrainerHeader + call TalkToTrainer + ld a, $4 + ld [wSeafoamIslandsB4FCurScript], a + jp TextScriptEnd + +CrockyBattleText: + text_far _CrockyBattleText + text_asm + ld a, CROCKY + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd \ No newline at end of file diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm index fa9cafda..6703cd6d 100644 --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm @@ -185,3 +185,25 @@ RockTunnel2EndBattleText9: RockTunnel2AfterBattleText9: text_far _RockTunnel2AfterBattleText9 text_end + +; Edited from Articuno - PvK + def_trainers 9 +KabutopsTrainerHeader: + trainer EVENT_BEAT_KABUTOPS, 0, KabutopsBattleText, KabutopsBattleText, KabutopsBattleText + db -1 ; end + +KabutopsText: + text_asm + ld hl, KabutopsTrainerHeader + call TalkToTrainer + ld a, $4 + ld [wSeafoamIslandsB4FCurScript], a + jp TextScriptEnd + +KabutopsBattleText: + text_far _KabutopsBattleText + text_asm + ld a, KABUTOPS + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd \ No newline at end of file diff --git a/text.asm b/text.asm index c5020bba..47a39280 100644 --- a/text.asm +++ b/text.asm @@ -70,6 +70,7 @@ INCLUDE "text/SeafoamIslandsB4F.asm" INCLUDE "data/text/text_2.asm" INCLUDE "text/DiglettsCaveRoute2.asm" +INCLUDE "text/DiglettsCave.asm" INCLUDE "text/ViridianForestNorthGate.asm" INCLUDE "text/Route2TradeHouse.asm" INCLUDE "text/Route2Gate.asm" diff --git a/text/DiglettsCave.asm b/text/DiglettsCave.asm new file mode 100644 index 00000000..523a7081 --- /dev/null +++ b/text/DiglettsCave.asm @@ -0,0 +1,3 @@ +_CrockyBattleText:: + text "Graogh!" + text_end diff --git a/text/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm index e8e45a7f..ca4be66f 100644 --- a/text/RockTunnelB1F_2.asm +++ b/text/RockTunnelB1F_2.asm @@ -18,3 +18,7 @@ _RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." done + +_KabutopsBattleText:: + text "Grr..." + text_end \ No newline at end of file