Demo matches (#767)

include/d/actor/d_a_boss_item.h

@@ -2,9 +2,14 @@
 #define D_A_BOSS_ITEM_H
 
 #include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
 
 class bossitem_class : public fopAc_ac_c {
     /* 0x290 */ u8 m290[0x298 - 0x290];
 };
 
+namespace daBossItem_prm {
+    inline int getStage(bossitem_class* actor) { return fopAcM_GetParam(actor) & 0xFF; }
+}
+
 #endif /* D_A_BOSS_ITEM_H */

include/d/actor/d_a_npc_btsw2.h

@@ -14,7 +14,7 @@ public:
         ACTION_ENDING   = -1,
     };
 
-    void getAttentionBasePos() {}
+    cXyz& getAttentionBasePos() { return mAttPos; }
     void setAction(ActionFunc func, void* arg) {
         if (mCurrActionFunc != func) {
             if (mCurrActionFunc) {

include/d/actor/d_a_npc_ji1.h

@@ -177,8 +177,8 @@ public:
     /* 0x418 */ mDoExt_btkAnm field_0x418;
     /* 0x42C */ f32 field_0x42C;
     /* 0x430 */ JPABaseEmitter* field_0x430;
-    /* 0x434 */ dBgS_ObjAcch field_0x434;
-    /* 0x5F8 */ dBgS_AcchCir field_0x5F8;
+    /* 0x434 */ dBgS_ObjAcch mAcch;
+    /* 0x5F8 */ dBgS_AcchCir mAcchCir;
     /* 0x638 */ dCcD_Stts field_0x638;
     /* 0x674 */ dCcD_Stts field_0x674;
     /* 0x6B0 */ dCcD_Cyl field_0x6B0;

include/d/actor/d_a_obj_Ygush00.h

@@ -37,11 +37,15 @@ public:
 class daObjYgush00_HIO_c : public JORReflexible  {
 public:
     daObjYgush00_HIO_c();
+    virtual ~daObjYgush00_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
 public:
     /* 0x04 */ s8 mNo;
+    /* 0x05 */ s8 m05;
+    /* 0x06 */ s8 m06;
+    /* 0x07 */ s8 m07;
 };
 
 #endif /* D_A_OBJ_YGUSH00_H */

include/d/actor/d_a_obj_hfuck1.h

@@ -5,6 +5,9 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"
 #include "d/d_cc_d.h"
+#if VERSION == VERSION_DEMO
+#include "m_Do/m_Do_hostIO.h"
+#endif
 
 class daObjHfuck1_c : public fopAc_ac_c {
 public:
@@ -26,4 +29,18 @@ public:
     /* 0x40C */ fopAc_ac_c * mpHookshotActor;
 };
 
+#if VERSION == VERSION_DEMO
+class daObjHfuck1_HIO_c : public JORReflexible {
+public:
+    daObjHfuck1_HIO_c();
+    virtual ~daObjHfuck1_HIO_c() {}
+
+    /* 0x04 */ s8 mNo;
+    f32 field_0x08;
+    f32 field_0x0C;
+    f32 field_0x10;
+    f32 field_0x14;
+};
+#endif
+
 #endif /* D_A_OBJ_HFUCK1_H */

include/d/actor/d_a_obj_hha.h

@@ -51,31 +51,56 @@ public:
     bool chk_stop() { return mbIsActive == false; }
     
     void delete_s() {
+#if VERSION == VERSION_DEMO
+        if(mpEmitter != NULL){
+            mSplashCb.remove();
+            mpEmitter = NULL;
+            mbIsActive = false;
+        }
+#else
         if(mSplashCb.getEmitter() != NULL){
             mSplashCb.remove();
             mbIsActive = false;
         }
+#endif
     }
 
     void play_particle() {
+#if VERSION == VERSION_DEMO
+        if(mpEmitter != NULL){
+            mpEmitter->playCreateParticle();
+            mbIsActive = true;
+        }
+#else
         JPABaseEmitter* pSplashEmitter = mSplashCb.getEmitter();
         if(pSplashEmitter != NULL){
             pSplashEmitter->playCreateParticle();
             mbIsActive = true;
         }
+#endif
     }
     
     void stop_particle() {
+#if VERSION == VERSION_DEMO
+        if(mpEmitter != NULL){
+            mpEmitter->stopCreateParticle();
+            mbIsActive = false;
+        }
+#else
         JPABaseEmitter* pSplashEmitter = mSplashCb.getEmitter();
         if(pSplashEmitter != NULL){
             pSplashEmitter->stopCreateParticle();
             mbIsActive = false;
         }
+#endif
     }
 
     void create_s(u16, cXyz*, float, float, csXyz*);
 
 public:
+#if VERSION == VERSION_DEMO
+    /* 0x00 */ JPABaseEmitter* mpEmitter;
+#endif
     /* 0x00 */ dPa_followEcallBack mSplashCb;
     /* 0x14 */ cXyz mBasePos;
     /* 0x20 */ cXyz mPos;
@@ -138,8 +163,10 @@ public:
     bool _draw();
 
 public:
+#if VERSION > VERSION_DEMO
     static const dCcD_SrcCyl M_cyl_data;
     static const dCcD_SrcSph M_sph_data;
+#endif
     static const char M_arcname[4];
     enum State_t  {State_OPEN = 0, State_SWITCHING = 1, State_CLOSED = 2};
 
@@ -149,20 +176,22 @@ public:
     /* 0x2C4 */ dCcD_Stts mCylStts;
     /* 0x300 */ dCcD_Cyl mCyl;
     /* 0x430 */ bool mHitboxActive;
+#if VERSION > VERSION_DEMO
     /* 0x434 */ dCcD_Stts mSphStts;
     /* 0x470 */ dCcD_Sph mSph;
+#endif
     /* 0x59C */ daObjHhaYgush_c mYgush;
     /* 0x6A0 */ daObjHhaPart_c mPartA[2];
     /* 0x738 */ daObjHhaSplash_c mSplashA[2];
     /* 0x7A0 */ cXyz mPosOffset;
     /* 0x7AC */ u32 mSwitchNo;
     /* 0x7B0 */ u8 mIsMiddle;
-    /* 0x7B2 */ short mPartTimer;
-    /* 0x7B4 */ float mWtrScale;
-    /* 0x7B8 */ float mWtrScaleMin;
+    /* 0x7B2 */ s16 mPartTimer;
+    /* 0x7B4 */ f32 mWtrScale;
+    /* 0x7B8 */ f32 mWtrScaleMin;
     /* 0x7BC */ u16 mWtrTimer;
     /* 0X7BE */ u8 mWtrState;
-    /* 0x7C0 */ short mEventIdx;
+    /* 0x7C0 */ s16 mEventIdx;
     /* 0x7C2 */ u8 mState;
     /* 0x7C3 */ bool mWaterSound;
 };