From a5ee0f2727218d942d36735a83d7dc02834d8856 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 2 Jan 2026 21:59:12 +0100 Subject: [PATCH] ItemTMHMOrEvolutionStone enum (#2192) --- include/item_use.h | 7 +++++++ src/item_use.c | 6 +++--- src/party_menu.c | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/item_use.h b/include/item_use.h index 8e28a4229c..52b07cd265 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -33,4 +33,11 @@ void Task_UseDigEscapeRopeOnField(u8 taskId); bool8 CanUseDigOrEscapeRopeOnCurMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); +enum ItemTMHMOrEvolutionStone +{ + ITEM_IS_OTHER, + ITEM_IS_TM_HM, + ITEM_IS_EVOLUTION_STONE, +}; + #endif // GUARD_ITEM_USE_H diff --git a/src/item_use.c b/src/item_use.c index b7bf458a99..be09493f46 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -176,11 +176,11 @@ static void Task_CloseCantUseKeyItemMessage(u8 taskId) u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId) { if (GetItemFieldFunc(itemId) == ItemUseOutOfBattle_TMHM) - return 1; + return ITEM_IS_TM_HM; else if (GetItemFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone) - return 2; + return ITEM_IS_EVOLUTION_STONE; else - return 0; + return ITEM_IS_OTHER; } // Mail in the bag menu can't have a message but it can be checked (view the mail background, no message) diff --git a/src/party_menu.c b/src/party_menu.c index 7cde1a018c..1ba9051c6c 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -987,10 +987,10 @@ static bool8 DisplayPartyPokemonDataForMoveTutorOrEvolutionItem(u8 slot) { default: return FALSE; - case 1: // TM/HM + case ITEM_IS_TM_HM: DisplayPartyPokemonDataToTeachMove(slot, item, 0); break; - case 2: // Evolution stone + case ITEM_IS_EVOLUTION_STONE: if (!GetMonData(currentPokemon, MON_DATA_IS_EGG) && GetEvolutionTargetSpecies(currentPokemon, EVO_MODE_ITEM_CHECK, item) != SPECIES_NONE) return FALSE; DisplayPartyPokemonDescriptionData(slot, PARTYBOX_DESC_NO_USE);