summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-24 16:57:20 -0500
committerGitHub <noreply@github.com>2017-12-24 16:57:20 -0500
commit70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (patch)
treec1d9606acc6a47212cbc6a5faa79b289deba010a /data
parent8a8b96138be070d0154a79adc00ce2fb2e0f12d4 (diff)
parentcbec3771e2944a502eea69aeb012bea6cdc4e26b (diff)
Merge pull request #417 from mid-kid/master
mid-kid's patches
Diffstat (limited to 'data')
-rw-r--r--data/items/item_attributes.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/items/item_attributes.asm b/data/items/item_attributes.asm
index d6d272107..dc2842760 100644
--- a/data/items/item_attributes.asm
+++ b/data/items/item_attributes.asm
@@ -170,7 +170,7 @@ ItemAttributes: ; 67c1
; POISON BARB
item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; KING'S ROCK
- item_attribute 100, HELD_TRADE_EVOLVE, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+ item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BITTER BERRY
item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY
; MINT BERRY