thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Bellignan, fix evo stones

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -90,6 +90,7 @@
const BELLSPROUT ; 45
const WEEPINBELL ; 46
const VICTREEBEL ; 47
const BELLIGNAN
const TENTACOOL ; 48
const TENTACRUEL ; 49
const GEODUDE ; 4a

1
data/pokemon/base_stats.asm
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"

1
data/pokemon/cries.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

1
data/pokemon/dex_entries.asm
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"

10
data/pokemon/dex_entries/bellignan.asm Normal file
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.@"

1
data/pokemon/dex_entry_pointers.asm
View file

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

1
data/pokemon/dex_order_alpha.asm
View file

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

1
data/pokemon/dex_order_new.asm
View file

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

1
data/pokemon/egg_moves_kanto.asm
View file

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

12
data/pokemon/evos_attacks_kanto.asm
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

1
data/pokemon/first_stages.asm
View file

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

1
data/pokemon/gen1_base_special.asm
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

1
data/pokemon/gen1_order.asm
View file

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

1
data/pokemon/menu_icons.asm
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

1
data/pokemon/names.asm
View file

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

2
data/pokemon/palettes.asm
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

2
data/pokemon/pic_pointers.asm
View file

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

10
engine/items/item_effects.asm
View file

@ -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

1
gfx/footprints.asm
View file

@ -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"

BIN
gfx/footprints/bellignan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 106 B

2
gfx/pics.asm
View file

@ -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"

1
gfx/pokemon/anim_pointers.asm
View file

@ -71,6 +71,7 @@ AnimationPointers:
dw BellsproutAnimation
dw WeepinbellAnimation
dw VictreebelAnimation
dw BellignanAnimation
dw TentacoolAnimation
dw TentacruelAnimation
dw GeodudeAnimation

1
gfx/pokemon/anims.asm
View file

@ -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"

19
gfx/pokemon/bellignan/anim.asm Normal file
View file

@ -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

1
gfx/pokemon/bellignan/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/bellignan/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 887 B

BIN
gfx/pokemon/bellignan/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
gfx/pokemon/bellignan/readme.txt Normal file
View file

@ -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

2
gfx/pokemon/bellignan/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 20, 23, 03
RGB 14, 12, 31

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -71,6 +71,7 @@ BitmasksPointers:
dw BellsproutBitmasks
dw WeepinbellBitmasks
dw VictreebelBitmasks
dw BellignanBitmasks
dw TentacoolBitmasks
dw TentacruelBitmasks
dw GeodudeBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -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"

1
gfx/pokemon/frame_pointers.asm
View file

@ -71,6 +71,7 @@ FramesPointers:
dba BellsproutFrames
dba WeepinbellFrames
dba VictreebelFrames
dba BellignanFrames
dba TentacoolFrames
dba TentacruelFrames
dba GeodudeFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -71,6 +71,7 @@ AnimationIdlePointers:
dw BellsproutAnimationIdle
dw WeepinbellAnimationIdle
dw VictreebelAnimationIdle
dw BellignanAnimationIdle
dw TentacoolAnimationIdle
dw TentacruelAnimationIdle
dw GeodudeAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -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"

1
gfx/pokemon/kanto_frames.asm
View file

@ -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"

8
maps/PlayersHouse2F.asm
View file

@ -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