thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kirk, Shuckie and the Antique Pot

Browse source 
- Adds Pockle, an evolution of Shuckle based on cut data from early 1999. Uses a custom sprite reminiscent of Shuckle's early 'pot' design, with the base sprite being used in Pokemon October, then heavily edited by me.

- Reworked the Shuckie event entirely. Shuckie is now 5 levels higher and holds a Berry Juice, and their OT has been changed to the better name used in HGSS. Kirk now no longer takes Shuckie back from you after a day, instead giving you an incentive to raise Shuckie's friendship. Once you raise it high enough, he gives you the Antique Pot, which (currently) acts like an evolution Stone for Shuckle.

- Kirk now no longer checks for the species as well, allowing the sidequest to be completed immediately by showing him an evolved Shuckie. This does mean that this can be bypassed with the right OT and ID, but you basically need ACE or RNG manip to achieve that so its a non-issue.
This commit is contained in:
Martha Schilling 2024-03-26 00:26:25 +00:00
parent 393f2d7f1b
commit adb9e3c540
41 changed files with 177 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/items/attributes.asm
View file

@ -349,8 +349,8 @@ ItemAttributes:
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; POLKADOT_BOW
item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_AB
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ANTIQUE_POT
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; UP_GRADE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY

6
data/items/descriptions.asm
View file

@ -171,7 +171,7 @@ ItemDescriptions:
dw GorgeousBoxDesc
dw SunStoneDesc
dw PolkadotBowDesc
dw QuestionMarkDesc
dw AntiquePotDesc
dw UpGradeDesc
dw BerryDesc
dw GoldBerryDesc
@ -848,6 +848,10 @@ SunStoneDesc:
PolkadotBowDesc:
db "Powers up normal-"
next "type moves. (HOLD)@"
AntiquePotDesc:
db "A valuable pot."
next "Sell very high.@"
UpGradeDesc:
db "A mysterious box"

2
data/items/names.asm
View file

@ -170,7 +170,7 @@ ItemNames::
li "GORGEOUS BOX"
li "SUN STONE"
li "POLKADOT BOW"
li "TERU-SAMA"
li "ANTIQUE POT"
li "UP-GRADE"
li "BERRY"
li "GOLD BERRY"

1
data/pokemon/base_stats.asm
View file

@ -289,6 +289,7 @@ INCLUDE "data/pokemon/base_stats/granbull.asm"
INCLUDE "data/pokemon/base_stats/qwilfish.asm"
INCLUDE "data/pokemon/base_stats/scizor.asm"
INCLUDE "data/pokemon/base_stats/shuckle.asm"
INCLUDE "data/pokemon/base_stats/pockle.asm"
INCLUDE "data/pokemon/base_stats/heracross.asm"
INCLUDE "data/pokemon/base_stats/sneasel.asm"
INCLUDE "data/pokemon/base_stats/teddiursa.asm"

21
data/pokemon/base_stats/pockle.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 70, 60, 130, 55, 60, 130
; hp atk def spd sat sdf
db BUG, ROCK ; type
db 45 ; catch rate
db 160 ; base exp
db BERRY, BERRY_JUICE ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/pockle/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_BUG, EGG_BUG ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH
; end

1
data/pokemon/cries.asm
View file

@ -268,6 +268,7 @@ PokemonCries::
mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH
mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR
mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE
mon_cry CRY_DUNSPARCE, 640, 208 ; POCKLE
mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS
mon_cry CRY_WOOPER, 83, 175 ; SNEASEL
mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA

1
data/pokemon/dex_entries.asm
View file

@ -274,6 +274,7 @@ GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbull.asm"
QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfish.asm"
ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scizor.asm"
ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/shuckle.asm"
PocklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/pockle.asm"
HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/heracross.asm"
SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sneasel.asm"
TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/teddiursa.asm"

10
data/pokemon/dex_entries/pockle.asm Normal file
View file

@ -0,0 +1,10 @@
db "POTTERY@" ; species name
dw 204, 900 ; height, weight
db "When it evolves,"
next "it sneaks into a"
next "vase unnoticed."
page "Very little change"
next "happens with the"
next "#MON itself.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -263,6 +263,7 @@ PokedexDataPointerTable:
dba QwilfishPokedexEntry
dba ScizorPokedexEntry
dba ShucklePokedexEntry
dba PocklePokedexEntry
dba HeracrossPokedexEntry
dba SneaselPokedexEntry
dba TeddiursaPokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -205,6 +205,7 @@ AlphabeticalPokedexOrder:
dw PILOSWINE
dw PINECO
dw PINSIR
dw POCKLE
dw POLITOED
dw POLIWAG
dw POLIWHIRL

1
data/pokemon/dex_order_new.asm
View file

@ -203,6 +203,7 @@ NewPokedexOrder:
dw KRABBY
dw KINGLER
dw SHUCKLE
dw POCKLE
dw STARYU
dw STARMIE
dw SHELLDER

1
data/pokemon/egg_moves_johto.asm
View file

@ -86,6 +86,7 @@ EggMovePointers2::
dw QwilfishEggMoves
dw NoEggMoves2
dw ShuckleEggMoves
dw NoEggMoves2
dw HeracrossEggMoves
dw SneaselEggMoves
dw TeddiursaEggMoves

13
data/pokemon/evos_attacks_johto.asm
View file

@ -85,6 +85,7 @@ EvosAttacksPointers2::
dw QwilfishEvosAttacks
dw ScizorEvosAttacks
dw ShuckleEvosAttacks
dw PockleEvosAttacks
dw HeracrossEvosAttacks
dw SneaselEvosAttacks
dw TeddiursaEvosAttacks
@ -1226,6 +1227,18 @@ ScizorEvosAttacks:
db 0 ; no more level-up moves
ShuckleEvosAttacks:
dbbw EVOLVE_ITEM, ANTIQUE_POT, POCKLE
db 0 ; no more evolutions
dbw 1, CONSTRICT
dbw 1, WITHDRAW
dbw 9, WRAP
dbw 14, ENCORE
dbw 23, SAFEGUARD
dbw 28, BIDE
dbw 37, REST
db 0 ; no more level-up moves
PockleEvosAttacks:
db 0 ; no more evolutions
dbw 1, CONSTRICT
dbw 1, WITHDRAW

1
data/pokemon/first_stages.asm
View file

@ -263,6 +263,7 @@ FirstEvoStages::
dw QWILFISH
dw SCYTHER
dw SHUCKLE
dw SHUCKLE
dw HERACROSS
dw SNEASEL
dw TEDDIURSA ;d8

1
data/pokemon/gen1_order.asm
View file

@ -305,4 +305,5 @@ Pokered_MonIndices:
db BARREAU
db RAGING_BOLT
db GOUGING_FIRE
db POCKLE
assert_table_length NUM_POKEMON - 1

1
data/pokemon/menu_icons.asm
View file

@ -264,6 +264,7 @@ MonMenuIcons:
db ICON_FISH ; QWILFISH
db ICON_BUG ; SCIZOR
db ICON_BUG ; SHUCKLE
db ICON_BUG ; POCKLE
db ICON_BUG ; HERACROSS
db ICON_FOX ; SNEASEL
db ICON_MONSTER ; TEDDIURSA

1
data/pokemon/names.asm
View file

@ -266,6 +266,7 @@ PokemonNames::
db "QWILFISH@@"
db "SCIZOR@@@@"
db "SHUCKLE@@@"
db "POCKLE@@@@"
db "HERACROSS@"
db "SNEASEL@@@"
db "TEDDIURSA@"

2
data/pokemon/palettes.asm
View file

@ -557,6 +557,8 @@ INCBIN "gfx/pokemon/scizor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/scizor/shiny.pal"
INCBIN "gfx/pokemon/shuckle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/shuckle/shiny.pal"
INCBIN "gfx/pokemon/pockle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pockle/shiny.pal"
INCBIN "gfx/pokemon/heracross/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/heracross/shiny.pal"
INCBIN "gfx/pokemon/sneasel/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -540,6 +540,8 @@ PokemonPicPointers::
dba ScizorBackpic
dba ShuckleFrontpic
dba ShuckleBackpic
dba PockleFrontpic
dba PockleBackpic
dba HeracrossFrontpic
dba HeracrossBackpic
dba SneaselFrontpic