diff --git a/README.md b/README.md index 1bb9a57..8908e3b 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,14 @@ Using the Kanto Expansion Pak's original criteria, the ethos of the Johto Expans What falls under "Johto- and Kanto-related" is a Pokemon is the following, so long as they are, in fact, related: - Is a regional variant (Eg. Hisuian Sneasel) -- Evolves from or into a Pokemon (eg. Tangrowth, Honchkrow) +- Evolves from or into a Pokemon (eg. Tangrowth, Honchkrow, Leafeon, Happiny) + - This includes Evolotto, a Pokemon from the RS Asset Leak that evolves into almost anything! Very much an edge case, but it is a nice addition to the Goldenrod Lottery feature. - Was cut from the final game (eg. Bellignan, Tricules, Phandarin; "beta" Pokemon) or cut from a future title while being related to a Kanto/Johto Pokemon (eg. Lizargun/Charmada) -- Is a regional convergent (eg. Wugtrio, Toedscruel; "Okagyaradosu" qualifies for this) +- Is a regional convergent (eg. Wugtrio, Toedscruel; "Okagyaradosu" qualified for this, which we named Terrados!) - Is a Paradox equivalent (eg. Walking Wake) -- Would qualify for the Kanto Expansion Pak (eg. Omegadge, Melmetal) +- Would qualify for the Kanto Expansion Pak (eg. Omegadge, Melmetal); we call these "KEP Veterans." -Any Pokemon that you can think of that would come under this, is absolutely in. Dex total is 483! +Any Pokemon that you can think of that would come under this, is absolutely in. Dex total is 484! Many prototype Pokemon have very little information around them: You'll be hard-pressed to find stats, cries, movesets, anything for some. With the Kanto Expansion Pak, we used all context clues available to try and formulate a picture-perfect, accurate representation to the best of our abilities. We've done this with the May 1998 Sprite Cache Pokemon, among others. Whenever something confirmed exists, it is used, and that then informs the interpretation. We also take Nob Ogasawara names as canon whenever they appear. @@ -53,21 +54,14 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration. - Prototype GSC classes such as the Male Teacher, Sportsman, and Soldier - The Painter from FRLG! - The Elder from HGSS, featuring the NTSC Sage sprite. - - Decensor is applied to the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. Let Tully have a puff! + - Decensoring is applied to the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. Let Tully have a puff! - Many evolution stones have been added to accomodate the Pokemon featured here, including the Heart and Poison Stones from the SpaceWorld demo, and the Peat Block! - The Fairy Feather from Scarlet and Violet has been added to accomodate the Fairy type. - The Antique Pot has been added to accomodate a Shuckle evolution! - New Club and Wing Fossils; the former for Xylodon, a May98 Prototype Pokemon, and the latter for Feradactyl, (seemingly) an Aerodactyl pre-evolution from the same prototype. - The unused Honey Pot from prototype GSC has been added! 2 days after placing Sweet Honey, you can encounter either Munchlax, Beedrill, Ursaring, or Heracross! - Unused moves from the SpaceWorld demo have been re-implemented and distributed amongst the Pokemon. This includes the unused HMs, each with unique effects, sometimes calling back to other titles. - -## Technical Changes -- Numerous important registers, such as map and Pokemon IDs, now support 16-bit IDs, allowing for significantly more additions to the game. This makes JEP possible. - - Important to note is the fact Crystal has ~30% free ROM space, which, given the sheer amount of content inside, makes this bountiful. This, too, makes JEP possible. Regardless, expanded ROMs can be played from good flash cartridges, so ROM space is not a concern to the team. -- Tilesets now handle up to 255 titles (from 192), allowing for slightly nicer maps. We also have flipped tiles available for more complexity. -- Can now have up to 17 object events. -- Footprint pictures were optimised to make dex additions easier on memory. Before, they were mapped to a single bank - optimal for 8-bits, but not for 16! -- Lots of unnecessary, unreferenced code was removed as and when it became necessary. +- Pokemon all have unique party icons! ## QoL Changes - Fast text and stereo sound are now the default options. @@ -116,8 +110,16 @@ Additionally, there have been many wild encounter tweaks. View this document for - Walls can be climbed using Strong Arm, functionality identical to HGSS Rock Climb. - Deep water now exists for Dive, with various locations across Johto, Kanto, and Nihon featuring it. +## Technical Changes +- Numerous important registers, such as map and Pokemon IDs, now support 16-bit IDs, allowing for significantly more additions to the game. This makes JEP possible. + - Important to note is the fact Crystal has ~30% free ROM space, which, given the sheer amount of content inside, makes this bountiful. This, too, makes JEP possible. Regardless, expanded ROMs can be played from good flash cartridges, so ROM space is not a concern to the team. +- Tilesets now handle up to 255 titles (from 192), allowing for slightly nicer maps. We also have flipped tiles available for more complexity and to modify vanilla tilesets with more content. +- Maps can now have up to 17 object events. +- Footprint pictures were optimised to make dex additions easier on memory. Before, they were mapped to a single bank - optimal for 8-bits, but not for 16! +- Lots of unnecessary, unreferenced code was removed as and when it became necessary. This does not affect gameplay. + # Credits -As the open source nature of this project implies, people are free to reuse what's here for their own ends, **so long as credit is given to this hack and those who worked on what you reuse.** Additionally, we strongly urge you to make any projects using JEP's content open source. JEP strongly supports the [free software movement](https://www.fsf.org/about/) and its four essential freedoms. If you have any questions on the topic of content reuse, contact @ plague_von_karma on Discord. +As the open source nature of this project implies, people are free to reuse what's here for their own ends, **so long as credit is given to this hack and those who worked on what you reuse.** Additionally, we strongly urge you to make any projects using JEP's content open source. JEP strongly supports the [free software movement](https://www.fsf.org/about/) and its four essential freedoms. If you have any questions on the topic of content reuse, contact the Expansion Pak Discord. If you use our implementations of anything at all, it is encouraged to submit Pull Requests for bug fixes if you find any issues! We very much appreciate them! @@ -193,8 +195,9 @@ JEP-affiliated musicians require music to be used with direct credit for non-com When naming Ajawalcan, we used academic sources compiling the grammar and vocabulary of Yucatan Mayan and Classical Mayan, aiming to represent indiginous Latin American cultures the best we could. The name literally translates to "Kingly serpent" or "Lordly serpent", where "Ajaw" was the name for a king or ruler, and "can" is the spelling for "serpent" used in Kukulcan, the deity worshipped by Mayans of the day. -Original readme proceeding... -# 16-bit index expansion for Crystal +# On the 16-bit index expansion + +This is taken from the original readme. This repository contains a modified Pokémon Crystal game, updated to handle 16-bit indexes. The main goal of this project is to create a reusable system that ROM hacks can use to bring 16-bit indexes into their games. @@ -215,53 +218,6 @@ me know in advance so I can notify you of history rewrites. For further documentation, check out the [wiki]. -## Branches - -* `master`: (status: **stable**, last update: **2023-07-18**) Base branch. This branch contains a slightly modified - version of Pokémon Crystal, with some quality-of-life improvements intended to make development easier. These - improvements have been taken from the documentation in the [main disassembly repository][pokecrystal]. This branch - contains no 16-bit features and it is only intended as a reference. -* `base-components`: (status: **stable**, last update: **2023-07-18**) This branch defines the basic components that - will comprise the 16-bit index table system, on top of which the remaining branches will be built. Since it only - defines macros (and a handful of WRAM locations to be shared by all index tables), it should build the same ROM as - `master`. -* `expand-mon-ID`: (status: **stable**, last update: **2023-07-18**) This branch implements 16-bit indexes for Pokémon - species, thus allowing more than 253 species to be included in a single game. -* `expand-move-ID`: (status: **stable**, last update: **2023-07-18**) This branch implements 16-bit indexes for moves, - on top of the existing 16-bit support for Pokémon species from the previous branch. (Interaction between the - branches is kept to a minimum, though.) -* `newbox`: (status: **experimental**, last update: **2023-07-18**) This branch ports Rangi & FIQ's "newbox" from - Polished Crystal. Newbox is a complete overhaul to Bill's PC, and this branch ports the functionality on - top of the previous branches. -* `pokecrystal`: (status: **N/A**, last update **2023-07-18**) This branch contains pret's vanilla pokecrystal and - should only be used to compare with the previous branches to view pokecrystal16 changes. **DO NOT USE THIS BRANCH!** - -To view the differences between any two branches (or any two commits in the repository), you can use GitHub's [tree -comparison][compare] tool. - -## FAQs - -**Q1:** Will this engine include \? -**A1:** Unless the feature is specifically related to 16-bit indexing (or otherwise extending the range of possible -index values), the answer is almost certainly "no". This repository's scope is limited to 16-bit indexes. If you -already have a ROM hack that includes the features you like and you'd want it to have 16-bit indexes, the right course -of action would be to port this engine to it. Otherwise, you can use this engine as a base to make your own ROM hack -with all the features you want. - -**Q2:** Can I use this engine for my own ROM hack? -**A2:** Of course; that's what it was made for. I will try make it as easy as possible to port to existing or new ROM -hacks; instructions to do so will be in the [wiki]. All I can ask you for is that, just like this engine was openly -available for you to use, you make your hack's code openly available as well — quoting some of the text in -[SQLite](https://sqlite.org)'s copyright disclaimer, "may you share freely, never taking more than you give". - -**Q3:** What's this engine's new limit on indexes? -**A3:** The theoretical limit is 65,534, minus a couple of "special" indexes used by the game for specific purposes -(such as the value that indicates that a Pokémon is inside an egg). However, there are several limitations that will -probably prevent you from ever reaching that limit. For starters, you can't fit 65,534 of _anything_ inside a ROM -bank! The index work is done, and I'll try to remove any hurdles that would render that work useless; however, if you -want to push the limits of the hardware and add 20,000 new Pokémon, you'll find yourself against a technical challenge -that will go beyond indexes. - [compare]: https://github.com/aaaaaa123456789/pokecrystal16/compare [pokecrystal]: https://github.com/pret/pokecrystal/ [wiki]: https://github.com/aaaaaa123456789/pokecrystal16/wiki diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 8e26943..606aad8 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -83,6 +83,8 @@ const VENOMOTH ; 31 const DIGLETT ; 32 const DUGTRIO ; 33 + const WIGLETT + const WUGTRIO const COINPUR const MEOWTH ; 34 const PERSIAN ; 35 @@ -135,6 +137,7 @@ const CROAKOZUNA const FARFETCH_D ; 53 const LUXWAN + const DODAERIE const DODUO ; 54 const DODRIO ; 55 const SEEL ; 56 @@ -169,17 +172,24 @@ const WEEZING ; 6e const RHYHORN ; 6f const RHYDON ; 70 + const RHYPERIOR const HAPPINY const CHANSEY ; 71 + const GORILLAIMO + const CACTORMUS const BURGELA const TANGELA ; 72 const TANGROWTH const JUNGELA + const RAMOOSE const KANGASKHAN ; 73 + const TRAMPEL + const ARAPHANT const HORSEA ; 74 const SEADRA ; 75 const BLASTYKE const BLASTOISE + const SHARPOON const ORFRY const GOLDEEN ; 76 const SEAKING ; 77 @@ -209,6 +219,7 @@ const VAPOREON ; 86 const JOLTEON ; 87 const FLAREON ; 88 + const PORYBIT const PORYGON ; 89 const OMANYTE ; 8a const OMASTAR ; 8b @@ -218,6 +229,7 @@ const AERODACTYL ; 8e const DECILLA const GAWARHED + const OMEGADGE const MUNCHLAX const SNORLAX ; 8f const ARTICUNO ; 90 @@ -231,6 +243,8 @@ const DRAGONITE ; 95 const MEWTWO ; 96 const MEW ; 97 + const MELTAN + const MELMETAL DEF JOHTO_POKEMON EQU const_value const CHIKORITA ; 98 const BAYLEEF ; 99 @@ -303,6 +317,7 @@ DEF JOHTO_POKEMON EQU const_value const LEAFEON const GLACEON const SYLVEON + const BREEZEON const MURKROW ; c6 const HONCHKROW const SLOWKING ; c7 @@ -322,6 +337,7 @@ DEF JOHTO_POKEMON EQU const_value const DUNSPARCE ; ce const DUDUNSPARCE const GLIGAR ; cf + const GLISCOR const STEELIX ; d0 const SNUBBULL ; d1 const GRANBULL ; d2 @@ -329,11 +345,15 @@ DEF JOHTO_POKEMON EQU const_value const QWILFISH ; d3 const KAZAPPELIN const QWILFATHER + const SAILWING const SCIZOR ; d4 const SHUCKLE ; d5 const POCKLE const HERACROSS ; d6 const SNEASEL ; d7 + const WEAVILE + const WARFURS + const WEARLYCAN const TEDDIURSA ; d8 const URSARING ; d9 const URSALUNA @@ -363,6 +383,10 @@ DEF JOHTO_POKEMON EQU const_value const WYRDEER const SMEARGLE ; eb const GRENMAR + const BUNICE + const BUNDRA + const BUNBERG + const BUNDRAKE const TYROGUE ; ec const HITMONTOP ; ed const SMOOCHUM ; ee @@ -393,11 +417,16 @@ DEF JOHTO_POKEMON EQU const_value const WISPIRIT const COATL const MIMEAR + const SNUZZLES + const DRILLUSK const INOSHIKA const RUDDERNAUT + const PIXYTOP + const MAWTLE const XYLODON const XYLOFIN const DOKUROAR + const ALPHALITH const SCREAM_TAIL const SANDY_SHOCKS const GREAT_TUSK diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index c3b9e99..a40cb3f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -91,6 +91,8 @@ INCLUDE "data/pokemon/base_stats/venonat.asm" INCLUDE "data/pokemon/base_stats/venomoth.asm" INCLUDE "data/pokemon/base_stats/diglett.asm" INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/wiglett.asm" +INCLUDE "data/pokemon/base_stats/wugtrio.asm" INCLUDE "data/pokemon/base_stats/coinpur.asm" INCLUDE "data/pokemon/base_stats/meowth.asm" INCLUDE "data/pokemon/base_stats/persian.asm" @@ -143,6 +145,7 @@ INCLUDE "data/pokemon/base_stats/ribbito.asm" INCLUDE "data/pokemon/base_stats/croakozuna.asm" INCLUDE "data/pokemon/base_stats/farfetch_d.asm" INCLUDE "data/pokemon/base_stats/luxwan.asm" +INCLUDE "data/pokemon/base_stats/dodaerie.asm" INCLUDE "data/pokemon/base_stats/doduo.asm" INCLUDE "data/pokemon/base_stats/dodrio.asm" INCLUDE "data/pokemon/base_stats/seel.asm" @@ -177,17 +180,24 @@ INCLUDE "data/pokemon/base_stats/koffing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/rhyperior.asm" INCLUDE "data/pokemon/base_stats/happiny.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/gorillaimo.asm" +INCLUDE "data/pokemon/base_stats/cactormus.asm" INCLUDE "data/pokemon/base_stats/burgela.asm" INCLUDE "data/pokemon/base_stats/tangela.asm" INCLUDE "data/pokemon/base_stats/tangrowth.asm" INCLUDE "data/pokemon/base_stats/jungela.asm" +INCLUDE "data/pokemon/base_stats/ramoose.asm" INCLUDE "data/pokemon/base_stats/kangaskhan.asm" +INCLUDE "data/pokemon/base_stats/trampel.asm" +INCLUDE "data/pokemon/base_stats/araphant.asm" INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/seadra.asm" INCLUDE "data/pokemon/base_stats/blastyke.asm" INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/sharpoon.asm" INCLUDE "data/pokemon/base_stats/orfry.asm" INCLUDE "data/pokemon/base_stats/goldeen.asm" INCLUDE "data/pokemon/base_stats/seaking.asm" @@ -217,6 +227,7 @@ INCLUDE "data/pokemon/base_stats/eevee.asm" INCLUDE "data/pokemon/base_stats/vaporeon.asm" INCLUDE "data/pokemon/base_stats/jolteon.asm" INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/porybit.asm" INCLUDE "data/pokemon/base_stats/porygon.asm" INCLUDE "data/pokemon/base_stats/omanyte.asm" INCLUDE "data/pokemon/base_stats/omastar.asm" @@ -226,6 +237,7 @@ INCLUDE "data/pokemon/base_stats/feradactyl.asm" INCLUDE "data/pokemon/base_stats/aerodactyl.asm" INCLUDE "data/pokemon/base_stats/decilla.asm" INCLUDE "data/pokemon/base_stats/gawarhed.asm" +INCLUDE "data/pokemon/base_stats/omegadge.asm" INCLUDE "data/pokemon/base_stats/munchlax.asm" INCLUDE "data/pokemon/base_stats/snorlax.asm" INCLUDE "data/pokemon/base_stats/articuno.asm" @@ -239,6 +251,8 @@ INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" INCLUDE "data/pokemon/base_stats/mew.asm" +INCLUDE "data/pokemon/base_stats/meltan.asm" +INCLUDE "data/pokemon/base_stats/melmetal.asm" INCLUDE "data/pokemon/base_stats/chikorita.asm" INCLUDE "data/pokemon/base_stats/bayleef.asm" INCLUDE "data/pokemon/base_stats/meganium.asm" @@ -310,6 +324,7 @@ INCLUDE "data/pokemon/base_stats/umbreon.asm" INCLUDE "data/pokemon/base_stats/leafeon.asm" INCLUDE "data/pokemon/base_stats/glaceon.asm" INCLUDE "data/pokemon/base_stats/sylveon.asm" +INCLUDE "data/pokemon/base_stats/breezeon.asm" INCLUDE "data/pokemon/base_stats/murkrow.asm" INCLUDE "data/pokemon/base_stats/honchkrow.asm" INCLUDE "data/pokemon/base_stats/slowking.asm" @@ -329,6 +344,7 @@ INCLUDE "data/pokemon/base_stats/forretress.asm" INCLUDE "data/pokemon/base_stats/dunsparce.asm" INCLUDE "data/pokemon/base_stats/dudunsparce.asm" INCLUDE "data/pokemon/base_stats/gligar.asm" +INCLUDE "data/pokemon/base_stats/gliscor.asm" INCLUDE "data/pokemon/base_stats/steelix.asm" INCLUDE "data/pokemon/base_stats/snubbull.asm" INCLUDE "data/pokemon/base_stats/granbull.asm" @@ -336,11 +352,15 @@ INCLUDE "data/pokemon/base_stats/caretorker.asm" INCLUDE "data/pokemon/base_stats/qwilfish.asm" INCLUDE "data/pokemon/base_stats/kazappelin.asm" INCLUDE "data/pokemon/base_stats/qwilfather.asm" +INCLUDE "data/pokemon/base_stats/sailwing.asm" INCLUDE "data/pokemon/base_stats/scizor.asm" INCLUDE "data/pokemon/base_stats/shuckle.asm" INCLUDE "data/pokemon/base_stats/pockle.asm" INCLUDE "data/pokemon/base_stats/heracross.asm" INCLUDE "data/pokemon/base_stats/sneasel.asm" +INCLUDE "data/pokemon/base_stats/weavile.asm" +INCLUDE "data/pokemon/base_stats/warfurs.asm" +INCLUDE "data/pokemon/base_stats/wearlycan.asm" INCLUDE "data/pokemon/base_stats/teddiursa.asm" INCLUDE "data/pokemon/base_stats/ursaring.asm" INCLUDE "data/pokemon/base_stats/ursaluna.asm" @@ -370,6 +390,10 @@ INCLUDE "data/pokemon/base_stats/stantler.asm" INCLUDE "data/pokemon/base_stats/wyrdeer.asm" INCLUDE "data/pokemon/base_stats/smeargle.asm" INCLUDE "data/pokemon/base_stats/grenmar.asm" +INCLUDE "data/pokemon/base_stats/bunice.asm" +INCLUDE "data/pokemon/base_stats/bundra.asm" +INCLUDE "data/pokemon/base_stats/bunberg.asm" +INCLUDE "data/pokemon/base_stats/bundrake.asm" INCLUDE "data/pokemon/base_stats/tyrogue.asm" INCLUDE "data/pokemon/base_stats/hitmontop.asm" INCLUDE "data/pokemon/base_stats/smoochum.asm" @@ -398,11 +422,16 @@ INCLUDE "data/pokemon/base_stats/kitsen.asm" INCLUDE "data/pokemon/base_stats/wispirit.asm" INCLUDE "data/pokemon/base_stats/coatl.asm" INCLUDE "data/pokemon/base_stats/mimear.asm" +INCLUDE "data/pokemon/base_stats/snuzzles.asm" +INCLUDE "data/pokemon/base_stats/drillusk.asm" INCLUDE "data/pokemon/base_stats/inoshika.asm" INCLUDE "data/pokemon/base_stats/ruddernaut.asm" +INCLUDE "data/pokemon/base_stats/pixytop.asm" +INCLUDE "data/pokemon/base_stats/mawtle.asm" INCLUDE "data/pokemon/base_stats/xylodon.asm" INCLUDE "data/pokemon/base_stats/xylofin.asm" INCLUDE "data/pokemon/base_stats/dokuroar.asm" +INCLUDE "data/pokemon/base_stats/alphalith.asm" INCLUDE "data/pokemon/base_stats/scream_tail.asm" INCLUDE "data/pokemon/base_stats/sandy_shocks.asm" INCLUDE "data/pokemon/base_stats/great_tusk.asm" diff --git a/data/pokemon/base_stats/alphalith.asm b/data/pokemon/base_stats/alphalith.asm new file mode 100644 index 0000000..969754e --- /dev/null +++ b/data/pokemon/base_stats/alphalith.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 48, 92, 192, 48, 92, 108 + ; hp atk def spd sat sdf + + db ROCK, PSYCHIC_TYPE ; type + db 3 ; catch rate + db 203 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/alphalith/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate ; PLACEHOLDER + dn EGG_NONE, EGG_NONE ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/araphant.asm b/data/pokemon/base_stats/araphant.asm new file mode 100644 index 0000000..6c0e58e --- /dev/null +++ b/data/pokemon/base_stats/araphant.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 110, 100, 120, 46, 54, 60 + ; hp atk def spd sat sdf + + db NORMAL, STEEL ; type + db 25 ; catch rate + db 224 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/araphant/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/breezeon.asm b/data/pokemon/base_stats/breezeon.asm new file mode 100644 index 0000000..a9c4363 --- /dev/null +++ b/data/pokemon/base_stats/breezeon.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 95, 110, 65, 130, 65, 60 + ; hp atk def spd sat sdf + + db FLYING, FLYING ; type + db 45 ; catch rate + db 196 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 + db 35 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/breezeon/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, CUT, FLY + ; end diff --git a/data/pokemon/base_stats/bunberg.asm b/data/pokemon/base_stats/bunberg.asm new file mode 100644 index 0000000..0ff3047 --- /dev/null +++ b/data/pokemon/base_stats/bunberg.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 80, 50, 90, 80, 100, 100 + ; hp atk def spd sat sdf + + db ICE, GRASS ; type + db 50 ; catch rate + db 207 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/bunberg/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/bundra.asm b/data/pokemon/base_stats/bundra.asm new file mode 100644 index 0000000..f909d57 --- /dev/null +++ b/data/pokemon/base_stats/bundra.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 60, 40, 70, 60, 80, 70 + ; hp atk def spd sat sdf + + db ICE, GRASS ; type + db 75 ; catch rate + db 160 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/bundra/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/bundrake.asm b/data/pokemon/base_stats/bundrake.asm new file mode 100644 index 0000000..5b276c8 --- /dev/null +++ b/data/pokemon/base_stats/bundrake.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 80, 50, 100, 70, 110, 90 + ; hp atk def spd sat sdf + + db WATER, GRASS ; type + db 50 ; catch rate + db 207 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/bundra/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/bunice.asm b/data/pokemon/base_stats/bunice.asm new file mode 100644 index 0000000..5151a37 --- /dev/null +++ b/data/pokemon/base_stats/bunice.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 40, 25, 50, 40, 60, 55 + ; hp atk def spd sat sdf + + db ICE, ICE ; type + db 225 ; catch rate + db 78 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/bunice/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/drillusk.asm b/data/pokemon/base_stats/drillusk.asm new file mode 100644 index 0000000..9f16791 --- /dev/null +++ b/data/pokemon/base_stats/drillusk.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 75, 90, 85, 90, 105, 65 + ; hp atk def spd sat sdf + + db WATER, GROUND ; type + db 45 ; catch rate ; PLACEHOLDER + db 99 ; base exp ; PLACEHOLDER + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/drillusk/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER + dn EGG_WATER_3, EGG_WATER_3 ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/evolotto.asm b/data/pokemon/base_stats/evolotto.asm new file mode 100644 index 0000000..b53d3e8 --- /dev/null +++ b/data/pokemon/base_stats/evolotto.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 30, 30, 30, 30, 30, 30 + ; hp atk def spd sat sdf + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 64 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/evolotto/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups + + ; tm/hm learnset + tmhm HIDDEN_POWER + ; end diff --git a/data/pokemon/base_stats/gliscor.asm b/data/pokemon/base_stats/gliscor.asm new file mode 100644 index 0000000..cf49959 --- /dev/null +++ b/data/pokemon/base_stats/gliscor.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 75, 95, 125, 95, 45, 75 + ; hp atk def spd sat sdf + + db GROUND, FLYING ; type + db 30 ; catch rate + db 192 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/gliscor/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH + ; end diff --git a/data/pokemon/base_stats/gorillaimo.asm b/data/pokemon/base_stats/gorillaimo.asm new file mode 100644 index 0000000..67f5a40 --- /dev/null +++ b/data/pokemon/base_stats/gorillaimo.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 130, 100, 75, 65, 80, 40 + ; hp atk def spd sat sdf + + db NORMAL, FIGHTING ; type + db 45 ; catch rate + db 185 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/gorillaimo/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, THUNDERPUNCH, DETECT, REST, ATTRACT, SURF, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/inoshika.asm b/data/pokemon/base_stats/inoshika.asm index f51278f..b33ba20 100644 --- a/data/pokemon/base_stats/inoshika.asm +++ b/data/pokemon/base_stats/inoshika.asm @@ -14,7 +14,7 @@ INCBIN "gfx/pokemon/inoshika/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER - dn EGG_NONE, EGG_NONE ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, BLIZZARD, THUNDER, PSYCHIC_M, SHADOW_BALL, FIRE_BLAST, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/mawtle.asm b/data/pokemon/base_stats/mawtle.asm new file mode 100644 index 0000000..09cef39 --- /dev/null +++ b/data/pokemon/base_stats/mawtle.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 80, 80, 115, 75, 95, 65 + ; hp atk def spd sat sdf + + db WATER, DARK ; type + db 25 ; catch rate + db 129 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/mawtle/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER + dn EGG_WATER_1, EGG_MONSTER ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, CUT, SURF, STRENGTH, WHIRLPOOL + ; end diff --git a/data/pokemon/base_stats/pixytop.asm b/data/pokemon/base_stats/pixytop.asm new file mode 100644 index 0000000..0b1274c --- /dev/null +++ b/data/pokemon/base_stats/pixytop.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 65, 110, 75, 100, 85, 75 + ; hp atk def spd sat sdf + + db FAIRY, FIGHTING ; type + db 25 ; catch rate + db 129 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/pixytop/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER + dn EGG_NONE, EGG_NONE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH + ; end diff --git a/data/pokemon/base_stats/porybit.asm b/data/pokemon/base_stats/porybit.asm new file mode 100644 index 0000000..ace27ed --- /dev/null +++ b/data/pokemon/base_stats/porybit.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 48, 48, 48, 32, 64, 64 + ; hp atk def spd sat sdf + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 128 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/porybit/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups + + ; tm/hm learnset + tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/sailwing.asm b/data/pokemon/base_stats/sailwing.asm new file mode 100644 index 0000000..1340c63 --- /dev/null +++ b/data/pokemon/base_stats/sailwing.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 70, 75, 50, 115, 95, 60 + ; hp atk def spd sat sdf + + db WATER, FLYING ; type + db 75 ; catch rate + db 78 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/sailwing/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_WATER_2 ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, FLY, SURF, WHIRLPOOL, WATERFALL + ; end diff --git a/data/pokemon/base_stats/snuzzles.asm b/data/pokemon/base_stats/snuzzles.asm new file mode 100644 index 0000000..e9952a6 --- /dev/null +++ b/data/pokemon/base_stats/snuzzles.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 60, 85, 75, 90, 95, 60 + ; hp atk def spd sat sdf + + db FAIRY, FIRE ; type + db 45 ; catch rate ; PLACEHOLDER + db 99 ; base exp ; PLACEHOLDER + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/snuzzles/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER + dn EGG_FAIRY, EGG_FAIRY ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FLASH, FLAMETHROWER + ; end diff --git a/data/pokemon/base_stats/trampel.asm b/data/pokemon/base_stats/trampel.asm index 4c31579..e9dacf4 100644 --- a/data/pokemon/base_stats/trampel.asm +++ b/data/pokemon/base_stats/trampel.asm @@ -17,5 +17,5 @@ dn EGG_MONSTER, EGG_GROUND ; egg groups ; tm/hm learnset - tmhm DYNAMIC, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/warfurs.asm b/data/pokemon/base_stats/warfurs.asm new file mode 100644 index 0000000..58a0351 --- /dev/null +++ b/data/pokemon/base_stats/warfurs.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 45, 80, 70, 55, 50, 30 + ; hp atk def spd sat sdf + + db ICE, FIGHTING ; type + db 60 ; catch rate + db 132 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/warfurs/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/wearlycan.asm b/data/pokemon/base_stats/wearlycan.asm new file mode 100644 index 0000000..52d8ba7 --- /dev/null +++ b/data/pokemon/base_stats/wearlycan.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 75, 110, 100, 85, 80, 50 + ; hp atk def spd sat sdf + + db ICE, FIGHTING ; type + db 45 ; catch rate + db 199 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/wearlycan/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/weavile.asm b/data/pokemon/base_stats/weavile.asm new file mode 100644 index 0000000..a1b736c --- /dev/null +++ b/data/pokemon/base_stats/weavile.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 70, 120, 65, 125, 45, 85 + ; hp atk def spd sat sdf + + db DARK, ICE ; type + db 45 ; catch rate + db 199 ; base exp + db NO_ITEM, QUICK_CLAW ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/weavile/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 84c434a..f374f44 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -70,6 +70,8 @@ PokemonCries:: mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_NIDORAN_M, 0, 0 ; WIGLETT (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; WUGTRIO (incomplete) mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN @@ -122,6 +124,7 @@ PokemonCries:: mon_cry CRY_GOLEM, 37, 383 ; CROAKOZUNA mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D mon_cry CRY_SUNFLORA, 13, 256 ; LUXWAN (incomplete - just taken from remoraid for now) + mon_cry CRY_NIDORAN_M, 0, 0 ; DODAERIE (incomplete) mon_cry CRY_DIGLETT, 187, 129 ; DODUO mon_cry CRY_DIGLETT, 153, 160 ; DODRIO mon_cry CRY_SEEL, 136, 320 ; SEEL @@ -156,17 +159,24 @@ PokemonCries:: mon_cry CRY_GOLEM, 255, 383 ; WEEZING mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN mon_cry CRY_RHYDON, 0, 256 ; RHYDON + mon_cry CRY_NIDORAN_M, 0, 0 ; RHYPERIOR (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; HAPPINY (incomplete) mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_NIDORAN_M, 0, 0 ; GORILLAIMO (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; CACTORMUS (incomplete) mon_cry CRY_GOLEM, 50, 140 ; BURGELA, tentative mon_cry CRY_GOLEM, 0, 256 ; TANGELA mon_cry CRY_RAIKOU, 426, 592 ; TANGROWTH mon_cry CRY_GOLEM, -140, 383 ; JUNGELA, tentative + mon_cry CRY_NIDORAN_M, 0, 0 ; RAMOOSE (incomplete) mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN + mon_cry CRY_NIDORAN_M, 0, 0 ; TRAMPEL (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; ARAPHANT (incomplete) mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE + mon_cry CRY_NIDORAN_M, 0, 0 ; SHARPOON (incomplete) mon_cry CRY_CATERPIE, 137, 142 ; ORFRY mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN mon_cry CRY_CATERPIE, 16, 383 ; SEAKING @@ -196,6 +206,7 @@ PokemonCries:: mon_cry CRY_VENONAT, 170, 383 ; VAPOREON mon_cry CRY_VENONAT, 61, 256 ; JOLTEON mon_cry CRY_VENONAT, 16, 160 ; FLAREON + mon_cry CRY_NIDORAN_M, 0, 0 ; PORYBIT (incomplete) mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON mon_cry CRY_GROWLITHE, 240, 129 ; OMANYTE mon_cry CRY_GROWLITHE, 255, 192 ; OMASTAR @@ -205,6 +216,7 @@ PokemonCries:: mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL mon_cry CRY_BULBASAUR, 64, 256 ; DECILLA mon_cry CRY_BULBASAUR, 0, 256 ; GAWARHED + mon_cry CRY_NIDORAN_M, 0, 0 ; OMEGADGE (incomplete) mon_cry CRY_GRIMER, 101, 128 ; MUNCHLAX mon_cry CRY_GRIMER, 85, 129 ; SNORLAX mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO @@ -218,6 +230,8 @@ PokemonCries:: mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE mon_cry CRY_PARAS, 153, 383 ; MEWTWO mon_cry CRY_PARAS, 238, 383 ; MEW + mon_cry CRY_NIDORAN_M, 0, 0 ; MELTAN (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; MELMETAL (incomplete) mon_cry CRY_CHIKORITA, -16, 176 ; CHIKORITA mon_cry CRY_CHIKORITA, -34, 288 ; BAYLEEF mon_cry CRY_CHIKORITA, -183, 512 ; MEGANIUM @@ -289,6 +303,7 @@ PokemonCries:: mon_cry CRY_CHIKORITA, -1, 512 ; LEAFEON mon_cry CRY_AMPHAROS, 63, 592 ; GLACEON mon_cry CRY_NIDOQUEEN, 253, 367 ; SYLVEON + mon_cry CRY_NIDORAN_M, 0, 0 ; BREEZEON (incomplete) mon_cry CRY_MARILL, -31, 384 ; MURKROW mon_cry CRY_NIDORAN_M, 0, 0 ; HONCHKROW (incomplete) mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING @@ -308,6 +323,7 @@ PokemonCries:: mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE mon_cry CRY_NIDORAN_M, 0, 0 ; DUDUNSPARCE (incomplete) mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR + mon_cry CRY_NIDORAN_M, 0, 0 ; GLISCOR (incomplete) mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL @@ -315,11 +331,15 @@ PokemonCries:: mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH mon_cry CRY_NIDORAN_M, 0, 0 ; KAZAPPELIN (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; QWILFATHER (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; SAILWING (incomplete) mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE mon_cry CRY_DUNSPARCE, 640, 208 ; POCKLE mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS mon_cry CRY_WOOPER, 83, 175 ; SNEASEL + mon_cry CRY_NIDORAN_M, 0, 0 ; WEAVILE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; WARFURS (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; WEARLYCAN (incomplete) mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING mon_cry CRY_NIDORAN_M, 0, 0 ; URSALUNA (incomplete) @@ -349,6 +369,10 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 0 ; WYRDEER (incomplete) mon_cry CRY_PICHU, -538, 496 ; SMEARGLE mon_cry CRY_NIDORAN_M, 0, 0 ; GRENMAR + mon_cry CRY_NIDORAN_M, 0, 0 ; BUNICE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; BUNDRA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; BUNBERG (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; BUNDRAKE (incomplete) mon_cry CRY_AIPOM, 44, 264 ; TYROGUE mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM @@ -377,11 +401,16 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 128 ; WISPIRIT mon_cry CRY_NIDORAN_M, 0, 128 ; COATL mon_cry CRY_NIDORAN_M, 0, 128 ; MIMEAR + mon_cry CRY_NIDORAN_M, 0, 0 ; SNUZZLES (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; DRILLUSKS (incomplete) mon_cry CRY_NIDORAN_M, 0, 128 ; INOSHIKA mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT + mon_cry CRY_NIDORAN_M, 0, 0 ; PIXYTOP (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; MAWTLE (incomplete) mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR + mon_cry CRY_NIDORAN_M, 0, 0 ; ALPHALITH (incomplete) mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS mon_cry CRY_NIDORAN_M, 0, 128 ; GREAT_TUSK diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 6bd9cb4..3f0da86 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -64,6 +64,8 @@ VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm" VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm" DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm" DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm" +WiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wiglett.asm" +WugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wugtrio.asm" CoinpurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coinpur.asm" MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm" PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm" @@ -111,6 +113,7 @@ RibbitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ribbito.asm" CroakozunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croakozuna.asm" FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farfetch_d.asm" LuxwanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/luxwan.asm" +DodaeriePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodaerie.asm" DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/doduo.asm" DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodrio.asm" SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seel.asm" @@ -145,18 +148,25 @@ KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/koffing.asm" WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weezing.asm" RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyhorn.asm" RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhydon.asm" +RhyperiorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyperior.asm" HappinyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/happiny.asm" ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chansey.asm" +GorillaimoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorillaimo.asm" +CactormusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cactormus.asm" BurgelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/burgela.asm" TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" TangrowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangrowth.asm" JungelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jungela.asm" +RamoosePokedexEntry:: INCLUDE "data/pokemon/dex_entries/ramoose.asm" KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm" +TrampelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trampel.asm" +AraphantPokedexEntry:: INCLUDE "data/pokemon/dex_entries/araphant.asm" HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm" BlastykePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastyke.asm" BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm" -OrfryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/orfry.asm" +SharpoonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sharpoon.asm" +OrfryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/orfry.asm" GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm" SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm" StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" @@ -186,6 +196,7 @@ EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/eevee.asm" VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vaporeon.asm" JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jolteon.asm" FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flareon.asm" +PorybitPokedexEntry:: INCLUDE "data/pokemon/dex_entries/porybit.asm" PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon.asm" OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/omanyte.asm" OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/omastar.asm" @@ -195,6 +206,7 @@ FeradactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/feradactyl.asm" AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aerodactyl.asm" DecillaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/decilla.asm" GawarhedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gawarhed.asm" +OmegadgePokedexEntry:: INCLUDE "data/pokemon/dex_entries/omegadge.asm" MunchlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/munchlax.asm" SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snorlax.asm" ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/articuno.asm" @@ -208,6 +220,8 @@ DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonair.asm" DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonite.asm" MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mewtwo.asm" MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mew.asm" +MeltanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meltan.asm" +MelmetalPokedexEntry:: INCLUDE "data/pokemon/dex_entries/melmetal.asm" ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chikorita.asm" BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bayleef.asm" MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meganium.asm" @@ -283,6 +297,7 @@ UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm" LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm" GlaceonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/glaceon.asm" SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm" +BreezeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/breezeon.asm" MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm" HonchkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/honchkrow.asm" SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm" @@ -302,6 +317,7 @@ ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/forretress.asm" DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dunsparce.asm" DudunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dudunsparce.asm" GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gligar.asm" +GliscorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gliscor.asm" SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/steelix.asm" SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snubbull.asm" GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbull.asm" @@ -309,11 +325,15 @@ CaretorkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/caretorker.asm" QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfish.asm" KazappelinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kazappelin.asm" QwilfatherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfather.asm" +SailwingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sailwing.asm" ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scizor.asm" ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/shuckle.asm" PocklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/pockle.asm" HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/heracross.asm" SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sneasel.asm" +WeavilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weavile.asm" +WarfursPokedexEntry:: INCLUDE "data/pokemon/dex_entries/warfurs.asm" +WearlycanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wearlycan.asm" TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/teddiursa.asm" UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaring.asm" UrsalunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaluna.asm" @@ -342,6 +362,11 @@ PorygonZPokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon_z.asm" StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stantler.asm" WyrdeerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wyrdeer.asm" SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/smeargle.asm" +GrenmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grenmar.asm" +BunicePokedexEntry:: INCLUDE "data/pokemon/dex_entries/bunice.asm" +BundraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bundra.asm" +BunbergPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bunberg.asm" +BundrakePokedexEntry:: INCLUDE "data/pokemon/dex_entries/bundrake.asm" TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyrogue.asm" HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmontop.asm" SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/smoochum.asm" @@ -350,6 +375,9 @@ ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/elekid.asm" MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magby.asm" MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/miltank.asm" BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm" + +SECTION "Pokedex Entries NEW", ROMX + WaruchuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/waruchu.asm" SoneggPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sonegg.asm" CacawphonyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cacawphony.asm" @@ -370,11 +398,16 @@ KitsenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kitsen.asm" WispiritPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wispirit.asm" CoatlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coatl.asm" MimearPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mimear.asm" +SnuzzlesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snuzzles.asm" +DrilluskPokedexEntry:: INCLUDE "data/pokemon/dex_entries/drillusk.asm" InoshikaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/inoshika.asm" RuddernautPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ruddernaut.asm" +PixytopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pixytop.asm" +MawtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mawtle.asm" XylodonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xylodon.asm" XylofinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xylofin.asm" DokuroarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dokuroar.asm" +AlphalithPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alphalith.asm" ScreamTailPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scream_tail.asm" SandyShocksPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandy_shocks.asm" GreatTuskPokedexEntry:: INCLUDE "data/pokemon/dex_entries/great_tusk.asm" @@ -408,4 +441,4 @@ MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm" -GrenmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grenmar.asm" + diff --git a/data/pokemon/dex_entries/araphant.asm b/data/pokemon/dex_entries/araphant.asm new file mode 100644 index 0000000..333d10d --- /dev/null +++ b/data/pokemon/dex_entries/araphant.asm @@ -0,0 +1,10 @@ + db "TUSK@" ; species name + dw 601, 6320 ; height, weight + + db "Domesticated" + next "TRAMPEL become" + next "this #MON." + + page "It loves to give" + next "people rides" + next "through hot areas." diff --git a/data/pokemon/dex_entries/breezeon.asm b/data/pokemon/dex_entries/breezeon.asm new file mode 100644 index 0000000..f8f3c55 --- /dev/null +++ b/data/pokemon/dex_entries/breezeon.asm @@ -0,0 +1,10 @@ + db "AERIAL@" ; species name + dw 303, 488 ; height, weight + + db "It prances among" + next "the clouds, flying" + next "up to 5 miles" + + page "off the ground." + next "Aviators believe" + next "it to bring luck.@" diff --git a/data/pokemon/dex_entries/bunberg.asm b/data/pokemon/dex_entries/bunberg.asm new file mode 100644 index 0000000..c33bb30 --- /dev/null +++ b/data/pokemon/dex_entries/bunberg.asm @@ -0,0 +1,10 @@ + db "SNOW BUNNY@" ; species name + dw 205, 623 ; height, weight + + db "Lives in tundras." + next "A stampede of" + next "BUNBERG will leave" + + page "even PILOSWINE" + next "buried under the" + next "ensuing avalanche.@" diff --git a/data/pokemon/dex_entries/bundra.asm b/data/pokemon/dex_entries/bundra.asm new file mode 100644 index 0000000..fdd8642 --- /dev/null +++ b/data/pokemon/dex_entries/bundra.asm @@ -0,0 +1,10 @@ + db "SNOW BUNNY@" ; species name + dw 104, 372 ; height, weight + + db "Children love to" + next "sculpt snow in" + next "BUNDRA's image." + + page "Its ears and rosy" + next "cheeks give it the" + next "name Snow PIKACHU." diff --git a/data/pokemon/dex_entries/bundrake.asm b/data/pokemon/dex_entries/bundrake.asm new file mode 100644 index 0000000..49e2177 --- /dev/null +++ b/data/pokemon/dex_entries/bundrake.asm @@ -0,0 +1,10 @@ + db "MANDRAKE@" ; species name + dw 205, 781 ; height, weight + + db "If taken to a hot" + next "region, BUNDRA" + next "will bury them-" + + page "selves and melt" + next "before growing" + next "into a BUNDRAKE.@" diff --git a/data/pokemon/dex_entries/bunice.asm b/data/pokemon/dex_entries/bunice.asm new file mode 100644 index 0000000..29c379d --- /dev/null +++ b/data/pokemon/dex_entries/bunice.asm @@ -0,0 +1,10 @@ + db "SNOWBALL@" ; species name + dw 8, 261 ; height, weight + + db "Sometimes mistaken" + next "for food by" + next "starving tourists," + + page "BUNICE has become" + next "deathly afraid" + next "of humans.@" diff --git a/data/pokemon/dex_entries/cactormus.asm b/data/pokemon/dex_entries/cactormus.asm new file mode 100644 index 0000000..9e39e65 --- /dev/null +++ b/data/pokemon/dex_entries/cactormus.asm @@ -0,0 +1,10 @@ + db "NEEDLE@" ; species name + dw 211, 520 ; height, weight + + db "When attacked," + next "CACTORMUS scatters" + next "SPIKES everywhere." + + page "It then runs away" + next "at speeds of" + next "over 55 mph." diff --git a/data/pokemon/dex_entries/decilla.asm b/data/pokemon/dex_entries/decilla.asm index 7b7713e..7612854 100644 --- a/data/pokemon/dex_entries/decilla.asm +++ b/data/pokemon/dex_entries/decilla.asm @@ -1,5 +1,5 @@ db "SHRIEKING@" ; species name - dw 37, 1400 ; height, weight + dw 307, 1400 ; height, weight db "It's weak, so its" ; this needs rewriting next "mother has to" diff --git a/data/pokemon/dex_entries/dodaerie.asm b/data/pokemon/dex_entries/dodaerie.asm new file mode 100644 index 0000000..e520d82 --- /dev/null +++ b/data/pokemon/dex_entries/dodaerie.asm @@ -0,0 +1,10 @@ + db "NEST@" ; species name + dw 103, 210 ; height, weight + + db "The heads fight" + next "over food. When" + next "it evolves, the" + + page "weakest will merge" + next "into the other" + next "two's body.@" diff --git a/data/pokemon/dex_entries/drillusk.asm b/data/pokemon/dex_entries/drillusk.asm new file mode 100644 index 0000000..20b8399 --- /dev/null +++ b/data/pokemon/dex_entries/drillusk.asm @@ -0,0 +1,10 @@ + db "INK@" ; species name + dw 304, 1375 ; height, weight - temp + + db "It bores holes in" + next "the seabed, lying" + next "in wait. When it" + + page "spots prey, it" + next "shoots out to grab" + next "and devour them.@" diff --git a/data/pokemon/dex_entries/evolotto.asm b/data/pokemon/dex_entries/evolotto.asm new file mode 100644 index 0000000..09b1625 --- /dev/null +++ b/data/pokemon/dex_entries/evolotto.asm @@ -0,0 +1,10 @@ + db "LOTTERY@" ; species name + dw 104, 80 ; height, weight + + db "Only responds to" + next "sound and light." + next "How it manipula-" + + page "tes its body is" + next "a common resea-" + next "rch topic.@" diff --git a/data/pokemon/dex_entries/gawarhed.asm b/data/pokemon/dex_entries/gawarhed.asm index 8285d33..f5b58f5 100644 --- a/data/pokemon/dex_entries/gawarhed.asm +++ b/data/pokemon/dex_entries/gawarhed.asm @@ -1,5 +1,5 @@ db "CALAMITY@" ; species name - dw 82, 6900 ; height, weight + dw 802, 6900 ; height, weight db "Research is being" next "conducted into" diff --git a/data/pokemon/dex_entries/gliscor.asm b/data/pokemon/dex_entries/gliscor.asm new file mode 100644 index 0000000..0ef4626 --- /dev/null +++ b/data/pokemon/dex_entries/gliscor.asm @@ -0,0 +1,10 @@ + db "FNGSCORPIO@" ; species name + dw 607, 937 ; height, weight + + db "Feeding on the" + next "blood of various" + next "#MON species" + + page "has made it" + next "uniquely resistant" + next "to many poisons.@" diff --git a/data/pokemon/dex_entries/gorillaimo.asm b/data/pokemon/dex_entries/gorillaimo.asm new file mode 100644 index 0000000..c33dac5 --- /dev/null +++ b/data/pokemon/dex_entries/gorillaimo.asm @@ -0,0 +1,10 @@ + db "GREAT APE@" ; species name + dw 711, 4080 ; height, weight + + db "Hats created by" + next "GORILLAIMO often" + next "sell for a great" + + page "sum to collectors." + next "Poaching has thus" + next "greatly increased." ; Reference to Congo, a famous chimp artist born in the 1950s. diff --git a/data/pokemon/dex_entries/mawtle.asm b/data/pokemon/dex_entries/mawtle.asm new file mode 100644 index 0000000..2ea7571 --- /dev/null +++ b/data/pokemon/dex_entries/mawtle.asm @@ -0,0 +1,10 @@ + db "ARCHELON@" ; species name + dw 503, 1997 ; height, weight + + db "MAWTLE lures prey" + next "to its lair by" + next "seeming defeated," + + page "then CRUNCHes down" + next "and drags them" + next "into the depths.@" \ No newline at end of file diff --git a/data/pokemon/dex_entries/melmetal.asm b/data/pokemon/dex_entries/melmetal.asm new file mode 100644 index 0000000..f8d027f --- /dev/null +++ b/data/pokemon/dex_entries/melmetal.asm @@ -0,0 +1,10 @@ + db "HEX NUT@" ; species name + dw 802, 17637 ; height, weight + + db "Once worshipped as" + next "a god, it was" + next "split apart and" + + page "sealed away. Its" + next "magnetic field is" + next "intensely strong.@" ; References Pokemon GO lore & Magnet Pull ability diff --git a/data/pokemon/dex_entries/meltan.asm b/data/pokemon/dex_entries/meltan.asm new file mode 100644 index 0000000..4bf5c2a --- /dev/null +++ b/data/pokemon/dex_entries/meltan.asm @@ -0,0 +1,10 @@ + db "HEX NUT@" ; species name + dw 8, 176 ; height, weight + + db "Packs of MELTAN" + next "are found around" + next "the globe, packed" + + page "into MYSTERY BOXs." + next "They seek to be" + next "whole once more.@" ; References Pokemon GO as a whole, as well as some obscure lore. Cont. in Melmetal's. diff --git a/data/pokemon/dex_entries/omegadge.asm b/data/pokemon/dex_entries/omegadge.asm new file mode 100644 index 0000000..1a82580 --- /dev/null +++ b/data/pokemon/dex_entries/omegadge.asm @@ -0,0 +1,10 @@ + db "ARTIFICIAL@" ; species name + dw 806, 8260 ; height, weight + + db "It was built by" + next "SILPH CO. to fight" + next "one of the last" + + page "GAWARHED. Recent" + next "upgrades have" + next "fixed many issues." diff --git a/data/pokemon/dex_entries/pixytop.asm b/data/pokemon/dex_entries/pixytop.asm new file mode 100644 index 0000000..e5ca340 --- /dev/null +++ b/data/pokemon/dex_entries/pixytop.asm @@ -0,0 +1,10 @@ + db "SPINTOP@" ; species name + dw 407, 1060 ; height, weight + + db "On the night of" + next "the full moon, it" + next "interrupts groups" + + page "of CLEFAIRY with" + next "vicious kicks," + next "laughing wildly.@" diff --git a/data/pokemon/dex_entries/porybit.asm b/data/pokemon/dex_entries/porybit.asm index fc6bf2a..fee295e 100644 --- a/data/pokemon/dex_entries/porybit.asm +++ b/data/pokemon/dex_entries/porybit.asm @@ -1,10 +1,10 @@ db "PIXEL@" ; species name dw 100, 2 ; height, weight - db "Believed to be a" - next "prototype form of" - next "PORYGON. Its two-" + db "The graphical" + next "precursor to" + next "PORYGON. It exists" - page "dimensional body" - next "makes it a very" - next "unique species.@" ; can definitely be improved somehow + page "as a 2D object in" + next "3D space through" + next "unknown means." diff --git a/data/pokemon/dex_entries/ramoose.asm b/data/pokemon/dex_entries/ramoose.asm new file mode 100644 index 0000000..9b38df6 --- /dev/null +++ b/data/pokemon/dex_entries/ramoose.asm @@ -0,0 +1,10 @@ + db "BIG HORN@" ; species name + dw 411, 1230 ; height, weight + + db "It was pushed out" + next "of its natural" + next "habitat due to the" + + page "overpopulation" + next "of STANTLER in the" + next "forests of JOHTO.@" diff --git a/data/pokemon/dex_entries/rhyperior.asm b/data/pokemon/dex_entries/rhyperior.asm new file mode 100644 index 0000000..4628d91 --- /dev/null +++ b/data/pokemon/dex_entries/rhyperior.asm @@ -0,0 +1,10 @@ + db "DRILL@" ; species name + dw 710, 6235 ; height, weight + + db "Evolution has" + next "shrunk its brain." + next "Due to this, it" + + page "is prone to fits" + next "of rage that can" + next "level mountains.@" diff --git a/data/pokemon/dex_entries/sailwing.asm b/data/pokemon/dex_entries/sailwing.asm new file mode 100644 index 0000000..a8db6dd --- /dev/null +++ b/data/pokemon/dex_entries/sailwing.asm @@ -0,0 +1,10 @@ + db "FLYING DOVE@" ; species name + dw 208, 522 ; height, weight + + db "Loves leaping from" + next "the ocean to steal" + next "from beachgoers." + + page "Despite its sharp" + next "talons, it's poor" + next "at catching prey.@" diff --git a/data/pokemon/dex_entries/sharpoon.asm b/data/pokemon/dex_entries/sharpoon.asm new file mode 100644 index 0000000..8814d63 --- /dev/null +++ b/data/pokemon/dex_entries/sharpoon.asm @@ -0,0 +1,10 @@ + db "IRON HORN@" ; species name + dw 1102, 4220 ; height, weight - placeholder + + db "Major trade routes" + next "must be planned" + next "around SHARPOON" + + page "migration, or else" + next "the ships will be" + next "torn to shreds.@" diff --git a/data/pokemon/dex_entries/snuzzles.asm b/data/pokemon/dex_entries/snuzzles.asm new file mode 100644 index 0000000..11acc76 --- /dev/null +++ b/data/pokemon/dex_entries/snuzzles.asm @@ -0,0 +1,10 @@ + db "PUPPYDOG@" ; species name + dw 208, 192 ; height, weight + + db "It was created to" + next "be a mascot for a" + next "department store." + + page "The boss' values" + next "influenced its" + next "conniving nature.@" diff --git a/data/pokemon/dex_entries/trampel.asm b/data/pokemon/dex_entries/trampel.asm new file mode 100644 index 0000000..19f541b --- /dev/null +++ b/data/pokemon/dex_entries/trampel.asm @@ -0,0 +1,10 @@ + db "TUSK@" ; species name + dw 707, 4170 ; height, weight + + db "From overhunting," + next "its tusks have be-" + next "come smaller over" + + page "time. It often" + next "brawls with GORO-" + next "CHU and DONPHAN.@" diff --git a/data/pokemon/dex_entries/warfurs.asm b/data/pokemon/dex_entries/warfurs.asm new file mode 100644 index 0000000..75c6a79 --- /dev/null +++ b/data/pokemon/dex_entries/warfurs.asm @@ -0,0 +1,10 @@ + db "WOLFSKIN@" ; species name + dw 206, 736 ; height, weight + + db "HIKERs who see" + next "the glowing eyes" + next "of WARFURS late" + + page "at night may soon" + next "meet with a" + next "terrible fate.@" diff --git a/data/pokemon/dex_entries/wearlycan.asm b/data/pokemon/dex_entries/wearlycan.asm new file mode 100644 index 0000000..de06e0b --- /dev/null +++ b/data/pokemon/dex_entries/wearlycan.asm @@ -0,0 +1,10 @@ + db "WOLFSKIN@" ; species name + dw 508, 2318 ; height, weight + + db "It hunts #MON" + next "with others of its" + next "kind. The one" + + page "wearing the thick-" + next "est pelt is the" + next "pack's leader.@" diff --git a/data/pokemon/dex_entries/weavile.asm b/data/pokemon/dex_entries/weavile.asm new file mode 100644 index 0000000..541a509 --- /dev/null +++ b/data/pokemon/dex_entries/weavile.asm @@ -0,0 +1,10 @@ + db "SHARP CLAW@" ; species name + dw 307, 750 ; height, weight + + db "Cuts from WEAVILE" + next "can cause frost-" + next "bite. It leaves" + + page "marks on trees to" + next "communicate with" + next "its pack.@" diff --git a/data/pokemon/dex_entries/wiglett.asm b/data/pokemon/dex_entries/wiglett.asm new file mode 100644 index 0000000..63fa8dd --- /dev/null +++ b/data/pokemon/dex_entries/wiglett.asm @@ -0,0 +1,10 @@ + db "GARDEN EEL@" ; species name + dw 311, 40 ; height, weight + + db "In order to hide" + next "from predators," + next "it can dive at" + + page "speeds of up to" + next "300,000,000 m/s" + next "into the seafloor." ; Gary states Digletts can burrow into the earth at the speed of light, why not? diff --git a/data/pokemon/dex_entries/wugtrio.asm b/data/pokemon/dex_entries/wugtrio.asm new file mode 100644 index 0000000..a4b4479 --- /dev/null +++ b/data/pokemon/dex_entries/wugtrio.asm @@ -0,0 +1,10 @@ + db "GARDEN EEL@" ; species name + dw 311, 119 ; height, weight + + db "Its predatory nat-" + next "ure makes it very" + next "dangerous to swim-" + + page "mers and fishers." + next "Warnings are found" + next "by WUGTRIO nests.@" ; They're DANGEROUS. diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 74b13d5..a9b24c6 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -65,6 +65,8 @@ PokedexDataPointerTable: dba VenomothPokedexEntry dba DiglettPokedexEntry dba DugtrioPokedexEntry + dba WiglettPokedexEntry + dba WugtrioPokedexEntry dba CoinpurPokedexEntry dba MeowthPokedexEntry dba PersianPokedexEntry @@ -117,6 +119,7 @@ PokedexDataPointerTable: dba CroakozunaPokedexEntry dba FarfetchDPokedexEntry dba LuxwanPokedexEntry + dba DodaeriePokedexEntry dba DoduoPokedexEntry dba DodrioPokedexEntry dba SeelPokedexEntry @@ -151,17 +154,24 @@ PokedexDataPointerTable: dba WeezingPokedexEntry dba RhyhornPokedexEntry dba RhydonPokedexEntry + dba RhyperiorPokedexEntry dba HappinyPokedexEntry dba ChanseyPokedexEntry + dba GorillaimoPokedexEntry + dba CactormusPokedexEntry dba BurgelaPokedexEntry dba TangelaPokedexEntry dba TangrowthPokedexEntry dba JungelaPokedexEntry + dba RamoosePokedexEntry dba KangaskhanPokedexEntry + dba TrampelPokedexEntry + dba AraphantPokedexEntry dba HorseaPokedexEntry dba SeadraPokedexEntry dba BlastykePokedexEntry dba BlastoisePokedexEntry + dba SharpoonPokedexEntry dba OrfryPokedexEntry dba GoldeenPokedexEntry dba SeakingPokedexEntry @@ -191,6 +201,7 @@ PokedexDataPointerTable: dba VaporeonPokedexEntry dba JolteonPokedexEntry dba FlareonPokedexEntry + dba PorybitPokedexEntry dba PorygonPokedexEntry dba OmanytePokedexEntry dba OmastarPokedexEntry @@ -200,6 +211,7 @@ PokedexDataPointerTable: dba AerodactylPokedexEntry dba DecillaPokedexEntry dba GawarhedPokedexEntry + dba OmegadgePokedexEntry dba MunchlaxPokedexEntry dba SnorlaxPokedexEntry dba ArticunoPokedexEntry @@ -213,6 +225,8 @@ PokedexDataPointerTable: dba DragonitePokedexEntry dba MewtwoPokedexEntry dba MewPokedexEntry + dba MeltanPokedexEntry + dba MelmetalPokedexEntry dba ChikoritaPokedexEntry dba BayleefPokedexEntry dba MeganiumPokedexEntry @@ -284,6 +298,7 @@ PokedexDataPointerTable: dba LeafeonPokedexEntry dba GlaceonPokedexEntry dba SylveonPokedexEntry + dba BreezeonPokedexEntry dba MurkrowPokedexEntry dba HonchkrowPokedexEntry dba SlowkingPokedexEntry @@ -303,6 +318,7 @@ PokedexDataPointerTable: dba DunsparcePokedexEntry dba DudunsparcePokedexEntry dba GligarPokedexEntry + dba GliscorPokedexEntry dba SteelixPokedexEntry dba SnubbullPokedexEntry dba GranbullPokedexEntry @@ -310,11 +326,15 @@ PokedexDataPointerTable: dba QwilfishPokedexEntry dba KazappelinPokedexEntry dba QwilfatherPokedexEntry + dba SailwingPokedexEntry dba ScizorPokedexEntry dba ShucklePokedexEntry dba PocklePokedexEntry dba HeracrossPokedexEntry dba SneaselPokedexEntry + dba WeavilePokedexEntry + dba WarfursPokedexEntry + dba WearlycanPokedexEntry dba TeddiursaPokedexEntry dba UrsaringPokedexEntry dba UrsalunaPokedexEntry @@ -344,6 +364,10 @@ PokedexDataPointerTable: dba WyrdeerPokedexEntry dba SmearglePokedexEntry dba GrenmarPokedexEntry + dba BunicePokedexEntry + dba BundraPokedexEntry + dba BunbergPokedexEntry + dba BundrakePokedexEntry dba TyroguePokedexEntry dba HitmontopPokedexEntry dba SmoochumPokedexEntry @@ -372,11 +396,16 @@ PokedexDataPointerTable: dba WispiritPokedexEntry dba CoatlPokedexEntry dba MimearPokedexEntry + dba SnuzzlesPokedexEntry + dba DrilluskPokedexEntry dba InoshikaPokedexEntry dba RuddernautPokedexEntry + dba PixytopPokedexEntry + dba MawtlePokedexEntry dba XylodonPokedexEntry dba XylofinPokedexEntry dba DokuroarPokedexEntry + dba AlphalithPokedexEntry dba ScreamTailPokedexEntry dba SandyShocksPokedexEntry dba GreatTuskPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 90ee386..2201363 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -7,12 +7,13 @@ AlphabeticalPokedexOrder: dw AERODACTYL dw AIPOM dw ALAKAZAM - dw TANOBI + dw ALPHALITH dw AMBIPOM dw AMPHAROS dw ANGORE dw ANNIHILAPE dw ARBOK + dw ARAPHANT dw ARCANINE dw ARIADOS dw ARTICUNO @@ -33,12 +34,18 @@ AlphabeticalPokedexOrder: dw BLISSEY dw BLOTTLE dw BONSLY + dw BREEZEON dw BRUINOUS dw BULBASAUR + dw BUNBERG + dw BUNDRA + dw BUNDRAKE + dw BUNICE dw BURGELA dw BUTTERFREE dw BUU dw CACAWPHONY + dw CACTORMUS dw CARAPTHOR dw CARETORKER dw CATERPIE @@ -71,6 +78,7 @@ AlphabeticalPokedexOrder: dw DIGLETT dw DISTURBAN dw DITTO + dw DODAERIE dw DODRIO dw DODUO dw DOKUROAR @@ -79,6 +87,7 @@ AlphabeticalPokedexOrder: dw DRAGONAIR dw DRAGONITE dw DRATINI + dw DRILLUSK dw DROWZEE dw DUDUNSPARCE dw DUGTRIO @@ -118,11 +127,13 @@ AlphabeticalPokedexOrder: dw GIRAFARIG dw GLACEON dw GLIGAR + dw GLISCOR dw GLOOM dw GOLBAT dw GOLDEEN dw GOLDUCK dw GOLEM + dw GORILLAIMO dw GOROCHU dw GOROTORA dw GOUGING_FIRE @@ -215,7 +226,10 @@ AlphabeticalPokedexOrder: dw MAREEP dw MARILL dw MAROWAK + dw MAWTLE dw MEGANIUM + dw MELMETAL + dw MELTAN dw MEOWTH dw METAPOD dw MEW @@ -248,6 +262,7 @@ AlphabeticalPokedexOrder: dw ODDISH dw OMANYTE dw OMASTAR + dw OMEGADGE dw ONIX dw ONIYANMA dw ORFRY @@ -268,12 +283,14 @@ AlphabeticalPokedexOrder: dw PILOSWINE dw PINECO dw PINSIR + dw PIXYTOP dw POCKLE dw POLITOED dw POLIWAG dw POLIWHIRL dw POLIWRATH dw PONYTA + dw PORYBIT dw PORYGON dw PORYGON_Z dw PORYGON2 @@ -292,6 +309,7 @@ AlphabeticalPokedexOrder: dw RAICHU dw RAITORA dw RAIKOU + dw RAMOOSE dw RAPIDASH dw RATICATE dw RATTATA @@ -299,10 +317,11 @@ AlphabeticalPokedexOrder: dw REROAD dw RHYDON dw RHYHORN - ; dw RHYPERIOR + dw RHYPERIOR dw RIBBITO dw RUDDERNAUT dw SAKURAZE + dw SAILWING dw SANDSHREW dw SANDSLASH dw SANDY_SHOCKS @@ -313,6 +332,7 @@ AlphabeticalPokedexOrder: dw SEAKING dw SEEL dw SENTRET + dw SHARPOON dw SHELLDER dw SHUCKLE dw SKARMORY @@ -327,6 +347,7 @@ AlphabeticalPokedexOrder: dw SNEASEL dw SNORLAX dw SNUBBULL + dw SNUZZLES dw SONEGG dw SPEAROW dw SPINARAK @@ -347,6 +368,7 @@ AlphabeticalPokedexOrder: dw SYLVEON dw TANGELA dw TANGROWTH + dw TANOBI dw TAUROS dw TEDDIURSA dw TENTACOOL @@ -360,6 +382,7 @@ AlphabeticalPokedexOrder: dw TONQUITO dw TOTARTLE dw TOTODILE + dw TRAMPEL dw TREBIR dw TRICULES dw TRUSTAN @@ -380,16 +403,21 @@ AlphabeticalPokedexOrder: dw VULPIII dw VULPIX dw WALKING_WAKE + dw WARFURS dw WARTORTLE dw WARUCHU + dw WEARLYCAN + dw WEAVILE dw WEEDLE dw WEEPINBELL dw WEEZING dw WEIRDUCK dw WIGGLYTUFF + dw WIGLETT dw WISPIRIT dw WOBBUFFET dw WOOPER + dw WUGTRIO dw WYNAUT dw WYRDEER dw XATU diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 90886e4..9815236 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -180,6 +180,8 @@ NewPokedexOrder: dw AZUMARILL dw DIGLETT dw DUGTRIO + dw WIGLETT + dw WUGTRIO dw MANKEY dw PRIMEAPE dw ANNIHILAPE @@ -219,6 +221,10 @@ NewPokedexOrder: dw MR__MIME dw SMEARGLE dw GRENMAR + dw BUNICE + dw BUNDRA + dw BUNBERG + dw BUNDRAKE dw FARFETCH_D dw LUXWAN dw NATU @@ -229,6 +235,7 @@ NewPokedexOrder: dw QWILFISH dw KAZAPPELIN dw QWILFATHER + dw SAILWING dw TENTACOOL dw TENTACRUEL dw TOEDSCOOL @@ -264,6 +271,7 @@ NewPokedexOrder: dw TANGELA dw TANGROWTH dw JUNGELA + dw RAMOOSE dw EEVEE dw VAPOREON dw JOLTEON @@ -273,12 +281,15 @@ NewPokedexOrder: dw LEAFEON dw GLACEON dw SYLVEON + dw BREEZEON dw HORSEA dw SEADRA dw KINGDRA dw BLASTYKE dw BLASTOISE + dw SHARPOON dw GLIGAR + dw GLISCOR dw DELIBIRD dw SWINUB dw PILOSWINE @@ -292,6 +303,7 @@ NewPokedexOrder: dw MANTYKE dw MANTINE dw SKARMORY + dw DODAERIE dw DODUO dw DODRIO dw KOLTA @@ -302,8 +314,11 @@ NewPokedexOrder: dw MAROWAK dw GUARDIA dw KANGASKHAN + dw TRAMPEL + dw ARAPHANT dw RHYHORN dw RHYDON + dw RHYPERIOR dw MURKROW dw HONCHKROW dw HOUNDOUR @@ -311,16 +326,22 @@ NewPokedexOrder: dw SLUGMA dw MAGCARGO dw SNEASEL + dw WEAVILE + dw WARFURS + dw WEARLYCAN dw MISDREAVUS dw MISMAGIUS dw STROMEN dw PHANDARIN + dw PORYBIT dw PORYGON dw PORYGON2 dw PORYGON_Z dw HAPPINY dw CHANSEY dw BLISSEY + dw GORILLAIMO + dw CACTORMUS dw WARUCHU dw SONEGG dw CACAWPHONY @@ -341,11 +362,16 @@ NewPokedexOrder: dw WISPIRIT dw COATL dw MIMEAR + dw SNUZZLES + dw DRILLUSK dw INOSHIKA dw RUDDERNAUT + dw PIXYTOP + dw MAWTLE dw XYLODON dw XYLOFIN dw DOKUROAR + dw ALPHALITH dw LAPRAS dw OMANYTE dw OMASTAR @@ -355,6 +381,7 @@ NewPokedexOrder: dw AERODACTYL dw DECILLA dw GAWARHED + dw OMEGADGE dw MUNCHLAX dw SNORLAX dw BULBASAUR @@ -398,5 +425,7 @@ NewPokedexOrder: dw HYOSHU_YIN dw MEWTWO dw MEW + dw MELTAN + dw MELMETAL dw CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index f4f18e1..96c9ef9 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -72,6 +72,7 @@ EggMovePointers2:: dw NoEggMoves2 ; Leafeon dw NoEggMoves2 ; Glaceon dw NoEggMoves2 ; Sylveon + dw NoEggMoves2 ; Breezeon dw MurkrowEggMoves dw NoEggMoves2 ; Honchkrow dw NoEggMoves2 @@ -91,6 +92,7 @@ EggMovePointers2:: dw DunsparceEggMoves dw NoEggMoves2 ; Dudunsparce dw GligarEggMoves + dw NoEggMoves2 ; Gliscor dw NoEggMoves2 dw SnubbullEggMoves dw NoEggMoves2 @@ -98,11 +100,15 @@ EggMovePointers2:: dw QwilfishEggMoves dw NoEggMoves2 ; Kazappelin dw NoEggMoves2 ; Qwilfather + dw SailwingEggMoves dw NoEggMoves2 dw ShuckleEggMoves dw NoEggMoves2 dw HeracrossEggMoves dw SneaselEggMoves + dw NoEggMoves2 ; Weavile + dw WarfursEggMoves + dw NoEggMoves2 ; Wearlycan dw TeddiursaEggMoves dw NoEggMoves2 dw NoEggMoves2 ; Ursaluna @@ -132,6 +138,10 @@ EggMovePointers2:: dw NoEggMoves2 ; Wyrdeer dw NoEggMoves2 dw GrenmarEggMoves + dw BuniceEggMoves + dw NoEggMoves2 ; Bundra + dw NoEggMoves2 ; Bunberg + dw NoEggMoves2 ; Bundrake dw TyrogueEggMoves dw NoEggMoves2 dw SmoochumEggMoves @@ -161,11 +171,16 @@ EggMovePointers2:: dw WispiritEggMoves dw CoatlEggMoves dw MimearEggMoves + dw SnuzzlesEggMoves + dw DrilluskEggMoves dw InoshikaEggMoves dw RuddernautEggMoves + dw PixytopEggMoves + dw MawtleEggMoves dw XylodonEggMoves dw NoEggMoves2 dw NoEggMoves2 ; Dokuroar + dw NoEggMoves2 ; Alphalith dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 @@ -487,6 +502,12 @@ QwilfishEggMoves: dw BUBBLEBEAM dw SUPERSONIC dw -1 ; end + +SailwingEggMoves: + dw AGILITY + dw AURORA_BEAM + dw GUST + dw TWISTER ShuckleEggMoves: dw SWEET_SCENT @@ -509,6 +530,15 @@ SneaselEggMoves: dw REFLECT dw BITE dw -1 ; end + +WarfursEggMoves: + dw BEAT_UP + dw BITE + dw CRUNCH + dw DIZZY_PUNCH + dw PURSUIT + dw RAGE + dw -1 ; end TeddiursaEggMoves: dw CRUNCH @@ -611,6 +641,14 @@ GrenmarEggMoves: dw SING dw SLAM dw -1 + +BuniceEggMoves: + dw CHARM + dw LIGHT_SCREEN + dw REFLECT + dw PETAL_DANCE + dw PRESENT + dw -1 ; end TyrogueEggMoves: dw RAPID_SPIN @@ -762,6 +800,18 @@ MimearEggMoves: dw SWEET_KISS dw BITE dw -1 ;end + +SnuzzlesEggMoves: + dw FURY_ATTACK + dw PRESENT + dw SWEET_KISS + dw -1 ; end + +DrilluskEggMoves: + dw FURY_ATTACK + dw SAND_ATTACK + dw FISSURE + dw -1 ; end InoshikaEggMoves: dw FURY_ATTACK @@ -777,6 +827,20 @@ RuddernautEggMoves: dw PSYBEAM dw SAFEGUARD dw -1 ;end + +PixytopEggMoves: + dw DRAINING_KISS + dw REVERSAL + dw MEGA_KICK + dw SONICBOOM + dw -1 ; end + +MawtleEggMoves: + dw PURSUIT + dw BIDE + dw RAPID_SPIN + dw SKULL_BASH + dw -1 ; end XylodonEggMoves: dw BELLY_DRUM diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 806f579..721f602 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -65,6 +65,8 @@ EggMovePointers1: dw NoEggMoves1 dw DiglettEggMoves dw NoEggMoves1 + dw WiglettEggMoves + dw NoEggMoves1 ; Wugtrio dw CoinpurEggMoves dw NoEggMoves1 dw NoEggMoves1 @@ -117,7 +119,8 @@ EggMovePointers1: dw NoEggMoves1 ; Croakozuna dw FarfetchDEggMoves dw NoEggMoves1 ; Luxwan - dw DoduoEggMoves + dw DodaerieEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw SeelEggMoves dw NoEggMoves1 @@ -151,17 +154,24 @@ EggMovePointers1: dw NoEggMoves1 dw RhyhornEggMoves dw NoEggMoves1 + dw NoEggMoves1 ; Rhyperior dw HappinyEggMoves dw NoEggMoves1 ; Chansey + dw GorillaimoEggMoves + dw CactormusEggMoves dw BurgelaEggMoves ; Burgela dw NoEggMoves1 dw NoEggMoves1 ; Tangrowth dw NoEggMoves1 ; Jungela + dw RamooseEggMoves dw KangaskhanEggMoves + dw TrampelEggMoves + dw NoEggMoves1 ; Araphant dw HorseaEggMoves dw NoEggMoves1 dw BlastykeEggMoves ; Blastyke dw NoEggMoves1 ; Blastoise + dw SharpoonEggMoves dw OrfryEggMoves dw NoEggMoves1 dw NoEggMoves1 @@ -191,6 +201,7 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Porybit dw NoEggMoves1 dw OmanyteEggMoves dw NoEggMoves1 @@ -200,6 +211,7 @@ EggMovePointers1: dw NoEggMoves1 ; Aerodactyl dw DecillaEggMoves dw NoEggMoves1 ; Gawarhed + dw NoEggMoves1 ; Omegadge dw MunchlaxEggMoves ; Munchlax dw NoEggMoves1 ; Should this even exist? dw NoEggMoves1 @@ -213,6 +225,8 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Meltan + dw NoEggMoves1 ; Melmetal .IndirectEnd:: BulbasaurEggMoves: @@ -356,6 +370,14 @@ DiglettEggMoves: dw PURSUIT dw BEAT_UP dw -1 ; end + +WiglettEggMoves: + dw FAINT_ATTACK + dw SCREECH + dw ANCIENTPOWER + dw PURSUIT + dw BEAT_UP + dw -1 ; end CoinpurEggMoves: dw SPITE @@ -504,7 +526,7 @@ FarfetchDEggMoves: dw FLAIL dw -1 ; end -DoduoEggMoves: +DodaerieEggMoves: dw QUICK_ATTACK dw SUPERSONIC dw HAZE @@ -609,6 +631,21 @@ HappinyEggMoves: dw METRONOME dw HEAL_BELL dw -1 ; end + +GorillaimoEggMoves: + dw CROSS_CHOP + dw LICK + dw ROCK_SLIDE + dw THRASH + dw MEGA_PUNCH + dw PRESENT + dw -1 ; end + +CactormusEggMoves: + dw SWORDS_DANCE + dw LEECH_SEED + dw RAPID_SPIN + dw -1 ; end BurgelaEggMoves: dw FLAIL @@ -617,6 +654,14 @@ BurgelaEggMoves: dw REFLECT dw AMNESIA dw -1 ; end + +RamooseEggMoves: + dw QUICK_ATTACK + dw LEECH_SEED + dw STOMP + dw LIGHT_SCREEN + dw REFLECT + dw -1 ; end KangaskhanEggMoves: dw STOMP @@ -626,6 +671,15 @@ KangaskhanEggMoves: dw DISABLE dw MEGAPHONE dw -1 ; end + +TrampelEggMoves: + dw COMET_PUNCH + dw THRASH + dw SCREECH + dw FOCUS_ENERGY + dw FORESIGHT + dw ROCK_SLIDE + dw -1 ; end HorseaEggMoves: dw FLAIL @@ -644,6 +698,12 @@ BlastykeEggMoves: dw FORESIGHT dw FLAIL dw -1 ; end + +SharpoonEggMoves: + dw THRASH + dw AGILITY + dw SWORDS_DANCE + dw -1 ; end OrfryEggMoves: dw PSYBEAM diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index dea440b..acb6d1e 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -4,20 +4,20 @@ EvolutionMoves:: dw NO_MOVE ;VENUSAUR ; 03 dw NO_MOVE ;CHARMANDER ; 04 dw NO_MOVE ;CHARMELEON ; 05 - dw NO_MOVE ;CHARIZARD ; 06 - dw NO_MOVE ;CHARMADA + dw WING_ATTACK ;CHARIZARD ; 06 + dw IRON_TAIL ;CHARMADA dw NO_MOVE ;SQUIRTLE ; 07 dw NO_MOVE ;WARTORTLE ; 08 - dw NO_MOVE ;TOTARTLE ; 09 + dw MEGA_PUNCH ;TOTARTLE ; 09 dw NO_MOVE ;CATERPIE ; 0a dw NO_MOVE ;METAPOD ; 0b - dw NO_MOVE ;BUTTERFREE ; 0c + dw CONFUSION ;BUTTERFREE ; 0c dw NO_MOVE ;WEEDLE ; 0d dw NO_MOVE ;KAKUNA ; 0e - dw NO_MOVE ;BEEDRILL ; 0f + dw FURY_ATTACK ;BEEDRILL ; 0f dw NO_MOVE ;GENTLARVA dw NO_MOVE ;PUPAL - dw NO_MOVE ;CARAPTHOR + dw UPPERCUT ;CARAPTHOR dw NO_MOVE ;KOTORA dw NO_MOVE ;GAOTORA dw NO_MOVE ;GOROTORA @@ -63,6 +63,8 @@ EvolutionMoves:: dw NO_MOVE ;VENOMOTH ; 31 dw NO_MOVE ;DIGLETT ; 32 dw NO_MOVE ;DUGTRIO ; 33 + dw NO_MOVE ;WIGLETT + dw NO_MOVE ;WUGTRIO dw NO_MOVE ;COINPUR dw NO_MOVE ;MEOWTH ; 34 dw NO_MOVE ;PERSIAN ; 35 @@ -80,7 +82,7 @@ EvolutionMoves:: dw NO_MOVE ;POLIWHIRL ; 3d dw NO_MOVE ;POLIWRATH ; 3e dw NO_MOVE ;ABRA ; 3f - dw NO_MOVE ;KADABRA ; 40 + dw CONFUSION ;KADABRA ; 40 dw NO_MOVE ;ALAKAZAM ; 41 dw NO_MOVE ;MACHOP ; 42 dw NO_MOVE ;MACHOKE ; 43 @@ -115,6 +117,7 @@ EvolutionMoves:: dw NO_MOVE ;CROAKOZUNA dw NO_MOVE ;FARFETCH_D ; 53 dw NO_MOVE ;LUXWAN + dw NO_MOVE ;DODAERIE dw NO_MOVE ;DODUO ; 54 dw NO_MOVE ;DODRIO ; 55 dw NO_MOVE ;SEEL ; 56 @@ -140,8 +143,8 @@ EvolutionMoves:: dw NO_MOVE ;CUBONE ; 68 dw NO_MOVE ;MAROWAK ; 69 dw NO_MOVE ;GUARDIA - dw NO_MOVE ;HITMONLEE ; 6a - dw NO_MOVE ;HITMONCHAN ; 6b + dw JUMP_KICK ;HITMONLEE ; 6a + dw MACH_PUNCH ;HITMONCHAN ; 6b dw NO_MOVE ;LICKITUNG ; 6c dw NO_MOVE ;LICKILICKY dw NO_MOVE ;LICKILORD @@ -149,17 +152,24 @@ EvolutionMoves:: dw NO_MOVE ;WEEZING ; 6e dw NO_MOVE ;RHYHORN ; 6f dw NO_MOVE ;RHYDON ; 70 + dw NO_MOVE ;RHYPERIOR dw NO_MOVE ;HAPPINY dw NO_MOVE ;CHANSEY ; 71 + dw NO_MOVE ;GORILLAIMO + dw NO_MOVE ;CACTORMUS dw NO_MOVE ;BURGELA dw NO_MOVE ;TANGELA ; 72 dw NO_MOVE ;TANGROWTH dw NO_MOVE ;JUNGELA + dw NO_MOVE ;RAMOOSE dw NO_MOVE ;KANGASKHAN ; 73 + dw NO_MOVE ;TRAMPEL + dw NO_MOVE ;ARAPHANT dw NO_MOVE ;HORSEA ; 74 dw NO_MOVE ;SEADRA ; 75 dw NO_MOVE ;BLASTYKE dw NO_MOVE ;BLASTOISE + dw NO_MOVE ;SHARPOON dw NO_MOVE ;ORFRY dw NO_MOVE ;GOLDEEN ; 76 dw NO_MOVE ;SEAKING ; 77 @@ -189,6 +199,7 @@ EvolutionMoves:: dw NO_MOVE ;VAPOREON ; 86 dw NO_MOVE ;JOLTEON ; 87 dw NO_MOVE ;FLAREON ; 88 + dw NO_MOVE ;PORYBIT dw NO_MOVE ;PORYGON ; 89 dw NO_MOVE ;OMANYTE ; 8a dw NO_MOVE ;OMASTAR ; 8b @@ -197,7 +208,8 @@ EvolutionMoves:: dw NO_MOVE ;FERADACTYL dw NO_MOVE ;AERODACTYL ; 8e dw NO_MOVE ;DECILLA - dw NO_MOVE ;GAWARHED + dw OUTRAGE ;GAWARHED + dw NO_MOVE ;OMEGADGE dw NO_MOVE ;MUNCHLAX dw NO_MOVE ;SNORLAX ; 8f dw NO_MOVE ;ARTICUNO ; 90 @@ -211,6 +223,8 @@ EvolutionMoves:: dw NO_MOVE ;DRAGONITE ; 95 dw NO_MOVE ;MEWTWO ; 96 dw NO_MOVE ;MEW ; 97 + dw NO_MOVE ;MELTAN + dw THUNDERPUNCH ;MELMETAL dw NO_MOVE ;CHIKORITA ; 98 dw NO_MOVE ;BAYLEEF ; 99 dw NO_MOVE ;MEGANIUM ; 9a @@ -282,6 +296,7 @@ EvolutionMoves:: dw NO_MOVE ;LEAFEON dw NO_MOVE ;GLACEON dw NO_MOVE ;SYLVEON + dw NO_MOVE ;BREEZEON dw NO_MOVE ;MURKROW ; c6 dw NO_MOVE ;HONCHKROW dw NO_MOVE ;SLOWKING ; c7 @@ -301,6 +316,7 @@ EvolutionMoves:: dw NO_MOVE ;DUNSPARCE ; ce dw NO_MOVE ;DUDUNSPARCE dw NO_MOVE ;GLIGAR ; cf + dw NO_MOVE ;GLISCOR dw NO_MOVE ;STEELIX ; d0 dw NO_MOVE ;SNUBBULL ; d1 dw NO_MOVE ;GRANBULL ; d2 @@ -308,11 +324,15 @@ EvolutionMoves:: dw NO_MOVE ;QWILFISH ; d3 dw NO_MOVE ;KAZAPPELIN dw NO_MOVE ;QWILFATHER + dw NO_MOVE ;SAILWING dw NO_MOVE ;SCIZOR ; d4 dw NO_MOVE ;SHUCKLE ; d5 dw NO_MOVE ;POCKLE dw NO_MOVE ;HERACROSS ; d6 dw NO_MOVE ;SNEASEL ; d7 + dw NO_MOVE ;WEAVILE + dw NO_MOVE ;WARFURS + dw NO_MOVE ;WEARLYCAN dw NO_MOVE ;TEDDIURSA ; d8 dw NO_MOVE ;URSARING ; d9 dw NO_MOVE ;URSALUNA @@ -342,8 +362,12 @@ EvolutionMoves:: dw NO_MOVE ;WYRDEER dw NO_MOVE ;SMEARGLE ; eb dw NO_MOVE ;GRENMAR + dw NO_MOVE ;BUNICE + dw NO_MOVE ;BUNDRA + dw NO_MOVE ;BUNBERG + dw NO_MOVE ;BUNDRAKE dw NO_MOVE ;TYROGUE ; ec - dw NO_MOVE ;HITMONTOP ; ed + dw RAPID_SPIN ;HITMONTOP ; ed dw NO_MOVE ;SMOOCHUM ; ee dw NO_MOVE ;ELEBEBI dw NO_MOVE ;ELEKID ; ef @@ -370,11 +394,16 @@ EvolutionMoves:: dw NO_MOVE ;WISPIRIT dw NO_MOVE ;COATL dw NO_MOVE ;MIMEAR + dw NO_MOVE ;SNUZZLES + dw NO_MOVE ;DRILLUSK dw NO_MOVE ;INOSHIKA dw NO_MOVE ;RUDDERNAUT + dw NO_MOVE ;PIXYTOP + dw NO_MOVE ;MAWTLE dw NO_MOVE ;XYLODON dw NO_MOVE ;XYLOFIN dw NO_MOVE ;DOKUROAR + dw NO_MOVE ;ALPHALITH dw NO_MOVE ;SCREAM_TAIL dw NO_MOVE ;SANDY_SHOCKS dw NO_MOVE ;GREAT_TUSK diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index e595e6d..b93db08 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -72,6 +72,7 @@ EvosAttacksPointers2:: dw LeafeonEvosAttacks dw GlaceonEvosAttacks dw SylveonEvosAttacks + dw BreezeonEvosAttacks dw MurkrowEvosAttacks dw HonchkrowEvosAttacks dw SlowkingEvosAttacks @@ -91,6 +92,7 @@ EvosAttacksPointers2:: dw DunsparceEvosAttacks dw DudunsparceEvosAttacks dw GligarEvosAttacks + dw GliscorEvosAttacks dw SteelixEvosAttacks dw SnubbullEvosAttacks dw GranbullEvosAttacks @@ -98,11 +100,15 @@ EvosAttacksPointers2:: dw QwilfishEvosAttacks dw KazappelinEvosAttacks dw QwilfatherEvosAttacks + dw SailwingEvosAttacks dw ScizorEvosAttacks dw ShuckleEvosAttacks dw PockleEvosAttacks dw HeracrossEvosAttacks dw SneaselEvosAttacks + dw WeavileEvosAttacks + dw WarfursEvosAttacks + dw WearlycanEvosAttacks dw TeddiursaEvosAttacks dw UrsaringEvosAttacks dw UrsalunaEvosAttacks @@ -132,6 +138,10 @@ EvosAttacksPointers2:: dw WyrdeerEvosAttacks dw SmeargleEvosAttacks dw GrenmarEvosAttacks + dw BuniceEvosAttacks + dw BundraEvosAttacks + dw BunbergEvosAttacks + dw BundrakeEvosAttacks dw TyrogueEvosAttacks dw HitmontopEvosAttacks dw SmoochumEvosAttacks @@ -160,11 +170,16 @@ EvosAttacksPointers2:: dw WispiritEvosAttacks dw CoatlEvosAttacks dw MimearEvosAttacks + dw SnuzzlesEvosAttacks + dw DrilluskEvosAttacks dw InoshikaEvosAttacks dw RuddernautEvosAttacks + dw PixytopEvosAttacks + dw MawtleEvosAttacks dw XylodonEvosAttacks dw XylofinEvosAttacks dw DokuroarEvosAttacks + dw AlphalithEvosAttacks dw ScreamTailEvosAttacks dw SandyShocksEvosAttacks dw GreatTuskEvosAttacks @@ -1351,6 +1366,22 @@ SylveonEvosAttacks: dbw 47, MOONBLAST ; XY dbw 52, LIGHT_SCREEN db 0 ; no more level-up moves + +BreezeonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 1, FAIRY_WIND + dbw 8, SAND_ATTACK + dbw 16, GUST + dbw 20, WHIRLWIND + dbw 25, QUICK_ATTACK + dbw 30, WING_ATTACK + dbw 36, RAZOR_WIND + dbw 42, SWIFT + dbw 47, LIGHT_SCREEN + dbw 52, EXTREMESPEED + db 0 ; no more level-up moves MurkrowEvosAttacks: dbbw EVOLVE_ITEM, DUSK_STONE, HONCHKROW @@ -1616,6 +1647,22 @@ DudunsparceEvosAttacks: db 0 ; no more level-up moves GligarEvosAttacks: + dbbw EVOLVE_ITEM, MOON_STONE, GLISCOR ; PLACEHOLDER + db 0 ; no more evolutions + dbw 1, POISON_STING + dbw 6, SAND_ATTACK + dbw 12, HARDEN + dbw 18, QUICK_ATTACK + dbw 23, FURY_CUTTER ; HGSS + dbw 28, FAINT_ATTACK + dbw 34, SLASH + dbw 39, SCREECH + dbw 44, SWORDS_DANCE ; HGSS + dbw 49, CROSS_CUTTER + dbw 55, GUILLOTINE + db 0 ; no more level-up moves + +GliscorEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_STING dbw 6, SAND_ATTACK @@ -1752,6 +1799,22 @@ QwilfatherEvosAttacks: dbw 50, HYDRO_PUMP dbw 56, DESTINY_BOND ; FRLG db 0 ; no more level-up moves + +SailwingEvosAttacks: + db 0 ; no more evolutions + dbw 1, WATER_GUN + dbw 1, SCRATCH + dbw 1, SPLASH + dbw 7, FLAIL + dbw 13, WING_ATTACK + dbw 19, FURY_SWIPES + dbw 25, SUPERSONIC + dbw 31, MIST + dbw 37, BOUNCE + dbw 43, TAKE_DOWN + dbw 49, WHIRLWIND + dbw 55, SLASH + db 0 ; no more level-up moves ScizorEvosAttacks: db 0 ; no more evolutions @@ -1813,6 +1876,7 @@ HeracrossEvosAttacks: db 0 ; no more level-up moves SneaselEvosAttacks: + dbbw EVOLVE_ITEM, MOON_STONE, WEAVILE ; PLACEHOLDER db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -1829,6 +1893,60 @@ SneaselEvosAttacks: dbw 59, METAL_CLAW dbw 65, BEAT_UP db 0 ; no more level-up moves + +WeavileEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 6, QUICK_ATTACK + dbw 11, SCREECH + dbw 17, RAZOR_WIND + dbw 23, THIEF + dbw 28, FURY_SWIPES + dbw 34, FAINT_ATTACK + dbw 39, ICY_WIND + dbw 45, PURSUIT + dbw 49, SLASH + dbw 55, AGILITY + dbw 59, METAL_CLAW + dbw 65, BEAT_UP + db 0 ; no more level-up moves + +WarfursEvosAttacks: + dbbw EVOLVE_LEVEL, 24, WEARLYCAN + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 7, POWDER_SNOW + dbw 13, KARATE_CHOP + dbw 18, SAFEGUARD + dbw 23, FURY_SWIPES + dbw 29, ICE_PUNCH + dbw 35, VITAL_THROW + dbw 41, SLASH + dbw 46, SCREECH + dbw 51, CONFUSE_RAY + dbw 56, BLIZZARD + dbw 60, CROSS_CHOP + db 0 ; no more level-up moves + +WearlycanEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 7, POWDER_SNOW + dbw 13, KARATE_CHOP + dbw 18, SAFEGUARD + dbw 23, FURY_SWIPES + dbw 31, ICE_PUNCH + dbw 37, VITAL_THROW + dbw 43, SLASH + dbw 50, SCREECH + dbw 55, CONFUSE_RAY + dbw 60, BLIZZARD + dbw 66, CROSS_CHOP + dbw 70, GUILLOTINE + db 0 ; no more level-up moves TeddiursaEvosAttacks: dbbw EVOLVE_LEVEL, 30, URSARING @@ -2299,7 +2417,7 @@ SmeargleEvosAttacks: db 0 ; no more level-up moves GrenmarEvosAttacks: - db 0 + db 0 ; no more evolutions dbw 1, TACKLE dbw 1, DEFENSE_CURL dbw 7, BUBBLE @@ -2313,6 +2431,70 @@ GrenmarEvosAttacks: dbw 49, FIRE_SPIN dbw 55, HYDRO_PUMP db 0 ; no more level-up moves + +BuniceEvosAttacks: + dbbw EVOLVE_LEVEL, 16, BUNDRA + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 6, GROWL + dbw 10, POWDER_SNOW + dbw 14, DEFENSE_CURL + dbw 18, MIST + dbw 23, ROLLOUT + dbw 28, RAZOR_LEAF + dbw 34, COTTON_SPORE + dbw 40, AURORA_BEAM + dbw 46, PETAL_DANCE + db 0 ; no more level-up moves + +BundraEvosAttacks: + dbbw EVOLVE_ITEM, ICE_STONE, BUNBERG + dbbw EVOLVE_ITEM, WATER_STONE, BUNDRAKE + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 6, GROWL + dbw 10, POWDER_SNOW + dbw 14, DEFENSE_CURL + dbw 16, SYNTHESIS + dbw 20, MIST + dbw 25, ROLLOUT + dbw 32, RAZOR_LEAF + dbw 38, COTTON_SPORE + dbw 46, AURORA_BEAM + dbw 52, PETAL_DANCE + db 0 ; no more level-up moves + +BunbergEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 6, GROWL + dbw 10, POWDER_SNOW + dbw 14, DEFENSE_CURL + dbw 16, SYNTHESIS + dbw 20, MIST + dbw 25, ROLLOUT + dbw 32, RAZOR_LEAF + dbw 38, COTTON_SPORE + dbw 46, AURORA_BEAM + dbw 52, PETAL_DANCE + dbw 58, BLIZZARD + db 0 ; no more level-up moves + +BundrakeEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 6, GROWL + dbw 10, POWDER_SNOW + dbw 14, DEFENSE_CURL + dbw 16, SYNTHESIS + dbw 20, MIST + dbw 25, ROLLOUT + dbw 32, RAZOR_LEAF + dbw 38, COTTON_SPORE + dbw 46, AURORA_BEAM + dbw 52, PETAL_DANCE + dbw 58, HYDRO_PUMP + db 0 ; no more level-up moves TyrogueEvosAttacks: dbbbw EVOLVE_STAT, 20, ATK_LT_DEF, HITMONCHAN @@ -2752,6 +2934,38 @@ MimearEvosAttacks: dbw 61, SOLARBEAM dbw 65, MOONBLAST db 0 ; no more level-up moves + +SnuzzlesEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 8, EMBER + dbw 14, CHARM + dbw 20, FIRE_SPIN + dbw 26, HORN_ATTACK + dbw 32, DRAINING_KISS + dbw 38, FLAME_WHEEL + dbw 42, FURY_ATTACK + dbw 48, PLAY_ROUGH + dbw 54, HORN_DRILL + db 0 ; no more level-up moves + +DrilluskEvosAttacks: + db 0 ; no more evolutions + dbw 1, WATER_GUN + dbw 1, PECK + dbw 1, WITHDRAW + dbw 8, HORN_ATTACK + dbw 14, MUD_SLAP + dbw 20, SPIKE_CANNON + dbw 26, FURY_ATTACK + dbw 32, OCTAZOOKA + dbw 38, DRILL_PECK + dbw 44, DIG + dbw 50, HYDRO_PUMP + dbw 56, MEGAHORN + dbw 62, HORN_DRILL + db 0 ; no more level-up moves InoshikaEvosAttacks: db 0 ; no more evolutions @@ -2782,6 +2996,39 @@ RuddernautEvosAttacks: dbw 63, PSYCHIC_M dbw 70, HYDRO_PUMP db 0 ; no more level-up moves + +PixytopEvosAttacks: + db 0 ; no more evolutions + dbw 1, RAPID_SPIN + dbw 1, GROWL + dbw 7, DOUBLE_KICK + dbw 13, SING + dbw 19, DISARMING_VOICE + dbw 24, LOW_KICK + dbw 30, METRONOME + dbw 36, COUNTER + dbw 42, ROLLING_KICK + dbw 48, DAZZLING_GLEAM + dbw 54, TRIPLE_KICK + dbw 60, MEGA_KICK + db 0 ; no more level-up moves + +MawtleEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, SAND_ATTACK + dbw 1, WITHDRAW + dbw 7, BITE + dbw 13, WATER_GUN + dbw 19, HARDEN + dbw 24, BUBBLEBEAM + dbw 30, HEADBUTT + dbw 36, STOMP + dbw 42, FAINT_ATTACK + dbw 48, SUPER_FANG + dbw 54, CRUNCH + dbw 60, SKULL_BASH + db 0 ; no more level-up moves XylodonEvosAttacks: dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions @@ -2836,6 +3083,23 @@ DokuroarEvosAttacks: dbw 63, TAKE_DOWN dbw 70, ROCK_SLASH db 0 ; no more level-up moves + +AlphalithEvosAttacks: + db 0 ; no more evolutions + dbw 1, ANCIENTPOWER + dbw 1, LEER + dbw 1, HIDDEN_POWER + dbw 7, CONFUSION + dbw 14, HYPNOSIS + dbw 21, ROCK_THROW + dbw 28, SYNCHRONIZE + dbw 35, METRONOME + dbw 42, PSYCHIC_M + dbw 49, GLARE + dbw 56, ROCK_SLIDE + dbw 63, MEAN_LOOK + dbw 70, ROCK_SLASH + db 0 ; no more level-up moves ScreamTailEvosAttacks: db 0 ; no more evolutions diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 1ca8cfc..77346bd 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -65,6 +65,8 @@ EvosAttacksPointers1:: dw VenomothEvosAttacks dw DiglettEvosAttacks dw DugtrioEvosAttacks + dw WiglettEvosAttacks + dw WugtrioEvosAttacks dw CoinpurEvosAttacks dw MeowthEvosAttacks dw PersianEvosAttacks @@ -117,6 +119,7 @@ EvosAttacksPointers1:: dw CroakozunaEvosAttacks dw FarfetchDEvosAttacks dw LuxwanEvosAttacks + dw DodaerieEvosAttacks dw DoduoEvosAttacks dw DodrioEvosAttacks dw SeelEvosAttacks @@ -151,17 +154,24 @@ EvosAttacksPointers1:: dw WeezingEvosAttacks dw RhyhornEvosAttacks dw RhydonEvosAttacks + dw RhyperiorEvosAttacks dw HappinyEvosAttacks dw ChanseyEvosAttacks + dw GorillaimoEvosAttacks + dw CactormusEvosAttacks dw BurgelaEvosAttacks dw TangelaEvosAttacks dw TangrowthEvosAttacks dw JungelaEvosAttacks + dw RamooseEvosAttacks dw KangaskhanEvosAttacks + dw TrampelEvosAttacks + dw AraphantEvosAttacks dw HorseaEvosAttacks dw SeadraEvosAttacks dw BlastykeEvosAttacks dw BlastoiseEvosAttacks + dw SharpoonEvosAttacks dw OrfryEvosAttacks dw GoldeenEvosAttacks dw SeakingEvosAttacks @@ -191,6 +201,7 @@ EvosAttacksPointers1:: dw VaporeonEvosAttacks dw JolteonEvosAttacks dw FlareonEvosAttacks + dw PorybitEvosAttacks dw PorygonEvosAttacks dw OmanyteEvosAttacks dw OmastarEvosAttacks @@ -200,6 +211,7 @@ EvosAttacksPointers1:: dw AerodactylEvosAttacks dw DecillaEvosAttacks dw GawarhedEvosAttacks + dw OmegadgeEvosAttacks dw MunchlaxEvosAttacks dw SnorlaxEvosAttacks dw ArticunoEvosAttacks @@ -213,6 +225,8 @@ EvosAttacksPointers1:: dw DragoniteEvosAttacks dw MewtwoEvosAttacks dw MewEvosAttacks + dw MeltanEvosAttacks + dw MelmetalEvosAttacks .IndirectEnd:: BulbasaurEvosAttacks: @@ -1193,6 +1207,36 @@ DugtrioEvosAttacks: dbw 49, SANDSTORM ; SW97 dbw 55, FISSURE db 0 ; no more level-up moves + +WiglettEvosAttacks: + dbbw EVOLVE_LEVEL, 26, WUGTRIO + db 0 ; no more evolutions + dbw 1, WATER_GUN + dbw 1, MUD_SLAP + dbw 9, WRAP + dbw 15, DIG + dbw 21, SLAM + dbw 27, SAND_ATTACK + dbw 33, HEADBUTT + dbw 39, FAINT_ATTACK + dbw 45, RAIN_DANCE + dbw 51, HYDRO_PUMP + db 0 ; no more level-up moves + +WugtrioEvosAttacks: + db 0 ; no more evolutions + dbw 1, WATER_GUN + dbw 1, MUD_SLAP + dbw 9, WRAP + dbw 15, DIG + dbw 21, SLAM + dbw 27, SAND_ATTACK + dbw 30, TRI_ATTACK + dbw 35, HEADBUTT + dbw 41, FAINT_ATTACK + dbw 49, RAIN_DANCE + dbw 55, HYDRO_PUMP + db 0 ; no more level-up moves CoinpurEvosAttacks: dbbw EVOLVE_LEVEL, 14, MEOWTH @@ -2034,6 +2078,22 @@ LuxwanEvosAttacks: dbw 55, FALSE_SWIPE db 0 ; no more level-up moves +DodaerieEvosAttacks: + dbbw EVOLVE_LEVEL, 16, DODUO + db 0 ; no more evolutions + dbw 1, PECK + dbw 1, GROWL + dbw 9, PURSUIT + dbw 14, FURY_ATTACK + dbw 20, QUICK_ATTACK ; HGSS + dbw 24, RAGE + dbw 28, DRILL_PECK + dbw 33, TRI_ATTACK + dbw 37, AGILITY + dbw 42, THRASH ; LGPE + dbw 48, JUMP_KICK ; LGPE + db 0 ; no more level-up moves + DoduoEvosAttacks: dbbw EVOLVE_LEVEL, 31, DODRIO db 0 ; no more evolutions @@ -2570,6 +2630,7 @@ RhyhornEvosAttacks: db 0 ; no more level-up moves RhydonEvosAttacks: + dbbw EVOLVE_TRADE, DRAGON_SCALE, RHYPERIOR ; PLACEHOLDER db 0 ; no more evolutions dbw 1, HORN_ATTACK dbw 1, TAIL_WHIP @@ -2580,10 +2641,27 @@ RhydonEvosAttacks: dbw 28, SCARY_FACE dbw 32, MAGNITUDE ; Egg move dbw 37, TAKE_DOWN - dbw 43, ROCK_HEAD - dbw 49, HORN_DRILL - dbw 55, EARTHQUAKE - dbw 61, MEGAHORN ; FRLG + dbw 45, ROCK_HEAD + dbw 51, HORN_DRILL + dbw 59, EARTHQUAKE + dbw 65, MEGAHORN ; FRLG + db 0 ; no more level-up moves + +RhyperiorEvosAttacks: + db 0 ; no more evolutions + dbw 1, HORN_ATTACK + dbw 1, TAIL_WHIP + dbw 7, MUD_SLAP ; SW97 + dbw 13, STOMP + dbw 19, FURY_ATTACK + dbw 24, ENDURE ; SW97 + dbw 28, SCARY_FACE + dbw 32, MAGNITUDE ; Egg move + dbw 37, TAKE_DOWN + dbw 45, ROCK_HEAD + dbw 51, HORN_DRILL + dbw 59, EARTHQUAKE + dbw 65, MEGAHORN ; FRLG db 0 ; no more level-up moves HappinyEvosAttacks: @@ -2612,6 +2690,38 @@ ChanseyEvosAttacks: dbw 46, LIGHT_SCREEN dbw 52, DOUBLE_EDGE db 0 ; no more level-up moves + +GorillaimoEvosAttacks: + db 0 ; no more evolutions + dbw 1, COMET_PUNCH + dbw 1, GROWL + dbw 1, UPPERCUT + dbw 7, ROAR + dbw 13, BITE + dbw 19, SPARK + dbw 25, SEISMIC_TOSS + dbw 31, THUNDERPUNCH + dbw 37, BODY_SLAM + dbw 43, AMNESIA + dbw 49, SUBMISSION + dbw 55, DYNAMICPUNCH + db 0 ; no more level-up moves + +CactormusEvosAttacks: + db 0 ; no more evolutions + dbw 1, BARRAGE + dbw 1, SAND_ATTACK + dbw 6, VINE_WHIP + dbw 11, HORN_ATTACK + dbw 16, GROWTH + dbw 22, PIN_MISSILE + dbw 28, SPIKES + dbw 34, FURY_ATTACK + dbw 40, FAINT_ATTACK + dbw 45, SPIKE_CANNON + dbw 50, SANDSTORM + dbw 55, EXPLOSION + db 0 ; no more level-up moves BurgelaEvosAttacks: dbbw EVOLVE_LEVEL, 22, TANGELA @@ -2683,6 +2793,23 @@ JungelaEvosAttacks: dbw 60, GIGA_DRAIN ; Later gen level-up & TM dbw 65, CRUNCH db 0 ; no more level-up moves + +RamooseEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 4, SAND_ATTACK + dbw 9, CONFUSION + dbw 12, LEER + dbw 17, QUICK_ATTACK + dbw 23, RAZOR_LEAF + dbw 28, SUPERSONIC + dbw 33, HEADBUTT + dbw 38, JUMP_KICK + dbw 42, AGILITY + dbw 46, THRASH + dbw 50, GROWTH + dbw 56, DOUBLE_EDGE + db 0 ; no more level-up moves KangaskhanEvosAttacks: db 0 ; no more evolutions @@ -2698,6 +2825,41 @@ KangaskhanEvosAttacks: dbw 55, OUTRAGE ; LGPE dbw 61, REVERSAL db 0 ; no more level-up moves + +TrampelEvosAttacks: + dbbw EVOLVE_TRADE, METAL_COAT, ARAPHANT + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 1, LEER + dbw 7, HORN_ATTACK + dbw 13, STOMP + dbw 19, MAGNITUDE + dbw 24, RAGE + dbw 29, FURY_ATTACK + dbw 34, BODY_SLAM + dbw 39, BELLY_DRUM + dbw 45, ROAR + dbw 51, EARTHQUAKE + dbw 57, FISSURE + db 0 ; no more level-up moves + +AraphantEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 1, LEER + dbw 7, HORN_ATTACK + dbw 13, STOMP + dbw 19, HEADBUTT + dbw 24, HARDEN + dbw 29, FURY_ATTACK + dbw 34, METAL_CLAW + dbw 39, BELLY_DRUM + dbw 45, ROAR + dbw 51, DOUBLE_EDGE + dbw 57, HORN_DRILL + db 0 ; no more level-up moves HorseaEvosAttacks: dbbw EVOLVE_LEVEL, 32, SEADRA @@ -2770,6 +2932,22 @@ BlastoiseEvosAttacks: dbw 65, HYPER_BEAM ; TM db 0 ; no more level-up moves +SharpoonEvosAttacks: + db 0 ; no more evolutions + dbw 1, BITE + dbw 1, LEER + dbw 7, WATER_GUN + dbw 13, SCREECH + dbw 19, HORN_ATTACK + dbw 25, FURY_ATTACK + dbw 31, SHARPEN + dbw 37, HEADBUTT + dbw 42, CRUNCH + dbw 48, IRON_TAIL + dbw 54, HYDRO_PUMP + dbw 60, HORN_DRILL + db 0 ; no more level-up moves + OrfryEvosAttacks: dbbw EVOLVE_LEVEL, 16, GOLDEEN db 0 ; no more evolutions @@ -3219,6 +3397,21 @@ FlareonEvosAttacks: dbw 52, FLAMETHROWER db 0 ; no more level-up moves +PorybitEvosAttacks: + dbbw EVOLVE_TRADE, UP_GRADE, PORYGON ; PLACEHOLDER + db 0 ; no more evolutions + dbw 1, CONVERSION2 + dbw 1, TACKLE + dbw 1, CONVERSION + dbw 9, AGILITY + dbw 15, PSYBEAM + dbw 21, RECOVER + dbw 27, MINIMIZE + dbw 33, LOCK_ON + dbw 39, TRI_ATTACK + dbw 45, ZAP_CANNON + db 0 ; no more level-up moves + PorygonEvosAttacks: dbbw EVOLVE_TRADE, UP_GRADE, PORYGON2 db 0 ; no more evolutions @@ -3372,6 +3565,24 @@ GawarhedEvosAttacks: dbw 70, ROCK_SLASH dbw 77, HYPER_BEAM db 0 ; no more level-up moves + +OmegadgeEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, SUPERSONIC + dbw 1, LOCK_ON + dbw 7, THUNDERSHOCK + dbw 14, METAL_CLAW + dbw 21, SLAM + dbw 28, SCREECH + dbw 35, THUNDER_WAVE + dbw 42, IRON_TAIL + dbw 49, THUNDERBOLT + dbw 56, EXPLOSION + dbw 63, PROTECT + dbw 70, ZAP_CANNON + dbw 77, HYPER_BEAM + db 0 ; no more level-up moves MunchlaxEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, SNORLAX @@ -3581,3 +3792,32 @@ MewEvosAttacks: dbw 40, PSYCHIC_M dbw 50, ANCIENTPOWER db 0 ; no more level-up moves + +MeltanEvosAttacks: + dbbw EVOLVE_LEVEL, 45, MELMETAL ; PLACEHOLDER + db 0 ; no more evolutions + dbw 1, HEADBUTT + dbw 1, HARDEN + dbw 9, TAIL_WHIP + dbw 18, THUNDER_WAVE + dbw 27, THUNDERSHOCK + dbw 36, ACID_ARMOR + dbw 45, IRON_TAIL + db 0 ; no more level-up moves + +MelmetalEvosAttacks: + db 0 ; no more evolutions + dbw 1, HEADBUTT + dbw 1, HARDEN + dbw 1, THUNDERPUNCH + dbw 9, TAIL_WHIP + dbw 18, THUNDER_WAVE + dbw 27, THUNDERSHOCK + dbw 36, ACID_ARMOR + dbw 45, IRON_TAIL + dbw 54, MEGA_PUNCH + dbw 63, PROTECT + dbw 72, SUBMISSION + dbw 81, DYNAMICPUNCH + dbw 90, HYPER_BEAM + db 0 ; no more level-up moves diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index deae0d7..5f21302 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -65,6 +65,8 @@ FirstEvoStages:: dw VENONAT dw DIGLETT dw DIGLETT + dw WIGLETT + dw WIGLETT dw COINPUR dw COINPUR dw COINPUR @@ -117,8 +119,9 @@ FirstEvoStages:: dw RIBBITO dw FARFETCH_D dw FARFETCH_D - dw DODUO - dw DODUO + dw DODAERIE + dw DODAERIE + dw DODAERIE dw SEEL dw SEEL dw SMUJJ @@ -151,17 +154,24 @@ FirstEvoStages:: dw KOFFING dw RHYHORN dw RHYHORN ;70 + dw RHYHORN dw HAPPINY dw HAPPINY + dw GORILLAIMO + dw CACTORMUS dw BURGELA dw BURGELA dw BURGELA dw BURGELA + dw RAMOOSE dw KANGASKHAN + dw TRAMPEL + dw TRAMPEL dw HORSEA dw HORSEA dw BLASTYKE dw BLASTYKE + dw SHARPOON dw ORFRY dw ORFRY dw ORFRY @@ -191,7 +201,8 @@ FirstEvoStages:: dw EEVEE dw EEVEE dw EEVEE ;88 - dw PORYGON + dw PORYBIT + dw PORYBIT dw OMANYTE dw OMANYTE dw KABUTO @@ -200,6 +211,7 @@ FirstEvoStages:: dw FERADACTYL dw DECILLA dw DECILLA + dw OMEGADGE dw MUNCHLAX dw MUNCHLAX dw ARTICUNO ;90 @@ -213,6 +225,8 @@ FirstEvoStages:: dw DRATINI dw MEWTWO dw MEW + dw MELTAN + dw MELTAN dw CHIKORITA ;98 dw CHIKORITA dw CHIKORITA @@ -284,6 +298,7 @@ FirstEvoStages:: dw EEVEE dw EEVEE dw EEVEE + dw EEVEE dw MURKROW dw MURKROW dw SLOWPOKE @@ -303,6 +318,7 @@ FirstEvoStages:: dw DUNSPARCE dw DUNSPARCE dw GLIGAR + dw GLIGAR dw ONIX ;d0 dw SNUBBULL dw SNUBBULL @@ -310,11 +326,15 @@ FirstEvoStages:: dw QWILFISH dw QWILFISH dw QWILFISH + dw SAILWING dw SCYTHER dw SHUCKLE dw SHUCKLE dw HERACROSS dw SNEASEL + dw SNEASEL + dw WARFURS + dw WARFURS dw TEDDIURSA ;d8 dw TEDDIURSA dw TEDDIURSA @@ -344,6 +364,10 @@ FirstEvoStages:: dw STANTLER dw SMEARGLE dw GRENMAR + dw BUNICE + dw BUNICE + dw BUNICE + dw BUNICE dw TYROGUE dw TYROGUE dw SMOOCHUM @@ -372,11 +396,16 @@ FirstEvoStages:: dw WISPIRIT dw COATL dw MIMEAR + dw SNUZZLES + dw DRILLUSK dw INOSHIKA dw RUDDERNAUT + dw PIXYTOP + dw MAWTLE dw XYLODON dw XYLODON dw DOKUROAR + dw ALPHALITH dw SCREAM_TAIL dw SANDY_SHOCKS dw GREAT_TUSK diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 2c9234f..d574658 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -66,6 +66,8 @@ KantoMonSpecials: db 90 ; VENOMOTH db 45 ; DIGLETT db 70 ; DUGTRIO + db 35 ; WIGLETT + db 70 ; WUGTRIO db 35 ; COINPUR db 40 ; MEOWTH db 65 ; PERSIAN @@ -118,6 +120,7 @@ KantoMonSpecials: db 75 ; CROAKOZUNA db 58 ; FARFETCH_D db 63 ; LUXWAN + db 15 ; DODAERIE db 35 ; DODUO db 60 ; DODRIO db 70 ; SEEL @@ -152,17 +155,24 @@ KantoMonSpecials: db 85 ; WEEZING db 30 ; RHYHORN db 45 ; RHYDON + db 55 ; RHYPERIOR db 65 ; HAPPINY db 105 ; CHANSEY + db 40 ; GORILLAIMO + db 75 ; CACTORMUS db 80 ; BURGELA db 100 ; TANGELA db 110 ; TANGROWTH db 125 ; JUNGELA + db 90 ; RAMOOSE db 40 ; KANGASKHAN + db 64 ; TRAMPEL + db 54 ; ARAPHANT db 70 ; HORSEA db 95 ; SEADRA db 45 ; BLASTYKE db 85 ; BLASTOISE + db 85 ; SHARPOON db 20 ; ORFRY db 50 ; GOLDEEN db 80 ; SEAKING @@ -192,6 +202,7 @@ KantoMonSpecials: db 110 ; VAPOREON db 110 ; JOLTEON db 110 ; FLAREON + db 64 ; PORYBIT db 75 ; PORYGON db 90 ; OMANYTE db 115 ; OMASTAR @@ -201,6 +212,7 @@ KantoMonSpecials: db 60 ; AERODACTYL db 40 ; DECILLA db 95 ; GAWARHED + db 95 ; OMEGADGE db 40 ; MUNCHLAX db 65 ; SNORLAX db 125 ; ARTICUNO @@ -214,4 +226,6 @@ KantoMonSpecials: db 100 ; DRAGONITE db 154 ; MEWTWO db 100 ; MEW + db 35 ; MELTAN + db 65 ; MELMETAL assert_table_length JOHTO_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 1e07cf9..d94efa6 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -66,6 +66,8 @@ MonMenuIcons: db ICON_MOTH ; VENOMOTH db ICON_DIGLETT ; DIGLETT db ICON_DIGLETT ; DUGTRIO + db ICON_DIGLETT ; WIGLETT + db ICON_DIGLETT ; WUGTRIO db ICON_FOX ; COINPUR db ICON_FOX ; MEOWTH db ICON_FOX ; PERSIAN @@ -118,6 +120,7 @@ MonMenuIcons: db ICON_POLIWAG ; CROAKOZUNA db ICON_BIRD ; FARFETCH_D db ICON_BIRD ; LUXWAN + db ICON_BIRD ; DODAERIE db ICON_BIRD ; DODUO db ICON_BIRD ; DODRIO db ICON_LAPRAS ; SEEL @@ -152,17 +155,24 @@ MonMenuIcons: db ICON_BLOB ; WEEZING db ICON_EQUINE ; RHYHORN db ICON_MONSTER ; RHYDON + db ICON_MONSTER ; RHYPERIOR db ICON_CLEFAIRY ; HAPPINY db ICON_CLEFAIRY ; CHANSEY + db ICON_MONSTER ; GORILLAIMO + db ICON_ODDISH ; CACTORMUS db ICON_ODDISH ; BURGELA db ICON_ODDISH ; TANGELA db ICON_ODDISH ; TANGROWTH db ICON_ODDISH ; JUNGELA + db ICON_EQUINE ; RAMOOSE db ICON_MONSTER ; KANGASKHAN + db ICON_MONSTER ; TRAMPEL + db ICON_EQUINE ; ARAPHANT db ICON_FISH ; HORSEA db ICON_FISH ; SEADRA db ICON_SQUIRTLE ; BLASTYKE db ICON_SQUIRTLE ; BLASTOISE + db ICON_FISH ; SHARPOON db ICON_FISH ; ORFRY db ICON_FISH ; GOLDEEN db ICON_FISH ; SEAKING @@ -192,6 +202,7 @@ MonMenuIcons: db ICON_FOX ; VAPOREON db ICON_FOX ; JOLTEON db ICON_FOX ; FLAREON + db ICON_VOLTORB ; PORYBIT db ICON_VOLTORB ; PORYGON db ICON_SHELL ; OMANYTE db ICON_SHELL ; OMASTAR @@ -201,6 +212,7 @@ MonMenuIcons: db ICON_BIRD ; AERODACTYL db ICON_MONSTER ; DECILLA db ICON_MONSTER ; GAWARHED + db ICON_MONSTER ; OMEGADGE db ICON_SNORLAX ; MUNCHLAX db ICON_SNORLAX ; SNORLAX db ICON_BIRD ; ARTICUNO @@ -214,6 +226,8 @@ MonMenuIcons: db ICON_BIGMON ; DRAGONITE db ICON_HUMANSHAPE ; MEWTWO db ICON_HUMANSHAPE ; MEW + db ICON_BLOB ; MELTAN + db ICON_FIGHTER ; MELMETAL db ICON_ODDISH ; CHIKORITA db ICON_ODDISH ; BAYLEEF db ICON_ODDISH ; MEGANIUM @@ -285,6 +299,7 @@ MonMenuIcons: db ICON_FOX ; LEAFEON db ICON_FOX ; GLACEON db ICON_FOX ; SYLVEON + db ICON_FOX ; BREEZEON db ICON_BIRD ; MURKROW db ICON_BIRD ; HONCHKROW db ICON_SLOWPOKE ; SLOWKING @@ -304,6 +319,7 @@ MonMenuIcons: db ICON_SERPENT ; DUNSPARCE db ICON_SERPENT ; DUDUNSPARCE db ICON_BUG ; GLIGAR + db ICON_BUG ; GLISCOR db ICON_SERPENT ; STEELIX db ICON_MONSTER ; SNUBBULL db ICON_MONSTER ; GRANBULL @@ -311,11 +327,15 @@ MonMenuIcons: db ICON_FISH ; QWILFISH db ICON_FISH ; KAZAPPELIN db ICON_FISH ; QWILFATHER + db ICON_FISH ; SAILWING db ICON_BUG ; SCIZOR db ICON_BUG ; SHUCKLE db ICON_BUG ; POCKLE db ICON_BUG ; HERACROSS db ICON_FOX ; SNEASEL + db ICON_FOX ; WEAVILE + db ICON_FOX ; WARFURS + db ICON_FOX ; WEARLYCAN db ICON_MONSTER ; TEDDIURSA db ICON_MONSTER ; URSARING db ICON_MONSTER ; URSALUNA @@ -345,6 +365,10 @@ MonMenuIcons: db ICON_EQUINE ; WYRDEER db ICON_MONSTER ; SMEARGLE db ICON_LAPRAS ; GRENMAR + db ICON_VOLTORB ; BUNICE + db ICON_ODDISH ; BUNDRA + db ICON_ODDISH ; BUNBERG + db ICON_ODDISH ; BUNDRAKE db ICON_FIGHTER ; TYROGUE db ICON_FIGHTER ; HITMONTOP db ICON_HUMANSHAPE ; SMOOCHUM @@ -373,11 +397,16 @@ MonMenuIcons: db ICON_GHOST ; WISPIRIT db ICON_SERPENT ; COATL db ICON_HUMANSHAPE ; MIMEAR + db ICON_FOX ; SNUZZLES + db ICON_SHELL ; DRILLUSK db ICON_EQUINE ; INOSHIKA db ICON_LAPRAS ; RUDDERNAUT + db ICON_CLEFAIRY ; PIXYTOP + db ICON_SQUIRTLE ; MAWTLE db ICON_MONSTER ; XYLODON db ICON_MONSTER ; XYLOFIN db ICON_MONSTER ; DOKUROAR + db ICON_HUMANSHAPE ; ALPHALITH (idk LOL) db ICON_JIGGLYPUFF ; SCREAM_TAIL db ICON_VOLTORB ; SANDY_SHOCKS db ICON_EQUINE ; GREAT_TUSK diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index f35fb2a..c915978 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -68,6 +68,8 @@ PokemonNames:: db "VENOMOTH@@" db "DIGLETT@@@" db "DUGTRIO@@@" + db "WIGLETT@@@" + db "WUGTRIO@@@" db "COINPUR@@@" db "MEOWTH@@@@" db "PERSIAN@@@" @@ -120,6 +122,7 @@ PokemonNames:: db "CROAKOZUNA" db "FARFETCH'D" db "LUXWAN@@@@" + db "DODAERIE@@" db "DODUO@@@@@" db "DODRIO@@@@" db "SEEL@@@@@@" @@ -154,17 +157,24 @@ PokemonNames:: db "WEEZING@@@" db "RHYHORN@@@" db "RHYDON@@@@" + db "RHYPERIOR@" db "HAPPINY@@@" db "CHANSEY@@@" + db "GORILLAIMO" + db "CACTORMUS@" db "BURGELA@@@" db "TANGELA@@@" db "TANGROWTH@" db "JUNGELA@@@" + db "RAMOOSE@@@" db "KANGASKHAN" + db "TRAMPEL@@@" + db "ARAPHANT@@" db "HORSEA@@@@" db "SEADRA@@@@" db "BLASTYKE@@" db "BLASTOISE@" + db "SHARPOON@@" db "ORFRY@@@@@" db "GOLDEEN@@@" db "SEAKING@@@" @@ -194,6 +204,7 @@ PokemonNames:: db "VAPOREON@@" db "JOLTEON@@@" db "FLAREON@@@" + db "PORYBIT@@@" db "PORYGON@@@" db "OMANYTE@@@" db "OMASTAR@@@" @@ -203,6 +214,7 @@ PokemonNames:: db "AERODACTYL" db "DECILLA@@@" db "GAWARHED@@" + db "OMEGADGE@@" db "MUNCHLAX@@" db "SNORLAX@@@" db "ARTICUNO@@" @@ -216,6 +228,8 @@ PokemonNames:: db "DRAGONITE@" db "MEWTWO@@@@" db "MEW@@@@@@@" + db "MELTAN@@@@" + db "MELMETAL@@" db "CHIKORITA@" db "BAYLEEF@@@" db "MEGANIUM@@" @@ -287,6 +301,7 @@ PokemonNames:: db "LEAFEON@@@" db "GLACEON@@@" db "SYLVEON@@@" + db "BREEZEON@@" db "MURKROW@@@" db "HONCHKROW@" db "SLOWKING@@" @@ -306,6 +321,7 @@ PokemonNames:: db "DUNSPARCE@" db "DUDUNSPARC" ; this SUCKS but idk what else to do weh db "GLIGAR@@@@" + db "GLISCOR@@@" db "STEELIX@@@" db "SNUBBULL@@" db "GRANBULL@@" @@ -313,11 +329,15 @@ PokemonNames:: db "QWILFISH@@" db "KAZAPPELIN" db "QWILFATHER" + db "SAILWING@@" db "SCIZOR@@@@" db "SHUCKLE@@@" db "POCKLE@@@@" db "HERACROSS@" db "SNEASEL@@@" + db "WEAVILE@@@" + db "WARFURS@@@" + db "WEARLYCAN@" db "TEDDIURSA@" db "URSARING@@" db "URSALUNA@@" @@ -347,6 +367,10 @@ PokemonNames:: db "WYRDEER@@@" db "SMEARGLE@@" db "GRENMAR@@@" + db "BUNICE@@@@" + db "BUNDRA@@@@" + db "BUNBERG@@@" + db "BUNDRAKE@@" db "TYROGUE@@@" db "HITMONTOP@" db "SMOOCHUM@@" @@ -376,11 +400,16 @@ PokemonNames:: db "WISPIRIT@@" db "AJAWALCAN@" ; Previously Coatl. db "AVALOP@@@@" + db "SNUZZLES@@" + db "DRILLUSK@@" db "INOSHIKA@@" db "RUDDERNAUT" + db "PIXYTOP@@@" + db "MAWTLE@@@@" db "XYLODON@@@" db "XYLOFIN@@@" db "DOKUROAR@@" + db "ALPHALITH@" db "SCREAMTAIL" db "SANDY SHOX" db "GREAT TUSK" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index ee92abf..4c9ee51 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -161,6 +161,10 @@ INCBIN "gfx/pokemon/diglett/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/diglett/shiny.pal" INCBIN "gfx/pokemon/dugtrio/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/dugtrio/shiny.pal" +INCBIN "gfx/pokemon/wiglett/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/wiglett/shiny.pal" +INCBIN "gfx/pokemon/wugtrio/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/wugtrio/shiny.pal" INCBIN "gfx/pokemon/coinpur/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/coinpur/shiny.pal" INCBIN "gfx/pokemon/meowth/front.gbcpal", middle_colors @@ -265,6 +269,8 @@ INCBIN "gfx/pokemon/farfetch_d/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" INCBIN "gfx/pokemon/luxwan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/luxwan/shiny.pal" +INCBIN "gfx/pokemon/dodaerie/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/dodaerie/shiny.pal" INCBIN "gfx/pokemon/doduo/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/doduo/shiny.pal" INCBIN "gfx/pokemon/dodrio/front.gbcpal", middle_colors @@ -333,10 +339,16 @@ INCBIN "gfx/pokemon/rhyhorn/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" INCBIN "gfx/pokemon/rhydon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhydon/shiny.pal" +INCBIN "gfx/pokemon/rhyperior/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/rhyperior/shiny.pal" INCBIN "gfx/pokemon/happiny/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/happiny/shiny.pal" INCBIN "gfx/pokemon/chansey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/chansey/shiny.pal" +INCBIN "gfx/pokemon/gorillaimo/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gorillaimo/shiny.pal" +INCBIN "gfx/pokemon/cactormus/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/cactormus/shiny.pal" INCBIN "gfx/pokemon/burgela/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/burgela/shiny.pal" INCBIN "gfx/pokemon/tangela/front.gbcpal", middle_colors @@ -345,8 +357,14 @@ INCBIN "gfx/pokemon/tangrowth/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tangrowth/shiny.pal" INCBIN "gfx/pokemon/jungela/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jungela/shiny.pal" +INCBIN "gfx/pokemon/ramoose/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/ramoose/shiny.pal" INCBIN "gfx/pokemon/kangaskhan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" +INCBIN "gfx/pokemon/trampel/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/trampel/shiny.pal" +INCBIN "gfx/pokemon/araphant/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/araphant/shiny.pal" INCBIN "gfx/pokemon/horsea/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/horsea/shiny.pal" INCBIN "gfx/pokemon/seadra/front.gbcpal", middle_colors @@ -355,6 +373,8 @@ INCBIN "gfx/pokemon/blastyke/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/blastyke/shiny.pal" INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/blastoise/shiny.pal" +INCBIN "gfx/pokemon/sharpoon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/sharpoon/shiny.pal" INCBIN "gfx/pokemon/orfry/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/orfry/shiny.pal" INCBIN "gfx/pokemon/goldeen/front.gbcpal", middle_colors @@ -413,6 +433,8 @@ INCBIN "gfx/pokemon/jolteon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jolteon/shiny.pal" INCBIN "gfx/pokemon/flareon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/flareon/shiny.pal" +INCBIN "gfx/pokemon/porybit/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/porybit/shiny.pal" INCBIN "gfx/pokemon/porygon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/porygon/shiny.pal" INCBIN "gfx/pokemon/omanyte/front.gbcpal", middle_colors @@ -431,6 +453,8 @@ INCBIN "gfx/pokemon/decilla/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/decilla/shiny.pal" INCBIN "gfx/pokemon/gawarhed/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gawarhed/shiny.pal" +INCBIN "gfx/pokemon/omegadge/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/omegadge/shiny.pal" INCBIN "gfx/pokemon/munchlax/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/munchlax/shiny.pal" INCBIN "gfx/pokemon/snorlax/front.gbcpal", middle_colors @@ -457,6 +481,10 @@ INCBIN "gfx/pokemon/mewtwo/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mewtwo/shiny.pal" INCBIN "gfx/pokemon/mew/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mew/shiny.pal" +INCBIN "gfx/pokemon/meltan/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/meltan/shiny.pal" +INCBIN "gfx/pokemon/melmetal/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/melmetal/shiny.pal" INCBIN "gfx/pokemon/chikorita/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/chikorita/shiny.pal" INCBIN "gfx/pokemon/bayleef/front.gbcpal", middle_colors @@ -599,6 +627,8 @@ INCBIN "gfx/pokemon/glaceon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/glaceon/shiny.pal" INCBIN "gfx/pokemon/sylveon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sylveon/shiny.pal" +INCBIN "gfx/pokemon/breezeon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/breezeon/shiny.pal" INCBIN "gfx/pokemon/murkrow/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/murkrow/shiny.pal" INCBIN "gfx/pokemon/honchkrow/front.gbcpal", middle_colors @@ -637,6 +667,8 @@ INCBIN "gfx/pokemon/dudunsparce/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/dudunsparce/shiny.pal" INCBIN "gfx/pokemon/gligar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gligar/shiny.pal" +INCBIN "gfx/pokemon/gliscor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gliscor/shiny.pal" INCBIN "gfx/pokemon/steelix/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/steelix/shiny.pal" INCBIN "gfx/pokemon/snubbull/front.gbcpal", middle_colors @@ -651,6 +683,8 @@ INCBIN "gfx/pokemon/kazappelin/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kazappelin/shiny.pal" INCBIN "gfx/pokemon/qwilfather/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/qwilfather/shiny.pal" +INCBIN "gfx/pokemon/sailwing/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/sailwing/shiny.pal" INCBIN "gfx/pokemon/scizor/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/scizor/shiny.pal" INCBIN "gfx/pokemon/shuckle/front.gbcpal", middle_colors @@ -661,6 +695,12 @@ INCBIN "gfx/pokemon/heracross/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/heracross/shiny.pal" INCBIN "gfx/pokemon/sneasel/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sneasel/shiny.pal" +INCBIN "gfx/pokemon/weavile/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/weavile/shiny.pal" +INCBIN "gfx/pokemon/warfurs/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/warfurs/shiny.pal" +INCBIN "gfx/pokemon/wearlycan/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/wearlycan/shiny.pal" INCBIN "gfx/pokemon/teddiursa/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/teddiursa/shiny.pal" INCBIN "gfx/pokemon/ursaring/front.gbcpal", middle_colors @@ -719,6 +759,14 @@ INCBIN "gfx/pokemon/smeargle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/smeargle/shiny.pal" INCBIN "gfx/pokemon/grenmar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/grenmar/shiny.pal" +INCBIN "gfx/pokemon/bunice/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bunice/shiny.pal" +INCBIN "gfx/pokemon/bundra/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bundra/shiny.pal" +INCBIN "gfx/pokemon/bunberg/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bunberg/shiny.pal" +INCBIN "gfx/pokemon/bundrake/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bundrake/shiny.pal" INCBIN "gfx/pokemon/tyrogue/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tyrogue/shiny.pal" INCBIN "gfx/pokemon/hitmontop/front.gbcpal", middle_colors @@ -776,16 +824,26 @@ INCBIN "gfx/pokemon/coatl/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/coatl/shiny.pal" INCBIN "gfx/pokemon/mimear/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mimear/shiny.pal" +INCBIN "gfx/pokemon/snuzzles/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/snuzzles/shiny.pal" +INCBIN "gfx/pokemon/drillusk/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/drillusk/shiny.pal" INCBIN "gfx/pokemon/inoshika/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/inoshika/shiny.pal" INCBIN "gfx/pokemon/ruddernaut/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/ruddernaut/shiny.pal" +INCBIN "gfx/pokemon/pixytop/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pixytop/shiny.pal" +INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/mawtle/shiny.pal" INCBIN "gfx/pokemon/xylodon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/xylodon/shiny.pal" INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/xylofin/shiny.pal" INCBIN "gfx/pokemon/dokuroar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/dokuroar/shiny.pal" +INCBIN "gfx/pokemon/alphalith/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/alphalith/shiny.pal" INCBIN "gfx/pokemon/scream_tail/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/scream_tail/shiny.pal" diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index df14cbc..361d17e 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -141,6 +141,10 @@ PokemonPicPointers:: dba DiglettBackpic dba DugtrioFrontpic dba DugtrioBackpic + dba WiglettFrontpic + dba WiglettBackpic + dba WugtrioFrontpic + dba WugtrioBackpic dba CoinpurFrontpic dba CoinpurBackpic dba MeowthFrontpic @@ -245,6 +249,8 @@ PokemonPicPointers:: dba FarfetchDBackpic dba LuxwanFrontpic dba LuxwanBackpic + dba DodaerieFrontpic + dba DodaerieBackpic dba DoduoFrontpic dba DoduoBackpic dba DodrioFrontpic @@ -313,10 +319,16 @@ PokemonPicPointers:: dba RhyhornBackpic dba RhydonFrontpic dba RhydonBackpic + dba RhyperiorFrontpic + dba RhyperiorBackpic dba HappinyFrontpic dba HappinyBackpic dba ChanseyFrontpic dba ChanseyBackpic + dba GorillaimoFrontpic + dba GorillaimoBackpic + dba CactormusFrontpic + dba CactormusBackpic dba BurgelaFrontpic dba BurgelaBackpic dba TangelaFrontpic @@ -325,8 +337,14 @@ PokemonPicPointers:: dba TangrowthBackpic dba JungelaFrontpic dba JungelaBackpic + dba RamooseFrontpic + dba RamooseBackpic dba KangaskhanFrontpic dba KangaskhanBackpic + dba TrampelFrontpic + dba TrampelBackpic + dba AraphantFrontpic + dba AraphantBackpic dba HorseaFrontpic dba HorseaBackpic dba SeadraFrontpic @@ -335,6 +353,8 @@ PokemonPicPointers:: dba BlastykeBackpic dba BlastoiseFrontpic dba BlastoiseBackpic + dba SharpoonFrontpic + dba SharpoonBackpic dba OrfryFrontpic dba OrfryBackpic dba GoldeenFrontpic @@ -393,6 +413,8 @@ PokemonPicPointers:: dba JolteonBackpic dba FlareonFrontpic dba FlareonBackpic + dba PorybitFrontpic + dba PorybitBackpic dba PorygonFrontpic dba PorygonBackpic dba OmanyteFrontpic @@ -411,6 +433,8 @@ PokemonPicPointers:: dba DecillaBackpic dba GawarhedFrontpic dba GawarhedBackpic + dba OmegadgeFrontpic + dba OmegadgeBackpic dba MunchlaxFrontpic dba MunchlaxBackpic dba SnorlaxFrontpic @@ -437,6 +461,10 @@ PokemonPicPointers:: dba MewtwoBackpic dba MewFrontpic dba MewBackpic + dba MeltanFrontpic + dba MeltanBackpic + dba MelmetalFrontpic + dba MelmetalBackpic dba ChikoritaFrontpic dba ChikoritaBackpic dba BayleefFrontpic @@ -579,6 +607,8 @@ PokemonPicPointers:: dba GlaceonBackpic dba SylveonFrontpic dba SylveonBackpic + dba BreezeonFrontpic + dba BreezeonBackpic dba MurkrowFrontpic dba MurkrowBackpic dba HonchkrowFrontpic @@ -620,6 +650,8 @@ PokemonPicPointers:: dba DudunsparceBackpic dba GligarFrontpic dba GligarBackpic + dba GliscorFrontpic + dba GliscorBackpic dba SteelixFrontpic dba SteelixBackpic dba SnubbullFrontpic @@ -634,6 +666,8 @@ PokemonPicPointers:: dba KazappelinBackpic dba QwilfatherFrontpic dba QwilfatherBackpic + dba SailwingFrontpic + dba SailwingBackpic dba ScizorFrontpic dba ScizorBackpic dba ShuckleFrontpic @@ -644,6 +678,12 @@ PokemonPicPointers:: dba HeracrossBackpic dba SneaselFrontpic dba SneaselBackpic + dba WeavileFrontpic + dba WeavileBackpic + dba WarfursFrontpic + dba WarfursBackpic + dba WearlycanFrontpic + dba WearlycanBackpic dba TeddiursaFrontpic dba TeddiursaBackpic dba UrsaringFrontpic @@ -702,6 +742,14 @@ PokemonPicPointers:: dba SmeargleBackpic dba GrenmarFrontpic dba GrenmarBackpic + dba BuniceFrontpic + dba BuniceBackpic + dba BundraFrontpic + dba BundraBackpic + dba BunbergFrontpic + dba BunbergBackpic + dba BundrakeFrontpic + dba BundrakeBackpic dba TyrogueFrontpic dba TyrogueBackpic dba HitmontopFrontpic @@ -758,16 +806,26 @@ PokemonPicPointers:: dba CoatlBackpic dba MimearFrontpic dba MimearBackpic + dba SnuzzlesFrontpic + dba SnuzzlesBackpic + dba DrilluskFrontpic + dba DrilluskBackpic dba InoshikaFrontpic dba InoshikaBackpic dba RuddernautFrontpic dba RuddernautBackpic + dba PixytopFrontpic + dba PixytopBackpic + dba MawtleFrontpic + dba MawtleBackpic dba XylodonFrontpic dba XylodonBackpic dba XylofinFrontpic dba XylofinBackpic dba DokuroarFrontpic dba DokuroarBackpic + dba AlphalithFrontpic + dba AlphalithBackpic dba ScreamTailFrontpic dba ScreamTailBackpic dba SandyShocksFrontpic diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index e55e704..3a8e42e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -108,7 +108,7 @@ JasmineGroup: ; Jasmine is going to use Egg Moves! db 34 dw SKARMORY dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER - db 35 + ; db 35 ; dw SHARPOON ; dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE db 35 @@ -5431,30 +5431,40 @@ KimonoGirlGroup: next_list_item ; KIMONO_GIRL (2) db "NAOKO@", TRAINERTYPE_NORMAL + db 15 + dw BELLOSSOM db 17 dw FLAREON db -1 ; end next_list_item ; KIMONO_GIRL (3) db "SAYO@", TRAINERTYPE_NORMAL + db 15 + dw BELLOSSOM db 17 dw ESPEON db -1 ; end next_list_item ; KIMONO_GIRL (4) db "ZUKI@", TRAINERTYPE_NORMAL + db 15 + dw BELLOSSOM db 17 dw UMBREON db -1 ; end next_list_item ; KIMONO_GIRL (5) db "KUNI@", TRAINERTYPE_NORMAL + db 15 + dw BELLOSSOM db 17 dw VAPOREON db -1 ; end next_list_item ; KIMONO_GIRL (6) db "MIKI@", TRAINERTYPE_NORMAL + db 15 + dw BELLOSSOM db 17 dw JOLTEON db -1 ; end diff --git a/gfx/footprints/alphalith.png b/gfx/footprints/alphalith.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/alphalith.png differ diff --git a/gfx/footprints/araphant.png b/gfx/footprints/araphant.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/araphant.png differ diff --git a/gfx/footprints/breezeon.png b/gfx/footprints/breezeon.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/breezeon.png differ diff --git a/gfx/footprints/bunberg.png b/gfx/footprints/bunberg.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/bunberg.png differ diff --git a/gfx/footprints/bundra.png b/gfx/footprints/bundra.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/bundra.png differ diff --git a/gfx/footprints/bundrake.png b/gfx/footprints/bundrake.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/bundrake.png differ diff --git a/gfx/footprints/bunice.png b/gfx/footprints/bunice.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/bunice.png differ diff --git a/gfx/footprints/cactormus.png b/gfx/footprints/cactormus.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/cactormus.png differ diff --git a/gfx/footprints/dodaerie.png b/gfx/footprints/dodaerie.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/dodaerie.png differ diff --git a/gfx/footprints/drillusk.png b/gfx/footprints/drillusk.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/drillusk.png differ diff --git a/gfx/footprints/gliscor.png b/gfx/footprints/gliscor.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/gliscor.png differ diff --git a/gfx/footprints/gorillaimo.png b/gfx/footprints/gorillaimo.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/gorillaimo.png differ diff --git a/gfx/footprints/mawtle.png b/gfx/footprints/mawtle.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/mawtle.png differ diff --git a/gfx/footprints/melmetal.png b/gfx/footprints/melmetal.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/melmetal.png differ diff --git a/gfx/footprints/meltan.png b/gfx/footprints/meltan.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/meltan.png differ diff --git a/gfx/footprints/omegadge.png b/gfx/footprints/omegadge.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/omegadge.png differ diff --git a/gfx/footprints/pixytop.png b/gfx/footprints/pixytop.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/pixytop.png differ diff --git a/gfx/footprints/porybit.png b/gfx/footprints/porybit.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/porybit.png differ diff --git a/gfx/footprints/ramoose.png b/gfx/footprints/ramoose.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/ramoose.png differ diff --git a/gfx/footprints/rhyperior.png b/gfx/footprints/rhyperior.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/rhyperior.png differ diff --git a/gfx/footprints/sailwing.png b/gfx/footprints/sailwing.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/sailwing.png differ diff --git a/gfx/footprints/sharpoon.png b/gfx/footprints/sharpoon.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/sharpoon.png differ diff --git a/gfx/footprints/snuzzles.png b/gfx/footprints/snuzzles.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/snuzzles.png differ diff --git a/gfx/footprints/trampel.png b/gfx/footprints/trampel.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/trampel.png differ diff --git a/gfx/footprints/warfurs.png b/gfx/footprints/warfurs.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/warfurs.png differ diff --git a/gfx/footprints/wearlycan.png b/gfx/footprints/wearlycan.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/wearlycan.png differ diff --git a/gfx/footprints/weavile.png b/gfx/footprints/weavile.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/weavile.png differ diff --git a/gfx/footprints/wiglett.png b/gfx/footprints/wiglett.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/wiglett.png differ diff --git a/gfx/footprints/wugtrio.png b/gfx/footprints/wugtrio.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/wugtrio.png differ diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index 04f7da1..b87de9a 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -72,6 +72,7 @@ INCBIN "gfx/footprints/umbreon.1bpp" INCBIN "gfx/footprints/leafeon.1bpp" INCBIN "gfx/footprints/glaceon.1bpp" INCBIN "gfx/footprints/sylveon.1bpp" +INCBIN "gfx/footprints/breezeon.1bpp" INCBIN "gfx/footprints/murkrow.1bpp" INCBIN "gfx/footprints/honchkrow.1bpp" INCBIN "gfx/footprints/slowking.1bpp" @@ -91,6 +92,7 @@ INCBIN "gfx/footprints/forretress.1bpp" INCBIN "gfx/footprints/dunsparce.1bpp" INCBIN "gfx/footprints/dudunsparce.1bpp" INCBIN "gfx/footprints/gligar.1bpp" +INCBIN "gfx/footprints/gliscor.1bpp" INCBIN "gfx/footprints/steelix.1bpp" INCBIN "gfx/footprints/snubbull.1bpp" INCBIN "gfx/footprints/granbull.1bpp" @@ -98,11 +100,15 @@ INCBIN "gfx/footprints/caretorker.1bpp" INCBIN "gfx/footprints/qwilfish.1bpp" INCBIN "gfx/footprints/kazappelin.1bpp" INCBIN "gfx/footprints/qwilfather.1bpp" +INCBIN "gfx/footprints/sailwing.1bpp" INCBIN "gfx/footprints/scizor.1bpp" INCBIN "gfx/footprints/shuckle.1bpp" INCBIN "gfx/footprints/pockle.1bpp" INCBIN "gfx/footprints/heracross.1bpp" INCBIN "gfx/footprints/sneasel.1bpp" +INCBIN "gfx/footprints/weavile.1bpp" +INCBIN "gfx/footprints/warfurs.1bpp" +INCBIN "gfx/footprints/wearlycan.1bpp" INCBIN "gfx/footprints/teddiursa.1bpp" INCBIN "gfx/footprints/ursaring.1bpp" INCBIN "gfx/footprints/ursaluna.1bpp" @@ -132,6 +138,10 @@ INCBIN "gfx/footprints/stantler.1bpp" INCBIN "gfx/footprints/wyrdeer.1bpp" INCBIN "gfx/footprints/smeargle.1bpp" INCBIN "gfx/footprints/grenmar.1bpp" +INCBIN "gfx/footprints/bunice.1bpp" +INCBIN "gfx/footprints/bundra.1bpp" +INCBIN "gfx/footprints/bunberg.1bpp" +INCBIN "gfx/footprints/bundrake.1bpp" INCBIN "gfx/footprints/tyrogue.1bpp" INCBIN "gfx/footprints/hitmontop.1bpp" INCBIN "gfx/footprints/smoochum.1bpp" @@ -160,11 +170,16 @@ INCBIN "gfx/footprints/kitsen.1bpp" INCBIN "gfx/footprints/wispirit.1bpp" INCBIN "gfx/footprints/coatl.1bpp" INCBIN "gfx/footprints/mimear.1bpp" +INCBIN "gfx/footprints/snuzzles.1bpp" +INCBIN "gfx/footprints/drillusk.1bpp" INCBIN "gfx/footprints/inoshika.1bpp" INCBIN "gfx/footprints/ruddernaut.1bpp" +INCBIN "gfx/footprints/pixytop.1bpp" +INCBIN "gfx/footprints/mawtle.1bpp" INCBIN "gfx/footprints/xylodon.1bpp" INCBIN "gfx/footprints/xylofin.1bpp" INCBIN "gfx/footprints/dokuroar.1bpp" +INCBIN "gfx/footprints/alphalith.1bpp" INCBIN "gfx/footprints/scream_tail.1bpp" INCBIN "gfx/footprints/sandy_shocks.1bpp" INCBIN "gfx/footprints/great_tusk.1bpp" diff --git a/gfx/footprints_kanto.asm b/gfx/footprints_kanto.asm index ffac4bc..5ac6bd5 100644 --- a/gfx/footprints_kanto.asm +++ b/gfx/footprints_kanto.asm @@ -65,6 +65,8 @@ INCBIN "gfx/footprints/venonat.1bpp" INCBIN "gfx/footprints/venomoth.1bpp" INCBIN "gfx/footprints/diglett.1bpp" INCBIN "gfx/footprints/dugtrio.1bpp" +INCBIN "gfx/footprints/wiglett.1bpp" +INCBIN "gfx/footprints/wugtrio.1bpp" INCBIN "gfx/footprints/coinpur.1bpp" INCBIN "gfx/footprints/meowth.1bpp" INCBIN "gfx/footprints/persian.1bpp" @@ -117,6 +119,7 @@ INCBIN "gfx/footprints/ribbito.1bpp" INCBIN "gfx/footprints/croakozuna.1bpp" INCBIN "gfx/footprints/farfetch_d.1bpp" INCBIN "gfx/footprints/luxwan.1bpp" +INCBIN "gfx/footprints/dodaerie.1bpp" INCBIN "gfx/footprints/doduo.1bpp" INCBIN "gfx/footprints/dodrio.1bpp" INCBIN "gfx/footprints/seel.1bpp" @@ -151,17 +154,24 @@ INCBIN "gfx/footprints/koffing.1bpp" INCBIN "gfx/footprints/weezing.1bpp" INCBIN "gfx/footprints/rhyhorn.1bpp" INCBIN "gfx/footprints/rhydon.1bpp" +INCBIN "gfx/footprints/rhyperior.1bpp" INCBIN "gfx/footprints/happiny.1bpp" INCBIN "gfx/footprints/chansey.1bpp" +INCBIN "gfx/footprints/gorillaimo.1bpp" +INCBIN "gfx/footprints/cactormus.1bpp" INCBIN "gfx/footprints/burgela.1bpp" INCBIN "gfx/footprints/tangela.1bpp" INCBIN "gfx/footprints/tangrowth.1bpp" INCBIN "gfx/footprints/jungela.1bpp" +INCBIN "gfx/footprints/ramoose.1bpp" INCBIN "gfx/footprints/kangaskhan.1bpp" +INCBIN "gfx/footprints/trampel.1bpp" +INCBIN "gfx/footprints/araphant.1bpp" INCBIN "gfx/footprints/horsea.1bpp" INCBIN "gfx/footprints/seadra.1bpp" INCBIN "gfx/footprints/blastyke.1bpp" INCBIN "gfx/footprints/blastoise.1bpp" +INCBIN "gfx/footprints/sharpoon.1bpp" INCBIN "gfx/footprints/orfry.1bpp" INCBIN "gfx/footprints/goldeen.1bpp" INCBIN "gfx/footprints/seaking.1bpp" @@ -191,6 +201,7 @@ INCBIN "gfx/footprints/eevee.1bpp" INCBIN "gfx/footprints/vaporeon.1bpp" INCBIN "gfx/footprints/jolteon.1bpp" INCBIN "gfx/footprints/flareon.1bpp" +INCBIN "gfx/footprints/porybit.1bpp" INCBIN "gfx/footprints/porygon.1bpp" INCBIN "gfx/footprints/omanyte.1bpp" INCBIN "gfx/footprints/omastar.1bpp" @@ -200,6 +211,7 @@ INCBIN "gfx/footprints/feradactyl.1bpp" INCBIN "gfx/footprints/aerodactyl.1bpp" INCBIN "gfx/footprints/decilla.1bpp" INCBIN "gfx/footprints/gawarhed.1bpp" +INCBIN "gfx/footprints/omegadge.1bpp" INCBIN "gfx/footprints/munchlax.1bpp" INCBIN "gfx/footprints/snorlax.1bpp" INCBIN "gfx/footprints/articuno.1bpp" @@ -213,5 +225,7 @@ INCBIN "gfx/footprints/dragonair.1bpp" INCBIN "gfx/footprints/dragonite.1bpp" INCBIN "gfx/footprints/mewtwo.1bpp" INCBIN "gfx/footprints/mew.1bpp" +INCBIN "gfx/footprints/meltan.1bpp" +INCBIN "gfx/footprints/melmetal.1bpp" .IndirectEnd:: \ No newline at end of file diff --git a/gfx/pics.asm b/gfx/pics.asm index 92f6d8d..4844a02 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1064,6 +1064,68 @@ AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz" +WiglettFrontpic: INCBIN "gfx/pokemon/wiglett/front.animated.2bpp.lz" +WiglettBackpic: INCBIN "gfx/pokemon/wiglett/back.2bpp.lz" +WugtrioFrontpic: INCBIN "gfx/pokemon/wugtrio/front.animated.2bpp.lz" +WugtrioBackpic: INCBIN "gfx/pokemon/wugtrio/back.2bpp.lz" +DodaerieFrontpic: INCBIN "gfx/pokemon/dodaerie/front.animated.2bpp.lz" +DodaerieBackpic: INCBIN "gfx/pokemon/dodaerie/back.2bpp.lz" +RhyperiorFrontpic: INCBIN "gfx/pokemon/rhyperior/front.animated.2bpp.lz" +RhyperiorBackpic: INCBIN "gfx/pokemon/rhyperior/back.2bpp.lz" +GorillaimoFrontpic: INCBIN "gfx/pokemon/gorillaimo/front.animated.2bpp.lz" +GorillaimoBackpic: INCBIN "gfx/pokemon/gorillaimo/back.2bpp.lz" +CactormusFrontpic: INCBIN "gfx/pokemon/cactormus/front.animated.2bpp.lz" +CactormusBackpic: INCBIN "gfx/pokemon/cactormus/back.2bpp.lz" +RamooseFrontpic: INCBIN "gfx/pokemon/ramoose/front.animated.2bpp.lz" +RamooseBackpic: INCBIN "gfx/pokemon/ramoose/back.2bpp.lz" +TrampelFrontpic: INCBIN "gfx/pokemon/trampel/front.animated.2bpp.lz" +TrampelBackpic: INCBIN "gfx/pokemon/trampel/back.2bpp.lz" +AraphantFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" +AraphantBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" +SharpoonFrontpic: INCBIN "gfx/pokemon/sharpoon/front.animated.2bpp.lz" +SharpoonBackpic: INCBIN "gfx/pokemon/sharpoon/back.2bpp.lz" +PorybitFrontpic: INCBIN "gfx/pokemon/porybit/front.animated.2bpp.lz" +PorybitBackpic: INCBIN "gfx/pokemon/porybit/back.2bpp.lz" +OmegadgeFrontpic: INCBIN "gfx/pokemon/omegadge/front.animated.2bpp.lz" +OmegadgeBackpic: INCBIN "gfx/pokemon/omegadge/back.2bpp.lz" +MeltanFrontpic: INCBIN "gfx/pokemon/meltan/front.animated.2bpp.lz" +MeltanBackpic: INCBIN "gfx/pokemon/meltan/back.2bpp.lz" +MelmetalFrontpic: INCBIN "gfx/pokemon/melmetal/front.animated.2bpp.lz" +MelmetalBackpic: INCBIN "gfx/pokemon/melmetal/back.2bpp.lz" + +SECTION "Pics 28", ROMX + +BreezeonFrontpic: INCBIN "gfx/pokemon/breezeon/front.animated.2bpp.lz" +BreezeonBackpic: INCBIN "gfx/pokemon/breezeon/back.2bpp.lz" +GliscorFrontpic: INCBIN "gfx/pokemon/gliscor/front.animated.2bpp.lz" +GliscorBackpic: INCBIN "gfx/pokemon/gliscor/back.2bpp.lz" +SailwingFrontpic: INCBIN "gfx/pokemon/sailwing/front.animated.2bpp.lz" +SailwingBackpic: INCBIN "gfx/pokemon/sailwing/back.2bpp.lz" +WeavileFrontpic: INCBIN "gfx/pokemon/weavile/front.animated.2bpp.lz" +WeavileBackpic: INCBIN "gfx/pokemon/weavile/back.2bpp.lz" +WarfursFrontpic: INCBIN "gfx/pokemon/warfurs/front.animated.2bpp.lz" +WarfursBackpic: INCBIN "gfx/pokemon/warfurs/back.2bpp.lz" +WearlycanFrontpic: INCBIN "gfx/pokemon/wearlycan/front.animated.2bpp.lz" +WearlycanBackpic: INCBIN "gfx/pokemon/wearlycan/back.2bpp.lz" +BuniceFrontpic: INCBIN "gfx/pokemon/bunice/front.animated.2bpp.lz" +BuniceBackpic: INCBIN "gfx/pokemon/bunice/back.2bpp.lz" +BundraFrontpic: INCBIN "gfx/pokemon/bundra/front.animated.2bpp.lz" +BundraBackpic: INCBIN "gfx/pokemon/bundra/back.2bpp.lz" +BunbergFrontpic: INCBIN "gfx/pokemon/bunberg/front.animated.2bpp.lz" +BunbergBackpic: INCBIN "gfx/pokemon/bunberg/back.2bpp.lz" +BundrakeFrontpic: INCBIN "gfx/pokemon/bundrake/front.animated.2bpp.lz" +BundrakeBackpic: INCBIN "gfx/pokemon/bundrake/back.2bpp.lz" +SnuzzlesFrontpic: INCBIN "gfx/pokemon/snuzzles/front.animated.2bpp.lz" +SnuzzlesBackpic: INCBIN "gfx/pokemon/snuzzles/back.2bpp.lz" +DrilluskFrontpic: INCBIN "gfx/pokemon/drillusk/front.animated.2bpp.lz" +DrilluskBackpic: INCBIN "gfx/pokemon/drillusk/back.2bpp.lz" +PixytopFrontpic: INCBIN "gfx/pokemon/pixytop/front.animated.2bpp.lz" +PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz" +MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz" +MawtleBackpic: INCBIN "gfx/pokemon/mawtle/back.2bpp.lz" +AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz" +AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" + ; spillover KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz" diff --git a/gfx/pokemon/alphalith/anim.asm b/gfx/pokemon/alphalith/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/alphalith/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/alphalith/anim_idle.asm b/gfx/pokemon/alphalith/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/alphalith/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/alphalith/back.png b/gfx/pokemon/alphalith/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/alphalith/back.png differ diff --git a/gfx/pokemon/alphalith/front.png b/gfx/pokemon/alphalith/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/alphalith/front.png differ diff --git a/gfx/pokemon/alphalith/shiny.pal b/gfx/pokemon/alphalith/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/alphalith/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 60d065a..297250e 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -64,6 +64,8 @@ AnimationPointers: dw VenomothAnimation dw DiglettAnimation dw DugtrioAnimation + dw WiglettAnimation + dw WugtrioAnimation dw CoinpurAnimation dw MeowthAnimation dw PersianAnimation @@ -116,6 +118,7 @@ AnimationPointers: dw CroakozunaAnimation dw FarfetchDAnimation dw LuxwanAnimation + dw DodaerieAnimation dw DoduoAnimation dw DodrioAnimation dw SeelAnimation @@ -150,17 +153,24 @@ AnimationPointers: dw WeezingAnimation dw RhyhornAnimation dw RhydonAnimation + dw RhyperiorAnimation dw HappinyAnimation dw ChanseyAnimation + dw GorillaimoAnimation + dw CactormusAnimation dw BurgelaAnimation dw TangelaAnimation dw TangrowthAnimation dw JungelaAnimation + dw RamooseAnimation dw KangaskhanAnimation + dw TrampelAnimation + dw AraphantAnimation dw HorseaAnimation dw SeadraAnimation dw BlastykeAnimation dw BlastoiseAnimation + dw SharpoonAnimation dw OrfryAnimation dw GoldeenAnimation dw SeakingAnimation @@ -190,6 +200,7 @@ AnimationPointers: dw VaporeonAnimation dw JolteonAnimation dw FlareonAnimation + dw PorybitAnimation dw PorygonAnimation dw OmanyteAnimation dw OmastarAnimation @@ -199,6 +210,7 @@ AnimationPointers: dw AerodactylAnimation dw DecillaAnimation dw GawarhedAnimation + dw OmegadgeAnimation dw MunchlaxAnimation dw SnorlaxAnimation dw ArticunoAnimation @@ -212,6 +224,8 @@ AnimationPointers: dw DragoniteAnimation dw MewtwoAnimation dw MewAnimation + dw MeltanAnimation + dw MelmetalAnimation dw ChikoritaAnimation dw BayleefAnimation dw MeganiumAnimation @@ -283,6 +297,7 @@ AnimationPointers: dw LeafeonAnimation dw GlaceonAnimation dw SylveonAnimation + dw BreezeonAnimation dw MurkrowAnimation dw HonchkrowAnimation dw SlowkingAnimation @@ -302,6 +317,7 @@ AnimationPointers: dw DunsparceAnimation dw DudunsparceAnimation dw GligarAnimation + dw GliscorAnimation dw SteelixAnimation dw SnubbullAnimation dw GranbullAnimation @@ -309,11 +325,15 @@ AnimationPointers: dw QwilfishAnimation dw KazappelinAnimation dw QwilfatherAnimation + dw SailwingAnimation dw ScizorAnimation dw ShuckleAnimation dw PockleAnimation dw HeracrossAnimation dw SneaselAnimation + dw WeavileAnimation + dw WarfursAnimation + dw WearlycanAnimation dw TeddiursaAnimation dw UrsaringAnimation dw UrsalunaAnimation @@ -343,6 +363,10 @@ AnimationPointers: dw WyrdeerAnimation dw SmeargleAnimation dw GrenmarAnimation + dw BuniceAnimation + dw BundraAnimation + dw BunbergAnimation + dw BundrakeAnimation dw TyrogueAnimation dw HitmontopAnimation dw SmoochumAnimation @@ -372,11 +396,16 @@ AnimationPointers: dw WispiritAnimation dw CoatlAnimation dw MimearAnimation + dw SnuzzlesAnimation + dw DrilluskAnimation dw InoshikaAnimation dw RuddernautAnimation + dw PixytopAnimation + dw MawtleAnimation dw XylodonAnimation dw XylofinAnimation dw DokuroarAnimation + dw AlphalithAnimation dw ScreamTailAnimation dw SandyShocksAnimation dw GreatTuskAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index e83873d..3979f65 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -62,6 +62,8 @@ VenonatAnimation: INCLUDE "gfx/pokemon/venonat/anim.asm" VenomothAnimation: INCLUDE "gfx/pokemon/venomoth/anim.asm" DiglettAnimation: INCLUDE "gfx/pokemon/diglett/anim.asm" DugtrioAnimation: INCLUDE "gfx/pokemon/dugtrio/anim.asm" +WiglettAnimation: INCLUDE "gfx/pokemon/wiglett/anim.asm" +WugtrioAnimation: INCLUDE "gfx/pokemon/wugtrio/anim.asm" CoinpurAnimation: INCLUDE "gfx/pokemon/coinpur/anim.asm" MeowthAnimation: INCLUDE "gfx/pokemon/meowth/anim.asm" PersianAnimation: INCLUDE "gfx/pokemon/persian/anim.asm" @@ -114,6 +116,7 @@ RibbitoAnimation: INCLUDE "gfx/pokemon/ribbito/anim.asm" CroakozunaAnimation: INCLUDE "gfx/pokemon/croakozuna/anim.asm" FarfetchDAnimation: INCLUDE "gfx/pokemon/farfetch_d/anim.asm" LuxwanAnimation: INCLUDE "gfx/pokemon/luxwan/anim.asm" +DodaerieAnimation: INCLUDE "gfx/pokemon/dodaerie/anim.asm" DoduoAnimation: INCLUDE "gfx/pokemon/doduo/anim.asm" DodrioAnimation: INCLUDE "gfx/pokemon/dodrio/anim.asm" SeelAnimation: INCLUDE "gfx/pokemon/seel/anim.asm" @@ -148,17 +151,24 @@ KoffingAnimation: INCLUDE "gfx/pokemon/koffing/anim.asm" WeezingAnimation: INCLUDE "gfx/pokemon/weezing/anim.asm" RhyhornAnimation: INCLUDE "gfx/pokemon/rhyhorn/anim.asm" RhydonAnimation: INCLUDE "gfx/pokemon/rhydon/anim.asm" +RhyperiorAnimation: INCLUDE "gfx/pokemon/rhyperior/anim.asm" HappinyAnimation: INCLUDE "gfx/pokemon/happiny/anim.asm" ChanseyAnimation: INCLUDE "gfx/pokemon/chansey/anim.asm" +GorillaimoAnimation: INCLUDE "gfx/pokemon/gorillaimo/anim.asm" +CactormusAnimation: INCLUDE "gfx/pokemon/cactormus/anim.asm" BurgelaAnimation: INCLUDE "gfx/pokemon/burgela/anim.asm" TangelaAnimation: INCLUDE "gfx/pokemon/tangela/anim.asm" TangrowthAnimation: INCLUDE "gfx/pokemon/tangrowth/anim.asm" JungelaAnimation: INCLUDE "gfx/pokemon/jungela/anim.asm" +RamooseAnimation: INCLUDE "gfx/pokemon/ramoose/anim.asm" KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm" +TrampelAnimation: INCLUDE "gfx/pokemon/trampel/anim.asm" +AraphantAnimation: INCLUDE "gfx/pokemon/araphant/anim.asm" HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm" SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm" BlastykeAnimation: INCLUDE "gfx/pokemon/blastyke/anim.asm" BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm" +SharpoonAnimation: INCLUDE "gfx/pokemon/sharpoon/anim.asm" OrfryAnimation: INCLUDE "gfx/pokemon/orfry/anim.asm" GoldeenAnimation: INCLUDE "gfx/pokemon/goldeen/anim.asm" SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm" @@ -188,6 +198,7 @@ EeveeAnimation: INCLUDE "gfx/pokemon/eevee/anim.asm" VaporeonAnimation: INCLUDE "gfx/pokemon/vaporeon/anim.asm" JolteonAnimation: INCLUDE "gfx/pokemon/jolteon/anim.asm" FlareonAnimation: INCLUDE "gfx/pokemon/flareon/anim.asm" +PorybitAnimation: INCLUDE "gfx/pokemon/porybit/anim.asm" PorygonAnimation: INCLUDE "gfx/pokemon/porygon/anim.asm" OmanyteAnimation: INCLUDE "gfx/pokemon/omanyte/anim.asm" OmastarAnimation: INCLUDE "gfx/pokemon/omastar/anim.asm" @@ -197,6 +208,7 @@ FeradactylAnimation: INCLUDE "gfx/pokemon/feradactyl/anim.asm" AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim.asm" DecillaAnimation: INCLUDE "gfx/pokemon/decilla/anim.asm" GawarhedAnimation: INCLUDE "gfx/pokemon/gawarhed/anim.asm" +OmegadgeAnimation: INCLUDE "gfx/pokemon/omegadge/anim.asm" MunchlaxAnimation: INCLUDE "gfx/pokemon/munchlax/anim.asm" SnorlaxAnimation: INCLUDE "gfx/pokemon/snorlax/anim.asm" ArticunoAnimation: INCLUDE "gfx/pokemon/articuno/anim.asm" @@ -210,6 +222,8 @@ DragonairAnimation: INCLUDE "gfx/pokemon/dragonair/anim.asm" DragoniteAnimation: INCLUDE "gfx/pokemon/dragonite/anim.asm" MewtwoAnimation: INCLUDE "gfx/pokemon/mewtwo/anim.asm" MewAnimation: INCLUDE "gfx/pokemon/mew/anim.asm" +MeltanAnimation: INCLUDE "gfx/pokemon/meltan/anim.asm" +MelmetalAnimation: INCLUDE "gfx/pokemon/melmetal/anim.asm" ChikoritaAnimation: INCLUDE "gfx/pokemon/chikorita/anim.asm" BayleefAnimation: INCLUDE "gfx/pokemon/bayleef/anim.asm" MeganiumAnimation: INCLUDE "gfx/pokemon/meganium/anim.asm" @@ -281,6 +295,7 @@ UmbreonAnimation: INCLUDE "gfx/pokemon/umbreon/anim.asm" LeafeonAnimation: INCLUDE "gfx/pokemon/leafeon/anim.asm" GlaceonAnimation: INCLUDE "gfx/pokemon/glaceon/anim.asm" SylveonAnimation: INCLUDE "gfx/pokemon/sylveon/anim.asm" +BreezeonAnimation: INCLUDE "gfx/pokemon/breezeon/anim.asm" MurkrowAnimation: INCLUDE "gfx/pokemon/murkrow/anim.asm" HonchkrowAnimation: INCLUDE "gfx/pokemon/honchkrow/anim.asm" SlowkingAnimation: INCLUDE "gfx/pokemon/slowking/anim.asm" @@ -300,6 +315,7 @@ ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim.asm" DunsparceAnimation: INCLUDE "gfx/pokemon/dunsparce/anim.asm" DudunsparceAnimation: INCLUDE "gfx/pokemon/dudunsparce/anim.asm" GligarAnimation: INCLUDE "gfx/pokemon/gligar/anim.asm" +GliscorAnimation: INCLUDE "gfx/pokemon/gliscor/anim.asm" SteelixAnimation: INCLUDE "gfx/pokemon/steelix/anim.asm" SnubbullAnimation: INCLUDE "gfx/pokemon/snubbull/anim.asm" GranbullAnimation: INCLUDE "gfx/pokemon/granbull/anim.asm" @@ -307,11 +323,15 @@ CaretorkerAnimation: INCLUDE "gfx/pokemon/caretorker/anim.asm" QwilfishAnimation: INCLUDE "gfx/pokemon/qwilfish/anim.asm" KazappelinAnimation: INCLUDE "gfx/pokemon/kazappelin/anim.asm" QwilfatherAnimation: INCLUDE "gfx/pokemon/qwilfather/anim.asm" +SailwingAnimation: INCLUDE "gfx/pokemon/sailwing/anim.asm" ScizorAnimation: INCLUDE "gfx/pokemon/scizor/anim.asm" ShuckleAnimation: INCLUDE "gfx/pokemon/shuckle/anim.asm" PockleAnimation: INCLUDE "gfx/pokemon/pockle/anim.asm" HeracrossAnimation: INCLUDE "gfx/pokemon/heracross/anim.asm" SneaselAnimation: INCLUDE "gfx/pokemon/sneasel/anim.asm" +WeavileAnimation: INCLUDE "gfx/pokemon/weavile/anim.asm" +WarfursAnimation: INCLUDE "gfx/pokemon/warfurs/anim.asm" +WearlycanAnimation: INCLUDE "gfx/pokemon/wearlycan/anim.asm" TeddiursaAnimation: INCLUDE "gfx/pokemon/teddiursa/anim.asm" UrsaringAnimation: INCLUDE "gfx/pokemon/ursaring/anim.asm" UrsalunaAnimation: INCLUDE "gfx/pokemon/ursaluna/anim.asm" @@ -341,6 +361,10 @@ StantlerAnimation: INCLUDE "gfx/pokemon/stantler/anim.asm" WyrdeerAnimation: INCLUDE "gfx/pokemon/wyrdeer/anim.asm" SmeargleAnimation: INCLUDE "gfx/pokemon/smeargle/anim.asm" GrenmarAnimation: INCLUDE "gfx/pokemon/grenmar/anim.asm" +BuniceAnimation: INCLUDE "gfx/pokemon/bunice/anim.asm" +BundraAnimation: INCLUDE "gfx/pokemon/bundra/anim.asm" +BunbergAnimation: INCLUDE "gfx/pokemon/bunberg/anim.asm" +BundrakeAnimation: INCLUDE "gfx/pokemon/bundrake/anim.asm" TyrogueAnimation: INCLUDE "gfx/pokemon/tyrogue/anim.asm" HitmontopAnimation: INCLUDE "gfx/pokemon/hitmontop/anim.asm" SmoochumAnimation: INCLUDE "gfx/pokemon/smoochum/anim.asm" @@ -370,11 +394,16 @@ KitsenAnimation: INCLUDE "gfx/pokemon/kitsen/anim.asm" WispiritAnimation: INCLUDE "gfx/pokemon/wispirit/anim.asm" CoatlAnimation: INCLUDE "gfx/pokemon/coatl/anim.asm" MimearAnimation: INCLUDE "gfx/pokemon/mimear/anim.asm" +SnuzzlesAnimation: INCLUDE "gfx/pokemon/snuzzles/anim.asm" +DrilluskAnimation: INCLUDE "gfx/pokemon/drillusk/anim.asm" InoshikaAnimation: INCLUDE "gfx/pokemon/inoshika/anim.asm" RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm" +PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm" +MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm" XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm" XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm" DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm" +AlphalithAnimation: INCLUDE "gfx/pokemon/alphalith/anim.asm" ScreamTailAnimation: INCLUDE "gfx/pokemon/scream_tail/anim.asm" SandyShocksAnimation: INCLUDE "gfx/pokemon/sandy_shocks/anim.asm" GreatTuskAnimation: INCLUDE "gfx/pokemon/great_tusk/anim.asm" diff --git a/gfx/pokemon/araphant/anim.asm b/gfx/pokemon/araphant/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/araphant/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/araphant/anim_idle.asm b/gfx/pokemon/araphant/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/araphant/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/araphant/back.png b/gfx/pokemon/araphant/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/araphant/back.png differ diff --git a/gfx/pokemon/araphant/front.png b/gfx/pokemon/araphant/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/araphant/front.png differ diff --git a/gfx/pokemon/araphant/shiny.pal b/gfx/pokemon/araphant/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/araphant/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 60ad177..d16cde3 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -64,6 +64,8 @@ BitmasksPointers: dw VenomothBitmasks dw DiglettBitmasks dw DugtrioBitmasks + dw WiglettBitmasks + dw WugtrioBitmasks dw CoinpurBitmasks dw MeowthBitmasks dw PersianBitmasks @@ -116,6 +118,7 @@ BitmasksPointers: dw CroakozunaBitmasks dw FarfetchDBitmasks dw LuxwanBitmasks + dw DodaerieBitmasks dw DoduoBitmasks dw DodrioBitmasks dw SeelBitmasks @@ -150,17 +153,24 @@ BitmasksPointers: dw WeezingBitmasks dw RhyhornBitmasks dw RhydonBitmasks + dw RhyperiorBitmasks dw HappinyBitmasks dw ChanseyBitmasks + dw GorillaimoBitmasks + dw CactormusBitmasks dw BurgelaBitmasks dw TangelaBitmasks dw TangrowthBitmasks dw JungelaBitmasks + dw RamooseBitmasks dw KangaskhanBitmasks + dw TrampelBitmasks + dw AraphantBitmasks dw HorseaBitmasks dw SeadraBitmasks dw BlastykeBitmasks dw BlastoiseBitmasks + dw SharpoonBitmasks dw OrfryBitmasks dw GoldeenBitmasks dw SeakingBitmasks @@ -190,6 +200,7 @@ BitmasksPointers: dw VaporeonBitmasks dw JolteonBitmasks dw FlareonBitmasks + dw PorybitBitmasks dw PorygonBitmasks dw OmanyteBitmasks dw OmastarBitmasks @@ -199,6 +210,7 @@ BitmasksPointers: dw AerodactylBitmasks dw DecillaBitmasks dw GawarhedBitmasks + dw OmegadgeBitmasks dw MunchlaxBitmasks dw SnorlaxBitmasks dw ArticunoBitmasks @@ -212,6 +224,8 @@ BitmasksPointers: dw DragoniteBitmasks dw MewtwoBitmasks dw MewBitmasks + dw MeltanBitmasks + dw MelmetalBitmasks dw ChikoritaBitmasks dw BayleefBitmasks dw MeganiumBitmasks @@ -283,6 +297,7 @@ BitmasksPointers: dw LeafeonBitmasks dw GlaceonBitmasks dw SylveonBitmasks + dw BreezeonBitmasks dw MurkrowBitmasks dw HonchkrowBitmasks dw SlowkingBitmasks @@ -302,6 +317,7 @@ BitmasksPointers: dw DunsparceBitmasks dw DudunsparceBitmasks dw GligarBitmasks + dw GliscorBitmasks dw SteelixBitmasks dw SnubbullBitmasks dw GranbullBitmasks @@ -309,11 +325,15 @@ BitmasksPointers: dw QwilfishBitmasks dw KazappelinBitmasks dw QwilfatherBitmasks + dw SailwingBitmasks dw ScizorBitmasks dw ShuckleBitmasks dw PockleBitmasks dw HeracrossBitmasks dw SneaselBitmasks + dw WeavileBitmasks + dw WarfursBitmasks + dw WearlycanBitmasks dw TeddiursaBitmasks dw UrsaringBitmasks dw UrsalunaBitmasks @@ -343,6 +363,10 @@ BitmasksPointers: dw WyrdeerBitmasks dw SmeargleBitmasks dw GrenmarBitmasks + dw BuniceBitmasks + dw BundraBitmasks + dw BunbergBitmasks + dw BundrakeBitmasks dw TyrogueBitmasks dw HitmontopBitmasks dw SmoochumBitmasks @@ -372,11 +396,16 @@ BitmasksPointers: dw WispiritBitmasks dw CoatlBitmasks dw MimearBitmasks + dw SnuzzlesBitmasks + dw DrilluskBitmasks dw InoshikaBitmasks dw RuddernautBitmasks + dw PixytopBitmasks + dw MawtleBitmasks dw XylodonBitmasks dw XylofinBitmasks dw DokuroarBitmasks + dw AlphalithBitmasks dw ScreamTailBitmasks dw SandyShocksBitmasks dw GreatTuskBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index dc009bb..9d50afa 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -62,6 +62,8 @@ VenonatBitmasks: INCLUDE "gfx/pokemon/venonat/bitmask.asm" VenomothBitmasks: INCLUDE "gfx/pokemon/venomoth/bitmask.asm" DiglettBitmasks: INCLUDE "gfx/pokemon/diglett/bitmask.asm" DugtrioBitmasks: INCLUDE "gfx/pokemon/dugtrio/bitmask.asm" +WiglettBitmasks: INCLUDE "gfx/pokemon/wiglett/bitmask.asm" +WugtrioBitmasks: INCLUDE "gfx/pokemon/wugtrio/bitmask.asm" CoinpurBitmasks: INCLUDE "gfx/pokemon/coinpur/bitmask.asm" MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm" PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm" @@ -114,6 +116,7 @@ RibbitoBitmasks: INCLUDE "gfx/pokemon/ribbito/bitmask.asm" CroakozunaBitmasks: INCLUDE "gfx/pokemon/croakozuna/bitmask.asm" FarfetchDBitmasks: INCLUDE "gfx/pokemon/farfetch_d/bitmask.asm" LuxwanBitmasks: INCLUDE "gfx/pokemon/luxwan/bitmask.asm" +DodaerieBitmasks: INCLUDE "gfx/pokemon/dodaerie/bitmask.asm" DoduoBitmasks: INCLUDE "gfx/pokemon/doduo/bitmask.asm" DodrioBitmasks: INCLUDE "gfx/pokemon/dodrio/bitmask.asm" SeelBitmasks: INCLUDE "gfx/pokemon/seel/bitmask.asm" @@ -148,17 +151,24 @@ KoffingBitmasks: INCLUDE "gfx/pokemon/koffing/bitmask.asm" WeezingBitmasks: INCLUDE "gfx/pokemon/weezing/bitmask.asm" RhyhornBitmasks: INCLUDE "gfx/pokemon/rhyhorn/bitmask.asm" RhydonBitmasks: INCLUDE "gfx/pokemon/rhydon/bitmask.asm" +RhyperiorBitmasks: INCLUDE "gfx/pokemon/rhyperior/bitmask.asm" HappinyBitmasks: INCLUDE "gfx/pokemon/happiny/bitmask.asm" ChanseyBitmasks: INCLUDE "gfx/pokemon/chansey/bitmask.asm" +GorillaimoBitmasks: INCLUDE "gfx/pokemon/gorillaimo/bitmask.asm" +CactormusBitmasks: INCLUDE "gfx/pokemon/cactormus/bitmask.asm" BurgelaBitmasks: INCLUDE "gfx/pokemon/burgela/bitmask.asm" TangelaBitmasks: INCLUDE "gfx/pokemon/tangela/bitmask.asm" TangrowthBitmasks: INCLUDE "gfx/pokemon/tangrowth/bitmask.asm" JungelaBitmasks: INCLUDE "gfx/pokemon/jungela/bitmask.asm" +RamooseBitmasks: INCLUDE "gfx/pokemon/ramoose/bitmask.asm" KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm" +TrampelBitmasks: INCLUDE "gfx/pokemon/trampel/bitmask.asm" +AraphantBitmasks: INCLUDE "gfx/pokemon/araphant/bitmask.asm" HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm" SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm" BlastykeBitmasks: INCLUDE "gfx/pokemon/blastyke/bitmask.asm" BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm" +SharpoonBitmasks: INCLUDE "gfx/pokemon/sharpoon/bitmask.asm" OrfryBitmasks: INCLUDE "gfx/pokemon/orfry/bitmask.asm" GoldeenBitmasks: INCLUDE "gfx/pokemon/goldeen/bitmask.asm" SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm" @@ -188,6 +198,7 @@ EeveeBitmasks: INCLUDE "gfx/pokemon/eevee/bitmask.asm" VaporeonBitmasks: INCLUDE "gfx/pokemon/vaporeon/bitmask.asm" JolteonBitmasks: INCLUDE "gfx/pokemon/jolteon/bitmask.asm" FlareonBitmasks: INCLUDE "gfx/pokemon/flareon/bitmask.asm" +PorybitBitmasks: INCLUDE "gfx/pokemon/porybit/bitmask.asm" PorygonBitmasks: INCLUDE "gfx/pokemon/porygon/bitmask.asm" OmanyteBitmasks: INCLUDE "gfx/pokemon/omanyte/bitmask.asm" OmastarBitmasks: INCLUDE "gfx/pokemon/omastar/bitmask.asm" @@ -197,6 +208,7 @@ FeradactylBitmasks: INCLUDE "gfx/pokemon/feradactyl/bitmask.asm" AerodactylBitmasks: INCLUDE "gfx/pokemon/aerodactyl/bitmask.asm" DecillaBitmasks: INCLUDE "gfx/pokemon/decilla/bitmask.asm" GawarhedBitmasks: INCLUDE "gfx/pokemon/gawarhed/bitmask.asm" +OmegadgeBitmasks: INCLUDE "gfx/pokemon/omegadge/bitmask.asm" MunchlaxBitmasks: INCLUDE "gfx/pokemon/munchlax/bitmask.asm" SnorlaxBitmasks: INCLUDE "gfx/pokemon/snorlax/bitmask.asm" ArticunoBitmasks: INCLUDE "gfx/pokemon/articuno/bitmask.asm" @@ -210,6 +222,8 @@ DragonairBitmasks: INCLUDE "gfx/pokemon/dragonair/bitmask.asm" DragoniteBitmasks: INCLUDE "gfx/pokemon/dragonite/bitmask.asm" MewtwoBitmasks: INCLUDE "gfx/pokemon/mewtwo/bitmask.asm" MewBitmasks: INCLUDE "gfx/pokemon/mew/bitmask.asm" +MeltanBitmasks: INCLUDE "gfx/pokemon/meltan/bitmask.asm" +MelmetalBitmasks: INCLUDE "gfx/pokemon/melmetal/bitmask.asm" ChikoritaBitmasks: INCLUDE "gfx/pokemon/chikorita/bitmask.asm" BayleefBitmasks: INCLUDE "gfx/pokemon/bayleef/bitmask.asm" MeganiumBitmasks: INCLUDE "gfx/pokemon/meganium/bitmask.asm" @@ -281,6 +295,7 @@ UmbreonBitmasks: INCLUDE "gfx/pokemon/umbreon/bitmask.asm" LeafeonBitmasks: INCLUDE "gfx/pokemon/leafeon/bitmask.asm" GlaceonBitmasks: INCLUDE "gfx/pokemon/glaceon/bitmask.asm" SylveonBitmasks: INCLUDE "gfx/pokemon/sylveon/bitmask.asm" +BreezeonBitmasks: INCLUDE "gfx/pokemon/breezeon/bitmask.asm" MurkrowBitmasks: INCLUDE "gfx/pokemon/murkrow/bitmask.asm" HonchkrowBitmasks: INCLUDE "gfx/pokemon/honchkrow/bitmask.asm" SlowkingBitmasks: INCLUDE "gfx/pokemon/slowking/bitmask.asm" @@ -300,6 +315,7 @@ ForretressBitmasks: INCLUDE "gfx/pokemon/forretress/bitmask.asm" DunsparceBitmasks: INCLUDE "gfx/pokemon/dunsparce/bitmask.asm" DudunsparceBitmasks: INCLUDE "gfx/pokemon/dudunsparce/bitmask.asm" GligarBitmasks: INCLUDE "gfx/pokemon/gligar/bitmask.asm" +GliscorBitmasks: INCLUDE "gfx/pokemon/diglett/bitmask.asm" SteelixBitmasks: INCLUDE "gfx/pokemon/steelix/bitmask.asm" SnubbullBitmasks: INCLUDE "gfx/pokemon/snubbull/bitmask.asm" GranbullBitmasks: INCLUDE "gfx/pokemon/granbull/bitmask.asm" @@ -307,11 +323,15 @@ CaretorkerBitmasks: INCLUDE "gfx/pokemon/caretorker/bitmask.asm" QwilfishBitmasks: INCLUDE "gfx/pokemon/qwilfish/bitmask.asm" KazappelinBitmasks: INCLUDE "gfx/pokemon/kazappelin/bitmask.asm" QwilfatherBitmasks: INCLUDE "gfx/pokemon/qwilfather/bitmask.asm" +SailwingBitmasks: INCLUDE "gfx/pokemon/sailwing/bitmask.asm" ScizorBitmasks: INCLUDE "gfx/pokemon/scizor/bitmask.asm" ShuckleBitmasks: INCLUDE "gfx/pokemon/shuckle/bitmask.asm" PockleBitmasks: INCLUDE "gfx/pokemon/pockle/bitmask.asm" HeracrossBitmasks: INCLUDE "gfx/pokemon/heracross/bitmask.asm" SneaselBitmasks: INCLUDE "gfx/pokemon/sneasel/bitmask.asm" +WeavileBitmasks: INCLUDE "gfx/pokemon/weavile/bitmask.asm" +WarfursBitmasks: INCLUDE "gfx/pokemon/warfurs/bitmask.asm" +WearlycanBitmasks: INCLUDE "gfx/pokemon/wearlycan/bitmask.asm" TeddiursaBitmasks: INCLUDE "gfx/pokemon/teddiursa/bitmask.asm" UrsaringBitmasks: INCLUDE "gfx/pokemon/ursaring/bitmask.asm" UrsalunaBitmasks: INCLUDE "gfx/pokemon/ursaluna/bitmask.asm" @@ -341,6 +361,10 @@ StantlerBitmasks: INCLUDE "gfx/pokemon/stantler/bitmask.asm" WyrdeerBitmasks: INCLUDE "gfx/pokemon/wyrdeer/bitmask.asm" SmeargleBitmasks: INCLUDE "gfx/pokemon/smeargle/bitmask.asm" GrenmarBitmasks: INCLUDE "gfx/pokemon/grenmar/bitmask.asm" +BuniceBitmasks: INCLUDE "gfx/pokemon/bunice/bitmask.asm" +BundraBitmasks: INCLUDE "gfx/pokemon/bundra/bitmask.asm" +BunbergBitmasks: INCLUDE "gfx/pokemon/bunberg/bitmask.asm" +BundrakeBitmasks: INCLUDE "gfx/pokemon/bundrake/bitmask.asm" TyrogueBitmasks: INCLUDE "gfx/pokemon/tyrogue/bitmask.asm" HitmontopBitmasks: INCLUDE "gfx/pokemon/hitmontop/bitmask.asm" SmoochumBitmasks: INCLUDE "gfx/pokemon/smoochum/bitmask.asm" @@ -370,11 +394,16 @@ KitsenBitmasks: INCLUDE "gfx/pokemon/kitsen/bitmask.asm" WispiritBitmasks: INCLUDE "gfx/pokemon/wispirit/bitmask.asm" CoatlBitmasks: INCLUDE "gfx/pokemon/coatl/bitmask.asm" MimearBitmasks: INCLUDE "gfx/pokemon/mimear/bitmask.asm" +SnuzzlesBitmasks: INCLUDE "gfx/pokemon/snuzzles/bitmask.asm" +DrilluskBitmasks: INCLUDE "gfx/pokemon/drillusk/bitmask.asm" InoshikaBitmasks: INCLUDE "gfx/pokemon/inoshika/bitmask.asm" RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm" +PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm" +MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm" XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm" XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm" DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm" +AlphalithBitmasks: INCLUDE "gfx/pokemon/alphalith/bitmask.asm" ScreamTailBitmasks: INCLUDE "gfx/pokemon/scream_tail/bitmask.asm" SandyShocksBitmasks: INCLUDE "gfx/pokemon/sandy_shocks/bitmask.asm" GreatTuskBitmasks: INCLUDE "gfx/pokemon/great_tusk/bitmask.asm" diff --git a/gfx/pokemon/breezeon/anim.asm b/gfx/pokemon/breezeon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/breezeon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/breezeon/anim_idle.asm b/gfx/pokemon/breezeon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/breezeon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/breezeon/back.png b/gfx/pokemon/breezeon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/breezeon/back.png differ diff --git a/gfx/pokemon/breezeon/front.png b/gfx/pokemon/breezeon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/breezeon/front.png differ diff --git a/gfx/pokemon/breezeon/shiny.pal b/gfx/pokemon/breezeon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/breezeon/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/bunberg/anim.asm b/gfx/pokemon/bunberg/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bunberg/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bunberg/anim_idle.asm b/gfx/pokemon/bunberg/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bunberg/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bunberg/back.png b/gfx/pokemon/bunberg/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/bunberg/back.png differ diff --git a/gfx/pokemon/bunberg/front.png b/gfx/pokemon/bunberg/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/bunberg/front.png differ diff --git a/gfx/pokemon/bunberg/shiny.pal b/gfx/pokemon/bunberg/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bunberg/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/bundra/back.png b/gfx/pokemon/bundra/back.png index 7f7dc6f..9d7ba29 100644 Binary files a/gfx/pokemon/bundra/back.png and b/gfx/pokemon/bundra/back.png differ diff --git a/gfx/pokemon/bundrake/anim.asm b/gfx/pokemon/bundrake/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bundrake/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bundrake/anim_idle.asm b/gfx/pokemon/bundrake/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bundrake/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bundrake/back.png b/gfx/pokemon/bundrake/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/bundrake/back.png differ diff --git a/gfx/pokemon/bundrake/front.png b/gfx/pokemon/bundrake/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/bundrake/front.png differ diff --git a/gfx/pokemon/bundrake/shiny.pal b/gfx/pokemon/bundrake/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bundrake/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/bunice/anim.asm b/gfx/pokemon/bunice/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bunice/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bunice/anim_idle.asm b/gfx/pokemon/bunice/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bunice/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bunice/back.png b/gfx/pokemon/bunice/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/bunice/back.png differ diff --git a/gfx/pokemon/bunice/front.png b/gfx/pokemon/bunice/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/bunice/front.png differ diff --git a/gfx/pokemon/bunice/shiny.pal b/gfx/pokemon/bunice/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bunice/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/cactormus/anim.asm b/gfx/pokemon/cactormus/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/cactormus/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/cactormus/anim_idle.asm b/gfx/pokemon/cactormus/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/cactormus/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/cactormus/back.png b/gfx/pokemon/cactormus/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/cactormus/back.png differ diff --git a/gfx/pokemon/cactormus/front.png b/gfx/pokemon/cactormus/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/cactormus/front.png differ diff --git a/gfx/pokemon/cactormus/shiny.pal b/gfx/pokemon/cactormus/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/cactormus/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/drillusk/anim.asm b/gfx/pokemon/drillusk/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/drillusk/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/drillusk/anim_idle.asm b/gfx/pokemon/drillusk/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/drillusk/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/drillusk/back.png b/gfx/pokemon/drillusk/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/drillusk/back.png differ diff --git a/gfx/pokemon/drillusk/front.png b/gfx/pokemon/drillusk/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/drillusk/front.png differ diff --git a/gfx/pokemon/drillusk/shiny.pal b/gfx/pokemon/drillusk/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/drillusk/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index f3828de..c8b4fd4 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -64,6 +64,8 @@ FramesPointers: dba VenomothFrames dba DiglettFrames dba DugtrioFrames + dba WiglettFrames + dba WugtrioFrames dba CoinpurFrames dba MeowthFrames dba PersianFrames @@ -116,6 +118,7 @@ FramesPointers: dba CroakozunaFrames dba FarfetchDFrames dba LuxwanFrames + dba DodaerieFrames dba DoduoFrames dba DodrioFrames dba SeelFrames @@ -150,17 +153,24 @@ FramesPointers: dba WeezingFrames dba RhyhornFrames dba RhydonFrames + dba RhyperiorFrames dba HappinyFrames dba ChanseyFrames + dba GorillaimoFrames + dba CactormusFrames dba BurgelaFrames dba TangelaFrames dba TangrowthFrames dba JungelaFrames + dba RamooseFrames dba KangaskhanFrames + dba TrampelFrames + dba AraphantFrames dba HorseaFrames dba SeadraFrames dba BlastykeFrames dba BlastoiseFrames + dba SharpoonFrames dba OrfryFrames dba GoldeenFrames dba SeakingFrames @@ -190,6 +200,7 @@ FramesPointers: dba VaporeonFrames dba JolteonFrames dba FlareonFrames + dba PorybitFrames dba PorygonFrames dba OmanyteFrames dba OmastarFrames @@ -199,6 +210,7 @@ FramesPointers: dba AerodactylFrames dba DecillaFrames dba GawarhedFrames + dba OmegadgeFrames dba MunchlaxFrames dba SnorlaxFrames dba ArticunoFrames @@ -212,6 +224,8 @@ FramesPointers: dba DragoniteFrames dba MewtwoFrames dba MewFrames + dba MeltanFrames + dba MelmetalFrames dba ChikoritaFrames dba BayleefFrames dba MeganiumFrames @@ -283,6 +297,7 @@ FramesPointers: dba LeafeonFrames dba GlaceonFrames dba SylveonFrames + dba BreezeonFrames dba MurkrowFrames dba HonchkrowFrames dba SlowkingFrames @@ -302,6 +317,7 @@ FramesPointers: dba DunsparceFrames dba DudunsparceFrames dba GligarFrames + dba GliscorFrames dba SteelixFrames dba SnubbullFrames dba GranbullFrames @@ -309,11 +325,15 @@ FramesPointers: dba QwilfishFrames dba KazappelinFrames dba QwilfatherFrames + dba SailwingFrames dba ScizorFrames dba ShuckleFrames dba PockleFrames dba HeracrossFrames dba SneaselFrames + dba WeavileFrames + dba WarfursFrames + dba WearlycanFrames dba TeddiursaFrames dba UrsaringFrames dba UrsalunaFrames @@ -343,6 +363,10 @@ FramesPointers: dba WyrdeerFrames dba SmeargleFrames dba GrenmarFrames + dba BuniceFrames + dba BundraFrames + dba BunbergFrames + dba BundrakeFrames dba TyrogueFrames dba HitmontopFrames dba SmoochumFrames @@ -372,11 +396,16 @@ FramesPointers: dba WispiritFrames dba CoatlFrames dba MimearFrames + dba SnuzzlesFrames + dba DrilluskFrames dba InoshikaFrames dba RuddernautFrames + dba PixytopFrames + dba MawtleFrames dba XylodonFrames dba XylofinFrames dba DokuroarFrames + dba AlphalithFrames dba ScreamTailFrames dba SandyShocksFrames dba GreatTuskFrames diff --git a/gfx/pokemon/gliscor/anim.asm b/gfx/pokemon/gliscor/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gliscor/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gliscor/anim_idle.asm b/gfx/pokemon/gliscor/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gliscor/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gliscor/back.png b/gfx/pokemon/gliscor/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gliscor/back.png differ diff --git a/gfx/pokemon/gliscor/front.png b/gfx/pokemon/gliscor/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gliscor/front.png differ diff --git a/gfx/pokemon/gliscor/shiny.pal b/gfx/pokemon/gliscor/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gliscor/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/gorillaimo/anim.asm b/gfx/pokemon/gorillaimo/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorillaimo/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorillaimo/anim_idle.asm b/gfx/pokemon/gorillaimo/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorillaimo/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorillaimo/back.png b/gfx/pokemon/gorillaimo/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gorillaimo/back.png differ diff --git a/gfx/pokemon/gorillaimo/front.png b/gfx/pokemon/gorillaimo/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gorillaimo/front.png differ diff --git a/gfx/pokemon/gorillaimo/shiny.pal b/gfx/pokemon/gorillaimo/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gorillaimo/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 937d7d8..f3ae200 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -64,6 +64,8 @@ AnimationIdlePointers: dw VenomothAnimationIdle dw DiglettAnimationIdle dw DugtrioAnimationIdle + dw WiglettAnimationIdle + dw WugtrioAnimationIdle dw CoinpurAnimationIdle dw MeowthAnimationIdle dw PersianAnimationIdle @@ -116,6 +118,7 @@ AnimationIdlePointers: dw CroakozunaAnimationIdle dw FarfetchDAnimationIdle dw LuxwanAnimationIdle + dw DodaerieAnimationIdle dw DoduoAnimationIdle dw DodrioAnimationIdle dw SeelAnimationIdle @@ -150,17 +153,24 @@ AnimationIdlePointers: dw WeezingAnimationIdle dw RhyhornAnimationIdle dw RhydonAnimationIdle + dw RhyperiorAnimationIdle dw HappinyAnimationIdle dw ChanseyAnimationIdle + dw GorillaimoAnimationIdle + dw CactormusAnimationIdle dw BurgelaAnimationIdle dw TangelaAnimationIdle dw TangrowthAnimationIdle dw JungelaAnimationIdle + dw RamooseAnimationIdle dw KangaskhanAnimationIdle + dw TrampelAnimationIdle + dw AraphantAnimationIdle dw HorseaAnimationIdle dw SeadraAnimationIdle dw BlastykeAnimationIdle dw BlastoiseAnimationIdle + dw SharpoonAnimationIdle dw OrfryAnimationIdle dw GoldeenAnimationIdle dw SeakingAnimationIdle @@ -190,6 +200,7 @@ AnimationIdlePointers: dw VaporeonAnimationIdle dw JolteonAnimationIdle dw FlareonAnimationIdle + dw PorybitAnimationIdle dw PorygonAnimationIdle dw OmanyteAnimationIdle dw OmastarAnimationIdle @@ -199,6 +210,7 @@ AnimationIdlePointers: dw AerodactylAnimationIdle dw DecillaAnimationIdle dw GawarhedAnimationIdle + dw OmegadgeAnimationIdle dw MunchlaxAnimationIdle dw SnorlaxAnimationIdle dw ArticunoAnimationIdle @@ -212,6 +224,8 @@ AnimationIdlePointers: dw DragoniteAnimationIdle dw MewtwoAnimationIdle dw MewAnimationIdle + dw MeltanAnimationIdle + dw MelmetalAnimationIdle dw ChikoritaAnimationIdle dw BayleefAnimationIdle dw MeganiumAnimationIdle @@ -283,6 +297,7 @@ AnimationIdlePointers: dw LeafeonAnimationIdle dw GlaceonAnimationIdle dw SylveonAnimationIdle + dw BreezeonAnimationIdle dw MurkrowAnimationIdle dw HonchkrowAnimationIdle dw SlowkingAnimationIdle @@ -302,6 +317,7 @@ AnimationIdlePointers: dw DunsparceAnimationIdle dw DudunsparceAnimationIdle dw GligarAnimationIdle + dw GliscorAnimationIdle dw SteelixAnimationIdle dw SnubbullAnimationIdle dw GranbullAnimationIdle @@ -309,11 +325,15 @@ AnimationIdlePointers: dw QwilfishAnimationIdle dw KazappelinAnimationIdle dw QwilfatherAnimationIdle + dw SailwingAnimationIdle dw ScizorAnimationIdle dw ShuckleAnimationIdle dw PockleAnimationIdle dw HeracrossAnimationIdle dw SneaselAnimationIdle + dw WeavileAnimationIdle + dw WarfursAnimationIdle + dw WearlycanAnimationIdle dw TeddiursaAnimationIdle dw UrsaringAnimationIdle dw UrsalunaAnimationIdle @@ -343,6 +363,10 @@ AnimationIdlePointers: dw WyrdeerAnimationIdle dw SmeargleAnimationIdle dw GrenmarAnimationIdle + dw BuniceAnimationIdle + dw BundraAnimationIdle + dw BunbergAnimationIdle + dw BundrakeAnimationIdle dw TyrogueAnimationIdle dw HitmontopAnimationIdle dw SmoochumAnimationIdle @@ -372,11 +396,16 @@ AnimationIdlePointers: dw WispiritAnimationIdle dw CoatlAnimationIdle dw MimearAnimationIdle + dw SnuzzlesAnimationIdle + dw DrilluskAnimationIdle dw InoshikaAnimationIdle dw RuddernautAnimationIdle + dw PixytopAnimationIdle + dw MawtleAnimationIdle dw XylodonAnimationIdle dw XylofinAnimationIdle dw DokuroarAnimationIdle + dw AlphalithAnimationIdle dw ScreamTailAnimationIdle dw SandyShocksAnimationIdle dw GreatTuskAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 8e83b56..5f94472 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -62,6 +62,8 @@ VenonatAnimationIdle: INCLUDE "gfx/pokemon/venonat/anim_idle.asm" VenomothAnimationIdle: INCLUDE "gfx/pokemon/venomoth/anim_idle.asm" DiglettAnimationIdle: INCLUDE "gfx/pokemon/diglett/anim_idle.asm" DugtrioAnimationIdle: INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm" +WiglettAnimationIdle: INCLUDE "gfx/pokemon/wiglett/anim_idle.asm" +WugtrioAnimationIdle: INCLUDE "gfx/pokemon/wugtrio/anim_idle.asm" CoinpurAnimationIdle: INCLUDE "gfx/pokemon/coinpur/anim_idle.asm" MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm" PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm" @@ -114,6 +116,7 @@ RibbitoAnimationIdle: INCLUDE "gfx/pokemon/ribbito/anim_idle.asm" CroakozunaAnimationIdle: INCLUDE "gfx/pokemon/croakozuna/anim_idle.asm" FarfetchDAnimationIdle: INCLUDE "gfx/pokemon/farfetch_d/anim_idle.asm" LuxwanAnimationIdle: INCLUDE "gfx/pokemon/luxwan/anim_idle.asm" +DodaerieAnimationIdle: INCLUDE "gfx/pokemon/dodaerie/anim_idle.asm" DoduoAnimationIdle: INCLUDE "gfx/pokemon/doduo/anim_idle.asm" DodrioAnimationIdle: INCLUDE "gfx/pokemon/dodrio/anim_idle.asm" SeelAnimationIdle: INCLUDE "gfx/pokemon/seel/anim_idle.asm" @@ -148,17 +151,24 @@ KoffingAnimationIdle: INCLUDE "gfx/pokemon/koffing/anim_idle.asm" WeezingAnimationIdle: INCLUDE "gfx/pokemon/weezing/anim_idle.asm" RhyhornAnimationIdle: INCLUDE "gfx/pokemon/rhyhorn/anim_idle.asm" RhydonAnimationIdle: INCLUDE "gfx/pokemon/rhydon/anim_idle.asm" +RhyperiorAnimationIdle: INCLUDE "gfx/pokemon/rhyperior/anim_idle.asm" HappinyAnimationIdle: INCLUDE "gfx/pokemon/happiny/anim_idle.asm" ChanseyAnimationIdle: INCLUDE "gfx/pokemon/chansey/anim_idle.asm" +GorillaimoAnimationIdle: INCLUDE "gfx/pokemon/gorillaimo/anim_idle.asm" +CactormusAnimationIdle: INCLUDE "gfx/pokemon/cactormus/anim_idle.asm" BurgelaAnimationIdle: INCLUDE "gfx/pokemon/burgela/anim_idle.asm" TangelaAnimationIdle: INCLUDE "gfx/pokemon/tangela/anim_idle.asm" TangrowthAnimationIdle: INCLUDE "gfx/pokemon/tangrowth/anim_idle.asm" JungelaAnimationIdle: INCLUDE "gfx/pokemon/jungela/anim_idle.asm" +RamooseAnimationIdle: INCLUDE "gfx/pokemon/ramoose/anim_idle.asm" KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm" +TrampelAnimationIdle: INCLUDE "gfx/pokemon/trampel/anim_idle.asm" +AraphantAnimationIdle: INCLUDE "gfx/pokemon/araphant/anim_idle.asm" HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm" SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/anim_idle.asm" BlastykeAnimationIdle: INCLUDE "gfx/pokemon/blastyke/anim_idle.asm" BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm" +SharpoonAnimationIdle: INCLUDE "gfx/pokemon/sharpoon/anim_idle.asm" OrfryAnimationIdle: INCLUDE "gfx/pokemon/orfry/anim_idle.asm" GoldeenAnimationIdle: INCLUDE "gfx/pokemon/goldeen/anim_idle.asm" SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm" @@ -188,6 +198,7 @@ EeveeAnimationIdle: INCLUDE "gfx/pokemon/eevee/anim_idle.asm" VaporeonAnimationIdle: INCLUDE "gfx/pokemon/vaporeon/anim_idle.asm" JolteonAnimationIdle: INCLUDE "gfx/pokemon/jolteon/anim_idle.asm" FlareonAnimationIdle: INCLUDE "gfx/pokemon/flareon/anim_idle.asm" +PorybitAnimationIdle: INCLUDE "gfx/pokemon/porybit/anim_idle.asm" PorygonAnimationIdle: INCLUDE "gfx/pokemon/porygon/anim_idle.asm" OmanyteAnimationIdle: INCLUDE "gfx/pokemon/omanyte/anim_idle.asm" OmastarAnimationIdle: INCLUDE "gfx/pokemon/omastar/anim_idle.asm" @@ -197,6 +208,7 @@ FeradactylAnimationIdle: INCLUDE "gfx/pokemon/feradactyl/anim_idle.asm" AerodactylAnimationIdle: INCLUDE "gfx/pokemon/aerodactyl/anim_idle.asm" DecillaAnimationIdle: INCLUDE "gfx/pokemon/decilla/anim_idle.asm" GawarhedAnimationIdle: INCLUDE "gfx/pokemon/gawarhed/anim_idle.asm" +OmegadgeAnimationIdle: INCLUDE "gfx/pokemon/omegadge/anim_idle.asm" MunchlaxAnimationIdle: INCLUDE "gfx/pokemon/munchlax/anim_idle.asm" SnorlaxAnimationIdle: INCLUDE "gfx/pokemon/snorlax/anim_idle.asm" ArticunoAnimationIdle: INCLUDE "gfx/pokemon/articuno/anim_idle.asm" @@ -210,6 +222,8 @@ DragonairAnimationIdle: INCLUDE "gfx/pokemon/dragonair/anim_idle.asm" DragoniteAnimationIdle: INCLUDE "gfx/pokemon/dragonite/anim_idle.asm" MewtwoAnimationIdle: INCLUDE "gfx/pokemon/mewtwo/anim_idle.asm" MewAnimationIdle: INCLUDE "gfx/pokemon/mew/anim_idle.asm" +MeltanAnimationIdle: INCLUDE "gfx/pokemon/meltan/anim_idle.asm" +MelmetalAnimationIdle: INCLUDE "gfx/pokemon/melmetal/anim_idle.asm" ChikoritaAnimationIdle: INCLUDE "gfx/pokemon/chikorita/anim_idle.asm" BayleefAnimationIdle: INCLUDE "gfx/pokemon/bayleef/anim_idle.asm" MeganiumAnimationIdle: INCLUDE "gfx/pokemon/meganium/anim_idle.asm" @@ -281,6 +295,7 @@ UmbreonAnimationIdle: INCLUDE "gfx/pokemon/umbreon/anim_idle.asm" LeafeonAnimationIdle: INCLUDE "gfx/pokemon/leafeon/anim_idle.asm" GlaceonAnimationIdle: INCLUDE "gfx/pokemon/glaceon/anim_idle.asm" SylveonAnimationIdle: INCLUDE "gfx/pokemon/sylveon/anim_idle.asm" +BreezeonAnimationIdle: INCLUDE "gfx/pokemon/breezeon/anim_idle.asm" MurkrowAnimationIdle: INCLUDE "gfx/pokemon/murkrow/anim_idle.asm" HonchkrowAnimationIdle: INCLUDE "gfx/pokemon/honchkrow/anim_idle.asm" SlowkingAnimationIdle: INCLUDE "gfx/pokemon/slowking/anim_idle.asm" @@ -300,6 +315,7 @@ ForretressAnimationIdle: INCLUDE "gfx/pokemon/forretress/anim_idle.asm" DunsparceAnimationIdle: INCLUDE "gfx/pokemon/dunsparce/anim_idle.asm" DudunsparceAnimationIdle: INCLUDE "gfx/pokemon/dudunsparce/anim_idle.asm" GligarAnimationIdle: INCLUDE "gfx/pokemon/gligar/anim_idle.asm" +GliscorAnimationIdle: INCLUDE "gfx/pokemon/gliscor/anim_idle.asm" SteelixAnimationIdle: INCLUDE "gfx/pokemon/steelix/anim_idle.asm" SnubbullAnimationIdle: INCLUDE "gfx/pokemon/snubbull/anim_idle.asm" GranbullAnimationIdle: INCLUDE "gfx/pokemon/granbull/anim_idle.asm" @@ -307,11 +323,15 @@ CaretorkerAnimationIdle: INCLUDE "gfx/pokemon/caretorker/anim_idle.asm" QwilfishAnimationIdle: INCLUDE "gfx/pokemon/qwilfish/anim_idle.asm" KazappelinAnimationIdle: INCLUDE "gfx/pokemon/kazappelin/anim_idle.asm" QwilfatherAnimationIdle: INCLUDE "gfx/pokemon/qwilfather/anim_idle.asm" +SailwingAnimationIdle: INCLUDE "gfx/pokemon/sailwing/anim_idle.asm" ScizorAnimationIdle: INCLUDE "gfx/pokemon/scizor/anim_idle.asm" ShuckleAnimationIdle: INCLUDE "gfx/pokemon/shuckle/anim_idle.asm" PockleAnimationIdle: INCLUDE "gfx/pokemon/pockle/anim_idle.asm" HeracrossAnimationIdle: INCLUDE "gfx/pokemon/heracross/anim_idle.asm" SneaselAnimationIdle: INCLUDE "gfx/pokemon/sneasel/anim_idle.asm" +WeavileAnimationIdle: INCLUDE "gfx/pokemon/weavile/anim_idle.asm" +WarfursAnimationIdle: INCLUDE "gfx/pokemon/warfurs/anim_idle.asm" +WearlycanAnimationIdle: INCLUDE "gfx/pokemon/wearlycan/anim_idle.asm" TeddiursaAnimationIdle: INCLUDE "gfx/pokemon/teddiursa/anim_idle.asm" UrsaringAnimationIdle: INCLUDE "gfx/pokemon/ursaring/anim_idle.asm" UrsalunaAnimationIdle: INCLUDE "gfx/pokemon/ursaluna/anim_idle.asm" @@ -341,6 +361,10 @@ StantlerAnimationIdle: INCLUDE "gfx/pokemon/stantler/anim_idle.asm" WyrdeerAnimationIdle: INCLUDE "gfx/pokemon/wyrdeer/anim_idle.asm" SmeargleAnimationIdle: INCLUDE "gfx/pokemon/smeargle/anim_idle.asm" GrenmarAnimationIdle: INCLUDE "gfx/pokemon/grenmar/anim_idle.asm" +BuniceAnimationIdle: INCLUDE "gfx/pokemon/bunice/anim_idle.asm" +BundraAnimationIdle: INCLUDE "gfx/pokemon/bundra/anim_idle.asm" +BunbergAnimationIdle: INCLUDE "gfx/pokemon/bunberg/anim_idle.asm" +BundrakeAnimationIdle: INCLUDE "gfx/pokemon/bundrake/anim_idle.asm" TyrogueAnimationIdle: INCLUDE "gfx/pokemon/tyrogue/anim_idle.asm" HitmontopAnimationIdle: INCLUDE "gfx/pokemon/hitmontop/anim_idle.asm" SmoochumAnimationIdle: INCLUDE "gfx/pokemon/smoochum/anim_idle.asm" @@ -370,11 +394,16 @@ KitsenAnimationIdle: INCLUDE "gfx/pokemon/kitsen/anim_idle.asm" WispiritAnimationIdle: INCLUDE "gfx/pokemon/wispirit/anim_idle.asm" CoatlAnimationIdle: INCLUDE "gfx/pokemon/coatl/anim_idle.asm" MimearAnimationIdle: INCLUDE "gfx/pokemon/mimear/anim_idle.asm" +SnuzzlesAnimationIdle: INCLUDE "gfx/pokemon/snuzzles/anim_idle.asm" +DrilluskAnimationIdle: INCLUDE "gfx/pokemon/drillusk/anim_idle.asm" InoshikaAnimationIdle: INCLUDE "gfx/pokemon/inoshika/anim_idle.asm" RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm" +PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm" +MawtleAnimationIdle: INCLUDE "gfx/pokemon/mawtle/anim_idle.asm" XylodonAnimationIdle: INCLUDE "gfx/pokemon/xylodon/anim_idle.asm" XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm" DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm" +AlphalithAnimationIdle: INCLUDE "gfx/pokemon/alphalith/anim_idle.asm" ScreamTailAnimationIdle: INCLUDE "gfx/pokemon/scream_tail/anim_idle.asm" SandyShocksAnimationIdle: INCLUDE "gfx/pokemon/sandy_shocks/anim_idle.asm" GreatTuskAnimationIdle: INCLUDE "gfx/pokemon/great_tusk/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index e899e49..c48ab7d 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -71,6 +71,7 @@ UmbreonFrames: INCLUDE "gfx/pokemon/umbreon/frames.asm" LeafeonFrames: INCLUDE "gfx/pokemon/leafeon/frames.asm" GlaceonFrames: INCLUDE "gfx/pokemon/glaceon/frames.asm" SylveonFrames: INCLUDE "gfx/pokemon/sylveon/frames.asm" +BreezeonFrames: INCLUDE "gfx/pokemon/breezeon/frames.asm" MurkrowFrames: INCLUDE "gfx/pokemon/murkrow/frames.asm" HonchkrowFrames: INCLUDE "gfx/pokemon/honchkrow/frames.asm" SlowkingFrames: INCLUDE "gfx/pokemon/slowking/frames.asm" @@ -90,6 +91,7 @@ ForretressFrames: INCLUDE "gfx/pokemon/forretress/frames.asm" DunsparceFrames: INCLUDE "gfx/pokemon/dunsparce/frames.asm" DudunsparceFrames: INCLUDE "gfx/pokemon/dudunsparce/frames.asm" GligarFrames: INCLUDE "gfx/pokemon/gligar/frames.asm" +GliscorFrames: INCLUDE "gfx/pokemon/gliscor/frames.asm" SteelixFrames: INCLUDE "gfx/pokemon/steelix/frames.asm" SnubbullFrames: INCLUDE "gfx/pokemon/snubbull/frames.asm" GranbullFrames: INCLUDE "gfx/pokemon/granbull/frames.asm" @@ -97,11 +99,15 @@ CaretorkerFrames: INCLUDE "gfx/pokemon/caretorker/frames.asm" QwilfishFrames: INCLUDE "gfx/pokemon/qwilfish/frames.asm" KazappelinFrames: INCLUDE "gfx/pokemon/kazappelin/frames.asm" QwilfatherFrames: INCLUDE "gfx/pokemon/qwilfather/frames.asm" +SailwingFrames: INCLUDE "gfx/pokemon/sailwing/frames.asm" ScizorFrames: INCLUDE "gfx/pokemon/scizor/frames.asm" ShuckleFrames: INCLUDE "gfx/pokemon/shuckle/frames.asm" PockleFrames: INCLUDE "gfx/pokemon/pockle/frames.asm" HeracrossFrames: INCLUDE "gfx/pokemon/heracross/frames.asm" SneaselFrames: INCLUDE "gfx/pokemon/sneasel/frames.asm" +WeavileFrames: INCLUDE "gfx/pokemon/weavile/frames.asm" +WarfursFrames: INCLUDE "gfx/pokemon/warfurs/frames.asm" +WearlycanFrames: INCLUDE "gfx/pokemon/wearlycan/frames.asm" TeddiursaFrames: INCLUDE "gfx/pokemon/teddiursa/frames.asm" UrsaringFrames: INCLUDE "gfx/pokemon/ursaring/frames.asm" UrsalunaFrames: INCLUDE "gfx/pokemon/ursaluna/frames.asm" @@ -131,6 +137,10 @@ StantlerFrames: INCLUDE "gfx/pokemon/stantler/frames.asm" WyrdeerFrames: INCLUDE "gfx/pokemon/wyrdeer/frames.asm" SmeargleFrames: INCLUDE "gfx/pokemon/smeargle/frames.asm" GrenmarFrames: INCLUDE "gfx/pokemon/grenmar/frames.asm" +BuniceFrames: INCLUDE "gfx/pokemon/bunice/frames.asm" +BundraFrames: INCLUDE "gfx/pokemon/bundra/frames.asm" +BunbergFrames: INCLUDE "gfx/pokemon/bunberg/frames.asm" +BundrakeFrames: INCLUDE "gfx/pokemon/bundrake/frames.asm" TyrogueFrames: INCLUDE "gfx/pokemon/tyrogue/frames.asm" HitmontopFrames: INCLUDE "gfx/pokemon/hitmontop/frames.asm" SmoochumFrames: INCLUDE "gfx/pokemon/smoochum/frames.asm" @@ -160,11 +170,16 @@ KitsenFrames: INCLUDE "gfx/pokemon/kitsen/frames.asm" WispiritFrames: INCLUDE "gfx/pokemon/wispirit/frames.asm" CoatlFrames: INCLUDE "gfx/pokemon/coatl/frames.asm" MimearFrames: INCLUDE "gfx/pokemon/mimear/frames.asm" +SnuzzlesFrames: INCLUDE "gfx/pokemon/snuzzles/frames.asm" +DrilluskFrames: INCLUDE "gfx/pokemon/drillusk/frames.asm" InoshikaFrames: INCLUDE "gfx/pokemon/inoshika/frames.asm" RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm" +PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm" +MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm" XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm" XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm" DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm" +AlphalithFrames: INCLUDE "gfx/pokemon/alphalith/frames.asm" ScreamTailFrames: INCLUDE "gfx/pokemon/scream_tail/frames.asm" SandyShocksFrames: INCLUDE "gfx/pokemon/sandy_shocks/frames.asm" GreatTuskFrames: INCLUDE "gfx/pokemon/great_tusk/frames.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 07eb618..f11c1bf 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -64,6 +64,8 @@ VenonatFrames: INCLUDE "gfx/pokemon/venonat/frames.asm" VenomothFrames: INCLUDE "gfx/pokemon/venomoth/frames.asm" DiglettFrames: INCLUDE "gfx/pokemon/diglett/frames.asm" DugtrioFrames: INCLUDE "gfx/pokemon/dugtrio/frames.asm" +WiglettFrames: INCLUDE "gfx/pokemon/wiglett/frames.asm" +WugtrioFrames: INCLUDE "gfx/pokemon/wugtrio/frames.asm" CoinpurFrames: INCLUDE "gfx/pokemon/coinpur/frames.asm" MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm" PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm" @@ -116,6 +118,7 @@ RibbitoFrames: INCLUDE "gfx/pokemon/ribbito/frames.asm" CroakozunaFrames: INCLUDE "gfx/pokemon/croakozuna/frames.asm" FarfetchDFrames: INCLUDE "gfx/pokemon/farfetch_d/frames.asm" LuxwanFrames: INCLUDE "gfx/pokemon/luxwan/frames.asm" +DodaerieFrames: INCLUDE "gfx/pokemon/dodaerie/frames.asm" DoduoFrames: INCLUDE "gfx/pokemon/doduo/frames.asm" DodrioFrames: INCLUDE "gfx/pokemon/dodrio/frames.asm" SeelFrames: INCLUDE "gfx/pokemon/seel/frames.asm" @@ -150,17 +153,24 @@ KoffingFrames: INCLUDE "gfx/pokemon/koffing/frames.asm" WeezingFrames: INCLUDE "gfx/pokemon/weezing/frames.asm" RhyhornFrames: INCLUDE "gfx/pokemon/rhyhorn/frames.asm" RhydonFrames: INCLUDE "gfx/pokemon/rhydon/frames.asm" +RhyperiorFrames: INCLUDE "gfx/pokemon/rhyperior/frames.asm" HappinyFrames: INCLUDE "gfx/pokemon/happiny/frames.asm" ChanseyFrames: INCLUDE "gfx/pokemon/chansey/frames.asm" +GorillaimoFrames: INCLUDE "gfx/pokemon/gorillaimo/frames.asm" +CactormusFrames: INCLUDE "gfx/pokemon/cactormus/frames.asm" BurgelaFrames: INCLUDE "gfx/pokemon/burgela/frames.asm" TangelaFrames: INCLUDE "gfx/pokemon/tangela/frames.asm" TangrowthFrames: INCLUDE "gfx/pokemon/tangrowth/frames.asm" JungelaFrames: INCLUDE "gfx/pokemon/jungela/frames.asm" +RamooseFrames: INCLUDE "gfx/pokemon/ramoose/frames.asm" KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm" +TrampelFrames: INCLUDE "gfx/pokemon/trampel/frames.asm" +AraphantFrames: INCLUDE "gfx/pokemon/araphant/frames.asm" HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm" SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm" BlastykeFrames: INCLUDE "gfx/pokemon/blastyke/frames.asm" BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm" +SharpoonFrames: INCLUDE "gfx/pokemon/sharpoon/frames.asm" OrfryFrames: INCLUDE "gfx/pokemon/orfry/frames.asm" GoldeenFrames: INCLUDE "gfx/pokemon/goldeen/frames.asm" SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm" @@ -190,6 +200,7 @@ EeveeFrames: INCLUDE "gfx/pokemon/eevee/frames.asm" VaporeonFrames: INCLUDE "gfx/pokemon/vaporeon/frames.asm" JolteonFrames: INCLUDE "gfx/pokemon/jolteon/frames.asm" FlareonFrames: INCLUDE "gfx/pokemon/flareon/frames.asm" +PorybitFrames: INCLUDE "gfx/pokemon/porybit/frames.asm" PorygonFrames: INCLUDE "gfx/pokemon/porygon/frames.asm" OmanyteFrames: INCLUDE "gfx/pokemon/omanyte/frames.asm" OmastarFrames: INCLUDE "gfx/pokemon/omastar/frames.asm" @@ -199,6 +210,7 @@ FeradactylFrames: INCLUDE "gfx/pokemon/feradactyl/frames.asm" AerodactylFrames: INCLUDE "gfx/pokemon/aerodactyl/frames.asm" DecillaFrames: INCLUDE "gfx/pokemon/decilla/frames.asm" GawarhedFrames: INCLUDE "gfx/pokemon/gawarhed/frames.asm" +OmegadgeFrames: INCLUDE "gfx/pokemon/omegadge/frames.asm" MunchlaxFrames: INCLUDE "gfx/pokemon/munchlax/frames.asm" SnorlaxFrames: INCLUDE "gfx/pokemon/snorlax/frames.asm" ArticunoFrames: INCLUDE "gfx/pokemon/articuno/frames.asm" @@ -212,3 +224,5 @@ DragonairFrames: INCLUDE "gfx/pokemon/dragonair/frames.asm" DragoniteFrames: INCLUDE "gfx/pokemon/dragonite/frames.asm" MewtwoFrames: INCLUDE "gfx/pokemon/mewtwo/frames.asm" MewFrames: INCLUDE "gfx/pokemon/mew/frames.asm" +MeltanFrames: INCLUDE "gfx/pokemon/meltan/frames.asm" +MelmetalFrames: INCLUDE "gfx/pokemon/melmetal/frames.asm" diff --git a/gfx/pokemon/mawtle/anim.asm b/gfx/pokemon/mawtle/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/mawtle/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/mawtle/anim_idle.asm b/gfx/pokemon/mawtle/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/mawtle/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/mawtle/back.png b/gfx/pokemon/mawtle/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/mawtle/back.png differ diff --git a/gfx/pokemon/mawtle/front.png b/gfx/pokemon/mawtle/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/mawtle/front.png differ diff --git a/gfx/pokemon/mawtle/shiny.pal b/gfx/pokemon/mawtle/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/mawtle/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/melmetal/anim.asm b/gfx/pokemon/melmetal/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/melmetal/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/melmetal/anim_idle.asm b/gfx/pokemon/melmetal/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/melmetal/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/melmetal/back.png b/gfx/pokemon/melmetal/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/melmetal/back.png differ diff --git a/gfx/pokemon/melmetal/front.png b/gfx/pokemon/melmetal/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/melmetal/front.png differ diff --git a/gfx/pokemon/melmetal/shiny.pal b/gfx/pokemon/melmetal/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/melmetal/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/meltan/anim.asm b/gfx/pokemon/meltan/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/meltan/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/meltan/anim_idle.asm b/gfx/pokemon/meltan/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/meltan/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/meltan/back.png b/gfx/pokemon/meltan/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/meltan/back.png differ diff --git a/gfx/pokemon/meltan/front.png b/gfx/pokemon/meltan/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/meltan/front.png differ diff --git a/gfx/pokemon/meltan/shiny.pal b/gfx/pokemon/meltan/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/meltan/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/omegadge/front.png b/gfx/pokemon/omegadge/front.png index b219b51..0502ca2 100644 Binary files a/gfx/pokemon/omegadge/front.png and b/gfx/pokemon/omegadge/front.png differ diff --git a/gfx/pokemon/pixytop/anim.asm b/gfx/pokemon/pixytop/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pixytop/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pixytop/anim_idle.asm b/gfx/pokemon/pixytop/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pixytop/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pixytop/back.png b/gfx/pokemon/pixytop/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/pixytop/back.png differ diff --git a/gfx/pokemon/pixytop/front.png b/gfx/pokemon/pixytop/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/pixytop/front.png differ diff --git a/gfx/pokemon/pixytop/shiny.pal b/gfx/pokemon/pixytop/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pixytop/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/porybit/anim.asm b/gfx/pokemon/porybit/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/porybit/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/porybit/anim_idle.asm b/gfx/pokemon/porybit/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/porybit/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/porybit/back.png b/gfx/pokemon/porybit/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/porybit/back.png differ diff --git a/gfx/pokemon/porybit/front.png b/gfx/pokemon/porybit/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/porybit/front.png differ diff --git a/gfx/pokemon/porybit/shiny.pal b/gfx/pokemon/porybit/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/porybit/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/ramoose/anim.asm b/gfx/pokemon/ramoose/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/ramoose/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/ramoose/anim_idle.asm b/gfx/pokemon/ramoose/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/ramoose/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/ramoose/back.png b/gfx/pokemon/ramoose/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/ramoose/back.png differ diff --git a/gfx/pokemon/ramoose/front.png b/gfx/pokemon/ramoose/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/ramoose/front.png differ diff --git a/gfx/pokemon/ramoose/shiny.pal b/gfx/pokemon/ramoose/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/ramoose/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/rhyperior/front.png b/gfx/pokemon/rhyperior/front.png index 22fed17..a07d122 100644 Binary files a/gfx/pokemon/rhyperior/front.png and b/gfx/pokemon/rhyperior/front.png differ diff --git a/gfx/pokemon/sailwing/back.png b/gfx/pokemon/sailwing/back.png index f92a826..d78c91a 100644 Binary files a/gfx/pokemon/sailwing/back.png and b/gfx/pokemon/sailwing/back.png differ diff --git a/gfx/pokemon/sailwing/shiny.pal b/gfx/pokemon/sailwing/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/sailwing/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/sharpoon/anim.asm b/gfx/pokemon/sharpoon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sharpoon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sharpoon/anim_idle.asm b/gfx/pokemon/sharpoon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sharpoon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sharpoon/back.png b/gfx/pokemon/sharpoon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/sharpoon/back.png differ diff --git a/gfx/pokemon/sharpoon/front.png b/gfx/pokemon/sharpoon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/sharpoon/front.png differ diff --git a/gfx/pokemon/sharpoon/shiny.pal b/gfx/pokemon/sharpoon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/sharpoon/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/snuzzles/anim.asm b/gfx/pokemon/snuzzles/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/snuzzles/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/snuzzles/anim_idle.asm b/gfx/pokemon/snuzzles/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/snuzzles/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/snuzzles/back.png b/gfx/pokemon/snuzzles/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/snuzzles/back.png differ diff --git a/gfx/pokemon/snuzzles/front.png b/gfx/pokemon/snuzzles/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/snuzzles/front.png differ diff --git a/gfx/pokemon/snuzzles/shiny.pal b/gfx/pokemon/snuzzles/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/snuzzles/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/trampel/anim.asm b/gfx/pokemon/trampel/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/trampel/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/trampel/anim_idle.asm b/gfx/pokemon/trampel/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/trampel/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/trampel/back.png b/gfx/pokemon/trampel/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/trampel/back.png differ diff --git a/gfx/pokemon/trampel/front.png b/gfx/pokemon/trampel/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/trampel/front.png differ diff --git a/gfx/pokemon/trampel/shiny.pal b/gfx/pokemon/trampel/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/trampel/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/wearlycan/back.png b/gfx/pokemon/wearlycan/back.png index d9fec1b..68c818a 100644 Binary files a/gfx/pokemon/wearlycan/back.png and b/gfx/pokemon/wearlycan/back.png differ diff --git a/gfx/pokemon/weavile/anim.asm b/gfx/pokemon/weavile/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/weavile/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/weavile/anim_idle.asm b/gfx/pokemon/weavile/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/weavile/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/weavile/back.png b/gfx/pokemon/weavile/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/weavile/back.png differ diff --git a/gfx/pokemon/weavile/front.png b/gfx/pokemon/weavile/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/weavile/front.png differ diff --git a/gfx/pokemon/weavile/shiny.pal b/gfx/pokemon/weavile/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/weavile/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/wiglett/front.png b/gfx/pokemon/wiglett/front.png index 1d52785..4093bd1 100644 Binary files a/gfx/pokemon/wiglett/front.png and b/gfx/pokemon/wiglett/front.png differ diff --git a/gfx/pokemon/wugtrio/front.png b/gfx/pokemon/wugtrio/front.png index 42e8a36..6208bc4 100644 Binary files a/gfx/pokemon/wugtrio/front.png and b/gfx/pokemon/wugtrio/front.png differ diff --git a/main.asm b/main.asm index 7714b23..5cbd59b 100644 --- a/main.asm +++ b/main.asm @@ -304,14 +304,16 @@ INCLUDE "engine/gfx/player_gfx.asm" SECTION "bank23", ROMX -INCLUDE "engine/tilesets/timeofday_pals.asm" INCLUDE "engine/battle/battle_transition.asm" -INCLUDE "engine/events/field_moves.asm" -INCLUDE "engine/events/magnet_train.asm" INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/gfx/sprites.asm" INCLUDE "engine/gfx/mon_icons.asm" +SECTION "bank23 spillover", ROMX + +INCLUDE "engine/tilesets/timeofday_pals.asm" +INCLUDE "engine/events/field_moves.asm" +INCLUDE "engine/events/magnet_train.asm" SECTION "bank24", ROMX diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index ba1371f..65edaa5 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, SHELLDER + getmonname STRING_BUFFER_3, WARFURS writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke SHELLDER, 1 + givepoke WARFURS, 23, RARE_CANDY closetext end