diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 97a08d9..f5afe9b 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -90,6 +90,7 @@ const BELLSPROUT ; 45 const WEEPINBELL ; 46 const VICTREEBEL ; 47 + const BELLIGNAN const TENTACOOL ; 48 const TENTACRUEL ; 49 const GEODUDE ; 4a diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 5a72bdd..aa7e8d6 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -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" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 8e542f4..2ce8313 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 8b73c73..f4b6826 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -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" diff --git a/data/pokemon/dex_entries/bellignan.asm b/data/pokemon/dex_entries/bellignan.asm new file mode 100644 index 0000000..521da74 --- /dev/null +++ b/data/pokemon/dex_entries/bellignan.asm @@ -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.@" \ No newline at end of file diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index a2bf28d..3c18e90 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -72,6 +72,7 @@ PokedexDataPointerTable: dba BellsproutPokedexEntry dba WeepinbellPokedexEntry dba VictreebelPokedexEntry + dba BellignanPokedexEntry dba TentacoolPokedexEntry dba TentacruelPokedexEntry dba GeodudePokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index e231c3c..03b7665 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -14,6 +14,7 @@ AlphabeticalPokedexOrder: dw AZUMARILL dw BAYLEEF dw BEEDRILL + dw BELLIGNAN dw BELLOSSOM dw BELLSPROUT dw BLASTOISE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 65f162e..d4aa3d2 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -68,6 +68,7 @@ NewPokedexOrder: dw BELLSPROUT dw WEEPINBELL dw VICTREEBEL + dw BELLIGNAN dw HOPPIP dw SKIPLOOM dw JUMPLUFF diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 1cbb5f6..7d4f21c 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -72,6 +72,7 @@ EggMovePointers1: dw BellsproutEggMoves dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Bellignan dw TentacoolEggMoves dw NoEggMoves1 dw GeodudeEggMoves diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 0510e1b..889d184 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -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 diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 0e351e3..dc560dc 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -72,6 +72,7 @@ FirstEvoStages:: dw BELLSPROUT dw BELLSPROUT dw BELLSPROUT + dw BELLSPROUT dw TENTACOOL ;48 dw TENTACOOL dw GEODUDE diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 8319287..c111c20 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -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 diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 3583c99..e1b5f42 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -255,4 +255,5 @@ Pokered_MonIndices: db QWILFISH db WOBBUFFET db WOBBUFFET + db BELLIGNAN assert_table_length NUM_POKEMON + 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index c80102b..ba9554b 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index a8ae68c..dd66941 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -75,6 +75,7 @@ PokemonNames:: db "BELLSPROUT" db "WEEPINBELL" db "VICTREEBEL" + db "BELLIGNAN@" db "TENTACOOL@" db "TENTACRUEL" db "GEODUDE@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 1eb83a3..776dbb7 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -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 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index ea71fc3..10f69b0 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -155,6 +155,8 @@ PokemonPicPointers:: dba WeepinbellBackpic dba VictreebelFrontpic dba VictreebelBackpic + dba BellignanFrontpic + dba BellignanBackpic dba TentacoolFrontpic dba TentacoolBackpic dba TentacruelFrontpic diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 8c0f0a4..6d33df1 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -148,14 +148,14 @@ ItemEffects: dw NoEffect ; STAR_PIECE dw BasementKeyEffect ; BASEMENT_KEY dw NoEffect ; PASS - dw NoEffect ; ITEM_87 - dw NoEffect ; ITEM_88 - dw NoEffect ; ITEM_89 + dw EvoStoneEffect ; HEART_STONE + dw EvoStoneEffect ; POISON_STONE + dw EvoStoneEffect ; ICE_STONE dw NoEffect ; CHARCOAL dw RestoreHPEffect ; BERRY_JUICE dw NoEffect ; SCOPE_LENS - dw NoEffect ; ITEM_8D - dw NoEffect ; ITEM_8E + dw EvoStoneEffect ; DUSK_STONE + dw EvoStoneEffect ; SHINY_STONE dw NoEffect ; METAL_COAT dw NoEffect ; DRAGON_FANG dw NoEffect ; ITEM_91 diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 3c27419..9de45bc 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -72,6 +72,7 @@ INCBIN "gfx/footprints/machamp.1bpp" INCBIN "gfx/footprints/bellsprout.1bpp" INCBIN "gfx/footprints/weepinbell.1bpp" INCBIN "gfx/footprints/victreebel.1bpp" +;INCBIN "gfx/footprints/bellignan.1bpp" INCBIN "gfx/footprints/tentacool.1bpp" INCBIN "gfx/footprints/tentacruel.1bpp" INCBIN "gfx/footprints/geodude.1bpp" diff --git a/gfx/footprints/bellignan.png b/gfx/footprints/bellignan.png new file mode 100644 index 0000000..bfec0b0 Binary files /dev/null and b/gfx/footprints/bellignan.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index a44a0ce..0c25ca2 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -717,6 +717,8 @@ TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz" TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz" BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" +BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz" +BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz" INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 01b818e..ab37b35 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -71,6 +71,7 @@ AnimationPointers: dw BellsproutAnimation dw WeepinbellAnimation dw VictreebelAnimation + dw BellignanAnimation dw TentacoolAnimation dw TentacruelAnimation dw GeodudeAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index f943cd7..88e95aa 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -69,6 +69,7 @@ MachampAnimation: INCLUDE "gfx/pokemon/machamp/anim.asm" BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm" WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm" 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" GeodudeAnimation: INCLUDE "gfx/pokemon/geodude/anim.asm" diff --git a/gfx/pokemon/bellignan/anim.asm b/gfx/pokemon/bellignan/anim.asm new file mode 100644 index 0000000..9a83517 --- /dev/null +++ b/gfx/pokemon/bellignan/anim.asm @@ -0,0 +1,19 @@ + frame 0, 06 + frame 1, 06 + frame 2, 04 + frame 3, 04 + frame 4, 08 + frame 5, 08 + frame 6, 08 + frame 7, 08 + frame 1, 06 + frame 2, 10 + frame 8, 08 + frame 9, 08 + frame 10, 08 + frame 11, 08 + frame 9, 08 + frame 11, 08 + frame 9, 08 + frame 11, 08 + endanim diff --git a/gfx/pokemon/bellignan/anim_idle.asm b/gfx/pokemon/bellignan/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bellignan/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bellignan/back.png b/gfx/pokemon/bellignan/back.png new file mode 100644 index 0000000..c52f4c7 Binary files /dev/null and b/gfx/pokemon/bellignan/back.png differ diff --git a/gfx/pokemon/bellignan/front.png b/gfx/pokemon/bellignan/front.png new file mode 100644 index 0000000..86b434e Binary files /dev/null and b/gfx/pokemon/bellignan/front.png differ diff --git a/gfx/pokemon/bellignan/readme.txt b/gfx/pokemon/bellignan/readme.txt new file mode 100644 index 0000000..c2c6e05 --- /dev/null +++ b/gfx/pokemon/bellignan/readme.txt @@ -0,0 +1,2 @@ +This spritework is taken from Pokemon October, which finished Game Freak's design. +https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx/pokemon/bellignan \ No newline at end of file diff --git a/gfx/pokemon/bellignan/shiny.pal b/gfx/pokemon/bellignan/shiny.pal new file mode 100644 index 0000000..028b437 --- /dev/null +++ b/gfx/pokemon/bellignan/shiny.pal @@ -0,0 +1,2 @@ + RGB 20, 23, 03 + RGB 14, 12, 31 \ No newline at end of file diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 29bc7c2..b7755e8 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -71,6 +71,7 @@ BitmasksPointers: dw BellsproutBitmasks dw WeepinbellBitmasks dw VictreebelBitmasks + dw BellignanBitmasks dw TentacoolBitmasks dw TentacruelBitmasks dw GeodudeBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 48bd79f..c9ad3a5 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -69,6 +69,7 @@ MachampBitmasks: INCLUDE "gfx/pokemon/machamp/bitmask.asm" BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm" WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm" 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" GeodudeBitmasks: INCLUDE "gfx/pokemon/geodude/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index cb468f5..32caf3b 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -71,6 +71,7 @@ FramesPointers: dba BellsproutFrames dba WeepinbellFrames dba VictreebelFrames + dba BellignanFrames dba TentacoolFrames dba TentacruelFrames dba GeodudeFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index c4699cd..94fda4a 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -71,6 +71,7 @@ AnimationIdlePointers: dw BellsproutAnimationIdle dw WeepinbellAnimationIdle dw VictreebelAnimationIdle + dw BellignanAnimationIdle dw TentacoolAnimationIdle dw TentacruelAnimationIdle dw GeodudeAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 423ba49..f4090c7 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -69,6 +69,7 @@ MachampAnimationIdle: INCLUDE "gfx/pokemon/machamp/anim_idle.asm" BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm" WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm" 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" GeodudeAnimationIdle: INCLUDE "gfx/pokemon/geodude/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index ee4d116..e45958f 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -71,6 +71,7 @@ MachampFrames: INCLUDE "gfx/pokemon/machamp/frames.asm" BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm" WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm" 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" GeodudeFrames: INCLUDE "gfx/pokemon/geodude/frames.asm" diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index a4ab812..cc7d8e2 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -114,23 +114,23 @@ PlayersRadioText4: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, BLASTYKE + getmonname STRING_BUFFER_3, BELLIGNAN writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke BLASTYKE, 35, RARE_CANDY + givepoke BELLIGNAN, 35, RARE_CANDY closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, WARTORTLE + getmonname STRING_BUFFER_3, WEEPINBELL writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke WARTORTLE, 35, RARE_CANDY + givepoke WEEPINBELL, 35, POISON_STONE closetext end