d_a_tag_* TUs mostly matching for debug (#3054)

* d_a_tag_event debug almost matching

* d_a_tag_msg debug almost matching

* d_a_tag_attention almost matching

* d_a_tag_chkpoint debug almost matching (weak func order)

* d_a_tag_evt debug almost matching (extra weak fns)

* d_a_tag_evtarea debug almost matching (weak func order)

* d_a_tag_evtmsg debug almost matching (weak func order)

* d_a_tag_mist debug almost matching (weak func order)

* d_a_tag_howl debug almost matching (weak func order)

* d_a_tag_lantern debug almost matching (weak func order)

* d_a_tag_push debug almost matching (weak func order)

* d_a_tag_telop debug almost matching (weak func order)

* d_a_tag_CstaSw debug almost matching (weak func order)

* d_a_tag_ajnot debug almost matching (weak func order)

* d_a_tag_attack_item debug almost matching (weak func order)

* d_a_tag_gstart debug almost matching (weak func order)

* d_a_tag_hinit debug almost matching (debug weak func order)

* d_a_tag_hjump debug almost matching (weak func order)

* d_a_tag_hstop debug almost matching (weak func order)

* d_a_tag_lv2prchk debug almost matching (weak func order)

* d_a_tag_magne debug almost matching (weak func order)

* d_a_tag_mhint debug almost matching (weak func order)

* d_a_tag_mstop debug almost matching (weak func order)

* d_a_tag_spring debug almost matching (weak func order)

* d_a_tag_statue_evt debug almost matching (weak func order)

* d_a_tag_arena debug almost matching (weak func order)

* d_a_tag_Lv6Gate debug almost matching (weak func order)

* d_a_tag_Lv7Gate debug almost matching (weak func order)

* d_a_tag_Lv8Gate debug almost matching (.data + weak func order)

* d_a_tag_TWgate debug almost matching (weak func order)

* d_a_tag_lv6CstaSw debug almost matching (weak func order)

* d_a_tag_assistance debug almost matching (weak func order)

* d_a_tag_bottle_item debug almost matching (weak func order)

* d_a_tag_chgrestart debug almost matching (weak func order)

* d_a_tag_csw debug almost matching (weak func order)

* d_a_tag_escape debug almost matching (weak func order)

* d_a_tag_firewall debug almost matching (weak func order)

* d_a_tag_gra debug almost matching (weak func order)

* d_a_tag_guard debug almost matching (weak func order)

* d_a_tag_instruction debug almost matching (weak func order)

* d_a_tag_kago_fall debug almost matching (weak func order)

* d_a_tag_lightball debug almost matching (weak func order)

* d_a_tag_lv5soup debug almost matching (weak func order)

* d_a_tag_mmsg debug almost matching (weak func order)

* d_a_tag_mwait debug almost matching (weak func order)

* d_a_tag_myna2 debug almost matching (weak func order)

* d_a_tag_myna_light debug almost matching (weak func order)

* d_a_tag_pachi debug almost matching (weak func order)

* d_a_tag_poFire debug almost matching (weak func order)

* d_a_tag_qs debug almost matching (small mismatch in search)

* d_a_tag_ret_room debug almost matching (weak func order)

* d_a_tag_river_back debug almost matching (weak func order)

* d_a_tag_rmbit_sw debug almost matching (weak func order)

* d_a_tag_schedule debug almost matching (weak func order)

* d_a_tag_setBall debug almost matching (weak func order)

* d_a_tag_setrestart debug almost matching (weak func order)

* d_a_tag_shop_item debug almost matching (weak func order)

* d_a_tag_smk_emt debug almost matching (weak func order)

* d_a_tag_spinner debug almost matching (weak func order)

* d_a_tag_sspath debug almost matching (weak func order)

* d_a_tag_ss_drink debug almost matching (weak func order)

* d_a_tag_stream debug almost matching (weak func order)

* d_a_tag_theB_hint debug almost matching (weak func order)

* d_a_tag_watchge debug almost matching (weak func order)

* d_a_tag_waterfall debug almost matching (weak func order)

* d_a_tag_allmato debug almost matching (weak func order)

* d_a_tag_camera debug almost matching (extra weak fns)

* d_a_tag_wara_howl debug almost matching (RTTI mismatch?)

* d_a_tag_yami debug almost matching (weak func order)

* Fix Shield regressions related to d_a_tag_* debug work

include/d/actor/d_a_cstatue.h

@@ -5,22 +5,6 @@
 #include "d/d_particle_copoly.h"
 #include "f_op/f_op_actor.h"
 
-enum daCstatue_FLG0 {
-    daCstatue_FLG0_1 = 0x1,
-    daCstatue_FLG0_2 = 0x2,
-    daCstatue_FLG0_4 = 0x4,
-    daCstatue_FLG0_8 = 0x8,
-    daCstatue_FLG0_10 = 0x10,
-    daCstatue_FLG0_20 = 0x20,
-    daCstatue_FLG0_Demo = 0x40,
-    daCstatue_FLG0_80 = 0x80,
-    daCstatue_FLG0_100 = 0x100,
-    daCstatue_FLG0_200 = 0x200,
-    daCstatue_FLG0_400 = 0x400,
-    daCstatue_FLG0_800 = 0x800,
-    daCstatue_FLG0_1000 = 0x1000,
-};
-
 enum daCstatue_MoveMode {
     daCstatue_MoveMode_0,
     daCstatue_MoveMode_1,
@@ -58,6 +42,22 @@ enum daCstatueType {
  *
  */
 class daCstatue_c : public fopAc_ac_c {
+    enum daCstatue_FLG0 {
+        daCstatue_FLG0_1 = 0x1,
+        daCstatue_FLG0_2 = 0x2,
+        daCstatue_FLG0_4 = 0x4,
+        daCstatue_FLG0_8 = 0x8,
+        daCstatue_FLG0_10 = 0x10,
+        daCstatue_FLG0_20 = 0x20,
+        daCstatue_FLG0_Demo = 0x40,
+        daCstatue_FLG0_80 = 0x80,
+        daCstatue_FLG0_100 = 0x100,
+        daCstatue_FLG0_200 = 0x200,
+        daCstatue_FLG0_400 = 0x400,
+        daCstatue_FLG0_800 = 0x800,
+        daCstatue_FLG0_1000 = 0x1000,
+    };
+
 public:
     void atHitCallback(fopAc_ac_c*);
     int createHeap();

include/d/actor/d_a_npc4.h

@@ -388,7 +388,7 @@ public:
     }
     BOOL checkHide() { return mHide || (mTwilight && !dComIfGs_wolfeye_effect_check()); }
     void setIntDemander(fopAc_ac_c* i_actor) { field_0x824.entry(i_actor); }
-    void setIntFlowNodeNo(int i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
+    void setIntFlowNodeNo(s32 i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
     void setCutType(int i_cutType) { mCutType = i_cutType; }
     void onInterrupt(u8 param_0) { field_0x9ef = param_0; }
     void onHide() { mHide = true; }

include/d/actor/d_a_player.h

@@ -336,7 +336,7 @@ public:
         FLG0_FAST_SWORD_CUT = 0x80000,
         FLG0_UNK_40000 = 0x40000,
         FLG0_DK_CAUGHT2 = 0x20000,
-        FLG0_UNK_10000 = 0x10000,
+        FLG0_DEMO_STREAM_ACCEPT = 0x10000,
         FLG0_UNK_8000 = 0x8000,
         FLG0_UNK_4000 = 0x4000,
         FLG0_UNK_2000 = 0x2000,
@@ -951,6 +951,8 @@ public:
     void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_TURN); }
     void onTraningCutDown() { onNoResetFlg3(FLG3_TRANING_CUT_DOWN); }
     void onTraningShieldAttack() { onNoResetFlg3(FLG3_TRANING_SHIELD_ATTACK); }
+    void onDemoStreamAccept() { onNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
+    void offDemoStreamAccept() { offNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
 
     BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_STICK_ARROW_RESET); }
     BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_CUT_AT_FLG); }

include/d/actor/d_a_tag_CstaSw.h

@@ -14,7 +14,7 @@ public:
     int Draw();
     int Delete();
 
-    u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
+    u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
 private:
     /* 0x568 */ u8 mSwitch;
@@ -25,11 +25,11 @@ private:
 class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
 public:
     daTagCstaSw_HIO_c();
-    virtual ~daTagCstaSw_HIO_c();
+    virtual ~daTagCstaSw_HIO_c() {}
 
     void genMessage(JORMContext*);
 
-    u8 unk_0x4;
+    u8 show_range;
 };
 
 #endif /* D_A_TAG_CSTASW_H */

include/d/actor/d_a_tag_Lv6Gate.h

@@ -6,7 +6,7 @@
 
 class daTagLv6Gate_c : public fopAc_ac_c {
 public:
-    int createHeap();
+    inline int createHeap();
     int create();
     inline int execute();
     int draw();

include/d/actor/d_a_tag_Lv7Gate.h

@@ -6,23 +6,23 @@
 class daTagLv7Gate_c : public fopAc_ac_c {
 public:
     int create();
-    void create_init();
-    int execute();
+    inline void create_init();
+    inline int execute();
     void calcFly();
 
     inline ~daTagLv7Gate_c();
 
     inline int createHeap();
-    inline void setPath(u8 i_path_ID);
+    inline int setPath(int i_path_ID);
     inline void initBaseMtx();
     inline void setBaseMtx();
     inline void flyAnime();
-    inline bool checkPoint(f32 i_speed);
+    inline bool checkPoint(cXyz& i_point, f32 i_speed);
     inline bool setNextPoint();
     inline int draw();
 
-    u8 getPathID() { return fopAcM_GetParam(this) >> 0x10; }
-    u16 getFlowNodeNo() { return fopAcM_GetParam(this); }
+    u8 getPathID() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
+    s16 getFlowNodeNo() { return (u16)fopAcM_GetParam(this); }
 
     /* 0x568 */ J3DModel* mpModel;
     /* 0x56C */ mDoExt_bckAnm* mpBck;

include/d/actor/d_a_tag_Lv8Gate.h

@@ -10,8 +10,8 @@ class daTagLv8Gate_c : public fopAc_ac_c {
 public:
     inline ~daTagLv8Gate_c();
 
-    int createHeap();
-    int execute();
+    inline int createHeap();
+    inline int execute();
 
     void initBaseMtx();
     void create_init();

include/d/actor/d_a_tag_TWgate.h

@@ -8,6 +8,26 @@
 class daTagTWGate_c;
 typedef void (daTagTWGate_c::*actionFunc)();
 
+struct daTagTWGate_Attr_c {
+    /* 0x00 */ u8 show_range;
+};
+
+class daTagTWGate_Hio_c : public mDoHIO_entry_c {
+public:
+    daTagTWGate_Hio_c();
+
+    inline void ct();
+
+    inline void dt();
+
+    void default_set();
+
+    inline void genMessage(JORMContext*);
+
+    /* 0x08 */ int field_0x8;
+    /* 0x0C */ daTagTWGate_Attr_c attr;
+};
+
 class daTagTWGate_c : public fopAc_ac_c {
 public:
     enum EType {
@@ -31,6 +51,7 @@ public:
         /* 0x0A */ ACT_DEMO_HYRAL_1,
         /* 0x0B */ ACT_DEMO_HYRAL_2,
         /* 0x0C */ ACT_DEMO_HYRAL_3,
+        /* 0x0D */ MODE_MAX_e,
     };
 
     inline ~daTagTWGate_c();
@@ -62,65 +83,47 @@ public:
     void initDemoHyral3();
     void executeDemoHyral3();
     void initBaseMtx();
-    int downloadModels();
+    inline int downloadModels();
     void initTalk(int, fopAc_ac_c**);
     bool talkProc(int*, int, fopAc_ac_c**);
     static int createHeapCallBack(fopAc_ac_c*);
     int CreateHeap();
 
-    u8 getSwitch() { return fopAcM_GetParam(this) >> 8; }
+    u8 getSwitch() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
     u8 getType() { return fopAcM_GetParam(this); }
 
     inline int create();
 
-    void create_init() {
-        field_0x5e0 = 0;
-        mActionID = 0;
-        mAction = &ActionTable[mActionID][0];
-        (this->**mAction)();
+    inline void create_init();
+
+    inline void callExecute();
+
+    inline int execute();
+
+    inline int draw();
+
+#if DEBUG
+    daTagTWGate_Attr_c& attr() const {
+        return mHio.attr;
     }
+#endif
 
-    void callExecute() {
-        (this->*mAction[1])();
-        mDoAud_seStartLevel(Z2SE_OBJ_DARK_GATE, &current.pos, 0, 0);
-    }
+    inline void callInit();
 
-    int execute() {
-        callExecute();
+    inline void setAction(Mode_e i_action);
 
-        if (field_0x5e0 != 0) {
-            mpMorf->play(0, 0);
-            mpMorf->modelCalc();
-        }
-        return 1;
-    }
-
-    int draw() {
-        if (field_0x5e0 != 0) {
-            mpMorf->entryDL();
-        }
-        return 1;
-    }
-
-    void callInit() {
-        (this->*(*mAction))();
-    }
-
-    void setAction(Mode_e action) {
-        mActionID = action;
-        mAction = ActionTable[mActionID];
-        callInit();
-    }
-
-    static u8 const mAttr[1];
-    static actionFunc ActionTable[13][2];
+    static daTagTWGate_Attr_c const mAttr;
+#if DEBUG
+    static daTagTWGate_Hio_c mHio;
+#endif
+    static const actionFunc ActionTable[][2];
 
 private:
     /* 0x568 */ mDoExt_McaMorfSO* mpMorf;
     /* 0x56C */ request_of_phase_process_class mPhaseZevArc;
     /* 0x574 */ request_of_phase_process_class mPhaseMdRes;
     /* 0x57C */ request_of_phase_process_class mPhasePyRes;
-    /* 0x584 */ actionFunc* mAction;
+    /* 0x584 */ const actionFunc* mAction;
     /* 0x588 */ int mActionID;
     /* 0x58C */ dMsgFlow_c mMsgFlow;
     /* 0x5D8 */ u8 field_0x5d8[4];

include/d/actor/d_a_tag_assistance.h

@@ -5,21 +5,9 @@
 
 class daTagAssist_c : public fopAc_ac_c {
 public:
-    void create_init() {
-        attention_info.flags = 0;
-        field_0x570 = -1;
-    }
-
-    int create() {
-        fopAcM_ct(this, daTagAssist_c);
-        create_init();
-        return cPhs_COMPLEATE_e;
-    }
-
-    int execute() {
-        fopAcM_searchPlayerDistanceXZ(this);
-        return 1;
-    }
+    inline void create_init();
+    inline int create();
+    inline int execute();
 
     u8 field_0x568[8];
     s16 field_0x570;

include/d/actor/d_a_tag_attack_item.h

@@ -16,6 +16,7 @@ public:
     void action();
     BOOL checkHit();
     void createItem();
+    int draw();
     int _delete();
 
     virtual ~daTagAtkItem_c() {}

include/d/actor/d_a_tag_attention.h

@@ -4,6 +4,22 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
+class daAttp_HIO_c : public mDoHIO_entry_c {
+public:
+    daAttp_HIO_c();
+
+    void genMessage(JORMContext*);
+
+    /* 0x06 */ u8 enable_type_switching;
+    /* 0x07 */ u8 type_spec;
+    /* 0x08 */ u8 enable_distance_display;
+    /* 0x0C */ f32 dist_max;
+    /* 0x10 */ f32 dist_max_release;
+    /* 0x14 */ f32 dist_adjust;
+    /* 0x18 */ f32 upper_y;
+    /* 0x1C */ f32 lower_y;
+};
+
 class daAttp_c : public fopAc_ac_c {
 public:
     int Create();
@@ -11,28 +27,33 @@ public:
     int execute();
     int draw();
     int _delete();
+
+#if DEBUG
+    Mtx field_0x568;
+    u8 field_0x598;
+#endif
 };  // Size: 0x568
 
 namespace daAttp_prm {
-static inline u32 getArg0(daAttp_c* pActor) {
-    return fopAcM_GetParam(pActor) & 3;
+static inline u8 getArg0(daAttp_c* pActor) {
+    return fopAcM_GetParam(pActor) & 0x3;
 }
-static inline u32 getArg1(daAttp_c* pActor) {
-    return (fopAcM_GetParam(pActor) >> 2) & 3;
+static inline u8 getArg1(daAttp_c* pActor) {
+    return (fopAcM_GetParam(pActor) >> 2) & 0x3;
 }
-static inline u32 getArg2(daAttp_c* pActor) {
-    return (fopAcM_GetParam(pActor) >> 4) & 7;
+static inline u8 getArg2(daAttp_c* pActor) {
+    return (fopAcM_GetParam(pActor) >> 4) & 0x7;
 }
-static inline u32 getArg3(daAttp_c* pActor) {
-    return (fopAcM_GetParam(pActor) >> 7) & 1;
+static inline u8 getArg3(daAttp_c* pActor) {
+    return (fopAcM_GetParam(pActor) >> 7) & 0x1;
 }
-static inline u32 getArg4(daAttp_c* pActor) {
-    return (fopAcM_GetParam(pActor) >> 8) & 1;
+static inline u8 getArg4(daAttp_c* pActor) {
+    return (fopAcM_GetParam(pActor) >> 8) & 0x1;
 }
-static inline u32 getSw1(daAttp_c* pActor) {
+static inline u8 getSw1(daAttp_c* pActor) {
     return (fopAcM_GetParam(pActor) >> 0x10) & 0xff;
 }
-static inline u32 getSw2(daAttp_c* pActor) {
+static inline u8 getSw2(daAttp_c* pActor) {
     return (fopAcM_GetParam(pActor) >> 0x18);
 }
 }  // namespace daAttp_prm

include/d/actor/d_a_tag_bottle_item.h

@@ -14,18 +14,18 @@ private:
     /* 0x0576 */ u8 mBottleItemType;
 
 public:
-    s32 create();
-    s32 Delete();
-    s32 Execute();
-    s32 Draw();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
     void setTypeFromParam();
     void restart();
     void initialize();
     int checkProcess(ProcessFunc);
     int setProcess(ProcessFunc);
     void setAttnPos();
-    s32 chkEvent();
-    s32 orderEvent();
+    int chkEvent();
+    int orderEvent();
     void makeSoup();
     int wait(void*);
     virtual ~daTag_BottleItem_c();

include/d/actor/d_a_tag_camera.h

@@ -14,6 +14,7 @@ public:
     u16 getAreaType();
     u16 getAreaNoChk();
     int execute();
+    int draw();
 
     inline int create();
 

include/d/actor/d_a_tag_chgrestart.h

@@ -6,10 +6,11 @@
 class daTagChgRestart_c : public fopAc_ac_c {
 public:
     daTagChgRestart_c() {}
-    s32 Create();
-    s32 create();
-    s32 execute();
-    s32 _delete();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     /* 0x0568 */ cXyz mVertices[4];
 };
@@ -17,8 +18,12 @@ public:
 STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598);
 
 namespace daTagChgRestart_prm {
-    inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart) >> 8; }
-    inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart); }
+    inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) {
+        return (fopAcM_GetParam(p_chgRestart) >> 8) & 0xFF;
+    }
+    inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) {
+        return fopAcM_GetParam(p_chgRestart);
+    }
 };  // namespace daTagChgRestart_prm
 
 #endif /* D_A_TAG_CHGRESTART_H */

include/d/actor/d_a_tag_chkpoint.h

@@ -7,11 +7,12 @@
 class daTag_Chk_c : public fopAc_ac_c {
 public:
     int execute();
+    int draw();
 
     u16 getAreaType() { return home.angle.z & 0x100; }
-    u16 getHeight() { return fopAcM_GetParam(this) & 0xff; }
-    u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
-    u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
+    u8 getHeight() { return fopAcM_GetParam(this) & 0xff; }
+    u8 getSwBit() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
+    u8 getSwBit2() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
 
     int create() {
         fopAcM_ct(this, daTag_Chk_c);
@@ -34,8 +35,11 @@ public:
 
         attention_info.position = current.pos;
 
-        u16 height = getHeight();
-        height != 0xff ? attention_info.position.y += height * 10.0f : attention_info.position.y += scale.y * 0.5f;
+        if (getHeight() != 0xff) {
+            attention_info.position.y += getHeight() * 10.0f;
+        } else {
+            attention_info.position.y += scale.y * 0.5f;
+        }
 
         eyePos = attention_info.position;
         return cPhs_COMPLEATE_e;

include/d/actor/d_a_tag_csw.h

@@ -23,7 +23,7 @@ struct daTagCsw_c : public fopAc_ac_c, public request_of_phase_process_class {
     int getSw2() { return fopAcM_GetParamBit(this, 9, 8); }
     int getType() { return fopAcM_GetParamBit(this, 0, 1); }
     int getParam(int param_1, int param_2, int param_3) {
-        return (1 << param_3) - 1U & param_1 >> (param_2 & 0x3fU);
+        return (1 << param_3) - 1U & param_1 >> param_2;
     }
     int getArg0() { return getParam(current.angle.x, 0, 8); }
     int getItemBit() { return fopAcM_GetParamBit(this, 17, 8); }

include/d/actor/d_a_tag_escape.h

@@ -5,8 +5,7 @@
 
 class daTagEscape_c : public fopAc_ac_c {
 public:
-    daTagEscape_c() {}
-    ~daTagEscape_c() {}
+    inline int create();
     
     u8 getPathID() { return fopAcM_GetParam(this) & 0xff; }
 };

include/d/actor/d_a_tag_guard.h

@@ -9,7 +9,7 @@ public:
     int getAppearPoint(Vec*);
     void createGuard(u32);
 
-    u8 getPathID() { return fopAcM_GetParam(this) >> 8; }
+    u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
     inline int create();
     inline void create_init();
 

include/d/actor/d_a_tag_howl.h

@@ -14,7 +14,7 @@ public:
     int destroy();
     int execute();
     int draw();
-    u8 isAreaCheck();
+    bool isAreaCheck();
     int getParam();
     u8 getSwitchBit();
     virtual ~daTag_Howl_c() {}

include/d/actor/d_a_tag_lantern.h

@@ -5,7 +5,7 @@
 #include "d/d_msg_flow.h"
 
 struct daTag_Lantern_HIOParam {
-    u8 field_0x0;
+    u8 enable_debug_info;
 };
 
 class daTag_Lantern_Param_c {