make gameinfo members private

4 files changed, 11 insertions, 2 deletions

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 e7718fd23d..e26f1357d0 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
@@ -122,6 +122,14 @@ public:
     // temp for setWarashibeItem
     void setPlayUnkWarashibe1(u8 num) { play.setUnkWarashibe1(num); }
     void setPlayUnkWarashibe2(u8 num) { play.setUnkWarashibe2(num); }
+    dSv_player_c& getPlayer() { return info.getPlayer(); }
+    dSv_save_c& getSaveFile() { return info.getSaveFile(); }
+    u32 getNowVibration() { return play.getNowVibration(); }
+    dDlst_peekZ_c& getdlstPeekZ() { return draw_list_list.dlstPeekZ; }
+    dComIfG_play_c& getPlay() { return play; }
+    dSv_memory_c& getMemory() { return info.getMemory(); }
+
+private:
     /* 0x00000 */ dSv_info_c info;
     /* 0x00EEB */ u8 field_0xeeb[0x39];
     /* 0x00F24 */ u32 saveTotalTime;
diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h
index cef7bfafaa..300f4e4d64 100644
--- a/include/d/d_save/d_save/d_save.h
+++ b/include/d/d_save/d_save/d_save.h
@@ -892,6 +892,7 @@ public:
     dSv_save_c& getSaveFile() { return save_file; }
     dSv_memory_c& getMemory() { return memory; }
     dSv_zone_c* getZones() { return zones; }
+    dSv_player_c& getPlayer() { return save_file.getPlayer(); }
 
 private:
     /* 0x000 */ dSv_save_c save_file;
diff --git a/include/functions.h b/include/functions.h
index 0eec27ff71..fde457c3c2 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -242,7 +242,7 @@ void getUsedCount__9HeapCheckCFv(void);
 void isEventBit__11dSv_event_cCFUs(void);
 void dComIfGs_setMixItemIndex(int, u8);
 void dComIfGs_setSelectItemIndex(int, u8);
-void dComIfGs_getMixItemIndex(int);
+u8 dComIfGs_getMixItemIndex(int);
 char* strcpy(char*, const char*);
 int strcmp(char*, char*);
 void setBombNum__21dSv_player_item_max_cFUcUc(void);
diff --git a/include/variables.h b/include/variables.h
index 65c367fae2..aca609c7b3 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -5,7 +5,7 @@ extern float lbl_80451D58;
 extern u8 i_item_lst[24];
 extern u8 lbl_80430188[16];
 extern u8 lbl_80379235[16];
-extern u8 lbl_80379234[0x62];
+extern char lbl_80379234[0x64];
 extern char lbl_803739A0[0x310];
 extern void* lbl_80451368;
 extern u32 _sRumbleSupported;