Merge main

include/SSystem/SComponent/c_bg_s_chk.h

@@ -5,7 +5,6 @@
 #include "f_pc/f_pc_base.h"
 #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"
-#include "helpers/endian.h"
 
 struct cBgD_Vtx_t : public Vec {};
 

include/SSystem/SComponent/c_m3d_g_tri.h

@@ -2,7 +2,6 @@
 #define C_M3D_G_TRI_H_
 
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "helpers/endian.h"
 
 class cM3dGCyl;
 

include/Z2AudioCS/SpkMixingBuffer.h

@@ -13,7 +13,6 @@ public:
     bool update(s32 chan);
     void bzeroBuffer(s32 chan);
 
-private:
     /* 0x00 */ s16* mBuffer[4];
 };
 

include/Z2AudioCS/SpkSpeakerCtrl.h

@@ -41,7 +41,6 @@ public:
     static bool checkRadioSensitivity(s32 chan);
     static bool isSubmitPlayByRadioSensitivity(s32 chan);
 
-private:
 };
 
 #endif /* Z2AUDIOCS_SPKSPEAKERCTRL_H */

include/Z2AudioCS/SpkSystem.h

@@ -28,7 +28,6 @@ public:
     inline SpkData* getData(void) const { return mData; }
     inline SpkMixingBuffer* getMixingBuffer(void) const { return mMixingBuffer; }
 
-private:
     /* 0x00 */ JKRHeap* mHeap;
     /* 0x04 */ SpkData* mData;
     /* 0x08 */ SpkMixingBuffer* mMixingBuffer;

include/Z2AudioCS/SpkTable.h

@@ -31,7 +31,6 @@ public:
         return (SpkTableParams*)mEntryOffset + num;
     }
 
-    // private:
     /* 0x00 */ bool mIsInitialized;
     /* 0x04 */ s32 mNumOfSound;
     /* 0x08 */ u32 mEntryOffset;

include/Z2AudioCS/SpkWave.h

@@ -25,7 +25,6 @@ public:
     inline const void* getResource(void) const { return mWaveData; }
     inline void* getResource(void) { return mWaveData; }
 
-private:
     /* 0x00 */ void* mWaveData;
 };
 

include/Z2AudioLib/Z2Creature.h

@@ -67,7 +67,6 @@ public:
     void playVoice(int);
     virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
 
-private:
     /* 0xA0 */ s8 mCitizenID;
     /* 0xA1 */ s8 field_0xa1;
     /* 0xA2 */ bool mLinkSearch;

include/Z2AudioLib/Z2LinkMgr.h

@@ -63,7 +63,6 @@ public:
     friend class Z2LinkSoundStarter;
     friend struct Z2RideSoundStarter;
 
-private:
     /* 0x90 Z2LinkSoundStarter */
     /* 0x94 */ Z2SoundObjSimple mKantera;
     /* 0xB4 */ Vec field_0xb4;
@@ -123,7 +122,6 @@ public:
 
     virtual void deleteObject();
 
-private:
     /* 0x90 */  // Z2RideSoundStarter mSoundStarter;
     /* 0x98 */ bool mLinkRiding;
 };  // Size: 0x9C
@@ -136,7 +134,6 @@ public:
     Z2SoundHandlePool* startFireSound(u16);
     Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
 
-private:
     /* 0x20 */ f32 field_0x20;
 };
 

include/Z2AudioLib/Z2SceneMgr.h

@@ -47,7 +47,6 @@ public:
     s32 getBgmLoadStatus(u32 wave) { return getWaveLoadStatus(wave, 1); }
     u8 getDemoSeWaveNum() { return loadedDemoWave; }
 
-private:
     /* 0x00 */ JAISoundID BGM_ID;
     /* 0x04 */ int sceneNum;
     /* 0x08 */ int timer;

include/Z2AudioLib/Z2SeMgr.h

@@ -84,7 +84,6 @@ public:
     void homeMenuSeCallback(s32);    
 #endif
 
-private:
     /* 0x000 */ JAISoundHandle mSoundHandle[24];
     /* 0x060 */ JAISoundHandles mSoundHandles;
     #if VERSION >= VERSION_WII_USA_R0

include/Z2AudioLib/Z2SoundHandles.h

@@ -44,7 +44,6 @@ public:
         return (Z2SoundHandlePool*)getNth(index);
     }
 
-private:
     /* 0xC */ u8 handleNum_;
 };
 

include/Z2AudioLib/Z2SoundMgr.h

@@ -38,7 +38,6 @@ public:
     const JAISeqMgr* getSeqMgr() const { return &seqMgr_; }
     JAIStreamMgr* getStreamMgr() { return &streamMgr_; }
 
-private:
     /* 0x004 */ JAISeMgr seMgr_;
     /* 0x728 */ JAISeqMgr seqMgr_;
     /* 0x79C */ JAIStreamMgr streamMgr_;

include/Z2AudioLib/Z2SoundObjMgr.h

@@ -104,7 +104,6 @@ public:
     JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
     #endif
 
-private:
     /* 0x00 */ JSUList<Z2CreatureEnemy> field_0x0;
     #if PARTIAL_DEBUG || DEBUG
     /* 0x0C */ JSUList<Z2SoundObjBase> allList_;

include/Z2AudioLib/Z2WolfHowlMgr.h

@@ -70,7 +70,6 @@ public:
     u8 getReleaseTimer() { return mReleaseTimer; }
     u8 getCorrectCurveID() { return mCorrectCurveID; }
 
-private:
     /* 0x00 */ JAISoundHandle mWolfHowlHandle;
     /* 0x04 */ JAISoundHandle mWindStoneHandle;
     /* 0x08 */ JAISoundHandle mGuideHandle;

include/d/actor/d_a_alink.h

@@ -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;
@@ -4582,6 +4580,7 @@ public:
     bool mHsChainInterpCurrValid;
 
     bool mIsRollstab = false;
+    void* mAnmBuffers[3] = {};
 #endif
 };  // Size: 0x385C
 

include/d/actor/d_a_arrow.h

@@ -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;

include/d/actor/d_a_b_dr.h

@@ -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;

include/d/actor/d_a_b_ds.h

@@ -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;

include/d/actor/d_a_b_mgn.h

@@ -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;

include/d/actor/d_a_b_tn.h

@@ -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];

include/d/actor/d_a_b_yo.h

@@ -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;

include/d/actor/d_a_b_yo_ice.h

@@ -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;

include/d/actor/d_a_b_zant_magic.h

@@ -24,7 +24,6 @@ public:
     int _delete();
     int create();
 
-private:
     /* 0x5AC */ Mtx field_0x5ac;
     /* 0x5DC */ cXyz field_0x5dc;
     /* 0x5E8 */ f32 field_0x5e8;

include/d/actor/d_a_b_zant_mobile.h

@@ -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;

include/d/actor/d_a_bg.h

@@ -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;

include/d/actor/d_a_boomerang.h

@@ -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;

include/d/actor/d_a_canoe.h

@@ -65,7 +65,6 @@ public:
         field_0x1456 = 15;
     }
 
-private:
     /* 0x0568 */ request_of_phase_process_class mPhaseReq;
     /* 0x0570 */ J3DModel* mpModel;
     /* 0x0574 */ J3DModel* mpPaddleModel;

include/d/actor/d_a_coach_fire.h

@@ -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;

include/d/actor/d_a_cow.h

@@ -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;

include/d/actor/d_a_crod.h

@@ -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;

include/d/actor/d_a_cstaF.h

@@ -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;

include/d/actor/d_a_cstatue.h

@@ -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;

include/d/actor/d_a_demo_item.h

@@ -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;

include/d/actor/d_a_door_boss.h

@@ -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;

include/d/actor/d_a_door_bossL1.h

@@ -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;

include/d/actor/d_a_door_bossL5.h

@@ -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;

include/d/actor/d_a_door_dbdoor00.h

@@ -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;

include/d/actor/d_a_door_knob00.h

@@ -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;

include/d/actor/d_a_door_mbossL1.h

@@ -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;

include/d/actor/d_a_door_push.h

@@ -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;

include/d/actor/d_a_door_shutter.h

@@ -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;

include/d/actor/d_a_e_ai.h

@@ -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;

include/d/actor/d_a_e_bg.h

@@ -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;

include/d/actor/d_a_e_dk.h

@@ -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;

include/d/actor/d_a_e_dt.h

@@ -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;

include/d/actor/d_a_e_fb.h

@@ -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;

include/d/actor/d_a_e_fk.h

@@ -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];

include/d/actor/d_a_e_fz.h

@@ -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. */

include/d/actor/d_a_e_ge.h

@@ -61,7 +61,6 @@ public:
 
     u8 getGroupNo() { return mGroupNo; }
 
-private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
     /* 0x5B8 */ Z2CreatureEnemy mSound;

include/d/actor/d_a_e_gi.h

@@ -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;

include/d/actor/d_a_e_gm.h

@@ -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;

include/d/actor/d_a_e_hm.h

@@ -65,7 +65,6 @@ public:
     void CheckWall();
     void CreateStyle();
     int Create();
-private:
     /* 0x5AC */ u8 field_0x5ac;
     /* 0x5AD */ u8 field_0x5ad;
     /* 0x5AE */ u8 field_0x5ae;

include/d/actor/d_a_e_hz.h

@@ -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;

include/d/actor/d_a_e_kk.h

@@ -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;

include/d/actor/d_a_e_oc.h

@@ -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;

include/d/actor/d_a_e_oct_bg.h

@@ -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;

include/d/actor/d_a_e_ot.h

@@ -54,7 +54,6 @@ public:
         /* 0x4 */ ACT_DAMAGE,
     };
 
-private:
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
     /* 0x5B8 */ J3DModel* mpEggModel;

include/d/actor/d_a_e_pm.h

@@ -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;

include/d/actor/d_a_e_sb.h

@@ -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;

include/d/actor/d_a_e_sw.h

@@ -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;

include/d/actor/d_a_e_tt.h

@@ -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;

include/d/actor/d_a_e_vt.h

@@ -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;

include/d/actor/d_a_e_ww.h

@@ -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;

include/d/actor/d_a_e_ym.h

@@ -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;

include/d/actor/d_a_e_zs.h

@@ -39,7 +39,6 @@ public:
     int CreateHeap();
     int create();
 
-private:
     /* 0x5ac */ request_of_phase_process_class mPhase;
     /* 0x5b4 */ mDoExt_McaMorfSO* mpMorf;
     /* 0x5b8 */ Z2CreatureEnemy mSound;

include/d/actor/d_a_kago.h

@@ -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;

include/d/actor/d_a_mant.h

@@ -92,10 +92,7 @@ public:
     /* 0x39A4 */ cM_rnd_c mMantRng;
 #endif
 };
-#if TARGET_PC
-STATIC_ASSERT(sizeof(mant_class) == 0x39ac);
-#else
+
 STATIC_ASSERT(sizeof(mant_class) == 0x39a4);
-#endif
 
 #endif /* D_A_MANT_H */

include/d/actor/d_a_midna.h

@@ -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;

include/d/actor/d_a_movie_player.h

@@ -4,6 +4,7 @@
 #if !TARGET_PC
 #include <thp.h>
 #else
+#include <dolphin/thp.h>
 #include <atomic>
 #include <chrono>
 #endif
@@ -17,29 +18,6 @@ struct daMP_THPReadBuffer {
 };
 
 #if TARGET_PC
-// Copying here because thp.h is probably erroneous in the dolphin lib,
-// and it's kind of a problem being there (Aurora owns the headers).
-// TODO: Move this stuff in decomp?
-typedef struct THPAudioRecordHeader {
-    BE(u32) offsetNextChannel;
-    BE(u32) sampleSize;
-    BE(s16) lCoef[8][2];
-    BE(s16) rCoef[8][2];
-    BE(s16) lYn1;
-    BE(s16) lYn2;
-    BE(s16) rYn1;
-    BE(s16) rYn2;
-} THPAudioRecordHeader;
-
-typedef struct THPAudioDecodeInfo {
-    u8* encodeData;
-    u32 offsetNibbles;
-    u8 predictor;
-    u8 scale;
-    s16 yn1;
-    s16 yn2;
-} THPAudioDecodeInfo;
-
 typedef struct THPTextureSet {
 	u8* ytexture;
 	u8* utexture;
@@ -86,10 +64,6 @@ typedef struct THPHeader {
 	/* 0x2C */ BE(u32) finalFrameDataOffsets;
 } THPHeader;
 
-static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag);
-static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info);
-static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
-
 #define THP_AUDIO_BUFFER_COUNT 3
 #define THP_READ_BUFFER_COUNT  10
 #define THP_TEXTURE_SET_COUNT  3
@@ -166,7 +140,6 @@ public:
 
     static DUSK_GAME_DATA daMP_c* m_myObj;
 
-private:
     /* 0x568 */ u32 (*mpGetMovieRestFrame)(void);
     /* 0x56C */ void (*mpSetPercentMovieVol)(f32);
     /* 0x570 */ u32 (*mpTHPGetTotalFrame)(void);

include/d/actor/d_a_npc.h

@@ -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;

include/d/actor/d_a_npc2.h

@@ -15,7 +15,6 @@ public:
     fopAc_ac_c* getActor();
     virtual ~daBaseNpc_acMngr_c() {}
 
-private:
     /* 0x04 */ fpc_ProcID mActorId;
 };
 

include/d/actor/d_a_npc4.h

@@ -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

include/d/actor/d_a_npc_aru.h

@@ -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;

include/d/actor/d_a_npc_ash.h

@@ -145,7 +145,6 @@ public:
 
     static DUSK_GAME_DATA EventFn mEvtSeqList[6];
 
-private:
     /* 0xB48 */ Z2Creature mCreatureSound;
     /* 0xBD8 */ J3DModel* mModelBow;
     /* 0xBDC */ J3DModel* mModelQuiver;

include/d/actor/d_a_npc_ashB.h

@@ -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;

include/d/actor/d_a_npc_besu.h

@@ -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];

include/d/actor/d_a_npc_bou.h

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

include/d/actor/d_a_npc_bouS.h

@@ -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;

include/d/actor/d_a_npc_chat.h

@@ -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;

include/d/actor/d_a_npc_clerka.h

@@ -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;

include/d/actor/d_a_npc_clerkb.h

@@ -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;

include/d/actor/d_a_npc_clerkt.h

@@ -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;

include/d/actor/d_a_npc_coach.h

@@ -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;

include/d/actor/d_a_npc_doc.h

@@ -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;

include/d/actor/d_a_npc_doorboy.h

@@ -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;

include/d/actor/d_a_npc_fairy.h

@@ -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;

include/d/actor/d_a_npc_fairy_seirei.h

@@ -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;

include/d/actor/d_a_npc_gnd.h

@@ -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;

include/d/actor/d_a_npc_gra.h

@@ -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;

include/d/actor/d_a_npc_grc.h

@@ -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;

include/d/actor/d_a_npc_grd.h

@@ -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;

include/d/actor/d_a_npc_grm.h

@@ -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;

include/d/actor/d_a_npc_grmc.h

@@ -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;

include/d/actor/d_a_npc_gro.h

@@ -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;

include/d/actor/d_a_npc_grr.h

@@ -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;

include/d/actor/d_a_npc_grs.h

@@ -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;

include/d/actor/d_a_npc_grz.h

@@ -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;

include/d/actor/d_a_npc_guard.h

@@ -62,7 +62,6 @@ public:
 
     static DUSK_GAME_DATA actionFunc ActionTable[7][2];
 
-private:
     /* 0xAC8 */ J3DModel* mpModel;
     /* 0xACC */ J3DModel* mpModel2;
     /* 0xAD0 */ J3DAnmTransformKey* mpAnmKey;

include/d/actor/d_a_npc_gwolf.h

@@ -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;