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

View file

@ -263,6 +263,7 @@ INCBIN "gfx/footprints/granbull.1bpp"
INCBIN "gfx/footprints/qwilfish.1bpp"
INCBIN "gfx/footprints/scizor.1bpp"
INCBIN "gfx/footprints/shuckle.1bpp"
INCBIN "gfx/footprints/pockle.1bpp"
INCBIN "gfx/footprints/heracross.1bpp"
INCBIN "gfx/footprints/sneasel.1bpp"
INCBIN "gfx/footprints/teddiursa.1bpp"

BIN
gfx/footprints/pockle.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

View file

@ -827,4 +827,7 @@ BarreauBackpic: INCBIN "gfx/pokemon/barreau/back.2bpp.lz"
RagingBoltFrontpic: INCBIN "gfx/pokemon/raging_bolt/front.animated.2bpp.lz"
RagingBoltBackpic: INCBIN "gfx/pokemon/raging_bolt/back.2bpp.lz"
GougingFireFrontpic: INCBIN "gfx/pokemon/gouging_fire/front.animated.2bpp.lz"
GougingFireBackpic: INCBIN "gfx/pokemon/gouging_fire/back.2bpp.lz"
GougingFireBackpic: INCBIN "gfx/pokemon/gouging_fire/back.2bpp.lz"
PockleFrontpic: INCBIN "gfx/pokemon/pockle/front.animated.2bpp.lz"
PockleBackpic: INCBIN "gfx/pokemon/pockle/back.2bpp.lz"

View file

@ -262,6 +262,7 @@ AnimationPointers:
dw QwilfishAnimation
dw ScizorAnimation
dw ShuckleAnimation
dw PockleAnimation
dw HeracrossAnimation
dw SneaselAnimation
dw TeddiursaAnimation

View file

@ -260,6 +260,7 @@ GranbullAnimation: INCLUDE "gfx/pokemon/granbull/anim.asm"
QwilfishAnimation: INCLUDE "gfx/pokemon/qwilfish/anim.asm"
ScizorAnimation: INCLUDE "gfx/pokemon/scizor/anim.asm"
ShuckleAnimation: INCLUDE "gfx/pokemon/shuckle/anim.asm"
PockleAnimation: INCLUDE "gfx/pokemon/pockle/anim.asm"
HeracrossAnimation: INCLUDE "gfx/pokemon/heracross/anim.asm"
SneaselAnimation: INCLUDE "gfx/pokemon/sneasel/anim.asm"
TeddiursaAnimation: INCLUDE "gfx/pokemon/teddiursa/anim.asm"

View file

@ -262,6 +262,7 @@ BitmasksPointers:
dw QwilfishBitmasks
dw ScizorBitmasks
dw ShuckleBitmasks
dw PockleBitmasks
dw HeracrossBitmasks
dw SneaselBitmasks
dw TeddiursaBitmasks

View file

@ -260,6 +260,7 @@ GranbullBitmasks: INCLUDE "gfx/pokemon/granbull/bitmask.asm"
QwilfishBitmasks: INCLUDE "gfx/pokemon/qwilfish/bitmask.asm"
ScizorBitmasks: INCLUDE "gfx/pokemon/scizor/bitmask.asm"
ShuckleBitmasks: INCLUDE "gfx/pokemon/shuckle/bitmask.asm"
PockleBitmasks: INCLUDE "gfx/pokemon/pockle/bitmask.asm"
HeracrossBitmasks: INCLUDE "gfx/pokemon/heracross/bitmask.asm"
SneaselBitmasks: INCLUDE "gfx/pokemon/sneasel/bitmask.asm"
TeddiursaBitmasks: INCLUDE "gfx/pokemon/teddiursa/bitmask.asm"

View file

@ -262,6 +262,7 @@ FramesPointers:
dba QwilfishFrames
dba ScizorFrames
dba ShuckleFrames
dba PockleFrames
dba HeracrossFrames
dba SneaselFrames
dba TeddiursaFrames

View file

@ -262,6 +262,7 @@ AnimationIdlePointers:
dw QwilfishAnimationIdle
dw ScizorAnimationIdle
dw ShuckleAnimationIdle
dw PockleAnimationIdle
dw HeracrossAnimationIdle
dw SneaselAnimationIdle
dw TeddiursaAnimationIdle

View file

@ -260,6 +260,7 @@ GranbullAnimationIdle: INCLUDE "gfx/pokemon/granbull/anim_idle.asm"
QwilfishAnimationIdle: INCLUDE "gfx/pokemon/qwilfish/anim_idle.asm"
ScizorAnimationIdle: INCLUDE "gfx/pokemon/scizor/anim_idle.asm"
ShuckleAnimationIdle: INCLUDE "gfx/pokemon/shuckle/anim_idle.asm"
PockleAnimationIdle: INCLUDE "gfx/pokemon/pockle/anim_idle.asm"
HeracrossAnimationIdle: INCLUDE "gfx/pokemon/heracross/anim_idle.asm"
SneaselAnimationIdle: INCLUDE "gfx/pokemon/sneasel/anim_idle.asm"
TeddiursaAnimationIdle: INCLUDE "gfx/pokemon/teddiursa/anim_idle.asm"

View file

@ -84,6 +84,7 @@ GranbullFrames: INCLUDE "gfx/pokemon/granbull/frames.asm"
QwilfishFrames: INCLUDE "gfx/pokemon/qwilfish/frames.asm"
ScizorFrames: INCLUDE "gfx/pokemon/scizor/frames.asm"
ShuckleFrames: INCLUDE "gfx/pokemon/shuckle/frames.asm"
PockleFrames: INCLUDE "gfx/pokemon/pockle/frames.asm"
HeracrossFrames: INCLUDE "gfx/pokemon/heracross/frames.asm"
SneaselFrames: INCLUDE "gfx/pokemon/sneasel/frames.asm"
TeddiursaFrames: INCLUDE "gfx/pokemon/teddiursa/frames.asm"

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/pockle/back.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 569 B

View file

@ -0,0 +1,4 @@
RGB 31, 22, 05
RGB 15, 07, 31