Demo work

include/JSystem/JParticle/JPAEmitter.h

@@ -195,7 +195,7 @@ public:
 
     void setStatus(u32 status) { mFlags |= status; }
     void clearStatus(u32 status) { mFlags &= ~status; }
-    bool checkStatus(u32 status) { return mFlags & status; }
+    u32 checkStatus(u32 status) { return mFlags & status; }
     void initStatus(u32 status) { mFlags = status; }
 
     bool checkEmDataFlag(u32 mask) { return mDataFlag & mask; }

include/d/actor/d_a_rd.h

@@ -47,7 +47,13 @@ public:
     /* 0x7C */ JntHit_HIO_c m7C;
 };
 
-class daRd_c : public fopEn_enemy_c {
+class daRd_c
+#if VERSION == VERSION_DEMO
+: public fopAc_ac_c
+#else
+: public fopEn_enemy_c
+#endif
+{
 public:
     enum Proc_e {
         PROC_INIT = 0,

include/d/d_demo.h

@@ -352,6 +352,10 @@ private:
 };
 
 class mDoExt_McaMorf;
-BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8);
+#if VERSION == VERSION_DEMO
+BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int = 0, u16* = NULL);
+#else
+BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int = 0, u16* = NULL, u32 = 0, s8 = 0);
+#endif
 
 #endif /* D_DEMO_H */

include/d/d_ky_thunder.h

@@ -25,11 +25,18 @@ public:
 public:
     /* 0x0F8 */ JKRSolidHeap * solid_heap;
     /* 0x0FC */ dThunder_modelInfo_c mModelInfo;
+#if VERSION == VERSION_DEMO
+    /* 0x134 */ cXyz mPos;
+    /* 0x140 */ f32 mBtkTime;
+    /* 0x144 */ cXyz mScale;
+    /* 0x150 */ f32 mRot;
+#else
     /* 0x134 */ cXyz mScale;
     /* 0x140 */ cXyz mPos;
     /* 0x14C */ cXyz mPosNeg;
     /* 0x158 */ f32 mRot;
     /* 0x15C */ f32 mBtkTime;
+#endif
 };
 
 #endif /* D_KY_THUNDER_H */

include/d/d_timer.h

@@ -13,7 +13,7 @@ class JKRSolidHeap;
 class dDlst_TimerScrnDraw_c : public dDlst_base_c {
 public:
     dDlst_TimerScrnDraw_c() {
-        field_0x234 = 0;
+        mAnimeTimer = 0;
         mRupeeNum = -1;
         field_0x235 = 0;
     }
@@ -36,7 +36,7 @@ public:
     f32 acc(s16 param_0, s16 param_1, s16 param_2) {
         return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
     }
-    void animeTimerReset() {}
+    void animeTimerReset() { mAnimeTimer = 0; }
 
 public:
     /* 0x004 */ J2DScreen* scrn;
@@ -54,7 +54,7 @@ public:
     /* 0x220 */ J2DPane* mRupeeNumberShadow[3];
     /* 0x22C */ J2DPicture* mIconPicture;
     /* 0x230 */ s32 mRupeeNum;
-    /* 0x234 */ s8 field_0x234;
+    /* 0x234 */ s8 mAnimeTimer;
     /* 0x235 */ u8 field_0x235;
     /* 0x236 */ u8 field_0x236;
     /* 0x237 */ u8 field_0x237;
@@ -81,6 +81,13 @@ public:
     s32 getLimitTimeMs();
     s32 getRestTimeMs();
 
+    void setTimerPos(f32 x, f32 y) { mpScrnDraw->setTimerPos(x, y); }
+    void setRupeePos(f32 x, f32 y) { mpScrnDraw->setRupeePos(x, y); }
+    void setShowType(u8 type) { mpScrnDraw->setShowType(type); }
+    void setIconType(void* tex, u8 type) { mpScrnDraw->setIconType(tex, type); }
+    void timerHide() { mpScrnDraw->hide(); }
+    u8 getStatus() { return mStatus; }
+
     /* 0x0FC */ dDlst_TimerScrnDraw_c* mpScrnDraw;
     /* 0x100 */ void* iconTex;
     /* 0x104 */ request_of_phase_process_class mPhs;
@@ -101,7 +108,7 @@ public:
     /* 0x160 */ s16 field_0x160;
     /* 0x162 */ u8 field_0x162;
     /* 0x163 */ u8 field_0x163;
-    /* 0x164 */ u8 mState;
+    /* 0x164 */ u8 mStatus;
     /* 0x168 */ s32 mSeTimeLeft;
     /* 0x16C */ u32 mSeTableIndex;
     /* 0x170 */ JKRSolidHeap* mpSolidHeap;

include/m_Do/m_Do_hostIO.h

@@ -2,6 +2,7 @@
 #define M_DO_M_DO_HOSTIO_H
 
 #include "dolphin/types.h"
+#include <string.h>
 
 // move JOR stuff later
 class JOREventListener;
@@ -41,14 +42,19 @@ class mDoHIO_child_c {
 public:
     mDoHIO_child_c() {
         field_0x18 = 0;
-        mReflexible = NULL;
+        mPt = NULL;
     }
 
     ~mDoHIO_child_c() {}
 
+    const char* getName() { return mName; }
+    void setName(const char* i_name) { strncpy(mName, i_name, sizeof(mName)); }
+    JORReflexible* getPt() { return mPt; }
+    void setPt(JORReflexible* i_pt) { mPt = i_pt; }
+
     /* 0x00 */ char mName[24];
     /* 0x18 */ u8 field_0x18;
-    /* 0x1C */ JORReflexible* mReflexible;
+    /* 0x1C */ JORReflexible* mPt;
 };
 
 class mDoHIO_subRoot_c {
@@ -82,7 +88,18 @@ public:
 
 class mDoHIO_entry_c : public JORReflexible {
 public:
+#if VERSION == VERSION_DEMO
+    /* 0x00 */ s8 mNo;
+    /* 0x01 */ u8 mCount;
+    /* 0x04 */ /* vtable */
+
+    mDoHIO_entry_c();
+    virtual ~mDoHIO_entry_c();
+    void entryHIO(const char*);
+    void removeHIO();
+#else
     virtual ~mDoHIO_entry_c() {}
+#endif
 };
 
 extern mDoHIO_root_c mDoHIO_root;