mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-12-26 20:40:31 +13:00
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:
parent
393f2d7f1b
commit
adb9e3c540
|
|
@ -176,7 +176,7 @@
|
|||
const GORGEOUS_BOX ; a8
|
||||
const SUN_STONE ; a9
|
||||
const POLKADOT_BOW ; aa
|
||||
const ITEM_AB ; ab
|
||||
const ANTIQUE_POT ; ab
|
||||
const UP_GRADE ; ac
|
||||
const BERRY ; ad
|
||||
const GOLD_BERRY ; ae
|
||||
|
|
|
|||
|
|
@ -282,6 +282,7 @@ DEF JOHTO_POKEMON EQU const_value
|
|||
const QWILFISH ; d3
|
||||
const SCIZOR ; d4
|
||||
const SHUCKLE ; d5
|
||||
const POCKLE
|
||||
const HERACROSS ; d6
|
||||
const SNEASEL ; d7
|
||||
const TEDDIURSA ; d8
|
||||
|
|
|
|||
|
|
@ -280,9 +280,10 @@ DEF NUM_DECODESCS EQU const_value
|
|||
const_def
|
||||
const SHUCKIE_WRONG_MON ; 0
|
||||
const SHUCKIE_REFUSED ; 1
|
||||
const SHUCKIE_RETURNED ; 2
|
||||
const SHUCKIE_HAPPY ; 3
|
||||
const SHUCKIE_HAPPY ; 2
|
||||
const SHUCKIE_EVOLVED ; 3
|
||||
const SHUCKIE_FAINTED ; 4
|
||||
const SHUCKIE_OKAY ; 5
|
||||
|
||||
; CheckPartyFullAfterContest return values
|
||||
const_def
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
21
data/pokemon/base_stats/pockle.asm
Normal 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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
10
data/pokemon/dex_entries/pockle.asm
Normal 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.@"
|
||||
|
|
@ -263,6 +263,7 @@ PokedexDataPointerTable:
|
|||
dba QwilfishPokedexEntry
|
||||
dba ScizorPokedexEntry
|
||||
dba ShucklePokedexEntry
|
||||
dba PocklePokedexEntry
|
||||
dba HeracrossPokedexEntry
|
||||
dba SneaselPokedexEntry
|
||||
dba TeddiursaPokedexEntry
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ AlphabeticalPokedexOrder:
|
|||
dw PILOSWINE
|
||||
dw PINECO
|
||||
dw PINSIR
|
||||
dw POCKLE
|
||||
dw POLITOED
|
||||
dw POLIWAG
|
||||
dw POLIWHIRL
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ NewPokedexOrder:
|
|||
dw KRABBY
|
||||
dw KINGLER
|
||||
dw SHUCKLE
|
||||
dw POCKLE
|
||||
dw STARYU
|
||||
dw STARMIE
|
||||
dw SHELLDER
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ EggMovePointers2::
|
|||
dw QwilfishEggMoves
|
||||
dw NoEggMoves2
|
||||
dw ShuckleEggMoves
|
||||
dw NoEggMoves2
|
||||
dw HeracrossEggMoves
|
||||
dw SneaselEggMoves
|
||||
dw TeddiursaEggMoves
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -263,6 +263,7 @@ FirstEvoStages::
|
|||
dw QWILFISH
|
||||
dw SCYTHER
|
||||
dw SHUCKLE
|
||||
dw SHUCKLE
|
||||
dw HERACROSS
|
||||
dw SNEASEL
|
||||
dw TEDDIURSA ;d8
|
||||
|
|
|
|||
|
|
@ -305,4 +305,5 @@ Pokered_MonIndices:
|
|||
db BARREAU
|
||||
db RAGING_BOLT
|
||||
db GOUGING_FIRE
|
||||
db POCKLE
|
||||
assert_table_length NUM_POKEMON - 1
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ PokemonNames::
|
|||
db "QWILFISH@@"
|
||||
db "SCIZOR@@@@"
|
||||
db "SHUCKLE@@@"
|
||||
db "POCKLE@@@@"
|
||||
db "HERACROSS@"
|
||||
db "SNEASEL@@@"
|
||||
db "TEDDIURSA@"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -540,6 +540,8 @@ PokemonPicPointers::
|
|||
dba ScizorBackpic
|
||||
dba ShuckleFrontpic
|
||||
dba ShuckleBackpic
|
||||
dba PockleFrontpic
|
||||
dba PockleBackpic
|
||||
dba HeracrossFrontpic
|
||||
dba HeracrossBackpic
|
||||
dba SneaselFrontpic
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ GiveShuckle:
|
|||
xor a ; PARTYMON
|
||||
ld [wMonType], a
|
||||
|
||||
; Level 15 Shuckle.
|
||||
; Level 20 Shuckle.
|
||||
ld hl, SHUCKLE
|
||||
call GetPokemonIDFromIndex
|
||||
ld [wCurPartySpecies], a
|
||||
ld a, 15
|
||||
ld a, 20
|
||||
ld [wCurPartyLevel], a
|
||||
|
||||
predef TryAddMonToParty
|
||||
|
|
@ -19,7 +19,7 @@ GiveShuckle:
|
|||
ld b, CAUGHT_BY_UNKNOWN
|
||||
farcall SetGiftPartyMonCaughtData
|
||||
|
||||
; Holding a Berry.
|
||||
; Holding a Berry Juice.
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
ld a, [wPartyCount]
|
||||
dec a
|
||||
|
|
@ -27,7 +27,7 @@ GiveShuckle:
|
|||
push bc
|
||||
ld hl, wPartyMon1Item
|
||||
call AddNTimes
|
||||
ld [hl], BERRY
|
||||
ld [hl], BERRY_JUICE
|
||||
pop bc
|
||||
pop af
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ GiveShuckle:
|
|||
ret
|
||||
|
||||
SpecialShuckleOT:
|
||||
db "MANIA@"
|
||||
db "KIRK@" ; This guy was called Mania in Gen 2, which was changed to Kirk in HGSS. I prefer Kirk.
|
||||
|
||||
SpecialShuckleNickname:
|
||||
db "SHUCKIE@"
|
||||
|
|
@ -76,23 +76,6 @@ ReturnShuckie:
|
|||
farcall SelectMonFromParty
|
||||
jr c, .refused
|
||||
|
||||
ld a, [wCurPartySpecies]
|
||||
call GetPokemonIndexFromID
|
||||
ld a, l
|
||||
sub LOW(SHUCKLE)
|
||||
if HIGH(SHUCKLE) == 0
|
||||
or h
|
||||
else
|
||||
jr nz, .DontReturn
|
||||
if HIGH(SHUCKLE) == 1
|
||||
dec h
|
||||
else
|
||||
ld a, h
|
||||
cp HIGH(SHUCKLE)
|
||||
endc
|
||||
endc
|
||||
jr nz, .DontReturn
|
||||
|
||||
ld a, [wCurPartyMon]
|
||||
ld hl, wPartyMon1ID
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
|
|
@ -124,6 +107,26 @@ ReturnShuckie:
|
|||
.done
|
||||
farcall CheckCurPartyMonFainted
|
||||
jr c, .fainted
|
||||
ld a, [wCurPartySpecies]
|
||||
call GetPokemonIndexFromID
|
||||
ld a, l
|
||||
sub LOW(POCKLE)
|
||||
if HIGH(POCKLE) == 0
|
||||
or h
|
||||
else
|
||||
jr nz, .notPockle
|
||||
if HIGH(POCKLE) == 1
|
||||
dec h
|
||||
else
|
||||
ld a, h
|
||||
cp HIGH(POCKLE)
|
||||
endc
|
||||
endc
|
||||
jr nz, .notPockle
|
||||
ld a, SHUCKIE_EVOLVED
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
.notPockle:
|
||||
ld a, [wCurPartyMon]
|
||||
ld hl, wPartyMon1Happiness
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
|
|
@ -132,10 +135,7 @@ ReturnShuckie:
|
|||
cp 150
|
||||
ld a, SHUCKIE_HAPPY
|
||||
jr nc, .HappyToStayWithYou
|
||||
xor a ; REMOVE_PARTY
|
||||
ld [wPokemonWithdrawDepositParameter], a
|
||||
callfar RemoveMonFromPartyOrBox
|
||||
ld a, SHUCKIE_RETURNED
|
||||
ld a, SHUCKIE_OKAY
|
||||
.HappyToStayWithYou:
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ ItemEffects:
|
|||
dw GorgeousBoxEffect ; GORGEOUS_BOX
|
||||
dw EvoStoneEffect ; SUN_STONE
|
||||
dw NoEffect ; POLKADOT_BOW
|
||||
dw NoEffect ; ITEM_AB
|
||||
dw EvoStoneEffect ; ANTIQUE_POT
|
||||
dw NoEffect ; UP_GRADE
|
||||
dw RestoreHPEffect ; BERRY
|
||||
dw RestoreHPEffect ; GOLD_BERRY
|
||||
|
|
|
|||
|
|
@ -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
BIN
gfx/footprints/pockle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 B |
|
|
@ -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"
|
||||
|
|
@ -262,6 +262,7 @@ AnimationPointers:
|
|||
dw QwilfishAnimation
|
||||
dw ScizorAnimation
|
||||
dw ShuckleAnimation
|
||||
dw PockleAnimation
|
||||
dw HeracrossAnimation
|
||||
dw SneaselAnimation
|
||||
dw TeddiursaAnimation
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ BitmasksPointers:
|
|||
dw QwilfishBitmasks
|
||||
dw ScizorBitmasks
|
||||
dw ShuckleBitmasks
|
||||
dw PockleBitmasks
|
||||
dw HeracrossBitmasks
|
||||
dw SneaselBitmasks
|
||||
dw TeddiursaBitmasks
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ FramesPointers:
|
|||
dba QwilfishFrames
|
||||
dba ScizorFrames
|
||||
dba ShuckleFrames
|
||||
dba PockleFrames
|
||||
dba HeracrossFrames
|
||||
dba SneaselFrames
|
||||
dba TeddiursaFrames
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ AnimationIdlePointers:
|
|||
dw QwilfishAnimationIdle
|
||||
dw ScizorAnimationIdle
|
||||
dw ShuckleAnimationIdle
|
||||
dw PockleAnimationIdle
|
||||
dw HeracrossAnimationIdle
|
||||
dw SneaselAnimationIdle
|
||||
dw TeddiursaAnimationIdle
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
1
gfx/pokemon/pockle/anim.asm
Normal file
1
gfx/pokemon/pockle/anim.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
1
gfx/pokemon/pockle/anim_idle.asm
Normal file
1
gfx/pokemon/pockle/anim_idle.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
BIN
gfx/pokemon/pockle/back.png
Normal file
BIN
gfx/pokemon/pockle/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 342 B |
BIN
gfx/pokemon/pockle/front.png
Normal file
BIN
gfx/pokemon/pockle/front.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 569 B |
4
gfx/pokemon/pockle/shiny.pal
Normal file
4
gfx/pokemon/pockle/shiny.pal
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
|
||||
RGB 31, 22, 05
|
||||
RGB 15, 07, 31
|
||||
|
||||
|
|
@ -55,13 +55,12 @@ ManiaScript:
|
|||
special ReturnShuckie
|
||||
ifequal SHUCKIE_WRONG_MON, .wrong
|
||||
ifequal SHUCKIE_REFUSED, .refused
|
||||
ifequal SHUCKIE_HAPPY, .superhappy
|
||||
ifequal SHUCKIE_FAINTED, .default_postevent
|
||||
; SHUCKIE_RETURNED
|
||||
ifequal SHUCKIE_EVOLVED, .evolved
|
||||
ifequal SHUCKIE_HAPPY, .superhappy
|
||||
writetext ManiaText_ThankYou
|
||||
waitbutton
|
||||
closetext
|
||||
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
|
||||
end
|
||||
|
||||
.wrong
|
||||
|
|
@ -72,9 +71,12 @@ ManiaScript:
|
|||
|
||||
.superhappy
|
||||
writetext ManiaText_ShuckleLikesYou
|
||||
waitbutton
|
||||
closetext
|
||||
promptbutton
|
||||
verbosegiveitem ANTIQUE_POT
|
||||
iffalse .NoRoom1
|
||||
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
|
||||
.NoRoom1:
|
||||
closetext
|
||||
end
|
||||
|
||||
.refused
|
||||
|
|
@ -83,9 +85,13 @@ ManiaScript:
|
|||
closetext
|
||||
end
|
||||
|
||||
.nothingleft ; unreferenced
|
||||
writetext ManiaText_ShuckleIsYourLastMon
|
||||
waitbutton
|
||||
.evolved
|
||||
writetext ManiaText_Pockle
|
||||
promptbutton
|
||||
verbosegiveitem ANTIQUE_POT
|
||||
iffalse .NoRoom2
|
||||
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
|
||||
.NoRoom2:
|
||||
closetext
|
||||
end
|
||||
|
||||
|
|
@ -99,13 +105,12 @@ ManiasHouseUnusedBookshelf: ; unreferenced
|
|||
jumpstd PictureBookshelfScript
|
||||
|
||||
ManiaText_AskLookAfterShuckle:
|
||||
text "I, I'm in shock!"
|
||||
text "I-I'm in shock!"
|
||||
|
||||
para "A guy about your"
|
||||
line "age with piercing"
|
||||
|
||||
para "eyes and long hair"
|
||||
line "came in."
|
||||
cont "eyes and long hair"
|
||||
cont "came in."
|
||||
|
||||
para "He scared me into"
|
||||
line "giving him my"
|
||||
|
|
@ -117,9 +122,8 @@ ManiaText_AskLookAfterShuckle:
|
|||
|
||||
para "You look strong."
|
||||
line "Could you look"
|
||||
|
||||
para "after my #MON"
|
||||
line "for a while?"
|
||||
cont "after my #MON"
|
||||
cont "for a while?"
|
||||
done
|
||||
|
||||
ManiaText_TakeCareOfShuckle:
|
||||
|
|
@ -131,7 +135,7 @@ ManiaText_TakeCareOfShuckle:
|
|||
|
||||
ManiaText_GotShuckle:
|
||||
text "<PLAYER> received a"
|
||||
line "#MON."
|
||||
line "SHUCKLE."
|
||||
done
|
||||
|
||||
ManiaText_PartyFull:
|
||||
|
|
@ -146,55 +150,67 @@ ManiaText_IfHeComesBack:
|
|||
done
|
||||
|
||||
ManiaText_CanIHaveMyMonBack:
|
||||
text "Hi! How's my #-"
|
||||
line "MON?"
|
||||
text "Hi! How's my"
|
||||
line "SHUCKIE?"
|
||||
|
||||
para "I think I'm safe"
|
||||
line "now, so may I have"
|
||||
cont "it back?"
|
||||
para "If you have them"
|
||||
line "with you, may I"
|
||||
cont "see them?"
|
||||
done
|
||||
|
||||
ManiaText_ThankYou:
|
||||
text "Thank you!"
|
||||
text "SHUCKIE seems to"
|
||||
line "want to spend a"
|
||||
cont "little more time"
|
||||
cont "with you."
|
||||
done
|
||||
|
||||
ManiaText_ShuckleNotThere:
|
||||
text "Hey, you don't"
|
||||
line "have my #MON"
|
||||
cont "with you."
|
||||
line "have SHUCKIE with"
|
||||
cont "you."
|
||||
done
|
||||
|
||||
ManiaText_ShuckleLikesYou:
|
||||
text "My #MON has"
|
||||
line "come to like you."
|
||||
text "Looks like SHUCKIE"
|
||||
line "really likes you!"
|
||||
|
||||
para "All right, you"
|
||||
line "should keep it."
|
||||
|
||||
para "But promise to"
|
||||
line "be good to it!"
|
||||
para "If you're going"
|
||||
line "to keep SHUCKIE,"
|
||||
cont "you can have this"
|
||||
cont "too!"
|
||||
done
|
||||
|
||||
ManiaText_SameAsBeingRobbed:
|
||||
text "Oh, no, no… That's"
|
||||
line "the same as being"
|
||||
cont "robbed."
|
||||
text "Come back with"
|
||||
line "SHUCKIE sometime!"
|
||||
done
|
||||
|
||||
ManiaText_HappinessSpeech:
|
||||
text "For #MON, hap-"
|
||||
line "piness is being"
|
||||
text "SHUCKIE loves that"
|
||||
line "ANTIQUE POT, so"
|
||||
cont "I'm sure it'll"
|
||||
cont "appreciate you"
|
||||
cont "keeping it safe."
|
||||
|
||||
para "with a person who"
|
||||
line "treats them well."
|
||||
para "Promise to be good"
|
||||
line "to SHUCKIE, won't"
|
||||
cont "you?"
|
||||
done
|
||||
|
||||
ManiaText_ShuckleIsYourLastMon:
|
||||
text "If I take my #-"
|
||||
line "MON back, what are"
|
||||
ManiaText_Pockle:
|
||||
text "Wow, you made"
|
||||
line "SHUCKIE evolve?"
|
||||
|
||||
para "you going to use"
|
||||
line "in battle?"
|
||||
para "That's excellent!"
|
||||
line "They look really"
|
||||
cont "pleased now, too."
|
||||
|
||||
para "There's not much"
|
||||
line "point in taking"
|
||||
cont "this now that you"
|
||||
cont "evolved SHUCKIE,"
|
||||
cont "but have this!"
|
||||
done
|
||||
|
||||
ManiasHouse_MapEvents:
|
||||
|
|
|
|||
Loading…
Reference in a new issue