Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1907 from LOuroboros/flingIE

Browse Source 
Implemented Fling (2/2)
This commit is contained in:
Eduardo Quezada D'Ottone 2022-01-22 12:37:51 -03:00 committed by GitHub
commit b38011eb3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 610 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/item.h
View File

@ -22,6 +22,7 @@ struct Item
u8 battleUsage; u8 battleUsage;
ItemUseFunc battleUseFunc; ItemUseFunc battleUseFunc;
u8 secondaryId; u8 secondaryId;
u8 flingPower;
}; };
struct BagPocket struct BagPocket
@ -76,5 +77,6 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId);
u8 ItemId_GetBattleUsage(u16 itemId); u8 ItemId_GetBattleUsage(u16 itemId);
ItemUseFunc ItemId_GetBattleFunc(u16 itemId); ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
u8 ItemId_GetSecondaryId(u16 itemId); u8 ItemId_GetSecondaryId(u16 itemId);
u8 ItemId_GetFlingPower(u16 itemId);
#endif // GUARD_ITEM_H #endif // GUARD_ITEM_H

604
src/data/items.h
View File

File diff suppressed because it is too large Load Diff

5
src/item.c
View File

@ -947,3 +947,8 @@ u8 ItemId_GetSecondaryId(u16 itemId)
{ {
return gItems[SanitizeItemId(itemId)].secondaryId; return gItems[SanitizeItemId(itemId)].secondaryId;
} }
u8 ItemId_GetFlingPower(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].flingPower;
}