Kirk, Shuckie and the Antique Pot

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

data/pokemon/base_stats.asm

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

data/pokemon/base_stats/pockle.asm

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

data/pokemon/cries.asm

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

data/pokemon/dex_entries.asm

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

data/pokemon/dex_entries/pockle.asm

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

data/pokemon/dex_entry_pointers.asm

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

data/pokemon/dex_order_alpha.asm

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

data/pokemon/dex_order_new.asm

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

data/pokemon/egg_moves_johto.asm

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

data/pokemon/evos_attacks_johto.asm

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

data/pokemon/first_stages.asm

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

data/pokemon/gen1_order.asm

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

data/pokemon/menu_icons.asm

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

data/pokemon/names.asm

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

data/pokemon/palettes.asm

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

data/pokemon/pic_pointers.asm

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