mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-17 12:07:38 +01:00
Merge pull request #1907 from LOuroboros/flingIE
Implemented Fling (2/2)
This commit is contained in:
commit
b38011eb3f
@ -22,6 +22,7 @@ struct Item
|
||||
u8 battleUsage;
|
||||
ItemUseFunc battleUseFunc;
|
||||
u8 secondaryId;
|
||||
u8 flingPower;
|
||||
};
|
||||
|
||||
struct BagPocket
|
||||
@ -76,5 +77,6 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId);
|
||||
u8 ItemId_GetBattleUsage(u16 itemId);
|
||||
ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
|
||||
u8 ItemId_GetSecondaryId(u16 itemId);
|
||||
u8 ItemId_GetFlingPower(u16 itemId);
|
||||
|
||||
#endif // GUARD_ITEM_H
|
||||
|
604
src/data/items.h
604
src/data/items.h
File diff suppressed because it is too large
Load Diff
@ -947,3 +947,8 @@ u8 ItemId_GetSecondaryId(u16 itemId)
|
||||
{
|
||||
return gItems[SanitizeItemId(itemId)].secondaryId;
|
||||
}
|
||||
|
||||
u8 ItemId_GetFlingPower(u16 itemId)
|
||||
{
|
||||
return gItems[SanitizeItemId(itemId)].flingPower;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user