d_file_select work + misc changes (#1873)

* setup TU

* JASResArcLoader OK

* d_a_obj_stoneMark work

* some funcs in d_a_obj_stoneMark

* many changes

* quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile

* d_file_select functions + pr cleanup

* match many dfile_select_c methods

* m_Do_main OK

* selFileWakuAnm & bookIconAnm

* selCopyFileWakuAnm & copyBookIconAnm

* dataDelEffAnm & dataCopyEffAnm

* selectDataBaseMoveAnmInitSet & selectDataBaseMoveAnm

* dataSelectIn

* _move & dataSelectInit

* match a few more

* comment

* J2DPicture::drawTexCoord

* draw_function

* dScnPly_Create + fix typing on request_of_phase_process_fn

* checkpoint

* checkpoint

* checkpoint

* checkpoint 2 (fixed)

* dFile_select_c::dataSelectAnmSet

* dFile_select_c::selectDataOpenMove

* dFile_select_c::copySelMoveAnmInitSet

* fix brightcheck issues

* rm comments, fix status update

* small mod to pr template

10 files changed, 238 insertions, 87 deletions

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 78d2775b0f..0178c53612 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -788,7 +788,7 @@ extern GXColor g_blackColor;
 extern GXColor g_clearColor;
 extern GXColor g_whiteColor;
 
-int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn, void*);
+int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
 BOOL dComIfG_resetToOpening(scene_class* scene);
 char* dComIfG_getRoomArcName(int roomNo);
 void* dComIfG_getStageRes(char const* resName);
@@ -1497,6 +1497,10 @@ inline void dComIfGs_setNewFile(u8 i_fileNo) {
     return g_dComIfG_gameInfo.info.setNewFile(i_fileNo);
 }
 
+inline void dComIfGs_i_setNewFile(u8 i_fileNo) {
+    return g_dComIfG_gameInfo.info.setNewFile(i_fileNo);
+}
+
 inline char* dComIfGs_getPlayerName() {
     return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName();
 }
@@ -1527,6 +1531,14 @@ inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos
                                                                          i_point, i_region);
 }
 
+inline void dComIfGs_setPlayerName(const char* i_name) {
+    g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setPlayerName(i_name);
+}
+
+inline void dComIfGs_setHorseName(const char* i_name) {
+    g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setHorseName(i_name);
+}
+
 inline void dComIfGs_setStartPoint(s16 i_point) {
     g_dComIfG_gameInfo.info.getRestart().setStartPoint(i_point);
 }
@@ -1671,6 +1683,10 @@ inline u8 dComIfGs_getNewFile() {
     return g_dComIfG_gameInfo.info.getNewFile();
 }
 
+inline u8 dComIfGs_getNoFile() {
+    return g_dComIfG_gameInfo.info.getNoFile();
+}
+
 inline void dComIfGs_setInitDataToCard(u8* i_saveData, int i_dataNum) {
     g_dComIfG_gameInfo.info.initdata_to_card((char*)i_saveData, i_dataNum);
 }
diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h
index cb1278cb35..52dc8ba14a 100644
--- a/include/d/d_bright_check.h
+++ b/include/d/d_bright_check.h
@@ -2,5 +2,23 @@
 #define D_D_BRIGHT_CHECK_H
 
 #include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+
+// class dBrightCheck_c {
+// public:
+//     /* 80192F10 */ dBrightCheck_c(JKRArchive*);
+//     /* 80192F98 */ ~dBrightCheck_c();
+//     /* 80193030 */ void screenSet();
+//     /* 801934D0 */ void _move();
+//     /* 80193508 */ void modeWait();
+//     /* 8019350C */ void modeMove();
+//     /* 80193594 */ void _draw();
+
+//     bool isEnd() { return mEnd; }
+
+//     void* vtable;
+//     /* 0x04 */ u8 field_0x4[0x15];
+//     /* 0x19 */ bool mEnd;
+// };
 
 #endif /* D_D_BRIGHT_CHECK_H */
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index dddaaa9c5c..0d183141c6 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -12,7 +12,8 @@ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
 BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
                                 cXyz const* param_3);
 
-struct STControl {
+class STControl {
+public:
     STControl() {
         setWaitParm(15, 15, 0, 0, 0.9f, 0.5f, 0, 0x2000);
         init();
diff --git a/include/d/d_name.h b/include/d/d_name.h
index d2150301ec..a84c60e5d9 100644
--- a/include/d/d_name.h
+++ b/include/d/d_name.h
@@ -3,6 +3,8 @@
 
 #include "d/d_drawlist.h"
 #include "dolphin/types.h"
+#include "d/d_select_cursor.h"
+#include "MSL_C/string.h"
 
 class CPaneMgr;
 class CPaneMgrAlpha;
@@ -11,7 +13,6 @@ class J2DAnmTextureSRTKey;
 class J2DTextBox;
 class JUTFont;
 struct STControl;
-class dSelect_cursor_c;
 
 class dNm_HIO_c {
 public:
@@ -61,15 +62,15 @@ public:
     };
 
     enum {
-        MOJI_HIRA,
-        MOJI_KATA,
-        MOJI_EIGO,
+        MOJI_HIRA, // hiragana characters
+        MOJI_KATA, // katakana characters
+        MOJI_EIGO, // english characters
     };
 
     enum {
-        MENU_HIRA,
-        MENU_KATA,
-        MENU_EIGO,
+        MENU_HIRA, // hiragana menu
+        MENU_KATA, // katakana menu
+        MENU_EIGO, // english menu
         MENU_END,
     };
 
@@ -115,6 +116,13 @@ public:
 
     /* 8024E468 */ virtual ~dName_c();
 
+    u8 getCurPos() { return mCurPos; }
+    u8 isInputEnd() { return mIsInputEnd; }
+    char* getInputStrPtr() { return mInputStr; }
+    void hideIcon() { mSelIcon->setAlphaRate(0.0f); }
+    void setNextNameStr(char* i_name) { strcpy(mNextNameStr,i_name); }
+    void draw() { _draw(); }
+
 private:
     /* 0x004 */ STControl* stick;
     /* 0x008 */ JKRArchive* archive;
diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h
index 060b90517f..babb6bbde4 100644
--- a/include/d/file/d_file_sel_info.h
+++ b/include/d/file/d_file_sel_info.h
@@ -24,6 +24,7 @@ public:
     void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; }
     CPaneMgrAlpha* getDatBase() { return mDatBase; }
     CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; }
+    void draw() { _draw(); }
 
 private:
     /* 0x04 */ JKRArchive* mArchive;
diff --git a/include/d/file/d_file_sel_warning.h b/include/d/file/d_file_sel_warning.h
index d347b7ee86..c1143545ef 100644
--- a/include/d/file/d_file_sel_warning.h
+++ b/include/d/file/d_file_sel_warning.h
@@ -24,6 +24,7 @@ public:
     /* 80191C18 */ virtual ~dFile_warning_c();
 
     u8 getStatus() { return mStatus; }
+    void draw() { _draw(); }
 
     u8 field_0x4[0x3D - 0x4];
     /* 0x3D */ u8 mStatus;
diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h
index 5c274e7574..65fdb5b7ef 100644
--- a/include/d/file/d_file_select.h
+++ b/include/d/file/d_file_select.h
@@ -2,24 +2,13 @@
 #define D_FILE_D_FILE_SELECT_H
 
 #include "dolphin/types.h"
-#include "global.h"
-
-class CPaneMgr;
-class CPaneMgrAlpha;
-class J2DAnmBase;
-class J2DAnmTransform;
-class J2DPane;
-class J2DPicture;
-class J2DScreen;
-class JKRArchive;
-class JUTFont;
-struct STControl;
-struct cXyz;
-class dFile_warning_c;
-class dMsgString_c;
-class dName_c;
-class dSelect_cursor_c;
-class dSv_save_c;
+#include "d/com/d_com_inf_game.h"
+#include "m_Do/m_Do_MemCard.h"
+#include "d/file/d_file_sel_warning.h"
+#include "d/d_name.h"
+#include "d/msg/d_msg_string.h"
+#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
+#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
 
 class dDlst_FileSel_c {
 public:
@@ -30,7 +19,8 @@ public:
     /* 0x04 */ J2DScreen* mpScreen;
 };
 
-struct dFile_select3D_c {
+class dFile_select3D_c {
+public:
     /* 801902F0 */ dFile_select3D_c();
     /* 80190380 */ ~dFile_select3D_c();
     /* 801903DC */ void _create(u8, u8);
@@ -46,9 +36,33 @@ struct dFile_select3D_c {
     /* 80190D68 */ void createMirrorModel();
     /* 80190FE8 */ void toItem3Dpos(f32, f32, f32, cXyz*);
     /* 801910D4 */ void calcViewMtx(f32 (*)[4]);
+
+    void drawOff() { mpModel = 0; }
+
+    /* 0x0000 */ void* vtable;
+    /* 0x0004 */ JKRSolidHeap* mpHeap;
+    /* 0x0008 */ J3DModel* mpModel;
+    /* 0x000C */ mDoExt_bckAnm* mBckAnm;
+    /* 0x0010 */ mDoExt_brkAnm* mBrkAnm;
+    /* 0x0014 */ J3DLightInfo mLightInfo;
+    /* 0x0048 */ u8 field_0x0048[0x0088 - 0x0048];
+    /* 0x0088 */ J3DLightObj mLightObjects[6];
+    /* 0x0340 */ u8 field_0x0340[0x039C - 0x0340];
+    /* 0x039C */ J2DPane* pane;
+    /* 0x03A0 */ u8 field_0x03A0[0x03A4 - 0x03A0];
+    /* 0x03A4 */ cXyz field_0x03a4;
+    /* 0x03B0 */ csXyz field_0x03b0;
+    /* 0x03B6 */ u8 padding[2];
+    /* 0x03B8 */ cXyz field_0x03b8;
+    /* 0x03C4 */ float field_0x03c4;
+    /* 0x03C8 */ float field_0x03c8;
+    /* 0x03CC */ u8 field_0x03CC[0x03CE - 0x03CC];
+    /* 0x03CE */ u8 mMirrorIdx;
+    /* 0x03CF */ u8 mMaskIdx;
 };
 
-struct dDlst_FileSelYn_c {
+class dDlst_FileSelYn_c {
+public:
     /* 8018E0C0 */ void draw();
     /* 801911F4 */ ~dDlst_FileSelYn_c();
 
@@ -57,7 +71,8 @@ struct dDlst_FileSelYn_c {
     /* 0x08 */ u8 field_0x08[4];
 };
 
-struct dDlst_FileSelDt_c {
+class dDlst_FileSelDt_c {
+public:
     /* 8018DEF4 */ void draw();
     /* 801912E4 */ ~dDlst_FileSelDt_c();
 
@@ -67,7 +82,8 @@ struct dDlst_FileSelDt_c {
     /* 0x0C */ u8 field_0x0c[4];
 };
 
-struct dDlst_FileSelCp_c {
+class dDlst_FileSelCp_c {
+public:
     /* 8018DFFC */ void draw();
     /* 8019126C */ ~dDlst_FileSelCp_c();
 
@@ -78,7 +94,8 @@ struct dDlst_FileSelCp_c {
     /* 0x10 */ J2DPane* mpPane2;
 };
 
-struct dDlst_FileSel3m_c {
+class dDlst_FileSel3m_c {
+public:
     /* 8018E0F8 */ void draw();
     /* 8019117C */ ~dDlst_FileSel3m_c();
 
@@ -86,10 +103,13 @@ struct dDlst_FileSel3m_c {
     /* 0x04 */ J2DScreen* mpScreen;
 };
 
-struct dFile_info_c {
+class dFile_info_c {
+public:
     /* 80192434 */ dFile_info_c(JKRArchive*, u8);
     /* 80192954 */ void setSaveData(dSv_save_c*, int, u8);
     /* 80192D60 */ void _draw();
+
+    void draw() { _draw(); }
 };
 
 // temp struct in order to get matches
@@ -163,14 +183,14 @@ public:
     /* 80184B44 */ void dataDelEffAnm();
     /* 80184BFC */ void dataCopyEffAnm();
     /* 80184CB4 */ void selectDataBaseMoveAnmInitSet(int, int);
-    /* 80184D4C */ void selectDataBaseMoveAnm();
+    /* 80184D4C */ bool selectDataBaseMoveAnm();
     /* 80184E38 */ void dataSelectInAnmSet();
     /* 80185040 */ void dataSelectIn();
     /* 80185230 */ void dataSelectInit();
     /* 801853C4 */ void dataSelect();
     /* 80185508 */ void dataSelectStart();
     /* 80185994 */ void selectDataMoveAnmInitSet(int, int);
-    /* 80185AAC */ void selectDataMoveAnm();
+    /* 80185AAC */ bool selectDataMoveAnm();
     /* 80185C2C */ void dataSelectAnmSet();
     /* 80185DE0 */ void dataSelectMoveAnime();
     /* 80186088 */ void makeRecInfo(u8);
@@ -205,7 +225,7 @@ public:
     /* 8018832C */ void copyDataToSelectMoveAnmSet();
     /* 801884D0 */ void copyDataToSelectMoveAnm();
     /* 80188834 */ void copySelectWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 80188878 */ void copySelectWakuAlpahAnm(u8);
+    /* 80188878 */ bool copySelectWakuAlpahAnm(u8);
     /* 80188950 */ void getCptoNum(u8);
     /* 80188994 */ void copyToSelBack();
     /* 80188B54 */ void copyToSelPaneMove();
@@ -252,10 +272,10 @@ public:
     /* 8018D4F8 */ void ketteiTxtDispAnmInit(u8);
     /* 8018D574 */ bool ketteiTxtDispAnm();
     /* 8018D650 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 8018D68C */ void selectWakuAlpahAnm(u8);
+    /* 8018D68C */ bool selectWakuAlpahAnm(u8);
     /* 8018D764 */ void selFileCursorShow();
     /* 8018D884 */ void menuWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 8018D8C8 */ void menuWakuAlpahAnm(u8);
+    /* 8018D8C8 */ bool menuWakuAlpahAnm(u8);
     /* 8018DA10 */ void menuCursorShow();
     /* 8018DB80 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
     /* 8018DBCC */ void yesnoWakuAlpahAnm(u8);
@@ -302,7 +322,7 @@ public:
     /* 8018FD30 */ void errorTxtChangeAnm();
     /* 8018FE18 */ bool fileRecScaleAnm();
     /* 8018FE64 */ void fileRecScaleAnmInitSet2(f32, f32);
-    /* 8018FEF4 */ void fileRecScaleAnm2();
+    /* 8018FEF4 */ bool fileRecScaleAnm2();
     /* 8018FF9C */ bool fileInfoScaleAnm();
     /* 80190074 */ void nameMoveAnmInitSet(int, int);
     /* 80190124 */ bool nameMoveAnm();
@@ -328,23 +348,33 @@ public:
     /* 0x0034 */ dDlst_FileSelCp_c mFileSelCopyDlst;     
     /* 0x0048 */ dDlst_FileSelYn_c mFileSelYesNoDlst;    
     /* 0x0054 */ dDlst_FileSel3m_c mFileSel3mDlst;       
-    /* 0x005C */ u8 field_0x00[4];                       
+    /* 0x005C */ u8 field_0x005c[4];                       
     /* 0x0060 */ dSelect_cursor_c* mpCursor1;            
     /* 0x0064 */ dSelect_cursor_c* mpCursor2;            
     /* 0x0068 */ dName_c* mpName;                        
     /* 0x006C */ dFile_warning_c* mpFileWarning;         
     /* 0x0070 */ u8 field_0x70[0xc];                     
     /* 0x007C */ dFile_info_c* mpFileInfo[2];            
-    /* 0x0084 */ J2DAnmBase* mpAnmBase[7];               
-    /* 0x00A0 */ u8 field_0xa0[4];                       
-    /* 0x00A4 */ CPaneMgr* mpPaneMgr1;                    
-    /* 0x00A8 */ u8 field_0xa8[0xbc-0xa8];               
-    /* 0x00BC */ CPaneMgr* mpPaneMgrs[4];
+    /* 0x0084 */ J2DAnmTransform* mpAnmBase[7]; // this might be 7 individual pointers and not an array              
+    /* 0x00A0 */ u8 field_0x00a0[4];                       
+    /* 0x00A4 */ CPaneMgr* field_0x00a4;                    
+    /* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8];               
+    /* 0x00B0 */ s32 field_0x00b0;
+    /* 0x00B4 */ s32 field_0x00b4;
+    /* 0x00B8 */ u8 field_0x00b8;
+    /* 0x00B9 */ u8 field_0x00b9;
+    /* 0x00BA */ u8 field_0x00ba;
+    /* 0x00BB */ u8 field_0x00bb;
+    /* 0x00BC */ CPaneMgr* field_0x00bc[3];
+    /* 0x00C8 */ f32 field_0x00c8;
     /* 0x00CC */ u8 field_0x00cc[8];
     /* 0x00D4 */ float field_0x00d4;
-    /* 0x00D8 */ u8 field_0xd8[0x108 - 0xd8];
-    /* 0x0108 */ bool field_0x108;                       
-    /* 0x0109 */ bool field_0x109;                       
+    /* 0x00D8 */ u8 field_0x00d8[8];
+    /* 0x00E0 */ s32 field_0x00e0[3];
+    /* 0x00EC */ s32 field_0x00ec;
+    /* 0x00F0 */ u8 field_0x00f0[0x108 - 0xf0];
+    /* 0x0108 */ bool field_0x0108;                       
+    /* 0x0109 */ bool field_0x0109;                       
     /* 0x010A */ u8 field_0x10a[2];                      
     /* 0x010C */ J2DPane* mpPane;                        
     /* 0x0110 */ int field_0x0110;
@@ -365,80 +395,98 @@ public:
     /* 0x0188 */ CPaneMgr* field_0x0188[3];
     /* 0x0194 */ u8 field_0x0194[0x01C8 - 0x0194];
     /* 0x01C8 */ J2DAnmBase* field_0x01c8;
-    /* 0x01CC */ u8 field_0x01CC[0x01D0 - 0x01CC];
+    /* 0x01CC */ s32 field_0x01cc;
     /* 0x01D0 */ J2DAnmBase* field_0x01d0;
-    /* 0x01D4 */ u8 field_0x01D4[0x01D8 - 0x01D4];
+    /* 0x01D4 */ s32 field_0x01d4;
     /* 0x01D8 */ J2DAnmBase* field_0x01d8;
-    /* 0x01DC */ u8 field_0x01DC[0x01E0 - 0x01DC];
+    /* 0x01DC */ s32 field_0x01dc;
     /* 0x01E0 */ J2DAnmBase* field_0x01e0;
-    /* 0x01E4 */ u8 field_0x01E4[0x01E8 - 0x01E4];
+    /* 0x01E4 */ s32 field_0x01e4;
     /* 0x01E8 */ J2DAnmBase* field_0x01e8;
-    /* 0x01EC */ u8 field_0x01EC[0x01F0 - 0x01EC];
+    /* 0x01EC */ s32 field_0x01ec;
     /* 0x01F0 */ J2DAnmBase* field_0x01f0;
-    /* 0x01F4 */ u8 field_0x01F4[0x01F8 - 0x01F4];
+    /* 0x01F4 */ s32 field_0x01f4;
     /* 0x01F8 */ J2DAnmBase* field_0x01f8;
-    /* 0x01FC */ u8 field_0x01FC[0x0200 - 0x01FC];
+    /* 0x01FC */ s32 field_0x01fc;
     /* 0x0200 */ J2DAnmBase* field_0x0200;
-    /* 0x0204 */ u8 field_0x0204[8];
+    /* 0x0204 */ s32 field_0x0204;
+    /* 0x0208 */ u8 field_0x0208;
+    /* 0x0209 */ u8 field_0x0209;
+    /* 0x020A */ u8 field_0x020a;
+    /* 0x020B */ u8 field_0x020b;
     /* 0x020C */ CPaneMgrAlpha* field_0x020c;
     /* 0x0210 */ u8 field_0x0210[0x021C - 0x0210];
     /* 0x021C */ u8 field_0x021c;
     /* 0x021D */ u8 field_0x021d;
-    /* 0x021E */ u8 field_0x021e[0x0238 - 0x021E];
+    /* 0x021E */ u8 field_0x021e;
+    /* 0x021F */ u8 field_0x021f;
+    /* 0x0220 */ CPaneMgrAlpha* field_0x0220[3];
+    /* 0x022C */ CPaneMgrAlpha* field_0x022c[3];
     /* 0x0238 */ CPaneMgrAlpha* field_0x0238;
     /* 0x023C */ CPaneMgrAlpha* field_0x023c;
     /* 0x0240 */ CPaneMgrAlpha* field_0x0240;
     /* 0x0244 */ CPaneMgrAlpha* field_0x0244;
     /* 0x0248 */ u8 field_0x0248[0x024A - 0x0248];
     /* 0x024A */ bool field_0x024a;
-    /* 0x024B */ u8 field_0x024B[0x0250 - 0x024B];
+    /* 0x024B */ u8 field_0x024b;
+    /* 0x024C */ u8 field_0x024c;
+    /* 0x024B */ u8 field_0x024d[3];
     /* 0x0250 */ char* field_0x0250;
     /* 0x0254 */ STControl* mStick;
     /* 0x0258 */ u8 mDataNew[3];
     /* 0x025B */ u8 field_0x025b[3];
-    /* 0x025C */ u8 field_0x025e[0x0264 - 0x025E];
-    /* 0x0264 */ u8 field_0x0264;
-    /* 0x0265 */ u8 mSelectNum;
-    /* 0x0266 */ u8 field_0x0266;
-    /* 0x0267 */ u8 field_0x0267;
+    /* 0x025C */ u8 field_0x025e[0x0264 - 0x025e];
+    /* 0x0264 */ u8 mLastSelectNum; // previously selected quest log
+    /* 0x0265 */ u8 mSelectNum; // currently selected quest log
+    /* 0x0266 */ u8 mLastSelectMenuNum; // previously select menu number (for copy / start / delete)
+    /* 0x0267 */ u8 mSelectMenuNum; // currently selected menu number  (for copy / start / delete)
     /* 0x0268 */ u8 field_0x0268[0x026A - 0x0268];
     /* 0x026A */ u8 field_0x026a;
     /* 0x026B */ u8 field_0x026b[0x026e - 0x026b];
     /* 0x026E */ u8 field_0x026e;
     /* 0x026F */ u8 field_0x026f;
     /* 0x0270 */ bool mSelectEnd;
-    /* 0x0271 */ u8 field_0x0271[0x0283 - 0x0271];
+    /* 0x0271 */ u8 field_0x0271;
+    /* 0x0272 */ u8 field_0x0272[0x0281 - 0x0272];
+    /* 0x0281 */ bool field_0x0281;
+    /* 0x0282 */ bool field_0x0282;
     /* 0x0283 */ bool field_0x0283;
     /* 0x0284 */ u8 field_0x0284[0x029C - 0x0284];
-    /* 0x029C */ J2DAnmBase* field_0x029c;
-    /* 0x02A0 */ J2DAnmBase* field_0x02a0;
-    /* 0x02A4 */ u8 field_0x02A4[0x02E8 - 0x02A4];
+    /* 0x029C */ J2DAnmTransform* field_0x029c;
+    /* 0x02A0 */ J2DAnmTransform* field_0x02a0;
+    /* 0x02A4 */ CPaneMgr* field_0x02a4[3];
+    /* 0x02B0 */ u8 field_0x02b0[0x2c0-0x2b0];
+    /* 0x02C0 */ CPaneMgr* field_0x02c0;
+    /* 0x02C4 */ CPaneMgr* field_0x02c4;
+    /* 0x02C8 */ CPaneMgr* field_0x02c8;
+    /* 0x02CC */ CPaneMgr* field_0x02cc;
+    /* 0x02D0 */ CPaneMgr* field_0x02d0;
+    /* 0x02D4 */ CPaneMgr* field_0x02d4;
+    /* 0x02D8 */ u8 field_0x02d8[0x2e8-0x2d8];
     /* 0x02E8 */ J2DAnmBase* field_0x02e8;
-    /* 0x02EC */ u8 field_0x02EC[0x02F0 - 0x02EC];
+    /* 0x02EC */ s32 field_0x02ec;
     /* 0x02F0 */ J2DAnmBase* field_0x02f0;
-    /* 0x02F4 */ u8 field_0x02F4[0x02F8 - 0x02F4];
+    /* 0x02F4 */ s32 field_0x02f4;
     /* 0x02F8 */ J2DAnmBase* field_0x02f8;
-    /* 0x02FC */ u8 field_0x02FC[0x0300 - 0x02FC];
+    /* 0x02FC */ s32 field_0x02fc;
     /* 0x0300 */ J2DAnmBase* field_0x0300;
-    /* 0x0304 */ u8 field_0x0304[0x0308 - 0x0304];
+    /* 0x0304 */ s32 field_0x0304;
     /* 0x0308 */ J2DAnmBase* field_0x0308;
-    /* 0x030C */ u8 field_0x030C[0x0310 - 0x030C];
+    /* 0x030C */ s32 field_0x030c;
     /* 0x0310 */ J2DAnmBase* field_0x0310;
     /* 0x0314 */ J2DAnmBase* field_0x0314;
     /* 0x0318 */ J2DAnmBase* field_0x0318;
-    /* 0x031C */ J2DAnmBase* field_0x031c;
+    /* 0x031C */ s32 field_0x031c; // J2DAnmTransform*?
     /* 0x0320 */ J2DAnmBase* field_0x0320;
-    /* 0x0324 */ u8 field_0x0324[0x0328 - 0x0324];
-    /* 0x0328 */ J2DAnmTransform* field_0x0328; // actually J2DAnmVtxColor?
+    /* 0x0324 */ s32 field_0x0324;
+    /* 0x0328 */ J2DAnmTransform* field_0x0328;
     /* 0x032C */ J2DAnmTransform* field_0x032c;
     /* 0x0330 */ J2DAnmBase* field_0x0330;
-    /* 0x0334 */ u8 field_0x0334[0x0338 - 0x0334];
+    /* 0x0334 */ s32 field_0x0334;
     /* 0x0338 */ J2DAnmBase* field_0x0338;
-    /* 0x033C */ u8 field_0x033c[4];
-    /* 0x0340 */ CPaneMgrAlpha* field_0x0340;
-    /* 0x0344 */ u8 field_0x0344[8];
-    /* 0x034C */ s32 field_0x034c;
-    /* 0x0350 */ u8 field_0x0350[8];
+    /* 0x033C */ s32 field_0x033c;
+    /* 0x0340 */ CPaneMgr* field_0x0340[3];
+    /* 0x034C */ s32 field_0x034c[3];
     /* 0x0358 */ int field_0x0358;
     /* 0x035C */ int field_0x035c;
     /* 0x0360 */ bool field_0x0360;
@@ -461,15 +509,19 @@ public:
     /* 0x0394 */ CPaneMgr* mpPaneMgr2;
     /* 0x0398 */ u8 field_0x0398[0x03A0 - 0x0398];
     /* 0x03A0 */ J2DAnmBase* field_0x03a0;
-    /* 0x03A4 */ u8 field_0x03A4[0x03A8 - 0x03A4];
+    /* 0x03A4 */ s32 field_0x03a4;
     /* 0x03A8 */ CPaneMgr* field_0x03a8;
     /* 0x03AC */ s16 field_0x03ac;
     /* 0x03AE */ u8 field_0x03AE[0x03B0 - 0x03AE];
     /* 0x03B0 */ u8 mUseType;
-    /* 0x03B1 */ u8 field_0x03b1[7];
+    /* 0x03B1 */ u8 field_0x03b1;
+    /* 0x03B2 */ u8 field_0x03b2[6];
     /* 0x03B8 */ char mpMemCard;
     /* 0x03B9 */ u8 field_0x03b9[3];
-    /* 0x03BC */ u8 field_0x03bc[0x2374 - 0x3BC];
+    /* 0x03BC */ u8 field_0x03bc[0x3E0 - 0x3BC];
+    /* 0x03E0 */ dSv_save_c* mpSave;
+    /* 0x03E4 */ u8 field_0x03e4[4];
+    /* 0x03E8 */ u8 field_0x03e8[0x2374 - 0x3E8];
     /* 0x2374 */ bool mFadeFlag;
     /* 0x2375 */ bool mHasDrawn;
     /* 0x2376 */ u8 field_0x2376[0x2378 - 0x2376];
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index 9ad6a76758..8b414466d3 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -565,6 +565,11 @@ inline void dMeter2Info_setScopeZoomPointer(u8 param_0) {
     g_meter2_info.setScopeZoomPointer(param_0);
 }
 
+inline void dMeter2Info_decMsgKeyWaitTimer() {
+    g_meter2_info.decMsgKeyWaitTimer();
+}
+
+const char* dMeter2Info_getNumberTextureName(int pIndex);
 inline bool dMeter2Info_isFloatingMessageVisible() {
     return g_meter2_info.isFloatingMessageVisible();
 }
diff --git a/include/d/s/d_s_name.h b/include/d/s/d_s_name.h
index fd56c05701..0c7bb5a31d 100644
--- a/include/d/s/d_s_name.h
+++ b/include/d/s/d_s_name.h
@@ -5,9 +5,14 @@
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_scene.h"
 
-class JKRExpHeap;
-class dFile_select_c;
-class dBrightCheck_c;
+class dSn_HIO_c {
+public:
+    /* 8025878C */ dSn_HIO_c();
+    /* 802592DC */ virtual ~dSn_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x5 */ u8 mFileSelWaitTime;
+};
 
 class dScnName_camera_c : public camera_process_class {
 public:
@@ -15,6 +20,49 @@ public:
     /* 80259294 */ virtual ~dScnName_camera_c() {}
 };
 
+// remove later and use header instead
+class dFile_select_c {
+public:
+    /* 8018366C */ dFile_select_c(JKRArchive*);
+    /* 8018375C */ virtual ~dFile_select_c();
+    /* 801843CC */ void _create();
+    /* 801844FC */ void _move();
+    /* 8018DD38 */ void _draw();
+
+    bool getFadeFlag() { return mFadeFlag; }
+    int isDataNew(u8 i) { return mDataNew[i]; }
+    int isSelectEnd() { return mSelectEnd; }
+    u8 getSelectNum() { return mSelectNum; }
+    void setUseType(u8 type) { mUseType = type; }
+
+private:
+    u8 field_0x4[0x254];
+    /* 0x0258 */ u8 mDataNew[3];
+    /* 0x025B */ u8 field_0x25b[0x265 - 0x25b];
+    /* 0x0265 */ u8 mSelectNum;
+    /* 0x0266 */ u8 field_0x266[0x270 - 0x266];
+    /* 0x0270 */ bool mSelectEnd;
+    /* 0x0271 */ u8 field_0x271[0x3b0 - 0x271];
+    /* 0x03B0 */ u8 mUseType;
+    /* 0x03B1 */ u8 field_0x3b1[0x2374 - 0x3b1];
+    /* 0x2374 */ bool mFadeFlag;
+    /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375];
+};
+
+// remove later and use header instead
+class dBrightCheck_c {
+public:
+    /* 80192F10 */ dBrightCheck_c(JKRArchive*);
+    /* 80192F98 */ virtual ~dBrightCheck_c();
+    /* 801934D0 */ void _move();
+    /* 80193594 */ void _draw();
+
+    bool isEnd() { return mEnd; }
+
+    u8 field_0x4[0x15];
+    /* 0x19 */ bool mEnd;
+};
+
 class dScnName_c : public scene_class {
 public:
     dScnName_c() {}
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index ded1227c7b..b45ca2ef92 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1113,6 +1113,7 @@ public:
     u8 getDataNum() const { return mDataNum; }
     void setDataNum(u8 num) { mDataNum = num; }
     void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
+    u8 getNoFile() const { return mNoFile; }
     void setNoFile(u8 file) { mNoFile = file; }
     u8 getNewFile() const { return mNewFile; }
     void setNewFile(u8 file) { mNewFile = file; }