diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-23 21:05:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 21:05:39 -0400 |
| commit | 63798d56d05cf87ada77bd26727ea7725630b0b2 (patch) | |
| tree | c90b2bebe86dffe78e6597d220f70196d3e69e25 /data/items | |
| parent | 624864307e4e7a5055c01d7f06145feec35527a7 (diff) | |
| parent | 0345e4fb0e3f39a038e9eced72380a5a1ab6694f (diff) | |
Merge pull request #699 from Rangi42/master
Resolve some miscellaneous issues
Diffstat (limited to 'data/items')
| -rw-r--r-- | data/items/attributes.asm | 2 | ||||
| -rw-r--r-- | data/items/descriptions.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 806a2ef28..60ada8b6e 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -201,7 +201,7 @@ ItemAttributes: item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; WHT_APRICORN item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLACKBELT +; BLACKBELT_I 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 diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index e0f009047..2a7900b3a 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -188,7 +188,7 @@ ItemDescriptions: dw MorphMailDesc dw BlueSkyMailDesc dw MusicMailDesc - dw MewMailDesc + dw MirageMailDesc dw TeruSama25Desc dw TeruSama26Desc dw TeruSama26Desc @@ -978,7 +978,7 @@ MusicMailDesc: db "NATU-print MAIL." next "(HOLD)@" -MewMailDesc: +MirageMailDesc: db "MEW-print MAIL." next "(HOLD)@" |