From adb9e3c54038a8823d9d4fd775e782e09476d0a2 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Mar 2024 00:26:25 +0000 Subject: [PATCH] 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. --- constants/item_constants.asm | 2 +- constants/pokemon_constants.asm | 1 + constants/script_constants.asm | 5 +- data/items/attributes.asm | 4 +- data/items/descriptions.asm | 6 +- data/items/names.asm | 2 +- data/pokemon/base_stats.asm | 1 + data/pokemon/base_stats/pockle.asm | 21 ++++++ data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/pockle.asm | 10 +++ data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_johto.asm | 1 + data/pokemon/evos_attacks_johto.asm | 13 ++++ data/pokemon/first_stages.asm | 1 + data/pokemon/gen1_order.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 + data/pokemon/pic_pointers.asm | 2 + engine/events/shuckle.asm | 52 +++++++------- engine/items/item_effects.asm | 2 +- gfx/footprints.asm | 1 + gfx/footprints/pockle.png | Bin 0 -> 69 bytes gfx/pics.asm | 5 +- gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/johto_frames.asm | 1 + gfx/pokemon/pockle/anim.asm | 1 + gfx/pokemon/pockle/anim_idle.asm | 1 + gfx/pokemon/pockle/back.png | Bin 0 -> 342 bytes gfx/pokemon/pockle/front.png | Bin 0 -> 569 bytes gfx/pokemon/pockle/shiny.pal | 4 ++ maps/ManiasHouse.asm | 102 ++++++++++++++++------------ 41 files changed, 177 insertions(+), 78 deletions(-) create mode 100644 data/pokemon/base_stats/pockle.asm create mode 100644 data/pokemon/dex_entries/pockle.asm create mode 100644 gfx/footprints/pockle.png create mode 100644 gfx/pokemon/pockle/anim.asm create mode 100644 gfx/pokemon/pockle/anim_idle.asm create mode 100644 gfx/pokemon/pockle/back.png create mode 100644 gfx/pokemon/pockle/front.png create mode 100644 gfx/pokemon/pockle/shiny.pal diff --git a/constants/item_constants.asm b/constants/item_constants.asm index eaf6b2c..fa5bd7f 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -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 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index b5a371e..ea91c2d 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -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 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 35a776c..d931e45 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -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 diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 0a8d04f..60cbcdc 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -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 diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index bff76ec..2e8e272 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -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" diff --git a/data/items/names.asm b/data/items/names.asm index 344dd66..a3914cf 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -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" diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 253cfd1..2757cd7 100644 --- a/data/pokemon/base_stats.asm +++ b/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" diff --git a/data/pokemon/base_stats/pockle.asm b/data/pokemon/base_stats/pockle.asm new file mode 100644 index 0000000..7aa39d1 --- /dev/null +++ b/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 diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index a29a9bc..96af751 100644 --- a/data/pokemon/cries.asm +++ b/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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index f285ed9..646c76d 100644 --- a/data/pokemon/dex_entries.asm +++ b/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" diff --git a/data/pokemon/dex_entries/pockle.asm b/data/pokemon/dex_entries/pockle.asm new file mode 100644 index 0000000..f155de1 --- /dev/null +++ b/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.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index f3ac113..c40ebc6 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/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 diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 02ccf19..9d36d6e 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/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 diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 3755da2..1f322df 100644 --- a/data/pokemon/dex_order_new.asm +++ b/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 diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 272f226..1f007af 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/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 diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index e1ca395..1119262 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/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 diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 5a9370c..065370a 100644 --- a/data/pokemon/first_stages.asm +++ b/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 diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index abfe0ed..dcf2eab 100644 --- a/data/pokemon/gen1_order.asm +++ b/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 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index f93bfe7..3b8dbbf 100644 --- a/data/pokemon/menu_icons.asm +++ b/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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index dee0530..e0cd242 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -266,6 +266,7 @@ PokemonNames:: db "QWILFISH@@" db "SCIZOR@@@@" db "SHUCKLE@@@" + db "POCKLE@@@@" db "HERACROSS@" db "SNEASEL@@@" db "TEDDIURSA@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 65f78b1..5f5a848 100644 --- a/data/pokemon/palettes.asm +++ b/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 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index edee3ed..a5671fc 100644 --- a/data/pokemon/pic_pointers.asm +++ b/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 diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 1f12cfb..4511f88 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e61e24e..e0b8e7c 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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 diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 6cba692..9eb552d 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -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" diff --git a/gfx/footprints/pockle.png b/gfx/footprints/pockle.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index cb8f91a..976de60 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -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" \ No newline at end of file +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" \ No newline at end of file diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index f9daa1d..c23e226 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -262,6 +262,7 @@ AnimationPointers: dw QwilfishAnimation dw ScizorAnimation dw ShuckleAnimation + dw PockleAnimation dw HeracrossAnimation dw SneaselAnimation dw TeddiursaAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index f958a23..afa34e7 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -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" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 1e446a7..6993a4c 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -262,6 +262,7 @@ BitmasksPointers: dw QwilfishBitmasks dw ScizorBitmasks dw ShuckleBitmasks + dw PockleBitmasks dw HeracrossBitmasks dw SneaselBitmasks dw TeddiursaBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 1985bba..30ed30b 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -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" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 2f0d128..ce715ba 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -262,6 +262,7 @@ FramesPointers: dba QwilfishFrames dba ScizorFrames dba ShuckleFrames + dba PockleFrames dba HeracrossFrames dba SneaselFrames dba TeddiursaFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 5ec1e7b..53e5766 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -262,6 +262,7 @@ AnimationIdlePointers: dw QwilfishAnimationIdle dw ScizorAnimationIdle dw ShuckleAnimationIdle + dw PockleAnimationIdle dw HeracrossAnimationIdle dw SneaselAnimationIdle dw TeddiursaAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index ad9eaa5..8f6809e 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -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" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 223e63e..0c8bc7b 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.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" diff --git a/gfx/pokemon/pockle/anim.asm b/gfx/pokemon/pockle/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pockle/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pockle/anim_idle.asm b/gfx/pokemon/pockle/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pockle/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pockle/back.png b/gfx/pokemon/pockle/back.png new file mode 100644 index 0000000000000000000000000000000000000000..9e38480d77114a8f68ad1a5f57cd5aafa238e0a4 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK$5xtL9oo3828vx{Gx{ zilrpTFBl}AtKn7&*rMv1SDx7vq`#|39C^!4ct=ksaR4{ncW+O^eHu ze0!r%waXjk{8a2H_+)c+aV4YjugMJ8SXh4+{S*oiv3+o$%cIMUKbEnpyYOX#`+wGk zO{@if#iMqznYl$TeQ>V3-Ja>-_$6=M?h~>1e=iVIU|lv>Zc_2<^!e9T?N}w`KDA%f kBF$l1#3|WJ>!viaTU#){{a*1y6Bqytp00i_>zopr09j9yga7~l literal 0 HcmV?d00001 diff --git a/gfx/pokemon/pockle/front.png b/gfx/pokemon/pockle/front.png new file mode 100644 index 0000000000000000000000000000000000000000..a001d448cebaec64b61d125afab7fd1bfde035b9 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD;nSONz)Cw0}0g4ipkE zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|AAnu<`geOkU}EBgh{#}Co(2^ySp%Su*!M>*|DB3jv*Cu za;My8JgmUsx=}};$mIS<1_1&u{(F0iJvwlcA{P8Z&4>cZ)K&EWE_j%R1XTsL&s3OA*G zTGr}rt~BuycZY&$>f}?^nWnw=FE9GOD&u3Az3(RTjHl`v`?NzXkHxHLo>RUcce&&t z>ks8D@4dKQ8GDAG(oNz%D8cSg>K(KqaQEDbQhkO$ zEaE%9%;%C;cy0J<^8LnLcNhh3%w#M1!+z$Qq16n_8!28ZUb2OSid~tzaqC3BJ8u@3 zG32@lrk%CY;j3biG?;zuPur{Qk9(I$YZsO0Enl%^ueP|?gk3+5Pt3R0n4F^cJ7Ah* zh~X2@5Ve}GZ?~0}CBIPe64u(b@5E`VzR9ygB`SAoZdkueE57gEJF%7d;wKy!>>X?Z UTw?yt_za31Pgg&ebxsLQ0EoWM 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: