From a96cf3c0b8025c3a21a21774964b75d2e41e00fd Mon Sep 17 00:00:00 2001 From: dionmoustos Date: Tue, 2 Jun 2026 18:09:49 +0930 Subject: [PATCH] more --- .../scripts.inc | 36 +++++++++-- .../scripts.inc | 52 +++++++++++++++- .../scripts.inc | 62 ++++++++++++++++--- 3 files changed, 134 insertions(+), 16 deletions(-) diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index ae2525df0..7f2c813dd 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -26,15 +26,41 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: .align 2 CeladonCity_DepartmentStore_2F_Items:: + .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_REVIVE + .2byte ITEM_POKE_BALL + .2byte ITEM_NET_BALL + .2byte ITEM_DIVE_BALL + .2byte ITEM_NEST_BALL + .2byte ITEM_REPEAT_BALL + .2byte ITEM_TIMER_BALL + .2byte ITEM_LUXURY_BALL + .2byte ITEM_PREMIER_BALL + .2byte ITEM_SUPER_REPEL + .2byte ITEM_MAX_REPEL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_POTION .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING .2byte ITEM_BURN_HEAL .2byte ITEM_ICE_HEAL - .2byte ITEM_SUPER_REPEL + .2byte ITEM_AWAKENING + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_FRESH_WATER + .2byte ITEM_SODA_POP + .2byte ITEM_LEMONADE + .2byte ITEM_MOOMOO_MILK + .2byte ITEM_ENERGY_POWDER + .2byte ITEM_ENERGY_ROOT + .2byte ITEM_HEAL_POWDER + .2byte ITEM_REVIVAL_HERB + .2byte ITEM_LAVA_COOKIE .2byte ITEM_NONE release end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 98069ca2e..4c518e82e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -26,12 +26,60 @@ CeladonCity_DepartmentStore_4F_EventScript_Clerk:: .align 2 CeladonCity_DepartmentStore_4F_Items:: - .2byte ITEM_POKE_DOLL - .2byte ITEM_RETRO_MAIL + .2byte ITEM_SUN_STONE + .2byte ITEM_MOON_STONE .2byte ITEM_FIRE_STONE .2byte ITEM_THUNDER_STONE .2byte ITEM_WATER_STONE .2byte ITEM_LEAF_STONE + .2byte ITEM_DEEP_SEA_TOOTH + .2byte ITEM_DEEP_SEA_SCALE + .2byte ITEM_METAL_COAT + .2byte ITEM_DRAGON_SCALE + .2byte ITEM_DRAGON_FANG + .2byte ITEM_UP_GRADE + .2byte ITEM_POKE_DOLL + .2byte ITEM_FLUFFY_TAIL + .2byte ITEM_BRIGHT_POWDER + .2byte ITEM_WHITE_HERB + .2byte ITEM_MACHO_BRACE + .2byte ITEM_EXP_SHARE + .2byte ITEM_QUICK_CLAW + .2byte ITEM_SOOTHE_BELL + .2byte ITEM_MENTAL_HERB + .2byte ITEM_CHOICE_BAND + .2byte ITEM_KINGS_ROCK + .2byte ITEM_SILVER_POWDER + .2byte ITEM_AMULET_COIN + .2byte ITEM_CLEANSE_TAG + .2byte ITEM_SMOKE_BALL + .2byte ITEM_EVERSTONE + .2byte ITEM_FOCUS_BAND + .2byte ITEM_LUCKY_EGG + .2byte ITEM_SCOPE_LENS + .2byte ITEM_LEFTOVERS + .2byte ITEM_LIGHT_BALL + .2byte ITEM_SOFT_SAND + .2byte ITEM_HARD_STONE + .2byte ITEM_MIRACLE_SEED + .2byte ITEM_BLACK_GLASSES + .2byte ITEM_BLACK_BELT + .2byte ITEM_MAGNET + .2byte ITEM_MYSTIC_WATER + .2byte ITEM_SHARP_BEAK + .2byte ITEM_POISON_BARB + .2byte ITEM_NEVER_MELT_ICE + .2byte ITEM_SPELL_TAG + .2byte ITEM_TWISTED_SPOON + .2byte ITEM_CHARCOAL + .2byte ITEM_SILK_SCARF + .2byte ITEM_SHELL_BELL + .2byte ITEM_SEA_INCENSE + .2byte ITEM_LAX_INCENSE + .2byte ITEM_LUCKY_PUNCH + .2byte ITEM_METAL_POWDER + .2byte ITEM_THICK_CLUB + .2byte ITEM_STICK .2byte ITEM_NONE release end diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 8625e2244..feaa19492 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -26,13 +26,20 @@ CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: .align 2 CeladonCity_DepartmentStore_5F_XItems:: + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CARBOS + .2byte ITEM_CALCIUM + .2byte ITEM_RARE_CANDY + .2byte ITEM_ZINC + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED - .2byte ITEM_X_SPECIAL .2byte ITEM_X_ACCURACY - .2byte ITEM_GUARD_SPEC - .2byte ITEM_DIRE_HIT + .2byte ITEM_X_SPECIAL .2byte ITEM_NONE release end @@ -50,12 +57,49 @@ CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: .align 2 CeladonCity_DepartmentStore_5F_Vitamins:: - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_CALCIUM - .2byte ITEM_ZINC - .2byte ITEM_CARBOS + .2byte ITEM_CHERI_BERRY + .2byte ITEM_CHESTO_BERRY + .2byte ITEM_PECHA_BERRY + .2byte ITEM_RAWST_BERRY + .2byte ITEM_ASPEAR_BERRY + .2byte ITEM_LEPPA_BERRY + .2byte ITEM_ORAN_BERRY + .2byte ITEM_PERSIM_BERRY + .2byte ITEM_LUM_BERRY + .2byte ITEM_SITRUS_BERRY + .2byte ITEM_FIGY_BERRY + .2byte ITEM_WIKI_BERRY + .2byte ITEM_MAGO_BERRY + .2byte ITEM_AGUAV_BERRY + .2byte ITEM_IAPAPA_BERRY + .2byte ITEM_RAZZ_BERRY + .2byte ITEM_BLUK_BERRY + .2byte ITEM_NANAB_BERRY + .2byte ITEM_WEPEAR_BERRY + .2byte ITEM_PINAP_BERRY + .2byte ITEM_POMEG_BERRY + .2byte ITEM_KELPSY_BERRY + .2byte ITEM_QUALOT_BERRY + .2byte ITEM_HONDEW_BERRY + .2byte ITEM_GREPA_BERRY + .2byte ITEM_TAMATO_BERRY + .2byte ITEM_CORNN_BERRY + .2byte ITEM_MAGOST_BERRY + .2byte ITEM_RABUTA_BERRY + .2byte ITEM_NOMEL_BERRY + .2byte ITEM_SPELON_BERRY + .2byte ITEM_PAMTRE_BERRY + .2byte ITEM_WATMEL_BERRY + .2byte ITEM_DURIN_BERRY + .2byte ITEM_BELUE_BERRY + .2byte ITEM_LIECHI_BERRY + .2byte ITEM_GANLON_BERRY + .2byte ITEM_SALAC_BERRY + .2byte ITEM_PETAYA_BERRY + .2byte ITEM_APICOT_BERRY + .2byte ITEM_LANSAT_BERRY + .2byte ITEM_STARF_BERRY + .2byte ITEM_ENIGMA_BERRY .2byte ITEM_NONE release end