d_s_name equivalent except PAL

7 files changed, 90 insertions, 24 deletions

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index d1997069..5d9f3715 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1833,6 +1833,11 @@ inline void dComIfGs_initDan(s8 i_stageNo) {
     g_dComIfG_gameInfo.save.initDan(i_stageNo);
 }
 
+// Name from TP
+inline void dComIfGs_resetDan() {
+    g_dComIfG_gameInfo.save.resetDan();
+}
+
 inline void dComIfGs_onActor(int i_no, int i_roomNo) {
     g_dComIfG_gameInfo.save.onActor(i_no, i_roomNo);
 }
@@ -3091,7 +3096,7 @@ inline void dComIfGp_plusMiniGameRupee(s16 count) {
 inline s32 dComIfGp_getWindowNum() { return g_dComIfG_gameInfo.play.getWindowNum(); }
 inline void dComIfGp_setWindowNum(u8 num) { g_dComIfG_gameInfo.play.setWindowNum(num); }
 inline dDlst_window_c * dComIfGp_getWindow(int idx) { return g_dComIfG_gameInfo.play.getWindow(idx); }
-inline void dComIfGp_setWindow(int idx, f32 x, f32 y, f32 w, f32 h, f32 n, f32 f, int cameraID, int mode) {
+inline void dComIfGp_setWindow(u8 idx, f32 x, f32 y, f32 w, f32 h, f32 n, f32 f, int cameraID, int mode) {
     g_dComIfG_gameInfo.play.setWindow(idx, x, y, w, h, n, f, cameraID, mode);
 }
 inline J2DOrthoGraph* dComIfGp_getCurrentGrafPort() { return g_dComIfG_gameInfo.play.getCurrentGrafPort(); }
diff --git a/include/d/d_file_error.h b/include/d/d_file_error.h
index 32d93325..02c92bd2 100644
--- a/include/d/d_file_error.h
+++ b/include/d/d_file_error.h
@@ -78,6 +78,9 @@ public:
     void _create();
     void initial();
     void _delete();
+#if VERSION == VERSION_DEMO
+    void _deleteSp();
+#endif
     void setErrMessage(u32, int);
     void closeMessage();
     void resizeMsgBoard(int);
diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h
index ec4bd28d..83939d1e 100644
--- a/include/d/d_file_select.h
+++ b/include/d/d_file_select.h
@@ -83,8 +83,27 @@ public:
     /* 0x50 */ u8 field_0x50;
     /* 0x51 */ u8 field_0x51;
     /* 0x52 */ u8 field_0x52;
-    /* 0x54 */ float field_0x54;
-    /* 0x58 */ float field_0x58;
+    /* 0x54 */ f32 field_0x54;
+    /* 0x58 */ f32 field_0x58;
+#if VERSION == VERSION_PAL
+    /* 0x5C */ u8 field_0x5c;
+    /* 0x5D */ u8 field_0x5d;
+    /* 0x5E */ u8 field_0x5e;
+    /* 0x5F */ u8 field_0x5f;
+    /* 0x60 */ s16 field_0x60;
+    /* 0x62 */ s16 field_0x62;
+    /* 0x64 */ s16 field_0x64;
+    /* 0x66 */ s16 field_0x66;
+    /* 0x68 */ s16 field_0x68;
+    /* 0x6A */ s16 field_0x6a;
+    /* 0x6C */ s16 field_0x6c;
+    /* 0x6E */ s16 field_0x6e;
+    /* 0x70 */ s16 field_0x70;
+    /* 0x72 */ s16 field_0x72;
+    /* 0x74 */ s16 field_0x74;
+    /* 0x76 */ s16 field_0x76;
+    /* 0x78 */ u8 field_0x78;
+#endif
 };
 
 class dDlst_FileSel_c : public dDlst_base_c {
@@ -103,16 +122,18 @@ public:
     void setSavePicDataPtr(u8* dataPtr) { mSavePicDataPtr = dataPtr; }
     void setUseType(u8 useType) { mUseType = useType; }
 
-    void getErrType() {}
-    void getSelectNum() {}
-    void isDataExtra(u8) {}
-    void isDataNew(u8) {}
-    void isSelectEnd() {}
+    u8 getErrType() { return errType; }
+    u8 getSelectNum() { return selectNum; }
+    BOOL isDataExtra(u8 idx) { return dataExtra[idx]; }
+    BOOL isDataNew(u8 idx) { return dataNew[idx]; }
+    u8 isSelectEnd() { return selectEnd; } // ?
 
     dFile_select_c() {}
     void _create();
     void initial();
+#if VERSION == VERSION_DEMO
     void _deleteSp();
+#endif
     void _delete();
     void _move();
     bool _open();
@@ -213,7 +234,8 @@ public:
     void ExErrorMsgPaneMove2();
 
 public:
-    /* 0x0000 */ JKRMemArchive* field_0x0;
+    /* 0x0000 */ JKRMemArchive* archive;
+private:
     /* 0x0004 */ dDlst_FileSel_c fileSel;
     /* 0x0010 */ fopMsgM_pane_class field_0x10;
     /* 0x0048 */ fopMsgM_pane_class field_0x48;
@@ -270,6 +292,9 @@ public:
     /* 0x3730 */ fopMsgM_pane_class field_0x3730;
     /* 0x3768 */ fopMsgM_pane_class field_0x3768;
     /* 0x37A0 */ fopMsgM_pane_class field_0x37a0;
+#if VERSION == VERSION_PAL
+    fopMsgM_pane_class pad[0xF]; // TODO
+#endif
     /* 0x37D8 */ JUtility::TColor field_0x37d8[11];
     /* 0x3804 */ JUtility::TColor field_0x3804[11];
     /* 0x3830 */ JUtility::TColor field_0x3830[18];
@@ -284,13 +309,13 @@ public:
     /* 0x3900 */ char* field_0x3900[3];
     /* 0x390C */ STControl* stick;
     /* 0x3910 */ STControl* stick2;
-    /* 0x3914 */ u8 field_0x3914[3];
+    /* 0x3914 */ u8 dataNew[3];
     /* 0x3917 */ u8 field_0x3917[3];
-    /* 0x391A */ u8 saveStatus[3];
+    /* 0x391A */ u8 dataExtra[3];
     /* 0x391D */ u8 field_0x391D[3];
     /* 0x3920 */ u8 field_0x3920;
     /* 0x3921 */ u8 field_0x3921;
-    /* 0x3922 */ u8 saveSlot;
+    /* 0x3922 */ u8 selectNum;
     /* 0x3923 */ s8 field_0x3923;
     /* 0x3924 */ u8 field_0x3924;
     /* 0x3925 */ u8 field_0x3925;
@@ -300,10 +325,10 @@ public:
     /* 0x3929 */ u8 field_0x3929;
     /* 0x392A */ u8 field_0x392a;
     /* 0x392B */ u8 field_0x392b;
-    /* 0x392C */ u8 field_0x392c;
+    /* 0x392C */ u8 selectEnd;
     /* 0x392D */ u8 field_0x392d;
     /* 0x392E */ u8 field_0x392e;
-    /* 0x392F */ u8 field_0x392f;
+    /* 0x392F */ u8 errType;
     /* 0x3930 */ s16 field_0x3930;
     /* 0x3932 */ s16 field_0x3932;
     /* 0x3934 */ u8 field_0x3934[0x3936 - 0x3934];
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index 686eea1a..f7d09364 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -68,8 +68,8 @@ public:
     u8* getDataBufPtr() { return dataBuf; }
     u8 getEndStatus() { return endStatus; }
     u8 getSaveStatus() { return saveStatus; }
-    void setErrorFlag(u8) {}
-    void setErrorType(u8) {}
+    void setErrorFlag(u8 i_errorFlag) { errorFlag = i_errorFlag; }
+    void setErrorType(u8 i_errorType) { errorType = i_errorType; }
     void setUseType(u8 i_useType) { useType = i_useType; }
 
     virtual ~dMenu_save_c() {}
@@ -156,7 +156,7 @@ public:
     BOOL PaneRotate(s16, u8, fopMsgM_pane_class*, f32, f32, f32, u8);
     BOOL PaneTranceMenu(s16, u8, fopMsgM_pane_class*, f32, f32, u8, int);
 
-public:
+private:
     /* 0x0004 */ JKRArchive* archive;
     /* 0x0008 */ dDlst_MenuSave_c MenuSave;
     /* 0x0014 */ fopMsgM_pane_class field_0x14[8];
@@ -193,8 +193,8 @@ public:
     /* 0x0539 */ u8 field_0x539;
     /* 0x053A */ u8 field_0x53a;
     /* 0x053B */ u8 field_0x53b;
-    /* 0x053C */ u8 field_0x53c;
-    /* 0x053D */ u8 field_0x53d;
+    /* 0x053C */ u8 errorFlag;
+    /* 0x053D */ u8 errorType;
     /* 0x0540 */ int field_0x540;
     /* 0x0544 */ s16 field_0x544;
     /* 0x0546 */ u8 field_0x546[0x0554 - 0x0546];
diff --git a/include/d/d_name.h b/include/d/d_name.h
index 85358404..438ad8ae 100644
--- a/include/d/d_name.h
+++ b/include/d/d_name.h
@@ -159,7 +159,9 @@ public:
     void displayInit();
     void NameStrSet();
 
+#if VERSION == VERSION_DEMO
     void _deleteSp();
+#endif
 
     #if VERSION <= VERSION_JPN
     BOOL checkDakuon(int, u8);
diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h
index 66c4159e..53e57816 100644
--- a/include/d/d_s_name.h
+++ b/include/d/d_s_name.h
@@ -16,6 +16,7 @@ class dMenu_save_c;
 class dMCloth_c;
 class dName_c;
 class mDoDvdThd_toMainRam_c;
+class mDoDvdThd_mountXArchive_c;
 
 class dScnName_camera_c : public camera_class {
 public:
@@ -26,7 +27,7 @@ public:
     dSn_HIO_c();
     virtual ~dSn_HIO_c() {}
 
-    void genMessage(JORMContext* ctx);
+    void genMessage(JORMContext* ctx) { UNUSED(ctx); }
 
 public:
     /* 0x04 */ s8 mNo;
@@ -74,10 +75,22 @@ class dScnName_c : public scene_class {
 public:
     ~dScnName_c();
     cPhs_State create();
+#if VERSION == VERSION_PAL
+    void bmg_data_read_all();
+    void bmg_data_set();
+    void tex_data_set();
+#endif
     void cloth_create();
     void cloth_move();
     void cloth2D_create();
     void buttonIconCreate();
+#if VERSION == VERSION_PAL
+    void buttonIconTexChange(u8, u8);
+    void PaneAlphaLangTxt(s16, u8);
+    void languageTexChange();
+    void langTexChg();
+    void langTexChgFast();
+#endif
     BOOL paneTransButtonIcon(s16, u8, f32, f32, u8);
     BOOL execute();
     void setView();
@@ -128,9 +141,21 @@ public:
     void NoneDraw();
     void changeGameScene();
 
+#if VERSION == VERSION_PAL
+    /* 0x01C4 */ mDoDvdThd_mountXArchive_c* field_0x1c4;
+    /* 0x01C8 */ mDoDvdThd_mountXArchive_c* field_0x1c8;
+    /* 0x01CC */ mDoDvdThd_mountXArchive_c* field_0x1cc;
+    /* 0x01D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0;
+    /* 0x01D4 */ mDoDvdThd_mountXArchive_c* field_0x1d4;
+    u8 pad[0x14];
+#endif
     /* 0x01C4 */ request_of_phase_process_class mPhs;
-    /* 0x01CC */ JKRHeap* heap;
+#if VERSION == VERSION_DEMO
+    /* 0x01CC */ JKRSolidHeap* heap;
+#else
+    /* 0x01CC */ JKRExpHeap* heap;
     /* 0x01D0 */ JKRHeap* oldHeap;
+#endif
     /* 0x01D4 */ dScnName_camera_c mCamera;
     /* 0x040C */ JKRMemArchive* mArchive;
     /* 0x0410 */ mDoDvdThd_toMainRam_c* field_0x410;
@@ -146,9 +171,13 @@ public:
     /* 0x04AC */ fopMsgM_pane_class field_0x4ac;
     /* 0x04E4 */ fopMsgM_pane_class field_0x4e4;
     /* 0x051C */ fopMsgM_pane_class field_0x51c;
+#if VERSION == VERSION_PAL
+    /* 0x0554 */ fopMsgM_pane_class field_0x554;
+    /* 0x058C */ fopMsgM_pane_class field_0x58C;
+#endif
     /* 0x0554 */ u8 mMainProc;
-    /* 0x0555 */ u8 field_0x555;
-    /* 0x0556 */ u8 field_0x556;
+    /* 0x0555 */ u8 mOpenProc;
+    /* 0x0556 */ u8 mMemCardCheckProc;
     /* 0x0557 */ u8 mDrawProc;
     /* 0x0558 */ u8 field_0x558;
     /* 0x0559 */ u8 field_0x559;
diff --git a/include/d/d_save.h b/include/d/d_save.h
index ab0a3a3d..f9265cef 100644
--- a/include/d/d_save.h
+++ b/include/d/d_save.h
@@ -736,6 +736,7 @@ public:
     BOOL isSwitch(int);
     BOOL revSwitch(int);
 
+    void reset() { mStageNo = -1; } // Name from TP
     u8 getGbaRupeeCount() { return mGbaRupeeCount; }
     void incGbaRupeeCount() { mGbaRupeeCount++; }
 
@@ -949,13 +950,14 @@ public:
 
     void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
     void initDan(s8 i_stage) { mDan.init(i_stage); }
+    void resetDan() { mDan.reset(); } // Name from TP
 
     u8 getDataNum() { return mDataNum; }
     void setDataNum(u8 num) { mDataNum = num; }
     u8 getNoFile() { return mNoFile; }
     void setNoFile(u8 no) { mNoFile = no; }
     u8 getNewFile() { return mNewFile; }
-    void setNewFile(u8 file) {mNewFile = file; }
+    void setNewFile(u8 file) { mNewFile = file; }
     u64 getMemCardCheckID() { return mMemCardCheckID; }
     void setMemCardCheckID(u64 id) { mMemCardCheckID = id; }