mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 06:45:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from swekka/d_a_obj_rope_igaiga

Browse Source 
d_a_obj_rope_igaiga OK
This commit is contained in:
Elijah Thomas
2026-01-23 15:49:54 -05:00
committed by GitHub
parent 8d7eb2cba0 3bbca854eb
commit f2c31dd3c5
10 changed files with 931 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_base.h
+6 -2
View File
@@ -190,6 +190,10 @@ public:
return mRoomID;
}
bool isRoomID(s8 room) const {
return mRoomID == room;
}
void unsetActorProperty(u32 property) {
mActorProperties &= ~property;
}
@@ -200,8 +204,8 @@ public:
return mActorProperties & property;
}
dAcBase_c* searchNextActor(dAcBase_c* parent) {
return static_cast<dAcBase_c*>(fManager_c::searchBaseByGroupType(dAcBase_c::ACTOR, parent));
dAcBase_c *searchNextActor(dAcBase_c *parent) {
return static_cast<dAcBase_c *>(fManager_c::searchBaseByGroupType(dAcBase_c::ACTOR, parent));
}
public:
include/d/a/obj/d_a_obj_ivy_rope.h
+27 -3
View File
@@ -15,7 +15,6 @@
#include "toBeSorted/attention.h"
#include "toBeSorted/d_path.h"
class dAcOivyRope_c : public dAcObjBase_c {
public:
dAcOivyRope_c() : field_0x330(0), mStateMgr(*this, sStateID::null), mStts2(this), mEvent(*this, nullptr) {}
@@ -140,6 +139,28 @@ public:
return mSubtype == sub;
}
mVec3_c *getPnts2() {
return mPnts2;
}
mVec3_c &getTightRopeEnd() {
return mTightropeEnd;
}
mVec3_c &getTightRopeStart() {
return mTightropeStart;
}
bool getField_0x1002() {
return field_0x1002;
}
bool getField_0x1087() {
return field_0x1087;
}
static const f32 lbl_256_rodata_40;
private:
/* 0x 330 */ UNKWORD field_0x330;
/* 0x 334 */ m3d::smdl_c mMdlArr[2];
@@ -204,7 +225,9 @@ private:
/* 0x FF6 */ u8 field_0xFF6;
/* 0x FF7 */ u8 field_0xFF7;
/* 0x FF8 */ u8 field_0xFF8;
/* 0x FF9 */ u8 _FF9[0x1005 - 0xFF9];
/* 0x FF9 */ u8 _FF9[0x1002 - 0xFF9];
/* 0x1002 */ bool field_0x1002;
/* 0x1003 */ u8 _1003[0x1005 - 0x1003];
/* 0x1005 */ u8 field_0x1005;
/* 0x1006 */ u8 _1006[0x1010 - 0x1006];
/* 0x1010 */ mVec3_c field_0x1010;
@@ -235,7 +258,8 @@ private:
/* 0x106C */ f32 field_0x106C;
/* 0x1070 */ u8 _1070[0x1083 - 0x1070];
/* 0x1083 */ u8 field_0x1083;
/* 0x1084 */ u8 _1084[0x1088 - 0x1084];
/* 0x1084 */ u8 _1084[0x1087 - 0x1084];
/* 0x1087 */ bool field_0x1087;
/* 0x1088 */ dCcD_Cps mCpsArr2[16];
/* 0x2788 */ mVec3_c *mPnts1;
/* 0x278C */ mVec3_c *mPnts2;
include/d/a/obj/d_a_obj_rope_igaiga.h
+76 -1
View File
@@ -1,15 +1,41 @@
#ifndef D_A_OBJ_ROPE_IGAIGA_H
#define D_A_OBJ_ROPE_IGAIGA_H
#include "d/a/d_a_base.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s_acch.h"
#include "d/col/cc/d_cc_d.h"
#include "m/m3d/m_smdl.h"
#include "m/m_vec.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcOivyRope_c;
class dAcOropeIgaiga_c : public dAcObjBase_c {
public:
dAcOropeIgaiga_c() : mStateMgr(*this, sStateID::null) {}
virtual ~dAcOropeIgaiga_c() {}
virtual bool createHeap() override;
virtual int create() override;
virtual int doDelete() override;
virtual int actorExecute() override;
virtual int draw() override;
u32 fn_257_1CA0();
s32 fn_257_1D20();
void fn_257_1DF0();
void fn_257_1F20();
void fn_257_1FD0();
bool fn_257_1FF0(f32 *posY, bool p2);
void fn_257_20F0(f32 speed, f32 velocityY);
void fn_257_21A0();
bool fn_257_21D0();
bool fn_257_2310(s16 rotationOffset);
bool fn_257_2720();
STATE_FUNC_DECLARE(dAcOropeIgaiga_c, Init);
STATE_FUNC_DECLARE(dAcOropeIgaiga_c, Rope);
STATE_FUNC_DECLARE(dAcOropeIgaiga_c, Ground);
@@ -18,7 +44,56 @@ public:
STATE_FUNC_DECLARE(dAcOropeIgaiga_c, Water);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcOropeIgaiga_c);
/* 0x330 */ nw4r::g3d::ResFile mResFile;
/* 0x334 */ m3d ::smdl_c mMdl;
/* 0x350 */ dCcD_Sph mCollider;
/* 0x4A0 */ dBgS_AcchCir mAcchCir;
/* 0x4FC */ dBgS_ObjAcch mObjAcch;
/* 0x8AC */ STATE_MGR_DECLARE(dAcOropeIgaiga_c);
/* 0x8E8 */ dAcRef_c<dAcOivyRope_c> mIvyRopeRef;
/* 0x8F4 */ mVec3_c mPositionOffset;
/* 0x900 */ mVec3_c mPositionRelated;
/* 0x90C */ mVec3_c mLinkPosDiff;
/* 0x918 */ u16 mRopeTimer;
/* 0x91A */ u16 field_0x91A;
/* 0x91C */ s16 mRotationYOffset;
/* 0x91E */ s16 field_0x91E;
/* 0x920 */ s16 mRotationXOffset;
/* 0x922 */ u8 field_0x922;
/* 0x923 */ u8 mPnts2Idx;
/* 0x924 */ u8 mInitTimer;
/* 0x925 */ u8 mStartStateTree;
/* 0x926 */ u8 mSceneflag;
/* 0x927 */ u8 mStickTimer;
/* 0x928 */ u8 mYOffsetIdx;
/* 0x929 */ u8 mGroundTimer;
/* 0x92A */ s8 mVelocityYRelated;
/* 0x92C */ f32 mLinkSpeedRelated;
/* 0x930 */ f32 mPositionYRelated;
/* 0x934 */ f32 mRadius;
/* 0x938 */ bool field_0x938;
/* 0x939 */ bool mLinkShieldBash;
/* 0x93A */ bool mLinkHigher;
/* 0x93B */ bool field_0x93B;
/* 0x93C */ bool mSoundPlayed;
static dCcD_SrcSph sSphSrc;
static const s16 sRopeTimerMin1;
static const s16 sRopeTimerMin2;
static const f32 lbl_257_rodata_4[3];
static const s16 lbl_257_rodata_10;
static const s16 lbl_257_rodata_12;
static const s16 lbl_257_rodata_14;
static const s16 lbl_257_rodata_16;
static const s16 lbl_257_rodata_18;
static const s16 lbl_257_rodata_1A;
static const s16 lbl_257_rodata_1C;
static const s16 lbl_257_rodata_1E;
static const s16 lbl_257_rodata_20;
static const f32 lbl_257_rodata_28;
static const s16 lbl_257_rodata_90;
static const f32 sSquareXZDistanceThreshold;
static const f32 sLinkCenterTranslationYOffset[6];
};
#endif
include/d/col/c/c_cc_d.h
+2 -2
View File
@@ -878,7 +878,7 @@ public:
return mTg.ChkSet();
}
bool ChkAtEffCounter() { return mAt.ChkEffCounter(); }
bool ChkTgEffCounter() { return mTg.ChkEffCounter(); }
void ClrAtEffCounter() { mAt.ClrEffCounter(); }
@@ -905,7 +905,7 @@ public:
return mAt.MskSPrm(0x40);
}
u32 ChkCoNoCoHitInfSet() const {
return mCo.MskSPrm(0x800);
return mCo.MskSPrm(0x800);
}
// At
include/d/d_player_act.h
+8
View File
@@ -545,6 +545,10 @@ public:
return (someFlags_0x350 & mask) != 0;
}
inline bool checkFlags0x354(u32 mask) const {
return (someFlags_0x354 & mask) != 0;
}
inline void onFlags_0x358(u32 mask) {
someFlags_0x358 |= mask;
}
@@ -592,6 +596,10 @@ public:
return mCurrentAction == 0xAD || mCurrentAction == 0xAE;
}
bool checkSwordAndMoreStates(u32 mask) {
return mSwordAndMoreStates & mask;
}
void onModelUpdateFlag(u32 mask) {
mModelUpdateFlags |= mask;
}