Remove private specifiers from game code classes (#2375)

* remove private specifiers from game code * fix formatting * fix more formatting * Add some missing public modifiers --------- Co-authored-by: Luke Street <luke@street.dev>
2026-09-05 09:33:48 -04:00 · 2026-09-03 10:30:26 -05:00
parent 6a7acc8ddc
commit b748eaca1e
484 changed files with 28 additions and 550 deletions
@@ -77,7 +77,6 @@ public:
    virtual void draw();
    virtual ~daAlink_blur_c() {}

-    // private:
    /* 0x010 */ ResTIMG* m_blurTex;
    /* 0x014 */ int field_0x14;
    /* 0x018 */ u8 field_0x18[4];
@@ -113,7 +112,6 @@ public:

    void onAppearFlg() { mAppearFlg = true; }

-private:
    /* 0x04 */ s16 mHitFlg;
    /* 0x06 */ s16 mAppearFlg;
    /* 0x08 */ f32 mKeepMinY;
@@ -110,7 +110,6 @@ public:

    void setModelMatrix(MtxP mtx) { mpModel->setBaseTRMtx(mtx); }

-private:
    /* 0x568 */ J3DModel* mpModel;
    /* 0x56C */ dBgS_ArrowLinChk field_0x56c;
    /* 0x5DC */ dBgS_ObjLinChk field_0x5dc;
@@ -82,7 +82,6 @@ public:
    u8 onTarget() { return mTarget = true; }
    u8 isBack() { return arg0; }

-private:
    /* 0x05AC */ request_of_phase_process_class mPhase;
    /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
    /* 0x05B8 */ J3DModel* mpPartModel;
@@ -189,7 +189,6 @@ public:
    void onDemo() { mIsDemo = true; }
    void offDemo() { mIsDemo = false; }

-private:
    /* 0x05AC */ request_of_phase_process_class mPhase;
    /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x05B8 */ mDoExt_McaMorfSO* mpSwordMorf;
@@ -92,7 +92,6 @@ public:
    bool isDown() { return mDownFlag != 0; }
    bool isAppear() { return mAppearFlag != 0; }

-private:
    /* 0x05AC */ request_of_phase_process_class mMgnPhase;
    /* 0x05B4 */ request_of_phase_process_class mMgnePhase;
    /* 0x05BC */ mDoExt_McaMorfSO* mpMgnModelMorf;
@@ -131,7 +131,6 @@ public:
    int CreateHeap();
    int create();

-private:
    /* 0x05AC */ request_of_phase_process_class mPhaseReq1;
    /* 0x05B4 */ request_of_phase_process_class mPhaseReq2;
    /* 0x05BC */ J3DModel* mpPartModels[16];
@@ -80,7 +80,6 @@ public:
    void setDrawOff() { mIsInactive = 1; }
    bool isEnemyDemoEnd() { return (u8)mIsEnemyDemoEnd != 0; }

-private:
    /* 0x05AC */ request_of_phase_process_class mPhase1;
    /* 0x05B4 */ request_of_phase_process_class mPhase2;
    /* 0x05BC */ request_of_phase_process_class mPhase3;
@@ -51,7 +51,6 @@ public:

    void setSubNumber(int i_subNumber) { mSubNumber = i_subNumber; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ J3DModel* mpModel;
    /* 0x5B8 */ Z2Creature mCreatureSound;
@@ -24,7 +24,6 @@ public:
    int _delete();
    int create();

-private:
    /* 0x5AC */ Mtx field_0x5ac;
    /* 0x5DC */ cXyz field_0x5dc;
    /* 0x5E8 */ f32 field_0x5e8;
@@ -33,7 +33,6 @@ public:
    bool isSearchContinue() { return mSearchContinue != false; }
    void offSearchContinue() { mSearchContinue = false; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5B8 */ mDoExt_brkAnm* mpBrk;
@@ -57,7 +57,6 @@ public:
    inline int execute();
    inline int isDelete();

-private:
    /* 0x568 */ u8 field_0x568[0x570 - 0x568];
    /* 0x570 */ daBg_Part mBgParts[6];
    /* 0x5E8 */ dBgW* mpBgW;
@@ -25,7 +25,6 @@ public:
    void onReserve() { mReserve = 1; }
    void offReserve() { mReserve = 0; }

-private:
    /* 0x04 */ J2DScreen* m_cursorYellowScrn;
    /* 0x08 */ J2DPane* m_cursorYellowAllPane;
    /* 0x0C */ J2DPane* m_cursorYellow0Pane;
@@ -126,7 +125,6 @@ public:
    bool getLockCntMax() { return m_lockCnt >= BOOMERANG_LOCK_MAX; }
    void onLockDistanceCancel() { onStateFlg0(FLG0_LOCK_DIST_CANCEL); }

-private:
    /* 0x568 */ J3DModel* mp_boomModel;
    /* 0x56C */ J3DModel* mp_shippuModel;
    /* 0x570 */ J3DAnmTextureSRTKey* m_windBtk;
@@ -65,7 +65,6 @@ public:
        field_0x1456 = 15;
    }

-private:
    /* 0x0568 */ request_of_phase_process_class mPhaseReq;
    /* 0x0570 */ J3DModel* mpModel;
    /* 0x0574 */ J3DModel* mpPaddleModel;
@@ -42,7 +42,6 @@ public:
    void setNoHitTimer() { noHitTimer = 20; }
    inline int execute();

-private:
    /* 0x568 */ LIGHT_INFLUENCE mLightInfluence;
    /* 0x588 */ dCcD_Stts mStts;
    /* 0x5C4 */ dCcD_Sph mSph;
@@ -208,7 +208,6 @@ public:
    u8 getCowIn() { return mCowIn; }
    u8 getNoNearCheckTimer() { return mNoNearCheckTimer; }

-private:
    /* 0x568 */ u16 mFlags;
    /* 0x56c */ request_of_phase_process_class mPhase;
    /* 0x574 */ mDoExt_McaMorfSO* mpMorf;
@@ -48,7 +48,6 @@ public:
    static f32 getFlyInitY() { return 40.0f; }
    static f32 getFlyInitZ() { return 50.0f; }

-private:
    /* 0x568 */ J3DModel* mpBallModel;
    /* 0x56C */ mDoExt_bckAnm mBck;
    /* 0x588 */ J3DAnmTevRegKey* mpBallBrk;
@@ -40,7 +40,6 @@ public:
    };
    static DUSK_GAME_DATA const BckTbl m_bckIdxTable[];

-private:
    /* 0x5A0 */ const char* m_arcName;
    /* 0x5A4 */ request_of_phase_process_class m_phase;
    /* 0x5AC */ J3DModel* mp_model;
@@ -101,7 +101,6 @@ public:

    static DUSK_GAME_DATA u16 const m_bckIdxTable[daCstatueType_N][7];

-private:
    /* 0x568 */ const char* mResName;
    /* 0x56C */ request_of_phase_process_class mPhaseReq;
    /* 0x574 */ J3DModel* mModel;
@@ -55,7 +55,6 @@ public:
    void setOffsetPos(cXyz i_pos) { mOffsetPos = i_pos; }
    void setMaxScale(f32 i_scale) { mMaxScale = i_scale; }

-private:
    /* 0x92C */ cXyz mOffsetPos;
    /* 0x938 */ f32 mMaxScale;
    /* 0x93C */ u8 field_0x93c;
@@ -50,7 +50,6 @@ public:

    void setAction(u8 i_action) { mAction = i_action; }

-private:
    /* 0x568 */ request_of_phase_process_class mPhaseReq;
    /* 0x570 */ J3DModel* mpDoorModel;
    /* 0x574 */ J3DModel* mpLockModel;
@@ -76,7 +76,6 @@ public:

    void setAction(u8 action) { mAction = action; }

-private:
    /* 0x568 */ request_of_phase_process_class mPhase1;
    /* 0x570 */ request_of_phase_process_class mPhase2;
    /* 0x578 */ request_of_phase_process_class mPhase3;
@@ -72,7 +72,6 @@ public:
        return 1;
    }

-private:
    /* 0x568 */ request_of_phase_process_class mPhase1;
    /* 0x570 */ request_of_phase_process_class mPhase2;
    /* 0x578 */ request_of_phase_process_class mPhase3;
@@ -41,7 +41,6 @@ public:

    void setAction(u8 i_action) { mAction = i_action; }

-// private:
    /* 0x568 */ request_of_phase_process_class mPhaseReq;
    /* 0x570 */ request_of_phase_process_class mPhaseReq2;
    /* 0x578 */ J3DModel* mpModel;
@@ -73,7 +73,6 @@ public:
    void onFlag(u16 flag) { field_0x60c |= flag; }
    int checkFlag(u16 flag) { return field_0x60c & flag; }

-private:
    /* 0x568 */ request_of_phase_process_class mPhase1;
    /* 0x570 */ request_of_phase_process_class mPhase2;
    /* 0x578 */ J3DModel* mModel1;
@@ -121,7 +121,6 @@ public:
        mAction = action;
    }

-private:
    /* 0x568 */ request_of_phase_process_class mPhase1;
    /* 0x570 */ request_of_phase_process_class mPhase2;
    /* 0x578 */ request_of_phase_process_class mPhase3;
@@ -49,7 +49,6 @@ public:
    void setAction(u8 i_action) { mAction = i_action; }
    u32 getSceneNo() { return fopAcM_GetParamBit(this, 4, 6); }

-// private:
    /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
    /* 0x5A8 */ J3DModel* mpModel[2];
    /* 0x5B0 */ dBgW* mpDoorBgW;
@@ -123,7 +123,6 @@ public:
    bool checkFlag(u16 flag) { return field_0x68e & flag; }
    void setAction(u8 action) { mAction = action; }

-// private:
    /* 0x56C */ request_of_phase_process_class mPhase1;
    /* 0x574 */ request_of_phase_process_class mPhase2;
    /* 0x57C */ J3DModel* mModel1;
@@ -48,7 +48,6 @@ public:
    int CreateHeap();
    int Create();

-private:
    /* 0x5AC */ JPABaseEmitter* mpEmitter;
    /* 0x5B0 */ request_of_phase_process_class m_phase;
    /* 0x5B8 */ u8 field_0x5b8;
@@ -45,7 +45,6 @@ public:
    void setBgId(unsigned int i_bgId) { mBgId = i_bgId; }
    bool isBomb() { return mIsBomb; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
    /* 0x5B8 */ mDoExt_brkAnm* mpBrkAnm;
@@ -45,7 +45,6 @@ public:
    int create();
    daE_DK_c();

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
    /* 0x5B8 */ mDoExt_McaMorfSO* mpCoreMorfSO;
@@ -83,7 +83,6 @@ public:
    MtxP getBackMtx() { return mpMorf->getModel()->getAnmMtx(1); }
    fpc_ProcID getDemoId() { return mDemoID; }

-private:
    /* 0x05AC */ request_of_phase_process_class mPhase[3];
    /* 0x05C4 */ J3DModel* mpChestModel;
    /* 0x05C8 */ J3DModel* mpSpitModel;
@@ -40,7 +40,6 @@ public:
    cPhs_Step create();
    daE_FB_c();

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel;
@@ -52,7 +52,6 @@ public:
    void CreateChk();
    int Create();

-private:
    /* 0x5AC */ u8 field_0x5AC[0x5B1 - 0x5AC];
    /* 0x5B1 */ u8 mUpDownMode;
    /* 0x5B2 */ u8 field_0x5B2[0x5B6 - 0x5B2];
@@ -63,7 +63,6 @@ public:
    s32 CreateHeap();
    s32 create();

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;   /**< Phase request used when creating the actor. */
    /* 0x5B4 */ J3DModel* mpModel;                          /**< Pointer to the Mini Freezard's model. */
    /* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel;      /**< Invisible model used for the Mini Freezard. */
@@ -61,7 +61,6 @@ public:

    u8 getGroupNo() { return mGroupNo; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
    /* 0x5B8 */ Z2CreatureEnemy mSound;
@@ -47,7 +47,6 @@ public:
    bool isBattleOn() { return mIsBattleOn; }
    bool isAttackStart() { return mIsAttackStart; }
    
-private:
    /* 0x05AC */ request_of_phase_process_class mPhase;
    /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
    /* 0x05B8 */ J3DModel* mpSwordModel;
@@ -62,7 +62,6 @@ public:
    BOOL checkAction(actionFunc action) { return mAction == action; }
    BOOL checkOldAction(actionFunc action) { return mOldAction == action; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ dBgS_AcchCir mAcchCir;
    /* 0x5F4 */ dBgS_ObjAcch mObjAcch;
@@ -65,7 +65,6 @@ public:
    void CheckWall();
    void CreateStyle();
    int Create();
-private:
    /* 0x5AC */ u8 field_0x5ac;
    /* 0x5AD */ u8 field_0x5ad;
    /* 0x5AE */ u8 field_0x5ae;
@@ -64,7 +64,6 @@ public:
    void setInitPos();
    int create();

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ request_of_phase_process_class mPhaseReq2;
    /* 0x5BC */ mDoExt_McaMorfSO* mpMorfSO;
@@ -49,7 +49,6 @@ public:
    int CreateHeap();
    int create();

-private:
    /* 0x05AC */ request_of_phase_process_class mPhaseReq;
    /* 0x05B4 */ mDoExt_McaMorfSO* mpMorfSO;
    /* 0x05B8 */ mDoExt_McaMorfSO* mpWeaponMorfSO;
@@ -87,7 +87,6 @@ public:
    daE_OC_c* getTalkOc() { return mpTalk; }
    J3DModel* getOcModel() { return mpMorf->getModel(); }

-private:
    /* 0x5a0 */ request_of_phase_process_class mPhaseReqs[2];
    /* 0x5bc */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5c0 */ J3DModel* mpModel;
@@ -54,7 +54,6 @@ public:
    u32 checkAction(actionFunc func) { return field_0xb58 == func; }
    bool checkNormalAttk() { return checkAction(&daE_OctBg_c::normal_attack); }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* field_0x5b4;
    /* 0x5B8 */ mDoExt_brkAnm* field_0x5b8;
@@ -54,7 +54,6 @@ public:
        /* 0x4 */ ACT_DAMAGE,
    };

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5B8 */ J3DModel* mpEggModel;
@@ -84,7 +84,6 @@ public:
    u8 SwitchChk() { return mStage; }
    u8 DoorChk() { return mDoorAction; }

-private:
    /* 0x5AC */ fpc_ProcID mPuppetID[4];
    /* 0x5BC */ u8 field_0x5bc[0x5DC - 0x5BC];
    /* 0x5DC */ u8 mDoorAction;
@@ -57,7 +57,6 @@ public:
    int Delete();
    void setBaseMtx();
    cPhs_Step Create();
-private:
    /* 0x5AC */ int field_0x5ac;
    /* 0x5B0 */ int field_0x5b0;
    /* 0x5B4 */ int field_0x5b4;
@@ -78,7 +77,6 @@ private:
 public:
    /* 0x5EC */ cXyz* field_0x5ec;
    /* 0x5F0 */ f32 field_0x5f0;
-private:
    /* 0x5F4 */ cXyz field_0x5f4;
    /* 0x600 */ s16 field_0x600;
    /* 0x602 */ u8 field_0x602;
@@ -82,7 +82,6 @@ public:
    bool d_checkOldAction(void (daE_SW_c::*action)()) {
        return field_0xb0c == action;
    }
-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
    /* 0x5B8 */ Z2CreatureEnemy mSound;
@@ -47,7 +47,6 @@ public:
    int CreateHeap();
    int create();

-private:
    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
    /* 0x5B4 */ request_of_phase_process_class mPhaseReq2;
    /* 0x5BC */ mDoExt_McaMorfSO* mpMorfSO;
@@ -146,7 +146,6 @@ public:
    int create();
    daE_VA_c();

-private:
    /* 0x005AC */ request_of_phase_process_class mPhase;
    /* 0x005B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x005B8 */ mDoExt_McaMorfSO* mpEndEfMorf;
@@ -59,7 +59,6 @@ public:
    void setAttack() { mActionMode = 10; }
    f32 const getSpeedF() { return speedF; }

-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
    /* 0x5B8 */ Z2CreatureEnemy mSound;
@@ -122,7 +122,6 @@ public:
    u8 getSwitchBit() { return mSwitchBit; }
    u8 isHide() { return mIsHide; }
    
-private:
    /* 0x5AC */ request_of_phase_process_class mPhase;
    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5B8 */ mDoExt_brkAnm* mpBrk;
@@ -39,7 +39,6 @@ public:
    int CreateHeap();
    int create();

-private:
    /* 0x5ac */ request_of_phase_process_class mPhase;
    /* 0x5b4 */ mDoExt_McaMorfSO* mpMorf;
    /* 0x5b8 */ Z2CreatureEnemy mSound;
@@ -140,7 +140,6 @@ public:
    void setEatYm() { field_0x6d8 |= (u8) 4; }
    MtxP getMouthMtx() { return mAnm_p->getModel()->getAnmMtx(7); }

-private:
    /* 0x568 */ request_of_phase_process_class mPhase;
    /* 0x570 */ mDoExt_McaMorfSO* mAnm_p;
    /* 0x574 */ Z2CreatureEnemy mSound;
@@ -423,7 +423,6 @@ public:
    static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21];
    static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53];

-// private:
    /* 0x568 */ request_of_phase_process_class mPhase;
    /* 0x570 */ J3DModel* mpModel;
    /* 0x574 */ J3DModel* mpShadowModel;
@@ -166,7 +166,6 @@ public:

    static DUSK_GAME_DATA daMP_c* m_myObj;

-private:
    /* 0x568 */ u32 (*mpGetMovieRestFrame)(void);
    /* 0x56C */ void (*mpSetPercentMovieVol)(f32);
    /* 0x570 */ u32 (*mpTHPGetTotalFrame)(void);
@@ -29,7 +29,7 @@ struct daNpc_GetParam3 {  // name unknown
 };

 class daNpcT_ActorMngr_c {
-private:
+public:
    /* 0x0 */ fpc_ProcID mActorID;

 public:
@@ -44,7 +44,7 @@ public:
 };

 class daNpcT_MatAnm_c : public J3DMaterialAnm {
-private:
+public:
    /* 0x0F4 */ mutable f32 field_0xF4;
    /* 0x0F8 */ mutable f32 field_0xF8;
    /* 0x0FC */ f32 mNowOffsetX;
@@ -102,7 +102,6 @@ public:
    }
    void setOffset(int i_offset) { mOffset = i_offset; }

-private:
    /* 0x00 */ sequenceStepData_c const* mpSeqData;
    /* 0x04 */ int mStepNum;
    /* 0x08 */ int mNo;
@@ -217,7 +216,7 @@ public:
 };

 class daNpcT_JntAnm_c {
-private:
+public:
    /* 0x000 */ daNpcT_ActorMngr_c mActrMngr;
    /* 0x008 */ cXyz mPos;
    /* 0x014 */ cXyz mAttnPos;
@@ -15,7 +15,6 @@ public:
    fopAc_ac_c* getActor();
    virtual ~daBaseNpc_acMngr_c() {}

-private:
    /* 0x04 */ fpc_ProcID mActorId;
 };

@@ -12,7 +12,7 @@
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"

 class daNpcF_ActorMngr_c {
-private:
+public:
    /* 0x0 */ fpc_ProcID mActorID;

 public:
@@ -52,7 +52,7 @@ BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_i
 BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p);

 class daNpcF_SPCurve_c {
-private:
+public:
    /* 0x00 */ u16 mNurbs;
    /* 0x02 */ u16 field_0x02;
    /* 0x04 */ u8 mIsReversed;
@@ -119,7 +119,7 @@ public:
 };  // Size: 0x630

 class daNpcF_MatAnm_c : public J3DMaterialAnm {
-private:
+public:
    /* 0x0F4 */ mutable f32 field_0xF4;
    /* 0x0F8 */ mutable f32 field_0xF8;
    /* 0x0FC */ f32 mNowOffsetX;
@@ -138,7 +138,7 @@ public:
 };

 class daNpcF_Lookat_c {
-private:
+public:
    /* 0x00 */ cXyz mJointPos[4];
    /* 0x30 */ cXyz* mAttnPos_p;
    /* 0x34 */ csXyz mAngularMoveDis[4];
@@ -406,7 +406,6 @@ public:
 STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);

 class daNpcF_MoveBgActor_c : public daNpcF_c {
-private:
 public:
    // these functions are inferred based on daBaseNpc_moveBgActor_c -
    // defining them in this order fixes weak function order for this class in d_a_npc
@@ -174,7 +174,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];

-private:
    /* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCyl;
    /* 0xF80 */ u8 mType;
@@ -145,7 +145,6 @@ public:

    static DUSK_GAME_DATA EventFn mEvtSeqList[6];

-private:
    /* 0xB48 */ Z2Creature mCreatureSound;
    /* 0xBD8 */ J3DModel* mModelBow;
    /* 0xBDC */ J3DModel* mModelQuiver;
@@ -137,7 +137,6 @@ public:

    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[2];

-private:
    /* 0xB48 */ Z2Creature mCreatureSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ J3DModel* mpModel;
@@ -143,7 +143,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[15];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[15];

-private:
    /* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;
    /* 0x0E44 */ NPC_BESU_HIO_CLASS* mpHIO;
    /* 0x0E48 */ J3DModel* mpClothModel[1];
@@ -168,7 +168,6 @@ public:
        return 0;
    }

-private:
    /* 0xE40 */ NPC_BOU_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCyl1;
    /* 0xF80 */ u8 mType;
@@ -130,7 +130,6 @@ public:

    static DUSK_GAME_DATA eventFunc mEvtSeqList[4];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -104,7 +104,6 @@ public:

    static DUSK_GAME_DATA eventFunc DUSK_CONST mEvtSeqList[1];

-private:
    /* 0xB48 */ Z2CreatureCitizen mSound;
    /* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec];
    /* 0xBF0 */ J3DModel* mObjModel;
@@ -127,7 +127,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;
    /* 0x0F80 */ dCcD_Cyl mCyl;
    /* 0x10BC */ u8 mType;
@@ -140,7 +140,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;
    /* 0x0F7C */ NPC_CLERKB_HIO_CLASS* mpHIO;
    /* 0x0F98 */ dCcD_Cyl mCyl;
@@ -128,7 +128,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;
    /* 0x0F80 */ dCcD_Cyl mCyl;
    /* 0x10BC */ u8 mType;
@@ -297,7 +297,6 @@ public:

    static DUSK_GAME_DATA daNpcCoach_Attr_c const M_attr;
    static u16 const ParticleName[10];
-private:
    /* 0x0568 */ daNpcChHorse_c mChHorse;
    /* 0x0E7C */ daNpcChHarness_c mChHarness;
    /* 0x15D0 */ daNpcChCoach_c mChCoach;
@@ -136,7 +136,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCyl;
    /* 0xF80 */ u8 mType;
@@ -80,7 +80,6 @@ public:

    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];

-private:
    /* 0xB48 */ Z2CreatureCitizen mSound;
    /* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec];
    /* 0xBF0 */ daNpcF_Lookat_c mLookat;
@@ -296,7 +296,6 @@ public:

    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[18];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[18];
-// private:
    /* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
    /* 0x0E44 */ dCcD_Cyl mCyl;
    /* 0x0F80 */ u8 mType;
@@ -93,7 +93,6 @@ public:
    static DUSK_GAME_DATA DUSK_CONST char* mCutNameList[1];
    static DUSK_GAME_DATA DUSK_CONST cutFunc mCutList[1];

-private:
    /* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;
    /* 0xE44 */ u8 mType;
    /* 0xE48 */ dCcD_Cyl mCyl;
@@ -99,7 +99,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCyl1;
    /* 0xF80 */ u8 mType;
@@ -142,7 +142,6 @@ public:
    typedef BOOL (daNpc_grA_c::*cut_type)(int);
    static DUSK_GAME_DATA cut_type DUSK_CONST mEvtCutList[];

-private:
    typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*);
    
    /* 0x0B48 */ Z2Creature mCreature;
@@ -92,7 +92,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[1];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ int field_0xbd8;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -84,7 +84,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -134,7 +134,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2];

-private:
    /* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;
    /* 0x0F80 */ dCcD_Cyl mCyl;
    /* 0x10BC */ u8 mType;
@@ -127,7 +127,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList;
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;
    /* 0x0F80 */ dCcD_Cyl mCyl;
    /* 0x10BC */ u8 mType;
@@ -88,7 +88,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[3];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ J3DModel* mpOtherModel[1];
    /* 0xBDC */ daNpcF_MatAnm_c* mpMatAnm;
@@ -86,7 +86,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[1];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -87,7 +87,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ J3DModel* mpModel;
@@ -119,7 +119,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[7];

-private:
    /* 0x0B48 */ Z2Creature mSound;
    /* 0x0BD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0x0BDC */ daNpcF_Lookat_c mLookat;
@@ -62,7 +62,6 @@ public:

    static DUSK_GAME_DATA actionFunc ActionTable[7][2];

-private:
    /* 0xAC8 */ J3DModel* mpModel;
    /* 0xACC */ J3DModel* mpModel2;
    /* 0xAD0 */ J3DAnmTransformKey* mpAnmKey;
@@ -107,7 +107,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[5];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -221,7 +221,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[6];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[6];
    static DUSK_GAME_DATA dCcD_SrcSph DUSK_CONST mStoneCcDSph;
-private:
    /* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
    /* 0x0E44 */ J3DModel* mModel1;
    /* 0x0E48 */ J3DModel* mModel2;
@@ -12,7 +12,7 @@
 *
 */
 class d_a_npc_henna0 : public fopAc_ac_c {
-    private:
+    public:
        /* 0x568 */ u8 field_0x568[0x828 - 0x568];
 };

@@ -128,7 +128,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[];

-private:
    /* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCyl;
    /* 0xF80 */ u8 mType;
@@ -123,7 +123,6 @@ public:

    static DUSK_GAME_DATA EventFn mEvtSeqList[4];

-private:
    /* 0xB48 */ Z2Creature mCreatureSound;
    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
    /* 0xBDC */ daNpcF_Lookat_c mLookat;
@@ -121,7 +121,6 @@ public:

    static DUSK_GAME_DATA eventFunc mEvtSeqList[1];

-private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ J3DModel* mpUmbrellaModel;
    /* 0xBDC */ J3DModel* mpKagoModel;
@@ -225,7 +225,6 @@ public:

    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
-private:
    /* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO;
    /* 0x0E44 */ dCcD_Cyl mCyl1;
    /* 0x0F80 */ u8 mType;
@@ -116,7 +116,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
    static DUSK_GAME_DATA int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int);

-private:
    /* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO;
    /* 0x0E44 */ Z2SoundObjSimple mSound;
    /* 0x0E64 */ dCcD_Cyl mCcCyl;
@@ -206,7 +206,6 @@ public:
    static DUSK_GAME_DATA f32 mTargetTagDist;
    static DUSK_GAME_DATA s16 mWolfAngle;

-private:
    /* 0x0B48 */ Z2CreatureCitizen mSound;
    /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec];
    /* 0x0BF0 */ daNpcF_Lookat_c mLookat;
@@ -125,7 +125,6 @@ public:
    static DUSK_GAME_DATA f32 mTargetTagDist;
    static DUSK_GAME_DATA s16 mWolfAngle;

-private:
    /* 0x0B48 */ Z2CreatureCitizen mSound;
    /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec];
    /* 0x0BF0 */ daNpcF_Lookat_c mLookat;
@@ -126,7 +126,6 @@ public:
    static DUSK_GAME_DATA f32 mTargetTagDist;
    static DUSK_GAME_DATA s16 mWolfAngle;

-private:
    /* 0x0B48 */ Z2CreatureCitizen mSound;
    /* 0x0BEC */ u8 field_0xbec[0xbf0 - 0xbec];
    /* 0x0BF0 */ daNpcF_Lookat_c mLookat;
@@ -12,7 +12,7 @@
 *
 */
 class daNpcKdk_c : public fopAc_ac_c {
-private:
+public:
    /* 0x568 */ u8 field_0x568[0xFA0 - 0x568];
 };

@@ -121,7 +121,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[3];
    static DUSK_GAME_DATA int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int);

-private:
    /* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl mCcCyl;
    /* 0xF80 */ u8 mType;
@@ -421,7 +421,6 @@ public:
    static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50];
    static DUSK_GAME_DATA int mFindCount;

-private:
    /* 0x0E44 */ J3DModel* mpPodModel;
    /* 0x0E48 */ mDoExt_invisibleModel mInvisModel;
    /* 0x0E50 */ dKy_tevstr_c mTevStr;
@@ -83,7 +83,6 @@ public:
    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];

-private:
    /* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO;
    /* 0xE44 */ u8 mType;
    /* 0xE48 */ actionFunc mNextAction;
@@ -161,7 +161,6 @@ public:
        return 0;
    }

-private:
    /* 0x0E40 */ NPC_KOLIN_HIO_CLASS* mpHIO;
    /* 0x0E44 */ J3DModel* mpClothModel;
    /* 0x0E48 */ dCcD_Cyl field_0xe48;
@@ -166,7 +166,6 @@ public:

    u32 getModelType() { return fopAcM_GetParam(this) >> 28; }

-private:
    /* 0xE40 */ NPC_KOLINB_HIO_CLASS* mpHIO;
    /* 0xE44 */ dCcD_Cyl field_0xe44;
    /* 0xF80 */ Mtx mMtx;
--- a/Show More
+++ b/Show More