diff options
Diffstat (limited to 'data/items')
| -rw-r--r-- | data/items/apricorn_balls.asm | 11 | ||||
| -rw-r--r-- | data/items/attributes.asm | 310 | ||||
| -rw-r--r-- | data/items/catch_rate_items.asm | 19 | ||||
| -rw-r--r-- | data/items/descriptions.asm | 33 | ||||
| -rw-r--r-- | data/items/heal_hp.asm | 18 | ||||
| -rw-r--r-- | data/items/heal_status.asm | 18 | ||||
| -rw-r--r-- | data/items/marts.asm | 71 | ||||
| -rw-r--r-- | data/items/mystery_gift_items.asm | 40 | ||||
| -rw-r--r-- | data/items/x_stats.asm | 7 |
9 files changed, 304 insertions, 223 deletions
diff --git a/data/items/apricorn_balls.asm b/data/items/apricorn_balls.asm new file mode 100644 index 000000000..57e7d04bb --- /dev/null +++ b/data/items/apricorn_balls.asm @@ -0,0 +1,11 @@ +ApricornBalls: ; 24ca0 + ; apricorn, ball + db RED_APRICORN, LEVEL_BALL + db BLU_APRICORN, LURE_BALL + db YLW_APRICORN, MOON_BALL + db GRN_APRICORN, FRIEND_BALL + db WHT_APRICORN, FAST_BALL + db BLK_APRICORN, HEAVY_BALL + db PNK_APRICORN, LOVE_BALL + db -1 +; 24caf diff --git a/data/items/attributes.asm b/data/items/attributes.asm index dc2842760..5212be6d2 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -7,57 +7,57 @@ ENDM ItemAttributes: ; 67c1 ; entries correspond to constants/item_constants.asm -; MASTER BALL +; MASTER_BALL item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; ULTRA BALL +; ULTRA_BALL item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; BRIGHTPOWDER item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; GREAT BALL +; GREAT_BALL item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; # BALL +; POKE_BALL item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; TERU-SAMA +; TOWN_MAP item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BICYCLE item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; MOON STONE +; MOON_STONE item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ANTIDOTE item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; BURN HEAL +; BURN_HEAL item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; ICE HEAL +; ICE_HEAL item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; AWAKENING item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; PARLYZ HEAL +; PARLYZ_HEAL item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; FULL RESTORE +; FULL_RESTORE item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; MAX POTION +; MAX_POTION item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; HYPER POTION +; HYPER_POTION item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; SUPER POTION +; SUPER_POTION item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; POTION item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; ESCAPE ROPE +; ESCAPE_ROPE item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; REPEL item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; MAX ELIXER +; MAX_ELIXER item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; FIRE STONE +; FIRE_STONE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; THUNDERSTONE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; WATER STONE +; WATER_STONE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_19 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; HP UP +; HP_UP item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; PROTEIN item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE @@ -65,159 +65,159 @@ ItemAttributes: ; 67c1 item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; CARBOS item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; LUCKY PUNCH +; LUCKY_PUNCH item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CALCIUM item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; RARE CANDY +; RARE_CANDY item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; X ACCURACY +; X_ACCURACY item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; LEAF STONE +; LEAF_STONE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; METAL POWDER +; METAL_POWDER item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; NUGGET item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; # DOLL +; POKE_DOLL item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; FULL HEAL +; FULL_HEAL item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; REVIVE item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; MAX REVIVE +; MAX_REVIVE item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; GUARD SPEC. +; GUARD_SPEC item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; SUPER REPEL +; SUPER_REPEL item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; MAX REPEL +; MAX_REPEL item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; DIRE HIT +; DIRE_HIT item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; TERU-SAMA +; ITEM_2D item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; FRESH WATER +; FRESH_WATER item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; SODA POP +; SODA_POP item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; LEMONADE item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; X ATTACK +; X_ATTACK item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; TERU-SAMA +; ITEM_32 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; X DEFEND +; X_DEFEND item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; X SPEED +; X_SPEED item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; X SPECIAL +; X_SPECIAL item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; COIN CASE +; COIN_CASE item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; ITEMFINDER item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; TERU-SAMA +; POKE_FLUTE item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; EXP.SHARE +; EXP_SHARE item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; OLD ROD +; OLD_ROD item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; GOOD ROD +; GOOD_ROD item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; SILVER LEAF +; SILVER_LEAF item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SUPER ROD +; SUPER_ROD item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; PP UP +; PP_UP item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ETHER item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; MAX ETHER +; MAX_ETHER item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ELIXER item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; RED SCALE +; RED_SCALE item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SECRETPOTION item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; S.S.TICKET +; S_S_TICKET item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MYSTERY EGG +; MYSTERY_EGG item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; CLEAR BELL +; CLEAR_BELL item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SILVER WING +; SILVER_WING item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MOOMOO MILK +; MOOMOO_MILK item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; QUICK CLAW +; QUICK_CLAW item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PSNCUREBERRY item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; GOLD LEAF +; GOLD_LEAF item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SOFT SAND +; SOFT_SAND item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SHARP BEAK +; SHARP_BEAK item_attribute 100, HELD_FLYING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PRZCUREBERRY item_attribute 10, HELD_HEAL_PARALYZE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; BURNT BERRY +; BURNT_BERRY item_attribute 10, HELD_HEAL_FREEZE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; ICE BERRY +; ICE_BERRY item_attribute 10, HELD_HEAL_BURN, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; POISON BARB +; POISON_BARB item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; KING'S ROCK +; KINGS_ROCK item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BITTER BERRY +; BITTER_BERRY item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY -; MINT BERRY +; MINT_BERRY item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; RED APRICORN +; RED_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TINYMUSHROOM item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BIG MUSHROOM +; BIG_MUSHROOM item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SILVERPOWDER item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLU APRICORN +; BLU_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_5A item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; AMULET COIN +; AMULET_COIN item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; YLW APRICORN +; YLW_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; GRN APRICORN +; GRN_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; CLEANSE TAG +; CLEANSE_TAG item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MYSTIC WATER +; MYSTIC_WATER item_attribute 100, HELD_WATER_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TWISTEDSPOON item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; WHT APRICORN +; WHT_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKBELT item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLK APRICORN +; BLK_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_64 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; PNK APRICORN +; PNK_APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKGLASSES item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SLOWPOKETAIL item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; PINK BOW +; PINK_BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STICK item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SMOKE BALL +; SMOKE_BALL item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; NEVERMELTICE item_attribute 100, HELD_ICE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE @@ -227,165 +227,165 @@ ItemAttributes: ; 67c1 item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; PEARL item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BIG PEARL +; BIG_PEARL item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EVERSTONE item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SPELL TAG +; SPELL_TAG item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; RAGECANDYBAR item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; GS BALL +; GS_BALL item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLUE CARD +; BLUE_CARD item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; MIRACLE SEED +; MIRACLE_SEED item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; THICK CLUB +; THICK_CLUB item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; FOCUS BAND +; FOCUS_BAND item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_78 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ENERGYPOWDER item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; ENERGY ROOT +; ENERGY_ROOT item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; HEAL POWDER +; HEAL_POWDER item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; REVIVAL HERB +; REVIVAL_HERB item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; HARD STONE +; HARD_STONE item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; LUCKY EGG +; LUCKY_EGG item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; CARD KEY +; CARD_KEY item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; MACHINE PART +; MACHINE_PART item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; EGG TICKET +; EGG_TICKET item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; LOST ITEM +; LOST_ITEM item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STARDUST item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STAR PIECE item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BASEMENT KEY +; BASEMENT_KEY item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; PASS item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_87 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_88 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_89 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CHARCOAL item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BERRY JUICE +; BERRY_JUICE item_attribute 100, HELD_BERRY, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; SCOPE LENS +; SCOPE_LENS item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_8D item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_8E item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; METAL COAT +; METAL_COAT item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; DRAGON FANG +; DRAGON_FANG item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_91 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LEFTOVERS item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_93 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_94 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_95 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTERYBERRY item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; DRAGON SCALE +; DRAGON_SCALE item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BERSERK GENE +; BERSERK_GENE item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_99 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_9A item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_9B item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SACRED ASH +; SACRED_ASH item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; HEAVY BALL +; HEAVY_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; FLOWER MAIL +; FLOWER_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; LEVEL BALL +; LEVEL_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; LURE BALL +; LURE_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; FAST BALL +; FAST_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; TERU-SAMA +; ITEM_A2 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; LIGHT BALL +; LIGHT_BALL item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; FRIEND BALL +; FRIEND_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; MOON BALL +; MOON_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; LOVE BALL +; LOVE_BALL item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; NORMAL BOX +; NORMAL_BOX item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; GORGEOUS BOX +; GORGEOUS_BOX item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE -; SUN STONE +; SUN_STONE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; POLKADOT BOW +; POLKADOT_BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_AB item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; UP-GRADE +; UP_GRADE item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERRY item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY -; GOLD BERRY +; GOLD_BERRY item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SQUIRTBOTTLE item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_B0 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; PARK BALL +; PARK_BALL item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE -; RAINBOW WING +; RAINBOW_WING item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_B3 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BRICK PIECE +; BRICK_PIECE item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; SURF MAIL +; SURF_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LITEBLUEMAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PORTRAITMAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; LOVELY MAIL +; LOVELY_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; EON MAIL +; EON_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MORPH MAIL +; MORPH_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLUESKY MAIL +; BLUESKY_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MUSIC MAIL +; MUSIC_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; MIRAGE MAIL +; MIRAGE_MAIL item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_BE item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM01 item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE @@ -395,7 +395,7 @@ ItemAttributes: ; 67c1 item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM04 item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_C3 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM05 item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE @@ -445,7 +445,7 @@ ItemAttributes: ; 67c1 item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM28 item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_DC item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM29 item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE @@ -505,17 +505,17 @@ ItemAttributes: ; 67c1 item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM07 item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE -; TERU-SAMA +; ITEM_FA item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; $fb item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; $fc item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; $fd item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; $fe item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; TERU-SAMA +; $ff item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; ? +; $00 item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE diff --git a/data/items/catch_rate_items.asm b/data/items/catch_rate_items.asm new file mode 100644 index 000000000..fbab7d434 --- /dev/null +++ b/data/items/catch_rate_items.asm @@ -0,0 +1,19 @@ +; Pokémon traded from RBY do not have held items, so GSC usually interprets the +; catch rate as an item. However, if the catch rate appears in this table, the +; item associated with the table entry is used instead. + +TimeCapsule_CatchRateItems: ; 28785 + db ITEM_19, LEFTOVERS + db ITEM_2D, BITTER_BERRY + db ITEM_32, GOLD_BERRY + db ITEM_5A, BERRY + db ITEM_64, BERRY + db ITEM_78, BERRY + db ITEM_87, BERRY + db ITEM_BE, BERRY + db ITEM_C3, BERRY + db ITEM_DC, BERRY + db ITEM_FA, BERRY + db -1, BERRY + db 0 ; end +; 2879e diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index e5b01e8fd..20542b9e0 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -1,36 +1,3 @@ -PrintItemDescription: ; 0x1c8955 -; Print the description for item [CurSpecies] at de. - - ld a, [CurSpecies] - cp TM01 - jr c, .not_a_tm - - ld [CurItem], a - push de - farcall GetTMHMItemMove - pop hl - ld a, [wd265] - ld [CurSpecies], a - predef PrintMoveDesc - ret - -.not_a_tm - push de - ld hl, ItemDescriptions - ld a, [CurSpecies] - dec a - ld c, a - ld b, 0 - add hl, bc - add hl, bc - ld e, [hl] - inc hl - ld d, [hl] - pop hl - jp PlaceString -; 0x1c8987 - - ItemDescriptions: dw MasterBallDesc dw UltraBallDesc diff --git a/data/items/heal_hp.asm b/data/items/heal_hp.asm new file mode 100644 index 000000000..a84670450 --- /dev/null +++ b/data/items/heal_hp.asm @@ -0,0 +1,18 @@ +HealingHPAmounts: ; f3af + dbw FRESH_WATER, 50 + dbw SODA_POP, 60 + dbw LEMONADE, 80 + dbw HYPER_POTION, 200 + dbw SUPER_POTION, 50 + dbw POTION, 20 + dbw MAX_POTION, MAX_STAT_VALUE + dbw FULL_RESTORE, MAX_STAT_VALUE + dbw MOOMOO_MILK, 100 + dbw BERRY, 10 + dbw GOLD_BERRY, 30 + dbw ENERGYPOWDER, 50 + dbw ENERGY_ROOT, 200 + dbw RAGECANDYBAR, 20 + dbw BERRY_JUICE, 20 + dbw -1, 0 ; end +; f3df diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm new file mode 100644 index 000000000..f0b0148bb --- /dev/null +++ b/data/items/heal_status.asm @@ -0,0 +1,18 @@ +StatusHealingActions: ; f071 + ; item, party menu action text, status + db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN + db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN + db ICE_HEAL, PARTYMENUTEXT_HEAL_FRZ, 1 << FRZ + db AWAKENING, PARTYMENUTEXT_HEAL_SLP, SLP + db PARLYZ_HEAL, PARTYMENUTEXT_HEAL_PAR, 1 << PAR + db FULL_HEAL, PARTYMENUTEXT_HEAL_ALL, %11111111 + db FULL_RESTORE, PARTYMENUTEXT_HEAL_ALL, %11111111 + db HEAL_POWDER, PARTYMENUTEXT_HEAL_ALL, %11111111 + db PSNCUREBERRY, PARTYMENUTEXT_HEAL_PSN, 1 << PSN + db PRZCUREBERRY, PARTYMENUTEXT_HEAL_PAR, 1 << PAR + db BURNT_BERRY, PARTYMENUTEXT_HEAL_FRZ, 1 << FRZ + db ICE_BERRY, PARTYMENUTEXT_HEAL_BRN, 1 << BRN + db MINT_BERRY, PARTYMENUTEXT_HEAL_SLP, SLP + db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111 + db -1, 0, 0 ; end +; f09e diff --git a/data/items/marts.asm b/data/items/marts.asm index cd17ca36b..fd156225d 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,4 +1,5 @@ Marts: ; 160a9 +; entries correspond to MART_* constants dw MartCherrygrove dw MartCherrygroveDex dw MartViolet @@ -43,7 +44,7 @@ MartCherrygrove: ; 160ed db ANTIDOTE db PARLYZ_HEAL db AWAKENING - db $ff + db -1 ; end ; 160f3 MartCherrygroveDex: ; 160f3 @@ -53,7 +54,7 @@ MartCherrygroveDex: ; 160f3 db ANTIDOTE db PARLYZ_HEAL db AWAKENING - db $ff + db -1 ; end ; 160fa MartViolet: ; 160fa @@ -68,7 +69,7 @@ MartViolet: ; 160fa db X_ATTACK db X_SPEED db FLOWER_MAIL - db $ff + db -1 ; end ; 16106 MartAzalea: ; 16106 @@ -82,7 +83,7 @@ MartAzalea: ; 16106 db ANTIDOTE db PARLYZ_HEAL db FLOWER_MAIL - db $ff + db -1 ; end ; 16111 MartCianwood: ; 16111 @@ -92,7 +93,7 @@ MartCianwood: ; 16111 db HYPER_POTION db FULL_HEAL db REVIVE - db $ff + db -1 ; end ; 16118 MartGoldenrod2F1: ; 16118 @@ -104,7 +105,7 @@ MartGoldenrod2F1: ; 16118 db AWAKENING db BURN_HEAL db ICE_HEAL - db $ff + db -1 ; end ; 16121 MartGoldenrod2F2: ; 16121 @@ -117,7 +118,7 @@ MartGoldenrod2F2: ; 16121 db FULL_HEAL db POKE_DOLL db FLOWER_MAIL - db $ff + db -1 ; end ; 1612b MartGoldenrod3F: ; 1612b @@ -129,7 +130,7 @@ MartGoldenrod3F: ; 1612b db DIRE_HIT db GUARD_SPEC db X_ACCURACY - db $ff + db -1 ; end ; 16134 MartGoldenrod4F: ; 16134 @@ -139,7 +140,7 @@ MartGoldenrod4F: ; 16134 db CARBOS db CALCIUM db HP_UP - db $ff + db -1 ; end ; 1613b MartGoldenrod5F1: ; 1613b @@ -147,7 +148,7 @@ MartGoldenrod5F1: ; 1613b db TM_THUNDERPUNCH db TM_FIRE_PUNCH db TM_ICE_PUNCH - db $ff + db -1 ; end ; 16140 MartGoldenrod5F2: ; 16140 @@ -156,7 +157,7 @@ MartGoldenrod5F2: ; 16140 db TM_FIRE_PUNCH db TM_ICE_PUNCH db TM_HEADBUTT - db $ff + db -1 ; end ; 16146 MartGoldenrod5F3: ; 16146 @@ -165,7 +166,7 @@ MartGoldenrod5F3: ; 16146 db TM_FIRE_PUNCH db TM_ICE_PUNCH db TM_ROCK_SMASH - db $ff + db -1 ; end ; 1614c MartGoldenrod5F4: ; 1614c @@ -175,7 +176,7 @@ MartGoldenrod5F4: ; 1614c db TM_ICE_PUNCH db TM_HEADBUTT db TM_ROCK_SMASH - db $ff + db -1 ; end ; 16153 MartOlivine: ; 16153 @@ -189,7 +190,7 @@ MartOlivine: ; 16153 db ICE_HEAL db SUPER_REPEL db SURF_MAIL - db $ff + db -1 ; end ; 1615e MartEcruteak: ; 1615e @@ -204,7 +205,7 @@ MartEcruteak: ; 1615e db BURN_HEAL db ICE_HEAL db REVIVE - db $ff + db -1 ; end ; 1616a MartMahogany1: ; 1616a @@ -213,7 +214,7 @@ MartMahogany1: ; 1616a db SLOWPOKETAIL db POKE_BALL db POTION - db $ff + db -1 ; end ; 16170 MartMahogany2: ; 16170 @@ -227,7 +228,7 @@ MartMahogany2: ; 16170 db SUPER_REPEL db REVIVE db FLOWER_MAIL - db $ff + db -1 ; end ; 1617b MartBlackthorn: ; 1617b @@ -241,7 +242,7 @@ MartBlackthorn: ; 1617b db MAX_REPEL db X_DEFEND db X_ATTACK - db $ff + db -1 ; end ; 16186 MartViridian: ; 16186 @@ -255,7 +256,7 @@ MartViridian: ; 16186 db AWAKENING db BURN_HEAL db FLOWER_MAIL - db $ff + db -1 ; end ; 16191 MartPewter: ; 16191 @@ -267,7 +268,7 @@ MartPewter: ; 16191 db PARLYZ_HEAL db AWAKENING db BURN_HEAL - db $ff + db -1 ; end ; 1619a MartCerulean: ; 1619a @@ -281,7 +282,7 @@ MartCerulean: ; 1619a db X_ATTACK db DIRE_HIT db SURF_MAIL - db $ff + db -1 ; end ; 161a5 MartLavender: ; 161a5 @@ -294,7 +295,7 @@ MartLavender: ; 161a5 db PARLYZ_HEAL db AWAKENING db BURN_HEAL - db $ff + db -1 ; end ; 161af MartVermilion: ; 161af @@ -307,7 +308,7 @@ MartVermilion: ; 161af db AWAKENING db BURN_HEAL db LITEBLUEMAIL - db $ff + db -1 ; end ; 161b9 MartCeladon2F1: ; 161b9 @@ -319,7 +320,7 @@ MartCeladon2F1: ; 161b9 db REVIVE db SUPER_REPEL db MAX_REPEL - db $ff + db -1 ; end ; 161c2 MartCeladon2F2: ; 161c2 @@ -334,7 +335,7 @@ MartCeladon2F2: ; 161c2 db ICE_HEAL db AWAKENING db PARLYZ_HEAL - db $ff + db -1 ; end ; 161ce MartCeladon3F: ; 161ce @@ -344,7 +345,7 @@ MartCeladon3F: ; 161ce db TM_PROTECT db TM_RAIN_DANCE db TM_SANDSTORM - db $ff + db -1 ; end ; 161d5 MartCeladon4F: ; 161d5 @@ -352,7 +353,7 @@ MartCeladon4F: ; 161d5 db POKE_DOLL db LOVELY_MAIL db SURF_MAIL - db $ff + db -1 ; end ; 161da MartCeladon5F1: ; 161da @@ -362,7 +363,7 @@ MartCeladon5F1: ; 161da db IRON db CARBOS db CALCIUM - db $ff + db -1 ; end ; 161e1 MartCeladon5F2: ; 161e1 @@ -374,7 +375,7 @@ MartCeladon5F2: ; 161e1 db X_DEFEND db X_SPEED db X_SPECIAL - db $ff + db -1 ; end ; 161ea MartFuchsia: ; 161ea @@ -386,7 +387,7 @@ MartFuchsia: ; 161ea db FULL_HEAL db MAX_REPEL db FLOWER_MAIL - db $ff + db -1 ; end ; 161f3 MartSaffron: ; 161f3 @@ -399,7 +400,7 @@ MartSaffron: ; 161f3 db X_ATTACK db X_DEFEND db FLOWER_MAIL - db $ff + db -1 ; end ; 161fd MartMtMoon: ; 161fd @@ -410,7 +411,7 @@ MartMtMoon: ; 161fd db LEMONADE db REPEL db PORTRAITMAIL - db $ff + db -1 ; end ; 16205 MartIndigoPlateau: ; 16205 @@ -422,7 +423,7 @@ MartIndigoPlateau: ; 16205 db FULL_RESTORE db REVIVE db FULL_HEAL - db $ff + db -1 ; end ; 1620e MartUnderground: ; 1620e @@ -431,12 +432,12 @@ MartUnderground: ; 1620e db ENERGY_ROOT db HEAL_POWDER db REVIVAL_HERB - db $ff + db -1 ; end ; 16214 DefaultMart: ; 16214 db 2 ; # items db POKE_BALL db POTION - db $ff + db -1 ; end ; 16218 diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm new file mode 100644 index 000000000..b2379071e --- /dev/null +++ b/data/items/mystery_gift_items.asm @@ -0,0 +1,40 @@ +MysteryGiftItems: ; 2c725 + db BERRY + db PRZCUREBERRY + db MINT_BERRY + db ICE_BERRY + db BURNT_BERRY + db PSNCUREBERRY + db GUARD_SPEC + db X_DEFEND + db X_ATTACK + db BITTER_BERRY + db DIRE_HIT + db X_SPECIAL + db X_ACCURACY + db EON_MAIL + db MORPH_MAIL + db MUSIC_MAIL + db MIRACLEBERRY + db GOLD_BERRY + db REVIVE + db GREAT_BALL + db SUPER_REPEL + db MAX_REPEL + db ELIXER + db ETHER + db WATER_STONE + db FIRE_STONE + db LEAF_STONE + db THUNDERSTONE + db MAX_ETHER + db MAX_ELIXER + db MAX_REVIVE + db SCOPE_LENS + db HP_UP + db PP_UP + db RARE_CANDY + db BLUESKY_MAIL + db MIRAGE_MAIL +MysteryGiftItemsEnd: +; 2c74a diff --git a/data/items/x_stats.asm b/data/items/x_stats.asm new file mode 100644 index 000000000..ac2d0ad27 --- /dev/null +++ b/data/items/x_stats.asm @@ -0,0 +1,7 @@ +XItemStats: ; f504 + ; item, stat + db X_ATTACK, ATTACK + db X_DEFEND, DEFENSE + db X_SPEED, SPEED + db X_SPECIAL, SP_ATTACK +; f50c |