Add Bellignan, fix evo stones

My first foray into adding Pokemon, here's Bellignan! Imported the sprite animation from Pokemon October. Works like a charm!

I also fixed the new evo stones, which didn't have their effects assigned yet.
This commit is contained in:
Llinos Evans 2023-10-26 11:49:59 +01:00
parent 8669e4f980
commit b582a0e7aa
36 changed files with 83 additions and 9 deletions

View file

@ -98,6 +98,7 @@ INCLUDE "data/pokemon/base_stats/machamp.asm"
INCLUDE "data/pokemon/base_stats/bellsprout.asm"
INCLUDE "data/pokemon/base_stats/weepinbell.asm"
INCLUDE "data/pokemon/base_stats/victreebel.asm"
INCLUDE "data/pokemon/base_stats/bellignan.asm"
INCLUDE "data/pokemon/base_stats/tentacool.asm"
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
INCLUDE "data/pokemon/base_stats/geodude.asm"

View file

@ -77,6 +77,7 @@ PokemonCries::
mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT
mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL
mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL
mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN
mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL
mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL
mon_cry CRY_VULPIX, 240, 144 ; GEODUDE

View file

@ -75,6 +75,7 @@ MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machamp.asm"
BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellsprout.asm"
WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weepinbell.asm"
VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/victreebel.asm"
BellignanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellignan.asm"
TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacool.asm"
TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacruel.asm"
GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/geodude.asm"

View file

@ -0,0 +1,10 @@
db "SPROUT@" ; species name
dw 403, 160 ; height, weight
db "It lives through"
next "absorbing nutrients"
next "in the ground with"
page "its root-like"
next "feet. Revered"
next "by some faiths.@"

View file

@ -72,6 +72,7 @@ PokedexDataPointerTable:
dba BellsproutPokedexEntry
dba WeepinbellPokedexEntry
dba VictreebelPokedexEntry
dba BellignanPokedexEntry
dba TentacoolPokedexEntry
dba TentacruelPokedexEntry
dba GeodudePokedexEntry

View file

@ -14,6 +14,7 @@ AlphabeticalPokedexOrder:
dw AZUMARILL
dw BAYLEEF
dw BEEDRILL
dw BELLIGNAN
dw BELLOSSOM
dw BELLSPROUT
dw BLASTOISE

View file

@ -68,6 +68,7 @@ NewPokedexOrder:
dw BELLSPROUT
dw WEEPINBELL
dw VICTREEBEL
dw BELLIGNAN
dw HOPPIP
dw SKIPLOOM
dw JUMPLUFF

View file

@ -72,6 +72,7 @@ EggMovePointers1:
dw BellsproutEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Bellignan
dw TentacoolEggMoves
dw NoEggMoves1
dw GeodudeEggMoves

View file

@ -72,6 +72,7 @@ EvosAttacksPointers1::
dw BellsproutEvosAttacks
dw WeepinbellEvosAttacks
dw VictreebelEvosAttacks
dw BellignanEvosAttacks
dw TentacoolEvosAttacks
dw TentacruelEvosAttacks
dw GeodudeEvosAttacks
@ -1069,6 +1070,7 @@ BellsproutEvosAttacks:
WeepinbellEvosAttacks:
dbbw EVOLVE_ITEM, LEAF_STONE, VICTREEBEL
dbbw EVOLVE_ITEM, POISON_STONE, BELLIGNAN
db 0 ; no more evolutions
dbw 1, VINE_WHIP
dbw 1, GROWTH
@ -1092,6 +1094,16 @@ VictreebelEvosAttacks:
dbw 1, RAZOR_LEAF
db 0 ; no more level-up moves
BellignanEvosAttacks:
db 0 ; no more evolutions
dbw 1, SLEEP_POWDER
dbw 1, RAZOR_LEAF
dbw 1, LOVELY_KISS
dbw 1, ACID
dbw 40, LOVELY_KISS
dbw 48, SLUDGE_BOMB
db 0 ; no more level-up moves
TentacoolEvosAttacks:
dbbw EVOLVE_LEVEL, 30, TENTACRUEL
db 0 ; no more evolutions

View file

@ -72,6 +72,7 @@ FirstEvoStages::
dw BELLSPROUT
dw BELLSPROUT
dw BELLSPROUT
dw BELLSPROUT
dw TENTACOOL ;48
dw TENTACOOL
dw GEODUDE

View file

@ -73,6 +73,7 @@ KantoMonSpecials:
db 70 ; BELLSPROUT
db 85 ; WEEPINBELL
db 100 ; VICTREEBEL
db 100 ; BELLIGNAN
db 100 ; TENTACOOL
db 120 ; TENTACRUEL
db 30 ; GEODUDE

View file

@ -255,4 +255,5 @@ Pokered_MonIndices:
db QWILFISH
db WOBBUFFET
db WOBBUFFET
db BELLIGNAN
assert_table_length NUM_POKEMON + 1

View file

@ -73,6 +73,7 @@ MonMenuIcons:
db ICON_ODDISH ; BELLSPROUT
db ICON_ODDISH ; WEEPINBELL
db ICON_ODDISH ; VICTREEBEL
db ICON_ODDISH ; BELLIGNAN
db ICON_JELLYFISH ; TENTACOOL
db ICON_JELLYFISH ; TENTACRUEL
db ICON_GEODUDE ; GEODUDE

View file

@ -75,6 +75,7 @@ PokemonNames::
db "BELLSPROUT"
db "WEEPINBELL"
db "VICTREEBEL"
db "BELLIGNAN@"
db "TENTACOOL@"
db "TENTACRUEL"
db "GEODUDE@@@"

View file

@ -175,6 +175,8 @@ INCBIN "gfx/pokemon/weepinbell/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/weepinbell/shiny.pal"
INCBIN "gfx/pokemon/victreebel/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/victreebel/shiny.pal"
INCBIN "gfx/pokemon/bellignan/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/victreebel/shiny.pal"
INCBIN "gfx/pokemon/tentacool/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/tentacool/shiny.pal"
INCBIN "gfx/pokemon/tentacruel/front.gbcpal", middle_colors

View file

@ -155,6 +155,8 @@ PokemonPicPointers::
dba WeepinbellBackpic
dba VictreebelFrontpic
dba VictreebelBackpic
dba BellignanFrontpic
dba BellignanBackpic
dba TentacoolFrontpic
dba TentacoolBackpic
dba TentacruelFrontpic