diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
| commit | b805d343f36019ae9fdf5d248d78a0d9b12f25d7 (patch) | |
| tree | e296a2d4a3805aee0340ad05eb61da9ce7ed7db6 /data | |
| parent | ef9090b9a07b3d727b1508957c76c899bbc39987 (diff) | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'data')
| -rw-r--r-- | data/items/item_attributes.asm | 2 |
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 |