atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assign FORM_ITEM_USE constants to secondaryId for appropriate items.

Browse source
This commit is contained in:
ultima-soul 2021-10-03 09:39:26 -07:00
parent 75c2832afe
commit 50ab03e9c1
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/data/items.h
View file

@ -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,