diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h
index 3a216c7d4..0efe61368 100644
--- a/include/d/actor/d_a_auction.h
+++ b/include/d/actor/d_a_auction.h
@@ -7,6 +7,8 @@
 
 class daAuction_c : public fopAc_ac_c {
 public:
+    daAuction_c();
+
     void chkNpcExec(int) {}
     void getAnmNpcNo() {}
     void getAucMdlNo(unsigned char) {}
diff --git a/include/d/actor/d_a_lwood.h b/include/d/actor/d_a_lwood.h
index 3290b36a8..e30337448 100644
--- a/include/d/actor/d_a_lwood.h
+++ b/include/d/actor/d_a_lwood.h
@@ -11,8 +11,8 @@ public:
     inline BOOL _execute();
     void getYureScale() const {}
     void getYureTimer() const {}
-    void setMoveBGMtx() {}
-    void set_mtx() {}
+    void setMoveBGMtx(); // weak but not inlined?
+    void set_mtx(); // weak but not inlined?
 
     void CreateHeap();
     void CreateInit();
diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h
index 310d1f00a..d2554f60a 100644
--- a/include/d/actor/d_a_mgameboard.h
+++ b/include/d/actor/d_a_mgameboard.h
@@ -15,7 +15,7 @@ public:
     inline BOOL _delete();
     inline BOOL _draw();
     void reqClearGame() {}
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     bool checkClearGame();
     u8 getScore();
diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h
index f7eeab65c..c3a844f32 100644
--- a/include/d/actor/d_a_npc_ah.h
+++ b/include/d/actor/d_a_npc_ah.h
@@ -10,6 +10,8 @@ struct sAhAnmDat {
 
 class daNpcAh_c : public fopAc_ac_c {
 public:
+    daNpcAh_c();
+
     void getPhaseP() {}
     void setResFlag(unsigned char) {}
 
diff --git a/include/d/actor/d_a_npc_auction.h b/include/d/actor/d_a_npc_auction.h
index 521bcdc51..2da81e73e 100644
--- a/include/d/actor/d_a_npc_auction.h
+++ b/include/d/actor/d_a_npc_auction.h
@@ -9,6 +9,8 @@ struct sAnmDat {
 
 class daNpcAuction_c : public fopAc_ac_c {
 public:
+    daNpcAuction_c();
+
     inline s32 _create();
     inline BOOL _delete();
     inline BOOL _draw();
diff --git a/include/d/actor/d_a_npc_bmcon1.h b/include/d/actor/d_a_npc_bmcon1.h
index c083be031..e8dbb0581 100644
--- a/include/d/actor/d_a_npc_bmcon1.h
+++ b/include/d/actor/d_a_npc_bmcon1.h
@@ -12,6 +12,8 @@ struct sBmconAnmDat {
 
 class daNpcBmcon_c : public fopAc_ac_c {
 public:
+    daNpcBmcon_c();
+
     void getNpcNo() {}
     void getPhaseP() {}
     void get_arm_L_jnt_num() {}
diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h
index b14f3c69a..a80dddb7f 100644
--- a/include/d/actor/d_a_npc_so.h
+++ b/include/d/actor/d_a_npc_so.h
@@ -11,54 +11,9 @@ public:
         
     };
 
-    void cutAppearProc() {}
-    void cutAppearStart() {}
-    void cutDisappearProc() {}
-    void cutDisappearStart() {}
-    void cutDiveProc() {}
-    void cutDiveStart() {}
-    void cutEatesaFirstProc() {}
-    void cutEatesaFirstStart() {}
-    void cutEatesaProc() {}
-    void cutEatesaStart() {}
-    void cutEffectProc() {}
-    void cutEffectStart() {}
-    void cutEquipProc() {}
-    void cutEquipStart() {}
-    void cutJumpMapopenProc() {}
-    void cutJumpMapopenStart() {}
-    void cutJumpProc() {}
-    void cutJumpStart() {}
-    void cutMiniGameEndProc() {}
-    void cutMiniGameEndStart() {}
-    void cutMiniGamePlTurnProc() {}
-    void cutMiniGamePlTurnStart() {}
-    void cutMiniGamePlUpProc() {}
-    void cutMiniGamePlUpStart() {}
-    void cutMiniGameProc() {}
-    void cutMiniGameReturnProc() {}
-    void cutMiniGameReturnStart() {}
-    void cutMiniGameStart() {}
-    void cutMiniGameWaitProc() {}
-    void cutMiniGameWaitStart() {}
-    void cutMiniGameWarpProc() {}
-    void cutMiniGameWarpStart() {}
-    void cutPartnerShipProc() {}
-    void cutPartnerShipStart() {}
-    void cutProc() {}
-    void cutSetAnmProc() {}
-    void cutSetAnmStart() {}
-    void cutSwimProc() {}
-    void cutSwimStart() {}
-    void cutTurnProc() {}
-    void cutTurnStart() {}
-    void cutUnequipProc() {}
-    void cutUnequipStart() {}
     void getMiniGameRestArrow() {}
-    void initCam() {}
     void isAnm(signed char) {}
     void modeProcInit(int) {}
-    void moveCam() {}
 
     void _searchEsa(fopAc_ac_c*);
     void _nodeControl(J3DNode*, J3DModel*);
@@ -125,6 +80,52 @@ public:
     s32 _create();
     BOOL _delete();
 
+    void cutAppearProc();
+    void cutAppearStart();
+    void cutDisappearProc();
+    void cutDisappearStart();
+    void cutDiveProc();
+    void cutDiveStart();
+    void cutEatesaFirstProc();
+    void cutEatesaFirstStart();
+    void cutEatesaProc();
+    void cutEatesaStart();
+    void cutEffectProc();
+    void cutEffectStart();
+    void cutEquipProc();
+    void cutEquipStart();
+    void cutJumpMapopenProc();
+    void cutJumpMapopenStart();
+    void cutJumpProc();
+    void cutJumpStart();
+    void cutMiniGameEndProc();
+    void cutMiniGameEndStart();
+    void cutMiniGamePlTurnProc();
+    void cutMiniGamePlTurnStart();
+    void cutMiniGamePlUpProc();
+    void cutMiniGamePlUpStart();
+    void cutMiniGameProc();
+    void cutMiniGameReturnProc();
+    void cutMiniGameReturnStart();
+    void cutMiniGameStart();
+    void cutMiniGameWaitProc();
+    void cutMiniGameWaitStart();
+    void cutMiniGameWarpProc();
+    void cutMiniGameWarpStart();
+    void cutPartnerShipProc();
+    void cutPartnerShipStart();
+    void cutProc();
+    void cutSetAnmProc();
+    void cutSetAnmStart();
+    void cutSwimProc();
+    void cutSwimStart();
+    void cutTurnProc();
+    void cutTurnStart();
+    void cutUnequipProc();
+    void cutUnequipStart();
+    void initCam();
+    void moveCam();
+
 public:
     /* Place member variables here */
 };
diff --git a/include/d/actor/d_a_npc_tt.h b/include/d/actor/d_a_npc_tt.h
index 317dfc207..341889759 100644
--- a/include/d/actor/d_a_npc_tt.h
+++ b/include/d/actor/d_a_npc_tt.h
@@ -17,9 +17,6 @@ public:
     void chkFlag(unsigned short) {}
     void clrEvFlag(unsigned short) {}
     void clrFlag(unsigned short) {}
-    void danceInit(int) {}
-    void danceNext() {}
-    void danceProc() {}
     void getBackboneJntNum() {}
     void getBackbone_x() {}
     void getBackbone_y() {}
@@ -27,10 +24,7 @@ public:
     void getHead_x() {}
     void getHead_y() {}
     void incAttnSetCount() {}
-    void initTexPatternAnm(bool) {}
-    void playTexPatternAnm() {}
     void setAction(int (daNpc_Tt_c::*)(void*), void*) {}
-    void setAnm(int) {}
     void setAttentionBasePos(cXyz) {}
     void setEvFlag(unsigned short) {}
     void setEyePos(cXyz) {}
@@ -75,6 +69,13 @@ public:
     s32 _create();
     void CreateHeap();
 
+    void initTexPatternAnm(bool);
+    void playTexPatternAnm();
+    void setAnm(int);
+    void danceInit(int);
+    void danceProc();
+    void danceNext();
+
 public:
     /* Place member variables here */
 };
diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h
index 5d0bf3e20..1a2095348 100644
--- a/include/d/actor/d_a_obj_eff.h
+++ b/include/d/actor/d_a_obj_eff.h
@@ -2,6 +2,7 @@
 #define D_A_OBJ_EFF_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_particle.h"
 
 namespace daObjEff {
     class Act_c : public fopAc_ac_c {
@@ -50,6 +51,41 @@ namespace daObjEff {
     public:
         /* Place member variables here */
     };
+
+    class BarrelSmokeCB : public dPa_smokeEcallBack {
+    public:
+        BarrelSmokeCB();
+        void execute(JPABaseEmitter*);
+    };
+
+    class StoolSmokeCB : public dPa_smokeEcallBack {
+    public:
+        StoolSmokeCB();
+        void execute(JPABaseEmitter*);
+    };
+
+    class SkullSmokeCB : public dPa_smokeEcallBack {
+    public:
+        SkullSmokeCB();
+        void execute(JPABaseEmitter*);
+    };
+
+    class LandSmokeCB : public dPa_smokeEcallBack {
+    public:
+        LandSmokeCB();
+    };
+
+    class PineconeSmokeCB : public dPa_smokeEcallBack {
+    public:
+        PineconeSmokeCB();
+        void execute(JPABaseEmitter*);
+    };
+
+    class WoodBoxSmokeCB : public dPa_smokeEcallBack {
+    public:
+        WoodBoxSmokeCB();
+        void execute(JPABaseEmitter*);
+    };
 };
 
 #endif /* D_A_OBJ_EFF_H */
diff --git a/include/d/actor/d_a_obj_figure.h b/include/d/actor/d_a_obj_figure.h
index e20ea77b8..1e52b79b3 100644
--- a/include/d/actor/d_a_obj_figure.h
+++ b/include/d/actor/d_a_obj_figure.h
@@ -8,6 +8,8 @@
 
 class daObjFigure_c : public fopAc_ac_c {
 public:
+    daObjFigure_c();
+
     void getFigureNo() {}
     void getPhase1P() {}
     void getPhase2P() {}
diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h
index 6cec26eac..3a862d086 100644
--- a/include/d/actor/d_a_obj_ftree.h
+++ b/include/d/actor/d_a_obj_ftree.h
@@ -12,6 +12,14 @@ namespace daObjFtree {
         
     };
 
+    static void Ftree_get_water_pos(cXyz*, cXyz*);
+    static void Ftree_checkXyEventCallBack(void*, int);
+    static void Ftree_XyEventCallBack(void*, int);
+    static void is_broughtID(int);
+    static void Ftree_NodeCallBack_Effect(J3DNode*, int);
+    static void Ftree_NodeCallBack_M(J3DNode*, int);
+    static void Ftree_NodeCallBack_L(J3DNode*, int);
+
     class Act_c : public fopAc_ac_c {
     public:
         void GetRate(float, float, float) {}
@@ -19,7 +27,7 @@ namespace daObjFtree {
         void check_heart() {}
         void check_water() {}
         void init_water() {}
-        void param_get_tree_idx() const {}
+        void param_get_tree_idx() const; // weak but not inlined?
         void set_heart(short) {}
         void set_water(short) {}
         void tree_brouht(int) {}
diff --git a/include/d/actor/d_a_obj_hat.h b/include/d/actor/d_a_obj_hat.h
index f19aa8e01..f16155da0 100644
--- a/include/d/actor/d_a_obj_hat.h
+++ b/include/d/actor/d_a_obj_hat.h
@@ -5,6 +5,8 @@
 
 class daObjHat_c : public fopAc_ac_c {
 public:
+    daObjHat_c();
+
     s32 _create();
     void createHeap();
     void createInit();
diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h
index 5ce63ce8f..b6db3567a 100644
--- a/include/d/actor/d_a_obj_hha.h
+++ b/include/d/actor/d_a_obj_hha.h
@@ -5,7 +5,7 @@
 
 class daObjHha_c : public fopAc_ac_c {
 public:
-    void check_sw() {}
+    void check_sw(); // weak but not inline?
 
     void solidHeapCB(fopAc_ac_c*);
     void create_heap();
@@ -28,4 +28,50 @@ public:
     /* Place member variables here */
 };
 
+class daObjHhaPart_c {
+public:
+    void draw(daObjHha_c*) {}
+    void execute(daObjHha_c*) {}
+    void setExeProc(void (daObjHhaPart_c::*)(daObjHha_c*)) {}
+    void start_move() {}
+
+    void init_data(float, float, unsigned short, unsigned char, unsigned char);
+    void set_mdl_area(const char*, int);
+    void set_bgw(const char*, int);
+    void init_mtx(cXyz, csXyz, cXyz);
+    void exe_normal(daObjHha_c*);
+    void exe_move(daObjHha_c*);
+    void draw_normal(daObjHha_c*);
+};
+
+class daObjHhaSplash_c {
+public:
+    void chk_stop() {}
+    void delete_s() {}
+    void get_base_pos() {}
+    void get_pos() {}
+    void get_pos_y() {}
+    void play_particle() {}
+    void set_pos(cXyz*) {}
+    void set_pos_y(float) {}
+    void stop_particle() {}
+
+    void create_s(unsigned short, cXyz*, float, float, csXyz*);
+};
+
+class daObjHhaYgush_c {
+public:
+    void anm_play() {}
+    void check_draw() {}
+    void disp_off() {}
+    void disp_on() {}
+    void get_base_pos() {}
+    void set_pos(cXyz) {}
+
+    void create_area(const char*);
+    void init_data(cXyz*, float, csXyz*, cXyz*, dKy_tevstr_c*, unsigned char);
+    void init_mtx();
+    BOOL draw();
+};
+
 #endif /* D_A_OBJ_HHA_H */
diff --git a/include/d/actor/d_a_obj_mmrr.h b/include/d/actor/d_a_obj_mmrr.h
index 2eda0eb90..9d3477870 100644
--- a/include/d/actor/d_a_obj_mmrr.h
+++ b/include/d/actor/d_a_obj_mmrr.h
@@ -33,6 +33,12 @@ namespace daObjMmrr {
         /* 0xBF8 */ u8 mBF8;
         /* 0xBF9 */ u8 mBF9[0xC18 - 0xBF9];
     };
+
+    class Eff_c {
+    public:
+        void end();
+        void remove();
+    };
 };
 
 #endif /* D_A_OBJ_MMRR_H */
diff --git a/include/d/actor/d_a_obj_tapestry.h b/include/d/actor/d_a_obj_tapestry.h
index 17eb0fd28..c42c8cac0 100644
--- a/include/d/actor/d_a_obj_tapestry.h
+++ b/include/d/actor/d_a_obj_tapestry.h
@@ -3,6 +3,38 @@
 
 #include "f_op/f_op_actor.h"
 
+class JPABaseEmitter;
+class daObjTapestryDrawVtx_c;
+
+class daObjTapestry_c {
+public:
+    void is_switch() const {}
+    void on_switch() const {}
+    void param_get_evId() const {}
+    void param_get_swSave() const {}
+
+    void chk_appear();
+    void set_mtx();
+    void init_mtx();
+    void solidHeapCB(fopAc_ac_c*);
+    void create_heap();
+    void create_res_load();
+    void init_cc();
+    void set_cc_pos();
+    void checkCollision();
+    void set_eye_pos();
+    s32 _create();
+    BOOL _delete();
+    void wait_act_proc();
+    void demo_request_act_proc();
+    void burn_act_proc();
+    void burn_act_init_proc();
+    void fine_act_init_proc();
+    void setup_action(int);
+    BOOL _execute();
+    BOOL _draw();
+};
+
 class daObjTapestryPLight_c : public fopAc_ac_c {
 public:
     void plight_delete();
@@ -14,6 +46,67 @@ public:
     /* Place member variables here */
 };
 
+class daObjTapestryFireEff_c {
+public:
+    void get_pos() const {}
+    void set_pos(const cXyz&) {}
+    void set_spd(const cXyz&) {}
+
+    void execute(JPABaseEmitter*);
+};
+
+class daObjTapestryDrawData_c {
+public:
+    daObjTapestryDrawData_c();
+
+    void dl() const {}
+    void dl_size() const {}
+    void tex_coord() const {}
+
+    void ct_tex();
+    void ct_dl();
+};
+
+class daObjTapestryPacket_c {
+public:
+    daObjTapestryPacket_c();
+
+    void set_wind_fun(const cXyz&) {}
+
+    void init(daObjTapestry_c*);
+    void update();
+    void calc_acc_spring_sub(const cXyz*, const cXyz*, float, float);
+    void calc_acc_spring(int, int);
+    void calc_acc_gravity();
+    void calc_acc_wave(int, int);
+    void calc_acc_hit(int, int);
+    void calc_spd(int, int);
+    void calc_pos_crr(int, int);
+    void calc_pos();
+    void calc_nrm();
+    void calc_wind();
+    void calc_hit();
+    void calc_fire_leap(int, int);
+    void calc_fire();
+    void calc(daObjTapestry_c*);
+    void set_hit(cXyz, cXyz, float, float, bool);
+    void get_now_pos(int, int);
+    void eff_start(int, int);
+    void eff_start_chk(int, int);
+    void eff_end();
+    void eff_pos();
+    void eff_delete();
+    void smokeCallback_init();
+    void smoke_set();
+    void smoke_move(fopAc_ac_c*);
+    void setup_vtx(daObjTapestryDrawVtx_c*);
+    void load_tex();
+    void setup_rendar();
+    void setup_tev_stage();
+    void setup_tevColReg(daObjTapestry_c*);
+    void draw();
+};
+
 class daObjTapestry_HIO_c {
 public:
     daObjTapestry_HIO_c();
diff --git a/include/d/actor/d_a_obj_vgnfd.h b/include/d/actor/d_a_obj_vgnfd.h
index fcbb2de56..6222489a8 100644
--- a/include/d/actor/d_a_obj_vgnfd.h
+++ b/include/d/actor/d_a_obj_vgnfd.h
@@ -6,7 +6,7 @@
 class daObjVgnfd_c : public fopAc_ac_c {
 public:
     void check_boss(int) {}
-    void check_ev_init(int) {}
+    void check_ev_init(int); // weak but not inlined?
     void on_door_ev(int) {}
 
     void solidHeapCB(fopAc_ac_c*);
diff --git a/include/d/actor/d_a_sail.h b/include/d/actor/d_a_sail.h
index 53ea22927..b59b4f7bc 100644
--- a/include/d/actor/d_a_sail.h
+++ b/include/d/actor/d_a_sail.h
@@ -8,4 +8,21 @@ public:
     /* Place member variables here */
 };
 
+class daSail_packet_c {
+public:
+    void getMtx() {}
+    void getNrm() {}
+    void getPos() {}
+    void getPosSpd() {}
+    void getStickMtx() {}
+    void getTexMtx() {}
+    void setTevStr(dKy_tevstr_c*) {}
+
+    void setCorrectNrmAngle(short, float);
+    void setNrmMtx();
+    void setBackNrm();
+    void setNrmVtx(cXyz*, int, int);
+    void draw();
+};
+
 #endif /* D_A_SAIL_H */
diff --git a/include/d/actor/d_a_tag_md_cb.h b/include/d/actor/d_a_tag_md_cb.h
index 7da85f4f0..65d89fa1c 100644
--- a/include/d/actor/d_a_tag_md_cb.h
+++ b/include/d/actor/d_a_tag_md_cb.h
@@ -5,6 +5,8 @@
 
 class daTag_MdCb_c : public fopAc_ac_c {
 public:
+    ~daTag_MdCb_c();
+
     void offEventAccept() {}
     void onEventAccept() {}
     void setTimer(short) {}
diff --git a/include/d/actor/d_a_toge.h b/include/d/actor/d_a_toge.h
index 79aa7c91a..afcfd42c0 100644
--- a/include/d/actor/d_a_toge.h
+++ b/include/d/actor/d_a_toge.h
@@ -5,7 +5,7 @@
 
 class daToge_c : public fopAc_ac_c {
 public:
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_warpgn.h b/include/d/actor/d_a_warpgn.h
index ae75a2891..528389973 100644
--- a/include/d/actor/d_a_warpgn.h
+++ b/include/d/actor/d_a_warpgn.h
@@ -5,7 +5,7 @@
 
 class daWarpgn_c : public fopAc_ac_c {
 public:
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_warphr.h b/include/d/actor/d_a_warphr.h
index c3f5c9a2a..57e4ae538 100644
--- a/include/d/actor/d_a_warphr.h
+++ b/include/d/actor/d_a_warphr.h
@@ -5,7 +5,7 @@
 
 class daWarphr_c : public fopAc_ac_c {
 public:
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_warpls.h b/include/d/actor/d_a_warpls.h
index a6ca7e7d4..b7e43759c 100644
--- a/include/d/actor/d_a_warpls.h
+++ b/include/d/actor/d_a_warpls.h
@@ -6,7 +6,7 @@
 class daWarpls_c : public fopAc_ac_c {
 public:
     inline BOOL _draw();
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_warpmj.h b/include/d/actor/d_a_warpmj.h
index ac8d56e02..4d224f9fb 100644
--- a/include/d/actor/d_a_warpmj.h
+++ b/include/d/actor/d_a_warpmj.h
@@ -5,7 +5,7 @@
 
 class daWarpmj_c : public fopAc_ac_c {
 public:
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h
index eccacb456..0e748902d 100644
--- a/include/d/actor/d_a_ykgr.h
+++ b/include/d/actor/d_a_ykgr.h
@@ -4,6 +4,7 @@
 #include "f_op/f_op_actor.h"
 
 class JPABaseEmitter;
+class JPABaseParticle;
 
 class daYkgr_c : public fopAc_ac_c {
 public:
@@ -34,4 +35,10 @@ public:
     /* Place member variables here */
 };
 
+class dPa_YkgrPcallBack {
+public:
+    void draw(JPABaseEmitter*, JPABaseParticle*);
+    void setParam(float);
+};
+
 #endif /* D_A_YKGR_H */
diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h
new file mode 100644
index 000000000..a5b8cdd9c
--- /dev/null
+++ b/include/d/d_menu_cloth.h
@@ -0,0 +1,55 @@
+#ifndef D_MENU_CLOTH_H
+#define D_MENU_CLOTH_H
+
+#include "dolphin/types.h"
+#include "SSystem/SComponent/c_xyz.h"
+#include "dolphin/gx/GXStruct.h"
+
+class JKRArchive;
+
+class dMCloth_c {
+public:
+    dMCloth_c();
+    ~dMCloth_c();
+
+    void getBackNrm() {}
+    void getNrm() {}
+    void getOffsetVec() {}
+    void getPos() {}
+    void getShadowPos() {}
+    void getTexObj() {}
+    void setArchive(JKRArchive*) {}
+    void setClothType(unsigned char) {}
+
+    void lightSet1(cXyz);
+    void cloth_init();
+    void init();
+    void setBackNrm();
+    void setNrmVtx(cXyz*, int, int);
+    void plot(float, float, float, float);
+    void plot_shadow(float, float, float, float);
+    void alpha_out();
+    void TevSettingMenu();
+    void TevSettingFileSelect();
+    void TevSetting();
+    void ShadowTevSettingMenu();
+    void ShadowTevSettingFileSelect();
+    void ShadowTevSetting();
+    void draw(float, GXColor, GXColor, unsigned char);
+    void cloth_move_sin();
+    void cloth_move_simple();
+    void cloth_move();
+};
+
+class daCLOTH_HIO_c {
+public:
+    daCLOTH_HIO_c();
+};
+
+class daCLOTH_ChildHIO_c {
+public:
+    daCLOTH_ChildHIO_c();
+    ~daCLOTH_ChildHIO_c();
+};
+
+#endif /* D_MENU_CLOTH_H */
diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h
new file mode 100644
index 000000000..66a505eab
--- /dev/null
+++ b/include/d/d_menu_collect.h
@@ -0,0 +1,94 @@
+#ifndef D_MENU_COLLECT_H
+#define D_MENU_COLLECT_H
+
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+class JKRArchive;
+class JUTFont;
+
+class dMenu_Collect_c {
+public:
+
+    void alphaChange(fopMsgM_pane_class*, float) {}
+    void draw() {}
+    void getCollectMode() {}
+    void getNowItem() {}
+    void setArchive(JKRArchive*) {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setItemTexBuffer(int, void*) {}
+    void setMapTexBuffer(void*) {}
+    void setNowItem(unsigned char) {}
+    void setOptionArchive(JKRArchive*) {}
+    void setQuitArchive(JKRArchive*) {}
+    void setSymbolTexBuffer(int, void*) {}
+    void setTactTexBuffer(void*) {}
+    void setTextArea(char*, char*, char*, char*, char*, char*) {}
+    void setTimer(short) {}
+    void setTriforceTexBuffer(int, void*) {}
+    void setTriggerInfo(unsigned char) {}
+
+    void screenSet();
+    void initialize();
+    void cursorAnime();
+    void stickDirection(unsigned char);
+    void cursorMainMove();
+    void noteCheck();
+    void noteInit();
+    void noteAppear();
+    void noteOpen();
+    void noteClose();
+    void mainTrans(float, float);
+    void subTrans(float, float);
+    void titleTrans(float, float);
+    void noteRotate(float, float);
+    void nameTrans(float, float);
+    void mainOpenProc(short, short, short);
+    void subOpenProc(short, short, short);
+    void titleOpenProc(short, short);
+    void noteOpenProc(short, short);
+    void nameOpenProc(short, short);
+    void itemBitCheck();
+    void itemScale();
+    void collectPriority();
+    void weponPriority();
+    void tactGuideShow(unsigned char, bool);
+    void tactDemoMode(unsigned char);
+    void tactPlayMode(unsigned char);
+    void tactTrans(unsigned char, float, float);
+    void tactBaseShow();
+    void cornerMove();
+    void triforceAnime(unsigned char);
+    void tactGuideHide();
+    void itemnameMove();
+    void itemnameSet();
+    void itemnoteSet();
+    void itemSet();
+    void outFontInit();
+    void outFontMove();
+    void outFontDraw();
+    void collectItemGetCheck(unsigned char);
+    void _create();
+    void _create3();
+    void _delete();
+    void _move();
+    void _move3();
+    void _draw();
+    void _open();
+    void _open3();
+    void _close();
+    void _close3();
+    void animeStep1(short, short);
+    void animeStep2(short, short);
+    void animeStep3(short, short);
+    void animeStep4(short, short);
+    void _open2();
+    void _close2();
+};
+
+class dMc_HIO_c {
+public:
+    dMc_HIO_c();
+};
+
+#endif /* D_MENU_COLLECT_H */
diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h
new file mode 100644
index 000000000..3c8e28349
--- /dev/null
+++ b/include/d/d_menu_dmap.h
@@ -0,0 +1,61 @@
+#ifndef D_MENU_DMAP_H
+#define D_MENU_DMAP_H
+
+#include "dolphin/types.h"
+
+class J2DPane;
+class fopMsgM_pane_class;
+class JKRArchive;
+class JUTFont;
+
+class dMenu_Dmap_c {
+public:
+    void alphaChange(fopMsgM_pane_class*, float) {}
+    void draw() {}
+    void setArchive(JKRArchive*) {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setItemTexBuffer(int, void*) {}
+    void setTextArea(char*, char*, char*, char*, char*, char*) {}
+
+    void changeFloorTexture(J2DPane*, int);
+    void screenSet();
+    void initialize();
+    void treasureSet();
+    void treasureDraw();
+    void paneMove(float);
+    void paneAlpha(float);
+    void decAlpha(float);
+    void cursorMove();
+    void cursorAnime();
+    void noteInit();
+    void noteCheck();
+    void noteAppear();
+    void noteOpen();
+    void noteClose();
+    void noteOpenProc(short);
+    void itemScale();
+    void floorInit();
+    void mapMove();
+    void mapOffsetY();
+    void itemnameMove();
+    void dnameSet();
+    void itemnameSet();
+    void itemnoteSet();
+    void outFontInit();
+    void linkAnime();
+    void bossAnime();
+    void bossEyeAnime();
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void _open();
+    void _close();
+};
+
+class dMd_HIO_c {
+public:
+    dMd_HIO_c();
+};
+
+#endif /* D_MENU_DMAP_H */
diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h
new file mode 100644
index 000000000..cea276f39
--- /dev/null
+++ b/include/d/d_menu_fmap.h
@@ -0,0 +1,184 @@
+#ifndef D_MENU_FMAP_H
+#define D_MENU_FMAP_H
+
+#include "dolphin/types.h"
+#include "SSystem/SComponent/c_xyz.h"
+
+class JUTFont;
+class J2DScreen;
+class fopMsgM_pane_class;
+class dMenu_FmapSv_c;
+struct cursorTable_t;
+struct aramCmapDatPat_t;
+
+class dMenu_Fmap_c {
+public:
+    void draw() {}
+    void getCtCurWX() {}
+    void getCtCurWY() {}
+    void getCtCurX() {}
+    void getCtCurY() {}
+    void getCtDispMode() {}
+    void getCtFmapZoom() {}
+    void getCtZoomGridX() {}
+    void getCtZoomGridY() {}
+    void lineInter0to1(float, float, float) {}
+    void lineInter0to1ForU8(unsigned char, unsigned char, float) {}
+    void setCtCurHX(signed char) {}
+    void setCtCurHY(signed char) {}
+    void setCtCurWX(signed char) {}
+    void setCtCurWY(signed char) {}
+    void setCtCurX(signed char) {}
+    void setCtCurY(signed char) {}
+    void setCtDispMode(unsigned char) {}
+    void setCtFmapZoom(unsigned char) {}
+    void setCtZoomGridX(signed char) {}
+    void setCtZoomGridY(signed char) {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setSvPtr(dMenu_FmapSv_c*) {}
+    void setTextArea_New(char*, char*, char*, char*, char*, char*) {}
+    void stopWrapBackEmitter() {}
+    void stopWrapSpotEmitter(int) {}
+
+    void _create();
+    void phantomShipCheck();
+    void screenSet();
+    void initialize();
+    void displayinit();
+    void backClothDispInit();
+    void calcGetMapCount();
+    void dispEndSalvageMark();
+    void checkMarkCheck1();
+    void checkMarkCheck2();
+    void checkMarkCheck3();
+    void isFmapClose();
+    void setPaneOnOff(J2DScreen*, unsigned long, bool);
+    void childPaneMoveSp(fopMsgM_pane_class*, fopMsgM_pane_class*, float, float, float);
+    void selGridMaskAlphaCtrl(short, unsigned char, unsigned char, int);
+    void fmapMaskAlphaCtrl(short, unsigned char, unsigned char, int);
+    void selCursorInit();
+    void selCursorHide();
+    void selCursorMove();
+    void islandNameChange();
+    void changeIslandName(unsigned char);
+    void AreaTxtChg();
+    void AreaTxtChgFast();
+    void salvageGetItemChg();
+    void salvageGetItemChange();
+    void SalvItmDispChgFast();
+    void changeSalvageGetItem(unsigned char);
+    void selCursorAnime();
+    void zoomCursorInit();
+    void zoomCursorAnime();
+    void playerPointGridAnimeInit();
+    void playerPointGridAnime();
+    void setDspWindAngle();
+    void windArrowColorAnime();
+    void checkMarkAnimeInit();
+    void checkMarkAnime();
+    void readFmapTexture(const char*);
+    void aramCmapDatRead();
+    void initCmapDatPnt(aramCmapDatPat_t*);
+    void getGridNumToCmapDatPnt(int);
+    void setDispIslandPos(signed char, signed char);
+    void setIslandPos(fopMsgM_pane_class*, float, float);
+    void changeFmapTexture(signed char, signed char);
+    void setDspNormalMapLink();
+    void setDspLargeMapLink();
+    void checkDspLargeMapLink();
+    void checkDspLargeMapShip();
+    void dispEndSalvageLargeMark();
+    void setDspHugeMapLink();
+    void dispEndSalvageHugeMark(float, float);
+    void checkDspHugeMapLink();
+    void checkDspHugeMapShip();
+    void _open();
+    void _close();
+    void _close_normalMode();
+    void _move();
+    void _draw();
+    void _delete();
+    void FmapProcMain();
+    void SelectGrid();
+    void zoom1000x1000Init();
+    void zoomMapAlphaSet(signed char, signed char, fopMsgM_pane_class*, unsigned char);
+    void ZoomGridLv1In();
+    void ZoomGridLv1Proc();
+    void zoom200x200Init();
+    void ZoomGridLv1Out();
+    void ZoomGridLv2In();
+    void ZoomGridLv2Proc();
+    void ZoomGridLv2Out();
+    void move_normal();
+    void FmapProc();
+    void HikakuProc();
+    void fmap2Open();
+    void fmap2Move();
+    void fmap2Close();
+    void paneTransBase(short, unsigned char, float, float, unsigned char, int);
+    void paneTranceZoomMap(short, unsigned char, float, float, float, float, float, float, unsigned char, int);
+    void paneTranceZoomMapAlpah(short, unsigned char, unsigned char, int);
+    void paneTranceZoom2Map(short, unsigned char, float, float, float, float, float, float, unsigned char, int);
+    void paneAlphaFmapCursor(fopMsgM_pane_class*, short, unsigned char, unsigned char, int);
+    void PaneAlphaSelvageItem(short, unsigned char);
+    void gShipMarkAnimeInit();
+    void gShipMarkAnime();
+    void _open_warpMode();
+    void init_warpMode();
+    void selCursorMoveWarp();
+    void _close_warpMode();
+    void moveMain_warpMode();
+    void wrapMove();
+    void wrapSelWinFadeIn1();
+    void wrapSelect();
+    void wrapSelWinFadeOut();
+    void wrapSelWarp();
+    void warpAreaAnime0();
+    void paneTranceWarpMsg(fopMsgM_pane_class*, short, unsigned char, float, float, unsigned char, int);
+    void paneAlphaWarpMsgBack(short, unsigned char, unsigned char, int);
+    void warpSelCursorMove();
+    void warpSelCursorAnimeInit();
+    void warpSelCursorAnime();
+    void getWarpAreaGridX(int);
+    void getWarpAreaGridY(int);
+    void getWarpAreaNo(const cursorTable_t*);
+    void getWarpAreaNoUp(const cursorTable_t*);
+    void getWarpAreaNoDown(const cursorTable_t*);
+    void getWarpAreaNoLeft(const cursorTable_t*);
+    void getWarpAreaNoRight(const cursorTable_t*);
+    void getWarpAreaTablePtr(signed char, signed char);
+    void areaTextChangeAnimeInit();
+    void areaTextChangeAnime();
+    void PaneAlphaAreaTxt(short, unsigned char, int);
+    void setDspWarpBackCornerColor(float);
+    void setWrapBackEmitter(cXyz);
+    void setWrapSpotEmitter(int, cXyz);
+    void _open_fishManMode();
+    void _close_fishManMode();
+    void init_fishManMode();
+    void movefishManMode();
+    void fmDispArea();
+    void fmZoomGridLv1In();
+    void fmZoomGridLv2In();
+    void islandNameSet(unsigned char);
+    void fmMapWrite();
+    void fmMapWait();
+    void paneAlphaZoom2Map(short, unsigned char, unsigned char, int);
+    void fmZoomGridLv2Out();
+    void fmZoomGridLv1Out();
+    void fmEndWait();
+    void _open_wallPaper();
+    void getButtonIconMode();
+};
+
+class dDlst_FMAP_c {
+public:
+    void draw();
+};
+
+class dMf_HIO_c {
+public:
+    dMf_HIO_c();
+};
+
+#endif /* D_MENU_FMAP_H */
diff --git a/include/d/d_menu_fmap2.h b/include/d/d_menu_fmap2.h
new file mode 100644
index 000000000..1c0e4658e
--- /dev/null
+++ b/include/d/d_menu_fmap2.h
@@ -0,0 +1,158 @@
+#ifndef D_MENU_FMAP2_H
+#define D_MENU_FMAP2_H
+
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+class J2DScreen;
+class ResTIMG;
+class aramCmapDat_c;
+class dMenu_FmapSv_c;
+
+class dMenu_Fmap2_c {
+public:
+    void getCmapDatPnt(int) {}
+    void getCmapDatValue() {}
+    void getCtActive() {}
+    void getCtCmapSelNo() {}
+    void getCtCurHX() {}
+    void getCtCurHY() {}
+    void getCtCurX() {}
+    void getCtCurY() {}
+    void getCtDispMode() {}
+    void lineInter0to1ForU8(unsigned char, unsigned char, float) {}
+    void setAramCmapDat(aramCmapDat_c*) {}
+    void setCtActive(unsigned char) {}
+    void setCtCmapSelNo(signed char) {}
+    void setCtCurHX(signed char) {}
+    void setCtCurHY(signed char) {}
+    void setSvPtr(dMenu_FmapSv_c*) {}
+
+    void _create();
+    void screenSet();
+    void initialize();
+    void displayInit();
+    void fmapPaneInit();
+    void cmapPaneInit();
+    void collectMapCheck();
+    void _move();
+    void FmapProcMain();
+    void FmapChange();
+    void CmapProcMain();
+    void spMapLoadForDVD(unsigned char);
+    void cmapOpenCheck();
+    void CmapScroll();
+    void isSpMap(int);
+    void CmapOpen();
+    void CmapSpLoadWait();
+    void screenSetGs();
+    void gsMoonAnimeInit();
+    void gsMoonAnime();
+    void gsShipAnime();
+    void gsIconAnimeInit();
+    void gsIconAnime();
+    void screenSetTn();
+    void screenSetTr();
+    void trTrifAnimeInit();
+    void trTrifAnime();
+    void screenSetIk();
+    void screenSetHeartP();
+    void screenSetTerry();
+    void screenSetSubMa();
+    void screenSetMoon();
+    void screenSetDfaliy();
+    void screenSetYagura();
+    void screenSetHeartM();
+    void screenSetSubdan();
+    void setPlayerPos(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*);
+    void CmapOpenSp();
+    void CmapProc2();
+    void CmapClose();
+    void cmapMove();
+    void changeSelCmap();
+    void changeSelCmap2();
+    void cmapAlphaSet();
+    void changeZoomCmap();
+    void ChangeProcMode();
+    void _open();
+    void _close();
+    void _draw();
+    void _delete();
+    void fCursorInit();
+    void fCursorMove();
+    void fCursorAnime();
+    void cCursorAnimeInit();
+    void cCursorAnime();
+    void cCursorHide();
+    void cSelCursorInit();
+    void cSelCursorAnimeInit();
+    void cSelCursorAnime();
+    void cSelCursorHide();
+    void playerPointGridAnimeInit();
+    void playerPointGridAnime(fopMsgM_pane_class*);
+    void changeFmapTexture();
+    void changeIslandName();
+    void fmapPlayerPosDisp();
+    void fmapPlayerPosDispCheck(float*, float*);
+    void changeCmapName();
+    void cmapPlayerPosDisp();
+    void cmapSalvagePosDisp();
+    void cmapPlayerPosDispCheck(float*, float*);
+    void paneTransBase(short, unsigned char, float, float, unsigned char, unsigned char, int);
+    void paneAlphaFmapBase(short, unsigned char, unsigned char, int);
+    void paneAlphaCmapBase(short, unsigned char, unsigned char, int);
+    void paneAlphaZoomCmapBase(short, unsigned char, float, float, unsigned char, unsigned char, int);
+    void paneAlphaCmapName(short, unsigned char, unsigned char);
+    void paneAlphaMessage2(short, unsigned char, unsigned char, int);
+    void paneTranceMessage(short, unsigned char, float, float, float, float, unsigned char, unsigned char, int);
+    void paneScaleXYChild(fopMsgM_pane_class*, float);
+    void paneTransSelCmapCle(short, unsigned char, float, float, float, float, unsigned char, unsigned char, int);
+    void paneTransSelCmapOpn(short, unsigned char, float, float, float, float, unsigned char, unsigned char, int);
+    void paneAlphaGostShipMap(short, unsigned char, unsigned char, int);
+    void paneAlphaTingleMap(short, unsigned char, unsigned char, int);
+    void paneAlphaTreasureMap(short, unsigned char, unsigned char, int);
+    void paneAlphaSubdanMap(short, unsigned char, unsigned char, int);
+    void paneAlphaHeartMMap(short, unsigned char, unsigned char, int);
+    void paneAlphaYaguraMap(short, unsigned char, unsigned char, int);
+    void paneAlphaDfaliyMap(short, unsigned char, unsigned char, int);
+    void paneAlphaHeartPMap(short, unsigned char, unsigned char, int);
+    void paneAlphaTerryMap(short, unsigned char, unsigned char, int);
+    void paneAlphaSubMaMap(short, unsigned char, unsigned char, int);
+    void paneAlphaMoonMap(short, unsigned char, unsigned char, int);
+    void paneAlphaDoctaMap(short, unsigned char, unsigned char, int);
+    void setPaneOnOff(J2DScreen*, unsigned long, bool);
+    void getCollectMapTexChange();
+    void finCollectMapTexChange();
+    void calcGetCollectMap();
+    void calcGetCollectMap2();
+    void calcFinCollectMap();
+    void getNowCmapFirstNum();
+    void getNowCmapNextNum(signed char, int);
+    void getCmapDatPnt4(int);
+    void readPaneCmapTexture(const ResTIMG*, int);
+    void readFmapTexture(const char*);
+    void getButtonIconMode();
+    void isLockBbutton();
+    void isGetCollectMap(signed char);
+    void isOpenCollectMap(signed char);
+    void isOpenCollectMapTriforce(signed char);
+    void getCollectMapKind(signed char);
+    void isCompleteCollectMap(signed char);
+};
+
+class dDlst_FMAP2_c {
+public:
+    void draw();
+};
+
+class dDlst_FMAP2GS_c {
+public:
+    void draw();
+};
+
+class dMf2_HIO_c {
+public:
+    dMf2_HIO_c();
+};
+
+#endif /* D_MENU_FMAP2_H */
diff --git a/include/d/d_menu_item.h b/include/d/d_menu_item.h
new file mode 100644
index 000000000..e44263f2a
--- /dev/null
+++ b/include/d/d_menu_item.h
@@ -0,0 +1,84 @@
+#ifndef D_MENU_ITEM_H
+#define D_MENU_ITEM_H
+
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+class JKRArchive;
+class JUTFont;
+class J2DPane;
+
+class dMenu_Item_c {
+public:
+    void alphaChange(fopMsgM_pane_class*, float) {}
+    void draw() {}
+    void getItemMode() {}
+    void getNowItem() {}
+    void setArchive(JKRArchive*) {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setItemTexBuffer(int, void*) {}
+    void setNowItem(unsigned char) {}
+    void setSubItemTexBuffer(int, void*) {}
+    void setTextArea(char*, char*, char*, char*, char*, char*) {}
+    void setTimer(short) {}
+    void setTriggerInfo(unsigned char) {}
+
+    void initialize();
+    void screenSet();
+    void cursorAnime();
+    void cursorMainMove();
+    void cursorSubMove();
+    void checkMove();
+    void itemplaceCheck(int);
+    void itemDecide();
+    void itemMove();
+    void itemScale();
+    void subWindowInit();
+    void subWindowDelete();
+    void subItemDecide();
+    void itemnameMove();
+    void itemnameSet();
+    void itemnoteSet();
+    void outFontInit();
+    void outFontMove();
+    void outFontDraw();
+    void noteCheck();
+    void noteInit();
+    void noteAppear();
+    void noteOpen();
+    void noteClose();
+    void mainTrans(float, float);
+    void titleTrans(float, float);
+    void noteRotate(float, float);
+    void nameTrans(float, float);
+    void mainOpenProc(short, short, short);
+    void titleOpenProc(short, short);
+    void noteOpenProc(short, short);
+    void nameOpenProc(short, short);
+    void numberSet(J2DPane*, unsigned char);
+    void numberColor(J2DPane*, unsigned char);
+    void itemNumberSet();
+    void itemCheck(int);
+    void itemBitCheck(bool);
+    void arrowLightAnime();
+    void bottleFwaterCheck();
+    void recollectBossCheck();
+    void cornerMove();
+    void equipBeastItem(int);
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void _open();
+    void _close();
+    void _open2();
+    void _close2();
+};
+
+class dMi_HIO_c {
+public:
+    dMi_HIO_c();
+};
+
+
+#endif /* D_MENU_ITEM_H */
diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h
new file mode 100644
index 000000000..e7054ff3b
--- /dev/null
+++ b/include/d/d_menu_option.h
@@ -0,0 +1,54 @@
+#ifndef D_MENU_OPTION_H
+#define D_MENU_OPTION_H
+
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+class JKRArchive;
+class JUTFont;
+
+class dMenu_Option_c {
+public:
+    void alphaChange(fopMsgM_pane_class*, float) {}
+    void getQuitStatus() {}
+    void setArchive(JKRArchive*) {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setTextArea(char*, char*, char*, char*) {}
+
+    void screenSet();
+    void mainInit();
+    void noteInit();
+    void titleInit();
+    void mainMove();
+    void noteMove();
+    void titleMove();
+    void cursorMove();
+    void cursorScale();
+    void typeMove();
+    void yazAnime();
+    void ccAnime();
+    void stickMove(unsigned char);
+    void noteSet();
+    void outFontInit();
+    void outFontMove();
+    void outFontDraw();
+    void stringlength(fopMsgM_pane_class*, char*);
+    void changeScaleCenter(fopMsgM_pane_class*, char*);
+    void setSoundMode(unsigned long);
+    void changeScaleRight(fopMsgM_pane_class*, char*);
+    void initialize();
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void _open();
+    void _close();
+};
+
+class dMo_HIO_c {
+public:
+    dMo_HIO_c();
+};
+
+
+#endif /* D_MENU_OPTION_H */
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
new file mode 100644
index 000000000..ab9c58db1
--- /dev/null
+++ b/include/d/d_menu_save.h
@@ -0,0 +1,129 @@
+#ifndef D_MENU_SAVE_H
+#define D_MENU_SAVE_H
+
+#include "d/d_drawlist.h"
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+
+class dDlst_MenuSave_c : public dDlst_base_c {
+public:
+    void draw();
+};
+
+class dMenu_save_c {
+public:
+    void getDataBufPtr() {}
+    void getEndStatus() {}
+    void getSaveStatus() {}
+    void setErrorFlag(unsigned char) {}
+    void setErrorType(unsigned char) {}
+    void setUseType(unsigned char) {}
+
+    virtual ~dMenu_save_c() {}
+    void _create();
+    void _draw();
+    void _draw2();
+    void _move();
+    bool _open();
+    bool _close();
+    void _delete();
+
+    void initialize();
+    void openNormal();
+    void closeNormal();
+    void openForCollect();
+    void openForItem();
+    void closeForCollect();
+    void closeForItem();
+    void openForGameover();
+    void closeForGameover();
+    void closeForGameover_1();
+    void closeForGameover_2();
+    void openForEnding();
+    void openForEnding2();
+    void closeForEnding();
+    void noSave();
+    void noSave2();
+    void saveQuestion();
+    void memCardCheck();
+    void openSaveMenu();
+    void closeSaveMenu();
+    void memCardErrMsgWaitKey();
+    void memCardErrMsgWaitKey2();
+    void memCardErrMsgWaitKey3();
+    void memCardErrGoIPLSel();
+    void memCardErrGoIPLSel2();
+    void memCardErrMsgWaitFormatSel();
+    void memCardErrMsgWaitFormatSel2();
+    void memCardFormat();
+    void memCardFormatCheck();
+    void memCardMakeGameFileSel();
+    void memCardMakeGameFile();
+    void memCardMakeGameFileCheck();
+    void memCardDataLoadWait();
+    void memCardDataLoadWait2();
+    void memCardDataSave();
+    void memCardDataSaveUpMenu();
+    void memCardDataSaveSel();
+    void memCardDataSaveDownMenu();
+    void dataWrite();
+    void memCardDataSaveWait();
+    void msgWait();
+    void msgWait2();
+    void saveEndWait();
+    void canNotSave();
+    void canNotSave2();
+    void gameContinue();
+    void gameContinue2();
+    void gameContinue3();
+    void gameContinue4();
+    void endingNoSave();
+    void endingNoSave2();
+    void endingNoSave3();
+    void endingDataCheck();
+    void saveWait();
+    void YesNoSelect(int);
+    void YesNoSelect2(int);
+    void CursorAlphaInit();
+    void CursorMove();
+    void CursorAnime();
+    void openSave();
+    void closeSave();
+    void screenSet();
+    void paneTransInit();
+    void displayInit();
+    void initializeEx();
+    void menuUp();
+    void menuDown();
+    void PaneAlphaMsgTxt(short, unsigned char);
+    void PaneTranceBase(short, unsigned char, float, float, unsigned char, int);
+    void PaneScaleAlphaWipe(short, unsigned char, float, unsigned char, int);
+    void PaneAlphaMask(short, unsigned char, unsigned char, int);
+    void PaneTranceTitle(short, unsigned char, float, float, unsigned char, int);
+    void PaneRotate(short, unsigned char, fopMsgM_pane_class*, float, float, float, unsigned char);
+    void PaneTranceMenu(short, unsigned char, fopMsgM_pane_class*, float, float, unsigned char, int);
+
+public:
+    /* 0x0004 */ u8 field_0x0004;
+    /* 0x0008 */ dDlst_MenuSave_c mDlst;
+    /* 0x000C */ u8 field_0x000c[0x0524];
+    /* 0x0530 */ u8 field_0x0530;
+    /* 0x0531 */ u8 field_0x0531;
+    /* 0x0532 */ u8 field_0x0532;
+    /* 0x0533 */ u8 field_0x0533;
+    /* 0x0534 */ u8 field_0x0534;
+    /* 0x0535 */ u8 field_0x0535;
+    /* 0x0536 */ u8 field_0x0536;
+    /* 0x0537 */ u8 field_0x0537;
+    /* 0x0538 */ u8 field_0x0538;
+    /* 0x0539 */ u8 field_0x0539[0x1ba4 - 0x0539];
+};
+
+class dMs_HIO_c {
+public:
+    dMs_HIO_c();
+};
+
+
+#endif /* D_MENU_SAVE_H */
diff --git a/include/d/d_menu_window.h b/include/d/d_menu_window.h
new file mode 100644
index 000000000..5b1393c29
--- /dev/null
+++ b/include/d/d_menu_window.h
@@ -0,0 +1,22 @@
+#ifndef D_MENU_WINDOW_H
+#define D_MENU_WINDOW_H
+
+#include "dolphin/types.h"
+
+class sub_ms_screen_class {
+public:
+    
+};
+
+class dMw_HIO_c {
+public:
+    dMw_HIO_c();
+};
+
+class dMw_DHIO_c {
+public:
+    dMw_DHIO_c();
+};
+
+
+#endif /* D_MENU_WINDOW_H */
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 92bc71cbd..58c4b6fb5 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -361,7 +361,11 @@ public:
     BOOL checkFrame(f32 frame) {
         return mFrameCtrl.checkPass(frame);
     }
-    void isMorf() {} // TODO
+    void changeAnm(J3DAnmTransform* bckAnm) { mpAnm = bckAnm; }
+    J3DAnmTransform* getAnm() { return mpAnm; }
+    f32 getMorfRatio() { return mCurMorf; }
+    BOOL isLoop() { return mFrameCtrl.checkState(J3DFrameCtrl::STATE_LOOP_E); }
+    BOOL isMorf() { return mCurMorf < 1.0f; }
 
     /* 0x50 */ J3DModel* mpModel;
     /* 0x54 */ J3DAnmTransform* mpAnm;
diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp
index 02744939e..29b6d397e 100644
--- a/src/d/actor/d_a_bigelf.cpp
+++ b/src/d/actor/d_a_bigelf.cpp
@@ -355,14 +355,3 @@ static BOOL daBigelf_Draw(daBigelf_c*) {
 static BOOL daBigelf_IsDelete(daBigelf_c*) {
     /* Nonmatching */
 }
-
-/* 00003890-000038AC       .text setEyePos__10daBigelf_cF4cXyz */
-void daBigelf_c::setEyePos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 000038AC-000038C8       .text setAttentionBasePos__10daBigelf_cF4cXyz */
-void daBigelf_c::setAttentionBasePos(cXyz) {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index cbf1a6b79..92523616b 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -295,19 +295,3 @@ static BOOL daNpc_Bs1_Draw(daNpc_Bs1_c*) {
 static BOOL daNpc_Bs1_IsDelete(daNpc_Bs1_c*) {
     /* Nonmatching */
 }
-
-/* 00005848-00005864       .text setEyePos__11daNpc_Bs1_cF4cXyz */
-void daNpc_Bs1_c::setEyePos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 00005864-00005880       .text setAttentionBasePos__11daNpc_Bs1_cF4cXyz */
-void daNpc_Bs1_c::setAttentionBasePos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 000058BC-0000599C       .text getItemZoomPos__16ShopCam_action_cFf */
-void ShopCam_action_c::getItemZoomPos(float) {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp
index b2df0a84f..46982aff8 100644
--- a/src/d/actor/d_a_npc_de1.cpp
+++ b/src/d/actor/d_a_npc_de1.cpp
@@ -290,9 +290,3 @@ static BOOL daNpc_De1_Draw(daNpc_De1_c*) {
 static BOOL daNpc_De1_IsDelete(daNpc_De1_c*) {
     /* Nonmatching */
 }
-
-/* 00002F54-00002F58       .text MatrixCrrPos__6dBgWSvFR13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
-void dBgWSv::MatrixCrrPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp
index cbf4494d2..e203e5068 100644
--- a/src/d/actor/d_a_npc_so.cpp
+++ b/src/d/actor/d_a_npc_so.cpp
@@ -391,228 +391,4 @@ static BOOL daNpc_SoIsDelete(void*) {
     /* Nonmatching */
 }
 
-/* 00004CE8-000051E8       .text cutProc__10daNpc_So_cFv */
-void daNpc_So_c::cutProc() {
-    /* Nonmatching */
-}
-
-/* 000051E8-000051EC       .text cutSwimStart__10daNpc_So_cFv */
-void daNpc_So_c::cutSwimStart() {
-    /* Nonmatching */
-}
-
-/* 000051EC-00005364       .text cutSwimProc__10daNpc_So_cFv */
-void daNpc_So_c::cutSwimProc() {
-    /* Nonmatching */
-}
-
-/* 00005364-000054A4       .text cutJumpStart__10daNpc_So_cFv */
-void daNpc_So_c::cutJumpStart() {
-    /* Nonmatching */
-}
-
-/* 000054A4-00005598       .text cutJumpProc__10daNpc_So_cFv */
-void daNpc_So_c::cutJumpProc() {
-    /* Nonmatching */
-}
-
-/* 00005598-00005610       .text cutAppearStart__10daNpc_So_cFv */
-void daNpc_So_c::cutAppearStart() {
-    /* Nonmatching */
-}
-
-/* 00005610-00005668       .text cutAppearProc__10daNpc_So_cFv */
-void daNpc_So_c::cutAppearProc() {
-    /* Nonmatching */
-}
-
-/* 00005668-00005688       .text cutDiveStart__10daNpc_So_cFv */
-void daNpc_So_c::cutDiveStart() {
-    /* Nonmatching */
-}
-
-/* 00005688-000056E0       .text cutDiveProc__10daNpc_So_cFv */
-void daNpc_So_c::cutDiveProc() {
-    /* Nonmatching */
-}
-
-/* 000056E0-00005778       .text cutDisappearStart__10daNpc_So_cFv */
-void daNpc_So_c::cutDisappearStart() {
-    /* Nonmatching */
-}
-
-/* 00005778-000057D0       .text cutDisappearProc__10daNpc_So_cFv */
-void daNpc_So_c::cutDisappearProc() {
-    /* Nonmatching */
-}
-
-/* 000057D0-000058D0       .text cutSetAnmStart__10daNpc_So_cFv */
-void daNpc_So_c::cutSetAnmStart() {
-    /* Nonmatching */
-}
-
-/* 000058D0-0000599C       .text cutSetAnmProc__10daNpc_So_cFv */
-void daNpc_So_c::cutSetAnmProc() {
-    /* Nonmatching */
-}
-
-/* 0000599C-00005AA8       .text cutEffectStart__10daNpc_So_cFv */
-void daNpc_So_c::cutEffectStart() {
-    /* Nonmatching */
-}
-
-/* 00005AA8-00005ADC       .text cutEffectProc__10daNpc_So_cFv */
-void daNpc_So_c::cutEffectProc() {
-    /* Nonmatching */
-}
-
-/* 00005ADC-00005AE0       .text cutEquipStart__10daNpc_So_cFv */
-void daNpc_So_c::cutEquipStart() {
-    /* Nonmatching */
-}
-
-/* 00005AE0-00005B1C       .text cutEquipProc__10daNpc_So_cFv */
-void daNpc_So_c::cutEquipProc() {
-    /* Nonmatching */
-}
-
-/* 00005B1C-00005B20       .text cutUnequipStart__10daNpc_So_cFv */
-void daNpc_So_c::cutUnequipStart() {
-    /* Nonmatching */
-}
-
-/* 00005B20-00005B5C       .text cutUnequipProc__10daNpc_So_cFv */
-void daNpc_So_c::cutUnequipProc() {
-    /* Nonmatching */
-}
-
-/* 00005B5C-00005B98       .text cutEatesaStart__10daNpc_So_cFv */
-void daNpc_So_c::cutEatesaStart() {
-    /* Nonmatching */
-}
-
-/* 00005B98-00005BF8       .text cutEatesaProc__10daNpc_So_cFv */
-void daNpc_So_c::cutEatesaProc() {
-    /* Nonmatching */
-}
-
-/* 00005BF8-00005C6C       .text cutEatesaFirstStart__10daNpc_So_cFv */
-void daNpc_So_c::cutEatesaFirstStart() {
-    /* Nonmatching */
-}
-
-/* 00005C6C-000060FC       .text cutEatesaFirstProc__10daNpc_So_cFv */
-void daNpc_So_c::cutEatesaFirstProc() {
-    /* Nonmatching */
-}
-
-/* 000060FC-00006148       .text cutJumpMapopenStart__10daNpc_So_cFv */
-void daNpc_So_c::cutJumpMapopenStart() {
-    /* Nonmatching */
-}
-
-/* 00006148-000064B8       .text cutJumpMapopenProc__10daNpc_So_cFv */
-void daNpc_So_c::cutJumpMapopenProc() {
-    /* Nonmatching */
-}
-
-/* 000064B8-00006710       .text cutMiniGameStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameStart() {
-    /* Nonmatching */
-}
-
-/* 00006710-00006FE4       .text cutMiniGameProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameProc() {
-    /* Nonmatching */
-}
-
-/* 00006FE4-00006FF0       .text cutTurnStart__10daNpc_So_cFv */
-void daNpc_So_c::cutTurnStart() {
-    /* Nonmatching */
-}
-
-/* 00006FF0-00007114       .text cutTurnProc__10daNpc_So_cFv */
-void daNpc_So_c::cutTurnProc() {
-    /* Nonmatching */
-}
-
-/* 00007114-00007324       .text cutMiniGameWarpStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameWarpStart() {
-    /* Nonmatching */
-}
-
-/* 00007324-00007438       .text cutMiniGameWarpProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameWarpProc() {
-    /* Nonmatching */
-}
-
-/* 00007438-00007524       .text cutMiniGameReturnStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameReturnStart() {
-    /* Nonmatching */
-}
-
-/* 00007524-0000781C       .text cutMiniGameReturnProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameReturnProc() {
-    /* Nonmatching */
-}
-
-/* 0000781C-00007820       .text cutPartnerShipStart__10daNpc_So_cFv */
-void daNpc_So_c::cutPartnerShipStart() {
-    /* Nonmatching */
-}
-
-/* 00007820-00007878       .text cutPartnerShipProc__10daNpc_So_cFv */
-void daNpc_So_c::cutPartnerShipProc() {
-    /* Nonmatching */
-}
-
-/* 00007878-000078E0       .text cutMiniGameWaitStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameWaitStart() {
-    /* Nonmatching */
-}
-
-/* 000078E0-00007914       .text cutMiniGameWaitProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameWaitProc() {
-    /* Nonmatching */
-}
-
-/* 00007914-00007934       .text cutMiniGameEndStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameEndStart() {
-    /* Nonmatching */
-}
-
-/* 00007934-0000798C       .text cutMiniGameEndProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGameEndProc() {
-    /* Nonmatching */
-}
-
-/* 0000798C-000079AC       .text cutMiniGamePlTurnStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGamePlTurnStart() {
-    /* Nonmatching */
-}
-
-/* 000079AC-00007AC0       .text cutMiniGamePlTurnProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGamePlTurnProc() {
-    /* Nonmatching */
-}
-
-/* 00007AC0-00007B1C       .text cutMiniGamePlUpStart__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGamePlUpStart() {
-    /* Nonmatching */
-}
-
-/* 00007B1C-00007CBC       .text cutMiniGamePlUpProc__10daNpc_So_cFv */
-void daNpc_So_c::cutMiniGamePlUpProc() {
-    /* Nonmatching */
-}
-
-/* 00007CBC-00007E74       .text initCam__10daNpc_So_cFv */
-void daNpc_So_c::initCam() {
-    /* Nonmatching */
-}
-
-/* 00007E74-00008010       .text moveCam__10daNpc_So_cFv */
-void daNpc_So_c::moveCam() {
-    /* Nonmatching */
-}
-
+#include "d/actor/d_a_npc_so_cut.inc"
diff --git a/src/d/actor/d_a_npc_so_cut.inc b/src/d/actor/d_a_npc_so_cut.inc
new file mode 100644
index 000000000..7ec72d118
--- /dev/null
+++ b/src/d/actor/d_a_npc_so_cut.inc
@@ -0,0 +1,229 @@
+// The original name of this file is unknown, but it must exist because d_a_npc_so's "cut" functions
+// are in a separate .text section from the rest of its functions.
+
+#include "d/actor/d_a_npc_so.h"
+
+/* 00004CE8-000051E8       .text cutProc__10daNpc_So_cFv */
+void daNpc_So_c::cutProc() {
+    /* Nonmatching */
+}
+
+/* 000051E8-000051EC       .text cutSwimStart__10daNpc_So_cFv */
+void daNpc_So_c::cutSwimStart() {
+    /* Nonmatching */
+}
+
+/* 000051EC-00005364       .text cutSwimProc__10daNpc_So_cFv */
+void daNpc_So_c::cutSwimProc() {
+    /* Nonmatching */
+}
+
+/* 00005364-000054A4       .text cutJumpStart__10daNpc_So_cFv */
+void daNpc_So_c::cutJumpStart() {
+    /* Nonmatching */
+}
+
+/* 000054A4-00005598       .text cutJumpProc__10daNpc_So_cFv */
+void daNpc_So_c::cutJumpProc() {
+    /* Nonmatching */
+}
+
+/* 00005598-00005610       .text cutAppearStart__10daNpc_So_cFv */
+void daNpc_So_c::cutAppearStart() {
+    /* Nonmatching */
+}
+
+/* 00005610-00005668       .text cutAppearProc__10daNpc_So_cFv */
+void daNpc_So_c::cutAppearProc() {
+    /* Nonmatching */
+}
+
+/* 00005668-00005688       .text cutDiveStart__10daNpc_So_cFv */
+void daNpc_So_c::cutDiveStart() {
+    /* Nonmatching */
+}
+
+/* 00005688-000056E0       .text cutDiveProc__10daNpc_So_cFv */
+void daNpc_So_c::cutDiveProc() {
+    /* Nonmatching */
+}
+
+/* 000056E0-00005778       .text cutDisappearStart__10daNpc_So_cFv */
+void daNpc_So_c::cutDisappearStart() {
+    /* Nonmatching */
+}
+
+/* 00005778-000057D0       .text cutDisappearProc__10daNpc_So_cFv */
+void daNpc_So_c::cutDisappearProc() {
+    /* Nonmatching */
+}
+
+/* 000057D0-000058D0       .text cutSetAnmStart__10daNpc_So_cFv */
+void daNpc_So_c::cutSetAnmStart() {
+    /* Nonmatching */
+}
+
+/* 000058D0-0000599C       .text cutSetAnmProc__10daNpc_So_cFv */
+void daNpc_So_c::cutSetAnmProc() {
+    /* Nonmatching */
+}
+
+/* 0000599C-00005AA8       .text cutEffectStart__10daNpc_So_cFv */
+void daNpc_So_c::cutEffectStart() {
+    /* Nonmatching */
+}
+
+/* 00005AA8-00005ADC       .text cutEffectProc__10daNpc_So_cFv */
+void daNpc_So_c::cutEffectProc() {
+    /* Nonmatching */
+}
+
+/* 00005ADC-00005AE0       .text cutEquipStart__10daNpc_So_cFv */
+void daNpc_So_c::cutEquipStart() {
+    /* Nonmatching */
+}
+
+/* 00005AE0-00005B1C       .text cutEquipProc__10daNpc_So_cFv */
+void daNpc_So_c::cutEquipProc() {
+    /* Nonmatching */
+}
+
+/* 00005B1C-00005B20       .text cutUnequipStart__10daNpc_So_cFv */
+void daNpc_So_c::cutUnequipStart() {
+    /* Nonmatching */
+}
+
+/* 00005B20-00005B5C       .text cutUnequipProc__10daNpc_So_cFv */
+void daNpc_So_c::cutUnequipProc() {
+    /* Nonmatching */
+}
+
+/* 00005B5C-00005B98       .text cutEatesaStart__10daNpc_So_cFv */
+void daNpc_So_c::cutEatesaStart() {
+    /* Nonmatching */
+}
+
+/* 00005B98-00005BF8       .text cutEatesaProc__10daNpc_So_cFv */
+void daNpc_So_c::cutEatesaProc() {
+    /* Nonmatching */
+}
+
+/* 00005BF8-00005C6C       .text cutEatesaFirstStart__10daNpc_So_cFv */
+void daNpc_So_c::cutEatesaFirstStart() {
+    /* Nonmatching */
+}
+
+/* 00005C6C-000060FC       .text cutEatesaFirstProc__10daNpc_So_cFv */
+void daNpc_So_c::cutEatesaFirstProc() {
+    /* Nonmatching */
+}
+
+/* 000060FC-00006148       .text cutJumpMapopenStart__10daNpc_So_cFv */
+void daNpc_So_c::cutJumpMapopenStart() {
+    /* Nonmatching */
+}
+
+/* 00006148-000064B8       .text cutJumpMapopenProc__10daNpc_So_cFv */
+void daNpc_So_c::cutJumpMapopenProc() {
+    /* Nonmatching */
+}
+
+/* 000064B8-00006710       .text cutMiniGameStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameStart() {
+    /* Nonmatching */
+}
+
+/* 00006710-00006FE4       .text cutMiniGameProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameProc() {
+    /* Nonmatching */
+}
+
+/* 00006FE4-00006FF0       .text cutTurnStart__10daNpc_So_cFv */
+void daNpc_So_c::cutTurnStart() {
+    /* Nonmatching */
+}
+
+/* 00006FF0-00007114       .text cutTurnProc__10daNpc_So_cFv */
+void daNpc_So_c::cutTurnProc() {
+    /* Nonmatching */
+}
+
+/* 00007114-00007324       .text cutMiniGameWarpStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameWarpStart() {
+    /* Nonmatching */
+}
+
+/* 00007324-00007438       .text cutMiniGameWarpProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameWarpProc() {
+    /* Nonmatching */
+}
+
+/* 00007438-00007524       .text cutMiniGameReturnStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameReturnStart() {
+    /* Nonmatching */
+}
+
+/* 00007524-0000781C       .text cutMiniGameReturnProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameReturnProc() {
+    /* Nonmatching */
+}
+
+/* 0000781C-00007820       .text cutPartnerShipStart__10daNpc_So_cFv */
+void daNpc_So_c::cutPartnerShipStart() {
+    /* Nonmatching */
+}
+
+/* 00007820-00007878       .text cutPartnerShipProc__10daNpc_So_cFv */
+void daNpc_So_c::cutPartnerShipProc() {
+    /* Nonmatching */
+}
+
+/* 00007878-000078E0       .text cutMiniGameWaitStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameWaitStart() {
+    /* Nonmatching */
+}
+
+/* 000078E0-00007914       .text cutMiniGameWaitProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameWaitProc() {
+    /* Nonmatching */
+}
+
+/* 00007914-00007934       .text cutMiniGameEndStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameEndStart() {
+    /* Nonmatching */
+}
+
+/* 00007934-0000798C       .text cutMiniGameEndProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGameEndProc() {
+    /* Nonmatching */
+}
+
+/* 0000798C-000079AC       .text cutMiniGamePlTurnStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGamePlTurnStart() {
+    /* Nonmatching */
+}
+
+/* 000079AC-00007AC0       .text cutMiniGamePlTurnProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGamePlTurnProc() {
+    /* Nonmatching */
+}
+
+/* 00007AC0-00007B1C       .text cutMiniGamePlUpStart__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGamePlUpStart() {
+    /* Nonmatching */
+}
+
+/* 00007B1C-00007CBC       .text cutMiniGamePlUpProc__10daNpc_So_cFv */
+void daNpc_So_c::cutMiniGamePlUpProc() {
+    /* Nonmatching */
+}
+
+/* 00007CBC-00007E74       .text initCam__10daNpc_So_cFv */
+void daNpc_So_c::initCam() {
+    /* Nonmatching */
+}
+
+/* 00007E74-00008010       .text moveCam__10daNpc_So_cFv */
+void daNpc_So_c::moveCam() {
+    /* Nonmatching */
+}
diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp
index 9d3afa7d5..7915ca307 100644
--- a/src/d/actor/d_a_npc_tt.cpp
+++ b/src/d/actor/d_a_npc_tt.cpp
@@ -250,43 +250,5 @@ static BOOL daNpc_Tt_Draw(daNpc_Tt_c*) {
 static BOOL daNpc_Tt_IsDelete(daNpc_Tt_c*) {
     /* Nonmatching */
 }
-/* 00002C60-00002C7C       .text setEyePos__10daNpc_Tt_cF4cXyz */
-void daNpc_Tt_c::setEyePos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 00002C7C-00002C98       .text setAttentionBasePos__10daNpc_Tt_cF4cXyz */
-void daNpc_Tt_c::setAttentionBasePos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 00002CD4-00002DEC       .text initTexPatternAnm__10daNpc_Tt_cFb */
-void daNpc_Tt_c::initTexPatternAnm(bool) {
-    /* Nonmatching */
-}
-
-/* 00002DEC-00002E78       .text playTexPatternAnm__10daNpc_Tt_cFv */
-void daNpc_Tt_c::playTexPatternAnm() {
-    /* Nonmatching */
-}
-
-/* 00002E78-00002F94       .text setAnm__10daNpc_Tt_cFi */
-void daNpc_Tt_c::setAnm(int) {
-    /* Nonmatching */
-}
-
-/* 00002F94-00002FFC       .text danceInit__10daNpc_Tt_cFi */
-void daNpc_Tt_c::danceInit(int) {
-    /* Nonmatching */
-}
-
-/* 00002FFC-000030B0       .text danceProc__10daNpc_Tt_cFv */
-void daNpc_Tt_c::danceProc() {
-    /* Nonmatching */
-}
-
-/* 000030B0-00003210       .text danceNext__10daNpc_Tt_cFv */
-void daNpc_Tt_c::danceNext() {
-    /* Nonmatching */
-}
 
+#include "d/actor/d_a_npc_tt_anm.inc"
diff --git a/src/d/actor/d_a_npc_tt_anm.inc b/src/d/actor/d_a_npc_tt_anm.inc
new file mode 100644
index 000000000..8f63442c6
--- /dev/null
+++ b/src/d/actor/d_a_npc_tt_anm.inc
@@ -0,0 +1,33 @@
+// The name of this .inc file is known because of an assert contained in it.
+
+#include "d/actor/d_a_npc_tt.h"
+
+/* 00002CD4-00002DEC       .text initTexPatternAnm__10daNpc_Tt_cFb */
+void daNpc_Tt_c::initTexPatternAnm(bool) {
+    /* Nonmatching */
+}
+
+/* 00002DEC-00002E78       .text playTexPatternAnm__10daNpc_Tt_cFv */
+void daNpc_Tt_c::playTexPatternAnm() {
+    /* Nonmatching */
+}
+
+/* 00002E78-00002F94       .text setAnm__10daNpc_Tt_cFi */
+void daNpc_Tt_c::setAnm(int) {
+    /* Nonmatching */
+}
+
+/* 00002F94-00002FFC       .text danceInit__10daNpc_Tt_cFi */
+void daNpc_Tt_c::danceInit(int) {
+    /* Nonmatching */
+}
+
+/* 00002FFC-000030B0       .text danceProc__10daNpc_Tt_cFv */
+void daNpc_Tt_c::danceProc() {
+    /* Nonmatching */
+}
+
+/* 000030B0-00003210       .text danceNext__10daNpc_Tt_cFv */
+void daNpc_Tt_c::danceNext() {
+    /* Nonmatching */
+}
diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp
index a98e0a1e5..227d50d83 100644
--- a/src/d/actor/d_a_obj_ekskz.cpp
+++ b/src/d/actor/d_a_obj_ekskz.cpp
@@ -7,12 +7,12 @@
 #include "dolphin/types.h"
 
 /* 00000078-00000368       .text CreateHeap__Q210daObjEkskz5Act_cFv */
-void daObjEkskz::Act_c::CreateHeap() {
+int daObjEkskz::Act_c::CreateHeap() {
     /* Nonmatching */
 }
 
 /* 00000368-0000054C       .text Create__Q210daObjEkskz5Act_cFv */
-s32 daObjEkskz::Act_c::Create() {
+int daObjEkskz::Act_c::Create() {
     /* Nonmatching */
 }
 
@@ -42,7 +42,7 @@ void daObjEkskz::Act_c::init_mtx() {
 }
 
 /* 00000DC0-00000FFC       .text Execute__Q210daObjEkskz5Act_cFPPA3_A4_f */
-void daObjEkskz::Act_c::Execute(float(**)[3][4]) {
+int daObjEkskz::Act_c::Execute(float(**)[3][4]) {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp
index 5fae315ad..5fc777c72 100644
--- a/src/d/actor/d_a_obj_hat.cpp
+++ b/src/d/actor/d_a_obj_hat.cpp
@@ -90,8 +90,3 @@ static BOOL daSampleDraw(void*) {
 static BOOL daSampleIsDelete(void*) {
     /* Nonmatching */
 }
-
-/* 00000B94-00000BB0       .text getWindVec__12daNpcRoten_cFv */
-void daNpcRoten_c::getWindVec() {
-    /* Nonmatching */
-}
diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp
index a8c451b8b..fcc2eba89 100644
--- a/src/d/actor/d_a_obj_hha.cpp
+++ b/src/d/actor/d_a_obj_hha.cpp
@@ -155,23 +155,3 @@ BOOL daObjHha_c::_execute() {
 BOOL daObjHha_c::_draw() {
     /* Nonmatching */
 }
-/* 00003064-00003080       .text get_base_pos__16daObjHhaSplash_cFv */
-void daObjHhaSplash_c::get_base_pos() {
-    /* Nonmatching */
-}
-
-/* 00003080-0000309C       .text get_pos__16daObjHhaSplash_cFv */
-void daObjHhaSplash_c::get_pos() {
-    /* Nonmatching */
-}
-
-/* 0000309C-000030B8       .text set_pos__15daObjHhaYgush_cF4cXyz */
-void daObjHhaYgush_c::set_pos(cXyz) {
-    /* Nonmatching */
-}
-
-/* 000030B8-000030D4       .text get_base_pos__15daObjHhaYgush_cFv */
-void daObjHhaYgush_c::get_base_pos() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp
index 05271af82..7c50163c6 100644
--- a/src/d/actor/d_a_obj_majyuu_door.cpp
+++ b/src/d/actor/d_a_obj_majyuu_door.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_majyuu_door.h"
-#include "dolphin/types.h"
+#include "d/d_cc_d.h"
 
 /* 000000EC-0000010C       .text createHeap_CB__FP10fopAc_ac_c */
 static BOOL createHeap_CB(fopAc_ac_c*) {
diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp
index 7b75c9f20..9af9bd03a 100644
--- a/src/d/actor/d_a_obj_plant.cpp
+++ b/src/d/actor/d_a_obj_plant.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_plant.h"
-#include "dolphin/types.h"
+#include "m_Do/m_Do_ext.h"
 
 /* 00000078-00000098       .text CheckCreateHeap__FP10fopAc_ac_c */
 static BOOL CheckCreateHeap(fopAc_ac_c*) {
diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp
index d278ac187..fb7a3278f 100644
--- a/src/d/actor/d_a_obj_tapestry.cpp
+++ b/src/d/actor/d_a_obj_tapestry.cpp
@@ -340,4 +340,3 @@ static BOOL daObjTapestry_Draw(daObjTapestry_c*) {
 static BOOL daObjTapestry_IsDelete(daObjTapestry_c*) {
     /* Nonmatching */
 }
-
diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp
index 40343b1bc..3376e7fac 100644
--- a/src/d/actor/d_a_obj_vfan.cpp
+++ b/src/d/actor/d_a_obj_vfan.cpp
@@ -7,12 +7,12 @@
 #include "dolphin/types.h"
 
 /* 00000078-00000134       .text CreateHeap__Q29daObjVfan5Act_cFv */
-void daObjVfan::Act_c::CreateHeap() {
+int daObjVfan::Act_c::CreateHeap() {
     /* Nonmatching */
 }
 
 /* 00000134-00000214       .text Create__Q29daObjVfan5Act_cFv */
-s32 daObjVfan::Act_c::Create() {
+int daObjVfan::Act_c::Create() {
     /* Nonmatching */
 }
 
@@ -47,7 +47,7 @@ void daObjVfan::Act_c::ParticleSet() {
 }
 
 /* 000009B4-00000C74       .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */
-void daObjVfan::Act_c::Execute(float(**)[3][4]) {
+int daObjVfan::Act_c::Execute(float(**)[3][4]) {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp
index 9bc47ad86..1fc1a43f2 100644
--- a/src/d/actor/d_a_ykgr.cpp
+++ b/src/d/actor/d_a_ykgr.cpp
@@ -6,6 +6,16 @@
 #include "d/actor/d_a_ykgr.h"
 #include "dolphin/types.h"
 
+/* 000000EC-00000134       .text draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */
+void dPa_YkgrPcallBack::draw(JPABaseEmitter*, JPABaseParticle*) {
+    /* Nonmatching */
+}
+
+/* 00000134-00000234       .text setParam__17dPa_YkgrPcallBackFf */
+void dPa_YkgrPcallBack::setParam(float) {
+    /* Nonmatching */
+}
+
 /* 00000234-00000408       .text getPosRate__8daYkgr_cFv */
 void daYkgr_c::getPosRate() {
     /* Nonmatching */
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index fd514ea60..ca161121a 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -3,6 +3,7 @@
 // Translation Unit: d_gameover.cpp
 //
 
+#include "d/d_menu_save.h"
 #include "d/d_drawlist.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_meter.h"
@@ -17,35 +18,6 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "SSystem/SComponent/c_phase.h"
 
-class dDlst_MenuSave_c : public dDlst_base_c {
-};
-
-class dMenu_save_c {
-public:
-    virtual ~dMenu_save_c() {}
-    void _create();
-    void _draw2();
-    void _move();
-    bool _open();
-    bool _close();
-    void _delete();
-
-public:
-    /* 0x0004 */ u8 field_0x0004;
-    /* 0x0008 */ dDlst_MenuSave_c mDlst;
-    /* 0x000C */ u8 field_0x000c[0x0524];
-    /* 0x0530 */ u8 field_0x0530;
-    /* 0x0531 */ u8 field_0x0531;
-    /* 0x0532 */ u8 field_0x0532;
-    /* 0x0533 */ u8 field_0x0533;
-    /* 0x0534 */ u8 field_0x0534;
-    /* 0x0535 */ u8 field_0x0535;
-    /* 0x0536 */ u8 field_0x0536;
-    /* 0x0537 */ u8 field_0x0537;
-    /* 0x0538 */ u8 field_0x0538;
-    /* 0x0539 */ u8 field_0x0539[0x1ba4 - 0x0539];
-};
-
 class dDlst_Gameover_CAPTURE_c : public dDlst_base_c {
 public:
     virtual ~dDlst_Gameover_CAPTURE_c() {}
diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp
index 74688b0e4..efc1da3a5 100644
--- a/src/d/d_menu_cloth.cpp
+++ b/src/d/d_menu_cloth.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_menu_cloth.cpp
 //
 
-#include "d_menu_cloth.h"
+#include "d/d_menu_cloth.h"
 #include "dolphin/types.h"
 
 /* 8019940C-8019966C       .text __ct__13daCLOTH_HIO_cFv */
@@ -145,9 +145,3 @@ void dMenu_ClothDraw(void*) {
 void dMenu_ClothIsDelete(void*) {
     /* Nonmatching */
 }
-
-/* 8019BDE0-8019BE50       .text __dt__13daCLOTH_HIO_cFv */
-daCLOTH_HIO_c::~daCLOTH_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp
index bf24d0157..4e6061774 100644
--- a/src/d/d_menu_collect.cpp
+++ b/src/d/d_menu_collect.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_menu_collect.cpp
 //
 
-#include "d_menu_collect.h"
+#include "d/d_menu_collect.h"
 #include "dolphin/types.h"
 
 /* 8019BE8C-8019BF14       .text __ct__9dMc_HIO_cFv */
@@ -290,54 +290,3 @@ void dMenu_Collect_c::_open2() {
 void dMenu_Collect_c::_close2() {
     /* Nonmatching */
 }
-
-/* 801A84B4-801A84FC       .text __dt__14dMenu_Option_cFv */
-dMenu_Option_c::~dMenu_Option_c() {
-    /* Nonmatching */
-}
-
-/* 801A84FC-801A8584       .text __dt__15dMenu_Collect_cFv */
-dMenu_Collect_c::~dMenu_Collect_c() {
-    /* Nonmatching */
-}
-
-/* 801A8584-801A85B0       .text draw__15dMenu_Collect_cFv */
-void dMenu_Collect_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801A85B0-801A860C       .text __dt__12dMenu_base_cFv */
-dMenu_base_c::~dMenu_base_c() {
-    /* Nonmatching */
-}
-
-/* 801A860C-801A8610       .text _create__12dMenu_base_cFv */
-void dMenu_base_c::_create() {
-    /* Nonmatching */
-}
-
-/* 801A8610-801A8614       .text _delete__12dMenu_base_cFv */
-void dMenu_base_c::_delete() {
-    /* Nonmatching */
-}
-
-/* 801A8614-801A8618       .text _move__12dMenu_base_cFv */
-void dMenu_base_c::_move() {
-    /* Nonmatching */
-}
-
-/* 801A8618-801A861C       .text _draw__12dMenu_base_cFv */
-void dMenu_base_c::_draw() {
-    /* Nonmatching */
-}
-
-/* 801A861C-801A8620       .text draw__12dMenu_base_cFv */
-void dMenu_base_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801A8620-801A8668       .text __dt__9dMc_HIO_cFv */
-dMc_HIO_c::~dMc_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp
index ff2984dfb..ecf496812 100644
--- a/src/d/d_menu_dmap.cpp
+++ b/src/d/d_menu_dmap.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_menu_dmap.cpp
 //
 
-#include "d_menu_dmap.h"
-#include "dolphin/types.h"
+#include "d/d_menu_dmap.h"
+#include "d/d_stage.h"
 
 /* 801A86A4-801A87CC       .text __ct__9dMd_HIO_cFv */
 dMd_HIO_c::dMd_HIO_c() {
@@ -185,19 +185,3 @@ void dMenu_Dmap_c::_open() {
 void dMenu_Dmap_c::_close() {
     /* Nonmatching */
 }
-
-/* 801AF3B8-801AF440       .text __dt__12dMenu_Dmap_cFv */
-dMenu_Dmap_c::~dMenu_Dmap_c() {
-    /* Nonmatching */
-}
-
-/* 801AF440-801AF46C       .text draw__12dMenu_Dmap_cFv */
-void dMenu_Dmap_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801AF46C-801AF4B4       .text __dt__9dMd_HIO_cFv */
-dMd_HIO_c::~dMd_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp
index 5460a4e5f..df6960424 100644
--- a/src/d/d_menu_fmap.cpp
+++ b/src/d/d_menu_fmap.cpp
@@ -3,8 +3,7 @@
 // Translation Unit: d_menu_fmap.cpp
 //
 
-#include "d_menu_fmap.h"
-#include "dolphin/types.h"
+#include "d/d_menu_fmap.h"
 
 /* 801AF4F0-801AF848       .text __ct__9dMf_HIO_cFv */
 dMf_HIO_c::dMf_HIO_c() {
@@ -660,14 +659,3 @@ void dMenu_Fmap_c::getButtonIconMode() {
 void dDlst_FMAP_c::draw() {
     /* Nonmatching */
 }
-
-/* 801BB088-801BB0E4       .text __dt__12dDlst_FMAP_cFv */
-dDlst_FMAP_c::~dDlst_FMAP_c() {
-    /* Nonmatching */
-}
-
-/* 801BB0E4-801BB12C       .text __dt__9dMf_HIO_cFv */
-dMf_HIO_c::~dMf_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_fmap2.cpp b/src/d/d_menu_fmap2.cpp
index b02a4448b..8a26d8185 100644
--- a/src/d/d_menu_fmap2.cpp
+++ b/src/d/d_menu_fmap2.cpp
@@ -3,8 +3,7 @@
 // Translation Unit: d_menu_fmap2.cpp
 //
 
-#include "d_menu_fmap2.h"
-#include "dolphin/types.h"
+#include "d/d_menu_fmap2.h"
 
 /* 801BB3E4-801BB5B8       .text __ct__10dMf2_HIO_cFv */
 dMf2_HIO_c::dMf2_HIO_c() {
@@ -570,19 +569,3 @@ void dDlst_FMAP2_c::draw() {
 void dDlst_FMAP2GS_c::draw() {
     /* Nonmatching */
 }
-
-/* 801C790C-801C7968       .text __dt__15dDlst_FMAP2GS_cFv */
-dDlst_FMAP2GS_c::~dDlst_FMAP2GS_c() {
-    /* Nonmatching */
-}
-
-/* 801C7968-801C79C4       .text __dt__13dDlst_FMAP2_cFv */
-dDlst_FMAP2_c::~dDlst_FMAP2_c() {
-    /* Nonmatching */
-}
-
-/* 801C79C4-801C7A0C       .text __dt__10dMf2_HIO_cFv */
-dMf2_HIO_c::~dMf2_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_item.cpp b/src/d/d_menu_item.cpp
index b3b81586b..0de373b38 100644
--- a/src/d/d_menu_item.cpp
+++ b/src/d/d_menu_item.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_menu_item.cpp
 //
 
-#include "d_menu_item.h"
+#include "d/d_menu_item.h"
 #include "dolphin/types.h"
 
 /* 801C7B4C-801C7C7C       .text __ct__9dMi_HIO_cFv */
@@ -260,19 +260,3 @@ void dMenu_Item_c::_open2() {
 void dMenu_Item_c::_close2() {
     /* Nonmatching */
 }
-
-/* 801D2A4C-801D2AB8       .text __dt__12dMenu_Item_cFv */
-dMenu_Item_c::~dMenu_Item_c() {
-    /* Nonmatching */
-}
-
-/* 801D2AB8-801D2AE4       .text draw__12dMenu_Item_cFv */
-void dMenu_Item_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801D2AE4-801D2B2C       .text __dt__9dMi_HIO_cFv */
-dMi_HIO_c::~dMi_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index 9a9326a6e..4079c582f 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_menu_option.cpp
 //
 
-#include "d_menu_option.h"
+#include "d/d_menu_option.h"
 #include "dolphin/types.h"
 
 /* 801D2B68-801D2B78       .text __ct__9dMo_HIO_cFv */
@@ -150,9 +150,3 @@ void dMenu_Option_c::_open() {
 void dMenu_Option_c::_close() {
     /* Nonmatching */
 }
-
-/* 801D5D38-801D5D80       .text __dt__9dMo_HIO_cFv */
-dMo_HIO_c::~dMo_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index 7609eba4e..33d3e45e1 100644
--- a/src/d/d_menu_save.cpp
+++ b/src/d/d_menu_save.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_menu_save.cpp
 //
 
-#include "d_menu_save.h"
+#include "d/d_menu_save.h"
 #include "dolphin/types.h"
 
 /* 801D5DB8-801D5E8C       .text __ct__9dMs_HIO_cFv */
@@ -22,7 +22,7 @@ void dMenu_save_c::initialize() {
 }
 
 /* 801D6174-801D61A0       .text _open__12dMenu_save_cFv */
-void dMenu_save_c::_open() {
+bool dMenu_save_c::_open() {
     /* Nonmatching */
 }
 
@@ -32,7 +32,7 @@ void dMenu_save_c::openNormal() {
 }
 
 /* 801D62CC-801D62F8       .text _close__12dMenu_save_cFv */
-void dMenu_save_c::_close() {
+bool dMenu_save_c::_close() {
     /* Nonmatching */
 }
 
@@ -420,14 +420,3 @@ void dMenu_save_c::_draw2() {
 void dDlst_MenuSave_c::draw() {
     /* Nonmatching */
 }
-
-/* 801DAED0-801DAF44       .text __dt__13dFile_error_cFv */
-dFile_error_c::~dFile_error_c() {
-    /* Nonmatching */
-}
-
-/* 801DAF44-801DAF8C       .text __dt__9dMs_HIO_cFv */
-dMs_HIO_c::~dMs_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp
index b493585e6..58ef14562 100644
--- a/src/d/d_menu_window.cpp
+++ b/src/d/d_menu_window.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_menu_window.cpp
 //
 
-#include "d_menu_window.h"
-#include "dolphin/types.h"
+#include "d/d_menu_window.h"
+#include "f_op/f_op_msg.h"
 
 /* 801DB384-801DB50C       .text __ct__9dMw_HIO_cFv */
 dMw_HIO_c::dMw_HIO_c() {
@@ -160,59 +160,3 @@ void dMs_Delete(sub_ms_screen_class*) {
 void dMs_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 801DF684-801DF9C0       .text draw__20dDlst_MENU_CAPTURE_cFv */
-void dDlst_MENU_CAPTURE_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801DF9C0-801DFA70       .text draw__18dDlst_MENU_CLOTH_cFv */
-void dDlst_MENU_CLOTH_c::draw() {
-    /* Nonmatching */
-}
-
-/* 801DFA70-801DFACC       .text __dt__20dDlst_MENU_CAPTURE_cFv */
-dDlst_MENU_CAPTURE_c::~dDlst_MENU_CAPTURE_c() {
-    /* Nonmatching */
-}
-
-/* 801DFACC-801DFB28       .text __dt__18dDlst_MENU_CLOTH_cFv */
-dDlst_MENU_CLOTH_c::~dDlst_MENU_CLOTH_c() {
-    /* Nonmatching */
-}
-
-/* 801DFB28-801DFBC4       .text __dt__13dMenu_Fmap2_cFv */
-dMenu_Fmap2_c::~dMenu_Fmap2_c() {
-    /* Nonmatching */
-}
-
-/* 801DFBC4-801DFC9C       .text __dt__12dMenu_Fmap_cFv */
-dMenu_Fmap_c::~dMenu_Fmap_c() {
-    /* Nonmatching */
-}
-
-/* 801DFC9C-801DFCF8       .text __dt__14dDlst_NameIN_cFv */
-dDlst_NameIN_c::~dDlst_NameIN_c() {
-    /* Nonmatching */
-}
-
-/* 801DFCF8-801DFD6C       .text __dt__7dName_cFv */
-dName_c::~dName_c() {
-    /* Nonmatching */
-}
-
-/* 801DFD6C-801DFDB4       .text __dt__10dMw_DHIO_cFv */
-dMw_DHIO_c::~dMw_DHIO_c() {
-    /* Nonmatching */
-}
-
-/* 801DFDB4-801DFDFC       .text __dt__9dMw_HIO_cFv */
-dMw_HIO_c::~dMw_HIO_c() {
-    /* Nonmatching */
-}
-
-/* 801DFEA8-801DFEE4       .text __dt__14dMenu_FmapSv_cFv */
-dMenu_FmapSv_c::~dMenu_FmapSv_c() {
-    /* Nonmatching */
-}
-