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

Merge pull request #1416 from ExpoSeed/IE/item-use-form-change

Browse source 
Support form changes with PE
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-22 00:05:11 -03:00 committed by GitHub
commit 3ef87ec722
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/data/items.h
View file

@ -1501,8 +1501,13 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sRedNectarDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder
#ifdef POKEMON_EXPANSION
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
#else
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
#endif
},
[ITEM_YELLOW_NECTAR] =
@ -1513,8 +1518,13 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sYellowNectarDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder
#ifdef POKEMON_EXPANSION
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
#else
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
#endif
},
[ITEM_PINK_NECTAR] =
@ -1525,8 +1535,13 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sPinkNectarDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder
#ifdef POKEMON_EXPANSION
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
#else
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
#endif
},
[ITEM_PURPLE_NECTAR] =
@ -1537,8 +1552,13 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sPurpleNectarDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder
#ifdef POKEMON_EXPANSION
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
#else
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
#endif
},
[ITEM_RARE_BONE] =
@ -5331,9 +5351,14 @@ const struct Item gItems[] =
.price = 0,
.holdEffect = HOLD_EFFECT_GRACIDEA,
.description = sGracideaDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.pocket = POCKET_KEY_ITEMS,
#ifdef POKEMON_EXPANSION
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_FormChange,
#else
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
#endif
},
[ITEM_BUG_MEMORY] =