From e9607ae760eea953c56c30e079c1eb3c4e77b351 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 5 Jan 2021 08:48:08 -0800 Subject: [PATCH] add a lot of dComIfGs inlines (#65) * item_func inlines * some getcheck func inlines * remove asm * format * format Co-authored-by: Pheenoh --- include/d/d_a/d_a_alink/asm/func_80141264.s | 12 - include/d/d_a/d_a_alink/d_a_alink.h | 5 - .../d/d_com/d_com_inf_game/d_com_inf_game.h | 196 ++++++- include/d/d_item/d_item/asm/func_800987B4.s | 18 - include/d/d_item/d_item/asm/func_80098AB0.s | 6 - include/d/d_item/d_item/asm/func_80098AE0.s | 6 - include/d/d_item/d_item/d_item.h | 1 + include/d/d_save/d_save/d_save.h | 32 +- include/functions.h | 2 +- src/d/d_a/d_a_alink.cpp | 7 +- src/d/d_item/d_item.cpp | 489 ++++++++---------- src/d/d_save/d_save.cpp | 4 +- 12 files changed, 412 insertions(+), 366 deletions(-) delete mode 100644 include/d/d_a/d_a_alink/asm/func_80141264.s delete mode 100644 include/d/d_item/d_item/asm/func_800987B4.s delete mode 100644 include/d/d_item/d_item/asm/func_80098AB0.s delete mode 100644 include/d/d_item/d_item/asm/func_80098AE0.s diff --git a/include/d/d_a/d_a_alink/asm/func_80141264.s b/include/d/d_a/d_a_alink/asm/func_80141264.s deleted file mode 100644 index ffe89fe4537..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_80141264.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80141264 0013E1A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80141268 0013E1A8 7C 08 02 A6 */ mflr r0 -/* 8014126C 0013E1AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80141270 0013E1B0 7C 64 1B 78 */ mr r4, r3 -/* 80141274 0013E1B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80141278 0013E1B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 8014127C 0013E1BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80141280 0013E1C0 4B EF 2C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80141284 0013E1C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80141288 0013E1C8 7C 08 03 A6 */ mtlr r0 -/* 8014128C 0013E1CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141290 0013E1D0 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h index a338412e4f8..0f79b220210 100644 --- a/include/d/d_a/d_a_alink/d_a_alink.h +++ b/include/d/d_a/d_a_alink/d_a_alink.h @@ -44,11 +44,6 @@ struct csXyz { // move later class daAlink_c { public: - // inlines - void dComIfGp_setZStatus(u8 status, u8 unk) { - g_dComIfG_gameInfo.getPlay().setZStatus(status, unk); - } - // member functions u32 getE3Zhint(void); const char* getAlinkArcName(void); diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index b96e176e677..288b58423b4 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -14,24 +14,24 @@ #include "d/d_vibration/d_vibration.h" struct item_func { - float hearts; // bf80 - u32 rupees; // bf84 - s16 small_keys; // bf88 - s16 kakera_heart; // bf8a - s16 magic; // bf8c - u16 unk; // bf8e - s16 magic_lv; // bf90 - u8 unk2[2]; // bf92/93 // removed stuff? - u32 unk3; // bf94 //related to lantern? - u32 unk4; // bf98 //related to lantern? - u32 unk5; // bf9c //related to lantern? - u32 unk6; // bfa0 //related to oxygen? - u32 unk7; // bfa4 //related to oxygen? - u32 unk8; // bfa8 //related to oxygen? - u32 unk9; // bfac //related to oxygen? - u32 unk10; // bfb0 //related to oxygen? - s16 arrows; // bfb4 - s16 seeds; // bfb6 + float hearts; // bf80 + u32 rupees; // bf84 + s16 small_keys; // bf88 + s16 max_life; // bf8a + s16 magic; // bf8c + u16 unk; // bf8e + s16 magic_lv; // bf90 + u8 unk2[2]; // bf92/93 // removed stuff? + u32 unk3; // bf94 //related to lantern? + u32 unk4; // bf98 //related to lantern? + u32 unk5; // bf9c //related to lantern? + int oxygen; // bfa0 + u32 unk7; // bfa4 //related to oxygen? + int max_oxygen; // bfa8 + u32 unk9; // bfac //related to oxygen? + u32 unk10; // bfb0 //related to oxygen? + s16 arrows; // bfb4 + s16 seeds; // bfb6 }; class dComIfG_camera_info_class { @@ -72,6 +72,19 @@ public: field_0x4ec0[0x3B] = status; field_0x4ec0[0x56] = unk; } + void setItemLifeCount(float hearts, u8 unk) { + give_item.hearts += hearts; + unk_heart = unk; + } + void setItemRupeeCount(long rupees) { give_item.rupees += rupees; } + void setItemMagicCount(short magic) { give_item.magic += magic; } + void setItemMaxMagicCount(short max) { give_item.magic_lv += max; } + void setItemArrowNumCount(short arrows) { give_item.arrows += arrows; } + void setItemPachinkoNumCount(short seeds) { give_item.seeds += seeds; } + void setItemKeyNumCount(short keys) { give_item.small_keys += keys; } + void setItemMaxLifeCount(short max) { give_item.max_life += max; } + void setOxygen(long oxygen) { give_item.oxygen = oxygen; } + void setMaxOxygen(long max) { give_item.max_oxygen = max; } private: /* 0x00000 */ dBgS dbgs; @@ -132,6 +145,8 @@ public: dDlst_peekZ_c& getdlstPeekZ() { return draw_list_list.dlstPeekZ; } dComIfG_play_c& getPlay() { return play; } dSv_memory_c& getMemory() { return info.getMemory(); } + dSv_event_c& getEvent() { return info.getEvent(); } + dSv_info_c& getInfo() { return info; } private: /* 0x00000 */ dSv_info_c info; @@ -166,6 +181,151 @@ private: extern dComIfG_inf_c g_dComIfG_gameInfo; +int dComIfGs_isItemFirstBit(u8); + +inline void dComIfGp_setZStatus(u8 status, u8 unk) { + g_dComIfG_gameInfo.getPlay().setZStatus(status, unk); +} +inline void dComIfGp_setItemLifeCount(float amount, u8 unk) { + g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk); +} +inline void dComIfGp_setItemRupeeCount(long amount) { + g_dComIfG_gameInfo.getPlay().setItemRupeeCount(amount); +} +inline void dComIfGp_setItemMagicCount(short amount) { + g_dComIfG_gameInfo.getPlay().setItemMagicCount(amount); +} +inline void dComIfGp_setItemMaxMagicCount(short max) { + g_dComIfG_gameInfo.getPlay().setItemMaxMagicCount(max); +} +inline void dComIfGp_setItemArrowNumCount(short amount) { + g_dComIfG_gameInfo.getPlay().setItemArrowNumCount(amount); +} +inline void dComIfGp_setItemPachinkoNumCount(short amount) { + g_dComIfG_gameInfo.getPlay().setItemPachinkoNumCount(amount); +} +inline void dComIfGp_setItemKeyNumCount(short amount) { + g_dComIfG_gameInfo.getPlay().setItemKeyNumCount(amount); +} +inline void dComIfGp_setItemMaxLifeCount(short max) { + g_dComIfG_gameInfo.getPlay().setItemMaxLifeCount(max); +} +inline void dComIfGs_onDungeonItemMap(void) { + g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemMap(); +} +inline void dComIfGs_onDungeonItemCompass(void) { + g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemCompass(); +} +inline void dComIfGs_onDungeonItemWarp(void) { + g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemWarp(); +} +inline void dComIfGs_setItem(int slot, u8 i_no) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setItem(slot, i_no); +} +inline void dComIfGs_setOxygen(long amount) { + g_dComIfG_gameInfo.getPlay().setOxygen(amount); +} +inline void dComIfGs_setMaxOxygen(long max) { + g_dComIfG_gameInfo.getPlay().setMaxOxygen(max); +} +inline void dComIfGs_setOil(u16 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setOil(amount); +} +inline void dComIfGs_setMaxOil(u16 max) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxOil(max); +} +inline void dComIfGs_setWalletSize(u8 size) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setWalletSize(size); +} +inline void dComIfGs_setMagic(u8 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMagic(amount); +} +inline void dComIfGs_setMaxMagic(u8 max) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxMagic(max); +} +inline void dComIfGs_setRupee(u16 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setRupee(amount); +} +inline void dComIfGs_setLife(u16 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setLife(amount); +} +inline void dComIfGs_setMaxLife(u8 max) { + g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxLife(max); +} +inline void dComIfGs_onDungeonItemBossKey(void) { + g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemBossKey(); +} +inline void dComIfGs_setCollectSword(u8 sword_id) { + g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(SWORD_BITFIELD, sword_id); +} +inline void dComIfGs_setCollectShield(u8 shield_id) { + g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(SHIELD_BITFIELD, shield_id); +} +inline void dComIfGs_setCollectClothes(u8 clothes_id) { + g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(CLOTHING_BITFIELD, clothes_id); +} +inline void dComIfGs_setRodTypeLevelUp(void) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setRodTypeLevelUp(); +} +inline void dComIfGs_setArrowNum(u8 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItemRecord().setArrowNum(amount); +} +inline void dComIfGs_setArrowMax(u8 max) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItemMax().setArrowNum(max); +} +inline u8 dComIfGs_getPachinkoMax(void) { + return 50; +} +inline void dComIfGs_setEmptyBombBag(void) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBag(); +} +inline void dComIfGs_setEmptyBombBag(u8 type, u8 amount) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBag(type, amount); +} +inline void dComIfGs_setEmptyBombBagItemIn(u8 type, bool unk) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBagItemIn(type, unk); +} +inline void dComIfGs_setEmptyBottle(void) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottle(); +} +inline void dComIfGs_setEmptyBottle(u8 type) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottle(type); +} +inline void dComIfGs_setEmptyBottleItemIn(u8 type) { + g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottleItemIn(type); +} +inline void dComIfGs_onEventBit(u16 id) { + g_dComIfG_gameInfo.getSaveFile().getEventFlags().onEventBit(id); +} +inline void dComIfGs_onLightDropFlag(u8 area_id) { + g_dComIfG_gameInfo.getSaveFile().getLightDrop().onLightDropGetFlag(area_id); +} +inline void dComIfGs_onSwitch(int param1, int param2) { + g_dComIfG_gameInfo.getInfo().onSwitch(param1, param2); +} +inline bool dComIfGs_isDungeonItemMap(void) { + return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItemMap(); +} +inline bool dComIfGs_isDungeonItemBossKey(void) { + return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItemBossKey(); +} +inline u8 dComIfGs_getItem(int slot, bool unk) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerItem().getItem(slot, unk); +} +inline BOOL dComIfGs_isCollectSword(u8 sword_id) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().isCollect(SWORD_BITFIELD, sword_id); +} +inline BOOL dComIfGs_isCollectClothing(u8 clothing_id) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().isCollect(CLOTHING_BITFIELD, + clothing_id); +} +inline u8 dComIfGs_checkBottle(u8 type) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerItem().checkBottle(type); +} +inline BOOL dComIfGs_isLightDropGetFlag(u8 area_id) { + return g_dComIfG_gameInfo.getSaveFile().getLightDrop().isLightDropGetFlag(area_id); +} + // int dComIfGp_roomControl_getZoneNo(int zone_no) { // return g_dComIfG_gameInfo.play.getRoomControl().getZoneNo(zone_no); // } diff --git a/include/d/d_item/d_item/asm/func_800987B4.s b/include/d/d_item/d_item/asm/func_800987B4.s deleted file mode 100644 index e82234991f8..00000000000 --- a/include/d/d_item/d_item/asm/func_800987B4.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 800987B4 000956F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800987B8 000956F8 7C 08 02 A6 */ mflr r0 -/* 800987BC 000956FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800987C0 00095700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800987C4 00095704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800987C8 00095708 38 63 00 9C */ addi r3, r3, 0x9c -/* 800987CC 0009570C 38 80 00 04 */ li r4, 4 -/* 800987D0 00095710 38 A0 00 43 */ li r5, 0x43 -/* 800987D4 00095714 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc -/* 800987D8 00095718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800987DC 0009571C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800987E0 00095720 38 00 00 1E */ li r0, 0x1e -/* 800987E4 00095724 98 03 00 EC */ stb r0, 0xec(r3) -/* 800987E8 00095728 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 800987EC 0009572C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800987F0 00095730 7C 08 03 A6 */ mtlr r0 -/* 800987F4 00095734 38 21 00 10 */ addi r1, r1, 0x10 -/* 800987F8 00095738 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80098AB0.s b/include/d/d_item/d_item/asm/func_80098AB0.s deleted file mode 100644 index 18a7f8b31b5..00000000000 --- a/include/d/d_item/d_item/asm/func_80098AB0.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 80098AB0 000959F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80098AB4 000959F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80098AB8 000959F8 38 00 00 3C */ li r0, 0x3c -/* 80098ABC 000959FC 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AC0 00095A00 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AC4 00095A04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80098AE0.s b/include/d/d_item/d_item/asm/func_80098AE0.s deleted file mode 100644 index 07a60290416..00000000000 --- a/include/d/d_item/d_item/asm/func_80098AE0.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 80098AE0 00095A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80098AE4 00095A24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80098AE8 00095A28 38 00 00 64 */ li r0, 0x64 -/* 80098AEC 00095A2C 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AF0 00095A30 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AF4 00095A34 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/d_item.h b/include/d/d_item/d_item/d_item.h index 1ef68a5b99b..aebfacd2120 100644 --- a/include/d/d_item/d_item/d_item.h +++ b/include/d/d_item/d_item/d_item.h @@ -1,6 +1,7 @@ #ifndef D_ITEM_H_ #define D_ITEM_H_ +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" int checkItemGet(u8, int); diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index a6555f9aadf..4480da87291 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -331,10 +331,14 @@ public: u16& getCurrentLanternOil() { return mCurrentLanternOil; } u8& getScent() { return mEquipment[3]; } void setWalletLV(u8 lv) { mCurrentWallet = lv; } - void setLanternOil(u16 amount) { - mMaxLanternOil = amount; - mCurrentLanternOil = amount; - } + void setOil(u16 oil) { mCurrentLanternOil = oil; } + void setMaxOil(u16 max) { mMaxLanternOil = max; } + void setWalletSize(u8 size) { mCurrentWallet = size; } + void setMagic(u8 magic) { mCurrentMagic = magic; } + void setMaxMagic(u8 max) { mMaxMagic = max; } + void setRupee(u16 rupees) { mCurrentRupees = rupees; } + void setLife(u16 life) { mCurrentHealth = life; } + void setMaxLife(u8 max) { mMaxHealth = max; } private: u16 mMaxHealth; @@ -349,8 +353,8 @@ private: u8 unk18; u8 mEquipment[6]; u8 mCurrentWallet; - u8 unk26; - u8 unk27; + u8 mMaxMagic; + u8 mCurrentMagic; u8 mMagicFlag; u8 unk29; u8 unk30; @@ -491,7 +495,7 @@ public: u8 addBottleNum(u8, s16); u8 getBottleNum(u8) const; - void setBowAmount(u8 amount) { mBow = amount; } + void setArrowNum(u8 amount) { mBow = amount; } private: u8 mBow; @@ -507,7 +511,7 @@ public: void setBombNum(u8, u8); u8 getBombNum(u8) const; - void setBowCapacity(u8 max) { mItemCapacities[0] = max; } + void setArrowNum(u8 max) { mItemCapacities[0] = max; } u8 getBowCapacity() { return mItemCapacities[0]; } private: @@ -642,7 +646,6 @@ public: dSv_player_get_item_c& getPlayerGetItem() { return player_get_item; } void setPlayerStatusAWalletLV(u8 lv) { player_status_a.setWalletLV(lv); } - void setPlayerStatusAOil(u16 amount) { player_status_a.setLanternOil(amount); } private: dSv_player_status_a_c player_status_a; @@ -681,6 +684,12 @@ public: bool isDungeonItem(int) const; u8 getSmallKeys() { return small_key_flags; } + void onDungeonItemMap() { onDungeonItem(MAP_FLAG); } + bool isDungeonItemMap() const { return isDungeonItem(MAP_FLAG); } + void onDungeonItemCompass() { onDungeonItem(COMPASS_FLAG); } + void onDungeonItemWarp() { onDungeonItem(OOCCOO_NOTE_FLAG); } + void onDungeonItemBossKey() { onDungeonItem(BOSS_KEY_FLAG); } + bool isDungeonItemBossKey() const { return isDungeonItem(BOSS_KEY_FLAG); } private: u32 area_flags_bitfields1[2]; @@ -854,7 +863,11 @@ public: dSv_player_c& getPlayer() { return player; } dSv_player_status_a_c& getPlayerStatusA() { return player.getPlayerStatusA(); } dSv_player_get_item_c& getPlayerGetItem() { return player.getPlayerGetItem(); } + dSv_player_item_record_c& getPlayerItemRecord() { return player.getPlayerItemRecord(); } + dSv_player_item_max_c& getPlayerItemMax() { return player.getPlayerItemMax(); } dSv_player_item_c& getPlayerItem() { return player.getPlayerItem(); } + dSv_player_collect_c& getPlayerCollect() { return player.getPlayerCollect(); } + dSv_light_drop_c& getLightDrop() { return player.getLightDrop(); } dSv_event_c& getEventFlags() { return event_flags; } void setPlayerStatusAWallet(u8 lv) { player.setPlayerStatusAWalletLV(lv); } @@ -894,6 +907,7 @@ public: dSv_memory_c& getMemory() { return memory; } dSv_zone_c* getZones() { return zones; } dSv_player_c& getPlayer() { return save_file.getPlayer(); } + dSv_event_c& getEvent() { return events; } private: /* 0x000 */ dSv_save_c save_file; diff --git a/include/functions.h b/include/functions.h index c5466bdb50f..99a693af02f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1909,7 +1909,7 @@ void func_801415E4(void); void func_8011E9F8(void); void daAlink_c_NS_procHangWaitInit(void); void func_8013BD54(void); -void dComIfGs_isItemFirstBit(void); +void dComIfGs_isItemFirstBit__FUc(u8); void daAlink_c_NS_checkLetterItem(void); void fopAcM_searchActorDistanceXZ(void); void checkBottle__17dSv_player_item_cFUc(void); diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index f389ef33d11..cfbdfaa70fb 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -13753,11 +13753,8 @@ asm void fopAcM_onSwitch(void) { #include "d/d_a/d_a_alink/asm/func_80141230.s" } -// dComIfGs_isItemFirstBit__FUc -// dComIfGs_isItemFirstBit(unsigned char) -asm void dComIfGs_isItemFirstBit(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_80141264.s" +int dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no); } // dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp index fbf225581d8..220cd6b6f6b 100644 --- a/src/d/d_item/d_item.cpp +++ b/src/d/d_item/d_item.cpp @@ -1,5 +1,4 @@ #include "d/d_item/d_item/d_item.h" -#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" void execItemGet(u8 item_id) { @@ -16,44 +15,43 @@ int checkItemGet(u8 item_id, int param_2) { } void item_func_HEART(void) { - g_dComIfG_gameInfo.getPlayGiveItem().hearts += lbl_80452BD8; - g_dComIfG_gameInfo.getPlayUnkHeart() = 0; + dComIfGp_setItemLifeCount(lbl_80452BD8, 0); } void item_func_GREEN_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 1; + dComIfGp_setItemRupeeCount(1); } void item_func_BLUE_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 5; + dComIfGp_setItemRupeeCount(5); } void item_func_YELLOW_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 10; + dComIfGp_setItemRupeeCount(10); } void item_func_RED_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 20; + dComIfGp_setItemRupeeCount(20); } void item_func_PURPLE_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 50; + dComIfGp_setItemRupeeCount(50); } void item_func_ORANGE_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 100; + dComIfGp_setItemRupeeCount(100); } void item_func_SILVER_RUPEE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 200; + dComIfGp_setItemRupeeCount(200); } void item_func_S_MAGIC(void) { - g_dComIfG_gameInfo.getPlayGiveItem().magic += 4; + dComIfGp_setItemMagicCount(4); } void item_func_L_MAGIC(void) { - g_dComIfG_gameInfo.getPlayGiveItem().magic += 8; + dComIfGp_setItemMagicCount(8); } void item_func_BOMB_5(void) { @@ -73,23 +71,23 @@ void item_func_BOMB_30(void) { } void item_func_ARROW_10(void) { - g_dComIfG_gameInfo.getPlayGiveItem().arrows += 10; + dComIfGp_setItemArrowNumCount(10); } void item_func_ARROW_20(void) { - g_dComIfG_gameInfo.getPlayGiveItem().arrows += 20; + dComIfGp_setItemArrowNumCount(20); } void item_func_ARROW_30(void) { - g_dComIfG_gameInfo.getPlayGiveItem().arrows += 30; + dComIfGp_setItemArrowNumCount(30); } void item_func_ARROW_1(void) { - g_dComIfG_gameInfo.getPlayGiveItem().arrows += 1; + dComIfGp_setItemArrowNumCount(1); } void item_func_PACHINKO_SHOT(void) { - g_dComIfG_gameInfo.getPlayGiveItem().seeds += 50; + dComIfGp_setItemPachinkoNumCount(50); } void item_func_WATER_BOMB_5(void) { @@ -125,8 +123,7 @@ void item_func_BOMB_INSECT_30(void) { } void item_func_RECOVER_FAILY(void) { - g_dComIfG_gameInfo.getPlayGiveItem().hearts += lbl_80452BDC; - g_dComIfG_gameInfo.getPlayUnkHeart() = 0; + dComIfGp_setItemLifeCount(lbl_80452BDC, 0); } void item_func_TRIPLE_HEART(void) { @@ -134,11 +131,11 @@ void item_func_TRIPLE_HEART(void) { } void item_func_SMALL_KEY(void) { - g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; + dComIfGp_setItemKeyNumCount(1); } void item_func_KAKERA_HEART(void) { - g_dComIfG_gameInfo.getPlayGiveItem().kakera_heart += 1; + dComIfGp_setItemMaxLifeCount(1); } asm void item_func_UTUWA_HEART(void) { @@ -147,41 +144,38 @@ asm void item_func_UTUWA_HEART(void) { } void item_func_MAP(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(MAP_FLAG); + dComIfGs_onDungeonItemMap(); } void item_func_COMPUS(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(COMPASS_FLAG); + dComIfGs_onDungeonItemCompass(); } void item_func_DUNGEON_EXIT(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(OOCCOO_NOTE_FLAG); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, DUNGEON_EXIT); + dComIfGs_onDungeonItemWarp(); + dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); } void item_func_BOSS_KEY(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG); + dComIfGs_onDungeonItemBossKey(); } void item_func_DUNGEON_BACK(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, DUNGEON_BACK); } void item_func_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD, - ORDON_SWORD_FLAG); + dComIfGs_setCollectSword(ORDON_SWORD_FLAG); dComIfGs_setSelectEquipSword(SWORD); } void item_func_MASTER_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD, - MASTER_SWORD_FLAG); + dComIfGs_setCollectSword(MASTER_SWORD_FLAG); dComIfGs_setSelectEquipSword(MASTER_SWORD); } void item_func_WOOD_SHIELD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(SHIELD_BITFIELD, - ORDON_SHIELD_FLAG); + dComIfGs_setCollectShield(ORDON_SHIELD_FLAG); dComIfGs_setSelectEquipShield(WOOD_SHIELD); } @@ -194,7 +188,7 @@ void item_func_HYLIA_SHIELD(void) { } void item_func_TKS_LETTER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, TKS_LETTER); + dComIfGs_setItem(SLOT_18, TKS_LETTER); } void item_func_WEAR_CASUAL(void) { @@ -202,8 +196,7 @@ void item_func_WEAR_CASUAL(void) { } void item_func_WEAR_KOKIRI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(CLOTHING_BITFIELD, - KOKIRI_CLOTHES_FLAG); + dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); } @@ -216,24 +209,24 @@ void item_func_WEAR_ZORA(void) { } void item_func_MAGIC_LV1(void) { - g_dComIfG_gameInfo.getPlayGiveItem().magic += 16; - g_dComIfG_gameInfo.getPlayGiveItem().magic_lv += 16; + dComIfGp_setItemMagicCount(16); + dComIfGp_setItemMaxMagicCount(16); } void item_func_DUNGEON_EXIT_2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); } void item_func_WALLET_LV1(void) { - g_dComIfG_gameInfo.getSaveFile().setPlayerStatusAWallet(WALLET); + dComIfGs_setWalletSize(WALLET); } void item_func_WALLET_LV2(void) { - g_dComIfG_gameInfo.getSaveFile().setPlayerStatusAWallet(BIG_WALLET); + dComIfGs_setWalletSize(BIG_WALLET); } void item_func_WALLET_LV3(void) { - g_dComIfG_gameInfo.getSaveFile().setPlayerStatusAWallet(GIANT_WALLET); + dComIfGs_setWalletSize(GIANT_WALLET); } void item_func_ZORAS_JEWEL(void) { @@ -241,22 +234,21 @@ void item_func_ZORAS_JEWEL(void) { checkFishingRod = item_getcheck_func_FISHING_ROD_1(); if (checkFishingRod != 0) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setRodTypeLevelUp(); + dComIfGs_setRodTypeLevelUp(); } else { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20, ZORAS_JEWEL); + dComIfGs_setItem(SLOT_20, ZORAS_JEWEL); } } void item_func_HAWK_EYE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_5, HAWK_EYE); + dComIfGs_setItem(SLOT_5, HAWK_EYE); } #ifdef NONMATCHING void item_func_WOOD_STICK(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD, - WOODEN_SWORD_FLAG); + dComIfGs_setCollectSword(WOODEN_SWORD_FLAG); dComIfGs_setSelectEquipSword(WOOD_STICK); - g_dComIfG_gameInfo.onSwitch(28, lbl_80450D64); // wrong order + dComIfGs_onSwitch(28, lbl_80450D64); // wrong order } #else asm void item_func_WOOD_STICK(void) { @@ -266,70 +258,63 @@ asm void item_func_WOOD_STICK(void) { #endif void item_func_BOOMERANG(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_0, BOOMERANG); + dComIfGs_setItem(SLOT_0, BOOMERANG); } void item_func_SPINNER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_2, SPINNER); + dComIfGs_setItem(SLOT_2, SPINNER); } void item_func_IRONBALL(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_6, IRONBALL); + dComIfGs_setItem(SLOT_6, IRONBALL); } -// li r0, 0x1e instruction in wrong place -#ifdef NONMATCHING void item_func_BOW(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4, BOW); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(30); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(30); + dComIfGs_setItem(SLOT_4, BOW); + dComIfGs_setArrowNum(30); + dComIfGs_setArrowMax(30); } -#else -asm void item_func_BOW(void) { - nofralloc -#include "d/d_item/d_item/asm/func_800987B4.s" -} -#endif void item_func_HOOKSHOT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9, HOOKSHOT); + dComIfGs_setItem(SLOT_9, HOOKSHOT); } void item_func_HVY_BOOTS(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_3, HVY_BOOTS); + dComIfGs_setItem(SLOT_3, HVY_BOOTS); } void item_func_COPY_ROD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8, COPY_ROD); + dComIfGs_setItem(SLOT_8, COPY_ROD); } void item_func_W_HOOKSHOT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9, NO_ITEM); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_10, W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, NO_ITEM); + dComIfGs_setItem(SLOT_10, W_HOOKSHOT); } void item_func_KANTERA(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().setPlayerStatusAOil(21600); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_1, KANTERA); + dComIfGs_setMaxOil(21600); + dComIfGs_setOil(21600); + dComIfGs_setItem(SLOT_1, KANTERA); } void item_func_LIGHT_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD, - LIGHT_SWORD_FLAG); + dComIfGs_setCollectSword(LIGHT_SWORD_FLAG); dMeter2Info_setSword(LIGHT_SWORD, 0); } void item_func_FISHING_ROD_1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20, FISHING_ROD_1); + dComIfGs_setItem(SLOT_20, FISHING_ROD_1); } void item_func_PACHINKO(void) { - g_dComIfG_gameInfo.getPlayGiveItem().seeds += 50; - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_23, PACHINKO); + u8 pachinko_max = dComIfGs_getPachinkoMax(); + dComIfGp_setItemPachinkoNumCount(pachinko_max); + dComIfGs_setItem(SLOT_23, PACHINKO); } void item_func_COPY_ROD_2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8, COPY_ROD); + dComIfGs_setItem(SLOT_8, COPY_ROD); } void item_func_BOMB_BAG_LV2(void) { @@ -337,55 +322,31 @@ void item_func_BOMB_BAG_LV2(void) { } void item_func_BOMB_BAG_LV1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); } void item_func_BOMB_IN_BAG(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); } void item_func_LIGHT_ARROW(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4, LIGHT_ARROW); + dComIfGs_setItem(SLOT_4, LIGHT_ARROW); } -// li r0, 0x3C instruction in wrong place -#ifdef NONMATCHING void item_func_ARROW_LV1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(60); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(60); + dComIfGs_setArrowNum(60); + dComIfGs_setArrowMax(60); } -#else -asm void item_func_ARROW_LV1(void) { - nofralloc -#include "d/d_item/d_item/asm/func_80098AB0.s" -} -#endif -// li r0, 0x3C instruction in wrong place -#ifdef NONMATCHING void item_func_ARROW_LV2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(60); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(60); + dComIfGs_setArrowNum(60); + dComIfGs_setArrowMax(60); } -#else -asm void item_func_ARROW_LV2(void) { - nofralloc -#include "d/d_item/d_item/asm/func_80098AB0.s" // didnt bother splitting as its exactly the same as LV1 -} -#endif -// li r0, 0x64 instruction in wrong place -#ifdef NONMATCHING void item_func_ARROW_LV3(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(100); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(100); + dComIfGs_setArrowNum(100); + dComIfGs_setArrowMax(100); } -#else -asm void item_func_ARROW_LV3(void) { - nofralloc -#include "d/d_item/d_item/asm/func_80098AE0.s" -} -#endif void item_func_LURE_ROD(void) { return; @@ -420,59 +381,59 @@ void item_func_JEWEL_WORM_ROD(void) { } void item_func_EMPTY_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(); + dComIfGs_setEmptyBottle(); } void item_func_RED_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); } void item_func_GREEN_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); } void item_func_BLUE_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); } void item_func_MILK_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE); } void item_func_HALF_MILK_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottle(HALF_MILK_BOTTLE); } void item_func_OIL_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); } void item_func_WATER_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(WATER_BOTTLE); + dComIfGs_setEmptyBottleItemIn(WATER_BOTTLE); } void item_func_OIL_BOTTLE2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); } void item_func_RED_BOTTLE2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); } void item_func_UGLY_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(UGLY_SOUP); + dComIfGs_setEmptyBottleItemIn(UGLY_SOUP); } void item_func_HOT_SPRING(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(HOT_SPRING); } void item_func_FAIRY_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY); + dComIfGs_setEmptyBottleItemIn(FAIRY); } void item_func_HOT_SPRING2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(HOT_SPRING); } void item_func_OIL2(void) { @@ -484,23 +445,21 @@ void item_func_OIL(void) { } void item_func_NORMAL_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB, 60); + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 60); } void item_func_WATER_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(WATER_BOMB, - 1); + dComIfGs_setEmptyBombBag(); + dComIfGs_setEmptyBombBagItemIn(WATER_BOMB, true); } void item_func_POKE_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(POKE_BOMB, - 1); + dComIfGs_setEmptyBombBag(); + dComIfGs_setEmptyBombBagItemIn(POKE_BOMB, true); } void item_func_FAIRY_DROP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY_DROP); + dComIfGs_setEmptyBottleItemIn(FAIRY_DROP); } void item_func_WORM(void) { @@ -508,7 +467,7 @@ void item_func_WORM(void) { } void item_func_DROP_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(FAIRY_DROP); + dComIfGs_setEmptyBottle(FAIRY_DROP); } asm void item_func_BEE_CHILD(void) { @@ -517,79 +476,76 @@ asm void item_func_BEE_CHILD(void) { } void item_func_CHUCHU_RARE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RARE); + dComIfGs_setEmptyBottleItemIn(CHUCHU_RARE); } void item_func_CHUCHU_RED(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RED); + dComIfGs_setEmptyBottleItemIn(CHUCHU_RED); } void item_func_CHUCHU_BLUE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLUE); + dComIfGs_setEmptyBottleItemIn(CHUCHU_BLUE); } void item_func_CHUCHU_GREEN(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_GREEN); + dComIfGs_setEmptyBottleItemIn(CHUCHU_GREEN); } void item_func_CHUCHU_YELLOW(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn( - CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); } void item_func_CHUCHU_PURPLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn( - CHUCHU_PURPLE); + dComIfGs_setEmptyBottleItemIn(CHUCHU_PURPLE); } void item_func_LV1_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV1_SOUP); + dComIfGs_setEmptyBottleItemIn(LV1_SOUP); } void item_func_LV2_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV2_SOUP); + dComIfGs_setEmptyBottleItemIn(LV2_SOUP); } void item_func_LV3_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV3_SOUP); + dComIfGs_setEmptyBottleItemIn(LV3_SOUP); } void item_func_LETTER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, LETTER); + dComIfGs_setItem(SLOT_21, LETTER); } void item_func_BILL(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, BILL); + dComIfGs_setItem(SLOT_21, BILL); } void item_func_WOOD_STATUE(void) { - g_dComIfG_gameInfo.getSaveFile().getEventFlags().onEventBit(lbl_803A7288.unk566); - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, WOOD_STATUE); + dComIfGs_onEventBit(lbl_803A7288.unk566); + dComIfGs_setItem(SLOT_21, WOOD_STATUE); } void item_func_IRIAS_PENDANT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, IRIAS_PENDANT); + dComIfGs_setItem(SLOT_21, IRIAS_PENDANT); } void item_func_HORSE_FLUTE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, HORSE_FLUTE); + dComIfGs_setItem(SLOT_21, HORSE_FLUTE); } void item_func_RAFRELS_MEMO(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19, RAFRELS_MEMO); + dComIfGs_setItem(SLOT_19, RAFRELS_MEMO); } void item_func_ASHS_SCRIBBLING(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19, ASHS_SCRIBBLING); + dComIfGs_setItem(SLOT_19, ASHS_SCRIBBLING); } void item_func_CHUCHU_YELLOW2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn( - CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); } void item_func_OIL_BOTTLE3(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(OIL_BOTTLE); + dComIfGs_setEmptyBottle(OIL_BOTTLE); } void item_func_SHOP_BEE_CHILD(void) { @@ -597,7 +553,7 @@ void item_func_SHOP_BEE_CHILD(void) { } void item_func_CHUCHU_BLACK(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLACK); + dComIfGs_setEmptyBottleItemIn(CHUCHU_BLACK); } void item_func_LIGHT_DROP(void) { @@ -605,15 +561,15 @@ void item_func_LIGHT_DROP(void) { } void item_func_DROP_CONTAINER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(FARON_VESSEL); + dComIfGs_onLightDropFlag(FARON_VESSEL); } void item_func_DROP_CONTAINER02(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(ELDIN_VESSEL); + dComIfGs_onLightDropFlag(ELDIN_VESSEL); } void item_func_DROP_CONTAINER03(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(LANAYRU_VESSEL); + dComIfGs_onLightDropFlag(LANAYRU_VESSEL); } void item_func_FILLED_CONTAINER(void) { @@ -757,28 +713,27 @@ void item_func_POU_SPIRIT(void) { } void item_func_ANCIENT_DOCUMENT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22, ANCIENT_DOCUMENT); + dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT); } void item_func_AIR_LETTER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22, AIR_LETTER); + dComIfGs_setItem(SLOT_22, AIR_LETTER); } void item_func_ANCIENT_DOCUMENT2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22, - ANCIENT_DOCUMENT2); + dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT2); } void item_func_LV7_DUNGEON_EXIT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, LV7_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, LV7_DUNGEON_EXIT); } void item_func_LINKS_SAVINGS(void) { - g_dComIfG_gameInfo.getPlayGiveItem().rupees += 50; + dComIfGp_setItemRupeeCount(50); } void item_func_SMALL_KEY2(void) { - g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; + dComIfGp_setItemKeyNumCount(1); } void item_func_POU_FIRE1(void) { @@ -810,7 +765,7 @@ void item_func_TASTE(void) { } void item_func_LV5_BOSS_KEY(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG); + dComIfGs_onDungeonItemBossKey(); } void item_func_SURFBOARD(void) { @@ -838,11 +793,11 @@ void item_func_KEY_OF_CARAVAN(void) { } void item_func_LV2_BOSS_KEY(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG); + dComIfGs_onDungeonItemBossKey(); } void item_func_KEY_OF_FILONE(void) { - g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; + dComIfGp_setItemKeyNumCount(1); } void item_func_noentry(void) { @@ -982,7 +937,7 @@ int item_getcheck_func_UTUWA_HEART(void) { } bool item_getcheck_func_MAP(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItem(MAP_FLAG); + return dComIfGs_isDungeonItemMap(); } int item_getcheck_func_COMPUS(void) { @@ -990,27 +945,23 @@ int item_getcheck_func_COMPUS(void) { } bool item_getcheck_func_DUNGEON_EXIT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true) == - DUNGEON_EXIT; + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT; } bool item_getcheck_func_BOSS_KEY(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG); + return dComIfGs_isDungeonItemBossKey(); } bool item_getcheck_func_DUNGEON_BACK(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true) == - DUNGEON_BACK; + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_BACK; } -void item_getcheck_func_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD, - ORDON_SWORD_FLAG); +BOOL item_getcheck_func_SWORD(void) { + return dComIfGs_isCollectSword(ORDON_SWORD_FLAG); } -void item_getcheck_func_MASTER_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD, - MASTER_SWORD_FLAG); +BOOL item_getcheck_func_MASTER_SWORD(void) { + return dComIfGs_isCollectSword(MASTER_SWORD_FLAG); } void item_getcheck_func_WOOD_SHIELD(void) { @@ -1026,17 +977,15 @@ void item_getcheck_func_HYLIA_SHIELD(void) { } bool item_getcheck_func_TKS_LETTER(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true) == - TKS_LETTER; + return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER; } void item_getcheck_func_WEAR_CASUAL(void) { g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WEARS_CASUAL); } -void item_getcheck_func_WEAR_KOKIRI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().isCollect(CLOTHING_BITFIELD, - KOKIRI_CLOTHES_FLAG); +BOOL item_getcheck_func_WEAR_KOKIRI(void) { + return dComIfGs_isCollectClothing(KOKIRI_CLOTHES_FLAG); } void item_getcheck_func_ARMOR(void) { @@ -1052,8 +1001,7 @@ int item_getcheck_func_MAGIC_LV1(void) { } bool item_getcheck_func_DUNGEON_EXIT_2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true) == - DUNGEON_EXIT; + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT; } int item_getcheck_func_WALLET_LV1(void) { @@ -1069,8 +1017,7 @@ int item_getcheck_func_WALLET_LV3(void) { } bool item_getcheck_func_ZORAS_JEWEL(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_20, true) == - ZORAS_JEWEL; + return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL; } void item_getcheck_func_HAWK_EYE(void) { @@ -1082,53 +1029,43 @@ void item_getcheck_func_WOOD_STICK(void) { } bool item_getcheck_func_BOOMERANG(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_0, true) == - BOOMERANG; + return dComIfGs_getItem(SLOT_0, true) == BOOMERANG; } bool item_getcheck_func_SPINNER(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_2, true) == - SPINNER; + return dComIfGs_getItem(SLOT_2, true) == SPINNER; } bool item_getcheck_func_IRONBALL(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_6, true) == - IRONBALL; + return dComIfGs_getItem(SLOT_6, true) == IRONBALL; } bool item_getcheck_func_BOW(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4, false) == - BOW; + return dComIfGs_getItem(SLOT_4, false) == BOW; } bool item_getcheck_func_HOOKSHOT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_9, true) == - HOOKSHOT; + return dComIfGs_getItem(SLOT_9, true) == HOOKSHOT; } bool item_getcheck_func_HVY_BOOTS(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_3, true) == - HVY_BOOTS; + return dComIfGs_getItem(SLOT_3, true) == HVY_BOOTS; } bool item_getcheck_func_COPY_ROD(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_8, true) == - COPY_ROD; + return dComIfGs_getItem(SLOT_8, true) == COPY_ROD; } bool item_getcheck_func_W_HOOKSHOT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_10, true) == - W_HOOKSHOT; + return dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT; } bool item_getcheck_func_KANTERA(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_1, true) == - KANTERA; + return dComIfGs_getItem(SLOT_1, true) == KANTERA; } -void item_getcheck_func_LIGHT_SWORD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD, - LIGHT_SWORD_FLAG); +BOOL item_getcheck_func_LIGHT_SWORD(void) { + return dComIfGs_isCollectSword(LIGHT_SWORD_FLAG); } asm int item_getcheck_func_FISHING_ROD_1(void) { @@ -1137,8 +1074,7 @@ asm int item_getcheck_func_FISHING_ROD_1(void) { } bool item_getcheck_func_PACHINKO(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_23, true) == - PACHINKO; + return dComIfGs_getItem(SLOT_23, true) == PACHINKO; } int item_getcheck_func_COPY_ROD_2(void) { @@ -1162,8 +1098,7 @@ void item_getcheck_func_LIGHT_ARROW(void) { } int item_getcheck_func_ARROW_LV1(void) { - return (g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4, false) == - BOW && + return (dComIfGs_getItem(SLOT_4, false) == BOW && g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 30) ? 1 : @@ -1171,8 +1106,7 @@ int item_getcheck_func_ARROW_LV1(void) { } int item_getcheck_func_ARROW_LV2(void) { - return (g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4, false) == - BOW && + return (dComIfGs_getItem(SLOT_4, false) == BOW && g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 60) ? 1 : @@ -1180,8 +1114,7 @@ int item_getcheck_func_ARROW_LV2(void) { } int item_getcheck_func_ARROW_LV3(void) { - return (g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4, false) == - BOW && + return (dComIfGs_getItem(SLOT_4, false) == BOW && g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 100) ? 1 : @@ -1200,89 +1133,88 @@ int item_getcheck_func_HAWK_ARROW(void) { return -1; } -void item_getcheck_func_BEE_ROD(void) { - item_getcheck_func_FISHING_ROD_1(); +BOOL item_getcheck_func_BEE_ROD(void) { + return item_getcheck_func_FISHING_ROD_1(); } -void item_getcheck_func_JEWEL_ROD(void) { - item_getcheck_func_FISHING_ROD_1(); +BOOL item_getcheck_func_JEWEL_ROD(void) { + return item_getcheck_func_FISHING_ROD_1(); } -void item_getcheck_func_WORM_ROD(void) { - item_getcheck_func_FISHING_ROD_1(); +BOOL item_getcheck_func_WORM_ROD(void) { + return item_getcheck_func_FISHING_ROD_1(); } -void item_getcheck_func_JEWEL_BEE_ROD(void) { - item_getcheck_func_FISHING_ROD_1(); +BOOL item_getcheck_func_JEWEL_BEE_ROD(void) { + return item_getcheck_func_FISHING_ROD_1(); } -void item_getcheck_func_JEWEL_WORM_ROD(void) { - item_getcheck_func_FISHING_ROD_1(); +BOOL item_getcheck_func_JEWEL_WORM_ROD(void) { + return item_getcheck_func_FISHING_ROD_1(); } int item_getcheck_func_EMPTY_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE); + return dComIfGs_checkBottle(EMPTY_BOTTLE); } int item_getcheck_func_RED_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE); + return dComIfGs_checkBottle(RED_BOTTLE); } int item_getcheck_func_GREEN_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE); + return dComIfGs_checkBottle(GREEN_BOTTLE); } int item_getcheck_func_BLUE_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE); + return dComIfGs_checkBottle(BLUE_BOTTLE); } int item_getcheck_func_MILK_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE); + return dComIfGs_checkBottle(MILK_BOTTLE); } int item_getcheck_func_HALF_MILK_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle( - HALF_MILK_BOTTLE); + return dComIfGs_checkBottle(HALF_MILK_BOTTLE); } int item_getcheck_func_OIL_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE); + return dComIfGs_checkBottle(OIL_BOTTLE); } int item_getcheck_func_WATER_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE); + return dComIfGs_checkBottle(WATER_BOTTLE); } int item_getcheck_func_OIL_BOTTLE2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2); + return dComIfGs_checkBottle(OIL_BOTTLE_2); } int item_getcheck_func_RED_BOTTLE2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2); + return dComIfGs_checkBottle(RED_BOTTLE_2); } int item_getcheck_func_UGLY_SOUP(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(UGLY_SOUP); + return dComIfGs_checkBottle(UGLY_SOUP); } int item_getcheck_func_HOT_SPRING(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING); + return dComIfGs_checkBottle(HOT_SPRING); } int item_getcheck_func_FAIRY_BOTTLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY); + return dComIfGs_checkBottle(FAIRY); } int item_getcheck_func_HOT_SPRING2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING); + return dComIfGs_checkBottle(HOT_SPRING); } int item_getcheck_func_OIL2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL2); + return dComIfGs_checkBottle(OIL2); } int item_getcheck_func_OIL(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL); + return dComIfGs_checkBottle(OIL); } void item_getcheck_func_NORMAL_BOMB(void) { @@ -1298,11 +1230,11 @@ void item_getcheck_func_POKE_BOMB(void) { } int item_getcheck_func_FAIRY_DROP(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY_DROP); + return dComIfGs_checkBottle(FAIRY_DROP); } int item_getcheck_func_WORM(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(WORM); + return dComIfGs_checkBottle(WORM); } void item_getcheck_func_DROP_BOTTLE(void) { @@ -1314,27 +1246,27 @@ int item_getcheck_func_BEE_CHILD(void) { } int item_getcheck_func_CHUCHU_RARE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE); + return dComIfGs_checkBottle(CHUCHU_RARE); } int item_getcheck_func_CHUCHU_RED(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RED); + return dComIfGs_checkBottle(CHUCHU_RED); } int item_getcheck_func_CHUCHU_BLUE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE); + return dComIfGs_checkBottle(CHUCHU_BLUE); } int item_getcheck_func_CHUCHU_GREEN(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN); + return dComIfGs_checkBottle(CHUCHU_GREEN); } int item_getcheck_func_CHUCHU_YELLOW(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW); + return dComIfGs_checkBottle(CHUCHU_YELLOW); } int item_getcheck_func_CHUCHU_PURPLE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_PURPLE); + return dComIfGs_checkBottle(CHUCHU_PURPLE); } void item_getcheck_func_LV1_SOUP(void) { @@ -1350,42 +1282,35 @@ void item_getcheck_func_LV3_SOUP(void) { } bool item_getcheck_func_LETTER(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true) == - LETTER; + return dComIfGs_getItem(SLOT_21, true) == LETTER; } bool item_getcheck_func_BILL(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true) == - BILL; + return dComIfGs_getItem(SLOT_21, true) == BILL; } bool item_getcheck_func_WOOD_STATUE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true) == - WOOD_STATUE; + return dComIfGs_getItem(SLOT_21, true) == WOOD_STATUE; } bool item_getcheck_func_IRIAS_PENDANT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true) == - IRIAS_PENDANT; + return dComIfGs_getItem(SLOT_21, true) == IRIAS_PENDANT; } bool item_getcheck_func_HORSE_FLUTE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true) == - HORSE_FLUTE; + return dComIfGs_getItem(SLOT_22, true) == HORSE_FLUTE; } bool item_getcheck_func_RAFRELS_MEMO(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true) == - RAFRELS_MEMO; + return dComIfGs_getItem(SLOT_19, true) == RAFRELS_MEMO; } bool item_getcheck_func_ASHS_SCRIBBLING(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true) == - ASHS_SCRIBBLING; + return dComIfGs_getItem(SLOT_19, true) == ASHS_SCRIBBLING; } int item_getcheck_func_CHUCHU_YELLOW2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW2); + return dComIfGs_checkBottle(CHUCHU_YELLOW2); } int item_getcheck_func_OIL_BOTTLE3(void) { @@ -1397,23 +1322,23 @@ int item_getcheck_func_SHOP_BEE_CHILD(void) { } int item_getcheck_func_CHUCHU_BLACK(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK); + return dComIfGs_checkBottle(CHUCHU_BLACK); } void item_getcheck_func_LIGHT_DROP(void) { g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LIGHT_DROP); } -void item_getcheck_func_DROP_CONTAINER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(FARON_VESSEL); +BOOL item_getcheck_func_DROP_CONTAINER(void) { + return dComIfGs_isLightDropGetFlag(FARON_VESSEL); } -void item_getcheck_func_DROP_CONTAINER02(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(ELDIN_VESSEL); +BOOL item_getcheck_func_DROP_CONTAINER02(void) { + return dComIfGs_isLightDropGetFlag(ELDIN_VESSEL); } -void item_getcheck_func_DROP_CONTAINER03(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(LANAYRU_VESSEL); +BOOL item_getcheck_func_DROP_CONTAINER03(void) { + return dComIfGs_isLightDropGetFlag(LANAYRU_VESSEL); } int item_getcheck_func_FILLED_CONTAINER(void) { @@ -1560,23 +1485,19 @@ int item_getcheck_func_POU_SPIRIT(void) { } bool item_getcheck_func_ANCIENT_DOCUMENT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true) == - ANCIENT_DOCUMENT; + return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT; } bool item_getcheck_func_AIR_LETTER(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true) == - AIR_LETTER; + return dComIfGs_getItem(SLOT_22, true) == AIR_LETTER; } bool item_getcheck_func_ANCIENT_DOCUMENT2(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true) == - ANCIENT_DOCUMENT2; + return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT2; } bool item_getcheck_func_LV7_DUNGEON_EXIT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true) == - LV7_DUNGEON_EXIT; + return dComIfGs_getItem(SLOT_18, true) == LV7_DUNGEON_EXIT; } int item_getcheck_func_LINKS_SAVINGS(void) { @@ -1643,8 +1564,8 @@ void item_getcheck_func_KEY_OF_CARAVAN(void) { g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(KEY_OF_CARAVAN); } -void item_getcheck_func_LV2_BOSS_KEY(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG); +bool item_getcheck_func_LV2_BOSS_KEY(void) { + return dComIfGs_isDungeonItemBossKey(); } int item_getcheck_func_KEY_OF_FILONE(void) { diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index b2ac59c422a..e788fc4be9b 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -41,8 +41,8 @@ void dSv_player_status_a_c::init() { this->mEquipment[3] = NO_ITEM; this->mEquipment[4] = NO_ITEM; this->mCurrentWallet = WALLET; - this->unk26 = 0; - this->unk27 = 0; + this->mMaxMagic = 0; + this->mCurrentMagic = 0; this->mMagicFlag = 0; this->unk29 = 0; this->unk30 = 0;