From 0f76cfc488bc83a2da213af497291952eb7636df Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:41:15 +0000 Subject: [PATCH] 17 new Pokemon! New Pokemon have been added and distributed across the region. Leafeon Glaceon Sylveon Coinpur - Night time on early routes over Rattata. I want to make an argument for branch evolving into Moibelle at night or if female. Perrserker - Unobtainable for now. Gentlarva - Ilex and Viridian Forest. Pupal - Evolve Gentlarva. Carapthor - Evolve Pupal. Kotora - Mt. Mortar outside, Viridian Forest. Gaotora - Evolve Kotora Gorotora - Evolve Gaotora Raitora - Evolve Kotora Bittybat - Union Cave and other early routes. Paraspor - Ilex & Viridian Forest Vulpiii - Route 36, Burned Tower 1F Annihilape - Trade Primeape Pupperon - Route 36, Route 37, Burned Tower B1F --- constants/pokemon_constants.asm | 17 ++ data/pokemon/base_stats.asm | 17 ++ data/pokemon/base_stats/vulpiii.asm | 21 +++ data/pokemon/cries.asm | 17 ++ data/pokemon/dex_entries.asm | 17 ++ data/pokemon/dex_entries/annihilape.asm | 12 ++ data/pokemon/dex_entries/bittybat.asm | 10 ++ data/pokemon/dex_entries/carapthor.asm | 10 ++ data/pokemon/dex_entries/coinpur.asm | 10 ++ data/pokemon/dex_entries/gaotora.asm | 10 ++ data/pokemon/dex_entries/gentlarva.asm | 10 ++ data/pokemon/dex_entries/glaceon.asm | 10 ++ data/pokemon/dex_entries/gorotora.asm | 10 ++ data/pokemon/dex_entries/kotora.asm | 10 ++ data/pokemon/dex_entries/leafeon.asm | 10 ++ data/pokemon/dex_entries/paraspor.asm | 10 ++ data/pokemon/dex_entries/perrserker.asm | 10 ++ data/pokemon/dex_entries/pupal.asm | 10 ++ data/pokemon/dex_entries/pupperon.asm | 10 ++ data/pokemon/dex_entries/raitora.asm | 10 ++ data/pokemon/dex_entries/sylveon.asm | 10 ++ data/pokemon/dex_entries/vulpiii.asm | 10 ++ data/pokemon/dex_entry_pointers.asm | 17 ++ data/pokemon/dex_order_alpha.asm | 17 ++ data/pokemon/dex_order_new.asm | 17 ++ data/pokemon/egg_moves_johto.asm | 7 +- data/pokemon/egg_moves_kanto.asm | 46 +++-- data/pokemon/evos_attacks_johto.asm | 45 +++++ data/pokemon/evos_attacks_kanto.asm | 209 ++++++++++++++++++++++- data/pokemon/first_stages.asm | 39 +++-- data/pokemon/gen1_base_special.asm | 14 ++ data/pokemon/gen1_order.asm | 17 ++ data/pokemon/menu_icons.asm | 17 ++ data/pokemon/names.asm | 17 ++ data/pokemon/palettes.asm | 34 ++++ data/pokemon/pic_pointers.asm | 34 ++++ data/wild/johto_grass.asm | 215 ++++++++++++------------ data/wild/kanto_grass.asm | 96 +++++------ gfx/footprints.asm | 21 ++- gfx/footprints/annihilape.png | Bin 0 -> 93 bytes gfx/footprints/bittybat.png | Bin 0 -> 69 bytes gfx/footprints/carapthor.png | Bin 0 -> 93 bytes gfx/footprints/coinpur.png | Bin 0 -> 93 bytes gfx/footprints/gaotora.png | Bin 0 -> 98 bytes gfx/footprints/gentlarva.png | Bin 0 -> 79 bytes gfx/footprints/glaceon.png | Bin 0 -> 99 bytes gfx/footprints/gorotora.png | Bin 0 -> 95 bytes gfx/footprints/kotora.png | Bin 0 -> 83 bytes gfx/footprints/leafeon.png | Bin 0 -> 99 bytes gfx/footprints/paraspor.png | Bin 0 -> 69 bytes gfx/footprints/perrserker.png | Bin 0 -> 93 bytes gfx/footprints/pupal.png | Bin 0 -> 69 bytes gfx/footprints/pupperon.png | Bin 0 -> 92 bytes gfx/footprints/raitora.png | Bin 0 -> 95 bytes gfx/footprints/sylveon.png | Bin 0 -> 99 bytes gfx/footprints/vulpiii.png | Bin 0 -> 95 bytes gfx/pics.asm | 34 ++++ gfx/pokemon/anim_pointers.asm | 17 ++ gfx/pokemon/anims.asm | 17 ++ gfx/pokemon/annihilape/anim.asm | 1 + gfx/pokemon/annihilape/anim_idle.asm | 1 + gfx/pokemon/annihilape/back.png | Bin 0 -> 304 bytes gfx/pokemon/annihilape/front.png | Bin 0 -> 315 bytes gfx/pokemon/annihilape/shiny.pal | 2 + gfx/pokemon/bitmask_pointers.asm | 17 ++ gfx/pokemon/bitmasks.asm | 17 ++ gfx/pokemon/bittybat/anim.asm | 1 + gfx/pokemon/bittybat/anim_idle.asm | 1 + gfx/pokemon/bittybat/back.png | Bin 0 -> 304 bytes gfx/pokemon/bittybat/front.png | Bin 0 -> 315 bytes gfx/pokemon/bittybat/shiny.pal | 2 + gfx/pokemon/carapthor/anim.asm | 1 + gfx/pokemon/carapthor/anim_idle.asm | 1 + gfx/pokemon/carapthor/back.png | Bin 0 -> 304 bytes gfx/pokemon/carapthor/front.png | Bin 0 -> 315 bytes gfx/pokemon/carapthor/shiny.pal | 2 + gfx/pokemon/coinpur/anim.asm | 1 + gfx/pokemon/coinpur/anim_idle.asm | 1 + gfx/pokemon/coinpur/back.png | Bin 0 -> 304 bytes gfx/pokemon/coinpur/front.png | Bin 0 -> 315 bytes gfx/pokemon/coinpur/shiny.pal | 2 + gfx/pokemon/frame_pointers.asm | 17 ++ gfx/pokemon/gaotora/anim.asm | 1 + gfx/pokemon/gaotora/anim_idle.asm | 1 + gfx/pokemon/gaotora/back.png | Bin 0 -> 304 bytes gfx/pokemon/gaotora/front.png | Bin 0 -> 315 bytes gfx/pokemon/gaotora/shiny.pal | 2 + gfx/pokemon/gentlarva/anim.asm | 1 + gfx/pokemon/gentlarva/anim_idle.asm | 1 + gfx/pokemon/gentlarva/back.png | Bin 0 -> 304 bytes gfx/pokemon/gentlarva/front.png | Bin 0 -> 315 bytes gfx/pokemon/gentlarva/shiny.pal | 2 + gfx/pokemon/glaceon/anim.asm | 1 + gfx/pokemon/glaceon/anim_idle.asm | 1 + gfx/pokemon/glaceon/back.png | Bin 0 -> 304 bytes gfx/pokemon/glaceon/front.png | Bin 0 -> 315 bytes gfx/pokemon/glaceon/shiny.pal | 2 + gfx/pokemon/gorotora/anim.asm | 1 + gfx/pokemon/gorotora/anim_idle.asm | 1 + gfx/pokemon/gorotora/back.png | Bin 0 -> 304 bytes gfx/pokemon/gorotora/front.png | Bin 0 -> 315 bytes gfx/pokemon/gorotora/shiny.pal | 2 + gfx/pokemon/idle_pointers.asm | 17 ++ gfx/pokemon/idles.asm | 17 ++ gfx/pokemon/johto_frames.asm | 3 + gfx/pokemon/kanto_frames.asm | 14 ++ gfx/pokemon/kotora/anim.asm | 1 + gfx/pokemon/kotora/anim_idle.asm | 1 + gfx/pokemon/kotora/back.png | Bin 0 -> 304 bytes gfx/pokemon/kotora/front.png | Bin 0 -> 315 bytes gfx/pokemon/kotora/shiny.pal | 2 + gfx/pokemon/leafeon/anim.asm | 1 + gfx/pokemon/leafeon/anim_idle.asm | 1 + gfx/pokemon/leafeon/back.png | Bin 0 -> 304 bytes gfx/pokemon/leafeon/front.png | Bin 0 -> 315 bytes gfx/pokemon/leafeon/shiny.pal | 2 + gfx/pokemon/paraspor/anim.asm | 1 + gfx/pokemon/paraspor/anim_idle.asm | 1 + gfx/pokemon/paraspor/back.png | Bin 0 -> 304 bytes gfx/pokemon/paraspor/front.png | Bin 0 -> 315 bytes gfx/pokemon/paraspor/shiny.pal | 2 + gfx/pokemon/perrserker/anim.asm | 1 + gfx/pokemon/perrserker/anim_idle.asm | 1 + gfx/pokemon/perrserker/back.png | Bin 0 -> 304 bytes gfx/pokemon/perrserker/front.png | Bin 0 -> 315 bytes gfx/pokemon/perrserker/shiny.pal | 2 + gfx/pokemon/pupal/anim.asm | 1 + gfx/pokemon/pupal/anim_idle.asm | 1 + gfx/pokemon/pupal/back.png | Bin 0 -> 304 bytes gfx/pokemon/pupal/front.png | Bin 0 -> 315 bytes gfx/pokemon/pupal/shiny.pal | 2 + gfx/pokemon/pupperon/anim.asm | 1 + gfx/pokemon/pupperon/anim_idle.asm | 1 + gfx/pokemon/pupperon/back.png | Bin 0 -> 304 bytes gfx/pokemon/pupperon/front.png | Bin 0 -> 315 bytes gfx/pokemon/pupperon/shiny.pal | 2 + gfx/pokemon/raitora/anim.asm | 1 + gfx/pokemon/raitora/anim_idle.asm | 1 + gfx/pokemon/raitora/back.png | Bin 0 -> 304 bytes gfx/pokemon/raitora/front.png | Bin 0 -> 315 bytes gfx/pokemon/raitora/shiny.pal | 2 + gfx/pokemon/sylveon/anim.asm | 1 + gfx/pokemon/sylveon/anim_idle.asm | 1 + gfx/pokemon/sylveon/back.png | Bin 0 -> 304 bytes gfx/pokemon/sylveon/front.png | Bin 0 -> 315 bytes gfx/pokemon/sylveon/shiny.pal | 2 + gfx/pokemon/vulpiii/anim.asm | 1 + gfx/pokemon/vulpiii/anim_idle.asm | 1 + gfx/pokemon/vulpiii/back.png | Bin 0 -> 304 bytes gfx/pokemon/vulpiii/front.png | Bin 0 -> 315 bytes gfx/pokemon/vulpiii/shiny.pal | 2 + main.asm | 3 + maps/PlayersHouse2F.asm | 8 +- scan_includes.exe.stackdump | 18 ++ 154 files changed, 1203 insertions(+), 187 deletions(-) create mode 100644 data/pokemon/base_stats/vulpiii.asm create mode 100644 data/pokemon/dex_entries/annihilape.asm create mode 100644 data/pokemon/dex_entries/bittybat.asm create mode 100644 data/pokemon/dex_entries/carapthor.asm create mode 100644 data/pokemon/dex_entries/coinpur.asm create mode 100644 data/pokemon/dex_entries/gaotora.asm create mode 100644 data/pokemon/dex_entries/gentlarva.asm create mode 100644 data/pokemon/dex_entries/glaceon.asm create mode 100644 data/pokemon/dex_entries/gorotora.asm create mode 100644 data/pokemon/dex_entries/kotora.asm create mode 100644 data/pokemon/dex_entries/leafeon.asm create mode 100644 data/pokemon/dex_entries/paraspor.asm create mode 100644 data/pokemon/dex_entries/perrserker.asm create mode 100644 data/pokemon/dex_entries/pupal.asm create mode 100644 data/pokemon/dex_entries/pupperon.asm create mode 100644 data/pokemon/dex_entries/raitora.asm create mode 100644 data/pokemon/dex_entries/sylveon.asm create mode 100644 data/pokemon/dex_entries/vulpiii.asm create mode 100644 gfx/footprints/annihilape.png create mode 100644 gfx/footprints/bittybat.png create mode 100644 gfx/footprints/carapthor.png create mode 100644 gfx/footprints/coinpur.png create mode 100644 gfx/footprints/gaotora.png create mode 100644 gfx/footprints/gentlarva.png create mode 100644 gfx/footprints/glaceon.png create mode 100644 gfx/footprints/gorotora.png create mode 100644 gfx/footprints/kotora.png create mode 100644 gfx/footprints/leafeon.png create mode 100644 gfx/footprints/paraspor.png create mode 100644 gfx/footprints/perrserker.png create mode 100644 gfx/footprints/pupal.png create mode 100644 gfx/footprints/pupperon.png create mode 100644 gfx/footprints/raitora.png create mode 100644 gfx/footprints/sylveon.png create mode 100644 gfx/footprints/vulpiii.png create mode 100644 gfx/pokemon/annihilape/anim.asm create mode 100644 gfx/pokemon/annihilape/anim_idle.asm create mode 100644 gfx/pokemon/annihilape/back.png create mode 100644 gfx/pokemon/annihilape/front.png create mode 100644 gfx/pokemon/annihilape/shiny.pal create mode 100644 gfx/pokemon/bittybat/anim.asm create mode 100644 gfx/pokemon/bittybat/anim_idle.asm create mode 100644 gfx/pokemon/bittybat/back.png create mode 100644 gfx/pokemon/bittybat/front.png create mode 100644 gfx/pokemon/bittybat/shiny.pal create mode 100644 gfx/pokemon/carapthor/anim.asm create mode 100644 gfx/pokemon/carapthor/anim_idle.asm create mode 100644 gfx/pokemon/carapthor/back.png create mode 100644 gfx/pokemon/carapthor/front.png create mode 100644 gfx/pokemon/carapthor/shiny.pal create mode 100644 gfx/pokemon/coinpur/anim.asm create mode 100644 gfx/pokemon/coinpur/anim_idle.asm create mode 100644 gfx/pokemon/coinpur/back.png create mode 100644 gfx/pokemon/coinpur/front.png create mode 100644 gfx/pokemon/coinpur/shiny.pal create mode 100644 gfx/pokemon/gaotora/anim.asm create mode 100644 gfx/pokemon/gaotora/anim_idle.asm create mode 100644 gfx/pokemon/gaotora/back.png create mode 100644 gfx/pokemon/gaotora/front.png create mode 100644 gfx/pokemon/gaotora/shiny.pal create mode 100644 gfx/pokemon/gentlarva/anim.asm create mode 100644 gfx/pokemon/gentlarva/anim_idle.asm create mode 100644 gfx/pokemon/gentlarva/back.png create mode 100644 gfx/pokemon/gentlarva/front.png create mode 100644 gfx/pokemon/gentlarva/shiny.pal create mode 100644 gfx/pokemon/glaceon/anim.asm create mode 100644 gfx/pokemon/glaceon/anim_idle.asm create mode 100644 gfx/pokemon/glaceon/back.png create mode 100644 gfx/pokemon/glaceon/front.png create mode 100644 gfx/pokemon/glaceon/shiny.pal create mode 100644 gfx/pokemon/gorotora/anim.asm create mode 100644 gfx/pokemon/gorotora/anim_idle.asm create mode 100644 gfx/pokemon/gorotora/back.png create mode 100644 gfx/pokemon/gorotora/front.png create mode 100644 gfx/pokemon/gorotora/shiny.pal create mode 100644 gfx/pokemon/kotora/anim.asm create mode 100644 gfx/pokemon/kotora/anim_idle.asm create mode 100644 gfx/pokemon/kotora/back.png create mode 100644 gfx/pokemon/kotora/front.png create mode 100644 gfx/pokemon/kotora/shiny.pal create mode 100644 gfx/pokemon/leafeon/anim.asm create mode 100644 gfx/pokemon/leafeon/anim_idle.asm create mode 100644 gfx/pokemon/leafeon/back.png create mode 100644 gfx/pokemon/leafeon/front.png create mode 100644 gfx/pokemon/leafeon/shiny.pal create mode 100644 gfx/pokemon/paraspor/anim.asm create mode 100644 gfx/pokemon/paraspor/anim_idle.asm create mode 100644 gfx/pokemon/paraspor/back.png create mode 100644 gfx/pokemon/paraspor/front.png create mode 100644 gfx/pokemon/paraspor/shiny.pal create mode 100644 gfx/pokemon/perrserker/anim.asm create mode 100644 gfx/pokemon/perrserker/anim_idle.asm create mode 100644 gfx/pokemon/perrserker/back.png create mode 100644 gfx/pokemon/perrserker/front.png create mode 100644 gfx/pokemon/perrserker/shiny.pal create mode 100644 gfx/pokemon/pupal/anim.asm create mode 100644 gfx/pokemon/pupal/anim_idle.asm create mode 100644 gfx/pokemon/pupal/back.png create mode 100644 gfx/pokemon/pupal/front.png create mode 100644 gfx/pokemon/pupal/shiny.pal create mode 100644 gfx/pokemon/pupperon/anim.asm create mode 100644 gfx/pokemon/pupperon/anim_idle.asm create mode 100644 gfx/pokemon/pupperon/back.png create mode 100644 gfx/pokemon/pupperon/front.png create mode 100644 gfx/pokemon/pupperon/shiny.pal create mode 100644 gfx/pokemon/raitora/anim.asm create mode 100644 gfx/pokemon/raitora/anim_idle.asm create mode 100644 gfx/pokemon/raitora/back.png create mode 100644 gfx/pokemon/raitora/front.png create mode 100644 gfx/pokemon/raitora/shiny.pal create mode 100644 gfx/pokemon/sylveon/anim.asm create mode 100644 gfx/pokemon/sylveon/anim_idle.asm create mode 100644 gfx/pokemon/sylveon/back.png create mode 100644 gfx/pokemon/sylveon/front.png create mode 100644 gfx/pokemon/sylveon/shiny.pal create mode 100644 gfx/pokemon/vulpiii/anim.asm create mode 100644 gfx/pokemon/vulpiii/anim_idle.asm create mode 100644 gfx/pokemon/vulpiii/back.png create mode 100644 gfx/pokemon/vulpiii/front.png create mode 100644 gfx/pokemon/vulpiii/shiny.pal create mode 100644 scan_includes.exe.stackdump diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 128adfd..e6f418a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -34,6 +34,13 @@ const WEEDLE ; 0d const KAKUNA ; 0e const BEEDRILL ; 0f + const GENTLARVA + const PUPAL + const CARAPTHOR + const KOTORA + const GAOTORA + const GOROTORA + const RAITORA const PIDGEY ; 10 const PIDGEOTTO ; 11 const PIDGEOT ; 12 @@ -57,27 +64,34 @@ const NIDOREIGN const CLEFAIRY ; 23 const CLEFABLE ; 24 + const VULPIII const VULPIX ; 25 const NINETALES ; 26 const JIGGLYPUFF ; 27 const WIGGLYTUFF ; 28 + const BITTYBAT const ZUBAT ; 29 const GOLBAT ; 2a const ODDISH ; 2b const GLOOM ; 2c const VILEPLUME ; 2d + const PARASPOR const PARAS ; 2e const PARASECT ; 2f const VENONAT ; 30 const VENOMOTH ; 31 const DIGLETT ; 32 const DUGTRIO ; 33 + const COINPUR const MEOWTH ; 34 const PERSIAN ; 35 + const PERRSERKER const PSYDUCK ; 36 const GOLDUCK ; 37 const MANKEY ; 38 const PRIMEAPE ; 39 + const ANNIHILAPE + const PUPPERON const GROWLITHE ; 3a const ARCANINE ; 3b const POLIWAG ; 3c @@ -225,6 +239,9 @@ DEF JOHTO_POKEMON EQU const_value const QUAGSIRE ; c3 const ESPEON ; c4 const UMBREON ; c5 + const LEAFEON + const GLACEON + const SYLVEON const MURKROW ; c6 const SLOWKING ; c7 const MISDREAVUS ; c8 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 1ed4c88..515ddba 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -42,6 +42,13 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm" INCLUDE "data/pokemon/base_stats/weedle.asm" INCLUDE "data/pokemon/base_stats/kakuna.asm" INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/gentlarva.asm" +INCLUDE "data/pokemon/base_stats/pupal.asm" +INCLUDE "data/pokemon/base_stats/carapthor.asm" +INCLUDE "data/pokemon/base_stats/kotora.asm" +INCLUDE "data/pokemon/base_stats/gaotora.asm" +INCLUDE "data/pokemon/base_stats/gorotora.asm" +INCLUDE "data/pokemon/base_stats/raitora.asm" INCLUDE "data/pokemon/base_stats/pidgey.asm" INCLUDE "data/pokemon/base_stats/pidgeotto.asm" INCLUDE "data/pokemon/base_stats/pidgeot.asm" @@ -65,27 +72,34 @@ INCLUDE "data/pokemon/base_stats/nidoking.asm" INCLUDE "data/pokemon/base_stats/nidoreign.asm" INCLUDE "data/pokemon/base_stats/clefairy.asm" INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpiii.asm" INCLUDE "data/pokemon/base_stats/vulpix.asm" INCLUDE "data/pokemon/base_stats/ninetales.asm" INCLUDE "data/pokemon/base_stats/jigglypuff.asm" INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/bittybat.asm" INCLUDE "data/pokemon/base_stats/zubat.asm" INCLUDE "data/pokemon/base_stats/golbat.asm" INCLUDE "data/pokemon/base_stats/oddish.asm" INCLUDE "data/pokemon/base_stats/gloom.asm" INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paraspor.asm" INCLUDE "data/pokemon/base_stats/paras.asm" INCLUDE "data/pokemon/base_stats/parasect.asm" INCLUDE "data/pokemon/base_stats/venonat.asm" INCLUDE "data/pokemon/base_stats/venomoth.asm" INCLUDE "data/pokemon/base_stats/diglett.asm" INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/coinpur.asm" INCLUDE "data/pokemon/base_stats/meowth.asm" INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/perrserker.asm" INCLUDE "data/pokemon/base_stats/psyduck.asm" INCLUDE "data/pokemon/base_stats/golduck.asm" INCLUDE "data/pokemon/base_stats/mankey.asm" INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/annihilape.asm" +INCLUDE "data/pokemon/base_stats/pupperon.asm" INCLUDE "data/pokemon/base_stats/growlithe.asm" INCLUDE "data/pokemon/base_stats/arcanine.asm" INCLUDE "data/pokemon/base_stats/poliwag.asm" @@ -232,6 +246,9 @@ INCLUDE "data/pokemon/base_stats/wooper.asm" INCLUDE "data/pokemon/base_stats/quagsire.asm" INCLUDE "data/pokemon/base_stats/espeon.asm" 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/murkrow.asm" INCLUDE "data/pokemon/base_stats/slowking.asm" INCLUDE "data/pokemon/base_stats/misdreavus.asm" diff --git a/data/pokemon/base_stats/vulpiii.asm b/data/pokemon/base_stats/vulpiii.asm new file mode 100644 index 0000000..b2611c0 --- /dev/null +++ b/data/pokemon/base_stats/vulpiii.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 28, 31, 30, 60, 45, 60 + ; hp atk def spd sat sdf + + db FIRE, FIRE ; type + db 190 ; catch rate + db 63 ; base exp + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/vulpix/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, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 56b9beb..52a6b90 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -21,6 +21,13 @@ PokemonCries:: mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL + mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) + mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA + mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA + mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA + mon_cry CRY_KANGASKHAN, 5, 129 ; RAITORA (Clone of Gorotora's for nowtm) mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT @@ -44,27 +51,34 @@ PokemonCries:: mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE + mon_cry CRY_PIDGEY, 224, 224 ; VULPIII mon_cry CRY_VULPIX, 79, 144 ; VULPIX mon_cry CRY_VULPIX, 136, 224 ; NINETALES mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, 224, 256 ; BITTYBAT (need to recover the old one from before it was removed from KEP) mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT mon_cry CRY_ODDISH, 221, 129 ; ODDISH mon_cry CRY_ODDISH, 170, 192 ; GLOOM mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME + mon_cry CRY_PARAS, 32, 352 ; PARASPOR (see bittybat) mon_cry CRY_PARAS, 32, 352 ; PARAS mon_cry CRY_PARAS, 66, 383 ; PARASECT mon_cry CRY_VENONAT, 68, 192 ; VENONAT mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN + mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise) mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE + mon_cry CRY_NIDOQUEEN, -1280, 512 ; ANNIHILAPE + mon_cry CRY_GROWLITHE, 32, 192 ; PUPPERON (see bittybat) mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG @@ -211,6 +225,9 @@ PokemonCries:: mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE mon_cry CRY_AIPOM, 162, 320 ; ESPEON mon_cry CRY_VENONAT, -233, 240 ; UMBREON + mon_cry CRY_NIDORAN_M, 0, 0 ; LEAFEON (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; GLACEON (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete) mon_cry CRY_MARILL, -31, 384 ; MURKROW mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 612a2b5..9fb7254 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -15,6 +15,13 @@ ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm" WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm" KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm" BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm" +KotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kotora.asm" +GaotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gaotora.asm" +GorotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorotora.asm" +RaitoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raitora.asm" +GentlarvaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gentlarva.asm" +PupalPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupal.asm" +CarapthorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/carapthor.asm" PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm" PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm" PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm" @@ -38,27 +45,34 @@ NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm" NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm" ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm" ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm" +VulpiiiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpiii.asm" VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm" NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm" JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm" WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm" +BittybatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bittybat.asm" ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm" GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm" OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm" GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm" VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm" +ParasporPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paraspor.asm" ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm" ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm" 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" +CoinpurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coinpur.asm" MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm" +PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm" PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm" PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm" GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm" MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm" PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm" +AnnihilapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/annihilape.asm" +PupperonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupperon.asm" GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm" ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm" PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm" @@ -217,6 +231,9 @@ WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm" 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" MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm" SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm" MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm" diff --git a/data/pokemon/dex_entries/annihilape.asm b/data/pokemon/dex_entries/annihilape.asm new file mode 100644 index 0000000..a32f088 --- /dev/null +++ b/data/pokemon/dex_entries/annihilape.asm @@ -0,0 +1,12 @@ + db "RAGEMONKEY@" ; species name + dw 311, 1235 ; height, weight + + db "ANNIHILAPE has" + next "abandoned its" + next "physical body," + + page "using its rage" + next "to deform its" + next "body in combat.@" ; Reference to its expanding unshackled arm. + +; could be revised. diff --git a/data/pokemon/dex_entries/bittybat.asm b/data/pokemon/dex_entries/bittybat.asm new file mode 100644 index 0000000..8df1f33 --- /dev/null +++ b/data/pokemon/dex_entries/bittybat.asm @@ -0,0 +1,10 @@ + db "TINY BAT@" ; species name + dw 107, 85 ; height, weight + + db "Flits about in" + next "dark caves. A" + next "swarm of BITTYBAT" + + page "can overwhelm" + next "even significantly" + next "larger #MON.@" diff --git a/data/pokemon/dex_entries/carapthor.asm b/data/pokemon/dex_entries/carapthor.asm new file mode 100644 index 0000000..a2da377 --- /dev/null +++ b/data/pokemon/dex_entries/carapthor.asm @@ -0,0 +1,10 @@ + db "DAPPER@" ; species name + dw 311, 760 ; height, weight + + db "Thanks to its" + next "trademark jog," + next "CARAPTHOR is a" + + page "common sight on" + next "old television" + next "shows.@" diff --git a/data/pokemon/dex_entries/coinpur.asm b/data/pokemon/dex_entries/coinpur.asm new file mode 100644 index 0000000..8dfd68d --- /dev/null +++ b/data/pokemon/dex_entries/coinpur.asm @@ -0,0 +1,10 @@ + db "BIG EATER@" ; species name + dw 102, 45 ; height, weight + + db "Due to its poor" + next "eyesight, it's" + next "often distracted" + + page "by city lights." + next "Even shiny coins" + next "transfix it.@" ; Vague reference to nighttime pollinators raiding people's homes, but applied to magpie-like behaviours. diff --git a/data/pokemon/dex_entries/gaotora.asm b/data/pokemon/dex_entries/gaotora.asm new file mode 100644 index 0000000..b95d3dd --- /dev/null +++ b/data/pokemon/dex_entries/gaotora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 307, 1620 ; height, weight + + db "As GAOTORA grows," + next "it becomes more" + next "rebellious. It" + + page "loves to shock" + next "its owners as" + next "a prank.@" diff --git a/data/pokemon/dex_entries/gentlarva.asm b/data/pokemon/dex_entries/gentlarva.asm new file mode 100644 index 0000000..9fc85ac --- /dev/null +++ b/data/pokemon/dex_entries/gentlarva.asm @@ -0,0 +1,10 @@ + db "GRUB@" ; species name + dw 100, 80 ; height, weight + + db "Adored by the" + next "elderly, it's" + next "seen as a symbol" + + page "of a simpler" + next "time. Feeds on" + next "tree sap.@" diff --git a/data/pokemon/dex_entries/glaceon.asm b/data/pokemon/dex_entries/glaceon.asm new file mode 100644 index 0000000..1fdcee6 --- /dev/null +++ b/data/pokemon/dex_entries/glaceon.asm @@ -0,0 +1,10 @@ + db "FRESH SNOW@" ; species name + dw 207, 571 ; height, weight + + db "With a mere cry," + next "diamond dust will" + next "fill the air." + + page "This makes it a" + next "popular #MON" + next "at ski resorts.@" diff --git a/data/pokemon/dex_entries/gorotora.asm b/data/pokemon/dex_entries/gorotora.asm new file mode 100644 index 0000000..b3a4472 --- /dev/null +++ b/data/pokemon/dex_entries/gorotora.asm @@ -0,0 +1,10 @@ + db "GOROTORA@" ; species name + dw 511, 3870 ; height, weight + + db "Lives in wooded" + next "areas. Completely" + next "wild, it strikes" + + page "all who enter its" + next "domain with bolts" + next "of THUNDER.@" diff --git a/data/pokemon/dex_entries/kotora.asm b/data/pokemon/dex_entries/kotora.asm new file mode 100644 index 0000000..561ead7 --- /dev/null +++ b/data/pokemon/dex_entries/kotora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 200, 620 ; height, weight + + db "Its rotund looks" + next "make it a popular" + next "first pet with" + + page "kids. However," + next "neglect quickly" + next "makes it feral.@" diff --git a/data/pokemon/dex_entries/leafeon.asm b/data/pokemon/dex_entries/leafeon.asm new file mode 100644 index 0000000..8533789 --- /dev/null +++ b/data/pokemon/dex_entries/leafeon.asm @@ -0,0 +1,10 @@ + db "VERDANT@" ; species name + dw 303, 562 ; height, weight + + db "Thanks to its" + next "photosynthesis," ; Don't ask about how long it took to make this fit in a reasonable manner. Please. + next "forests with" + + page "LEAFEON have" + next "pristine air." ; Reference to the Lental Pokedex entry. + next "Hides in bushes.@" diff --git a/data/pokemon/dex_entries/paraspor.asm b/data/pokemon/dex_entries/paraspor.asm new file mode 100644 index 0000000..8160c0c --- /dev/null +++ b/data/pokemon/dex_entries/paraspor.asm @@ -0,0 +1,10 @@ + db "MUSHROOM@" ; species name + dw 50, 100 ; height, weight + + db "Unable to move" + next "quickly, it lulls" + next "hungry WEEDLE" + + page "into gnawing its" + next "mushroom before" + next "ambushing them.@" diff --git a/data/pokemon/dex_entries/perrserker.asm b/data/pokemon/dex_entries/perrserker.asm new file mode 100644 index 0000000..77b345c --- /dev/null +++ b/data/pokemon/dex_entries/perrserker.asm @@ -0,0 +1,10 @@ + db "BIG EATER@" ; species name + dw 207, 617 ; height, weight + + db "PERSIAN is its" + next "archenemy. Their" + next "mutual disdain" + + page "have led to" + next "large-scale" + next "wars in cities.@" ; Could easily be revised. diff --git a/data/pokemon/dex_entries/pupal.asm b/data/pokemon/dex_entries/pupal.asm new file mode 100644 index 0000000..a24a947 --- /dev/null +++ b/data/pokemon/dex_entries/pupal.asm @@ -0,0 +1,10 @@ + db "PUPA@" ; species name + dw 207, 220 ; height, weight + + db "Dislikes fights." + next "As PUPAL awaits" + next "evolution, a" + + page "rhythmic hum can" + next "be heard from" + next "within.@" diff --git a/data/pokemon/dex_entries/pupperon.asm b/data/pokemon/dex_entries/pupperon.asm new file mode 100644 index 0000000..8769614 --- /dev/null +++ b/data/pokemon/dex_entries/pupperon.asm @@ -0,0 +1,10 @@ + db "PUPPY@" ; species name + dw 102, 210 ; height, weight + + db "Popular with rich" + next "women, PUPPERON's" + next "cute looks stop" + + page "even the coldest" + next "hearts in the" + next "street.@" ; If you know, you know. diff --git a/data/pokemon/dex_entries/raitora.asm b/data/pokemon/dex_entries/raitora.asm new file mode 100644 index 0000000..43fc1bf --- /dev/null +++ b/data/pokemon/dex_entries/raitora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 511, 4070 ; height, weight + + db "A domesticated" + next "KOTORA becomes" + next "this #MON." + + page "It loves to" + next "play with kids" + next "who groom it.@" diff --git a/data/pokemon/dex_entries/sylveon.asm b/data/pokemon/dex_entries/sylveon.asm new file mode 100644 index 0000000..89ba76f --- /dev/null +++ b/data/pokemon/dex_entries/sylveon.asm @@ -0,0 +1,10 @@ + db "INTERTWINING@" ; species name + dw 303, 518 ; height, weight + + db "Even against a" + next "dragon #MON," + next "SYLVEON will" + + page "fight valiantly." + next "This founded many" + next "fairy tales.@" diff --git a/data/pokemon/dex_entries/vulpiii.asm b/data/pokemon/dex_entries/vulpiii.asm new file mode 100644 index 0000000..e4a014e --- /dev/null +++ b/data/pokemon/dex_entries/vulpiii.asm @@ -0,0 +1,10 @@ + db "FOX@" ; species name + dw 120, 110 ; height, weight + + db "Small and weak," + next "VULPIII prefers" + next "to pacify foes by" + + page "by shaking its" + next "3 tails instead" + next "of fighting.@" ; Reference to Tail Whip overuse by Gen 1 AI diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 16e7403..733677a 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -16,6 +16,13 @@ PokedexDataPointerTable: dba WeedlePokedexEntry dba KakunaPokedexEntry dba BeedrillPokedexEntry + dba GentlarvaPokedexEntry + dba PupalPokedexEntry + dba CarapthorPokedexEntry + dba KotoraPokedexEntry + dba GaotoraPokedexEntry + dba GorotoraPokedexEntry + dba RaitoraPokedexEntry dba PidgeyPokedexEntry dba PidgeottoPokedexEntry dba PidgeotPokedexEntry @@ -39,27 +46,34 @@ PokedexDataPointerTable: dba NidoreignPokedexEntry dba ClefairyPokedexEntry dba ClefablePokedexEntry + dba VulpiiiPokedexEntry dba VulpixPokedexEntry dba NinetalesPokedexEntry dba JigglypuffPokedexEntry dba WigglytuffPokedexEntry + dba BittybatPokedexEntry dba ZubatPokedexEntry dba GolbatPokedexEntry dba OddishPokedexEntry dba GloomPokedexEntry dba VileplumePokedexEntry + dba ParasporPokedexEntry dba ParasPokedexEntry dba ParasectPokedexEntry dba VenonatPokedexEntry dba VenomothPokedexEntry dba DiglettPokedexEntry dba DugtrioPokedexEntry + dba CoinpurPokedexEntry dba MeowthPokedexEntry dba PersianPokedexEntry + dba PerrserkerPokedexEntry dba PsyduckPokedexEntry dba GolduckPokedexEntry dba MankeyPokedexEntry dba PrimeapePokedexEntry + dba AnnihilapePokedexEntry + dba PupperonPokedexEntry dba GrowlithePokedexEntry dba ArcaninePokedexEntry dba PoliwagPokedexEntry @@ -206,6 +220,9 @@ PokedexDataPointerTable: dba QuagsirePokedexEntry dba EspeonPokedexEntry dba UmbreonPokedexEntry + dba LeafeonPokedexEntry + dba GlaceonPokedexEntry + dba SylveonPokedexEntry dba MurkrowPokedexEntry dba SlowkingPokedexEntry dba MisdreavusPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 3a5ec02..01937a3 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -7,6 +7,7 @@ AlphabeticalPokedexOrder: dw AIPOM dw ALAKAZAM dw AMPHAROS + dw ANNIHILAPE dw ARBOK dw ARCANINE dw ARIADOS @@ -17,11 +18,13 @@ AlphabeticalPokedexOrder: dw BELLIGNAN dw BELLOSSOM dw BELLSPROUT + dw BITTYBAT dw BLASTOISE dw BLASTYKE dw BLISSEY dw BULBASAUR dw BUTTERFREE + dw CARAPTHOR dw CATERPIE dw CELEBI dw CHANSEY @@ -34,6 +37,7 @@ AlphabeticalPokedexOrder: dw CLEFAIRY dw CLEFFA dw CLOYSTER + dw COINPUR dw CORSOLA dw CROBAT dw CROCONAW @@ -69,9 +73,12 @@ AlphabeticalPokedexOrder: dw FORRETRESS dw FURRET dw GASTLY + dw GAOTORA dw GENGAR + dw GENTLARVA dw GEODUDE dw GIRAFARIG + dw GLACEON dw GLIGAR dw GLOOM dw GOLBAT @@ -79,6 +86,7 @@ AlphabeticalPokedexOrder: dw GOLDUCK dw GOLEM dw GOROCHU + dw GOROTORA dw GRANBULL dw GRAVELER dw GRIMER @@ -111,10 +119,12 @@ AlphabeticalPokedexOrder: dw KINGLER dw KLEAVOR dw KOFFING + dw KOTORA dw KRABBY dw LANTURN dw LAPRAS dw LARVITAR + dw LEAFEON dw LEDIAN dw LEDYBA dw LICKITUNG @@ -162,6 +172,8 @@ AlphabeticalPokedexOrder: dw ONIX dw PARAS dw PARASECT + dw PARASPOR + dw PERRSERKER dw PERSIAN dw PHANPY dw PICHU @@ -181,11 +193,14 @@ AlphabeticalPokedexOrder: dw PORYGON2 dw PRIMEAPE dw PSYDUCK + dw PUPAL dw PUPITAR + dw PUPPERON dw QUAGSIRE dw QUILAVA dw QWILFISH dw RAICHU + dw RAITORA dw RAIKOU dw RAPIDASH dw RATICATE @@ -227,6 +242,7 @@ AlphabeticalPokedexOrder: dw SUNFLORA dw SUNKERN dw SWINUB + dw SYLVEON dw TANGELA dw TAUROS dw TEDDIURSA @@ -250,6 +266,7 @@ AlphabeticalPokedexOrder: dw VICTREEBEL dw VILEPLUME dw VOLTORB + dw VULPIII dw VULPIX dw WALKING_WAKE dw WARTORTLE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 55ba85e..105e6b8 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -32,6 +32,13 @@ NewPokedexOrder: dw WEEDLE dw KAKUNA dw BEEDRILL + dw GENTLARVA + dw PUPAL + dw CARAPTHOR + dw KOTORA + dw GAOTORA + dw GOROTORA + dw RAITORA dw LEDYBA dw LEDIAN dw SPINARAK @@ -39,6 +46,7 @@ NewPokedexOrder: dw GEODUDE dw GRAVELER dw GOLEM + dw BITTYBAT dw ZUBAT dw GOLBAT dw CROBAT @@ -73,6 +81,7 @@ NewPokedexOrder: dw HOPPIP dw SKIPLOOM dw JUMPLUFF + dw PARASPOR dw PARAS dw PARASECT dw POLIWAG @@ -131,8 +140,10 @@ NewPokedexOrder: dw AIPOM dw SNUBBULL dw GRANBULL + dw VULPIII dw VULPIX dw NINETALES + dw PUPPERON dw GROWLITHE dw ARCANINE dw STANTLER @@ -142,8 +153,11 @@ NewPokedexOrder: dw DUGTRIO dw MANKEY dw PRIMEAPE + dw ANNIHILAPE + dw COINPUR dw MEOWTH dw PERSIAN + dw PERRSERKER dw PSYDUCK dw GOLDUCK dw MACHOP @@ -192,6 +206,9 @@ NewPokedexOrder: dw FLAREON dw ESPEON dw UMBREON + dw LEAFEON + dw GLACEON + dw SYLVEON dw HORSEA dw SEADRA dw KINGDRA diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 4beced6..6f5f23d 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -47,12 +47,17 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 ; Leafeon + dw NoEggMoves2 ; Glaceon + dw NoEggMoves2 ; Sylveon dw MurkrowEggMoves + ; dw NoEggMoves2 ; Honchkrow dw NoEggMoves2 dw MisdreavusEggMoves + ; dw NoEggMoves2 ; Mismagius dw NoEggMoves2 dw NoEggMoves2 - dw GirafarigEggMoves + dw GirafarigEggMoves ; This'll need a lot of stuff. Calfalc, Tsuinzu, Farigiraf... dw PinecoEggMoves dw NoEggMoves2 dw DunsparceEggMoves diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 09eac36..90b34c7 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -16,6 +16,13 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Gentlarva + dw NoEggMoves1 ; Pupal + dw NoEggMoves1 ; Carapthor + dw KotoraEggMoves + dw NoEggMoves1 ; Gaotora + dw NoEggMoves1 ; Gorotora + dw NoEggMoves1 ; Raitora dw PidgeyEggMoves dw NoEggMoves1 dw NoEggMoves1 @@ -39,28 +46,35 @@ EggMovePointers1: dw NoEggMoves1 ; Nidoreign dw NoEggMoves1 dw NoEggMoves1 - dw VulpixEggMoves + dw VulpiiiEggMoves dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 - dw ZubatEggMoves + dw NoEggMoves1 + dw BittybatEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw OddishEggMoves dw NoEggMoves1 dw NoEggMoves1 - dw ParasEggMoves + dw ParasporEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw VenonatEggMoves dw NoEggMoves1 dw DiglettEggMoves dw NoEggMoves1 - dw MeowthEggMoves + dw CoinpurEggMoves dw NoEggMoves1 + dw NoEggMoves1 + dw NoEggMoves1 ; Perrserker dw PsyduckEggMoves dw NoEggMoves1 dw MankeyEggMoves dw NoEggMoves1 - dw GrowlitheEggMoves + dw NoEggMoves1 ; Annihilape + dw PupperonEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw PoliwagEggMoves dw NoEggMoves1 @@ -151,7 +165,7 @@ EggMovePointers1: dw NoEggMoves1 dw AerodactylEggMoves dw MunchlaxEggMoves ; Munchlax - dw SnorlaxEggMoves ; Should this even exist? + dw NoEggMoves1 ; Should this even exist? dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -188,6 +202,12 @@ SquirtleEggMoves: dw FLAIL dw -1 ; end +KotoraEggMoves: + dw SCREECH + dw CHARM + dw CRUNCH + dw -1 ; end + PidgeyEggMoves: dw PURSUIT dw FAINT_ATTACK @@ -247,7 +267,7 @@ NidoranMEggMoves: dw BEAT_UP dw -1 ; end -VulpixEggMoves: +VulpiiiEggMoves: dw FAINT_ATTACK dw HYPNOSIS dw FLAIL @@ -255,7 +275,7 @@ VulpixEggMoves: dw DISABLE dw -1 ; end -ZubatEggMoves: +BittybatEggMoves: dw QUICK_ATTACK dw PURSUIT dw FAINT_ATTACK @@ -270,7 +290,7 @@ OddishEggMoves: dw SYNTHESIS dw -1 ; end -ParasEggMoves: +ParasporEggMoves: dw FALSE_SWIPE dw SCREECH dw COUNTER @@ -295,7 +315,7 @@ DiglettEggMoves: dw BEAT_UP dw -1 ; end -MeowthEggMoves: +CoinpurEggMoves: dw SPITE dw CHARM dw HYPNOSIS @@ -322,7 +342,7 @@ MankeyEggMoves: dw BEAT_UP dw -1 ; end -GrowlitheEggMoves: +PupperonEggMoves: dw BODY_SLAM dw SAFEGUARD dw CRUNCH @@ -599,10 +619,6 @@ MunchlaxEggMoves: dw LICK dw -1 ; end -SnorlaxEggMoves: - dw LICK - dw -1 ; end - DratiniEggMoves: dw LIGHT_SCREEN dw MIST diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 6e62d51..7c40893 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -47,6 +47,9 @@ EvosAttacksPointers2:: dw QuagsireEvosAttacks dw EspeonEvosAttacks dw UmbreonEvosAttacks + dw LeafeonEvosAttacks + dw GlaceonEvosAttacks + dw SylveonEvosAttacks dw MurkrowEvosAttacks dw SlowkingEvosAttacks dw MisdreavusEvosAttacks @@ -718,6 +721,48 @@ UmbreonEvosAttacks: dbw 52, MOONLIGHT db 0 ; no more level-up moves +LeafeonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, ABSORB + dbw 23, QUICK_ATTACK + dbw 30, GROWTH + dbw 36, RAZOR_LEAF + dbw 42, TAKE_DOWN + dbw 47, SYNTHESIS + dbw 52, SOLARBEAM + db 0 ; no more level-up moves + +GlaceonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, AURORA_BEAM + dbw 23, QUICK_ATTACK + dbw 30, MIST + dbw 36, HAZE + dbw 42, TAKE_DOWN + dbw 47, BLIZZARD + dbw 52, BARRIER + db 0 ; no more level-up moves + +SylveonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, POUND ; DISARMING_VOICE + dbw 23, QUICK_ATTACK + dbw 30, POUND ; DRAINING_KISS + dbw 36, POUND ; DAZZLING_GLEAM + dbw 42, SWIFT + dbw 47, CHARM + dbw 52, LIGHT_SCREEN + db 0 ; no more level-up moves + MurkrowEvosAttacks: db 0 ; no more evolutions dbw 1, PECK diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 35a9605..35e00f6 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -16,6 +16,13 @@ EvosAttacksPointers1:: dw WeedleEvosAttacks dw KakunaEvosAttacks dw BeedrillEvosAttacks + dw GentlarvaEvosAttacks + dw PupalEvosAttacks + dw CarapthorEvosAttacks + dw KotoraEvosAttacks + dw GaotoraEvosAttacks + dw GorotoraEvosAttacks + dw RaitoraEvosAttacks dw PidgeyEvosAttacks dw PidgeottoEvosAttacks dw PidgeotEvosAttacks @@ -39,27 +46,34 @@ EvosAttacksPointers1:: dw NidoreignEvosAttacks dw ClefairyEvosAttacks dw ClefableEvosAttacks + dw VulpiiiEvosAttacks dw VulpixEvosAttacks dw NinetalesEvosAttacks dw JigglypuffEvosAttacks dw WigglytuffEvosAttacks + dw BittybatEvosAttacks dw ZubatEvosAttacks dw GolbatEvosAttacks dw OddishEvosAttacks dw GloomEvosAttacks dw VileplumeEvosAttacks + dw ParasporEvosAttacks dw ParasEvosAttacks dw ParasectEvosAttacks dw VenonatEvosAttacks dw VenomothEvosAttacks dw DiglettEvosAttacks dw DugtrioEvosAttacks + dw CoinpurEvosAttacks dw MeowthEvosAttacks dw PersianEvosAttacks + dw PerrserkerEvosAttacks dw PsyduckEvosAttacks dw GolduckEvosAttacks dw MankeyEvosAttacks dw PrimeapeEvosAttacks + dw AnnihilapeEvosAttacks + dw PupperonEvosAttacks dw GrowlitheEvosAttacks dw ArcanineEvosAttacks dw PoliwagEvosAttacks @@ -370,6 +384,98 @@ BeedrillEvosAttacks: dbw 40, AGILITY db 0 ; no more level-up moves +GentlarvaEvosAttacks: + dbbw EVOLVE_LEVEL, 7, PUPAL + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 1, STRING_SHOT + db 0 ; no more level-up moves + +PupalEvosAttacks: + dbbw EVOLVE_LEVEL, 10, CARAPTHOR + db 0 ; no more evolutions + dbw 1, HARDEN + dbw 7, HARDEN + db 0 ; no more level-up moves + +CarapthorEvosAttacks: + db 0 ; no more evolutions + dbw 1, COMET_PUNCH + dbw 10, COMET_PUNCH + dbw 15, PIN_MISSILE + dbw 20, DEFENSE_CURL + dbw 25, SWIFT + dbw 30, MEGA_PUNCH + dbw 35, SUBSTITUTE + dbw 40, SWAGGER + db 0 ; no more level-up moves + +KotoraEvosAttacks: + dbbw EVOLVE_LEVEL, 16, GAOTORA + dbbw EVOLVE_ITEM, THUNDERSTONE, RAITORA + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 18, QUICK_ATTACK + dbw 23, PURSUIT + dbw 27, SPARK + dbw 31, BITE + dbw 34, SCARY_FACE + dbw 42, THUNDER + dbw 49, AGILITY + db 0 ; no more level-up moves + +GaotoraEvosAttacks: + dbbw EVOLVE_LEVEL, 36, GAOTORA + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 39, BITE + dbw 44, SCARY_FACE + dbw 49, THRASH + dbw 54, THUNDER + dbw 49, AGILITY + db 0 ; no more level-up moves + +GorotoraEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 36, BODY_SLAM + dbw 42, BITE + dbw 50, SCARY_FACE + dbw 58, THRASH + dbw 66, THUNDER + dbw 78, AGILITY + db 0 ; no more level-up moves + +RaitoraEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 39, BITE + dbw 44, SCARY_FACE + dbw 54, THUNDER + dbw 63, AGILITY + db 0 ; no more level-up moves + PidgeyEvosAttacks: dbbw EVOLVE_LEVEL, 18, PIDGEOTTO db 0 ; no more evolutions @@ -661,6 +767,19 @@ ClefableEvosAttacks: dbw 1, MOONLIGHT db 0 ; no more level-up moves +VulpiiiEvosAttacks: + dbbw EVOLVE_LEVEL, 15, VULPIX + db 0 ; no more evolutions + dbw 1, EMBER + dbw 1, TAIL_WHIP + dbw 7, QUICK_ATTACK + dbw 13, ROAR + dbw 17, CONFUSE_RAY + dbw 21, SAFEGUARD + dbw 25, FLAMETHROWER + dbw 29, FIRE_SPIN + db 0 ; no more level-up moves + VulpixEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, NINETALES db 0 ; no more evolutions @@ -705,6 +824,18 @@ WigglytuffEvosAttacks: dbw 1, DOUBLESLAP db 0 ; no more level-up moves +BittybatEvosAttacks: + dbbw EVOLVE_LEVEL, 15, ZUBAT + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 6, SUPERSONIC + dbw 12, BITE + dbw 17, CONFUSE_RAY + dbw 23, WING_ATTACK + dbw 30, MEAN_LOOK + dbw 38, HAZE + db 0 ; no more level-up moves + ZubatEvosAttacks: dbbw EVOLVE_LEVEL, 22, GOLBAT db 0 ; no more evolutions @@ -719,7 +850,7 @@ ZubatEvosAttacks: GolbatEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT - dbbw EVOLVE_LEVEL, 44, CROBAT + dbbw EVOLVE_LEVEL, 44, CROBAT ; do we need it this time? db 0 ; no more evolutions dbw 1, SCREECH dbw 1, LEECH_LIFE @@ -769,6 +900,20 @@ VileplumeEvosAttacks: dbw 1, PETAL_DANCE db 0 ; no more level-up moves +ParasporEvosAttacks: + dbbw EVOLVE_LEVEL, 15, PARAS + db 0 ; no more evolutions + dbw 1, ABSORB + dbw 1, SCRATCH + dbw 7, STUN_SPORE + dbw 13, POISONPOWDER + dbw 17, LEECH_LIFE + dbw 21, SPORE + dbw 25, SLASH + dbw 29, GROWTH + dbw 33, GIGA_DRAIN + db 0 ; no more level-up moves + ParasEvosAttacks: dbbw EVOLVE_LEVEL, 24, PARASECT db 0 ; no more evolutions @@ -857,6 +1002,19 @@ DugtrioEvosAttacks: dbw 61, FISSURE db 0 ; no more level-up moves +CoinpurEvosAttacks: + dbbw EVOLVE_LEVEL, 14, MEOWTH ; Consideration: Day, Meowth, night, Moibelle. May be excessive. + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 11, BITE + dbw 19, PAY_DAY ; I remember having it learn this way earlier in later KEP versions... + dbw 25, FAINT_ATTACK + dbw 30, SCREECH + dbw 34, FURY_SWIPES + dbw 37, SLASH ; Seems a bit late, but Meowth gets it at L46, so... + db 0 ; no more level-up moves + MeowthEvosAttacks: dbbw EVOLVE_LEVEL, 28, PERSIAN db 0 ; no more evolutions @@ -883,6 +1041,19 @@ PersianEvosAttacks: dbw 53, SLASH db 0 ; no more level-up moves +PerrserkerEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 11, METAL_CLAW + dbw 20, PAY_DAY + dbw 29, SWAGGER + dbw 38, SCREECH + dbw 46, FURY_SWIPES + dbw 53, SLASH + dbw 63, THRASH + db 0 ; no more level-up moves + PsyduckEvosAttacks: dbbw EVOLVE_LEVEL, 33, GOLDUCK db 0 ; no more evolutions @@ -928,6 +1099,7 @@ MankeyEvosAttacks: db 0 ; no more level-up moves PrimeapeEvosAttacks: + dbbw EVOLVE_TRADE, -1, ANNIHILAPE ; funny db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -945,6 +1117,38 @@ PrimeapeEvosAttacks: dbw 63, THRASH db 0 ; no more level-up moves +AnnihilapeEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 1, LOW_KICK + dbw 1, RAGE + dbw 9, LOW_KICK + dbw 15, KARATE_CHOP + dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD + dbw 27, FOCUS_ENERGY + dbw 28, RAGE + dbw 36, SEISMIC_TOSS + dbw 45, CROSS_CHOP + dbw 54, SCREECH + dbw 63, THRASH + dbw 72, SPITE + db 0 ; no more level-up moves + +PupperonEvosAttacks: + dbbw EVOLVE_LEVEL, 15, GROWLITHE + db 0 ; no more evolutions + dbw 1, BITE + dbw 1, ROAR + dbw 9, EMBER + dbw 16, LEER + dbw 22, TAKE_DOWN + dbw 28, FLAME_WHEEL + dbw 34, AGILITY + dbw 40, FLAMETHROWER + db 0 ; no more level-up moves + GrowlitheEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, ARCANINE db 0 ; no more evolutions @@ -2061,6 +2265,9 @@ EeveeEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, FLAREON dbbw EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON dbbw EVOLVE_HAPPINESS, TR_NITE, UMBREON + dbbw EVOLVE_ITEM, LEAF_STONE, LEAFEON + dbbw EVOLVE_ITEM, ICE_STONE, GLACEON + dbbw EVOLVE_ITEM, MOON_STONE, SYLVEON db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index d8c8813..3bff545 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -16,6 +16,13 @@ FirstEvoStages:: dw WEEDLE dw WEEDLE dw WEEDLE + dw GENTLARVA + dw GENTLARVA + dw GENTLARVA + dw KOTORA + dw KOTORA + dw KOTORA + dw KOTORA dw PIDGEY ;10 dw PIDGEY dw PIDGEY @@ -39,29 +46,36 @@ FirstEvoStages:: dw NIDORAN_F ; Nidoreign, tentative dw CLEFFA dw CLEFFA - dw VULPIX - dw VULPIX + dw VULPIII + dw VULPIII + dw VULPIII dw IGGLYBUFF dw IGGLYBUFF ;28 - dw ZUBAT - dw ZUBAT + dw BITTYBAT + dw BITTYBAT + dw BITTYBAT dw ODDISH dw ODDISH dw ODDISH - dw PARAS - dw PARAS + dw PARASPOR + dw PARASPOR + dw PARASPOR dw VENONAT ;30 dw VENONAT dw DIGLETT dw DIGLETT - dw MEOWTH - dw MEOWTH + dw COINPUR + dw COINPUR + dw COINPUR + dw MEOWTH ; Perrserker, should be MEOWTH_G dw PSYDUCK dw PSYDUCK dw MANKEY ;38 dw MANKEY - dw GROWLITHE - dw GROWLITHE + dw ANNIHILAPE + dw PUPPERON + dw PUPPERON + dw PUPPERON dw POLIWAG dw POLIWAG dw POLIWAG @@ -177,7 +191,7 @@ FirstEvoStages:: dw LEDYBA dw SPINARAK dw SPINARAK ;a8 - dw ZUBAT + dw BITTYBAT dw CHINCHOU dw CHINCHOU dw PICHU @@ -206,6 +220,9 @@ FirstEvoStages:: dw WOOPER dw EEVEE dw EEVEE + dw EEVEE + dw EEVEE + dw EEVEE dw MURKROW dw SLOWPOKE dw MISDREAVUS ;c8 diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 58b37f0..742660f 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -17,6 +17,13 @@ KantoMonSpecials: db 20 ; WEEDLE db 25 ; KAKUNA db 45 ; BEEDRILL + db 25 ; GENTLARVA + db 30 ; PUPAL + db 60 ; CARAPTHOR + db 55 ; KOTORA + db 75 ; GAOTORA + db 95 ; GOROTORA + db 105 ; RAITORA, technically not meant to be here but stay with me db 35 ; PIDGEY db 50 ; PIDGEOTTO db 70 ; PIDGEOT @@ -40,27 +47,34 @@ KantoMonSpecials: db 75 ; NIDOREIGN db 60 ; CLEFAIRY db 85 ; CLEFABLE + db 60 ; VULPIII db 65 ; VULPIX db 100 ; NINETALES db 25 ; JIGGLYPUFF db 50 ; WIGGLYTUFF + db 35 ; BITTYBAT db 40 ; ZUBAT db 75 ; GOLBAT db 75 ; ODDISH db 85 ; GLOOM db 100 ; VILEPLUME + db 45 ; PARASPOR db 55 ; PARAS db 80 ; PARASECT db 40 ; VENONAT db 90 ; VENOMOTH db 45 ; DIGLETT db 70 ; DUGTRIO + db 35 ; COINPUR db 40 ; MEOWTH db 65 ; PERSIAN + db 50 ; PERRSERKER db 50 ; PSYDUCK db 80 ; GOLDUCK db 35 ; MANKEY db 60 ; PRIMEAPE + db 50 ; ANNIHILAPE + db 40 ; PUPPERON db 50 ; GROWLITHE db 80 ; ARCANINE db 40 ; POLIWAG diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 7c6f668..a1d0f0a 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -261,4 +261,21 @@ Pokered_MonIndices: db MUNCHLAX db KLEAVOR db GOROCHU + db GENTLARVA + db PUPAL + db CARAPTHOR + db KOTORA + db GAOTORA + db GOROTORA + db RAITORA + db BITTYBAT + db VULPIII + db PARASPOR + db ANNIHILAPE + db PUPPERON + db COINPUR + db PERRSERKER + db LEAFEON + db GLACEON + db SYLVEON assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 4625bc8..d5c12ee 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -17,6 +17,13 @@ MonMenuIcons: db ICON_CATERPILLAR ; WEEDLE db ICON_CATERPILLAR ; KAKUNA db ICON_BUG ; BEEDRILL + db ICON_CATERPILLAR ; GENTLARVA + db ICON_CATERPILLAR ; PUPAL + db ICON_BUG ; CARAPTHOR + db ICON_FOX ; KOTORA + db ICON_FOX ; GAOTORA + db ICON_FOX ; GOROTORA + db ICON_FOX ; RAITORA db ICON_BIRD ; PIDGEY db ICON_BIRD ; PIDGEOTTO db ICON_BIRD ; PIDGEOT @@ -40,27 +47,34 @@ MonMenuIcons: db ICON_MONSTER ; NIDOREIGN db ICON_CLEFAIRY ; CLEFAIRY db ICON_CLEFAIRY ; CLEFABLE + db ICON_FOX ; VULPIII db ICON_FOX ; VULPIX db ICON_FOX ; NINETALES db ICON_JIGGLYPUFF ; JIGGLYPUFF db ICON_JIGGLYPUFF ; WIGGLYTUFF + db ICON_BAT ; BITTYBAT db ICON_BAT ; ZUBAT db ICON_BAT ; GOLBAT db ICON_ODDISH ; ODDISH db ICON_ODDISH ; GLOOM db ICON_ODDISH ; VILEPLUME + db ICON_BUG ; PARASPOR db ICON_BUG ; PARAS db ICON_BUG ; PARASECT db ICON_CATERPILLAR ; VENONAT db ICON_MOTH ; VENOMOTH db ICON_DIGLETT ; DIGLETT db ICON_DIGLETT ; DUGTRIO + db ICON_FOX ; COINPUR db ICON_FOX ; MEOWTH db ICON_FOX ; PERSIAN + db ICON_FOX ; PERRSERKER db ICON_MONSTER ; PSYDUCK db ICON_MONSTER ; GOLDUCK db ICON_FIGHTER ; MANKEY db ICON_FIGHTER ; PRIMEAPE + db ICON_FIGHTER ; ANNIHILAPE + db ICON_FOX ; PUPPERON db ICON_FOX ; GROWLITHE db ICON_FOX ; ARCANINE db ICON_POLIWAG ; POLIWAG @@ -207,6 +221,9 @@ MonMenuIcons: db ICON_MONSTER ; QUAGSIRE db ICON_FOX ; ESPEON db ICON_FOX ; UMBREON + db ICON_FOX ; LEAFEON + db ICON_FOX ; GLACEON + db ICON_FOX ; SYLVEON db ICON_BIRD ; MURKROW db ICON_SLOWPOKE ; SLOWKING db ICON_GHOST ; MISDREAVUS diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index dd9a92d..52b6093 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -19,6 +19,13 @@ PokemonNames:: db "WEEDLE@@@@" db "KAKUNA@@@@" db "BEEDRILL@@" + db "GENTLARVA@" + db "PUPAL@@@@@" + db "CARAPTHOR@" + db "KOTORA@@@@" + db "GAOTORA@@@" + db "GOROTORA@@" + db "RAITORA@@@" db "PIDGEY@@@@" db "PIDGEOTTO@" db "PIDGEOT@@@" @@ -42,27 +49,34 @@ PokemonNames:: db "NIDOREIGN@" db "CLEFAIRY@@" db "CLEFABLE@@" + db "VULPIII@@@" db "VULPIX@@@@" db "NINETALES@" db "JIGGLYPUFF" db "WIGGLYTUFF" + db "BITTYBAT@@" db "ZUBAT@@@@@" db "GOLBAT@@@@" db "ODDISH@@@@" db "GLOOM@@@@@" db "VILEPLUME@" + db "PARASPOR@@" db "PARAS@@@@@" db "PARASECT@@" db "VENONAT@@@" db "VENOMOTH@@" db "DIGLETT@@@" db "DUGTRIO@@@" + db "COINPUR@@@" db "MEOWTH@@@@" db "PERSIAN@@@" + db "PERRSERKER" db "PSYDUCK@@@" db "GOLDUCK@@@" db "MANKEY@@@@" db "PRIMEAPE@@" + db "ANNIHILAPE" + db "PUPPERON@@" db "GROWLITHE@" db "ARCANINE@@" db "POLIWAG@@@" @@ -209,6 +223,9 @@ PokemonNames:: db "QUAGSIRE@@" db "ESPEON@@@@" db "UMBREON@@@" + db "LEAFEON@@@" + db "GLACEON@@@" + db "SYLVEON@@@" db "MURKROW@@@" db "SLOWKING@@" db "MISDREAVUS" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2ec2b71..f15dd18 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -63,6 +63,20 @@ INCBIN "gfx/pokemon/kakuna/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kakuna/shiny.pal" INCBIN "gfx/pokemon/beedrill/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/beedrill/shiny.pal" +INCBIN "gfx/pokemon/gentlarva/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gentlarva/shiny.pal" +INCBIN "gfx/pokemon/pupal/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pupal/shiny.pal" +INCBIN "gfx/pokemon/carapthor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/carapthor/shiny.pal" +INCBIN "gfx/pokemon/kotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/kotora/shiny.pal" +INCBIN "gfx/pokemon/gaotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gaotora/shiny.pal" +INCBIN "gfx/pokemon/gorotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gorotora/shiny.pal" +INCBIN "gfx/pokemon/raitora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/raitora/shiny.pal" INCBIN "gfx/pokemon/pidgey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pidgey/shiny.pal" INCBIN "gfx/pokemon/pidgeotto/front.gbcpal", middle_colors @@ -109,6 +123,8 @@ INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefairy/shiny.pal" INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefable/shiny.pal" +INCBIN "gfx/pokemon/vulpiii/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/vulpiii/shiny.pal" INCBIN "gfx/pokemon/vulpix/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/vulpix/shiny.pal" INCBIN "gfx/pokemon/ninetales/front.gbcpal", middle_colors @@ -117,6 +133,8 @@ INCBIN "gfx/pokemon/jigglypuff/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" INCBIN "gfx/pokemon/wigglytuff/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" +INCBIN "gfx/pokemon/bittybat/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bittybat/shiny.pal" INCBIN "gfx/pokemon/zubat/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/zubat/shiny.pal" INCBIN "gfx/pokemon/golbat/front.gbcpal", middle_colors @@ -127,6 +145,8 @@ INCBIN "gfx/pokemon/gloom/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gloom/shiny.pal" INCBIN "gfx/pokemon/vileplume/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/vileplume/shiny.pal" +INCBIN "gfx/pokemon/paraspor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/paraspor/shiny.pal" INCBIN "gfx/pokemon/paras/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/paras/shiny.pal" INCBIN "gfx/pokemon/parasect/front.gbcpal", middle_colors @@ -139,10 +159,14 @@ 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/coinpur/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/coinpur/shiny.pal" INCBIN "gfx/pokemon/meowth/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/meowth/shiny.pal" INCBIN "gfx/pokemon/persian/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/persian/shiny.pal" +INCBIN "gfx/pokemon/perrserker/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/perrserker/shiny.pal" INCBIN "gfx/pokemon/psyduck/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/psyduck/shiny.pal" INCBIN "gfx/pokemon/golduck/front.gbcpal", middle_colors @@ -151,6 +175,10 @@ INCBIN "gfx/pokemon/mankey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mankey/shiny.pal" INCBIN "gfx/pokemon/primeape/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/primeape/shiny.pal" +INCBIN "gfx/pokemon/annihilape/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/annihilape/shiny.pal" +INCBIN "gfx/pokemon/pupperon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pupperon/shiny.pal" INCBIN "gfx/pokemon/growlithe/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/growlithe/shiny.pal" INCBIN "gfx/pokemon/arcanine/front.gbcpal", middle_colors @@ -443,6 +471,12 @@ INCBIN "gfx/pokemon/espeon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/espeon/shiny.pal" INCBIN "gfx/pokemon/umbreon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/umbreon/shiny.pal" +INCBIN "gfx/pokemon/leafeon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/leafeon/shiny.pal" +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/murkrow/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/murkrow/shiny.pal" INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 0b47362..7b2de53 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -43,6 +43,20 @@ PokemonPicPointers:: dba KakunaBackpic dba BeedrillFrontpic dba BeedrillBackpic + dba GentlarvaFrontpic + dba GentlarvaBackpic + dba PupalFrontpic + dba PupalBackpic + dba CarapthorFrontpic + dba CarapthorBackpic + dba KotoraFrontpic + dba KotoraBackpic + dba GaotoraFrontpic + dba GaotoraBackpic + dba GorotoraFrontpic + dba GorotoraBackpic + dba RaitoraFrontpic + dba RaitoraBackpic dba PidgeyFrontpic dba PidgeyBackpic dba PidgeottoFrontpic @@ -89,6 +103,8 @@ PokemonPicPointers:: dba ClefairyBackpic dba ClefableFrontpic dba ClefableBackpic + dba VulpiiiFrontpic + dba VulpiiiBackpic dba VulpixFrontpic dba VulpixBackpic dba NinetalesFrontpic @@ -97,6 +113,8 @@ PokemonPicPointers:: dba JigglypuffBackpic dba WigglytuffFrontpic dba WigglytuffBackpic + dba BittybatFrontpic + dba BittybatBackpic dba ZubatFrontpic dba ZubatBackpic dba GolbatFrontpic @@ -107,6 +125,8 @@ PokemonPicPointers:: dba GloomBackpic dba VileplumeFrontpic dba VileplumeBackpic + dba ParasporFrontpic + dba ParasporBackpic dba ParasFrontpic dba ParasBackpic dba ParasectFrontpic @@ -119,10 +139,14 @@ PokemonPicPointers:: dba DiglettBackpic dba DugtrioFrontpic dba DugtrioBackpic + dba CoinpurFrontpic + dba CoinpurBackpic dba MeowthFrontpic dba MeowthBackpic dba PersianFrontpic dba PersianBackpic + dba PerrserkerFrontpic + dba PerrserkerBackpic dba PsyduckFrontpic dba PsyduckBackpic dba GolduckFrontpic @@ -131,6 +155,10 @@ PokemonPicPointers:: dba MankeyBackpic dba PrimeapeFrontpic dba PrimeapeBackpic + dba AnnihilapeFrontpic + dba AnnihilapeBackpic + dba PupperonFrontpic + dba PupperonBackpic dba GrowlitheFrontpic dba GrowlitheBackpic dba ArcanineFrontpic @@ -423,6 +451,12 @@ PokemonPicPointers:: dba EspeonBackpic dba UmbreonFrontpic dba UmbreonBackpic + dba LeafeonFrontpic + dba LeafeonBackpic + dba GlaceonFrontpic + dba GlaceonBackpic + dba SylveonFrontpic + dba SylveonBackpic dba MurkrowFrontpic dba MurkrowBackpic dba SlowkingFrontpic diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index fd20f0d..6bbbcf3 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -24,10 +24,10 @@ JohtoGrassWildMons: dbw 3, GASTLY dbw 4, GASTLY dbw 5, GASTLY - dbw 3, RATTATA + dbw 3, COINPUR dbw 6, GASTLY - dbw 5, RATTATA - dbw 5, RATTATA + dbw 5, COINPUR + dbw 5, COINPUR end_grass_wildmons def_grass_wildmons SPROUT_TOWER_3F @@ -52,10 +52,10 @@ JohtoGrassWildMons: dbw 3, GASTLY dbw 4, GASTLY dbw 5, GASTLY - dbw 3, RATTATA + dbw 3, COINPUR dbw 6, GASTLY - dbw 5, RATTATA - dbw 5, RATTATA + dbw 5, COINPUR + dbw 5, COINPUR end_grass_wildmons def_grass_wildmons TIN_TOWER_2F @@ -80,10 +80,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_3F @@ -108,10 +108,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_4F @@ -136,10 +136,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_5F @@ -164,10 +164,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_6F @@ -192,10 +192,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_7F @@ -220,10 +220,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_8F @@ -248,10 +248,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_9F @@ -276,39 +276,39 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons ; Reworked to be way more Fire-type themed. ; The Burned Tower isn't very useful because stuff like Rattata can be found anywhere. ; They're good for worldbuilding but little else. ; Did you know they removed Magmar in B1F in Crystal? For Weezing?? -; The Rattata could possibly be replaced with Vulpiii later. +; The Rattata have been replaced with Vulpiii in 1F, and Pupperon in B1F. def_grass_wildmons BURNED_TOWER_1F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR dbw 15, HOUNDOUR ; day - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR dbw 15, HOUNDOUR ; nite - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR @@ -318,26 +318,26 @@ JohtoGrassWildMons: def_grass_wildmons BURNED_TOWER_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGBY dbw 14, MAGBY ; day - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGBY dbw 14, MAGBY ; nite - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGMAR dbw 14, MAGMAR @@ -432,7 +432,7 @@ JohtoGrassWildMons: ; morn dbw 6, GEODUDE dbw 6, SANDSHREW - dbw 5, ZUBAT + dbw 5, BITTYBAT dbw 4, RATTATA dbw 7, ZUBAT dbw 6, ONIX @@ -440,7 +440,7 @@ JohtoGrassWildMons: ; day dbw 6, GEODUDE dbw 6, SANDSHREW - dbw 5, ZUBAT + dbw 5, BITTYBAT dbw 4, RATTATA dbw 7, ZUBAT dbw 6, ONIX @@ -450,7 +450,7 @@ JohtoGrassWildMons: dbw 6, RATTATA dbw 5, WOOPER dbw 4, RATTATA - dbw 7, ZUBAT + dbw 7, BITTYBAT dbw 6, ONIX dbw 6, ONIX end_grass_wildmons @@ -459,7 +459,7 @@ JohtoGrassWildMons: db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn dbw 8, GEODUDE - dbw 6, ZUBAT + dbw 6, BITTYBAT dbw 8, ZUBAT dbw 8, ONIX dbw 6, RATTATA @@ -467,15 +467,15 @@ JohtoGrassWildMons: dbw 8, RATTATA ; day dbw 8, GEODUDE - dbw 6, ZUBAT - dbw 8, ZUBAT + dbw 6, BITTYBAT + dbw 8, BITTYBAT dbw 8, ONIX dbw 6, RATTATA dbw 8, RATTATA dbw 8, RATTATA ; nite dbw 8, GEODUDE - dbw 6, ZUBAT + dbw 6, BITTYBAT dbw 8, WOOPER dbw 8, ONIX dbw 6, RATTATA @@ -514,27 +514,27 @@ JohtoGrassWildMons: def_grass_wildmons SLOWPOKE_WELL_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE ; day - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE ; nite - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE end_grass_wildmons @@ -570,8 +570,9 @@ JohtoGrassWildMons: ; With Viridian Forest existing, much of this wild data no longer made sense. ; Changed to feature Yanma, Ledyba, etc. ; Yanma gives easier Yanmega access, Ledyba and Spinarak are nice flavour. -; Paras remains accessible for HM usage. It should be Paraspor, though. +; Paraspor remains accessible for HM usage. ; Shuckle, Pineco, and Heracross should be made more common Headbutt tree Pokemon. +; Gentlarva appears less than the other bugs, as usual, replacing Pidgey. Yanma is the new predator. def_grass_wildmons ILEX_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn @@ -579,7 +580,7 @@ JohtoGrassWildMons: dbw 5, WEEDLE dbw 7, LEDYBA dbw 7, LEDYBA - dbw 7, PIDGEY + dbw 7, GENTLARVA dbw 6, YANMA dbw 6, YANMA ; day @@ -587,7 +588,7 @@ JohtoGrassWildMons: dbw 5, WEEDLE dbw 7, LEDYBA dbw 7, LEDYBA - dbw 7, PIDGEY + dbw 7, GENTLARVA dbw 6, YANMA dbw 6, YANMA ; nite @@ -596,26 +597,27 @@ JohtoGrassWildMons: dbw 7, SPINARAK dbw 7, PSYDUCK dbw 7, HOOTHOOT - dbw 6, PARAS ; PARASPOR - dbw 6, PARAS ; PARASPOR + dbw 6, PARASPOR + dbw 6, PARASPOR end_grass_wildmons ; Mt. Mortar now has consistent Marill access like GS. +; Zubats and Golbats are no longer outside during the day as their Pokedex data often says they hate light. Also, Kotora. def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn dbw 14, RATTATA - dbw 13, ZUBAT + dbw 13, KOTORA dbw 14, MACHOP - dbw 13, GOLBAT + dbw 13, KOTORA dbw 14, GEODUDE dbw 16, RATICATE dbw 16, RATICATE ; day dbw 14, RATTATA - dbw 13, ZUBAT + dbw 13, KOTORA dbw 14, MACHOP - dbw 13, GOLBAT + dbw 13, KOTORA dbw 14, GEODUDE dbw 16, RATICATE dbw 16, RATICATE @@ -1198,28 +1200,28 @@ JohtoGrassWildMons: def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 3, GEODUDE - dbw 2, ZUBAT - dbw 2, GEODUDE - dbw 4, GEODUDE + dbw 3, PHANPY + dbw 2, BITTYBAT + dbw 2, PHANPY + dbw 4, PHANPY dbw 2, TEDDIURSA - dbw 4, ZUBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE ; day - dbw 3, GEODUDE - dbw 2, ZUBAT - dbw 2, GEODUDE - dbw 4, GEODUDE - dbw 2, ZUBAT - dbw 4, ZUBAT + dbw 3, PHANPY + dbw 2, BITTYBAT + dbw 2, PHANPY + dbw 4, PHANPY + dbw 2, BITTYBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE ; nite dbw 3, GEODUDE - dbw 2, ZUBAT + dbw 2, BITTYBAT dbw 2, GEODUDE dbw 4, GEODUDE - dbw 2, ZUBAT - dbw 4, ZUBAT + dbw 2, BITTYBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE end_grass_wildmons @@ -1358,7 +1360,7 @@ JohtoGrassWildMons: dbw 7, HOPPIP ; nite dbw 4, WOOPER - dbw 5, RATTATA + dbw 5, COINPUR dbw 7, BELLSPROUT dbw 6, MAREEP ; From Gold dbw 7, HOOTHOOT @@ -1385,13 +1387,13 @@ JohtoGrassWildMons: dbw 7, HOPPIP dbw 7, HOPPIP ; nite - dbw 6, RATTATA + dbw 6, COINPUR dbw 6, ZUBAT dbw 6, GEODUDE dbw 6, ZUBAT - dbw 7, RATTATA - dbw 7, RATTATA - dbw 7, RATTATA + dbw 7, COINPUR + dbw 7, COINPUR + dbw 7, COINPUR end_grass_wildmons def_grass_wildmons ROUTE_34 @@ -1414,7 +1416,7 @@ JohtoGrassWildMons: dbw 10, DITTO ; nite dbw 12, DROWZEE - dbw 11, RATTATA + dbw 11, COINPUR dbw 12, HOOTHOOT dbw 10, ABRA dbw 12, JIGGLYPUFF @@ -1456,7 +1458,7 @@ JohtoGrassWildMons: dbw 4, LEDYBA dbw 4, PIDGEY dbw 5, BELLSPROUT - dbw 5, GROWLITHE + dbw 5, PUPPERON dbw 5, PIDGEY dbw 6, PIDGEY dbw 6, PIDGEY @@ -1464,7 +1466,7 @@ JohtoGrassWildMons: dbw 4, PIDGEY dbw 4, PIDGEY dbw 5, BELLSPROUT - dbw 5, GROWLITHE + dbw 5, PUPPERON dbw 5, PIDGEY dbw 6, PIDGEY dbw 6, PIDGEY @@ -1472,7 +1474,7 @@ JohtoGrassWildMons: dbw 4, SPINARAK dbw 4, HOOTHOOT dbw 5, BELLSPROUT - dbw 5, HOOTHOOT + dbw 5, VULPIII ; Silver data, but specifically at night dbw 5, HOOTHOOT dbw 5, MISDREAVUS dbw 5, MISDREAVUS @@ -1484,7 +1486,7 @@ JohtoGrassWildMons: def_grass_wildmons ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 13, LEDYBA + dbw 13, PUPPERON dbw 14, STANTLER dbw 15, PIDGEY dbw 16, GROWLITHE @@ -1492,7 +1494,7 @@ JohtoGrassWildMons: dbw 15, LEDIAN dbw 15, LEDIAN ; day - dbw 13, PIDGEY + dbw 13, PUPPERON dbw 14, STANTLER dbw 15, PIDGEY dbw 16, GROWLITHE @@ -1685,6 +1687,7 @@ JohtoGrassWildMons: ; Ports the 5% Jigglypuff all-day encounter from GS. ; Makes Hoothoot replace a Rattata at night to have continuity with Spearow. ; Overall, increased Johto frequency that matches early advertising for the game. +; Coinpur replaces Rattatas at night. def_grass_wildmons ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn @@ -1707,8 +1710,8 @@ JohtoGrassWildMons: dbw 2, GEODUDE dbw 2, HOOTHOOT dbw 3, GEODUDE - dbw 3, RATTATA - dbw 2, RATTATA + dbw 3, COINPUR + dbw 2, COINPUR dbw 2, JIGGLYPUFF dbw 2, JIGGLYPUFF end_grass_wildmons diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 91ce40c..28128c3 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -338,60 +338,62 @@ KantoGrassWildMons: dbw 35, RATICATE end_grass_wildmons +; Gold Data, but with Snubbull in the day, vaguely like Crystal. def_grass_wildmons ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 37, RATTATA - dbw 37, SPEAROW - dbw 38, SNUBBULL - dbw 38, RATICATE - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + db 37, RATTATA + db 37, SPEAROW + db 38, GROWLITHE + db 39, RATICATE + db 39, RATTATA + db 35, SNUBBULL + db 35, SNUBBULL ; day - dbw 37, RATTATA - dbw 37, SPEAROW - dbw 38, SNUBBULL - dbw 38, RATICATE - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + db 37, RATTATA + db 37, SPEAROW + db 38, GROWLITHE + db 39, RATICATE + db 39, RATTATA + db 35, GROWLITHE + db 35, GROWLITHE ; nite - dbw 37, MEOWTH - dbw 37, MURKROW - dbw 38, HOUNDOUR - dbw 38, PERSIAN - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + db 37, RATTATA + db 37, MURKROW + db 38, GROWLITHE + db 39, RATICATE + db 39, MURKROW + db 35, HOUNDOUR + db 35, HOUNDOUR end_grass_wildmons +; Silver Data, contrasting with Route 7's Gold Data. def_grass_wildmons ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 37, SNUBBULL - dbw 39, PIDGEOTTO - dbw 36, ABRA - dbw 37, GROWLITHE - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + db 37, MEOWTH + db 39, PIDGEOTTO + db 35, ABRA + db 38, VULPIX + db 37, PIDGEOTTO + db 35, KADABRA + db 35, KADABRA ; day - dbw 37, SNUBBULL - dbw 39, PIDGEOTTO - dbw 36, ABRA - dbw 37, GROWLITHE - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + db 37, MEOWTH + db 39, PIDGEOTTO + db 35, ABRA + db 38, VULPIX + db 37, PIDGEOTTO + db 35, KADABRA + db 35, KADABRA ; nite - dbw 37, MEOWTH - dbw 30, NOCTOWL - dbw 36, ABRA - dbw 37, HAUNTER - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + db 37, MEOWTH + db 30, HAUNTER + db 35, ABRA + db 39, NOCTOWL + db 38, VULPIX + db 35, KADABRA + db 35, KADABRA end_grass_wildmons def_grass_wildmons ROUTE_9 @@ -879,7 +881,7 @@ KantoGrassWildMons: dbw 36, METAPOD dbw 36, CATERPIE dbw 35, PARAS - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU ; day @@ -887,15 +889,15 @@ KantoGrassWildMons: dbw 36, CATERPIE dbw 35, METAPOD dbw 36, METAPOD - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU ; nite - dbw 35, ODDISH ; KOTORA - dbw 36, ODDISH ; KOTORA + dbw 35, KOTORA + dbw 36, KOTORA dbw 36, ZUBAT dbw 35, PARAS - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU end_grass_wildmons diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 39f49c4..b5709f5 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -1,6 +1,6 @@ Footprints: table_width LEN_1BPP_TILE * 4, Footprints -; don't forget to update assert_table_length + INCBIN "gfx/footprints/bulbasaur.1bpp" INCBIN "gfx/footprints/ivysaur.1bpp" INCBIN "gfx/footprints/venusaur.1bpp" @@ -16,6 +16,13 @@ INCBIN "gfx/footprints/butterfree.1bpp" INCBIN "gfx/footprints/weedle.1bpp" INCBIN "gfx/footprints/kakuna.1bpp" INCBIN "gfx/footprints/beedrill.1bpp" +INCBIN "gfx/footprints/gentlarva.1bpp" +INCBIN "gfx/footprints/pupal.1bpp" +INCBIN "gfx/footprints/carapthor.1bpp" +INCBIN "gfx/footprints/kotora.1bpp" +INCBIN "gfx/footprints/gaotora.1bpp" +INCBIN "gfx/footprints/gorotora.1bpp" +INCBIN "gfx/footprints/raitora.1bpp" INCBIN "gfx/footprints/pidgey.1bpp" INCBIN "gfx/footprints/pidgeotto.1bpp" INCBIN "gfx/footprints/pidgeot.1bpp" @@ -39,27 +46,34 @@ INCBIN "gfx/footprints/nidoking.1bpp" INCBIN "gfx/footprints/nidoreign.1bpp" INCBIN "gfx/footprints/clefairy.1bpp" INCBIN "gfx/footprints/clefable.1bpp" +INCBIN "gfx/footprints/vulpiii.1bpp" INCBIN "gfx/footprints/vulpix.1bpp" INCBIN "gfx/footprints/ninetales.1bpp" INCBIN "gfx/footprints/jigglypuff.1bpp" INCBIN "gfx/footprints/wigglytuff.1bpp" +INCBIN "gfx/footprints/bittybat.1bpp" INCBIN "gfx/footprints/zubat.1bpp" INCBIN "gfx/footprints/golbat.1bpp" INCBIN "gfx/footprints/oddish.1bpp" INCBIN "gfx/footprints/gloom.1bpp" INCBIN "gfx/footprints/vileplume.1bpp" +INCBIN "gfx/footprints/paraspor.1bpp" INCBIN "gfx/footprints/paras.1bpp" INCBIN "gfx/footprints/parasect.1bpp" INCBIN "gfx/footprints/venonat.1bpp" INCBIN "gfx/footprints/venomoth.1bpp" INCBIN "gfx/footprints/diglett.1bpp" INCBIN "gfx/footprints/dugtrio.1bpp" +INCBIN "gfx/footprints/coinpur.1bpp" INCBIN "gfx/footprints/meowth.1bpp" INCBIN "gfx/footprints/persian.1bpp" +INCBIN "gfx/footprints/perrserker.1bpp" INCBIN "gfx/footprints/psyduck.1bpp" INCBIN "gfx/footprints/golduck.1bpp" INCBIN "gfx/footprints/mankey.1bpp" INCBIN "gfx/footprints/primeape.1bpp" +INCBIN "gfx/footprints/annihilape.1bpp" +INCBIN "gfx/footprints/pupperon.1bpp" INCBIN "gfx/footprints/growlithe.1bpp" INCBIN "gfx/footprints/arcanine.1bpp" INCBIN "gfx/footprints/poliwag.1bpp" @@ -206,6 +220,9 @@ INCBIN "gfx/footprints/wooper.1bpp" INCBIN "gfx/footprints/quagsire.1bpp" INCBIN "gfx/footprints/espeon.1bpp" INCBIN "gfx/footprints/umbreon.1bpp" +INCBIN "gfx/footprints/leafeon.1bpp" +INCBIN "gfx/footprints/glaceon.1bpp" +INCBIN "gfx/footprints/sylveon.1bpp" INCBIN "gfx/footprints/murkrow.1bpp" INCBIN "gfx/footprints/slowking.1bpp" INCBIN "gfx/footprints/misdreavus.1bpp" @@ -268,4 +285,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $110 ; don't forget to update this + assert_table_length NUM_POKEMON + 5 ; The +5 accounts for the 5 glitch footprints diff --git a/gfx/footprints/annihilape.png b/gfx/footprints/annihilape.png new file mode 100644 index 0000000000000000000000000000000000000000..35e5faeaf0838b1fa3272094761a9012536bfbcb GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2@Xv44Kse)Pk8XZ po}oFRO&}ps;3K=6LA`?!6T_4}0zw{hONBuCJYD@<);T3K0RYXA7&!m{ literal 0 HcmV?d00001 diff --git a/gfx/footprints/bittybat.png b/gfx/footprints/bittybat.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints/carapthor.png b/gfx/footprints/carapthor.png new file mode 100644 index 0000000000000000000000000000000000000000..35e5faeaf0838b1fa3272094761a9012536bfbcb GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2@Xv44Kse)Pk8XZ po}oFRO&}ps;3K=6LA`?!6T_4}0zw{hONBuCJYD@<);T3K0RYXA7&!m{ literal 0 HcmV?d00001 diff --git a/gfx/footprints/coinpur.png b/gfx/footprints/coinpur.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbc4762c956686ca24e2d6e93fce2d059c1d494 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2?y9_@H24!ws$!6 ogQw@{e@3?t5(hY1BqG>>S{(Ot7Q{@?^9AYiboFyt=akR{0J=ID2mk;8 literal 0 HcmV?d00001 diff --git a/gfx/footprints/gaotora.png b/gfx/footprints/gaotora.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b5ac5736a93a7d287b3df04b619ef478b7cf65 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJO-~ockcwN$2@cF>*c*;K|Lkz= v|9|!go%Y`xX7c~x2{?3&&ErG8!*xD}J;DMur$rAdfi!!%`njxgN@xNA)CnEc literal 0 HcmV?d00001 diff --git a/gfx/footprints/gentlarva.png b/gfx/footprints/gentlarva.png new file mode 100644 index 0000000000000000000000000000000000000000..bd50e57bb46789148e280f17dd628efb58fedcc9 GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJF;5rAkcwN$2?zLR@H24!<2PVB abCjK-JBYc}h$lw}q|(#X&t;ucLK6T*QxQA> literal 0 HcmV?d00001 diff --git a/gfx/footprints/glaceon.png b/gfx/footprints/glaceon.png new file mode 100644 index 0000000000000000000000000000000000000000..7bfd392149d2d23efb5d9797dfa9671a7ce29d32 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJEl(H6kcwN$2?sc5@H2Ftf8N;h s|3AM&r~NmFgZzKM^r3(JKC(Ov46pC;*=3ykatfr|)78&qol`;+0Pmz97ytkO literal 0 HcmV?d00001 diff --git a/gfx/footprints/gorotora.png b/gfx/footprints/gorotora.png new file mode 100644 index 0000000000000000000000000000000000000000..71a77b3ab715622ed0447153fabbe3ead650e1b7 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJHBT4EkcwN$2@MU*4rhwlJZ}7N r7ySQU{(yqOri7;d{1X!X9cW-+$Y&Kfn%^<|FG#1StDnm{r-UW|SEU@Y literal 0 HcmV?d00001 diff --git a/gfx/footprints/kotora.png b/gfx/footprints/kotora.png new file mode 100644 index 0000000000000000000000000000000000000000..f41e90a002591c1ec43bba3c9cd56fcab30811d7 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJDNh&2kcwN$2?sc5@H24!<99gp fk6(>(+5r{@@rCT`ihuh$gH(IE`njxgN@xNAvyv1r literal 0 HcmV?d00001 diff --git a/gfx/footprints/leafeon.png b/gfx/footprints/leafeon.png new file mode 100644 index 0000000000000000000000000000000000000000..7bfd392149d2d23efb5d9797dfa9671a7ce29d32 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJEl(H6kcwN$2?sc5@H2Ftf8N;h s|3AM&r~NmFgZzKM^r3(JKC(Ov46pC;*=3ykatfr|)78&qol`;+0Pmz97ytkO literal 0 HcmV?d00001 diff --git a/gfx/footprints/paraspor.png b/gfx/footprints/paraspor.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints/perrserker.png b/gfx/footprints/perrserker.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbc4762c956686ca24e2d6e93fce2d059c1d494 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2?y9_@H24!ws$!6 ogQw@{e@3?t5(hY1BqG>>S{(Ot7Q{@?^9AYiboFyt=akR{0J=ID2mk;8 literal 0 HcmV?d00001 diff --git a/gfx/footprints/pupal.png b/gfx/footprints/pupal.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints/pupperon.png b/gfx/footprints/pupperon.png new file mode 100644 index 0000000000000000000000000000000000000000..42c792ad1ce6b19c91459e195add5ae3f898b407 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJWltB!kcwN$2@VX;m>nMdNmqFM o|37mCXWRe(k_%Y=v$N$eFl>($b=$f$I}xPK)78&qol`;+0O<4@6#xJL literal 0 HcmV?d00001 diff --git a/gfx/footprints/raitora.png b/gfx/footprints/raitora.png new file mode 100644 index 0000000000000000000000000000000000000000..71a77b3ab715622ed0447153fabbe3ead650e1b7 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJHBT4EkcwN$2@MU*4rhwlJZ}7N r7ySQU{(yqOri7;d{1X!X9cW-+$Y&Kfn%^<|FG#1StDnm{r-UW|SEU@Y literal 0 HcmV?d00001 diff --git a/gfx/footprints/sylveon.png b/gfx/footprints/sylveon.png new file mode 100644 index 0000000000000000000000000000000000000000..7bfd392149d2d23efb5d9797dfa9671a7ce29d32 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJEl(H6kcwN$2?sc5@H2Ftf8N;h s|3AM&r~NmFgZzKM^r3(JKC(Ov46pC;*=3ykatfr|)78&qol`;+0Pmz97ytkO literal 0 HcmV?d00001 diff --git a/gfx/footprints/vulpiii.png b/gfx/footprints/vulpiii.png new file mode 100644 index 0000000000000000000000000000000000000000..cf21d80fa72b2d61c253d3c361e2f5104e997117 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJHBT4EkcwN$2?sc5@H2Ftf8KcH r|9^u={k9V}Y-|+#Bk#b)uaL>aP_mONM|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/annihilape/shiny.pal b/gfx/pokemon/annihilape/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/annihilape/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 4dfa479..bb331ae 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -15,6 +15,13 @@ BitmasksPointers: dw WeedleBitmasks dw KakunaBitmasks dw BeedrillBitmasks + dw GentlarvaBitmasks + dw PupalBitmasks + dw CarapthorBitmasks + dw KotoraBitmasks + dw GaotoraBitmasks + dw GorotoraBitmasks + dw RaitoraBitmasks dw PidgeyBitmasks dw PidgeottoBitmasks dw PidgeotBitmasks @@ -38,27 +45,34 @@ BitmasksPointers: dw NidoreignBitmasks dw ClefairyBitmasks dw ClefableBitmasks + dw VulpiiiBitmasks dw VulpixBitmasks dw NinetalesBitmasks dw JigglypuffBitmasks dw WigglytuffBitmasks + dw BittybatBitmasks dw ZubatBitmasks dw GolbatBitmasks dw OddishBitmasks dw GloomBitmasks dw VileplumeBitmasks + dw ParasporBitmasks dw ParasBitmasks dw ParasectBitmasks dw VenonatBitmasks dw VenomothBitmasks dw DiglettBitmasks dw DugtrioBitmasks + dw CoinpurBitmasks dw MeowthBitmasks dw PersianBitmasks + dw PerrserkerBitmasks dw PsyduckBitmasks dw GolduckBitmasks dw MankeyBitmasks dw PrimeapeBitmasks + dw AnnihilapeBitmasks + dw PupperonBitmasks dw GrowlitheBitmasks dw ArcanineBitmasks dw PoliwagBitmasks @@ -205,6 +219,9 @@ BitmasksPointers: dw QuagsireBitmasks dw EspeonBitmasks dw UmbreonBitmasks + dw LeafeonBitmasks + dw GlaceonBitmasks + dw SylveonBitmasks dw MurkrowBitmasks dw SlowkingBitmasks dw MisdreavusBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index aabf61c..e2b35ca 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -13,6 +13,13 @@ ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm" WeedleBitmasks: INCLUDE "gfx/pokemon/weedle/bitmask.asm" KakunaBitmasks: INCLUDE "gfx/pokemon/kakuna/bitmask.asm" BeedrillBitmasks: INCLUDE "gfx/pokemon/beedrill/bitmask.asm" +GentlarvaBitmasks: INCLUDE "gfx/pokemon/gentlarva/bitmask.asm" +PupalBitmasks: INCLUDE "gfx/pokemon/pupal/bitmask.asm" +CarapthorBitmasks: INCLUDE "gfx/pokemon/carapthor/bitmask.asm" +KotoraBitmasks: INCLUDE "gfx/pokemon/kotora/bitmask.asm" +GaotoraBitmasks: INCLUDE "gfx/pokemon/gaotora/bitmask.asm" +GorotoraBitmasks: INCLUDE "gfx/pokemon/gorotora/bitmask.asm" +RaitoraBitmasks: INCLUDE "gfx/pokemon/raitora/bitmask.asm" PidgeyBitmasks: INCLUDE "gfx/pokemon/pidgey/bitmask.asm" PidgeottoBitmasks: INCLUDE "gfx/pokemon/pidgeotto/bitmask.asm" PidgeotBitmasks: INCLUDE "gfx/pokemon/pidgeot/bitmask.asm" @@ -36,27 +43,34 @@ NidokingBitmasks: INCLUDE "gfx/pokemon/nidoking/bitmask.asm" NidoreignBitmasks: INCLUDE "gfx/pokemon/nidoreign/bitmask.asm" ClefairyBitmasks: INCLUDE "gfx/pokemon/clefairy/bitmask.asm" ClefableBitmasks: INCLUDE "gfx/pokemon/clefable/bitmask.asm" +VulpiiiBitmasks: INCLUDE "gfx/pokemon/vulpiii/bitmask.asm" VulpixBitmasks: INCLUDE "gfx/pokemon/vulpix/bitmask.asm" NinetalesBitmasks: INCLUDE "gfx/pokemon/ninetales/bitmask.asm" JigglypuffBitmasks: INCLUDE "gfx/pokemon/jigglypuff/bitmask.asm" WigglytuffBitmasks: INCLUDE "gfx/pokemon/wigglytuff/bitmask.asm" +BittybatBitmasks: INCLUDE "gfx/pokemon/bittybat/bitmask.asm" ZubatBitmasks: INCLUDE "gfx/pokemon/zubat/bitmask.asm" GolbatBitmasks: INCLUDE "gfx/pokemon/golbat/bitmask.asm" OddishBitmasks: INCLUDE "gfx/pokemon/oddish/bitmask.asm" GloomBitmasks: INCLUDE "gfx/pokemon/gloom/bitmask.asm" VileplumeBitmasks: INCLUDE "gfx/pokemon/vileplume/bitmask.asm" +ParasporBitmasks: INCLUDE "gfx/pokemon/paraspor/bitmask.asm" ParasBitmasks: INCLUDE "gfx/pokemon/paras/bitmask.asm" ParasectBitmasks: INCLUDE "gfx/pokemon/parasect/bitmask.asm" 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" +CoinpurBitmasks: INCLUDE "gfx/pokemon/coinpur/bitmask.asm" MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm" PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm" +PerrserkerBitmasks: INCLUDE "gfx/pokemon/perrserker/bitmask.asm" PsyduckBitmasks: INCLUDE "gfx/pokemon/psyduck/bitmask.asm" GolduckBitmasks: INCLUDE "gfx/pokemon/golduck/bitmask.asm" MankeyBitmasks: INCLUDE "gfx/pokemon/mankey/bitmask.asm" PrimeapeBitmasks: INCLUDE "gfx/pokemon/primeape/bitmask.asm" +AnnihilapeBitmasks: INCLUDE "gfx/pokemon/annihilape/bitmask.asm" +PupperonBitmasks: INCLUDE "gfx/pokemon/pupperon/bitmask.asm" GrowlitheBitmasks: INCLUDE "gfx/pokemon/growlithe/bitmask.asm" ArcanineBitmasks: INCLUDE "gfx/pokemon/arcanine/bitmask.asm" PoliwagBitmasks: INCLUDE "gfx/pokemon/poliwag/bitmask.asm" @@ -203,6 +217,9 @@ WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm" QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm" EspeonBitmasks: INCLUDE "gfx/pokemon/espeon/bitmask.asm" 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" MurkrowBitmasks: INCLUDE "gfx/pokemon/murkrow/bitmask.asm" SlowkingBitmasks: INCLUDE "gfx/pokemon/slowking/bitmask.asm" MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm" diff --git a/gfx/pokemon/bittybat/anim.asm b/gfx/pokemon/bittybat/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bittybat/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bittybat/anim_idle.asm b/gfx/pokemon/bittybat/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bittybat/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bittybat/back.png b/gfx/pokemon/bittybat/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/bittybat/shiny.pal b/gfx/pokemon/bittybat/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bittybat/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/carapthor/anim.asm b/gfx/pokemon/carapthor/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/carapthor/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/carapthor/anim_idle.asm b/gfx/pokemon/carapthor/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/carapthor/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/carapthor/back.png b/gfx/pokemon/carapthor/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/carapthor/shiny.pal b/gfx/pokemon/carapthor/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/carapthor/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/coinpur/anim.asm b/gfx/pokemon/coinpur/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/coinpur/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/coinpur/anim_idle.asm b/gfx/pokemon/coinpur/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/coinpur/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/coinpur/back.png b/gfx/pokemon/coinpur/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/coinpur/shiny.pal b/gfx/pokemon/coinpur/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/coinpur/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 07fbcd1..5bee58d 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -15,6 +15,13 @@ FramesPointers: dba WeedleFrames dba KakunaFrames dba BeedrillFrames + dba GentlarvaFrames + dba PupalFrames + dba CarapthorFrames + dba KotoraFrames + dba GaotoraFrames + dba GorotoraFrames + dba RaitoraFrames dba PidgeyFrames dba PidgeottoFrames dba PidgeotFrames @@ -38,27 +45,34 @@ FramesPointers: dba NidoreignFrames dba ClefairyFrames dba ClefableFrames + dba VulpiiiFrames dba VulpixFrames dba NinetalesFrames dba JigglypuffFrames dba WigglytuffFrames + dba BittybatFrames dba ZubatFrames dba GolbatFrames dba OddishFrames dba GloomFrames dba VileplumeFrames + dba ParasporFrames dba ParasFrames dba ParasectFrames dba VenonatFrames dba VenomothFrames dba DiglettFrames dba DugtrioFrames + dba CoinpurFrames dba MeowthFrames dba PersianFrames + dba PerrserkerFrames dba PsyduckFrames dba GolduckFrames dba MankeyFrames dba PrimeapeFrames + dba AnnihilapeFrames + dba PupperonFrames dba GrowlitheFrames dba ArcanineFrames dba PoliwagFrames @@ -205,6 +219,9 @@ FramesPointers: dba QuagsireFrames dba EspeonFrames dba UmbreonFrames + dba LeafeonFrames + dba GlaceonFrames + dba SylveonFrames dba MurkrowFrames dba SlowkingFrames dba MisdreavusFrames diff --git a/gfx/pokemon/gaotora/anim.asm b/gfx/pokemon/gaotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gaotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gaotora/anim_idle.asm b/gfx/pokemon/gaotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gaotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gaotora/back.png b/gfx/pokemon/gaotora/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/gaotora/shiny.pal b/gfx/pokemon/gaotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gaotora/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/gentlarva/anim.asm b/gfx/pokemon/gentlarva/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gentlarva/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gentlarva/anim_idle.asm b/gfx/pokemon/gentlarva/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gentlarva/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gentlarva/back.png b/gfx/pokemon/gentlarva/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/gentlarva/shiny.pal b/gfx/pokemon/gentlarva/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gentlarva/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/glaceon/anim.asm b/gfx/pokemon/glaceon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/glaceon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/glaceon/anim_idle.asm b/gfx/pokemon/glaceon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/glaceon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/glaceon/back.png b/gfx/pokemon/glaceon/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/glaceon/shiny.pal b/gfx/pokemon/glaceon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/glaceon/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/gorotora/anim.asm b/gfx/pokemon/gorotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorotora/anim_idle.asm b/gfx/pokemon/gorotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorotora/back.png b/gfx/pokemon/gorotora/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/gorotora/shiny.pal b/gfx/pokemon/gorotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gorotora/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 f017ad5..5a3270d 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -15,6 +15,13 @@ AnimationIdlePointers: dw WeedleAnimationIdle dw KakunaAnimationIdle dw BeedrillAnimationIdle + dw GentlarvaAnimationIdle + dw PupalAnimationIdle + dw CarapthorAnimationIdle + dw KotoraAnimationIdle + dw GaotoraAnimationIdle + dw GorotoraAnimationIdle + dw RaitoraAnimationIdle dw PidgeyAnimationIdle dw PidgeottoAnimationIdle dw PidgeotAnimationIdle @@ -38,27 +45,34 @@ AnimationIdlePointers: dw NidoreignAnimationIdle dw ClefairyAnimationIdle dw ClefableAnimationIdle + dw VulpiiiAnimationIdle dw VulpixAnimationIdle dw NinetalesAnimationIdle dw JigglypuffAnimationIdle dw WigglytuffAnimationIdle + dw BittybatAnimationIdle dw ZubatAnimationIdle dw GolbatAnimationIdle dw OddishAnimationIdle dw GloomAnimationIdle dw VileplumeAnimationIdle + dw ParasporAnimationIdle dw ParasAnimationIdle dw ParasectAnimationIdle dw VenonatAnimationIdle dw VenomothAnimationIdle dw DiglettAnimationIdle dw DugtrioAnimationIdle + dw CoinpurAnimationIdle dw MeowthAnimationIdle dw PersianAnimationIdle + dw PerrserkerAnimationIdle dw PsyduckAnimationIdle dw GolduckAnimationIdle dw MankeyAnimationIdle dw PrimeapeAnimationIdle + dw AnnihilapeAnimationIdle + dw PupperonAnimationIdle dw GrowlitheAnimationIdle dw ArcanineAnimationIdle dw PoliwagAnimationIdle @@ -205,6 +219,9 @@ AnimationIdlePointers: dw QuagsireAnimationIdle dw EspeonAnimationIdle dw UmbreonAnimationIdle + dw LeafeonAnimationIdle + dw GlaceonAnimationIdle + dw SylveonAnimationIdle dw MurkrowAnimationIdle dw SlowkingAnimationIdle dw MisdreavusAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 00a1c03..4c19da3 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -13,6 +13,13 @@ ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm" WeedleAnimationIdle: INCLUDE "gfx/pokemon/weedle/anim_idle.asm" KakunaAnimationIdle: INCLUDE "gfx/pokemon/kakuna/anim_idle.asm" BeedrillAnimationIdle: INCLUDE "gfx/pokemon/beedrill/anim_idle.asm" +GentlarvaAnimationIdle: INCLUDE "gfx/pokemon/gentlarva/anim_idle.asm" +PupalAnimationIdle: INCLUDE "gfx/pokemon/pupal/anim_idle.asm" +CarapthorAnimationIdle: INCLUDE "gfx/pokemon/carapthor/anim_idle.asm" +KotoraAnimationIdle: INCLUDE "gfx/pokemon/kotora/anim_idle.asm" +GaotoraAnimationIdle: INCLUDE "gfx/pokemon/gaotora/anim_idle.asm" +GorotoraAnimationIdle: INCLUDE "gfx/pokemon/gorotora/anim_idle.asm" +RaitoraAnimationIdle: INCLUDE "gfx/pokemon/raitora/anim_idle.asm" PidgeyAnimationIdle: INCLUDE "gfx/pokemon/pidgey/anim_idle.asm" PidgeottoAnimationIdle: INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm" PidgeotAnimationIdle: INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm" @@ -36,27 +43,34 @@ NidokingAnimationIdle: INCLUDE "gfx/pokemon/nidoking/anim_idle.asm" NidoreignAnimationIdle: INCLUDE "gfx/pokemon/nidoreign/anim_idle.asm" ClefairyAnimationIdle: INCLUDE "gfx/pokemon/clefairy/anim_idle.asm" ClefableAnimationIdle: INCLUDE "gfx/pokemon/clefable/anim_idle.asm" +VulpiiiAnimationIdle: INCLUDE "gfx/pokemon/vulpiii/anim_idle.asm" VulpixAnimationIdle: INCLUDE "gfx/pokemon/vulpix/anim_idle.asm" NinetalesAnimationIdle: INCLUDE "gfx/pokemon/ninetales/anim_idle.asm" JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm" WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm" +BittybatAnimationIdle: INCLUDE "gfx/pokemon/bittybat/anim_idle.asm" ZubatAnimationIdle: INCLUDE "gfx/pokemon/zubat/anim_idle.asm" GolbatAnimationIdle: INCLUDE "gfx/pokemon/golbat/anim_idle.asm" OddishAnimationIdle: INCLUDE "gfx/pokemon/oddish/anim_idle.asm" GloomAnimationIdle: INCLUDE "gfx/pokemon/gloom/anim_idle.asm" VileplumeAnimationIdle: INCLUDE "gfx/pokemon/vileplume/anim_idle.asm" +ParasporAnimationIdle: INCLUDE "gfx/pokemon/paraspor/anim_idle.asm" ParasAnimationIdle: INCLUDE "gfx/pokemon/paras/anim_idle.asm" ParasectAnimationIdle: INCLUDE "gfx/pokemon/parasect/anim_idle.asm" 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" +CoinpurAnimationIdle: INCLUDE "gfx/pokemon/coinpur/anim_idle.asm" MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm" PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm" +PerrserkerAnimationIdle: INCLUDE "gfx/pokemon/perrserker/anim_idle.asm" PsyduckAnimationIdle: INCLUDE "gfx/pokemon/psyduck/anim_idle.asm" GolduckAnimationIdle: INCLUDE "gfx/pokemon/golduck/anim_idle.asm" MankeyAnimationIdle: INCLUDE "gfx/pokemon/mankey/anim_idle.asm" PrimeapeAnimationIdle: INCLUDE "gfx/pokemon/primeape/anim_idle.asm" +AnnihilapeAnimationIdle: INCLUDE "gfx/pokemon/annihilape/anim_idle.asm" +PupperonAnimationIdle: INCLUDE "gfx/pokemon/pupperon/anim_idle.asm" GrowlitheAnimationIdle: INCLUDE "gfx/pokemon/growlithe/anim_idle.asm" ArcanineAnimationIdle: INCLUDE "gfx/pokemon/arcanine/anim_idle.asm" PoliwagAnimationIdle: INCLUDE "gfx/pokemon/poliwag/anim_idle.asm" @@ -203,6 +217,9 @@ WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm" QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm" EspeonAnimationIdle: INCLUDE "gfx/pokemon/espeon/anim_idle.asm" 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" MurkrowAnimationIdle: INCLUDE "gfx/pokemon/murkrow/anim_idle.asm" SlowkingAnimationIdle: INCLUDE "gfx/pokemon/slowking/anim_idle.asm" MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 13ec3b1..349a45a 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -46,6 +46,9 @@ WooperFrames: INCLUDE "gfx/pokemon/wooper/frames.asm" QuagsireFrames: INCLUDE "gfx/pokemon/quagsire/frames.asm" EspeonFrames: INCLUDE "gfx/pokemon/espeon/frames.asm" 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" MurkrowFrames: INCLUDE "gfx/pokemon/murkrow/frames.asm" SlowkingFrames: INCLUDE "gfx/pokemon/slowking/frames.asm" MisdreavusFrames: INCLUDE "gfx/pokemon/misdreavus/frames.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index c2cece7..fb5897e 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -15,6 +15,13 @@ ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm" WeedleFrames: INCLUDE "gfx/pokemon/weedle/frames.asm" KakunaFrames: INCLUDE "gfx/pokemon/kakuna/frames.asm" BeedrillFrames: INCLUDE "gfx/pokemon/beedrill/frames.asm" +GentlarvaFrames: INCLUDE "gfx/pokemon/gentlarva/frames.asm" +PupalFrames: INCLUDE "gfx/pokemon/pupal/frames.asm" +CarapthorFrames: INCLUDE "gfx/pokemon/carapthor/frames.asm" +KotoraFrames: INCLUDE "gfx/pokemon/kotora/frames.asm" +GaotoraFrames: INCLUDE "gfx/pokemon/gaotora/frames.asm" +GorotoraFrames: INCLUDE "gfx/pokemon/gorotora/frames.asm" +RaitoraFrames: INCLUDE "gfx/pokemon/raitora/frames.asm" PidgeyFrames: INCLUDE "gfx/pokemon/pidgey/frames.asm" PidgeottoFrames: INCLUDE "gfx/pokemon/pidgeotto/frames.asm" PidgeotFrames: INCLUDE "gfx/pokemon/pidgeot/frames.asm" @@ -38,27 +45,34 @@ NidokingFrames: INCLUDE "gfx/pokemon/nidoking/frames.asm" NidoreignFrames: INCLUDE "gfx/pokemon/nidoreign/frames.asm" ClefairyFrames: INCLUDE "gfx/pokemon/clefairy/frames.asm" ClefableFrames: INCLUDE "gfx/pokemon/clefable/frames.asm" +VulpiiiFrames: INCLUDE "gfx/pokemon/vulpiii/frames.asm" VulpixFrames: INCLUDE "gfx/pokemon/vulpix/frames.asm" NinetalesFrames: INCLUDE "gfx/pokemon/ninetales/frames.asm" JigglypuffFrames: INCLUDE "gfx/pokemon/jigglypuff/frames.asm" WigglytuffFrames: INCLUDE "gfx/pokemon/wigglytuff/frames.asm" +BittybatFrames: INCLUDE "gfx/pokemon/bittybat/frames.asm" ZubatFrames: INCLUDE "gfx/pokemon/zubat/frames.asm" GolbatFrames: INCLUDE "gfx/pokemon/golbat/frames.asm" OddishFrames: INCLUDE "gfx/pokemon/oddish/frames.asm" GloomFrames: INCLUDE "gfx/pokemon/gloom/frames.asm" VileplumeFrames: INCLUDE "gfx/pokemon/vileplume/frames.asm" +ParasporFrames: INCLUDE "gfx/pokemon/paraspor/frames.asm" ParasFrames: INCLUDE "gfx/pokemon/paras/frames.asm" ParasectFrames: INCLUDE "gfx/pokemon/parasect/frames.asm" 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" +CoinpurFrames: INCLUDE "gfx/pokemon/coinpur/frames.asm" MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm" PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm" +PerrserkerFrames: INCLUDE "gfx/pokemon/perrserker/frames.asm" PsyduckFrames: INCLUDE "gfx/pokemon/psyduck/frames.asm" GolduckFrames: INCLUDE "gfx/pokemon/golduck/frames.asm" MankeyFrames: INCLUDE "gfx/pokemon/mankey/frames.asm" PrimeapeFrames: INCLUDE "gfx/pokemon/primeape/frames.asm" +AnnihilapeFrames: INCLUDE "gfx/pokemon/annihilape/frames.asm" +PupperonFrames: INCLUDE "gfx/pokemon/pupperon/frames.asm" GrowlitheFrames: INCLUDE "gfx/pokemon/growlithe/frames.asm" ArcanineFrames: INCLUDE "gfx/pokemon/arcanine/frames.asm" PoliwagFrames: INCLUDE "gfx/pokemon/poliwag/frames.asm" diff --git a/gfx/pokemon/kotora/anim.asm b/gfx/pokemon/kotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/anim_idle.asm b/gfx/pokemon/kotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/back.png b/gfx/pokemon/kotora/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/kotora/shiny.pal b/gfx/pokemon/kotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/kotora/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/leafeon/anim.asm b/gfx/pokemon/leafeon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/leafeon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/leafeon/anim_idle.asm b/gfx/pokemon/leafeon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/leafeon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/leafeon/back.png b/gfx/pokemon/leafeon/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/leafeon/shiny.pal b/gfx/pokemon/leafeon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/leafeon/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/paraspor/anim.asm b/gfx/pokemon/paraspor/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/paraspor/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/paraspor/anim_idle.asm b/gfx/pokemon/paraspor/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/paraspor/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/paraspor/back.png b/gfx/pokemon/paraspor/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/paraspor/shiny.pal b/gfx/pokemon/paraspor/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/paraspor/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/perrserker/anim.asm b/gfx/pokemon/perrserker/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/perrserker/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/perrserker/anim_idle.asm b/gfx/pokemon/perrserker/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/perrserker/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/perrserker/back.png b/gfx/pokemon/perrserker/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/perrserker/shiny.pal b/gfx/pokemon/perrserker/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/perrserker/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/pupal/anim.asm b/gfx/pokemon/pupal/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupal/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupal/anim_idle.asm b/gfx/pokemon/pupal/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupal/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupal/back.png b/gfx/pokemon/pupal/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/pupal/shiny.pal b/gfx/pokemon/pupal/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pupal/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/pupperon/anim.asm b/gfx/pokemon/pupperon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupperon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupperon/anim_idle.asm b/gfx/pokemon/pupperon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupperon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupperon/back.png b/gfx/pokemon/pupperon/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/pupperon/shiny.pal b/gfx/pokemon/pupperon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pupperon/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/raitora/anim.asm b/gfx/pokemon/raitora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/raitora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/raitora/anim_idle.asm b/gfx/pokemon/raitora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/raitora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/raitora/back.png b/gfx/pokemon/raitora/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/raitora/shiny.pal b/gfx/pokemon/raitora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/raitora/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/sylveon/anim.asm b/gfx/pokemon/sylveon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sylveon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sylveon/anim_idle.asm b/gfx/pokemon/sylveon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sylveon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sylveon/back.png b/gfx/pokemon/sylveon/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/sylveon/shiny.pal b/gfx/pokemon/sylveon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/sylveon/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/vulpiii/anim.asm b/gfx/pokemon/vulpiii/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/vulpiii/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpiii/anim_idle.asm b/gfx/pokemon/vulpiii/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/vulpiii/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpiii/back.png b/gfx/pokemon/vulpiii/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/vulpiii/shiny.pal b/gfx/pokemon/vulpiii/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/vulpiii/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/main.asm b/main.asm index 0095bbb..efecffa 100644 --- a/main.asm +++ b/main.asm @@ -241,6 +241,9 @@ INCLUDE "engine/pokemon/switchpartymons.asm" INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" + +SECTION "Pokemon Names", ROMX + INCLUDE "data/pokemon/names.asm" diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index c68d90d..e19c12e 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -114,23 +114,23 @@ PlayersRadioText4: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, NIDORINA + getmonname STRING_BUFFER_3, EEVEE writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke NIDORINA, 36, MOON_STONE + givepoke EEVEE, 36, MOON_STONE closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, GOROCHU + getmonname STRING_BUFFER_3, RAICHU writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke GOROCHU, 35, POISON_STONE + givepoke RAICHU, 35, POISON_STONE closetext end diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump new file mode 100644 index 0000000..7afcc48 --- /dev/null +++ b/scan_includes.exe.stackdump @@ -0,0 +1,18 @@ +Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 +rax=FFFFFFF7FFF92891 rbx=0000000000000119 rcx=0000000800000010 +rdx=0000000000000000 rsi=0000000800059C23 rdi=0000000000000000 +r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 +r11=0000000100401282 r12=000000080006D770 r13=0000000100403148 +r14=0000000800059C22 r15=0000000000000001 +rbp=0000000100403156 rsp=00000000FFFFCA60 +program=C:\cygwin64\home\chipp\jep-hack\tools\scan_includes.exe, pid 2190, thread main +cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +00100403156 00100401246 (00800059C23, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000) +00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70) +000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 00180047746 (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 001800477F4 (00000000000, 00000000000, 00000000000, 00000000000) +End of stack trace