Misc Changes (#306)

2 files changed, 17 insertions, 0 deletions

diff --git a/include/d/com/d_com_inf_actor.h b/include/d/com/d_com_inf_actor.h
index ca9321197f..25860fd43c 100644
--- a/include/d/com/d_com_inf_actor.h
+++ b/include/d/com/d_com_inf_actor.h
@@ -3,12 +3,18 @@
 
 #include "dolphin/types.h"
 
+class dComIfGoat_info_c {
+public:
+    /* 0x0 */ int field_0x0;
+};
+
 class dComIfAc_info_c {
 public:
     /* 0x0 */ int field_0x0;
     /* 0x4 */ bool mPause;
 };
 
+extern dComIfGoat_info_c g_dComIfGoat_gameInfo;
 extern dComIfAc_info_c g_dComIfAc_gameInfo;
 
 inline bool dComIfA_PauseCheck() {
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 52f2870120..abe20294b6 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -815,6 +815,9 @@ const char* dComIfGs_getWarpStageName();
 s16 dComIfGs_getWarpPlayerAngleY();
 s8 dComIfGs_getWarpRoomNo();
 BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
+BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo);
+BOOL dComIfGs_isZoneSwitch(int,int);
+BOOL dComIfGs_isZoneItem(int,int);
 void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8);
 u16 dComIfGs_getMaxLifeGauge();
 void dComIfGs_setWarpMarkFlag(u8);
@@ -1129,6 +1132,10 @@ inline BOOL dComIfGs_isTbox(int i_no) {
     return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no);
 }
 
+inline BOOL dComIfGs_isSaveItem(int i_no) {
+    return g_dComIfG_gameInfo.info.getMemory().getBit().isItem(i_no);
+}
+
 inline BOOL dComIfGs_isSaveTbox(int i_stageNo, int i_no) {
     return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isTbox(i_no);
 }
@@ -1137,6 +1144,10 @@ inline BOOL dComIfGs_isSaveDunSwitch(int i_no) {
     return g_dComIfG_gameInfo.info.getDan().isSwitch(i_no);
 }
 
+inline BOOL dComIfGs_isSaveDunItem(int i_no) {
+    return g_dComIfG_gameInfo.info.getDan().isItem(i_no);
+}
+
 inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no) {
     g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onSwitch(i_no);
 }