diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 5bfbc71..92e6ccc 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -111,15 +111,24 @@ const BELLIGNAN const TENTACOOL ; 48 const TENTACRUEL ; 49 + const TOEDSCOOL + const TOEDSCRUEL + const BLOTTLE + const PENDRAKEN const GEODUDE ; 4a const GRAVELER ; 4b const GOLEM ; 4c + const KOLTA const PONYTA ; 4d const RAPIDASH ; 4e + const BALUMBA const SLOWPOKE ; 4f const SLOWBRO ; 50 const MAGNEMITE ; 51 + const MAGNETITE const MAGNETON ; 52 + const MAGNEZONE + const GAVILLAIN const CHEEP const JABETTA const RIBBITO diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 31798b0..692e211 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -119,15 +119,24 @@ INCLUDE "data/pokemon/base_stats/victreebel.asm" INCLUDE "data/pokemon/base_stats/bellignan.asm" INCLUDE "data/pokemon/base_stats/tentacool.asm" INCLUDE "data/pokemon/base_stats/tentacruel.asm" +INCLUDE "data/pokemon/base_stats/toedscool.asm" +INCLUDE "data/pokemon/base_stats/toedscruel.asm" +INCLUDE "data/pokemon/base_stats/blottle.asm" +INCLUDE "data/pokemon/base_stats/pendraken.asm" INCLUDE "data/pokemon/base_stats/geodude.asm" INCLUDE "data/pokemon/base_stats/graveler.asm" INCLUDE "data/pokemon/base_stats/golem.asm" +INCLUDE "data/pokemon/base_stats/kolta.asm" INCLUDE "data/pokemon/base_stats/ponyta.asm" INCLUDE "data/pokemon/base_stats/rapidash.asm" +INCLUDE "data/pokemon/base_stats/balumba.asm" INCLUDE "data/pokemon/base_stats/slowpoke.asm" INCLUDE "data/pokemon/base_stats/slowbro.asm" +INCLUDE "data/pokemon/base_stats/gavillain.asm" INCLUDE "data/pokemon/base_stats/magnemite.asm" +INCLUDE "data/pokemon/base_stats/magnetite.asm" INCLUDE "data/pokemon/base_stats/magneton.asm" +INCLUDE "data/pokemon/base_stats/magnezone.asm" INCLUDE "data/pokemon/base_stats/cheep.asm" INCLUDE "data/pokemon/base_stats/jabetta.asm" INCLUDE "data/pokemon/base_stats/ribbito.asm" diff --git a/data/pokemon/base_stats/balumba.asm b/data/pokemon/base_stats/balumba.asm index ac2ab85..fca3383 100644 --- a/data/pokemon/base_stats/balumba.asm +++ b/data/pokemon/base_stats/balumba.asm @@ -6,7 +6,7 @@ db FAIRY, FLYING ; type db 45 ; catch rate db 137 ; base exp - db NO_ITEM, NO_ITEM ; items + db NO_ITEM, FAIRY_FEATHER ; items db GENDER_F75 ; gender ratio db 100 ; unknown 1 db 20 ; step cycles to hatch @@ -17,5 +17,5 @@ dn EGG_FAIRY, EGG_INDETERMINATE ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFNESE_CURL, DREAM_EATER, REST, ATTRACT, NIGHTMARE, FLY, FLASH, THUNDERBOLT + tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, NIGHTMARE, FLY, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 447f678..ecee5bf 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -98,15 +98,24 @@ PokemonCries:: mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL + mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCOOL (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCRUEL (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; BLOTTLE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; PENDRAKEN (incomplete) mon_cry CRY_VULPIX, 240, 144 ; GEODUDE mon_cry CRY_VULPIX, 0, 256 ; GRAVELER mon_cry CRY_GOLEM, 224, 192 ; GOLEM + mon_cry CRY_NIDORAN_M, 0, 0 ; KOLTA (incomplete) mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH + mon_cry CRY_NIDORAN_M, 0, 0 ; BALUMBA (incomplete) mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE + mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNETITE (incomplete) mon_cry CRY_METAPOD, 32, 320 ; MAGNETON + mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; GAVILLAIN (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; CHEEP (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; JABETTA (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; RIBBITO (incomplete) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index a37a205..95b7c68 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -375,3 +375,12 @@ ShiShiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shi_shi.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm" TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm" +ToedscoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/toedscool.asm" +ToedscruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/toedscruel.asm" +BlottlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blottle.asm" +PendrakenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pendraken.asm" +KoltaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kolta.asm" +BalumbaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/balumba.asm" +MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm" +MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" +GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" diff --git a/data/pokemon/dex_entries/balumba.asm b/data/pokemon/dex_entries/balumba.asm new file mode 100644 index 0000000..af1a4fc --- /dev/null +++ b/data/pokemon/dex_entries/balumba.asm @@ -0,0 +1,10 @@ + db "BALLOON@" ; species name + dw 503, 1210 ; height, weight - temp + + db "Pulling BALUMBA's" + next "string causes it" + next "great pain, maki-" + + page "ng it shriek." + next "Lives near small" + next "villages.@" diff --git a/data/pokemon/dex_entries/blottle.asm b/data/pokemon/dex_entries/blottle.asm new file mode 100644 index 0000000..8f5b627 --- /dev/null +++ b/data/pokemon/dex_entries/blottle.asm @@ -0,0 +1,10 @@ + db "INK@" ; species name + dw 211, 1000 ; height, weight - temp + + db "Recent studies show" + next "BLOTTLE and OMANY-" + next "TE share a common" + + page "ancestor. BLOTTLE" + next "outcompeted it" + next "for food.@" diff --git a/data/pokemon/dex_entries/gavillain.asm b/data/pokemon/dex_entries/gavillain.asm new file mode 100644 index 0000000..b805474 --- /dev/null +++ b/data/pokemon/dex_entries/gavillain.asm @@ -0,0 +1,10 @@ + db "GLARING@" ; species name + dw 307, 420 ; height, weight - temp + + db "Lives in dark caves." + next "When it sees prey," + next "it spouts a strong" + + page "DRAGONBREATH bef-" + next "ore moving in to" + next "finish it off.@" diff --git a/data/pokemon/dex_entries/kolta.asm b/data/pokemon/dex_entries/kolta.asm new file mode 100644 index 0000000..cfa33ee --- /dev/null +++ b/data/pokemon/dex_entries/kolta.asm @@ -0,0 +1,10 @@ + db "FIRE HORSE@" ; species name + dw 303, 660 ; height, weight - temp + + db "When born, its hoo-" + next "ves take a day to" + next "harden, unnerving" + + page "new breeders. Very" + next "popular with young" + next "LASSes.@" diff --git a/data/pokemon/dex_entries/magnetite.asm b/data/pokemon/dex_entries/magnetite.asm new file mode 100644 index 0000000..0f1c078 --- /dev/null +++ b/data/pokemon/dex_entries/magnetite.asm @@ -0,0 +1,10 @@ + db "MAGNET@" ; species name + dw 100, 130 ; height, weight - temp + + db "It sometimes attr-" + next "acts so much metal" + next "that it loses its" + + page "ability to levita-" + next "te. SKARMORY is a" + next "common victim.@" diff --git a/data/pokemon/dex_entries/magnezone.asm b/data/pokemon/dex_entries/magnezone.asm new file mode 100644 index 0000000..0b6d19a --- /dev/null +++ b/data/pokemon/dex_entries/magnezone.asm @@ -0,0 +1,10 @@ + db "MAGNET AREA@" ; species name + dw 100, 130 ; height, weight - temp + + db "Its 3 eyes move ind-" + next "ependently of one" + next "another. This lets" + + page "it efficiently trap" ; referencing Magnet Pull + next "and neutralise other" + next "steel #MON.@" diff --git a/data/pokemon/dex_entries/pendraken.asm b/data/pokemon/dex_entries/pendraken.asm new file mode 100644 index 0000000..2680a17 --- /dev/null +++ b/data/pokemon/dex_entries/pendraken.asm @@ -0,0 +1,10 @@ + db "INK@" ; species name + dw 503, 1210 ; height, weight - temp + + db "The precision with" + next "which it sprays ink" + next "makes it popular" + + page "with calligraphers." + next "it can write kanji" ; in a localisation during this time period, I doubt it would pass. + next "with ease!@" ; consider revising. I imagine it would write 水 quite well! diff --git a/data/pokemon/dex_entries/toedscool.asm b/data/pokemon/dex_entries/toedscool.asm new file mode 100644 index 0000000..6fd59e4 --- /dev/null +++ b/data/pokemon/dex_entries/toedscool.asm @@ -0,0 +1,10 @@ + db "WOODEAR@" ; species name + dw 211, 1000 ; height, weight + + db "Lives in muggy for-" + next "rests. Its flaps" + next "are considered a" + + page "a delicacy, so" + next "it adapted to" + next "run quickly.@" diff --git a/data/pokemon/dex_entries/toedscruel.asm b/data/pokemon/dex_entries/toedscruel.asm new file mode 100644 index 0000000..5d4e1b2 --- /dev/null +++ b/data/pokemon/dex_entries/toedscruel.asm @@ -0,0 +1,10 @@ + db "WOODEAR@" ; species name + dw 503, 1210 ; height, weight + + db "Its tentacles are" + next "actually mycelium." + next "TOEDSCRUEL will" + + page "congregate in for-" + next "ests and jump at" + next "predators.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 4895dff..717ffcc 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -93,15 +93,24 @@ PokedexDataPointerTable: dba BellignanPokedexEntry dba TentacoolPokedexEntry dba TentacruelPokedexEntry + dba ToedscoolPokedexEntry + dba ToedscruelPokedexEntry + dba BlottlePokedexEntry + dba PendrakenPokedexEntry dba GeodudePokedexEntry dba GravelerPokedexEntry dba GolemPokedexEntry + dba KoltaPokedexEntry dba PonytaPokedexEntry dba RapidashPokedexEntry + dba BalumbaPokedexEntry dba SlowpokePokedexEntry dba SlowbroPokedexEntry dba MagnemitePokedexEntry + dba MagnetitePokedexEntry dba MagnetonPokedexEntry + dba MagnezonePokedexEntry + dba GavillainPokedexEntry dba CheepPokedexEntry dba JabettaPokedexEntry dba RibbitoPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 402633d..bb31a43 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -19,6 +19,7 @@ AlphabeticalPokedexOrder: dw AZUMARILL dw AZURILL dw BARREAU + dw BALUMBA dw BAYLEEF dw BEEDRILL dw BELLEDAM @@ -30,6 +31,7 @@ AlphabeticalPokedexOrder: dw BLASTOISE dw BLASTYKE dw BLISSEY + dw BLOTTLE dw BRUINOUS dw BULBASAUR dw BURGELA @@ -102,6 +104,7 @@ AlphabeticalPokedexOrder: dw FURRET dw GASTLY dw GAOTORA + dw GAVILLAIN dw GENGAR dw GENTLARVA dw GEODUDE @@ -160,6 +163,7 @@ AlphabeticalPokedexOrder: dw KIWOOKED dw KLEAVOR dw KOFFING + dw KOLTA dw KOTORA dw KRABBY dw KUWAGUARD @@ -186,6 +190,8 @@ AlphabeticalPokedexOrder: dw MAGMAR dw MAGNEMITE dw MAGNETON + dw MAGNETITE + dw MAGNEZONE dw MANKEY dw MANTINE dw MANTYKE @@ -228,6 +234,7 @@ AlphabeticalPokedexOrder: dw PARAS dw PARASECT dw PARASPOR + dw PENDRAKEN dw PERRSERKER dw PERSIAN dw PHANDARIN @@ -322,6 +329,8 @@ AlphabeticalPokedexOrder: dw TENTACOOL dw TENTACRUEL dw TERRADOS + dw TOEDSCOOL + dw TOEDSCRUEL dw TOGEPI dw TOGETIC dw TOGEKISS diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index c50fc5e..6ab3137 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -152,7 +152,10 @@ NewPokedexOrder: dw GRIMER dw MUK dw MAGNEMITE + dw MAGNETITE dw MAGNETON + dw MAGNEZONE + dw GAVILLAIN dw VOLTORB dw ELECTRODE dw AIPOM @@ -216,6 +219,10 @@ NewPokedexOrder: dw QWILFATHER dw TENTACOOL dw TENTACRUEL + dw TOEDSCOOL + dw TOEDSCRUEL + dw BLOTTLE + dw PENDRAKEN dw KRABBY dw KINGLER dw RIBBITO @@ -273,8 +280,10 @@ NewPokedexOrder: dw SKARMORY dw DODUO dw DODRIO + dw KOLTA dw PONYTA dw RAPIDASH + dw BALUMBA dw CUBONE dw MAROWAK dw KANGASKHAN diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 79fa5b2..d4fa95c 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -93,15 +93,24 @@ EggMovePointers1: dw NoEggMoves1 ; Bellignan dw TentacoolEggMoves dw NoEggMoves1 + dw ToedscoolEggMoves + dw NoEggMoves1 + dw BlottleEggMoves + dw NoEggMoves1 dw GeodudeEggMoves dw NoEggMoves1 dw NoEggMoves1 - dw PonytaEggMoves + dw KoltaEggMoves dw NoEggMoves1 + dw NoEggMoves1 + dw BalumbaEggMoves dw SlowpokeEggMoves dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 + dw NoEggMoves1 + dw GavillainEggMoves dw CheepEggMoves dw NoEggMoves1 ; Jabetta dw RibbitoEggMoves @@ -402,6 +411,21 @@ TentacoolEggMoves: dw HAZE dw SAFEGUARD dw -1 ; end + +ToedscoolEggMoves: + dw LEECH_SEED + dw MIRROR_COAT + dw RAPID_SPIN + dw TOXIC + dw -1 + +BlottleEggMoves: + dw AURORA_BEAM + dw AMNESIA + dw RAPID_SPIN + dw POISON_GAS + dw SMOG + dw -1 GeodudeEggMoves: dw MEGA_PUNCH @@ -409,7 +433,7 @@ GeodudeEggMoves: dw ROCK_SLASH dw -1 ; end -PonytaEggMoves: +KoltaEggMoves: dw FLAME_WHEEL dw THRASH dw DOUBLE_KICK @@ -418,6 +442,14 @@ PonytaEggMoves: dw QUICK_ATTACK dw -1 ; end +BalumbaEggMoves: + dw SCREECH + dw PSYBEAM + dw HYPNOSIS + dw MINIMIZE + dw SPLASH + dw -1 + SlowpokeEggMoves: dw SAFEGUARD dw BELLY_DRUM @@ -425,6 +457,12 @@ SlowpokeEggMoves: dw STOMP dw -1 ; end +GavillainEggMoves: + dw GROWL + dw SWORDS_DANCE + dw CRUNCH + dw -1 + CheepEggMoves: dw AGILITY dw AURORA_BEAM diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 3b800d3..6dae85d 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -93,15 +93,24 @@ EvosAttacksPointers1:: dw BellignanEvosAttacks dw TentacoolEvosAttacks dw TentacruelEvosAttacks + dw ToedscoolEvosAttacks + dw ToedscruelEvosAttacks + dw BlottleEvosAttacks + dw PendrakenEvosAttacks dw GeodudeEvosAttacks dw GravelerEvosAttacks dw GolemEvosAttacks + dw KoltaEvosAttacks dw PonytaEvosAttacks dw RapidashEvosAttacks + dw BalumbaEvosAttacks dw SlowpokeEvosAttacks dw SlowbroEvosAttacks dw MagnemiteEvosAttacks + dw MagnetiteEvosAttacks dw MagnetonEvosAttacks + dw MagnezoneEvosAttacks + dw GavillainEvosAttacks dw CheepEvosAttacks dw JabettaEvosAttacks dw RibbitoEvosAttacks @@ -1421,6 +1430,66 @@ TentacruelEvosAttacks: dbw 55, HYDRO_PUMP db 0 ; no more level-up moves +ToedscoolEvosAttacks: + dbbw EVOLVE_LEVEL, 30, TOEDSCRUEL + db 0 ; no more evolutions + dbw 1, MUD_SLAP + dbw 6, SUPERSONIC + dbw 12, CONSTRICT + dbw 19, ABSORB + dbw 25, POISONPOWDER + dbw 25, STUN_SPORE + dbw 30, WRAP + dbw 36, SPORE + dbw 43, SCREECH + dbw 49, GIGA_DRAIN + db 0 ; no more level-up moves + +ToedscruelEvosAttacks: + db 0 ; no more evolutions + dbw 1, MUD_SLAP + dbw 1, SUPERSONIC + dbw 1, CONSTRICT + dbw 19, ABSORB + dbw 25, POISONPOWDER + dbw 25, STUN_SPORE + dbw 30, WRAP + dbw 38, SPORE + dbw 47, SCREECH + dbw 55, GIGA_DRAIN + db 0 ; no more level-up moves + +BlottleEvosAttacks: + dbbw EVOLVE_LEVEL, 30, PENDRAKEN + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 1, SMOKESCREEN + dbw 7, BUBBLE + dbw 11, WRAP + ; dbw 15, FAIRY_WIND + dbw 20, HYPNOSIS + dbw 24, OCTAZOOKA + dbw 29, SUPERSONIC + ;dbw 33, DAZZLE_GLEAM + dbw 38, HAZE + dbw 43, HYDRO_PUMP + db 0 + +PendrakenEvosAttacks: + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 1, SMOKESCREEN + dbw 7, BUBBLE + dbw 11, WRAP + ; dbw 15, FAIRY_WIND + dbw 20, HYPNOSIS + dbw 24, OCTAZOOKA + dbw 29, SUPERSONIC + ;dbw 35, DAZZLE_GLEAM + dbw 42, HAZE + dbw 49, HYDRO_PUMP + db 0 + GeodudeEvosAttacks: dbbw EVOLVE_LEVEL, 25, GRAVELER db 0 ; no more evolutions @@ -1470,6 +1539,20 @@ GolemEvosAttacks: dbw 55, ROCK_HEAD db 0 ; no more level-up moves +KoltaEvosAttacks: + dbbw EVOLVE_LEVEL, 20, PONYTA + db 0 + dbw 1, TACKLE + dbw 4, GROWL + dbw 8, TAIL_WHIP + dbw 13, EMBER + dbw 19, STOMP + dbw 24, FIRE_SPIN + dbw 30, TAKE_DOWN + dbw 37, AGILITY + dbw 45, FIRE_BLAST + db 0 ; no more level-up moves + PonytaEvosAttacks: dbbw EVOLVE_LEVEL, 40, RAPIDASH db 0 ; no more evolutions @@ -1501,6 +1584,19 @@ RapidashEvosAttacks: dbw 61, FIRE_BLAST db 0 ; no more level-up moves +BalumbaEvosAttacks: + db 0 + ; dbw 1, FAIRY_WIND + dbw 1, GROWL + ; dbw 6, DRAIN_KISS + ; dbw 12, DISARM_VOICE + dbw 19, GUST + dbw 25, SWEET_KISS + dbw 31, CONFUSE_RAY + dbw 37, CHARM + ; dbw 43, DAZZLE_GLEAM + db 0 + SlowpokeEvosAttacks: dbbw EVOLVE_LEVEL, 37, SLOWBRO dbbw EVOLVE_TRADE, KINGS_ROCK, SLOWKING @@ -1534,7 +1630,7 @@ SlowbroEvosAttacks: db 0 ; no more level-up moves MagnemiteEvosAttacks: - dbbw EVOLVE_LEVEL, 30, MAGNETON + dbbw EVOLVE_LEVEL, 20, MAGNETITE db 0 ; no more evolutions dbw 1, TACKLE dbw 6, THUNDERSHOCK @@ -1547,7 +1643,23 @@ MagnemiteEvosAttacks: dbw 45, ZAP_CANNON db 0 ; no more level-up moves +MagnetiteEvosAttacks: + dbbw EVOLVE_LEVEL, 30, MAGNETON + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 6, THUNDERSHOCK + dbw 11, SUPERSONIC + dbw 16, SONICBOOM + dbw 22, THUNDER_WAVE + dbw 26, SPARK + dbw 30, LOCK_ON + dbw 38, SWIFT + dbw 46, SCREECH + dbw 54, ZAP_CANNON + db 0 ; no more level-up moves + MagnetonEvosAttacks: + dbbw EVOLVE_ITEM, THUNDERSTONE, MAGNEZONE ; could add magnetic area but it's so fuckin bleh dude oh my god db 0 ; no more evolutions dbw 1, TACKLE dbw 1, THUNDERSHOCK @@ -1562,7 +1674,39 @@ MagnetonEvosAttacks: dbw 43, SCREECH dbw 53, ZAP_CANNON db 0 ; no more level-up moves - + +MagnezoneEvosAttacks: +db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, THUNDERSHOCK + dbw 1, SUPERSONIC + dbw 1, SONICBOOM + dbw 6, THUNDERSHOCK + dbw 11, SUPERSONIC + dbw 16, SONICBOOM + dbw 22, THUNDER_WAVE + dbw 30, LOCK_ON + dbw 40, SWIFT + dbw 40, TRI_ATTACK + dbw 50, SCREECH + dbw 60, ZAP_CANNON + db 0 ; no more level-up moves + +GavillainEvosAttacks: + db 0 + dbw 1, SCRATCH + dbw 1, LEER + dbw 7, SUPERSONIC + dbw 12, BITE + dbw 16, SPARK + dbw 20, DRAGON_RAGE + dbw 24, SLASH + dbw 30, SCREECH + dbw 34, GLARE + dbw 39, DRAGONBREATH + dbw 46, CONFUSE_RAY + db 0 + CheepEvosAttacks: dbbw EVOLVE_LEVEL, 30, JABETTA db 0 ; no more evolutions diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 0bd1536..17f9498 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -93,15 +93,24 @@ FirstEvoStages:: dw BELLSPROUT dw TENTACOOL ;48 dw TENTACOOL + dw TOEDSCOOL + dw TOEDSCOOL + dw BLOTTLE + dw BLOTTLE dw GEODUDE dw GEODUDE dw GEODUDE - dw PONYTA - dw PONYTA + dw KOLTA + dw KOLTA + dw KOLTA + dw BALUMBA dw SLOWPOKE dw SLOWPOKE ;50 dw MAGNEMITE dw MAGNEMITE + dw MAGNEMITE + dw MAGNEMITE + dw GAVILLAIN dw CHEEP dw CHEEP dw RIBBITO diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 3cdcd38..49ec924 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -94,15 +94,24 @@ KantoMonSpecials: db 100 ; BELLIGNAN db 100 ; TENTACOOL db 120 ; TENTACRUEL + db 100 ; TOEDSCOOL + db 120 ; TOEDSCRUEL + db 65 ; BLOTTLE + db 95 ; PENDRAKEN db 30 ; GEODUDE db 45 ; GRAVELER db 55 ; GOLEM + db 45 ; KOLTA db 65 ; PONYTA db 80 ; RAPIDASH + db 100 ; BALUMBA db 40 ; SLOWPOKE db 80 ; SLOWBRO db 95 ; MAGNEMITE + db 105 ; MAGNETITE db 120 ; MAGNETON + db 135 ; MAGNEZONE + db 90 ; GAVILLAIN db 40 ; CHEEP db 80 ; JABETTA db 55 ; RIBBITO diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index f806d9e..ee7896f 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -363,4 +363,13 @@ Pokered_MonIndices: db CHARMADA db MAGIPREY db TERRADOS + db TOEDSCOOL + db TOEDSCRUEL + db BLOTTLE + db PENDRAKEN + db KOLTA + db BALUMBA + db MAGNETITE + db MAGNEZONE + db GAVILLAIN assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 242c5ea..00c4ed1 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -94,15 +94,24 @@ MonMenuIcons: db ICON_ODDISH ; BELLIGNAN db ICON_JELLYFISH ; TENTACOOL db ICON_JELLYFISH ; TENTACRUEL + db ICON_JELLYFISH ; TOEDSCOOL + db ICON_JELLYFISH ; TOEDSCRUEL + db ICON_JELLYFISH ; BLOTTLE + db ICON_JELLYFISH ; PENDRAKEN db ICON_GEODUDE ; GEODUDE db ICON_GEODUDE ; GRAVELER db ICON_GEODUDE ; GOLEM + db ICON_EQUINE ; KOLTA db ICON_EQUINE ; PONYTA db ICON_EQUINE ; RAPIDASH + db ICON_JIGGLYPUFF ; BALUMBA (tentative) db ICON_SLOWPOKE ; SLOWPOKE db ICON_SLOWPOKE ; SLOWBRO db ICON_VOLTORB ; MAGNEMITE + db ICON_VOLTORB ; MAGNETITE db ICON_VOLTORB ; MAGNETON + db ICON_VOLTORB ; MAGNEZONE + db ICON_SERPENT ; GAVILLAIN db ICON_FISH ; CHEEP db ICON_FISH ; JABETTA db ICON_POLIWAG ; RIBBITO diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index b032ef2..19884f6 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -96,15 +96,24 @@ PokemonNames:: db "BELLIGNAN@" db "TENTACOOL@" db "TENTACRUEL" + db "TOEDSCOOL@" + db "TOEDSCRUEL" + db "BLOTTLE@@@" + db "PENDRAKEN@" db "GEODUDE@@@" db "GRAVELER@@" db "GOLEM@@@@@" + db "KOLTA@@@@@" db "PONYTA@@@@" db "RAPIDASH@@" + db "BALUMBA@@@" db "SLOWPOKE@@" db "SLOWBRO@@@" db "MAGNEMITE@" + db "MAGNETITE@" db "MAGNETON@@" + db "MAGNEZONE@" + db "GAVILLAIN@" db "CHEEP@@@@@" db "JABETTA@@@" db "RIBBITO@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index be94fd4..22558ba 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -217,24 +217,42 @@ INCBIN "gfx/pokemon/tentacool/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tentacool/shiny.pal" INCBIN "gfx/pokemon/tentacruel/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tentacruel/shiny.pal" +INCBIN "gfx/pokemon/toedscool/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/toedscool/shiny.pal" +INCBIN "gfx/pokemon/toedscruel/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/toedscruel/shiny.pal" +INCBIN "gfx/pokemon/blottle/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/blottle/shiny.pal" +INCBIN "gfx/pokemon/pendraken/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pendraken/shiny.pal" INCBIN "gfx/pokemon/geodude/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/geodude/shiny.pal" INCBIN "gfx/pokemon/graveler/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/graveler/shiny.pal" INCBIN "gfx/pokemon/golem/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/golem/shiny.pal" +INCBIN "gfx/pokemon/kolta/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/kolta/shiny.pal" INCBIN "gfx/pokemon/ponyta/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/ponyta/shiny.pal" INCBIN "gfx/pokemon/rapidash/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/rapidash/shiny.pal" +INCBIN "gfx/pokemon/balumba/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/balumba/shiny.pal" INCBIN "gfx/pokemon/slowpoke/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowpoke/shiny.pal" INCBIN "gfx/pokemon/slowbro/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowbro/shiny.pal" INCBIN "gfx/pokemon/magnemite/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/magnemite/shiny.pal" +INCBIN "gfx/pokemon/magnetite/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/magnetite/shiny.pal" INCBIN "gfx/pokemon/magneton/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/magneton/shiny.pal" +INCBIN "gfx/pokemon/magnezone/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/magnezone/shiny.pal" +INCBIN "gfx/pokemon/gavillain/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gavillain/shiny.pal" INCBIN "gfx/pokemon/cheep/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/cheep/shiny.pal" INCBIN "gfx/pokemon/jabetta/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 260e176..9c3ba64 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -197,24 +197,42 @@ PokemonPicPointers:: dba TentacoolBackpic dba TentacruelFrontpic dba TentacruelBackpic + dba ToedscoolFrontpic + dba ToedscoolBackpic + dba ToedscruelFrontpic + dba ToedscruelBackpic + dba BlottleFrontpic + dba BlottleBackpic + dba PendrakenFrontpic + dba PendrakenBackpic dba GeodudeFrontpic dba GeodudeBackpic dba GravelerFrontpic dba GravelerBackpic dba GolemFrontpic dba GolemBackpic + dba KoltaFrontpic + dba KoltaBackpic dba PonytaFrontpic dba PonytaBackpic dba RapidashFrontpic dba RapidashBackpic + dba BalumbaFrontpic + dba BalumbaBackpic dba SlowpokeFrontpic dba SlowpokeBackpic dba SlowbroFrontpic dba SlowbroBackpic dba MagnemiteFrontpic dba MagnemiteBackpic + dba MagnetiteFrontpic + dba MagnetiteBackpic dba MagnetonFrontpic dba MagnetonBackpic + dba MagnezoneFrontpic + dba MagnezoneBackpic + dba GavillainFrontpic + dba GavillainBackpic dba CheepFrontpic dba CheepBackpic dba JabettaFrontpic diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm index e22e5bb..87cab9c 100644 --- a/data/wild/flee_mons.asm +++ b/data/wild/flee_mons.asm @@ -15,6 +15,7 @@ SometimesFleeMons: dw UNOWN dw SNUBBULL dw HERACROSS + dw BALUMBA dw -1 OftenFleeMons: @@ -27,6 +28,7 @@ OftenFleeMons: dw PHANPY dw TEDDIURSA dw KIWOOKED + dw TOEDSCOOL dw -1 AlwaysFleeMons: diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index fd2b35e..a7f4248 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -295,16 +295,16 @@ JohtoGrassWildMons: dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING - dbw 15, HOUNDOUR - dbw 15, HOUNDOUR + dbw 15, KOLTA + dbw 15, KOLTA ; day dbw 13, VULPIII dbw 14, KOFFING dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING - dbw 15, HOUNDOUR - dbw 15, HOUNDOUR + dbw 15, KOLTA + dbw 15, KOLTA ; nite dbw 13, VULPIII dbw 14, KOFFING @@ -352,7 +352,7 @@ JohtoGrassWildMons: dbw 14, PIDGEY dbw 16, CATERPIE dbw 16, WEEDLE - dbw 16, WEEDLE + dbw 16, BALUMBA ; day dbw 15, NIDORAN_F dbw 15, NIDORAN_M @@ -360,7 +360,7 @@ JohtoGrassWildMons: dbw 14, PIDGEY dbw 16, CATERPIE dbw 16, WEEDLE - dbw 16, WEEDLE + dbw 16, BALUMBA ; nite dbw 15, PSYDUCK dbw 15, HOOTHOOT @@ -1250,7 +1250,7 @@ JohtoGrassWildMons: dbw 20, WOBBUFFET dbw 25, WOBBUFFET dbw 23, GOLBAT - dbw 23, GOLBAT + dbw 23, GAVILLAIN end_grass_wildmons def_grass_wildmons ROUTE_29 diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 0b0bc70..ec16292 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -93,15 +93,24 @@ INCBIN "gfx/footprints/victreebel.1bpp" INCBIN "gfx/footprints/bellignan.1bpp" INCBIN "gfx/footprints/tentacool.1bpp" INCBIN "gfx/footprints/tentacruel.1bpp" +INCBIN "gfx/footprints/toedscool.1bpp" +INCBIN "gfx/footprints/toedscruel.1bpp" +INCBIN "gfx/footprints/blottle.1bpp" +INCBIN "gfx/footprints/pendraken.1bpp" INCBIN "gfx/footprints/geodude.1bpp" INCBIN "gfx/footprints/graveler.1bpp" INCBIN "gfx/footprints/golem.1bpp" +INCBIN "gfx/footprints/kolta.1bpp" INCBIN "gfx/footprints/ponyta.1bpp" INCBIN "gfx/footprints/rapidash.1bpp" +INCBIN "gfx/footprints/balumba.1bpp" INCBIN "gfx/footprints/slowpoke.1bpp" INCBIN "gfx/footprints/slowbro.1bpp" INCBIN "gfx/footprints/magnemite.1bpp" +INCBIN "gfx/footprints/magnetite.1bpp" INCBIN "gfx/footprints/magneton.1bpp" +INCBIN "gfx/footprints/magnezone.1bpp" +INCBIN "gfx/footprints/gavillain.1bpp" INCBIN "gfx/footprints/cheep.1bpp" INCBIN "gfx/footprints/jabetta.1bpp" INCBIN "gfx/footprints/ribbito.1bpp" diff --git a/gfx/footprints/balumba.png b/gfx/footprints/balumba.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/balumba.png differ diff --git a/gfx/footprints/blottle.png b/gfx/footprints/blottle.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/blottle.png differ diff --git a/gfx/footprints/gavillain.png b/gfx/footprints/gavillain.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/gavillain.png differ diff --git a/gfx/footprints/kolta.png b/gfx/footprints/kolta.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/kolta.png differ diff --git a/gfx/footprints/magnetite.png b/gfx/footprints/magnetite.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/magnetite.png differ diff --git a/gfx/footprints/magnezone.png b/gfx/footprints/magnezone.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/magnezone.png differ diff --git a/gfx/footprints/pendraken.png b/gfx/footprints/pendraken.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/pendraken.png differ diff --git a/gfx/footprints/toedscool.png b/gfx/footprints/toedscool.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/toedscool.png differ diff --git a/gfx/footprints/toedscruel.png b/gfx/footprints/toedscruel.png new file mode 100644 index 0000000..41dd308 Binary files /dev/null and b/gfx/footprints/toedscruel.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index addd8cc..3d271dc 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -962,3 +962,23 @@ TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz" PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" + +; Back to your regularly scheduled makefile error 1 +ToedscoolFrontpic: INCBIN "gfx/pokemon/toedscool/front.animated.2bpp.lz" +ToedscoolBackpic: INCBIN "gfx/pokemon/toedscool/back.2bpp.lz" +ToedscruelFrontpic: INCBIN "gfx/pokemon/toedscruel/front.animated.2bpp.lz" +ToedscruelBackpic: INCBIN "gfx/pokemon/toedscruel/back.2bpp.lz" +BlottleFrontpic: INCBIN "gfx/pokemon/blottle/front.animated.2bpp.lz" +BlottleBackpic: INCBIN "gfx/pokemon/blottle/back.2bpp.lz" +PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz" +PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz" +KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz" +KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz" +BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz" +BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz" +MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz" +MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz" +MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" +MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" +GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" +GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index ec601cc..3c3e8be 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -92,15 +92,24 @@ AnimationPointers: dw BellignanAnimation dw TentacoolAnimation dw TentacruelAnimation + dw ToedscoolAnimation + dw ToedscruelAnimation + dw BlottleAnimation + dw PendrakenAnimation dw GeodudeAnimation dw GravelerAnimation dw GolemAnimation + dw KoltaAnimation dw PonytaAnimation dw RapidashAnimation + dw BalumbaAnimation dw SlowpokeAnimation dw SlowbroAnimation dw MagnemiteAnimation + dw MagnetiteAnimation dw MagnetonAnimation + dw MagnezoneAnimation + dw GavillainAnimation dw CheepAnimation dw JabettaAnimation dw RibbitoAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 13c5d27..7f1e515 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -90,15 +90,24 @@ VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm" BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm" TentacoolAnimation: INCLUDE "gfx/pokemon/tentacool/anim.asm" TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm" +ToedscoolAnimation: INCLUDE "gfx/pokemon/toedscool/anim.asm" +ToedscruelAnimation: INCLUDE "gfx/pokemon/toedscruel/anim.asm" +BlottleAnimation: INCLUDE "gfx/pokemon/blottle/anim.asm" +PendrakenAnimation: INCLUDE "gfx/pokemon/pendraken/anim.asm" GeodudeAnimation: INCLUDE "gfx/pokemon/geodude/anim.asm" GravelerAnimation: INCLUDE "gfx/pokemon/graveler/anim.asm" GolemAnimation: INCLUDE "gfx/pokemon/golem/anim.asm" +KoltaAnimation: INCLUDE "gfx/pokemon/kolta/anim.asm" PonytaAnimation: INCLUDE "gfx/pokemon/ponyta/anim.asm" RapidashAnimation: INCLUDE "gfx/pokemon/rapidash/anim.asm" +BalumbaAnimation: INCLUDE "gfx/pokemon/balumba/anim.asm" SlowpokeAnimation: INCLUDE "gfx/pokemon/slowpoke/anim.asm" SlowbroAnimation: INCLUDE "gfx/pokemon/slowbro/anim.asm" MagnemiteAnimation: INCLUDE "gfx/pokemon/magnemite/anim.asm" +MagnetiteAnimation: INCLUDE "gfx/pokemon/magnetite/anim.asm" MagnetonAnimation: INCLUDE "gfx/pokemon/magneton/anim.asm" +MagnezoneAnimation: INCLUDE "gfx/pokemon/magnezone/anim.asm" +GavillainAnimation: INCLUDE "gfx/pokemon/gavillain/anim.asm" CheepAnimation: INCLUDE "gfx/pokemon/cheep/anim.asm" JabettaAnimation: INCLUDE "gfx/pokemon/jabetta/anim.asm" RibbitoAnimation: INCLUDE "gfx/pokemon/ribbito/anim.asm" diff --git a/gfx/pokemon/balumba/anim.asm b/gfx/pokemon/balumba/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/balumba/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/balumba/anim_idle.asm b/gfx/pokemon/balumba/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/balumba/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/balumba/back.png b/gfx/pokemon/balumba/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/balumba/back.png differ diff --git a/gfx/pokemon/balumba/front.png b/gfx/pokemon/balumba/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/balumba/front.png differ diff --git a/gfx/pokemon/balumba/shiny.pal b/gfx/pokemon/balumba/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/balumba/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 d6854a4..b8e1d8b 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -92,15 +92,24 @@ BitmasksPointers: dw BellignanBitmasks dw TentacoolBitmasks dw TentacruelBitmasks + dw ToedscoolBitmasks + dw ToedscruelBitmasks + dw BlottleBitmasks + dw PendrakenBitmasks dw GeodudeBitmasks dw GravelerBitmasks dw GolemBitmasks + dw KoltaBitmasks dw PonytaBitmasks dw RapidashBitmasks + dw BalumbaBitmasks dw SlowpokeBitmasks dw SlowbroBitmasks dw MagnemiteBitmasks + dw MagnetiteBitmasks dw MagnetonBitmasks + dw MagnezoneBitmasks + dw GavillainBitmasks dw CheepBitmasks dw JabettaBitmasks dw RibbitoBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 6297aa5..ba9205a 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -90,15 +90,24 @@ VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm" BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm" TentacoolBitmasks: INCLUDE "gfx/pokemon/tentacool/bitmask.asm" TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm" +ToedscoolBitmasks: INCLUDE "gfx/pokemon/toedscool/bitmask.asm" +ToedscruelBitmasks: INCLUDE "gfx/pokemon/toedscruel/bitmask.asm" +BlottleBitmasks: INCLUDE "gfx/pokemon/blottle/bitmask.asm" +PendrakenBitmasks: INCLUDE "gfx/pokemon/pendraken/bitmask.asm" GeodudeBitmasks: INCLUDE "gfx/pokemon/geodude/bitmask.asm" GravelerBitmasks: INCLUDE "gfx/pokemon/graveler/bitmask.asm" GolemBitmasks: INCLUDE "gfx/pokemon/golem/bitmask.asm" +KoltaBitmasks: INCLUDE "gfx/pokemon/kolta/bitmask.asm" PonytaBitmasks: INCLUDE "gfx/pokemon/ponyta/bitmask.asm" RapidashBitmasks: INCLUDE "gfx/pokemon/rapidash/bitmask.asm" +BalumbaBitmasks: INCLUDE "gfx/pokemon/balumba/bitmask.asm" SlowpokeBitmasks: INCLUDE "gfx/pokemon/slowpoke/bitmask.asm" SlowbroBitmasks: INCLUDE "gfx/pokemon/slowbro/bitmask.asm" MagnemiteBitmasks: INCLUDE "gfx/pokemon/magnemite/bitmask.asm" +MagnetiteBitmasks: INCLUDE "gfx/pokemon/magnetite/bitmask.asm" MagnetonBitmasks: INCLUDE "gfx/pokemon/magneton/bitmask.asm" +MagnezoneBitmasks: INCLUDE "gfx/pokemon/magnezone/bitmask.asm" +GavillainBitmasks: INCLUDE "gfx/pokemon/gavillain/bitmask.asm" CheepBitmasks: INCLUDE "gfx/pokemon/cheep/bitmask.asm" JabettaBitmasks: INCLUDE "gfx/pokemon/jabetta/bitmask.asm" RibbitoBitmasks: INCLUDE "gfx/pokemon/ribbito/bitmask.asm" diff --git a/gfx/pokemon/blottle/anim.asm b/gfx/pokemon/blottle/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/blottle/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/blottle/anim_idle.asm b/gfx/pokemon/blottle/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/blottle/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/blottle/back.png b/gfx/pokemon/blottle/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/blottle/back.png differ diff --git a/gfx/pokemon/blottle/front.png b/gfx/pokemon/blottle/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/blottle/front.png differ diff --git a/gfx/pokemon/blottle/shiny.pal b/gfx/pokemon/blottle/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/blottle/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 c0c608c..5ba2339 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -92,15 +92,24 @@ FramesPointers: dba BellignanFrames dba TentacoolFrames dba TentacruelFrames + dba ToedscoolFrames + dba ToedscruelFrames + dba BlottleFrames + dba PendrakenFrames dba GeodudeFrames dba GravelerFrames dba GolemFrames + dba KoltaFrames dba PonytaFrames dba RapidashFrames + dba BalumbaFrames dba SlowpokeFrames dba SlowbroFrames dba MagnemiteFrames + dba MagnetiteFrames dba MagnetonFrames + dba MagnezoneFrames + dba GavillainFrames dba CheepFrames dba JabettaFrames dba RibbitoFrames diff --git a/gfx/pokemon/gavillain/anim.asm b/gfx/pokemon/gavillain/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gavillain/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gavillain/anim_idle.asm b/gfx/pokemon/gavillain/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gavillain/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gavillain/back.png b/gfx/pokemon/gavillain/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gavillain/back.png differ diff --git a/gfx/pokemon/gavillain/front.png b/gfx/pokemon/gavillain/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gavillain/front.png differ diff --git a/gfx/pokemon/gavillain/shiny.pal b/gfx/pokemon/gavillain/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gavillain/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 9246061..cb93fbf 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -92,15 +92,24 @@ AnimationIdlePointers: dw BellignanAnimationIdle dw TentacoolAnimationIdle dw TentacruelAnimationIdle + dw ToedscoolAnimationIdle + dw ToedscruelAnimationIdle + dw BlottleAnimationIdle + dw PendrakenAnimationIdle dw GeodudeAnimationIdle dw GravelerAnimationIdle dw GolemAnimationIdle + dw KoltaAnimationIdle dw PonytaAnimationIdle dw RapidashAnimationIdle + dw BalumbaAnimationIdle dw SlowpokeAnimationIdle dw SlowbroAnimationIdle dw MagnemiteAnimationIdle + dw MagnetiteAnimationIdle dw MagnetonAnimationIdle + dw MagnezoneAnimationIdle + dw GavillainAnimationIdle dw CheepAnimationIdle dw JabettaAnimationIdle dw RibbitoAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index efbf363..b4e02a9 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -90,15 +90,24 @@ VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" TentacoolAnimationIdle: INCLUDE "gfx/pokemon/tentacool/anim_idle.asm" TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm" +ToedscoolAnimationIdle: INCLUDE "gfx/pokemon/toedscool/anim_idle.asm" +ToedscruelAnimationIdle: INCLUDE "gfx/pokemon/toedscruel/anim_idle.asm" +BlottleAnimationIdle: INCLUDE "gfx/pokemon/blottle/anim_idle.asm" +PendrakenAnimationIdle: INCLUDE "gfx/pokemon/pendraken/anim_idle.asm" GeodudeAnimationIdle: INCLUDE "gfx/pokemon/geodude/anim_idle.asm" GravelerAnimationIdle: INCLUDE "gfx/pokemon/graveler/anim_idle.asm" GolemAnimationIdle: INCLUDE "gfx/pokemon/golem/anim_idle.asm" +KoltaAnimationIdle: INCLUDE "gfx/pokemon/kolta/anim_idle.asm" PonytaAnimationIdle: INCLUDE "gfx/pokemon/ponyta/anim_idle.asm" RapidashAnimationIdle: INCLUDE "gfx/pokemon/rapidash/anim_idle.asm" +BalumbaAnimationIdle: INCLUDE "gfx/pokemon/balumba/anim_idle.asm" SlowpokeAnimationIdle: INCLUDE "gfx/pokemon/slowpoke/anim_idle.asm" SlowbroAnimationIdle: INCLUDE "gfx/pokemon/slowbro/anim_idle.asm" MagnemiteAnimationIdle: INCLUDE "gfx/pokemon/magnemite/anim_idle.asm" +MagnetiteAnimationIdle: INCLUDE "gfx/pokemon/magnetite/anim_idle.asm" MagnetonAnimationIdle: INCLUDE "gfx/pokemon/magneton/anim_idle.asm" +MagnezoneAnimationIdle: INCLUDE "gfx/pokemon/magnezone/anim_idle.asm" +GavillainAnimationIdle: INCLUDE "gfx/pokemon/gavillain/anim_idle.asm" CheepAnimationIdle: INCLUDE "gfx/pokemon/cheep/anim_idle.asm" JabettaAnimationIdle: INCLUDE "gfx/pokemon/jabetta/anim_idle.asm" RibbitoAnimationIdle: INCLUDE "gfx/pokemon/ribbito/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index f15f524..79c6f0f 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -92,15 +92,24 @@ VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm" BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm" TentacoolFrames: INCLUDE "gfx/pokemon/tentacool/frames.asm" TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm" +ToedscoolFrames: INCLUDE "gfx/pokemon/toedscool/frames.asm" +ToedscruelFrames: INCLUDE "gfx/pokemon/toedscruel/frames.asm" +BlottleFrames: INCLUDE "gfx/pokemon/blottle/frames.asm" +PendrakenFrames: INCLUDE "gfx/pokemon/pendraken/frames.asm" GeodudeFrames: INCLUDE "gfx/pokemon/geodude/frames.asm" GravelerFrames: INCLUDE "gfx/pokemon/graveler/frames.asm" GolemFrames: INCLUDE "gfx/pokemon/golem/frames.asm" +KoltaFrames: INCLUDE "gfx/pokemon/kolta/frames.asm" PonytaFrames: INCLUDE "gfx/pokemon/ponyta/frames.asm" RapidashFrames: INCLUDE "gfx/pokemon/rapidash/frames.asm" +BalumbaFrames: INCLUDE "gfx/pokemon/balumba/frames.asm" SlowpokeFrames: INCLUDE "gfx/pokemon/slowpoke/frames.asm" SlowbroFrames: INCLUDE "gfx/pokemon/slowbro/frames.asm" MagnemiteFrames: INCLUDE "gfx/pokemon/magnemite/frames.asm" +MagnetiteFrames: INCLUDE "gfx/pokemon/magnetite/frames.asm" MagnetonFrames: INCLUDE "gfx/pokemon/magneton/frames.asm" +MagnezoneFrames: INCLUDE "gfx/pokemon/magnezone/frames.asm" +GavillainFrames: INCLUDE "gfx/pokemon/gavillain/frames.asm" CheepFrames: INCLUDE "gfx/pokemon/cheep/frames.asm" JabettaFrames: INCLUDE "gfx/pokemon/jabetta/frames.asm" RibbitoFrames: INCLUDE "gfx/pokemon/ribbito/frames.asm" diff --git a/gfx/pokemon/kolta/anim.asm b/gfx/pokemon/kolta/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kolta/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kolta/anim_idle.asm b/gfx/pokemon/kolta/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kolta/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kolta/back.png b/gfx/pokemon/kolta/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/kolta/back.png differ diff --git a/gfx/pokemon/kolta/front.png b/gfx/pokemon/kolta/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/kolta/front.png differ diff --git a/gfx/pokemon/kolta/shiny.pal b/gfx/pokemon/kolta/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/kolta/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/magnetite/anim.asm b/gfx/pokemon/magnetite/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magnetite/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magnetite/anim_idle.asm b/gfx/pokemon/magnetite/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magnetite/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magnetite/back.png b/gfx/pokemon/magnetite/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/magnetite/back.png differ diff --git a/gfx/pokemon/magnetite/front.png b/gfx/pokemon/magnetite/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/magnetite/front.png differ diff --git a/gfx/pokemon/magnetite/shiny.pal b/gfx/pokemon/magnetite/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/magnetite/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/magnezone/anim.asm b/gfx/pokemon/magnezone/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magnezone/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magnezone/anim_idle.asm b/gfx/pokemon/magnezone/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magnezone/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magnezone/back.png b/gfx/pokemon/magnezone/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/magnezone/back.png differ diff --git a/gfx/pokemon/magnezone/front.png b/gfx/pokemon/magnezone/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/magnezone/front.png differ diff --git a/gfx/pokemon/magnezone/shiny.pal b/gfx/pokemon/magnezone/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/magnezone/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/pendraken/anim.asm b/gfx/pokemon/pendraken/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pendraken/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pendraken/anim_idle.asm b/gfx/pokemon/pendraken/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pendraken/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pendraken/back.png b/gfx/pokemon/pendraken/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/pendraken/back.png differ diff --git a/gfx/pokemon/pendraken/front.png b/gfx/pokemon/pendraken/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/pendraken/front.png differ diff --git a/gfx/pokemon/pendraken/shiny.pal b/gfx/pokemon/pendraken/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pendraken/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/toedscool/anim.asm b/gfx/pokemon/toedscool/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/toedscool/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/toedscool/anim_idle.asm b/gfx/pokemon/toedscool/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/toedscool/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/toedscool/back.png b/gfx/pokemon/toedscool/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/toedscool/back.png differ diff --git a/gfx/pokemon/toedscool/front.png b/gfx/pokemon/toedscool/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/toedscool/front.png differ diff --git a/gfx/pokemon/toedscool/shiny.pal b/gfx/pokemon/toedscool/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/toedscool/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/toedscruel/anim.asm b/gfx/pokemon/toedscruel/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/toedscruel/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/toedscruel/anim_idle.asm b/gfx/pokemon/toedscruel/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/toedscruel/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/toedscruel/back.png b/gfx/pokemon/toedscruel/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/toedscruel/back.png differ diff --git a/gfx/pokemon/toedscruel/front.png b/gfx/pokemon/toedscruel/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/toedscruel/front.png differ diff --git a/gfx/pokemon/toedscruel/shiny.pal b/gfx/pokemon/toedscruel/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/toedscruel/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file