d_s_menu work

include/JSystem/JKernel/JKRAram.h

@@ -86,6 +86,10 @@ inline JKRAramBlock *JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKR
     return JKRAram::mainRamToAram(buf, bufSize, alignedSize, expandSwitch, fileSize, heap, id);
 }
 
+inline JKRAramBlock* JKRMainRamToAram(u8* buf, JKRAramBlock* block, u32 size, JKRExpandSwitch expandSwitch, u32 fileSize, JKRHeap* heap, int id) {
+    return JKRAram::mainRamToAram(buf, block, size, expandSwitch, fileSize, heap, id);
+}
+
 // void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
 
 #endif /* JKRARAM_H */

include/d/d_com_inf_game.h

@@ -486,7 +486,8 @@ public:
     ItemTableList* getItemTable() { return mpItemTable; }
     void setFmapData(void * pData) { mpFmapData = pData; }
 
-    void setPictureBoxData(JKRAramBlock* aramHeap, int i) { mPictureBoxDataHeap[i] = aramHeap; }
+    JKRAramBlock* getPictureBoxData(int i) { return mPictureBoxData[i]; }
+    void setPictureBoxData(JKRAramBlock* aramBlock, int i) { mPictureBoxData[i] = aramBlock; }
     void offPictureFlag(u8 i) {
         u8 mask = (1 << i);
         mPictureFlag &= ~mask;
@@ -494,7 +495,7 @@ public:
     u8 getPictureFormat() { return mPictureFormat; }
     u8 getPictureResult() { return mPictureResult; }
     u8 getPictureResultDetail() { return mPictureResultDetail; }
-    void setBossBattleData(JKRAramBlock* aramHeap, int i) { mBossBattleDataHeap[i] = aramHeap; }
+    void setBossBattleData(JKRAramBlock* aramBlock, int i) { mBossBattleData[i] = aramBlock; }
 
     void startItemTimer() { mStartItemTimer = true; }
 
@@ -572,13 +573,13 @@ public:
     /* 0x47F8 */ JKRArchive* mpEnglishTextArchive;
 #if VERSION != VERSION_JPN
     /* 0x47FC */ JKRArchive* mpHyruleTextArchive;
-    /* 0x4800 */ JKRAramBlock* mPictureBoxDataHeap[3];
-    /* 0x480C */ JKRAramBlock* mBossBattleDataHeap[4];
+    /* 0x4800 */ JKRAramBlock* mPictureBoxData[3];
+    /* 0x480C */ JKRAramBlock* mBossBattleData[4];
     /* 0x481C */ JKRAramBlock* field_0x481c;
     /* 0x4820 */ JKRAramBlock* field_0x4820;
 #else
-    /* 0x47FC */ JKRAramBlock* mPictureBoxDataHeap[3];
-    /* 0x480C */ JKRAramBlock* mBossBattleDataHeap[4];
+    /* 0x47FC */ JKRAramBlock* mPictureBoxData[3];
+    /* 0x480C */ JKRAramBlock* mBossBattleData[4];
 #endif
     /* Offsets below are for USA/PAL */
 
@@ -2550,8 +2551,12 @@ inline u8 dComIfGp_getMesgStatus() {
     return g_dComIfG_gameInfo.play.getMesgStatus();
 }
 
-inline void dComIfGp_setPictureBoxData(JKRAramBlock* aramHeap, int i) {
-    g_dComIfG_gameInfo.play.setPictureBoxData(aramHeap, i);
+inline JKRAramBlock* dComIfGp_getPictureBoxData(int i) {
+    return g_dComIfG_gameInfo.play.getPictureBoxData(i);
+}
+
+inline void dComIfGp_setPictureBoxData(JKRAramBlock* aramBlock, int i) {
+    g_dComIfG_gameInfo.play.setPictureBoxData(aramBlock, i);
 }
 
 inline void dComIfGp_offPictureFlag(u8 i) {
@@ -2570,8 +2575,8 @@ inline u8 dComIfGp_getPictureResultDetail() {
     return g_dComIfG_gameInfo.play.getPictureResultDetail();
 }
 
-inline void dComIfGp_setBossBattleData(JKRAramBlock* aramHeap, int i) {
-    g_dComIfG_gameInfo.play.setBossBattleData(aramHeap, i);
+inline void dComIfGp_setBossBattleData(JKRAramBlock* aramBlock, int i) {
+    g_dComIfG_gameInfo.play.setBossBattleData(aramBlock, i);
 }
 
 inline u8 dComIfGp_getButtonActionMode() {

include/d/d_file_select.h

@@ -222,9 +222,12 @@ public:
     /* 0x3908 */ char* field_0x3908;
     /* 0x390C */ STControl* stick;
     /* 0x3910 */ STControl* stick2;
-    /* 0x3914 */ u8 field_0x3914[0x3921 - 0x3914];
+    /* 0x3914 */ u8 field_0x3914[3];
+    /* 0x3917 */ u8 field_0x3917[0x391A - 0x3917];
+    /* 0x391A */ u8 saveStatus[3];
+    /* 0x391D */ u8 field_0x391D[0x3921 - 0x391D];
     /* 0x3921 */ u8 field_0x3921;
-    /* 0x3922 */ u8 field_0x3922;
+    /* 0x3922 */ u8 saveSlot;
     /* 0x3923 */ u8 field_0x3923;
     /* 0x3924 */ u8 field_0x3924[0x3927 - 0x3924];
     /* 0x3927 */ u8 field_0x3927;

include/d/d_name.h

@@ -67,7 +67,11 @@ public:
 
     /* 0x0004 */ u8 field_0x4[0x0008 - 0x0004];
     /* 0x0008 */ dDlst_NameIN_c field_0x8;
-    /* 0x000C */ u8 field_0xc[0x2AD0 - 0x000C];
+    /* 0x000C */ u8 field_0xc[0x290B - 0x000C];
+    /* 0x290B */ u8 field_0x290b;
+    /* 0x290C */ u8 field_0x290c[0x2A5C - 0x290C];
+    /* 0x2A5C */ char field_0x2a5c[8];
+    /* 0x2A64 */ u8 field_0x2964[0x2AD0 - 0x2A64];
     /* 0x2AD0 */ char field_0x2ad0[0x2AE8 - 0x2AD0];
 };
 

include/d/d_s_menu.h

@@ -42,9 +42,9 @@ public:
     /* 0x1CC */ mDoDvdThd_toMainRam_c* command;
     /* 0x1D0 */ mDoDvdThd_toMainRam_c* fontCommand;
     /* 0x1D4 */ menu_inf* info;
-    /* 0x1D8 */ ResFONT* field_0x1d8;
-    /* 0x1DC */ myFontClass* field_0x1dc;
-    /* 0x1E0 */ u8 field_0x1e0;
+    /* 0x1D8 */ ResFONT* fontRes;
+    /* 0x1DC */ myFontClass* font;
+    /* 0x1E0 */ u8 startCode;
     /* 0x1E1 */ u8 field_0x1e1;
     /* 0x1E2 */ u8 field_0x1e2;
 };

include/d/d_s_name.h

@@ -164,13 +164,14 @@ public:
     /* 0x55D */ u8 field_0x55d;
     /* 0x55E */ u8 field_0x55e;
     /* 0x55F */ u8 field_0x55f;
-    /* 0x560 */ u8 field_0x560[0x1650];
+    /* 0x560 */ u8 saveMemory[0x1650];
     /* 0x1BB0 */ void* savePicDatabuf;
     /* 0x1BB4 */ short field_0x1bb4;
     /* 0x1BB6 */ u8 field_0x1bb6;
     /* 0x1BB7 */ u8 field_0x1bb7;
     /* 0x1BB8 */ u8 field_0x1bb8;
-    /* 0x1BB9 */ u8 field_0x1bb9[0x1BBC - 0x1BB9];
+    /* 0x1BB9 */ u8 field_0x1bb9;
+    /* 0x1BBA */ u8 field_0x1bba[0x1BBC - 0x1BBA];
     /* 0x1BBC */ int field_0x1bbc;
 };
 

include/m_Do/m_Do_MemCardRWmng.h

@@ -16,7 +16,7 @@ void mDoMemCdRWm_SetCardStat(CARDFileInfo*);
 void mDoMemCdRWm_CheckCardStat(CARDFileInfo*);
 void mDoMemCdRWm_CalcCheckSum(void*, u32);
 void mDoMemCdRWm_CalcCheckSumPictData(void*, u32);
-void mDoMemCdRWm_TestCheckSumPictData(void*);
+BOOL mDoMemCdRWm_TestCheckSumPictData(void*);
 void mDoMemCdRWm_SetCheckSumPictData(u8*);
 void mDoMemCdRWm_CalcCheckSumGameData(void*, u32);
 void mDoMemCdRWm_TestCheckSumGameData(void*);