wip

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -299,6 +299,8 @@ public:
     virtual ~J3DFrameCtrl() {}
 
     f32 getRate() const { return mRate; }
+    f32 getFrame() const { return mFrame; }
+    u8 getAttribute() const { return mAttribute; }
     void setAttribute(u8 attr) { mAttribute = attr; }
     void setEnd(s16 end) { mEnd = end; }
     void setRate(f32 rate) { mRate = rate; }

include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h

@@ -124,6 +124,8 @@ public:
     /* 800A4820 */ virtual ~J3DMaterialAnm();
     /* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
 
+    const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }
+
 private:
     /* 0x04 */ J3DMatColorAnm mMatColorAnm[2];
     /* 0x14 */ J3DTexMtxAnm mTexMtxAnm[8];

include/JSystem/J3DGraphAnimator/J3DModel.h

@@ -34,7 +34,7 @@ public:
     /* 803281B4 */ void calcBumpMtx();
     /* 803282B8 */ void calcBBoardMtx();
     /* 803282EC */ void prepareShapePackets();
-    Mtx* getAnmMtx(int);
+    MtxP getAnmMtx(int);
 
     /* 80327CA4 */ virtual void update();
     /* 80327E4C */ virtual void entry();
@@ -48,6 +48,7 @@ public:
     void onFlag(u32 flag) { mFlags |= flag; }
     void offFlag(u32 flag) { mFlags &= ~flag; }
     bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
+    Mtx& getBaseTRMtx() { return mBaseTransformMtx; }
 
     // is there a better way to handle inlines with same name as non-inlines?
     MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }

include/JSystem/J3DGraphBase/J3DMaterial.h

@@ -49,6 +49,7 @@ public:
     J3DColorBlock* getColorBlock() const { return mColorBlock; }
     J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
     J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
+    J3DShape* getShape() { return mShape; }
     J3DMaterialAnm* getMaterialAnm() const {
         if ((u32)mMaterialAnm < 0xC0000000) {
             return mMaterialAnm;

include/JSystem/J3DGraphBase/J3DShape.h

@@ -48,6 +48,8 @@ public:
     void setVertexDataPointer(J3DVertexData* pVtxData) { mVertexData = pVtxData; }
     void* getVcdVatCmd() const { return mVcdVatCmd; }
     void setVcdVatCmd(void* pVatCmd) { mVcdVatCmd = pVatCmd; }
+    void show() { offFlag(1); }
+    void hide() { onFlag(1); }
 
     static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
 

include/JSystem/JMath/JMath.h

@@ -10,6 +10,14 @@ inline f32 JMAFastReciprocal(f32 value) {
     return __fres(value);
 }
 
+inline f32 JMAFastSqrt(f32 input) {
+    if (input > 0.0f) {
+        f64 tmp = __frsqrte(input);
+        return tmp * input;
+    }
+    return input;
+}
+
 namespace JMath {
 
 inline f32 fastReciprocal(f32 value) {

include/SSystem/SComponent/c_cc_d.h

@@ -273,6 +273,7 @@ public:
     u8 GetWeightUc() const { return mWeight; }
     void SetWeight(u8 weight) { mWeight = weight; }
     fopAc_ac_c* GetAc() { return mActor; }
+    void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; }
 };  // Size = 0x1C
 
 STATIC_ASSERT(0x1C == sizeof(cCcD_Stts));
@@ -281,8 +282,8 @@ class cCcD_Obj;  // placeholder
 
 class cCcD_ObjCommonBase {
 protected:
-    /* 0x00 */ int mSPrm;
+    /* 0x00 */ u32 mSPrm;
-    /* 0x04 */ int mRPrm;
+    /* 0x04 */ u32 mRPrm;
     /* 0x08 */ cCcD_Obj* mHitObj;
     /* 0x0C vtable */
 public:
@@ -295,6 +296,8 @@ public:
     s32 getRPrm() const { return mRPrm; }
     cCcD_Obj* getHitObj() { return mHitObj; }
     u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
+    void OnSPrmBit(u32 flag) { mSPrm |= flag; }
+    void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
 };
 
 STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase));
@@ -311,6 +314,8 @@ public:
     bool ChkSet() const { return MskSPrm(1); }
     u8 GetAtp() const { return mAtp; }
     u32 MskType(u32 msk) const { return mType & msk; }
+    void SetType(u32 type) { mType = type; }
+    void SetAtp(int atp) { mAtp = atp; }
 
 protected:
     /* 0x10 */ int mType;
@@ -388,6 +393,11 @@ public:
     bool ChkAtType(u32 type) const { return mObjAt.MskType(type); }
     u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); }
     u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
+    void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
+    void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }
+    void SetAtType(u32 type) { mObjAt.SetType(type); }
+    void OnAtSetBit() { mObjAt.OnSPrmBit(1); }
+    void SetAtAtp(int atp) { mObjAt.SetAtp(atp); }
 
 };  // Size = 0x40
 

include/SSystem/SComponent/c_lib.h

@@ -42,6 +42,18 @@ inline u8 cLib_checkBit(u8& pVar, u8 pBit) {
     return pVar & pBit;
 }
 
+template<typename T>
+inline T cLib_minMaxLimit(T param_0, T min, T max) {
+    if (param_0 < min) {
+        return max;
+    }
+    min = param_0;
+    if (min > max) {
+        min = max;
+    }
+    return min;
+}
+
 void MtxInit(void);
 void MtxTrans(float, float, float, unsigned char);
 void MtxScale(float, float, float, unsigned char);

include/SSystem/SComponent/c_xyz.h

@@ -2,6 +2,7 @@
 #define C_XYZ_H
 
 #include "dolphin/mtx/vec.h"
+#include "msl_c/math.h"
 #include "global.h"
 
 struct cXyz : Vec {
@@ -116,6 +117,10 @@ struct cXyz : Vec {
         cXyz tmp2(other.x, 0, other.z);
         return tmp.abs2(tmp2);
     }
+    f32 absXZ(const Vec& other) const {
+        f32 abs = abs2XZ(other);
+        return sqrtf(abs);
+    }
     f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); }
 };
 

include/d/cc/d_cc_d.h

@@ -57,6 +57,7 @@ public:
     /* 80083830 */ void Move();
     /* 8008523C */ virtual ~dCcD_GStts() {}
     void ClrTg() { mTg = 0; }
+    void SetAtApid(unsigned int id) { mAtApid = id; }
 
     // private:
     /* 0x04 */ u8 mAt;
@@ -108,7 +109,11 @@ public:
     u32 GetGFlag() const { return mGFlag; }
     u32 GetRPrm() const { return mRPrm; }
     u32 MskSPrm(u32 mask) const { return mGFlag & mask; }
+    u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
     bool ChkSPrm(u32 mask) const { return MskSPrm(mask); }
+    void OnSPrm(u32 flag) { mGFlag |= flag; }
+    void OffSPrm(u32 flag) { mGFlag &= ~flag; }
+    bool ChkRPrm(u32 flag) const { return MskRPrm(flag); }
 };  // Size = 0x1C
 
 class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
@@ -117,6 +122,9 @@ public:
     /* 80083C44 */ virtual ~dCcD_GObjAt() {}
     void SetVec(cXyz& vec) { mVec = vec; }
     cXyz& GetVec() { return mVec; }
+    void SetHitMark(u8 mark) { mHitMark = mark; }
+    void SetSe(u8 se) { mSe = se; }
+    void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
 
     // private:
     /* 0x1C */ u8 mSe;
@@ -156,7 +164,7 @@ public:
     /* 800840E4 */ virtual ~dCcD_GObjInf();
     /* 80084268 */ cCcD_GObjInf* GetGObjInf();
     /* 8008426C */ virtual void ClrAtHit();
-    /* 800842C0 */ s32 ChkAtHit();
+    /* 800842C0 */ u32 ChkAtHit();
     /* 80084318 */ void ResetAtHit();
     /* 80084358 */ cCcD_Obj* GetAtHitObj();
     /* 800843A8 */ cCcD_GObjInf* GetAtHitGObj();
@@ -176,6 +184,15 @@ public:
 
     void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
     bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
+    void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
+    void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
+    void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
+    void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
+    void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
+    void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
+    void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
+    fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); }
+    bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); }
 
     static u32 const m_hitSeID[24];
 
@@ -224,6 +241,10 @@ public:
     dCcD_Tri() {}
 };
 
+enum dCcG_At_Spl {
+    /* 0x1 */ dCcG_At_Spl_UNK_01 = 1,
+};
+
 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0);
 
 #endif /* D_CC_D_CC_D_H */

include/d/com/d_com_inf_game.h

@@ -176,6 +176,15 @@ public:
     void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
     JKRArchive* getMain2DArchive() { return mMain2DArchive; }
     J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; }
+    dVibration_c& getVibration() { return mVibration; }
+    void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; }
+    BOOL checkCameraAttentionStatus(int i, u32 flag) { return mCameraInfo[i].mCameraAttentionStatus & flag; }
+    s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; }
+    void set3DStatus(u8 status, u8 direction, u8 flag) {
+        m3DStatus = status;
+        m3DDirection = direction;
+        m3DSetFlag = flag;
+    }
 
 public:
     /* 0x00000 */ dBgS mDBgS;
@@ -384,8 +393,8 @@ public:
     /* 0x04FD4 */ fopAc_ac_c* mMesgCamInfoActor8;
     /* 0x04FD8 */ fopAc_ac_c* mMesgCamInfoActor9;
     /* 0x04FDC */ fopAc_ac_c* mMesgCamInfoActor10;
-    /* 0x04FE0 */ int mPlayerStatus;
+    /* 0x04FE0 */ u32 mPlayerStatus[2];
-    /* 0x04FE4 */ u8 field_0x4fe4[0x14];
+    /* 0x04FE8 */ u8 field_0x4fe8[0x10];
     /* 0x04FF8 */ __d_timer_info_c mTimerInfo;
     /* 0x0500C */ dDlst_window_c* mCurrentWindow;
     /* 0x05010 */ void* mCurrentView;
@@ -451,6 +460,8 @@ void dComIfGs_setSelectEquipSword(u8);
 void dComIfGs_setSelectEquipShield(u8);
 void* dComIfG_getStageRes(char const*);
 void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**param_1)(void*), void*);
+void dComIfGp_addSelectItemNum(int, s16);
+BOOL dComIfGs_isOneZoneSwitch(int, int);
 
 inline void dComIfGp_setRStatus(u8 status, u8 flag) {
     g_dComIfG_gameInfo.play.setRStatus(status, flag);
@@ -1019,4 +1030,40 @@ inline dBgS& dComIfG_Bgsp() {
     return g_dComIfG_gameInfo.play.mDBgS;
 }
 
+inline s16 dComIfGs_getStartPoint() {
+    return g_dComIfG_gameInfo.info.getRestart().getStartPoint();
+}
+
+inline dVibration_c& dComIfGp_getVibration() {
+    return g_dComIfG_gameInfo.play.getVibration();
+}
+
+inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) {
+    g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag);
+}
+
+inline void dComIfGp_setPlayerStatus1(int param_0, u32 flag) {
+    g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 1, flag);
+}
+
+inline dEvent_manager_c* dComIfGp_getPEvtManager() {
+    return &g_dComIfG_gameInfo.play.getEvtManager();
+}
+
+inline void dComIfGp_evmng_cutEnd(int param_0) {
+    dComIfGp_getPEvtManager()->cutEnd(param_0);
+}
+
+inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) {
+    return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag);
+}
+
+inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) {
+    g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag);
+}
+
+inline u8 dComIfGs_getLastSceneMode() {
+    return g_dComIfG_gameInfo.info.getRestart().getLastMode();
+}
+
 #endif /* D_COM_D_COM_INF_GAME_H */

include/d/d_attention.h

@@ -148,6 +148,16 @@ public:
     /* 80070178 */ virtual void execute(u16, J3DTransformInfo*);
 };
 
+struct dist_entry {
+    f32 field_0x0;
+    f32 field_0x4;
+    f32 field_0x8;
+    f32 field_0xc;
+    f32 field_0x10;
+    f32 field_0x14;
+    u32 field_0x18;
+};  // Size: 0x1C
+
 class dAttention_c {
 public:
     dAttention_c() {}
@@ -185,14 +195,22 @@ public:
     /* 800736CC */ void LockonTargetPId(s32);
     /* 80073734 */ void ActionTarget(s32);
     /* 8007378C */ void CheckObjectTarget(s32);
-    /* 800737E4 */ void LockonTruth();
+    /* 800737E4 */ bool LockonTruth();
     /* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
 
     dAttCatch_c& getCatghTarget() { return mCatghTarget; }
+    bool chkFlag(u32 flag) { return mFlags & flag; }
+    bool Lockon() {
+        bool chk = true;
+        if (!LockonTruth() && !chkFlag(0x20000000)) {
+            chk = false;
+        }
+        return chk;
+    }
 
     static u8 loc_type_tbl[12];
     static u8 act_type_tbl[20];
-    static u8 dist_table[6552];
+    static dist_entry dist_table[234];
     static u32 loc_type_num;
     static u32 act_type_num;
     static u32 chk_type_tbl;

include/d/d_bomb.h

@@ -41,6 +41,14 @@ public:
     bool checkFlowerBombWait(fopAc_ac_c*);
     bool checkWaterBomb(fopAc_ac_c*);
     bool checkInsectBombMove(fopAc_ac_c*);
+
+    static fopAc_ac_c* createNormalBombPlayer(cXyz* p_pos) {
+        return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 8, p_pos, -1, NULL, NULL, -1, NULL, NULL);
+    }
+
+    static fopAc_ac_c* createWaterBombPlayer(cXyz* p_pos) {
+        return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 9, p_pos, -1, NULL, NULL, -1, NULL, NULL);
+    }
 };
 
 #endif /* D_D_BOMB_H */

include/d/d_jnt_col.h

@@ -20,6 +20,8 @@ public:
     /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
     /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
 
+    bool checkPassNum(int bit) { return field_0xc & (1 << bit); }
+
     /* 0x00 */ dJntColData_c* mData;
     /* 0x04 */ J3DModel* mModel;
     /* 0x08 */ int field_0x8;

include/d/event/d_event.h

@@ -80,6 +80,8 @@ public:
     void isOrderOK();
 
     u16 chkFlag2(u16 flag) { return flag & mFlag2; }
+    bool runCheck() { return field_0xe5 != 0; }
+    u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
 
 public:
     /* 0x000 */ u8 field_0x0[4];

include/d/event/d_event_manager.h

@@ -48,7 +48,7 @@ public:
     void startCheckOld(char const*);
     void endCheck(s16);
     void endCheckOld(char const*);
-    void getMyStaffId(char const*, fopAc_ac_c*, int);
+    s32 getMyStaffId(char const*, fopAc_ac_c*, int);
     void getIsAddvance(int);
     void getMyActIdx(int, char const* const*, int, int, int);
     void getMyNowCutName(int);

include/d/kankyo/d_kankyo.h

@@ -114,7 +114,6 @@ struct GB_MAPLE_COL_CHANGE {
 
 class dKy_tevstr_c {
 public:
-private:
     /* 0x000 */ J3DLightObj field_0x000;
     /* 0x074 */ J3DLightObj field_0x074[6];
     /* 0x32C */ cXyz field_0x32c;
@@ -124,10 +123,18 @@ private:
     /* 0x34C */ int field_0x34c;
     /* 0x350 */ int field_0x350;
     /* 0x354 */ int field_0x354;
-    /* 0x358 */ int field_0x358;
+    /* 0x358 */ u16 field_0x358;
-    /* 0x35C */ int field_0x35c;
+    /* 0x35A */ u16 field_0x35a;
-    /* 0x360 */ int field_0x360;
+    /* 0x35C */ u16 field_0x35c;
-    /* 0x364 */ int field_0x364;
+    /* 0x35E */ u8 field_0x35e[2];
+    /* 0x360 */ u8 field_0x360;
+    /* 0x361 */ u8 field_0x361;
+    /* 0x362 */ u8 field_0x362;
+    /* 0x363 */ u8 field_0x363;
+    /* 0x364 */ u8 field_0x364;
+    /* 0x365 */ u8 field_0x365;
+    /* 0x366 */ u8 field_0x366;
+    /* 0x367 */ u8 field_0x367;
     /* 0x368 */ f32 field_0x368;
     /* 0x36C */ f32 field_0x36c;
     /* 0x370 */ f32 field_0x370;
@@ -655,6 +662,6 @@ public:
 
 STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880);
 
-BOOL dKy_darkworld_stage_check(char const*, int);
+bool dKy_darkworld_stage_check(char const*, int);
 
 #endif /* D_KANKYO_D_KANKYO_H */

include/d/save/d_save.h

@@ -315,6 +315,10 @@ enum ItemTable {
     /* 0xFF */ NO_ITEM
 };
 
+enum EquipItem {
+    /* 0x103 */ EQUIP_SWORD = 0x103,
+};
+
 enum CollectItem {
     /* 0x0 */ COLLECT_CLOTHING,
     /* 0x1 */ COLLECT_SWORD,
@@ -915,6 +919,9 @@ class dSv_restart_c {
 public:
     void setRoom(const cXyz&, s16, s8);
 
+    s16 getStartPoint() const { return mStartPoint; }
+    u32 getLastMode() const { return mLastMode; }
+
 private:
     /* 0x00 */ s8 mRoomNo;
     /* 0x01 */ u8 field_0x01[3];
@@ -999,6 +1006,8 @@ public:
     dSv_zone_c* getZones() { return mZone; }
     dSv_player_c& getPlayer() { return mSavedata.getPlayer(); }
     dSv_event_c& getTmp() { return mTmp; }
+    dSv_restart_c& getRestart() { return mRestart; }
+    dSv_event_c& getEvent() { return mSavedata.getEvent(); }
     s64 getStartTime() { return mStartTime; }
     s64 getSaveTotalTime() { return mSaveTotalTime; }
     void initDan(s8 param_0) { mDan.init(param_0); }