Merge pull request #551 from Jcw87/random

Random
2026-06-05 11:17:43 -04:00 · 2023-12-15 19:09:41 -08:00
parent 62b986dd94 3e007c7ea9
commit 4fb30e845d
36 changed files with 1020 additions and 505 deletions
@@ -900,7 +900,7 @@ config.libs = [
        "JMath",
        [
            Object(NonMatching, "JSystem/JMath/JMath.cpp"),
-            Object(NonMatching, "JSystem/JMath/random.cpp"),
+            Object(Matching,    "JSystem/JMath/random.cpp"),
        ],
    ),
    DolphinLib(
@@ -53,10 +53,17 @@ public:
        mBounds.f.x = mBounds.i.x + w;
        mBounds.f.y = mBounds.i.y + h;
    }
-    virtual bool setConnectParent(bool connected);
-    virtual void calcMtx();
-    virtual void update();
-    virtual void drawSelf(f32 x, f32 y);
+    virtual bool setConnectParent(bool connected) {
+        mIsConnectParent = 0;
+        return false;
+    }
+    virtual void calcMtx() {
+        if (mPaneTree.mList) {
+            makeMatrix(mBounds.i.x, mBounds.i.y);
+        }
+    }
+    virtual void update() {}
+    virtual void drawSelf(f32 x, f32 y) {}
    virtual void drawSelf(f32 x, f32 y, Mtx* mtx) {}
    virtual J2DPane* search(u32 tag);
    virtual void makeMatrix(f32, f32);
@@ -27,8 +27,14 @@ public:
    virtual u16 getTypeID() { return 0x12; }
    virtual void drawSelf(f32 x, f32 y);
    virtual void drawSelf(f32 x, f32 y, Mtx* mtx);
-    virtual void drawOut(f32, f32, f32, f32, f32, f32);
-    virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
+    virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6) {
+        if (mpTexture[0]) {
+            drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + mpTexture[0]->getWidth(), p6 + mpTexture[0]->getHeight()));
+        }
+    }
+    virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8) {
+        drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + p7, p6 + p8));
+    }
    JUTTexture * getTexture(u8 idx) const {
        return idx < mNumTexture ? mpTexture[idx] : NULL;
    }
@@ -14,7 +14,7 @@ class J3DAnmCluster;
 class J3DDeformData {
 public:
    J3DDeformData();
-    void offAllFlag(u32);
+    void clear();
    void deform(J3DVertexBuffer*);
    void deform(J3DModel*);
    void setAnm(J3DAnmCluster*);
@@ -50,18 +50,13 @@ struct J3DSkinNList {
 class J3DSkinDeform {
 public:
    J3DSkinDeform();
-    void initSkinInfo(J3DModelData*);
    int initMtxIndexArray(J3DModelData*);
    void changeFastSkinDL(J3DModelData*);
-    // void calcNrmMtx(J3DMtxBuffer*);
-    void transformVtxPosNrm(J3DModelData*);
-    // void calcAnmInvJointMtx(J3DMtxBuffer*);
-    // void deformFastVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    // void deformFastVtxNrm_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    // void deformVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    // void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    void deformVtxNrm_F32(J3DVertexBuffer*) const;
-    void deformVtxNrm_S16(J3DVertexBuffer*) const;
+    void calcNrmMtx(J3DModel*);
+    void deformVtxPos_F32(J3DModel*) const;
+    void deformVtxPos_S16(J3DModel*) const;
+    void deformVtxNrm_F32(J3DModel*) const;
+    void deformVtxNrm_S16(J3DModel*) const;
    void setNrmMtx(int i, MtxP mtx) {
        J3DPSMtx33CopyFrom34(mtx, (Mtx3P)mNrmMtx[i]);
    }
@@ -71,7 +66,7 @@ public:
    bool checkFlag(u32 flag) { return mFlags & flag; }

    virtual void deform(J3DModel*);
-    virtual ~J3DSkinDeform();
+    virtual ~J3DSkinDeform() {}

    static u16* sWorkArea_WEvlpMixMtx[1024];
    static f32* sWorkArea_WEvlpMixWeight[1024];
@@ -90,10 +85,12 @@ STATIC_ASSERT(sizeof(J3DSkinDeform) == 0x18);
 class J3DDeformer {
 public:
    J3DDeformer(J3DDeformData*);
+    void clear();
    void deform(J3DVertexBuffer*, u16, f32*);
    void deform(J3DVertexBuffer*, u16);
    void deform_VtxPosF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
    void deform_VtxNrmF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
+    void normalize(f32*);
    void normalizeWeight(int, f32*);

 private:
@@ -29,6 +29,20 @@ struct TRandom_fast_ {

    void setSeed(u32 seed) { value = seed; }
 };
+
+struct TRandom_enough_ {
+    TRandom_enough_() { setSeed(0); }
+    void setSeed(u32 value);
+    f32 get();
+
+    void next_() {
+        field_0x0 = ((u64)field_0x0 * 0x41a7) % 0x7fffffff;
+    }
+
+    u32 field_0x0;
+    u32 field_0x4;
+    u32 field_0x8[32];
+};
 }  // namespace JMath

 #endif /* RANDOM_H */
@@ -0,0 +1,54 @@
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#include <dolphin/types.h>
+
+namespace JMessage {
+    class TResource {
+    public:
+        TResource() {
+            field_0x0 = 0;
+            field_0x4 = 0;
+            field_0x8 = 0;
+            field_0xc = 0;
+            field_0x10 = 0;
+            field_0x14 = 0;
+            field_0x18 = 0;
+        }
+
+        int field_0x0;
+        int field_0x4;
+        int field_0x8;
+        int field_0xc;
+        int field_0x10;
+        int field_0x14;
+        int field_0x18;
+    };
+    class TResourceContainer {
+    public:
+        int field_0x0;
+        int field_0x4;
+        int field_0x8;
+
+        TResourceContainer();
+        virtual ~TResourceContainer();
+        void Get_groupID(u16);
+        void SetEncoding(u8);
+        virtual TResource* Do_create();
+        virtual void Do_destroy(JMessage::TResource*);
+        void SetEncoding_(u8);
+
+        u8 field_0x10;
+        bool (*field_0x14)(int);
+    };
+
+    class TParse {
+    public:
+        TParse(JMessage::TResourceContainer*);
+        virtual ~TParse();
+        virtual void parseHeader_next(const void**, u32*, u32);
+        virtual void parseBlock_next(const void**, u32*, u32);
+    };
+}
+
+#endif /* RESOURCE_H */
@@ -83,9 +83,9 @@ public:
    /* 0x3C */ virtual const ResFONT* getResFont() const = 0;
    /* 0x40 */ virtual bool isLeadByte(int a1) const = 0;

-    static bool isLeadByte_1Byte(int b);
-    static bool isLeadByte_2Byte(int b);
-    static bool isLeadByte_ShiftJIS(int b);
+    static bool isLeadByte_1Byte(int b) { return false; }
+    static bool isLeadByte_2Byte(int b) { return true; }
+    static bool isLeadByte_ShiftJIS(int b) { return (b >= 0x81 && b <= 0x9f) || (b >= 0xe0 && b <= 0xfc);}

    void initialize_state();
    void setCharColor(JUtility::TColor col1);
@@ -5,7 +5,21 @@

 class daTitle_proc_c {
 public:
+    daTitle_proc_c();
+    ~daTitle_proc_c();
+    void proc_init3D();
+    void proc_init2D();
+    void setEnterMode();
+    void set_mtx();
+    void calc_2d_alpha();
+    void proc_execute();
+    void model_draw();
+    void proc_draw();
+    BOOL draw();
+
    static void daTitle_Kirakira_Sound_flag_on();
+
+    static bool daTitle_Kirakira_Sound_flag[];
 };

 class daTitle_c : public fopAc_ac_c {
@@ -3,14 +3,15 @@

 #include "dolphin/types.h"
 #include "JSystem/JStage/JSGActor.h"
+#include "JSystem/JStage/JSGAmbientLight.h"
+#include "JSystem/JStage/JSGCamera.h"
+#include "JSystem/JStage/JSGFog.h"
+#include "JSystem/JStage/JSGLight.h"
+#include "JSystem/JStage/JSGSystem.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"

-class dDemo_actor_c;
-class dDemo_camera_c;
-class dDemo_ambient_c;
-class dDemo_light_c;
 class dDemo_system_c;
 class TControl;
 class dMesg_tControl;
@@ -18,11 +19,35 @@ class fopAc_ac_c;

 class dDemo_actor_c : public JStage::TActor {
 public:
+    dDemo_actor_c();
+    ~dDemo_actor_c();
+    void getActor();
    void setActor(fopAc_ac_c*);
-    
+    void getP_BtpData(const char*);
+    void getP_BrkData(const char*);
+    void getP_BtkData(const char*);
+    void getPrm_Morf();
+    void JSGSetData(u32, const void*, u32);
+    void JSGSetTranslation(const Vec&);
+    void JSGSetScaling(const Vec&);
+    void JSGSetRotation(const Vec&);
+    void JSGSetShape(u32);
+    void JSGSetAnimation(u32);
+    void JSGSetAnimationFrame(f32);
+    void JSGSetAnimationTransition(f32);
+    void JSGSetTextureAnimation(u32);
+    void JSGSetTextureAnimationFrame(f32);
+    s32 JSGFindNodeID(const char*) const;
+    int JSGGetNodeTransformation(u32, f32(*)[4]) const;
+    f32 JSGGetAnimationFrameMax() const;
+    f32 JSGGetTextureAnimationFrameMax() const;
+    void JSGGetTranslation(Vec*) const;
+    void JSGGetScaling(Vec*) const;
+    void JSGGetRotation(Vec*) const;
+
    bool checkEnable(u16 mask) { return mFlags & mask; }
    csXyz* getRatate() { return &mRotation; }
-    
+
    /* 0x04 */ u16 mFlags;
    /* 0x06 */ u8 field_0x06[0x08 - 0x06];
    /* 0x08 */ cXyz mTranslation;
@@ -48,6 +73,53 @@ public:
    /* 0x68 */ s32 mBrkId;
 };

+class dDemo_camera_c : public JStage::TCamera {
+public:
+    ~dDemo_camera_c();
+    f32 JSGGetProjectionNear() const;
+    void JSGSetProjectionNear(f32);
+    f32 JSGGetProjectionFar() const;
+    void JSGSetProjectionFar(f32);
+    f32 JSGGetProjectionFovy() const;
+    void JSGSetProjectionFovy(f32);
+    f32 JSGGetProjectionAspect() const;
+    void JSGSetProjectionAspect(f32);
+    void JSGGetViewPosition(Vec*) const;
+    void JSGSetViewPosition(const Vec&);
+    void JSGGetViewUpVector(Vec*) const;
+    void JSGSetViewUpVector(const Vec&);
+    void JSGGetViewTargetPosition(Vec*) const;
+    void JSGSetViewTargetPosition(const Vec&);
+    f32 JSGGetViewRoll() const;
+    void JSGSetViewRoll(f32);
+};
+
+class dDemo_ambient_c : public JStage::TAmbientLight {
+public:
+    ~dDemo_ambient_c();
+    void JSGSetColor(_GXColor);
+};
+
+class dDemo_light_c : public JStage::TLight {
+public:
+    ~dDemo_light_c();
+    void JSGSetLightType(JStage::TELight);
+    void JSGSetPosition(const Vec&);
+    void JSGSetColor(_GXColor);
+    void JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn);
+    void JSGSetAngleAttenuation(f32, _GXSpotFn);
+    void JSGSetDirection(const Vec&);
+};
+
+class dDemo_fog_c : public JStage::TFog {
+public:
+    ~dDemo_fog_c();
+    void JSGSetFogFunction(_GXFogType);
+    void JSGSetStartZ(f32);
+    void JSGSetEndZ(f32);
+    void JSGSetColor(_GXColor);
+};
+
 class dDemo_object_c {
 public:
    dDemo_object_c();
@@ -71,6 +143,12 @@ public:
    /* 0xAC */ u8 field_0xac[4];
 };

+class dDemo_system_c : public JStage::TSystem {
+public:
+    ~dDemo_system_c();
+    bool JSGFindObject(const char*, JStage::TEObject) const;
+};
+
 class dDemo_manager_c {
 public:
    dDemo_manager_c();
@@ -79,19 +157,19 @@ public:
    void create(u8 const*, cXyz*, f32);
    void remove();
    void update();
-    
+
    int getFrame() { return mFrame; }
    u32 getFrameNoMsg() { return mFrameNoMsg; }
    s32 getMode() { return mMode; }

-    /* 0x00 */ dDemo_system_c* mpSystem;
-    /* 0x04 */ TControl* mpControl;
-    /* 0x08 */ void* mpStage;
-    /* 0x0C */ void* mpAudio;
-    /* 0x10 */ void* mpParticle;
-    /* 0x14 */ void* field_0x14;
-    /* 0x18 */ dMesg_tControl* mpMesgControl;
-    /* 0x1C */ void* mpMessage;
+    /* 0x00 */ dDemo_system_c* mSystem;
+    /* 0x04 */ TControl* mControl;
+    /* 0x08 */ void* mStage;
+    /* 0x0C */ void* mAudio;
+    /* 0x10 */ void* mParticle;
+    /* 0x14 */ void* mFactory;
+    /* 0x18 */ dMesg_tControl* mMesgControl;
+    /* 0x1C */ void* mMessage;
    /* 0x20 */ dDemo_object_c mDemoObj;
    /* 0xD0 */ void* field_0xd0;
    /* 0xD4 */ int mFrame;
@@ -102,4 +180,4 @@ public:
 class mDoExt_McaMorf;
 BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8);

-#endif /* D_DEMO_H */
+#endif /* D_DEMO_H */
@@ -14,7 +14,7 @@ class dDlst_base_c {
 public:
    dDlst_base_c() {}
    virtual ~dDlst_base_c() {}
-    virtual void draw();
+    virtual void draw() {}
 };

 class dDlst_2D_c : public dDlst_base_c {
@@ -10,7 +10,9 @@ class fopAc_ac_c;
 class dEvent_exception_c {
 public:
    dEvent_exception_c() { mEventInfoIdx = -1; }
+    void init();
    int setStartDemo(int eventInfoIdx);
+    void getEventName();

    /* 0x0 */ s32 mEventInfoIdx;
    /* 0x4 */ u8 field_0x4;
@@ -78,6 +80,11 @@ public:
    /* 0x03C */ dEvDtFlag_c mFlag;
 };

+class dEv_seach_prm {
+public:
+    dEv_seach_prm(const char*, u32, u32);
+};
+
 inline int dEvmng_strcmp(const char* s1, const char* s2) {
    return strcmp(s1, s2);
 }
@@ -1,9 +1,155 @@
 #ifndef D_MAP_H
 #define D_MAP_H

-#include "dolphin/types.h"
+#include "d/d_drawlist.h"

+struct ResTIMG;
+struct dmap_dmap_tlut_s;
 class fopAc_ac_c;
+struct map_dt_c;
+class stage_map_info_class;
+
+class dMap_2DMtMapSpcl_tex_c {
+public:
+    dMap_2DMtMapSpcl_tex_c();
+    ~dMap_2DMtMapSpcl_tex_c();
+    void init(ResTIMG*, u32, const _GXColor&);
+    void setScroll(f32, f32, f32, f32);
+
+    /* 0x00 */ u8 field_0x0[4];
+    /* 0x04 */ GXTexObj field_0x4;
+    /* 0x24 */ GXTlutObj field_0x24;
+    /* 0x30 */ GXColor field_0x30;
+    /* 0x34 */ u8 field_0x34[0x44 - 0x34];
+    /* 0x44 */ u32 field_0x44;
+};
+
+class dMap_2DMtMapSpcl_c : public dDlst_base_c {
+public:
+    dMap_2DMtMapSpcl_c() {}
+    ~dMap_2DMtMapSpcl_c() {}
+    void init(int, dMap_2DMtMapSpcl_tex_c*);
+    void setPos(s16, s16, s16, s16);
+    void draw();
+
+    /* 0x04 */ u8 field_0x4;
+    /* 0x05 */ u8 field_0x5;
+    /* 0x08 */ dMap_2DMtMapSpcl_tex_c* field_0x8;
+    /* 0x0C */ short field_0xc;
+    /* 0x0E */ short field_0xe;
+    /* 0x10 */ short field_0x10;
+    /* 0x12 */ short field_0x12;
+};
+
+class dMap_2DAGBScrDsp_c : public dDlst_base_c {
+public:
+    ~dMap_2DAGBScrDsp_c() {}
+    void setImage(ResTIMG*, map_dt_c*);
+    void init(map_dt_c*, ResTIMG*, f32, f32, s16, s16, s16, s16, f32, f32, u8);
+    void getScrnPrm(f32, f32, int, f32, int*, f32*, f32*);
+    void getScrnPrmXY(f32, f32, f32, f32, int, int, f32, f32, int*, int*, f32*, f32*, f32*, f32*);
+    void calc_standard_prm(u16, u16, f32, f32, s16, s16, s16, s16, f32, f32, int*, int*, int*, int*, f32*, f32*, f32*, f32*, f32*, f32*);
+    void draw();
+    void setPos(s16, s16, s16, s16);
+    void setScale(f32, f32);
+
+    /* 0x04 */ map_dt_c* field_0x4;
+    /* 0x08 */ ResTIMG* field_0x8;
+    /* 0x0C */ GXTexObj field_0xc;
+    /* 0x2C */ GXTlutObj field_0x2c;
+};
+
+class dMap_RoomInfo_c {
+public:
+    dMap_RoomInfo_c();
+    ~dMap_RoomInfo_c();
+    void getRoomDspFloorNo(u8, int);
+    void init(dMap_RoomInfo_c*, int);
+    void getRoomImage(int, u8, int, ResTIMG**, ResTIMG**, map_dt_c**, stage_map_info_class**, u8*);
+    void makeRoomDspFloorNoTbl(int);
+    void roomEntryRoom(int, u8, int, u8, dMap_RoomInfo_c*, s16, s16, f32);
+    void Changeimage(u8, u8, int, s16, s16, f32);
+    void deleteRoom();
+    void enlagementSizeTextureCordCalc(f32*, f32*, f32*, f32*, f32, f32, f32, f32, f32, f32);
+    void roomDrawRoomEnlargementSize(int, int, int, int, f32, f32, f32, f32, u8);
+    void roomDrawRoomRealSize(int, int, int, int, f32, f32, f32, f32, f32, f32, u8);
+
+    /* 0x00 */ u8 field_0x0;
+    /* 0x01 */ u8 field_0x1;
+    /* 0x02 */ u8 field_0x2[10];
+    /* 0x0C */ u8 field_0xc;
+    /* 0x10 */ int field_0x10;
+    /* 0x14 */ int field_0x14;
+    /* 0x18 */ f32 field_0x18;
+    /* 0x1C */ f32 field_0x1c;
+    /* 0x20 */ f32 field_0x20;
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ f32 field_0x28;
+    /* 0x2C */ f32 field_0x2c;
+    /* 0x30 */ dMap_2DMtMapSpcl_c field_0x30;
+    /* 0x44 */ dMap_2DMtMapSpcl_tex_c field_0x44[1];
+    /* 0x8C */ dMap_2DAGBScrDsp_c field_0x8c;
+    /* 0xE4 */ dMap_RoomInfo_c* field_0xe4;
+    /* 0xE8 */ void* field_0xe8;
+};
+
+class dMap_RoomInfoCtrl_c {
+public:
+    void roomExistenceCheck(int, dMap_RoomInfo_c**);
+    void getNextRoomP(dMap_RoomInfo_c*);
+    void ctrlEntryRoom(int, u8, int, u8, s16, s16, f32);
+    void deleteRoom(int);
+    void ctrlDrawRoomEnlargementSize(int, int, int, int, int, f32, f32, f32, f32, u8);
+    void ctrlDrawRoomRealSize(int, int, int, int, int, f32, f32, f32, f32, f32, f32, u8);
+    void init();
+    void checkFloorMoveImageChangeRoom(u8, u8, int, s16, s16, f32);
+};
+
+class dMap_2DSQ_c : public dDlst_base_c {
+public:
+    ~dMap_2DSQ_c();
+    void draw();
+};
+
+class dMap_2DTri_c : public dDlst_base_c {
+public:
+    ~dMap_2DTri_c();
+    void init(s16, s16, const _GXColor&, f32, f32, s16);
+    void draw();
+    void setPos(s16, s16);
+};
+
+class dMap_2DPoint_c : public dDlst_base_c {
+public:
+    dMap_2DPoint_c();
+    ~dMap_2DPoint_c();
+    void init(s16, s16, const _GXColor&, u8);
+    void draw();
+};
+
+class dMap_2DAGBCursor_c : public dDlst_base_c {
+public:
+    ~dMap_2DAGBCursor_c();
+    void init(s16, s16, const _GXColor&, u8);
+    void draw();
+};
+
+class dMap_2DT2_c : public dDlst_base_c {
+public:
+    dMap_2DT2_c();
+    ~dMap_2DT2_c();
+    void draw();
+    void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32, s16);
+};
+
+class dMap_Dmap_c : public dDlst_base_c {
+public:
+    ~dMap_Dmap_c();
+    void setTlut(dmap_dmap_tlut_s*, u8, u8, u8, f32);
+    void setFloorTextureOne(u8);
+    void init(s16, s16, s16, s16, s16, s16, s16, s16, s16, u8, u8, u8, u8, u8);
+    void draw();
+};

 class dMap_c {
 public:
@@ -104,4 +250,4 @@ inline void dMap_drawPoint(u8 param_1, f32 param_2, f32 param_3, f32 param_4, s8
    dMap_c::drawPointSingle(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9);
 }

-#endif /* D_MAP_H */
+#endif /* D_MAP_H */
@@ -1,7 +1,7 @@
 #ifndef D_MATERIAL_H
 #define D_MATERIAL_H

-#include "dolphin/types.h"
+#include "m_Do/m_Do_ext.h"

 class J3DMaterialTable;
 class J3DAnmTextureSRTKey;
@@ -10,6 +10,17 @@ class mDoExt_invisibleModel;
 class J3DModel;
 class J3DModelData;

+class dMat_backup_c {
+public:
+    dMat_backup_c();
+    ~dMat_backup_c();
+    void restore();
+
+    /* 0x00 */ J3DModelData* mModelData;
+    /* 0x04 */ u8 field_0x4[4];
+    /* 0x08 */ mDoExt_backupMaterial_c field_0x8;
+};
+
 class dMat_ice_c {
 public:
    void create(J3DMaterialTable*, J3DAnmTextureSRTKey*);
@@ -19,12 +30,17 @@ public:
    void updateDL(mDoExt_McaMorf*, s8, mDoExt_invisibleModel*);
    void entryDL(J3DModel*, s8, mDoExt_invisibleModel*);
    void entryDL(mDoExt_McaMorf*, s8, mDoExt_invisibleModel*);
+
+    /* 0x00 */ J3DMaterialTable* field_0x0;
+    /* 0x04 */ mDoExt_btkAnm field_0x4;
 };

 class dMat_control_c {
 public:
    static void icePlay() { mIce->play(); }
    static void create(J3DMaterialTable*, J3DAnmTextureSRTKey*);
+    static void remove();
+    static void restore(s8);

    static void iceEntryDL(J3DModel* model, s8 param_2, mDoExt_invisibleModel* invisModel) {
        mIce->entryDL(model, param_2, invisModel);
@@ -43,7 +59,10 @@ public:
    static void pop(J3DModelData*) {}
    static void push(J3DModelData*) {}

+    static mDoExt_backupMaterial_c mTempBackup;
+    static JKRSolidHeap* mHeap;
+    static dMat_backup_c* mBackup;
    static dMat_ice_c* mIce;
 };

-#endif /* D_MATERIAL_H */
+#endif /* D_MATERIAL_H */
@@ -1,6 +1,67 @@
 #ifndef D_METER_H
 #define D_METER_H

+#include "d/d_drawlist.h"
+
+class J2DPane;
+class fopAc_ac_c;
+class fopMsgM_pane_class;
+class msg_class;
+class sub_meter_class;
+
+class dMeter_HIO_c {
+public:
+    dMeter_HIO_c();
+    virtual ~dMeter_HIO_c();
+};
+
+class dMeter_menuHIO_c {
+public:
+    dMeter_menuHIO_c();
+    virtual ~dMeter_menuHIO_c();
+};
+
+class dMeter_msg_HIO_c {
+public:
+    dMeter_msg_HIO_c();
+    virtual ~dMeter_msg_HIO_c();
+};
+
+class dMeter_message_HIO_c {
+public:
+    dMeter_message_HIO_c();
+    virtual ~dMeter_message_HIO_c();
+};
+
+class dDlst_2DMETER1_c : public dDlst_base_c {
+public:
+    virtual ~dDlst_2DMETER1_c();
+    virtual void draw();
+};
+
+class dDlst_2DMETER2_c : public dDlst_base_c {
+public:
+    virtual ~dDlst_2DMETER2_c();
+    virtual void draw();
+};
+
+class dMeter_map_HIO_c {
+public:
+    dMeter_map_HIO_c();
+    virtual ~dMeter_map_HIO_c();
+};
+
+class mapCtrlDisp_c {
+public:
+    void initMapCtrlDisp();
+    void moveMapCtrlDisp();
+};
+
+class dMeter_info_c {
+public:
+    ~dMeter_info_c() {}
+};
+
 bool dMenu_flag();
 void dMenu_flagSet(u8);

@@ -0,0 +1,70 @@
+
+#ifndef D_METRONOME_H
+#define D_METRONOME_H
+
+#include "JSystem/JParticle/JPAEmitter.h"
+#include "JSystem/JUtility/TColor.h"
+#include "d/d_drawlist.h"
+#include "f_op/f_op_msg_mng.h"
+#include "m_Do/m_Do_hostIO.h"
+
+class dMn_HIO_c : public mDoHIO_entry_c {
+public:
+    dMn_HIO_c();
+    virtual ~dMn_HIO_c() {}
+
+public:
+    /* 0x04 */ f32 mEchoScale;
+    /* 0x08 */ s16 mShiftTiming;
+    /* 0x0A */ s16 mFlashTiming;
+    /* 0x0C */ JUtility::TColor mWhiteColor0;
+    /* 0x10 */ JUtility::TColor mWhiteColor1;
+    /* 0x14 */ JUtility::TColor mBlackColor0;
+    /* 0x18 */ JUtility::TColor mBlackColor1;
+    /* 0x1C */ u8 mAlphaOrig;
+    /* 0x1D */ u8 mTimingTrail;
+};
+
+class dMetronome_c : public dDlst_base_c {
+public:
+    void screenSet();
+    void metronomeMove();
+    void melodyInit(u8);
+    void melodyMove();
+    void melodyGuideShow(s32, s16);
+    void melodyShow();
+    void melodyDemo();
+    void melodyFlash();
+    void melodyShift();
+    void initialize();
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    BOOL _open();
+    BOOL _close();
+
+public:
+    /* 0x004 */ J2DScreen* scrn;
+    /* 0x008 */ fopMsgM_pane_class pane_cn[7];
+    /* 0x190 */ fopMsgM_pane_class pane_wn[7];
+    /* 0x318 */ fopMsgM_pane_class pane_pk[7];
+    /* 0x4A0 */ fopMsgM_pane_class pane_i12[7];
+    /* 0x628 */ fopMsgM_pane_class pane_i11[7];
+    /* 0x7B0 */ fopMsgM_pane_class pane_bs[7];
+    /* 0x938 */ fopMsgM_pane_class pane_timing[21]; // Metronome dots at the top
+    /* 0xDD0 */ fopMsgM_pane_class pane_echo; // Metronome "echo" when it hits the center dot.
+
+    /* 0xE08 */ JPABaseEmitter * mpEmitter;
+    /* 0xE0C */ f32 mCurRate;
+    /* 0xE10 */ f32 mPosX;
+    /* 0xE14 */ s32 field_0xE14;
+    /* 0xE18 */ s32 mNote[7];
+    /* 0xE34 */ s32 mCurTimer;
+    /* 0xE38 */ u8 field_0xE38;
+    /* 0xE39 */ u8 mMelodyNum;
+    /* 0xE3A */ u8 mAction;
+    /* 0xE3B */ u8 mbOpen;
+};
+
+#endif /* D_METRONOME_H */
@@ -0,0 +1,48 @@
+#ifndef D_S_OPEN
+#define D_S_OPEN
+
+#include "d/d_drawlist.h"
+#include "f_op/f_op_scene.h"
+
+class J2DScreen;
+
+
+class dScnOpen_message_c {
+public:
+    dScnOpen_message_c(JKRExpHeap*);
+    virtual ~dScnOpen_message_c();
+    void set_message(u32, int);
+    void exec();
+};
+
+class dScnOpen_proc_c : public dDlst_base_c {
+public:
+    dScnOpen_proc_c();
+    virtual ~dScnOpen_proc_c();
+    void proc_execute();
+    void proc_draw();
+    virtual void draw();
+
+    /* 0x004 */ JKRExpHeap* exp_heap;
+    /* 0x008 */ dScnOpen_message_c* m_message;
+    /* 0x00C */ J2DScreen* m_Screen;
+    /* 0x010 */ u8 pad[0x2a0];
+    /* 0x2B0 */ s32 field_0x2b0;
+    /* 0x010 */ u8 pad2[0x014];
+};
+
+class dScnOpen_c : public scene_class {
+public:
+    ~dScnOpen_c();
+    void changeGameScene();
+    s32 create();
+    BOOL draw();
+    BOOL execute();
+
+    /* 0x1C4 */ request_of_phase_process_class mPhs;
+    /* 0x1CC */ JKRSolidHeap* solid_heap;
+    /* 0x1D0 */ dScnOpen_proc_c* mpProc;
+    /* 0x1D4 */ u8 field_0x1d4;
+};
+
+#endif /* D_S_OPEN */
@@ -1,6 +1,7 @@
 #ifndef D_SNAP_H
 #define D_SNAP_H

+#include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "f_op/f_op_actor.h"

 class dSnap_Obj {
@@ -9,14 +10,76 @@ public:
    /* 0x0C */ f32 field_0x0c;
    /* 0x10 */ f32 field_0x10;
    /* 0x14 */ s32 mBsPcId;
-    /* 0x18 */ u32 field_0x18[6];
+    /* 0x18 */ u8 field_0x18;
+    /* 0x19 */ u8 field_0x19;
+    /* 0x1A */ u8 field_0x1a;
+    /* 0x1B */ u8 field_0x1b;
+    /* 0x1C */ s16 field_0x1c;
+    /* 0x1E */ s16 field_0x1e;
+    /* 0x20 */ s32 field_0x20;
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ s16 field_0x28;
+    /* 0x2A */ s16 field_0x2a;
+    /* 0x2C */ s16 field_0x2c;
+    /* 0x2E */ s16 field_0x2e;

 public:
    dSnap_Obj();
    virtual ~dSnap_Obj() {}

+    void CalcArea2D();
+    void draw();
+    void SetGeo(const Vec&, f32, f32, s16);
    void SetGeoSph(const Vec & c, f32 r);
    void SetInf(u8, const fopAc_ac_c*, u8, u8, s16);
+    void SetAreaClear();
+    void SetArea(s16, s16);
+    void ChkPhoto(int);
+    void ChkSuccess(s32, f32);
+    void ChkCamCull() const;
+};
+
+class dSnap_RegistObjElm {
+public:
+    /* 0x00 */ dSnap_Obj field_0x0;
+    /* 0x34 */ u8 field_0x34[4];
+
+    dSnap_RegistObjElm();
+    virtual ~dSnap_RegistObjElm();
+    void Init();
+    void Regist(const dSnap_Obj&);
+};
+
+class dSnap_packet : public J3DPacket {
+public:
+    virtual ~dSnap_packet();
+    void Create();
+    void ReleaseShutter();
+    void ChkReleaseShutter();
+    void Execute();
+    void Regist(const dSnap_Obj&);
+    virtual void draw();
+    void ClearAlphaBuffer();
+    void Judge();
+    void FindPhoto(int, int);
+    void JudgePost();
+    void JudgeBikutsuki();
+    void JudgeCoupleLook();
+    void JudgeGF();
+    void JudgeGenzo();
+    void JudgeObasan4();
+    void JudgeTestM();
+    void JudgeGene();
+    void JudgeFigure(int);
+    void SetResult();
+
+    /* 0x010 */ u8 field_0x10[0x18 - 0x10];
+    /* 0x018 */ dSnap_RegistObjElm field_0x18[0x3f];
+    /* 0xEDC */ int field_0xedc;
+    /* 0xEE0 */ int field_0xee0;
+    /* 0xEE4 */ u8 field_0xee4;
+
+    static void (dSnap_packet::*m_judge_tbl[])();
 };

 STATIC_ASSERT(sizeof(dSnap_Obj) == 0x34);
@@ -36,4 +99,4 @@ void dSnap_RegistFig(unsigned char, fopAc_ac_c*, const Vec&, short, float, float
 void dSnap_DebugDraw();
 void dSnap_Delete();

-#endif /* D_SNAP_H */
+#endif /* D_SNAP_H */
@@ -125,6 +125,7 @@ enum dEvt_Condition_e {
    dEvtCnd_CANTALKITEM_e = 0x0020,
 };

+// TODO: move to d_event.h
 class dEvt_info_c {
 public:
    dEvt_info_c();
@@ -0,0 +1,22 @@
+#ifndef M_DO_M_DO_MEMCARDRWMNG_H
+#define M_DO_M_DO_MEMCARDRWMNG_H
+
+#include "dolphin/types.h"
+
+typedef struct CARDFileInfo CARDFileInfo;
+struct mDoMemCdRWm_HeaderData;
+
+void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32);
+void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32);
+void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*);
+void mDoMemCdRWm_SetCardStat(CARDFileInfo*);
+void mDoMemCdRWm_CheckCardStat(CARDFileInfo*);
+void mDoMemCdRWm_CalcCheckSum(void*, u32);
+void mDoMemCdRWm_CalcCheckSumPictData(void*, u32);
+void mDoMemCdRWm_TestCheckSumPictData(void*);
+void mDoMemCdRWm_SetCheckSumPictData(u8*);
+void mDoMemCdRWm_CalcCheckSumGameData(void*, u32);
+void mDoMemCdRWm_TestCheckSumGameData(void*);
+void mDoMemCdRWm_SetCheckSumGameData(u8*, u8);
+
+#endif /* M_DO_M_DO_MEMCARDRWMNG_H */
@@ -509,6 +509,7 @@ private:

 class mDoExt_backupMaterial_c {
 public:
+    mDoExt_backupMaterial_c() { mBackupMatBlock = NULL; }
    bool create(J3DModelData*);
    bool create(u16);
    void restore(J3DModelData*);
@@ -4,21 +4,27 @@
 //

 #include "JSystem/J3DGraphAnimator/J3DCluster.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
+#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"

 /* 802F37C4-802F37E4       .text clear__13J3DDeformDataFv */
 void J3DDeformData::clear() {
-    /* Nonmatching */
+    mClusterNum = 0;
+    mClusterPointer = NULL;
+    mClusterKeyNum = 0;
+    mClusterKeyPointer = NULL;
+    field_0x20 = 0;
+    field_0x24 = 0;
 }

 /* 802F37E4-802F3814       .text __ct__13J3DDeformDataFv */
 J3DDeformData::J3DDeformData() {
-    /* Nonmatching */
+    clear();
 }

 /* 802F3814-802F3838       .text deform__13J3DDeformDataFP8J3DModel */
-void J3DDeformData::deform(J3DModel*) {
-    /* Nonmatching */
+void J3DDeformData::deform(J3DModel* model) {
+    deform(model->getVertexBuffer());
 }

 /* 802F3838-802F3900       .text deform__13J3DDeformDataFP15J3DVertexBuffer */
@@ -28,36 +34,44 @@ void J3DDeformData::deform(J3DVertexBuffer*) {

 /* 802F3900-802F3920       .text clear__11J3DDeformerFv */
 void J3DDeformer::clear() {
-    /* Nonmatching */
+    mDeformData = NULL;
+    mAnmCluster = NULL;
+    field_0x8 = 0;
+    field_0xc = 0;
+    mFlags = 3;
 }

 /* 802F3920-802F3A08       .text deform__11J3DDeformerFP15J3DVertexBufferUs */
-void J3DDeformer::deform(J3DVertexBuffer*, unsigned short) {
+void J3DDeformer::deform(J3DVertexBuffer*, u16) {
    /* Nonmatching */
 }

 /* 802F3A08-802F3FA8       .text deform__11J3DDeformerFP15J3DVertexBufferUsPf */
-void J3DDeformer::deform(J3DVertexBuffer*, unsigned short, float*) {
+void J3DDeformer::deform(J3DVertexBuffer*, u16, f32*) {
    /* Nonmatching */
 }

 /* 802F3FA8-802F4064       .text normalize__11J3DDeformerFPf */
-void J3DDeformer::normalize(float*) {
+void J3DDeformer::normalize(f32*) {
    /* Nonmatching */
 }

 /* 802F4064-802F40C0       .text normalizeWeight__11J3DDeformerFiPf */
-void J3DDeformer::normalizeWeight(int, float*) {
+void J3DDeformer::normalizeWeight(int, f32*) {
    /* Nonmatching */
 }

 /* 802F40C0-802F40F0       .text __ct__13J3DSkinDeformFv */
 J3DSkinDeform::J3DSkinDeform() {
-    /* Nonmatching */
+    mPosData = NULL;
+    mNrmData = NULL;
+    mNrmMtx = NULL;
+    mFlags = 3;
+    field_0x14 = 1;
 }

 /* 802F40F0-802F44E8       .text initMtxIndexArray__13J3DSkinDeformFP12J3DModelData */
-void J3DSkinDeform::initMtxIndexArray(J3DModelData*) {
+int J3DSkinDeform::initMtxIndexArray(J3DModelData*) {
    /* Nonmatching */
 }

@@ -95,8 +109,3 @@ void J3DSkinDeform::deformVtxNrm_S16(J3DModel*) const {
 void J3DSkinDeform::deform(J3DModel*) {
    /* Nonmatching */
 }
-
-/* 802F4D78-802F4DC0       .text __dt__13J3DSkinDeformFv */
-J3DSkinDeform::~J3DSkinDeform() {
-    /* Nonmatching */
-}
@@ -3,21 +3,38 @@
 // Translation Unit: random.cpp
 //

-#include "random.h"
+#include "JSystem/JMath/random.h"
 #include "dolphin/types.h"

 /* 80301350-80301358       .text __ct__Q25JMath13TRandom_fast_FUl */
-JMath::TRandom_fast_::TRandom_fast_(unsigned long) {
-    /* Nonmatching */
+JMath::TRandom_fast_::TRandom_fast_(u32 value) {
+    this->value = value;
 }

 /* 80301358-8030142C       .text setSeed__Q25JMath15TRandom_enough_FUl */
-void JMath::TRandom_enough_::setSeed(unsigned long) {
-    /* Nonmatching */
+void JMath::TRandom_enough_::setSeed(u32 value) {
+    field_0x4 = 0;
+    field_0x0 = value + 1;
+    if (field_0x0 == 0) {
+        field_0x0 += 1;
+    }
+    u32 i;
+    for (i = 8; i != 0; i--) {
+        next_();
+    }
+    for (i = 32; i != 0;) {
+        i--;
+        next_();
+        field_0x8[i] = field_0x0;
+    }
 }

 /* 8030142C-803014CC       .text get__Q25JMath15TRandom_enough_Fv */
-void JMath::TRandom_enough_::get() {
-    /* Nonmatching */
+f32 JMath::TRandom_enough_::get() {
+    next_();
+    u8 idx = (field_0x4 >> 24 & ~3) / 4;
+    field_0x4 = field_0x8[idx];
+    field_0x8[idx] = field_0x0;
+    f32 var3 = field_0x4 * 4.656613E-10f;
+    return var3 < 0.9999999f ? var3 : 0.9999999f;
 }
-
@@ -3,37 +3,62 @@
 // Translation Unit: resource.cpp
 //

-#include "resource.h"
+#include "JSystem/JMessage/resource.h"
+#include "JSystem/JUtility/JUTResFont.h"
 #include "dolphin/types.h"

 /* 8029FCC4-8029FD04       .text __ct__Q28JMessage18TResourceContainerFv */
 JMessage::TResourceContainer::TResourceContainer() {
    /* Nonmatching */
+    field_0x10 = 0;
+    field_0x14 = NULL;
 }

 /* 8029FD04-8029FD90       .text Get_groupID__Q28JMessage18TResourceContainerFUs */
-void JMessage::TResourceContainer::Get_groupID(unsigned short) {
+void JMessage::TResourceContainer::Get_groupID(u16) {
    /* Nonmatching */
 }

 /* 8029FD90-8029FDC8       .text SetEncoding__Q28JMessage18TResourceContainerFUc */
-void JMessage::TResourceContainer::SetEncoding(unsigned char) {
-    /* Nonmatching */
+void JMessage::TResourceContainer::SetEncoding(u8 param_1) {
+    if (param_1 == 0) {
+        field_0x10 = param_1;
+        field_0x14 = 0;
+    } else {
+        SetEncoding_(param_1);
+    }
 }

 /* 8029FDC8-8029FE14       .text Do_create__Q28JMessage18TResourceContainerFv */
-void JMessage::TResourceContainer::Do_create() {
-    /* Nonmatching */
+JMessage::TResource* JMessage::TResourceContainer::Do_create() {
+    return new TResource();
 }

 /* 8029FE14-8029FE38       .text Do_destroy__Q28JMessage18TResourceContainerFPQ28JMessage9TResource */
-void JMessage::TResourceContainer::Do_destroy(JMessage::TResource*) {
-    /* Nonmatching */
+void JMessage::TResourceContainer::Do_destroy(JMessage::TResource* resource) {
+    delete resource;
+}
+
+namespace JMessage {
+    namespace {
+        IsLeadByte_func gapfnIsLeadByte_[4] = {
+            NULL,
+            JUTFont::isLeadByte_1Byte,
+            JUTFont::isLeadByte_2Byte,
+            JUTFont::isLeadByte_ShiftJIS,
+        };
+    }
 }

 /* 8029FE38-8029FE68       .text SetEncoding___Q28JMessage18TResourceContainerFUc */
-void SetEncoding___Q28JMessage18TResourceContainerFUc {
-    /* Nonmatching */
+void JMessage::TResourceContainer::SetEncoding_(u8 param_1) {
+    field_0x10 = param_1;
+    u32 r4 = param_1;
+    field_0x14 = 0;
+    if (r4 >= 4) {
+        return;
+    }
+    field_0x14 = gapfnIsLeadByte_[r4];
 }

 /* 8029FE68-8029FE90       .text __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */
@@ -47,27 +72,11 @@ JMessage::TParse::~TParse() {
 }

 /* 8029FEF0-802A0024       .text parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
-void JMessage::TParse::parseHeader_next(const void**, unsigned long*, unsigned long) {
+void JMessage::TParse::parseHeader_next(const void**, u32*, u32) {
    /* Nonmatching */
 }

 /* 802A0024-802A0170       .text parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
-void JMessage::TParse::parseBlock_next(const void**, unsigned long*, unsigned long) {
+void JMessage::TParse::parseBlock_next(const void**, u32*, u32) {
    /* Nonmatching */
 }
-
-/* 802A0170-802A0178       .text isLeadByte_1Byte__7JUTFontFi */
-void JUTFont::isLeadByte_1Byte(int) {
-    /* Nonmatching */
-}
-
-/* 802A0178-802A0180       .text isLeadByte_2Byte__7JUTFontFi */
-void JUTFont::isLeadByte_2Byte(int) {
-    /* Nonmatching */
-}
-
-/* 802A0180-802A01B0       .text isLeadByte_ShiftJIS__7JUTFontFi */
-void JUTFont::isLeadByte_ShiftJIS(int) {
-    /* Nonmatching */
-}
-
@@ -15,6 +15,7 @@
 #include "d/actor/d_a_obj_movebox.h"
 #include "d/actor/d_a_tag_kb_item.h"
 #include "d/actor/d_a_item.h"
+#include "d/actor/d_a_title.h"
 #include "d/d_procname.h"
 #include "d/actor/d_a_npc_kamome.h"

@@ -259,10 +260,12 @@ void daTagKbItem_c::dig_main() {
    field_0x299 = 0;
 }

-// /* 80056CC0-80056CCC       .text daTitle_Kirakira_Sound_flag_on__14daTitle_proc_cFv */
-// void daTitle_proc_c::daTitle_Kirakira_Sound_flag_on() {
-//     /* Nonmatching */
-// }
+bool daTitle_proc_c::daTitle_Kirakira_Sound_flag[] = { false };
+
+/* 80056CC0-80056CCC       .text daTitle_Kirakira_Sound_flag_on__14daTitle_proc_cFv */
+void daTitle_proc_c::daTitle_Kirakira_Sound_flag_on() {
+    daTitle_Kirakira_Sound_flag[0] = true;
+}

 // /* 80056CCC-80056DE0       .text daiItemNodeCallBack__13daStandItem_cFP7J3DNodei */
 // void daStandItem_c::daiItemNodeCallBack(J3DNode*, int) {
@@ -3,7 +3,7 @@
 // Translation Unit: d_demo.cpp
 //

-#include "d_demo.h"
+#include "d/d_demo.h"
 #include "dolphin/types.h"

 /* 800692C4-80069330       .text __ct__13dDemo_actor_cFv */
@@ -47,17 +47,17 @@ void dDemo_actor_c::getPrm_Morf() {
 }

 /* 80069838-800698C0       .text dDemo_getJaiPointer__FPCcUliPUs */
-void dDemo_getJaiPointer(const char*, unsigned long, int, unsigned short*) {
+void dDemo_getJaiPointer(const char*, u32, int, u16*) {
    /* Nonmatching */
 }

 /* 800698C0-80069BC0       .text dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc */
-void dDemo_setDemoData(fopAc_ac_c*, unsigned char, mDoExt_McaMorf*, const char*, int, unsigned short*, unsigned long, signed char) {
+BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8) {
    /* Nonmatching */
 }

 /* 80069BC0-80069BDC       .text JSGSetData__13dDemo_actor_cFUlPCvUl */
-void dDemo_actor_c::JSGSetData(unsigned long, const void*, unsigned long) {
+void dDemo_actor_c::JSGSetData(u32, const void*, u32) {
    /* Nonmatching */
 }

@@ -77,32 +77,32 @@ void dDemo_actor_c::JSGSetRotation(const Vec&) {
 }

 /* 80069C90-80069CA4       .text JSGSetShape__13dDemo_actor_cFUl */
-void dDemo_actor_c::JSGSetShape(unsigned long) {
+void dDemo_actor_c::JSGSetShape(u32) {
    /* Nonmatching */
 }

 /* 80069CA4-80069CC0       .text JSGSetAnimation__13dDemo_actor_cFUl */
-void dDemo_actor_c::JSGSetAnimation(unsigned long) {
+void dDemo_actor_c::JSGSetAnimation(u32) {
    /* Nonmatching */
 }

 /* 80069CC0-80069CD4       .text JSGSetAnimationFrame__13dDemo_actor_cFf */
-void dDemo_actor_c::JSGSetAnimationFrame(float) {
+void dDemo_actor_c::JSGSetAnimationFrame(f32) {
    /* Nonmatching */
 }

 /* 80069CD4-80069CE8       .text JSGSetAnimationTransition__13dDemo_actor_cFf */
-void dDemo_actor_c::JSGSetAnimationTransition(float) {
+void dDemo_actor_c::JSGSetAnimationTransition(f32) {
    /* Nonmatching */
 }

 /* 80069CE8-80069CFC       .text JSGSetTextureAnimation__13dDemo_actor_cFUl */
-void dDemo_actor_c::JSGSetTextureAnimation(unsigned long) {
+void dDemo_actor_c::JSGSetTextureAnimation(u32) {
    /* Nonmatching */
 }

 /* 80069CFC-80069D10       .text JSGSetTextureAnimationFrame__13dDemo_actor_cFf */
-void dDemo_actor_c::JSGSetTextureAnimationFrame(float) {
+void dDemo_actor_c::JSGSetTextureAnimationFrame(f32) {
    /* Nonmatching */
 }

@@ -112,42 +112,42 @@ void getView() {
 }

 /* 80069D44-80069D78       .text JSGGetProjectionNear__14dDemo_camera_cCFv */
-void dDemo_camera_c::JSGGetProjectionNear() const {
+f32 dDemo_camera_c::JSGGetProjectionNear() const {
    /* Nonmatching */
 }

 /* 80069D78-80069D8C       .text JSGSetProjectionNear__14dDemo_camera_cFf */
-void dDemo_camera_c::JSGSetProjectionNear(float) {
+void dDemo_camera_c::JSGSetProjectionNear(f32) {
    /* Nonmatching */
 }

 /* 80069D8C-80069DC0       .text JSGGetProjectionFar__14dDemo_camera_cCFv */
-void dDemo_camera_c::JSGGetProjectionFar() const {
+f32 dDemo_camera_c::JSGGetProjectionFar() const {
    /* Nonmatching */
 }

 /* 80069DC0-80069DD4       .text JSGSetProjectionFar__14dDemo_camera_cFf */
-void dDemo_camera_c::JSGSetProjectionFar(float) {
+void dDemo_camera_c::JSGSetProjectionFar(f32) {
    /* Nonmatching */
 }

 /* 80069DD4-80069E08       .text JSGGetProjectionFovy__14dDemo_camera_cCFv */
-void dDemo_camera_c::JSGGetProjectionFovy() const {
+f32 dDemo_camera_c::JSGGetProjectionFovy() const {
    /* Nonmatching */
 }

 /* 80069E08-80069E1C       .text JSGSetProjectionFovy__14dDemo_camera_cFf */
-void dDemo_camera_c::JSGSetProjectionFovy(float) {
+void dDemo_camera_c::JSGSetProjectionFovy(f32) {
    /* Nonmatching */
 }

 /* 80069E1C-80069E50       .text JSGGetProjectionAspect__14dDemo_camera_cCFv */
-void dDemo_camera_c::JSGGetProjectionAspect() const {
+f32 dDemo_camera_c::JSGGetProjectionAspect() const {
    /* Nonmatching */
 }

 /* 80069E50-80069E64       .text JSGSetProjectionAspect__14dDemo_camera_cFf */
-void dDemo_camera_c::JSGSetProjectionAspect(float) {
+void dDemo_camera_c::JSGSetProjectionAspect(f32) {
    /* Nonmatching */
 }

@@ -182,12 +182,12 @@ void dDemo_camera_c::JSGSetViewTargetPosition(const Vec&) {
 }

 /* 80069FF8-8006A050       .text JSGGetViewRoll__14dDemo_camera_cCFv */
-void dDemo_camera_c::JSGGetViewRoll() const {
+f32 dDemo_camera_c::JSGGetViewRoll() const {
    /* Nonmatching */
 }

 /* 8006A050-8006A064       .text JSGSetViewRoll__14dDemo_camera_cFf */
-void dDemo_camera_c::JSGSetViewRoll(float) {
+void dDemo_camera_c::JSGSetViewRoll(f32) {
    /* Nonmatching */
 }

@@ -212,12 +212,12 @@ void dDemo_light_c::JSGSetColor(_GXColor) {
 }

 /* 8006A100-8006A11C       .text JSGSetDistanceAttenuation__13dDemo_light_cFff13_GXDistAttnFn */
-void dDemo_light_c::JSGSetDistanceAttenuation(float, float, _GXDistAttnFn) {
+void dDemo_light_c::JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn) {
    /* Nonmatching */
 }

 /* 8006A11C-8006A134       .text JSGSetAngleAttenuation__13dDemo_light_cFf9_GXSpotFn */
-void dDemo_light_c::JSGSetAngleAttenuation(float, _GXSpotFn) {
+void dDemo_light_c::JSGSetAngleAttenuation(f32, _GXSpotFn) {
    /* Nonmatching */
 }

@@ -232,12 +232,12 @@ void dDemo_fog_c::JSGSetFogFunction(_GXFogType) {
 }

 /* 8006A170-8006A184       .text JSGSetStartZ__11dDemo_fog_cFf */
-void dDemo_fog_c::JSGSetStartZ(float) {
+void dDemo_fog_c::JSGSetStartZ(f32) {
    /* Nonmatching */
 }

 /* 8006A184-8006A198       .text JSGSetEndZ__11dDemo_fog_cFf */
-void dDemo_fog_c::JSGSetEndZ(float) {
+void dDemo_fog_c::JSGSetEndZ(f32) {
    /* Nonmatching */
 }

@@ -253,7 +253,7 @@ dDemo_object_c::dDemo_object_c() {

 /* 8006A1E4-8006A234       .text __dt__14dDemo_object_cFv */
 dDemo_object_c::~dDemo_object_c() {
-    /* Nonmatching */
+    remove();
 }

 /* 8006A234-8006A2F8       .text appendActor__14dDemo_object_cFP10fopAc_ac_c */
@@ -262,7 +262,7 @@ void dDemo_object_c::appendActor(fopAc_ac_c*) {
 }

 /* 8006A2F8-8006A31C       .text getActor__14dDemo_object_cFUc */
-void dDemo_object_c::getActor(unsigned char) {
+dDemo_actor_c* dDemo_object_c::getActor(u8) {
    /* Nonmatching */
 }

@@ -297,27 +297,19 @@ void dDemo_object_c::remove() {
 }

 /* 8006A678-8006A6D8       .text __dt__11dDemo_fog_cFv */
-dDemo_fog_c::~dDemo_fog_c() {
-    /* Nonmatching */
-}
+dDemo_fog_c::~dDemo_fog_c() {}

 /* 8006A6D8-8006A738       .text __dt__13dDemo_light_cFv */
-dDemo_light_c::~dDemo_light_c() {
-    /* Nonmatching */
-}
+dDemo_light_c::~dDemo_light_c() {}

 /* 8006A738-8006A798       .text __dt__15dDemo_ambient_cFv */
-dDemo_ambient_c::~dDemo_ambient_c() {
-    /* Nonmatching */
-}
+dDemo_ambient_c::~dDemo_ambient_c() {}

 /* 8006A798-8006A7F8       .text __dt__14dDemo_camera_cFv */
-dDemo_camera_c::~dDemo_camera_c() {
-    /* Nonmatching */
-}
+dDemo_camera_c::~dDemo_camera_c() {}

 /* 8006A7F8-8006A92C       .text JSGFindObject__14dDemo_system_cCFPCcQ26JStage8TEObject */
-void dDemo_system_c::JSGFindObject(const char*, JStage::TEObject) const {
+bool dDemo_system_c::JSGFindObject(const char*, JStage::TEObject) const {
    /* Nonmatching */
 }

@@ -332,17 +324,17 @@ dDemo_manager_c::~dDemo_manager_c() {
 }

 /* 8006AEFC-8006AF5C       .text __dt__14dMesg_tControlFv */
+/*
 dMesg_tControl::~dMesg_tControl() {
    /* Nonmatching */
 }
+*/

 /* 8006AF5C-8006AFBC       .text __dt__14dDemo_system_cFv */
-dDemo_system_c::~dDemo_system_c() {
-    /* Nonmatching */
-}
+dDemo_system_c::~dDemo_system_c() {}

 /* 8006AFBC-8006B0D4       .text create__15dDemo_manager_cFPCUcP4cXyzf */
-void dDemo_manager_c::create(const unsigned char*, cXyz*, float) {
+void dDemo_manager_c::create(const u8*, cXyz*, f32) {
    /* Nonmatching */
 }

@@ -357,22 +349,22 @@ void dDemo_manager_c::update() {
 }

 /* 8006B1B4-8006B240       .text JSGFindNodeID__13dDemo_actor_cCFPCc */
-void dDemo_actor_c::JSGFindNodeID(const char*) const {
+s32 dDemo_actor_c::JSGFindNodeID(const char*) const {
    /* Nonmatching */
 }

 /* 8006B240-8006B2DC       .text JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f */
-void dDemo_actor_c::JSGGetNodeTransformation(unsigned long, float(*)[4]) const {
+int dDemo_actor_c::JSGGetNodeTransformation(u32, f32(*)[4]) const {
    /* Nonmatching */
 }

 /* 8006B2DC-8006B2E4       .text JSGGetAnimationFrameMax__13dDemo_actor_cCFv */
-void dDemo_actor_c::JSGGetAnimationFrameMax() const {
+f32 dDemo_actor_c::JSGGetAnimationFrameMax() const {
    /* Nonmatching */
 }

 /* 8006B2E4-8006B2EC       .text JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv */
-void dDemo_actor_c::JSGGetTextureAnimationFrameMax() const {
+f32 dDemo_actor_c::JSGGetTextureAnimationFrameMax() const {
    /* Nonmatching */
 }

@@ -390,4 +382,3 @@ void dDemo_actor_c::JSGGetScaling(Vec*) const {
 void dDemo_actor_c::JSGGetRotation(Vec*) const {
    /* Nonmatching */
 }
-
@@ -3,8 +3,9 @@
 // Translation Unit: d_event.cpp
 //

-#include "d_event.h"
+#include "d/d_event.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor.h" // dEvt_info_c

 /* 8006FE04-8006FE54       .text __ct__14dEvt_control_cFv */
 dEvt_control_c::dEvt_control_c() {
@@ -17,12 +18,12 @@ dEvt_order_c::dEvt_order_c() {
 }

 /* 8006FE58-8006FEE8       .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */
-void dEvt_control_c::orderOld(unsigned short, unsigned short, unsigned short, unsigned short, void*, void*, const void*) {
+s32 dEvt_control_c::orderOld(u16, u16, u16, u16, void*, void*, const void*) {
    /* Nonmatching */
 }

 /* 8006FEE8-8007002C       .text order__14dEvt_control_cFUsUsUsUsPvPvsUc */
-void dEvt_control_c::order(unsigned short, unsigned short, unsigned short, unsigned short, void*, void*, short, unsigned char) {
+s32 dEvt_control_c::order(u16, u16, u16, u16, void*, void*, s16, u8) {
    /* Nonmatching */
 }

@@ -42,7 +43,7 @@ void dEvt_control_c::afterFlagProc(dEvt_order_c*) {
 }

 /* 80070218-80070290       .text commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs */
-void dEvt_control_c::commonCheck(dEvt_order_c*, unsigned short, unsigned short) {
+void dEvt_control_c::commonCheck(dEvt_order_c*, u16, u16) {
    /* Nonmatching */
 }

@@ -132,12 +133,12 @@ void dEvt_control_c::photoCheck() {
 }

 /* 80071270-80071418       .text moveApproval__14dEvt_control_cFPv */
-void dEvt_control_c::moveApproval(void*) {
+s32 dEvt_control_c::moveApproval(void*) {
    /* Nonmatching */
 }

 /* 80071418-80071468       .text compulsory__14dEvt_control_cFPvPCcUs */
-void dEvt_control_c::compulsory(void*, const char*, unsigned short) {
+BOOL dEvt_control_c::compulsory(void*, const char*, u16) {
    /* Nonmatching */
 }

@@ -157,12 +158,12 @@ void dEvt_control_c::nextStageEventDt(void*) {
 }

 /* 800715B8-800715DC       .text getPId__14dEvt_control_cFPv */
-void dEvt_control_c::getPId(void*) {
+int dEvt_control_c::getPId(void*) {
    /* Nonmatching */
 }

 /* 800715DC-8007160C       .text convPId__14dEvt_control_cFUi */
-void dEvt_control_c::convPId(unsigned int) {
+fopAc_ac_c* dEvt_control_c::convPId(unsigned int) {
    /* Nonmatching */
 }

@@ -187,12 +188,11 @@ void dEvt_info_c::setEventName(char*) {
 }

 /* 800716AC-800716F8       .text getEventName__11dEvt_info_cFv */
-void dEvt_info_c::getEventName() {
+char* dEvt_info_c::getEventName() {
    /* Nonmatching */
 }

 /* 800716F8-80071778       .text giveItemCut__14dEvt_control_cFUc */
-void dEvt_control_c::giveItemCut(unsigned char) {
+void dEvt_control_c::giveItemCut(u8) {
    /* Nonmatching */
 }
-
@@ -3,7 +3,7 @@
 // Translation Unit: d_event_manager.cpp
 //

-#include "d_event_manager.h"
+#include "d/d_event_manager.h"
 #include "dolphin/types.h"

 /* 800737DC-800737F4       .text init__18dEvent_exception_cFv */
@@ -12,7 +12,7 @@ void dEvent_exception_c::init() {
 }

 /* 800737F4-80073900       .text setStartDemo__18dEvent_exception_cFi */
-void dEvent_exception_c::setStartDemo(int) {
+int dEvent_exception_c::setStartDemo(int) {
    /* Nonmatching */
 }

@@ -77,7 +77,7 @@ void dEvent_manager_c::closeProc(dEvDtEvent_c*) {
 }

 /* 80074114-800741D4       .text endProc__16dEvent_manager_cFsi */
-void dEvent_manager_c::endProc(short, int) {
+void dEvent_manager_c::endProc(s16, int) {
    /* Nonmatching */
 }

@@ -92,24 +92,23 @@ void dEvent_manager_c::runProc() {
 }

 /* 80074370-800743AC       .text getEventData__16dEvent_manager_cFs */
-void dEvent_manager_c::getEventData(short) {
+dEvDtEvent_c* dEvent_manager_c::getEventData(s16) {
    /* Nonmatching */
 }

 /* 800743AC-800744AC       .text getEventIdx__16dEvent_manager_cFPCcUc */
-s16 dEvent_manager_c::getEventIdx(const char*, unsigned char) {
+s16 dEvent_manager_c::getEventIdx(const char*, u8) {
    /* Nonmatching */
 }

 /* 800744AC-800744E8       .text order__16dEvent_manager_cFs */
-void dEvent_manager_c::order(short) {
+void dEvent_manager_c::order(s16) {
    /* Nonmatching */
 }

 /* 800744E8-80074528       .text startCheck__16dEvent_manager_cFs */
-void dEvent_manager_c::startCheck(short) {
+BOOL dEvent_manager_c::startCheck(s16) {
    /* Nonmatching */
-    startCheckOld()
 }

 /* 80074528-80074564       .text startCheckOld__16dEvent_manager_cFPCc */
@@ -118,22 +117,22 @@ int dEvent_manager_c::startCheckOld(const char*) {
 }

 /* 80074564-800745A4       .text endCheck__16dEvent_manager_cFs */
-BOOL dEvent_manager_c::endCheck(short) {
+BOOL dEvent_manager_c::endCheck(s16) {
    /* Nonmatching */
 }

 /* 800745A4-800745E0       .text endCheckOld__16dEvent_manager_cFPCc */
-void dEvent_manager_c::endCheckOld(const char*) {
+BOOL dEvent_manager_c::endCheckOld(const char*) {
    /* Nonmatching */
 }

 /* 800745E0-80074718       .text getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */
-void dEvent_manager_c::getMyStaffId(const char*, fopAc_ac_c*, int) {
+int dEvent_manager_c::getMyStaffId(const char*, fopAc_ac_c*, int) {
    /* Nonmatching */
 }

 /* 80074718-8007473C       .text getIsAddvance__16dEvent_manager_cFi */
-void dEvent_manager_c::getIsAddvance(int) {
+BOOL dEvent_manager_c::getIsAddvance(int) {
    /* Nonmatching */
 }

@@ -143,17 +142,17 @@ void dEvmng_strcmp(const char*, char*) {
 }

 /* 80074824-80074964       .text getMyActIdx__16dEvent_manager_cFiPCPCciii */
-void dEvent_manager_c::getMyActIdx(int, const char* const*, int, int, int) {
+int dEvent_manager_c::getMyActIdx(int, const char* const*, int, int, int) {
    /* Nonmatching */
 }

 /* 80074964-800749A0       .text getMyActName__16dEvent_manager_cFi */
-void dEvent_manager_c::getMyActName(int) {
+char* dEvent_manager_c::getMyActName(int) {
    /* Nonmatching */
 }

 /* 800749A0-800749D0       .text getMyNowCutName__16dEvent_manager_cFi */
-void dEvent_manager_c::getMyNowCutName(int) {
+char* dEvent_manager_c::getMyNowCutName(int) {
    /* Nonmatching */
 }

@@ -163,7 +162,7 @@ void dEvent_manager_c::getMyDataP(int, const char*, int) {
 }

 /* 80074AA0-80074AF8       .text getMySubstanceP__16dEvent_manager_cFiPCci */
-void dEvent_manager_c::getMySubstanceP(int, const char*, int) {
+void* dEvent_manager_c::getMySubstanceP(int, const char*, int) {
    /* Nonmatching */
 }

@@ -178,12 +177,12 @@ void dEvent_manager_c::cutEnd(int) {
 }

 /* 80074B7C-80074BB0       .text getEventPrio__16dEvent_manager_cFs */
-void dEvent_manager_c::getEventPrio(short) {
+u16 dEvent_manager_c::getEventPrio(s16) {
    /* Nonmatching */
 }

 /* 80074BB0-80074BE4       .text getEventEndSound__16dEvent_manager_cFs */
-void dEvent_manager_c::getEventEndSound(short) {
+void dEvent_manager_c::getEventEndSound(s16) {
    /* Nonmatching */
 }

@@ -208,7 +207,7 @@ void dEvent_manager_c::setGoal(cXyz*) {
 }

 /* 80074DF8-80074E00       .text getGoal__16dEvent_manager_cFv */
-void dEvent_manager_c::getGoal() {
+cXyz* dEvent_manager_c::getGoal() {
    /* Nonmatching */
 }

@@ -218,7 +217,7 @@ void findShutterCallBack(fopAc_ac_c*, void*) {
 }

 /* 80074EB4-80074FE8       .text specialCast_Shutter__16dEvent_manager_cFsi */
-void dEvent_manager_c::specialCast_Shutter(short, int) {
+void dEvent_manager_c::specialCast_Shutter(s16, int) {
    /* Nonmatching */
 }

@@ -233,12 +232,12 @@ void dEvent_manager_c::setPrmStaff(void*, int) {
 }

 /* 80075288-8007537C       .text getToolId__16dEvent_manager_cFUci */
-void dEvent_manager_c::getToolId(unsigned char, int) {
+void dEvent_manager_c::getToolId(u8, int) {
    /* Nonmatching */
 }

 /* 8007537C-80075394       .text __ct__13dEv_seach_prmFPCcUlUl */
-dEv_seach_prm::dEv_seach_prm(const char*, unsigned long, unsigned long) {
+dEv_seach_prm::dEv_seach_prm(const char*, u32, u32) {
    /* Nonmatching */
 }

@@ -253,7 +252,7 @@ void dEv_talkman_get_action(int) {
 }

 /* 80075450-8007548C       .text ChkPresentEnd__16dEvent_manager_cFv */
-void dEvent_manager_c::ChkPresentEnd() {
+BOOL dEvent_manager_c::ChkPresentEnd() {
    /* Nonmatching */
 }

@@ -263,12 +262,12 @@ void dEvent_manager_c::CancelPresent() {
 }

 /* 800754BC-800754EC       .text checkStartDemo__16dEvent_manager_cFv */
-void dEvent_manager_c::checkStartDemo() {
+BOOL dEvent_manager_c::checkStartDemo() {
    /* Nonmatching */
 }

 /* 800754EC-80075590       .text dEvmng_daNpc_Tt_Conv__FUc */
-void dEvmng_daNpc_Tt_Conv(unsigned char) {
+void dEvmng_daNpc_Tt_Conv(u8) {
    /* Nonmatching */
 }

@@ -276,4 +275,3 @@ void dEvmng_daNpc_Tt_Conv(unsigned char) {
 void dEvmng_daNpc_Tt_GetEvFlag(int) {
    /* Nonmatching */
 }
-
@@ -32,37 +32,37 @@ void mapOffsetY() {
 }

 /* 800458E0-800459E4       .text dMap_GetTopBottomFloorNo__FP11dStage_dt_cPUcPUc */
-void dMap_GetTopBottomFloorNo(dStage_dt_c*, unsigned char*, unsigned char*) {
+void dMap_GetTopBottomFloorNo(dStage_dt_c*, u8*, u8*) {
    /* Nonmatching */
 }

 /* 800459E4-80045A98       .text dMap_GetFloorInfoDtP__FP18dStage_FloorInfo_cf */
-void dMap_GetFloorInfoDtP(dStage_FloorInfo_c*, float) {
+void dMap_GetFloorInfoDtP(dStage_FloorInfo_c*, f32) {
    /* Nonmatching */
 }

 /* 80045A98-80045AEC       .text dMap_GetFloorInfoDtPFromFloorNo__FP18dStage_FloorInfo_cUc */
-void dMap_GetFloorInfoDtPFromFloorNo(dStage_FloorInfo_c*, unsigned char) {
+void dMap_GetFloorInfoDtPFromFloorNo(dStage_FloorInfo_c*, u8) {
    /* Nonmatching */
 }

 /* 80045AEC-80045C24       .text dMap_GetFloorNoForDmap__FP11dStage_dt_cif */
-void dMap_GetFloorNoForDmap(dStage_dt_c*, int, float) {
+void dMap_GetFloorNoForDmap(dStage_dt_c*, int, f32) {
    /* Nonmatching */
 }

 /* 80045C24-80045C6C       .text dMap_GetFloorNo_WithRoom__Fif */
-void dMap_GetFloorNo_WithRoom(int, float) {
+void dMap_GetFloorNo_WithRoom(int, f32) {
    /* Nonmatching */
 }

 /* 80045C6C-80045C90       .text dMap_GetFloorNo__FP11dStage_dt_cf */
-void dMap_GetFloorNo(dStage_dt_c*, float) {
+void dMap_GetFloorNo(dStage_dt_c*, f32) {
    /* Nonmatching */
 }

 /* 80045C90-80045E54       .text getRoomDspFloorNo__15dMap_RoomInfo_cFUci */
-void dMap_RoomInfo_c::getRoomDspFloorNo(unsigned char, int) {
+void dMap_RoomInfo_c::getRoomDspFloorNo(u8, int) {
    /* Nonmatching */
 }

@@ -72,7 +72,7 @@ void dMap_RoomInfo_c::init(dMap_RoomInfo_c*, int) {
 }

 /* 80045F40-80046314       .text getRoomImage__15dMap_RoomInfo_cFiUciPP7ResTIMGPP7ResTIMGPP8map_dt_cPP20stage_map_info_classPUc */
-void dMap_RoomInfo_c::getRoomImage(int, unsigned char, int, ResTIMG**, ResTIMG**, map_dt_c**, stage_map_info_class**, unsigned char*) {
+void dMap_RoomInfo_c::getRoomImage(int, u8, int, ResTIMG**, ResTIMG**, map_dt_c**, stage_map_info_class**, u8*) {
    /* Nonmatching */
 }

@@ -82,12 +82,12 @@ void dMap_RoomInfo_c::makeRoomDspFloorNoTbl(int) {
 }

 /* 80046470-80046A58       .text roomEntryRoom__15dMap_RoomInfo_cFiUciUcP15dMap_RoomInfo_cssf */
-void dMap_RoomInfo_c::roomEntryRoom(int, unsigned char, int, unsigned char, dMap_RoomInfo_c*, short, short, float) {
+void dMap_RoomInfo_c::roomEntryRoom(int, u8, int, u8, dMap_RoomInfo_c*, s16, s16, f32) {
    /* Nonmatching */
 }

 /* 80046A58-80046F08       .text Changeimage__15dMap_RoomInfo_cFUcUcissf */
-void dMap_RoomInfo_c::Changeimage(unsigned char, unsigned char, int, short, short, float) {
+void dMap_RoomInfo_c::Changeimage(u8, u8, int, s16, s16, f32) {
    /* Nonmatching */
 }

@@ -97,17 +97,17 @@ void dMap_RoomInfo_c::deleteRoom() {
 }

 /* 80046FE0-800470CC       .text enlagementSizeTextureCordCalc__15dMap_RoomInfo_cFPfPfPfPfffffff */
-void dMap_RoomInfo_c::enlagementSizeTextureCordCalc(float*, float*, float*, float*, float, float, float, float, float, float) {
+void dMap_RoomInfo_c::enlagementSizeTextureCordCalc(f32*, f32*, f32*, f32*, f32, f32, f32, f32, f32, f32) {
    /* Nonmatching */
 }

 /* 800470CC-800475B8       .text roomDrawRoomEnlargementSize__15dMap_RoomInfo_cFiiiiffffUc */
-void dMap_RoomInfo_c::roomDrawRoomEnlargementSize(int, int, int, int, float, float, float, float, unsigned char) {
+void dMap_RoomInfo_c::roomDrawRoomEnlargementSize(int, int, int, int, f32, f32, f32, f32, u8) {
    /* Nonmatching */
 }

 /* 800475B8-80047834       .text roomDrawRoomRealSize__15dMap_RoomInfo_cFiiiiffffffUc */
-void dMap_RoomInfo_c::roomDrawRoomRealSize(int, int, int, int, float, float, float, float, float, float, unsigned char) {
+void dMap_RoomInfo_c::roomDrawRoomRealSize(int, int, int, int, f32, f32, f32, f32, f32, f32, u8) {
    /* Nonmatching */
 }

@@ -122,7 +122,7 @@ void dMap_RoomInfoCtrl_c::getNextRoomP(dMap_RoomInfo_c*) {
 }

 /* 80047960-80047A8C       .text ctrlEntryRoom__19dMap_RoomInfoCtrl_cFiUciUcssf */
-void dMap_RoomInfoCtrl_c::ctrlEntryRoom(int, unsigned char, int, unsigned char, short, short, float) {
+void dMap_RoomInfoCtrl_c::ctrlEntryRoom(int, u8, int, u8, s16, s16, f32) {
    /* Nonmatching */
 }

@@ -132,12 +132,12 @@ void dMap_RoomInfoCtrl_c::deleteRoom(int) {
 }

 /* 80047AC4-80047B8C       .text ctrlDrawRoomEnlargementSize__19dMap_RoomInfoCtrl_cFiiiiiffffUc */
-void dMap_RoomInfoCtrl_c::ctrlDrawRoomEnlargementSize(int, int, int, int, int, float, float, float, float, unsigned char) {
+void dMap_RoomInfoCtrl_c::ctrlDrawRoomEnlargementSize(int, int, int, int, int, f32, f32, f32, f32, u8) {
    /* Nonmatching */
 }

 /* 80047B8C-80047C64       .text ctrlDrawRoomRealSize__19dMap_RoomInfoCtrl_cFiiiiiffffffUc */
-void dMap_RoomInfoCtrl_c::ctrlDrawRoomRealSize(int, int, int, int, int, float, float, float, float, float, float, unsigned char) {
+void dMap_RoomInfoCtrl_c::ctrlDrawRoomRealSize(int, int, int, int, int, f32, f32, f32, f32, f32, f32, u8) {
    /* Nonmatching */
 }

@@ -157,7 +157,7 @@ void dMap_c::isEnableEnlargementScroll() {
 }

 /* 800482B4-800482D8       .text isEnableDispMap__6dMap_cFv */
-void dMap_c::isEnableDispMap() {
+bool dMap_c::isEnableDispMap() {
    /* Nonmatching */
 }

@@ -172,7 +172,7 @@ void dMap_c::remove() {
 }

 /* 80048370-800484A4       .text setImage__6dMap_cFiif */
-void dMap_c::setImage(int, int, float) {
+void dMap_c::setImage(int, int, f32) {
    /* Nonmatching */
 }

@@ -192,27 +192,27 @@ void dMap_2DSQ_c::draw() {
 }

 /* 80048A20-80048B54       .text mapDrawIconFree__6dMap_cFssUc */
-void dMap_c::mapDrawIconFree(short, short, unsigned char) {
+void dMap_c::mapDrawIconFree(s16, s16, u8) {
    /* Nonmatching */
 }

 /* 80048B54-80048C80       .text mapDrawIconSelf__6dMap_cFssUc */
-void dMap_c::mapDrawIconSelf(short, short, unsigned char) {
+void dMap_c::mapDrawIconSelf(s16, s16, u8) {
    /* Nonmatching */
 }

 /* 80048C80-80048D80       .text mapDrawFrame__6dMap_cFUc */
-void dMap_c::mapDrawFrame(unsigned char) {
+void dMap_c::mapDrawFrame(u8) {
    /* Nonmatching */
 }

 /* 80048D80-80048F74       .text mapDrawEnlargementSize__6dMap_cFffffUc */
-void dMap_c::mapDrawEnlargementSize(float, float, float, float, unsigned char) {
+void dMap_c::mapDrawEnlargementSize(f32, f32, f32, f32, u8) {
    /* Nonmatching */
 }

 /* 80048F74-80049354       .text mapDrawRealSize__6dMap_cFffUc */
-void dMap_c::mapDrawRealSize(float, float, unsigned char) {
+void dMap_c::mapDrawRealSize(f32, f32, u8) {
    /* Nonmatching */
 }

@@ -222,12 +222,12 @@ void dMap_c::mapAGBSendIslandData() {
 }

 /* 800494A0-800494C8       .text setPlayerStayAgbMapTypeNow__6dMap_cFff */
-void dMap_c::setPlayerStayAgbMapTypeNow(float, float) {
+void dMap_c::setPlayerStayAgbMapTypeNow(f32, f32) {
    /* Nonmatching */
 }

 /* 800494C8-80049538       .text agbMapNoSet__6dMap_cFUcUc */
-void dMap_c::agbMapNoSet(unsigned char, unsigned char) {
+void dMap_c::agbMapNoSet(u8, u8) {
    /* Nonmatching */
 }

@@ -267,7 +267,7 @@ void dMap_c::agbIsActive() {
 }

 /* 800496D0-80049B1C       .text isInDspArea__6dMap_cFffb */
-void dMap_c::isInDspArea(float, float, bool) {
+void dMap_c::isInDspArea(f32, f32, bool) {
    /* Nonmatching */
 }

@@ -277,12 +277,12 @@ void dMap_c::mapAGBSendStatInit() {
 }

 /* 80049B64-80049F4C       .text mapAGBSendMapMain__6dMap_cFff */
-void dMap_c::mapAGBSendMapMain(float, float) {
+void dMap_c::mapAGBSendMapMain(f32, f32) {
    /* Nonmatching */
 }

 /* 80049F4C-8004A3A4       .text calcEnlargementSizeParameter__6dMap_cFff */
-void dMap_c::calcEnlargementSizeParameter(float, float) {
+void dMap_c::calcEnlargementSizeParameter(f32, f32) {
    /* Nonmatching */
 }

@@ -292,12 +292,12 @@ void dMap_c::calcScissor() {
 }

 /* 8004A478-8004A6E8       .text mapMoveAll__6dMap_cFffif */
-void dMap_c::mapMoveAll(float, float, int, float) {
+void dMap_c::mapMoveAll(f32, f32, int, f32) {
    /* Nonmatching */
 }

 /* 8004A6E8-8004A760       .text mapDrawAll__6dMap_cFffif */
-void dMap_c::mapDrawAll(float, float, int, float) {
+void dMap_c::mapDrawAll(f32, f32, int, f32) {
    /* Nonmatching */
 }

@@ -307,27 +307,27 @@ void dMap_c::mapDrawIcon() {
 }

 /* 8004A7B4-8004A82C       .text draw__6dMap_cFffif */
-void dMap_c::draw(float, float, int, float) {
+void dMap_c::draw(f32, f32, int, f32) {
    /* Nonmatching */
 }

 /* 8004A82C-8004A97C       .text point2Grid__6dMap_cFffPScPSc */
-void dMap_c::point2Grid(float, float, signed char*, signed char*) {
+void dMap_c::point2Grid(f32, f32, s8*, s8*) {
    /* Nonmatching */
 }

 /* 8004A97C-8004ABB0       .text point2GridAndLocal__6dMap_cFffPScPScPsPs */
-void dMap_c::point2GridAndLocal(float, float, signed char*, signed char*, short*, short*) {
+void dMap_c::point2GridAndLocal(f32, f32, s8*, s8*, s16*, s16*) {
    /* Nonmatching */
 }

 /* 8004ABB0-8004AC44       .text getCheckPointUseGrid__6dMap_cFScSc */
-void dMap_c::getCheckPointUseGrid(signed char, signed char) {
+void dMap_c::getCheckPointUseGrid(s8, s8) {
    /* Nonmatching */
 }

 /* 8004AC44-8004ACD8       .text getFmapChkPntPrm__6dMap_cFiPScPScPsPsPUc */
-void dMap_c::getFmapChkPntPrm(int, signed char*, signed char*, short*, short*, unsigned char*) {
+void dMap_c::getFmapChkPntPrm(int, s8*, s8*, s16*, s16*, u8*) {
    /* Nonmatching */
 }

@@ -347,102 +347,102 @@ void dMap_c::initPoint() {
 }

 /* 8004AE28-8004B148       .text setGbaPoint_ocean__6dMap_cFUcffsUcUcUcUc */
-void dMap_c::setGbaPoint_ocean(unsigned char, float, float, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::setGbaPoint_ocean(u8, f32, f32, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004B148-8004B1D0       .text isPointStayInDspNowRoomAgbScr__6dMap_cFss */
-void dMap_c::isPointStayInDspNowRoomAgbScr(short, short) {
+void dMap_c::isPointStayInDspNowRoomAgbScr(s16, s16) {
    /* Nonmatching */
 }

 /* 8004B1D0-8004B33C       .text setCollectPoint__6dMap_cFUcUcfffScsUcUcUcUc */
-void dMap_c::setCollectPoint(unsigned char, unsigned char, float, float, float, signed char, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::setCollectPoint(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004B33C-8004B814       .text setGbaPoint_dungeon__6dMap_cFUcffsUcUcUcUc */
-void dMap_c::setGbaPoint_dungeon(unsigned char, float, float, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::setGbaPoint_dungeon(u8, f32, f32, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004B814-8004B8A0       .text getPosAgbMapType__6dMap_cFffb */
-void dMap_c::getPosAgbMapType(float, float, bool) {
+void dMap_c::getPosAgbMapType(f32, f32, bool) {
    /* Nonmatching */
 }

 /* 8004B8A0-8004B8DC       .text setGbaPoint__6dMap_cFUcffsUcUcUcUc */
-void dMap_c::setGbaPoint(unsigned char, float, float, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::setGbaPoint(u8, f32, f32, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004B8DC-8004B9C8       .text setArriveInfo__6dMap_cFff */
-void dMap_c::setArriveInfo(float, float) {
+void dMap_c::setArriveInfo(f32, f32) {
    /* Nonmatching */
 }

 /* 8004B9C8-8004BA64       .text drawPointPlayer__6dMap_cFffs */
-void dMap_c::drawPointPlayer(float, float, short) {
+void dMap_c::drawPointPlayer(f32, f32, s16) {
    /* Nonmatching */
 }

 /* 8004BA64-8004BB0C       .text drawPointEnemy__6dMap_cFff */
-void dMap_c::drawPointEnemy(float, float) {
+void dMap_c::drawPointEnemy(f32, f32) {
    /* Nonmatching */
 }

 /* 8004BB0C-8004BC94       .text drawPointAgbCursor__6dMap_cFff */
-void dMap_c::drawPointAgbCursor(float, float) {
+void dMap_c::drawPointAgbCursor(f32, f32) {
    /* Nonmatching */
 }

 /* 8004BC94-8004BD84       .text drawPointTbox__6dMap_cFffff */
-void dMap_c::drawPointTbox(float, float, float, float) {
+void dMap_c::drawPointTbox(f32, f32, f32, f32) {
    /* Nonmatching */
 }

 /* 8004BD84-8004BE7C       .text drawPointDoor__6dMap_cFffffsUc */
-void dMap_c::drawPointDoor(float, float, float, float, short, unsigned char) {
+void dMap_c::drawPointDoor(f32, f32, f32, f32, s16, u8) {
    /* Nonmatching */
 }

 /* 8004BE7C-8004BF78       .text drawPointRestart__6dMap_cFffsff */
-void dMap_c::drawPointRestart(float, float, short, float, float) {
+void dMap_c::drawPointRestart(f32, f32, s16, f32, f32) {
    /* Nonmatching */
 }

 /* 8004BF78-8004C044       .text drawPointFriend__6dMap_cFfff */
-void dMap_c::drawPointFriend(float, float, float) {
+void dMap_c::drawPointFriend(f32, f32, f32) {
    /* Nonmatching */
 }

 /* 8004C044-8004C144       .text drawPointShip__6dMap_cFffsff */
-void dMap_c::drawPointShip(float, float, short, float, float) {
+void dMap_c::drawPointShip(f32, f32, s16, f32, f32) {
    /* Nonmatching */
 }

 /* 8004C144-8004CC7C       .text drawPointGc__6dMap_cFUcfffScsUcUcUcUc */
-void dMap_c::drawPointGc(unsigned char, float, float, float, signed char, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::drawPointGc(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004CC7C-8004CD68       .text drawPointMain__6dMap_cFUcUcfffScsUcUcUcUc */
-void dMap_c::drawPointMain(unsigned char, unsigned char, float, float, float, signed char, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::drawPointMain(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004CD68-8004CEF4       .text drawPointAgb__6dMap_cFUcfffScsUcUcUcUc */
-void dMap_c::drawPointAgb(unsigned char, float, float, float, signed char, short, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_c::drawPointAgb(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8) {
    /* Nonmatching */
 }

 /* 8004CEF4-8004CFA4       .text getTypeAgbGcFromTypeAcs__6dMap_cFUcPUcPUc */
-void dMap_c::getTypeAgbGcFromTypeAcs(unsigned char, unsigned char*, unsigned char*) {
+void dMap_c::getTypeAgbGcFromTypeAcs(u8, u8*, u8*) {
    /* Nonmatching */
 }

 /* 8004CFA4-8004D0A4       .text drawPointSingle__6dMap_cFUcfffScsUcUcUc */
-void dMap_c::drawPointSingle(unsigned char, float, float, float, signed char, short, unsigned char, unsigned char, unsigned char) {
+void dMap_c::drawPointSingle(u8, f32, f32, f32, s8, s16, u8, u8, u8) {
    /* Nonmatching */
 }

@@ -477,17 +477,17 @@ void dMap_c::mapBufferSendAGB(int) {
 }

 /* 8004D9BC-8004DA54       .text checkFloorMoveImageChangeRoom__19dMap_RoomInfoCtrl_cFUcUcissf */
-void dMap_RoomInfoCtrl_c::checkFloorMoveImageChangeRoom(unsigned char, unsigned char, int, short, short, float) {
+void dMap_RoomInfoCtrl_c::checkFloorMoveImageChangeRoom(u8, u8, int, s16, s16, f32) {
    /* Nonmatching */
 }

 /* 8004DA54-8004DBE0       .text init__22dMap_2DMtMapSpcl_tex_cFP7ResTIMGUlRC8_GXColor */
-void dMap_2DMtMapSpcl_tex_c::init(ResTIMG*, unsigned long, const _GXColor&) {
+void dMap_2DMtMapSpcl_tex_c::init(ResTIMG*, u32, const _GXColor&) {
    /* Nonmatching */
 }

 /* 8004DBE0-8004DBF4       .text setScroll__22dMap_2DMtMapSpcl_tex_cFffff */
-void dMap_2DMtMapSpcl_tex_c::setScroll(float, float, float, float) {
+void dMap_2DMtMapSpcl_tex_c::setScroll(f32, f32, f32, f32) {
    /* Nonmatching */
 }

@@ -497,7 +497,7 @@ void dMap_2DMtMapSpcl_c::init(int, dMap_2DMtMapSpcl_tex_c*) {
 }

 /* 8004DC08-8004DC1C       .text setPos__18dMap_2DMtMapSpcl_cFssss */
-void dMap_2DMtMapSpcl_c::setPos(short, short, short, short) {
+void dMap_2DMtMapSpcl_c::setPos(s16, s16, s16, s16) {
    /* Nonmatching */
 }

@@ -512,22 +512,22 @@ void dMap_2DAGBScrDsp_c::setImage(ResTIMG*, map_dt_c*) {
 }

 /* 8004E1CC-8004E264       .text init__18dMap_2DAGBScrDsp_cFP8map_dt_cP7ResTIMGffssssffUc */
-void dMap_2DAGBScrDsp_c::init(map_dt_c*, ResTIMG*, float, float, short, short, short, short, float, float, unsigned char) {
+void dMap_2DAGBScrDsp_c::init(map_dt_c*, ResTIMG*, f32, f32, s16, s16, s16, s16, f32, f32, u8) {
    /* Nonmatching */
 }

 /* 8004E264-8004E384       .text getScrnPrm__18dMap_2DAGBScrDsp_cFffifPiPfPf */
-void dMap_2DAGBScrDsp_c::getScrnPrm(float, float, int, float, int*, float*, float*) {
+void dMap_2DAGBScrDsp_c::getScrnPrm(f32, f32, int, f32, int*, f32*, f32*) {
    /* Nonmatching */
 }

 /* 8004E384-8004E41C       .text getScrnPrmXY__18dMap_2DAGBScrDsp_cFffffiiffPiPiPfPfPfPf */
-void dMap_2DAGBScrDsp_c::getScrnPrmXY(float, float, float, float, int, int, float, float, int*, int*, float*, float*, float*, float*) {
+void dMap_2DAGBScrDsp_c::getScrnPrmXY(f32, f32, f32, f32, int, int, f32, f32, int*, int*, f32*, f32*, f32*, f32*) {
    /* Nonmatching */
 }

 /* 8004E41C-8004E698       .text calc_standard_prm__18dMap_2DAGBScrDsp_cFUsUsffssssffPiPiPiPiPfPfPfPfPfPf */
-void dMap_2DAGBScrDsp_c::calc_standard_prm(unsigned short, unsigned short, float, float, short, short, short, short, float, float, int*, int*, int*, int*, float*, float*, float*, float*, float*, float*) {
+void dMap_2DAGBScrDsp_c::calc_standard_prm(u16, u16, f32, f32, s16, s16, s16, s16, f32, f32, int*, int*, int*, int*, f32*, f32*, f32*, f32*, f32*, f32*) {
    /* Nonmatching */
 }

@@ -537,17 +537,17 @@ void dMap_2DAGBScrDsp_c::draw() {
 }

 /* 8004EE30-8004EE44       .text setPos__18dMap_2DAGBScrDsp_cFssss */
-void dMap_2DAGBScrDsp_c::setPos(short, short, short, short) {
+void dMap_2DAGBScrDsp_c::setPos(s16, s16, s16, s16) {
    /* Nonmatching */
 }

 /* 8004EE44-8004EE50       .text setScale__18dMap_2DAGBScrDsp_cFff */
-void dMap_2DAGBScrDsp_c::setScale(float, float) {
+void dMap_2DAGBScrDsp_c::setScale(f32, f32) {
    /* Nonmatching */
 }

 /* 8004EE50-8004EE88       .text init__12dMap_2DTri_cFssRC8_GXColorffs */
-void dMap_2DTri_c::init(short, short, const _GXColor&, float, float, short) {
+void dMap_2DTri_c::init(s16, s16, const _GXColor&, f32, f32, s16) {
    /* Nonmatching */
 }

@@ -557,12 +557,12 @@ void dMap_2DTri_c::draw() {
 }

 /* 8004F080-8004F08C       .text setPos__12dMap_2DTri_cFss */
-void dMap_2DTri_c::setPos(short, short) {
+void dMap_2DTri_c::setPos(s16, s16) {
    /* Nonmatching */
 }

 /* 8004F08C-8004F0BC       .text init__14dMap_2DPoint_cFssRC8_GXColorUc */
-void dMap_2DPoint_c::init(short, short, const _GXColor&, unsigned char) {
+void dMap_2DPoint_c::init(s16, s16, const _GXColor&, u8) {
    /* Nonmatching */
 }

@@ -572,7 +572,7 @@ void dMap_2DPoint_c::draw() {
 }

 /* 8004F1E4-8004F214       .text init__18dMap_2DAGBCursor_cFssRC8_GXColorUc */
-void dMap_2DAGBCursor_c::init(short, short, const _GXColor&, unsigned char) {
+void dMap_2DAGBCursor_c::init(s16, s16, const _GXColor&, u8) {
    /* Nonmatching */
 }

@@ -587,22 +587,22 @@ void dMap_2DT2_c::draw() {
 }

 /* 8004F778-8004F8B4       .text init__11dMap_2DT2_cFP7ResTIMGffffUcUcUcffs */
-void dMap_2DT2_c::init(ResTIMG*, float, float, float, float, unsigned char, unsigned char, unsigned char, float, float, short) {
+void dMap_2DT2_c::init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32, s16) {
    /* Nonmatching */
 }

 /* 8004F8B4-8004FC68       .text setTlut__11dMap_Dmap_cFP16dmap_dmap_tlut_sUcUcUcf */
-void dMap_Dmap_c::setTlut(dmap_dmap_tlut_s*, unsigned char, unsigned char, unsigned char, float) {
+void dMap_Dmap_c::setTlut(dmap_dmap_tlut_s*, u8, u8, u8, f32) {
    /* Nonmatching */
 }

 /* 8004FC68-8004FFC8       .text setFloorTextureOne__11dMap_Dmap_cFUc */
-void dMap_Dmap_c::setFloorTextureOne(unsigned char) {
+void dMap_Dmap_c::setFloorTextureOne(u8) {
    /* Nonmatching */
 }

 /* 8004FFC8-800504C4       .text init__11dMap_Dmap_cFsssssssssUcUcUcUcUc */
-void dMap_Dmap_c::init(short, short, short, short, short, short, short, short, short, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char) {
+void dMap_Dmap_c::init(s16, s16, s16, s16, s16, s16, s16, s16, s16, u8, u8, u8, u8, u8) {
    /* Nonmatching */
 }

@@ -636,35 +636,19 @@ dMap_2DTri_c::~dMap_2DTri_c() {
    /* Nonmatching */
 }

-/* 800519C4-80051A20       .text __dt__18dMap_2DAGBScrDsp_cFv */
-dMap_2DAGBScrDsp_c::~dMap_2DAGBScrDsp_c() {
-    /* Nonmatching */
-}
-
-/* 80051A20-80051A7C       .text __dt__18dMap_2DMtMapSpcl_cFv */
-dMap_2DMtMapSpcl_c::~dMap_2DMtMapSpcl_c() {
-    /* Nonmatching */
-}
-
 /* 80051A7C-80051AD8       .text __dt__11dMap_2DSQ_cFv */
 dMap_2DSQ_c::~dMap_2DSQ_c() {
    /* Nonmatching */
 }

 /* 80051DE8-80051E20       .text __arraydtor$4205 */
-void __arraydtor$4205 {
-    /* Nonmatching */
-}
+//void __arraydtor$4205 {}

 /* 80051E20-80051E58       .text __arraydtor$4202 */
-void __arraydtor$4202 {
-    /* Nonmatching */
-}
+//void __arraydtor$4202 {}

 /* 80051E58-80051E90       .text __arraydtor$4200 */
-void __arraydtor$4200 {
-    /* Nonmatching */
-}
+//void __arraydtor$4200 {}

 /* 80051E90-80051EAC       .text __ct__11dMap_2DT2_cFv */
 dMap_2DT2_c::dMap_2DT2_c() {
@@ -672,9 +656,7 @@ dMap_2DT2_c::dMap_2DT2_c() {
 }

 /* 80051EAC-80051EE4       .text __arraydtor$4196 */
-void __arraydtor$4196 {
-    /* Nonmatching */
-}
+//void __arraydtor$4196 {}

 /* 80051EE4-80051F00       .text __ct__14dMap_2DPoint_cFv */
 dMap_2DPoint_c::dMap_2DPoint_c() {
@@ -682,9 +664,7 @@ dMap_2DPoint_c::dMap_2DPoint_c() {
 }

 /* 80051F00-80051F38       .text __arraydtor$4188 */
-void __arraydtor$4188 {
-    /* Nonmatching */
-}
+//void __arraydtor$4188 {}

 /* 80051F38-80051F74       .text __dt__22dMap_2DMtMapSpcl_tex_cFv */
 dMap_2DMtMapSpcl_tex_c::~dMap_2DMtMapSpcl_tex_c() {
@@ -697,19 +677,10 @@ dMap_2DMtMapSpcl_tex_c::dMap_2DMtMapSpcl_tex_c() {
 }

 /* 80051F78-80051FB0       .text __arraydtor$4186 */
-void __arraydtor$4186 {
-    /* Nonmatching */
-}
-
-/* 80051FB0-80051FCC       .text __ct__18dMap_2DMtMapSpcl_cFv */
-dMap_2DMtMapSpcl_c::dMap_2DMtMapSpcl_c() {
-    /* Nonmatching */
-}
+//void __arraydtor$4186 {}

 /* 80051FCC-80052004       .text __arraydtor$4184 */
-void __arraydtor$4184 {
-    /* Nonmatching */
-}
+//void __arraydtor$4184 {}

 /* 80052004-800520B8       .text __dt__15dMap_RoomInfo_cFv */
 dMap_RoomInfo_c::~dMap_RoomInfo_c() {
@@ -720,4 +691,3 @@ dMap_RoomInfo_c::~dMap_RoomInfo_c() {
 dMap_RoomInfo_c::dMap_RoomInfo_c() {
    /* Nonmatching */
 }
-
@@ -3,22 +3,36 @@
 // Translation Unit: d_material.cpp
 //

-#include "d_material.h"
+#include "d/d_material.h"
+#include "JSystem/JKernel/JKRSolidHeap.h"
+#include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/types.h"

+mDoExt_backupMaterial_c dMat_control_c::mTempBackup;
+JKRSolidHeap* dMat_control_c::mHeap;
+dMat_backup_c* dMat_control_c::mBackup;
+dMat_ice_c* dMat_control_c::mIce;
+
 /* 8006F62C-8006F69C       .text restore__13dMat_backup_cFv */
 void dMat_backup_c::restore() {
-    /* Nonmatching */
+    JUT_ASSERT(82, mModelData != 0);
+    field_0x8.restore(mModelData);
 }

 /* 8006F69C-8006F740       .text create__10dMat_ice_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
-void dMat_ice_c::create(J3DMaterialTable*, J3DAnmTextureSRTKey*) {
+void dMat_ice_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
    /* Nonmatching */
+    field_0x0 = param_1;
+    int rt = field_0x4.init(field_0x0, param_2, 1, 2, 1.0f, 0, -1, false, 0);
+    JUT_ASSERT(98, rt != 0);
+    field_0x4.entry(field_0x0, field_0x4.getFrameCtrl()->getFrame());
 }

 /* 8006F740-8006F780       .text play__10dMat_ice_cFv */
 void dMat_ice_c::play() {
    /* Nonmatching */
+    field_0x4.play();
+    field_0x4.entryFrame();
 }

 /* 8006F780-8006F83C       .text copy__10dMat_ice_cFP12J3DModelData */
@@ -47,27 +61,38 @@ void dMat_ice_c::entryDL(mDoExt_McaMorf*, signed char, mDoExt_invisibleModel*) {
 }

 /* 8006FB84-8006FCF0       .text create__14dMat_control_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
-void dMat_control_c::create(J3DMaterialTable*, J3DAnmTextureSRTKey*) {
+void dMat_control_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
    /* Nonmatching */
+    mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
+    JUT_ASSERT(308, mHeap != 0);
+    JKRHeap* heap = mDoExt_setCurrentHeap(mHeap);
+    mBackup = new dMat_backup_c[16];
+    mIce = new dMat_ice_c();
+    JUT_ASSERT(313, mBackup != 0 && mIce != 0);
+    mIce->create(param_1, param_2);
+    mTempBackup.create(0x40);
+    mDoExt_adjustSolidHeap(mHeap);
+    mDoExt_setCurrentHeap(heap);
 }

 /* 8006FD4C-8006FD88       .text __dt__13dMat_backup_cFv */
-dMat_backup_c::~dMat_backup_c() {
-    /* Nonmatching */
-}
+dMat_backup_c::~dMat_backup_c() {}

 /* 8006FD88-8006FD98       .text __ct__13dMat_backup_cFv */
 dMat_backup_c::dMat_backup_c() {
-    /* Nonmatching */
+    mModelData = NULL;
 }

 /* 8006FD98-8006FDBC       .text remove__14dMat_control_cFv */
 void dMat_control_c::remove() {
-    /* Nonmatching */
+    mDoExt_destroySolidHeap(mHeap);
 }

 /* 8006FDBC-8006FDF4       .text restore__14dMat_control_cFSc */
-void dMat_control_c::restore(signed char) {
+void dMat_control_c::restore(s8 param_1) {
    /* Nonmatching */
+    if (param_1 < 0) {
+        return;
+    }
+    mBackup[param_1].restore();
 }
-
@@ -3,8 +3,9 @@
 // Translation Unit: d_meter.cpp
 //

-#include "d_meter.h"
-#include "dolphin/types.h"
+#include "d/d_meter.h"
+#include "d/d_drawlist.h"
+#include "d/d_metronome.h"

 /* 801EEFDC-801EF360       .text __ct__12dMeter_HIO_cFv */
 dMeter_HIO_c::dMeter_HIO_c() {
@@ -37,12 +38,12 @@ void dMeter_mtrHide() {
 }

 /* 801EF94C-801EF954       .text dMenu_setMenuStatus__FUc */
-void dMenu_setMenuStatus(unsigned char) {
+void dMenu_setMenuStatus(u8) {
    /* Nonmatching */
 }

 /* 801EF954-801EF95C       .text dMenu_setMenuStatusOld__FUc */
-void dMenu_setMenuStatusOld(unsigned char) {
+void dMenu_setMenuStatusOld(u8) {
    /* Nonmatching */
 }

@@ -57,7 +58,7 @@ void dMenu_getCollectMode() {
 }

 /* 801EF96C-801EF974       .text dMenu_setCollectMode__FUc */
-void dMenu_setCollectMode(unsigned char) {
+void dMenu_setCollectMode(u8) {
    /* Nonmatching */
 }

@@ -67,7 +68,7 @@ void dMenu_getItemMode() {
 }

 /* 801EF97C-801EF984       .text dMenu_setItemMode__FUc */
-void dMenu_setItemMode(unsigned char) {
+void dMenu_setItemMode(u8) {
    /* Nonmatching */
 }

@@ -102,7 +103,7 @@ void dMeter_offAuctionFlag() {
 }

 /* 801EF9C4-801EFA38       .text dMeter_itemMoveSet__FP18fopMsgM_pane_classUcUc */
-void dMeter_itemMoveSet(fopMsgM_pane_class*, unsigned char, unsigned char) {
+void dMeter_itemMoveSet(fopMsgM_pane_class*, u8, u8) {
    /* Nonmatching */
 }

@@ -112,12 +113,12 @@ void dMeter_itemMoveFlagCheck() {
 }

 /* 801EFA40-801EFA48       .text dMenu_flag__Fv */
-void dMenu_flag() {
+bool dMenu_flag() {
    /* Nonmatching */
 }

 /* 801EFA48-801EFA50       .text dMenu_flagSet__FUc */
-void dMenu_flagSet(unsigned char) {
+void dMenu_flagSet(u8) {
    /* Nonmatching */
 }

@@ -132,7 +133,7 @@ void dMenu_getPushMenuButton() {
 }

 /* 801EFA60-801EFA68       .text dMenu_setPushMenuButton__FUc */
-void dMenu_setPushMenuButton(unsigned char) {
+void dMenu_setPushMenuButton(u8) {
    /* Nonmatching */
 }

@@ -142,17 +143,17 @@ void dMeter_PaneHide(fopMsgM_pane_class*) {
 }

 /* 801EFA78-801EFA90       .text dMeter_isBit8__FPUcUc */
-void dMeter_isBit8(unsigned char*, unsigned char) {
+void dMeter_isBit8(u8*, u8) {
    /* Nonmatching */
 }

 /* 801EFA90-801EFAA4       .text dMeter_onBit8__FPUcUc */
-void dMeter_onBit8(unsigned char*, unsigned char) {
+void dMeter_onBit8(u8*, u8) {
    /* Nonmatching */
 }

 /* 801EFAA4-801EFAB8       .text dMeter_offBit8__FPUcUc */
-void dMeter_offBit8(unsigned char*, unsigned char) {
+void dMeter_offBit8(u8*, u8) {
    /* Nonmatching */
 }

@@ -172,22 +173,22 @@ void dMeter_statusCheck(sub_meter_class*) {
 }

 /* 801F01C0-801F0258       .text dMeter_alphaClose__FPsPs */
-void dMeter_alphaClose(short*, short*) {
+void dMeter_alphaClose(s16*, s16*) {
    /* Nonmatching */
 }

 /* 801F0258-801F02E8       .text dMeter_alphaOpen__FPsPs */
-void dMeter_alphaOpen(short*, short*) {
+void dMeter_alphaOpen(s16*, s16*) {
    /* Nonmatching */
 }

 /* 801F02E8-801F0320       .text dMeter_rupy_num__FPcs */
-void dMeter_rupy_num(char*, short) {
+void dMeter_rupy_num(char*, s16) {
    /* Nonmatching */
 }

 /* 801F0320-801F0378       .text dMeter_actionTex__Fs */
-void dMeter_actionTex(short) {
+void dMeter_actionTex(s16) {
    /* Nonmatching */
 }

@@ -197,7 +198,7 @@ void dMeter_weponTex() {
 }

 /* 801F041C-801F0434       .text dMeter_heartTex__Fs */
-void dMeter_heartTex(short) {
+void dMeter_heartTex(s16) {
    /* Nonmatching */
 }

@@ -222,42 +223,42 @@ void dMeter_heart_data_set(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pan
 }

 /* 801F07D4-801F0820       .text dMeter_paneBottomScaleY__FP18fopMsgM_pane_classf */
-void dMeter_paneBottomScaleY(fopMsgM_pane_class*, float) {
+void dMeter_paneBottomScaleY(fopMsgM_pane_class*, f32) {
    /* Nonmatching */
 }

 /* 801F0820-801F08DC       .text dMeter_parentPaneTrans__FP18fopMsgM_pane_classf */
-void dMeter_parentPaneTrans(fopMsgM_pane_class*, float) {
+void dMeter_parentPaneTrans(fopMsgM_pane_class*, f32) {
    /* Nonmatching */
 }

 /* 801F08DC-801F09D8       .text dMeter_childPaneTrans__FP18fopMsgM_pane_classP18fopMsgM_pane_classf */
-void dMeter_childPaneTrans(fopMsgM_pane_class*, fopMsgM_pane_class*, float) {
+void dMeter_childPaneTrans(fopMsgM_pane_class*, fopMsgM_pane_class*, f32) {
    /* Nonmatching */
 }

 /* 801F09D8-801F0AD8       .text dMeter_childPaneTransOnly__FP18fopMsgM_pane_classP18fopMsgM_pane_classff */
-void dMeter_childPaneTransOnly(fopMsgM_pane_class*, fopMsgM_pane_class*, float, float) {
+void dMeter_childPaneTransOnly(fopMsgM_pane_class*, fopMsgM_pane_class*, f32, f32) {
    /* Nonmatching */
 }

 /* 801F0AD8-801F0C10       .text dMeter_childPaneTransChildTrans__FP18fopMsgM_pane_classP18fopMsgM_pane_classP18fopMsgM_pane_classff */
-void dMeter_childPaneTransChildTrans(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, float, float) {
+void dMeter_childPaneTransChildTrans(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, f32, f32) {
    /* Nonmatching */
 }

 /* 801F0C10-801F0D0C       .text dMeter_childPaneTransChildTransOnly__FP18fopMsgM_pane_classP18fopMsgM_pane_classP18fopMsgM_pane_classff */
-void dMeter_childPaneTransChildTransOnly(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, float, float) {
+void dMeter_childPaneTransChildTransOnly(fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, f32, f32) {
    /* Nonmatching */
 }

 /* 801F0D0C-801F0D64       .text dMeter_setHeartScaleXY__FP18fopMsgM_pane_classs */
-void dMeter_setHeartScaleXY(fopMsgM_pane_class*, short) {
+void dMeter_setHeartScaleXY(fopMsgM_pane_class*, s16) {
    /* Nonmatching */
 }

 /* 801F0D64-801F0DD4       .text dMeter_setHeartScaleXY2__FP18fopMsgM_pane_classs */
-void dMeter_setHeartScaleXY2(fopMsgM_pane_class*, short) {
+void dMeter_setHeartScaleXY2(fopMsgM_pane_class*, s16) {
    /* Nonmatching */
 }

@@ -402,12 +403,12 @@ void dMeter_actionAlpha(sub_meter_class*) {
 }

 /* 801F4C80-801F4CC4       .text dMeter_numberSet__FP7J2DPaneUc */
-void dMeter_numberSet(J2DPane*, unsigned char) {
+void dMeter_numberSet(J2DPane*, u8) {
    /* Nonmatching */
 }

 /* 801F4CC4-801F4E04       .text dMeter_numberColor__FP7J2DPaneUcUc */
-void dMeter_numberColor(J2DPane*, unsigned char, unsigned char) {
+void dMeter_numberColor(J2DPane*, u8, u8) {
    /* Nonmatching */
 }

@@ -452,7 +453,7 @@ void dMeter_xyItemChange(sub_meter_class*, int) {
 }

 /* 801F5FDC-801F6084       .text dMeter_xyRotateZ__FP18fopMsgM_pane_classff */
-void dMeter_xyRotateZ(fopMsgM_pane_class*, float, float) {
+void dMeter_xyRotateZ(fopMsgM_pane_class*, f32, f32) {
    /* Nonmatching */
 }

@@ -547,12 +548,12 @@ void dMeter_magicGaugeMove(sub_meter_class*) {
 }

 /* 801F961C-801F9A24       .text dMeter_flyGaugeMove__FP15sub_meter_classUcss */
-void dMeter_flyGaugeMove(sub_meter_class*, unsigned char, short, short) {
+void dMeter_flyGaugeMove(sub_meter_class*, u8, s16, s16) {
    /* Nonmatching */
 }

 /* 801F9A24-801F9B3C       .text dMeter_magicChange__FP15sub_meter_classf */
-void dMeter_magicChange(sub_meter_class*, float) {
+void dMeter_magicChange(sub_meter_class*, f32) {
    /* Nonmatching */
 }

@@ -567,7 +568,7 @@ void dMeter_magicInitTrans(sub_meter_class*) {
 }

 /* 801F9CCC-801F9F18       .text dMeter_magicTransScale__FP15sub_meter_classfff */
-void dMeter_magicTransScale(sub_meter_class*, float, float, float) {
+void dMeter_magicTransScale(sub_meter_class*, f32, f32, f32) {
    /* Nonmatching */
 }

@@ -607,7 +608,7 @@ void dMeter_menuPlusMove(sub_meter_class*) {
 }

 /* 801FBB28-801FBC70       .text dMeter_magicLength__FP15sub_meter_classf */
-void dMeter_magicLength(sub_meter_class*, float) {
+void dMeter_magicLength(sub_meter_class*, f32) {
    /* Nonmatching */
 }

@@ -652,12 +653,12 @@ void dMeter_walletChange(sub_meter_class*) {
 }

 /* 801FC85C-801FCA98       .text dMeter_keyLight__FP18fopMsgM_pane_classPsf */
-void dMeter_keyLight(fopMsgM_pane_class*, short*, float) {
+void dMeter_keyLight(fopMsgM_pane_class*, s16*, f32) {
    /* Nonmatching */
 }

 /* 801FCA98-801FCCA8       .text dMeter_keyRndLightFrame__FPs */
-void dMeter_keyRndLightFrame(short*) {
+void dMeter_keyRndLightFrame(s16*) {
    /* Nonmatching */
 }

@@ -677,7 +678,7 @@ void dMeter_keyMove(sub_meter_class*) {
 }

 /* 801FD09C-801FD104       .text dMeter_compassRotate__FP18fopMsgM_pane_classP18fopMsgM_pane_classf */
-void dMeter_compassRotate(fopMsgM_pane_class*, fopMsgM_pane_class*, float) {
+void dMeter_compassRotate(fopMsgM_pane_class*, fopMsgM_pane_class*, f32) {
    /* Nonmatching */
 }

@@ -757,12 +758,12 @@ void dMeter_clockMove(sub_meter_class*) {
 }

 /* 801FEC2C-801FED10       .text dMeter_clockStarLight__FP18fopMsgM_pane_classPs */
-void dMeter_clockStarLight(fopMsgM_pane_class*, short*) {
+void dMeter_clockStarLight(fopMsgM_pane_class*, s16*) {
    /* Nonmatching */
 }

 /* 801FED10-801FEE00       .text dMeter_starLightFrame__FPs */
-void dMeter_starLightFrame(short*) {
+void dMeter_starLightFrame(s16*) {
    /* Nonmatching */
 }

@@ -812,7 +813,7 @@ void dMeter_moveItemDraw(sub_meter_class*) {
 }

 /* 8020042C-8020054C       .text dMeter_swimTransY__FP15sub_meter_classf */
-void dMeter_swimTransY(sub_meter_class*, float) {
+void dMeter_swimTransY(sub_meter_class*, f32) {
    /* Nonmatching */
 }

@@ -827,12 +828,12 @@ void dMeter_swimPaneHide(sub_meter_class*) {
 }

 /* 80200630-802006AC       .text dMeter_swimPaneTransY__FP15sub_meter_classf */
-void dMeter_swimPaneTransY(sub_meter_class*, float) {
+void dMeter_swimPaneTransY(sub_meter_class*, f32) {
    /* Nonmatching */
 }

 /* 802006AC-8020070C       .text dMeter_swimPaneAlpha__FP15sub_meter_classf */
-void dMeter_swimPaneAlpha(sub_meter_class*, float) {
+void dMeter_swimPaneAlpha(sub_meter_class*, f32) {
    /* Nonmatching */
 }

@@ -892,7 +893,7 @@ void dMeter_swimLightBirth(sub_meter_class*) {
 }

 /* 802021B4-8020238C       .text dMeter_swimLightAnime__FP15sub_meter_classs */
-void dMeter_swimLightAnime(sub_meter_class*, short) {
+void dMeter_swimLightAnime(sub_meter_class*, s16) {
    /* Nonmatching */
 }

@@ -912,7 +913,7 @@ void dMeter_arrowCheckStatus(sub_meter_class*) {
 }

 /* 80202580-80202770       .text dMeter_arrowTransScale__FP15sub_meter_classffi */
-void dMeter_arrowTransScale(sub_meter_class*, float, float, int) {
+void dMeter_arrowTransScale(sub_meter_class*, f32, f32, int) {
    /* Nonmatching */
 }

@@ -1025,29 +1026,3 @@ void mapCtrlDisp_c::moveMapCtrlDisp() {
 dMeter_map_HIO_c::~dMeter_map_HIO_c() {
    /* Nonmatching */
 }
-
-/* 80205EDC-80205F14       .text __arraydtor$4710 */
-void __arraydtor$4710 {
-    /* Nonmatching */
-}
-
-/* 80205F14-80205F30       .text __ct__11dDlst_2Dm_cFv */
-dDlst_2Dm_c::dDlst_2Dm_c() {
-    /* Nonmatching */
-}
-
-/* 80205F30-80205F6C       .text __dt__13dMeter_info_cFv */
-dMeter_info_c::~dMeter_info_c() {
-    /* Nonmatching */
-}
-
-/* 80205F6C-80205FC8       .text __dt__12dMetronome_cFv */
-dMetronome_c::~dMetronome_c() {
-    /* Nonmatching */
-}
-
-/* 80205FC8-80205FE8       .text draw__12dMetronome_cFv */
-void dMetronome_c::draw() {
-    /* Nonmatching */
-}
-
@@ -3,76 +3,13 @@
 // Translation Unit: d_metronome.cpp
 //

+#include "d/d_metronome.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_com_inf_game.h"
-#include "d/d_drawlist.h"
-#include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_audio.h"
-#include "m_Do/m_Do_hostIO.h"
 #include "m_Do/m_Do_lib.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/JUtility/TColor.h"
-#include "JSystem/JParticle/JPAEmitter.h"
-
-class dMetronome_c : public dDlst_base_c {
-public:
-    void screenSet();
-    void metronomeMove();
-    void melodyInit(u8);
-    void melodyMove();
-    void melodyGuideShow(s32, s16);
-    void melodyShow();
-    void melodyDemo();
-    void melodyFlash();
-    void melodyShift();
-    void initialize();
-    void _create();
-    void _delete();
-    void _move();
-    void _draw();
-    BOOL _open();
-    BOOL _close();
-
-public:
-    /* 0x004 */ J2DScreen* scrn;
-    /* 0x008 */ fopMsgM_pane_class pane_cn[7];
-    /* 0x190 */ fopMsgM_pane_class pane_wn[7];
-    /* 0x318 */ fopMsgM_pane_class pane_pk[7];
-    /* 0x4A0 */ fopMsgM_pane_class pane_i12[7];
-    /* 0x628 */ fopMsgM_pane_class pane_i11[7];
-    /* 0x7B0 */ fopMsgM_pane_class pane_bs[7];
-    /* 0x938 */ fopMsgM_pane_class pane_timing[21]; // Metronome dots at the top
-    /* 0xDD0 */ fopMsgM_pane_class pane_echo; // Metronome "echo" when it hits the center dot.
-
-    /* 0xE08 */ JPABaseEmitter * mpEmitter;
-    /* 0xE0C */ f32 mCurRate;
-    /* 0xE10 */ f32 mPosX;
-    /* 0xE14 */ s32 field_0xE14;
-    /* 0xE18 */ s32 mNote[7];
-    /* 0xE34 */ s32 mCurTimer;
-    /* 0xE38 */ u8 field_0xE38;
-    /* 0xE39 */ u8 mMelodyNum;
-    /* 0xE3A */ u8 mAction;
-    /* 0xE3B */ u8 mbOpen;
-};
-
-class dMn_HIO_c : public mDoHIO_entry_c {
-public:
-    dMn_HIO_c();
-    virtual ~dMn_HIO_c() {}
-
-public:
-    /* 0x04 */ f32 mEchoScale;
-    /* 0x08 */ s16 mShiftTiming;
-    /* 0x0A */ s16 mFlashTiming;
-    /* 0x0C */ JUtility::TColor mWhiteColor0;
-    /* 0x10 */ JUtility::TColor mWhiteColor1;
-    /* 0x14 */ JUtility::TColor mBlackColor0;
-    /* 0x18 */ JUtility::TColor mBlackColor1;
-    /* 0x1C */ u8 mAlphaOrig;
-    /* 0x1D */ u8 mTimingTrail;
-};

 enum {
    ACT_INIT = 0,
@@ -433,7 +370,7 @@ void dMetronome_c::melodyShow() {
            }
        }
    }
-    
+
    for (s32 i = 0; i < 7; i++) {
        if (pane_bs[i].mUserArea != 0) {
            f32 alpha = fopMsgM_valueIncrease(5, pane_bs[i].mUserArea, 0);
@@ -3,6 +3,7 @@
 // Translation Unit: d_s_open.cpp
 //

+#include "d/d_s_open.h"
 #include "f_op/f_op_scene.h"
 #include "f_op/f_op_draw_iter.h"
 #include "f_op/f_op_scene_mng.h"
@@ -14,37 +15,6 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"

-class dScnOpen_message_c;
-class J2DScreen;
-
-class dScnOpen_proc_c : public dDlst_base_c {
-public:
-    dScnOpen_proc_c();
-    virtual ~dScnOpen_proc_c();
-    void proc_execute();
-
-    /* 0x004 */ JKRExpHeap* exp_heap;
-    /* 0x008 */ dScnOpen_message_c* m_message;
-    /* 0x00C */ J2DScreen* m_Screen;
-    /* 0x010 */ u8 pad[0x2a0];
-    /* 0x2B0 */ s32 field_0x2b0;
-    /* 0x010 */ u8 pad2[0x014];
-};
-
-class dScnOpen_c : public scene_class {
-public:
-    ~dScnOpen_c();
-    void changeGameScene();
-    s32 create();
-    BOOL draw();
-    BOOL execute();
-
-    /* 0x1C4 */ request_of_phase_process_class mPhs;
-    /* 0x1CC */ JKRSolidHeap* solid_heap;
-    /* 0x1D0 */ dScnOpen_proc_c* mpProc;
-    /* 0x1D4 */ u8 field_0x1d4;
-};
-
 /* 80232A68-80232BC4       .text create__10dScnOpen_cFv */
 s32 dScnOpen_c::create() {
    dComIfGp_offEnableNextStage();
@@ -3,11 +3,11 @@
 // Translation Unit: d_s_open_sub.cpp
 //

-#include "d_s_open_sub.h"
+#include "d/d_s_open.h"
 #include "dolphin/types.h"

 /* 80232EFC-8023334C       .text set_message__18dScnOpen_message_cFUli */
-void dScnOpen_message_c::set_message(unsigned long, int) {
+void dScnOpen_message_c::set_message(u32, int) {
    /* Nonmatching */
 }

@@ -50,4 +50,3 @@ void dScnOpen_proc_c::proc_draw() {
 void dScnOpen_proc_c::draw() {
    /* Nonmatching */
 }
-
@@ -3,9 +3,24 @@
 // Translation Unit: d_snap.cpp
 //

-#include "d_snap.h"
+#include "d/d_snap.h"
 #include "dolphin/types.h"

+void (dSnap_packet::*dSnap_packet::m_judge_tbl[])() = {
+    NULL,
+    &dSnap_packet::JudgePost,
+    &dSnap_packet::JudgeBikutsuki,
+    &dSnap_packet::JudgeCoupleLook,
+    &dSnap_packet::JudgeGF,
+    &dSnap_packet::JudgeGenzo,
+    &dSnap_packet::JudgeObasan4,
+    &dSnap_packet::JudgeGene,
+    &dSnap_packet::JudgeGene,
+    &dSnap_packet::JudgeGene,
+    &dSnap_packet::JudgeTestM,
+};
+dSnap_packet l_snap;
+
 /* 800CCF6C-800CCFE4       .text dSnap_PhotoIndex2TableIndex__Fi */
 void dSnap_PhotoIndex2TableIndex(int) {
    /* Nonmatching */
@@ -62,7 +77,7 @@ void dSnap_Obj::ChkPhoto(int) {
 }

 /* 800CDC18-800CDC40       .text ChkSuccess__9dSnap_ObjFlf */
-void dSnap_Obj::ChkSuccess(long, f32) {
+void dSnap_Obj::ChkSuccess(s32, f32) {
    /* Nonmatching */
 }

@@ -72,9 +87,7 @@ void dSnap_Obj::ChkCamCull() const {
 }

 /* 800CDCD8-800CDCDC       .text Init__18dSnap_RegistObjElmFv */
-void dSnap_RegistObjElm::Init() {
-    /* Nonmatching */
-}
+void dSnap_RegistObjElm::Init() {}

 /* 800CDCDC-800CDD70       .text Regist__18dSnap_RegistObjElmFRC9dSnap_Obj */
 void dSnap_RegistObjElm::Regist(const dSnap_Obj&) {
@@ -232,9 +245,7 @@ void dSnap_DebugDraw() {
 }

 /* 800CF054-800CF058       .text dSnap_Delete__Fv */
-void dSnap_Delete() {
-    /* Nonmatching */
-}
+void dSnap_Delete() {}

 /* 800CF058-800CF0DC       .text __dt__12dSnap_packetFv */
 dSnap_packet::~dSnap_packet() {
@@ -250,4 +261,3 @@ dSnap_RegistObjElm::~dSnap_RegistObjElm() {
 dSnap_RegistObjElm::dSnap_RegistObjElm() {
    /* Nonmatching */
 }
-
@@ -3,35 +3,30 @@
 // Translation Unit: d_vibration.cpp
 //

-#include "d_vibration.h"
-#include "dolphin/types.h"
-
-
-
-
+#include "d/d_vibration.h"

 /* 8009C73C-8009CCCC       .text Run__12dVibration_cFv */
-void dVibration_c::Run() {
+int dVibration_c::Run() {
    /* Nonmatching */
 }

 /* 8009CCCC-8009CD6C       .text StartShock__12dVibration_cFii4cXyz */
-void dVibration_c::StartShock(int, int, cXyz) {
+bool dVibration_c::StartShock(int, int, cXyz) {
    /* Nonmatching */
 }

 /* 8009CD6C-8009CE1C       .text StartQuake__12dVibration_cFii4cXyz */
-void dVibration_c::StartQuake(int, int, cXyz) {
+bool dVibration_c::StartQuake(int, int, cXyz) {
    /* Nonmatching */
 }

 /* 8009CE1C-8009CF84       .text StartQuake__12dVibration_cFPCUcii4cXyz */
-void dVibration_c::StartQuake(const unsigned char*, int, int, cXyz) {
+bool dVibration_c::StartQuake(const unsigned char*, int, int, cXyz) {
    /* Nonmatching */
 }

 /* 8009CF84-8009CFEC       .text StopQuake__12dVibration_cFi */
-void dVibration_c::StopQuake(int) {
+int dVibration_c::StopQuake(int) {
    /* Nonmatching */
 }

@@ -41,7 +36,7 @@ void dVibration_c::Kill() {
 }

 /* 8009D044-8009D06C       .text CheckQuake__12dVibration_cFv */
-void dVibration_c::CheckQuake() {
+bool dVibration_c::CheckQuake() {
    /* Nonmatching */
 }

@@ -69,4 +64,3 @@ dVibration_c::dVibration_c() {
 dVibration_c::~dVibration_c() {
    /* Nonmatching */
 }
-
@@ -7,12 +7,12 @@
 #include "dolphin/types.h"

 /* 80019940-80019CE8       .text mDoMemCdRWm_Store__FP12CARDFileInfoPvUl */
-void mDoMemCdRWm_Store(CARDFileInfo*, void*, unsigned long) {
+void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) {
    /* Nonmatching */
 }

 /* 80019CE8-80019F4C       .text mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl */
-void mDoMemCdRWm_Restore(CARDFileInfo*, void*, unsigned long) {
+void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) {
    /* Nonmatching */
 }

@@ -32,12 +32,12 @@ void mDoMemCdRWm_CheckCardStat(CARDFileInfo*) {
 }

 /* 8001A2F0-8001A330       .text mDoMemCdRWm_CalcCheckSum__FPvUl */
-void mDoMemCdRWm_CalcCheckSum(void*, unsigned long) {
+void mDoMemCdRWm_CalcCheckSum(void*, u32) {
    /* Nonmatching */
 }

 /* 8001A330-8001A358       .text mDoMemCdRWm_CalcCheckSumPictData__FPvUl */
-void mDoMemCdRWm_CalcCheckSumPictData(void*, unsigned long) {
+void mDoMemCdRWm_CalcCheckSumPictData(void*, u32) {
    /* Nonmatching */
 }

@@ -47,12 +47,12 @@ void mDoMemCdRWm_TestCheckSumPictData(void*) {
 }

 /* 8001A39C-8001A3D0       .text mDoMemCdRWm_SetCheckSumPictData__FPUc */
-void mDoMemCdRWm_SetCheckSumPictData(unsigned char*) {
+void mDoMemCdRWm_SetCheckSumPictData(u8*) {
    /* Nonmatching */
 }

 /* 8001A3D0-8001A408       .text mDoMemCdRWm_CalcCheckSumGameData__FPvUl */
-void mDoMemCdRWm_CalcCheckSumGameData(void*, unsigned long) {
+void mDoMemCdRWm_CalcCheckSumGameData(void*, u32) {
    /* Nonmatching */
 }

@@ -62,6 +62,6 @@ void mDoMemCdRWm_TestCheckSumGameData(void*) {
 }

 /* 8001A454-8001A498       .text mDoMemCdRWm_SetCheckSumGameData__FPUcUc */
-void mDoMemCdRWm_SetCheckSumGameData(unsigned char*, unsigned char) {
+void mDoMemCdRWm_SetCheckSumGameData(u8*, u8) {
    /* Nonmatching */
 }