From 5a5f5ececdde2c4c62bdee649d8b1d3edba96fed Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 21 Mar 2020 13:07:18 -0400 Subject: Miscellaneous fixes from #694 --- data/items/descriptions.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/items') 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)@" -- cgit v1.2.3 From 0345e4fb0e3f39a038e9eced72380a5a1ab6694f Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 21 Mar 2020 17:50:44 -0400 Subject: Add suffixes to some constants to avoid ambiguity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`) - `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`) - `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`) - `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`) This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.) --- data/items/attributes.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/items') 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 -- cgit v1.2.3