From 50ab03e9c1a879c836b92ba5cc38a27a12ae04db Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 3 Oct 2021 09:39:26 -0700 Subject: [PATCH] Assign FORM_ITEM_USE constants to secondaryId for appropriate items. --- src/data/items.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 37e3d467e0..c5f405451c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1191,12 +1191,12 @@ const struct Item gItems[] = .itemId = ITEM_ESCAPE_ROPE, .description = sEscapeRopeDesc, #if I_KEY_ESCAPE_ROPE >= GEN_8 - .price = 0, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, + .price = 0, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, #else - .price = 1000, - .pocket = POCKET_ITEMS, + .price = 1000, + .pocket = POCKET_ITEMS, #endif .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, @@ -1504,6 +1504,7 @@ const struct Item gItems[] = #ifdef POKEMON_EXPANSION .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, + .secondaryId = FORM_ITEM_USE, #else .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1521,6 +1522,7 @@ const struct Item gItems[] = #ifdef POKEMON_EXPANSION .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, + .secondaryId = FORM_ITEM_USE, #else .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1538,6 +1540,7 @@ const struct Item gItems[] = #ifdef POKEMON_EXPANSION .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, + .secondaryId = FORM_ITEM_USE, #else .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1555,6 +1558,7 @@ const struct Item gItems[] = #ifdef POKEMON_EXPANSION .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, + .secondaryId = FORM_ITEM_USE, #else .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -5355,6 +5359,7 @@ const struct Item gItems[] = #ifdef POKEMON_EXPANSION .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE_TIME, #else .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,