mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-02 01:59:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Dylan Ascencio
2023-09-24 21:54:36 -04:00
parent c536034e86
commit 6dc6e321b8
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
-6
View File
@@ -197,8 +197,6 @@ public:
mItemLifeCount += num;
}
u8 getSelectItem(int i_itemIdx) { return mEquippedItems[i_itemIdx]; }
u8 checkMesgCancelButton() { return field_0x4949; }
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
@@ -1119,10 +1117,6 @@ inline void dComIfGp_setItemMagicCount(s16 magic) {
g_dComIfG_gameInfo.play.setItemMagicCount(magic);
}
inline u8 dComIfGp_getSelectItem(int i_itemIdx) {
return g_dComIfG_gameInfo.play.getSelectItem(i_itemIdx);
}
inline u8 dComIfGp_checkMesgCancelButton() {
return g_dComIfG_gameInfo.play.checkMesgCancelButton();
}