Honey Pot & Grandma

Ported from Pokemon October.
8114fead91
1a6f3e4f03
d00cd6fafd

Alterations have been made in that the treemonset has been diversified a bit further, having Munchlax like in DPP. They're L60, intended to be used in Nihon.

I haven't placed the grandma in the region yet, intending for her to be in Old City.
This commit is contained in:
Llinos Evans 2024-07-21 23:00:43 +01:00
parent 02233c5429
commit bcfafaaf83
21 changed files with 331 additions and 303 deletions

View file

@ -23,7 +23,7 @@ EngineFlags:
engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F
engine_flag wMomSavingMoney, MOM_ACTIVE_F
engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
engine_flag wSweetHoneyEnabled, SWEET_HONEY_F ; unused, possibly related to a 2-day timer
engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F
engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F

View file

@ -79,7 +79,7 @@ SpecialsPointers::
add_special FindPartyMonAtLeastThatHappy ; unused
add_special FindPartyMonThatSpecies
add_special FindPartyMonThatSpeciesYourTrainerID
add_special UnusedCheckUnusedTwoDayTimer ; unused
add_special CheckSweetHoneyTimer ; unused
add_special DayCareMon1
add_special DayCareMon2
add_special SelectRandomBugContestContestants

View file

@ -206,8 +206,8 @@ ItemAttributes:
item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLK_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_64
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; HONEY_POT, was ITEM_64
item_attribute 20000, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; PNK_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLACKGLASSES

View file

@ -4,10 +4,10 @@
TimeCapsule_CatchRateItems:
db FAIRY_FEATHER, LEFTOVERS
db ITEM_2D, BITTER_BERRY
db ITEM_32, GOLD_BERRY
db ITEM_5A, BERRY
db ITEM_64, BERRY
db BERRY, BITTER_BERRY
db BERRY, GOLD_BERRY
db BERRY, BERRY
db BERRY, BERRY
db ITEM_78, BERRY
db HEART_STONE, BERRY
db OLD_AMBER, BERRY

View file

@ -100,7 +100,7 @@ ItemDescriptions:
dw WhtApricornDesc
dw BlackbeltDesc
dw BlkApricornDesc
dw QuestionMarkDesc
dw HoneyPotDesc
dw PnkApricornDesc
dw BlackGlassesDesc
dw SlowpokeTailDesc
@ -975,3 +975,7 @@ PeatBlockDesc:
ClubFossilDesc:
db "The club of an"
next "ancient #MON.@"
HoneyPotDesc:
db "A pot for storing"
next "SWEET HONEY.@"

View file

@ -99,7 +99,7 @@ ItemNames::
li "WHT APRICORN"
li "BLACKBELT"
li "BLK APRICORN"
li "TERU-SAMA"
li "HONEY POT"
li "PNK APRICORN"
li "BLACKGLASSES"
li "SLOWPOKETAIL"

View file

@ -14,8 +14,8 @@ TreeMons:
dw TreeMonSet_Rock_Ice
dw TreeMonSet_Rock_Square
dw TreeMonSet_Rock_Well
dw TreeMonSet_Sweet_Honey
assert_table_length NUM_TREEMON_SETS
dw TreeMonSet_City ; unused
; Two tables each (common, rare).
; Structure:
@ -180,3 +180,10 @@ TreeMonSet_Rock_Well:
dbbw 70, 15, KRABBY
dbbw 30, 15, SHELLDER
db -1
TreeMonSet_Sweet_Honey:
dbbw 25, 60, HERACROSS
dbbw 25, 60, URSARING
dbbw 25, 60, BEEDRILL
dbbw 25, 60, MUNCHLAX
db -1