mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-02 17:53:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tubo! (d_a_obj_tubo) (#95)

Browse Source 
* begin work

* fixup modifications to d_a_base header

* progress

* update from main again (forgor to fetch)

* progress

* Basically done

* clean up some inlines

* some at/tg hit typing and tubo naming

* more naming
This commit is contained in:
Elijah Thomas
2024-11-12 22:30:01 -05:00
committed by GitHub
parent 9525f8e9e5
commit 2ecf6509dd
43 changed files with 1335 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/obj/d_a_obj_base.h
+56 -7
View File
@@ -1,6 +1,7 @@
#ifndef D_A_OBJ_BASE_H
#define D_A_OBJ_BASE_H
#include "c/c_math.h"
#include "d/a/d_a_base.h"
#include "d/col/c/c_cc_d.h"
#include "d/col/c/c_m3d_g_aab.h"
@@ -12,6 +13,9 @@
#include "m/m_vec.h"
#include "m/types_m.h"
class dAcObjBase_c;
class dBgS_Acch;
// Size: 0xA8
struct ActorCarryStruct {
/* 0x00 */ fLiNdBa_c actorLink;
@@ -24,14 +28,29 @@ struct ActorCarryStruct {
/* 0x28 */ mMtx_c carryTransMtx;
/* 0x58 */ mMtx_c field_0x58;
/* 0x88 */ s32 isCarried;
/* 0x8C */ u8 field_0x8C[0x10]; // mQuat_c
/* 0x9C */ void *dtor; // ???
/* 0x8C */ f32 field_0x8C;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ void *dtor; // ???
/* 0xA0 */ u32 field_0xA0;
/* 0xA4 */ u32 field_0xA4;
void set(u32 flags, f32 x, f32 y, f32 z, void *unk);
// not real name, but sure
void bushTpFunc(dBgS_Acch &);
void fn_80050EA0(dAcObjBase_c *);
void fn_800511E0(dAcObjBase_c *);
bool testCarryFlag(u32 flag) {
return (carryFlags & flag) != 0;
}
bool checkCarryType(int type) const {
return (isCarried == 1 && carryType == type);
}
};
// Ghidra has it as `unk_ActorObjectBase`
@@ -48,7 +67,7 @@ struct LightingInfo {
class dAcObjBase_c : public dAcBase_c {
public:
/* 0x0FC */ f32 yoffset;
/* 0x100 */ char _0[4];
/* 0x100 */ f32 field_0x100;
/* 0x104 */ f32 unkfloat;
/* 0x108 */ char _1[12];
/* 0x114 */ u16 targetFiTextId;
@@ -66,11 +85,9 @@ public:
/* 0x1A4 */ f32 mCullingDistance;
/* 0x1A8 */ f32 field_0x1A8;
/* 0x1AC */ u32 mObjectActorFlags;
/* 0x1B0 */ u8 unk_0x1B0[0x1C0 - 0x1B0];
/* 0x1B0 */ f32 mField_0x1B0;
/* 0x1B4 */ mVec3_c mField_0x1B4;
/* 0x1C0 */ cCcD_Stts mStts;
/* 0x1FC */ mVec3_c mStartingPos;
/* 0x208 */ mAng3_c mStartingRot;
/* 0x210 */ ActorCarryStruct mActorCarryInfo;
@@ -101,6 +118,20 @@ public:
return fabsf(forwardSpeed) <= speed;
}
bool checkYOffsetField_0x100() const {
return yoffset <= field_0x100;
}
void clearObjectProperty(u32 property) {
mObjectActorFlags &= ~property;
}
void setObjectProperty(u32 property) {
mObjectActorFlags |= property;
}
bool checkObjectProperty(u32 property) const {
return mObjectActorFlags & property;
}
// could be their own thing?
/* 8002de40 */ static void *getOarcFile(const char *oarcName, const char *fileName);
/* 8002de60 */ static void *getOarcSubEntry(const char *oarcName, const char *fileName);
@@ -192,4 +223,22 @@ public:
} \
} while (0)
class dAcObjRef_unk {
public:
dAcObjRef_unk(dAcObjBase_c *ref) : mObj(nullptr), refOwner(ref) {}
~dAcObjRef_unk() {
refOwner = nullptr;
}
bool fn_80051780(const cCcD_Obj &);
void fn_800051630();
void modifyMtx();
/* 0x00 */ dAcRef_c<dAcObjBase_c> mObj;
/* 0x0C */ u8 _0C[4];
/* 0x10 */ dAcObjBase_c *refOwner;
/* 0x14 */ u8 _14[0x2C - 0x14];
};
#endif
include/d/a/obj/d_a_obj_bomb.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
/* vt 0x44 */ virtual bool createHeap() override;
/* vt 0x54 */ virtual int actorExecute() override;
/* vt 0x5C */ virtual void unkVirtFunc_0x5C() override;
/* vt 0x68 */ virtual void *getCurrentEventActor() override;
/* vt 0x68 */ virtual void registerInEvent() override;
/* vt 0x6C */ virtual void unkVirtFunc_0x6C() override;
STATE_FUNC_DECLARE(dAcBomb_c, Wait);
include/d/a/obj/d_a_obj_log.h
+7
View File
@@ -16,7 +16,14 @@ public:
STATE_FUNC_DECLARE(dAcOlog_c, Fall);
STATE_FUNC_DECLARE(dAcOlog_c, Shake);
u8 getField_0xE4E() const {
return mField_0xE4E;
}
private:
// TODO: Fixup stuff
/* 0x330 */ u8 _330[0xE4E - 0x330];
/* 0xE4E */ u8 mField_0xE4E;
/* 0x??? */ STATE_MGR_DECLARE(dAcOlog_c);
};
include/d/a/obj/d_a_obj_tubo.h
+116 -3
View File
@@ -1,15 +1,80 @@
#ifndef D_A_OBJ_TUBO_H
#define D_A_OBJ_TUBO_H
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/npc/d_a_npc_ce_friend.h"
#include "d/a/npc/d_a_npc_ce_lady.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 "d/d_shadow.h"
#include "d/flag/sceneflag_manager.h"
#include "m/m3d/m_smdl.h"
#include "m/m_quat.h"
#include "m/m_vec.h"
#include "nw4r/g3d/g3d_resfile.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
#include "toBeSorted/effects_struct.h"
class dAcOtubo_c : public dAcObjBase_c {
public:
dAcOtubo_c() : mStateMgr(*this, sStateID::null) {}
dAcOtubo_c() : mStateMgr(*this, sStateID::null), mField_0x8F0(this) {}
virtual ~dAcOtubo_c() {}
virtual int doDelete() override;
virtual int draw() override;
virtual bool createHeap() override;
virtual int actorCreate() override;
virtual int actorPostCreate() override;
virtual int actorExecute() override;
virtual void registerInEvent() override;
bool checkCarryType() const;
void destroy();
void calcRoll();
void adjustRoll();
void attemptDestroy();
void fn_272_2670();
mVec3_c getCenter() const;
void attemptDestroyOnWall(u32 *, const u8 *);
void fn_272_2E60(const mVec3_c &);
void fn_272_3020();
void addPickupTarget();
void adjustAngle();
void adjustSpeed();
bool checkSlope();
bool fn_272_3660();
bool checkInvalidGround();
bool checkOnLava();
bool checkSubmerged();
bool fn_272_38A0();
bool fn_272_38C0();
bool checkRollHitMaybe();
void playRollSound();
bool checkOnLog_0xE4E() const;
u8 getSubtype() const {
return params & 0xF; // 0 -> Tubo00, Else -> Tubo01
}
int getParams_0x3000() const {
return params >> 12 & 0x3;
}
u8 getParams_0xC000() const {
return params >> 14 & 0x3;
}
u8 getSceneflag() const {
return params >> 4 & 0xFF;
}
bool checkSceneflag() {
return SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
}
STATE_FUNC_DECLARE(dAcOtubo_c, Wait);
STATE_FUNC_DECLARE(dAcOtubo_c, Grab);
STATE_FUNC_DECLARE(dAcOtubo_c, Put);
@@ -17,7 +82,55 @@ public:
STATE_FUNC_DECLARE(dAcOtubo_c, Rebirth);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcOtubo_c);
/* 0x330 */ nw4r::g3d::ResFile mRes;
/* 0x334 */ m3d::smdl_c mMdl;
/* 0x350 */ dShadowCircle_c mShdw;
/* 0x358 */ dBgS_AcchCir mAcchCir;
/* 0x3B4 */ dBgS_ObjAcch mObjAcch;
/* 0x764 */ dCcD_Sph mSph;
/* 0x8B4 */ STATE_MGR_DECLARE(dAcOtubo_c);
/* 0x8F0 */ dAcObjRef_unk mField_0x8F0;
/* 0x91C */ EffectsStruct_Ext mEff_0x91C;
/* 0x964 */ dAcRef_c<dAcNpcCeLady_c> mCeLady;
/* 0x970 */ dAcRef_c<dAcNpcCeFriend_c> mCeFriend;
/* 0x97C */ mQuat_c mQuat_0x97C;
/* 0x98C */ mQuat_c mQuat_0x98C;
/* 0x99C */ mQuat_c mQuat_0x99C;
/* 0x9AC */ mVec3_c mField_0x9AC;
/* 0x9B8 */ mVec3_c mField_0x9B8;
/* 0x9C4 */ mAng mField_0x9C4;
/* 0x9C6 */ mAng mField_0x9C6;
/* 0x9C8 */ mAng mField_0x9C8;
/* 0x9CA */ mAng mField_0x9CA;
/* 0x9CC */ mAng mField_0x9CC;
/* 0x9D0 */ f32 mField_0x9D0;
/* 0x9D4 */ f32 mField_0x9D4;
/* 0x9D8 */ f32 mField_0x9D8;
/* 0x9DC */ f32 mField_0x9DC;
/* 0x9E0 */ f32 mField_0x9E0;
/* 0x9E4 */ f32 mField_0x9E4;
/* 0x9E8 */ u16 mTimer_0x9E8;
/* 0x9EA */ bool mbMovingForward;
/* 0x9EB */ bool mbField_0x9EB;
/* 0x9EC */ bool mbField_0x9EC;
/* 0x9ED */ bool mbField_0x9ED;
/* 0x9EE */ bool mbField_0x9EE;
/* 0x9EF */ bool mbField_0x9EF;
/* 0x9F0 */ bool mbField_0x9F0;
/* 0x9F1 */ bool mbField_0x9F1;
/* 0x9F2 */ bool mbSubmerged;
/* 0x9F2 */ bool mbField_0x9F3;
/* 0x9F4 */ u8 mTimer_0x9F4;
/* 0x9F5 */ u8 mTimer_0x9F5;
/* 0x9F6 */ u8 mField_0x9F6;
/* 0x9F7 */ u8 mTimer_0x9F7;
/* 0x9F8 */ u8 mSceneflag;
/* 0x9F9 */ u8 mSubtype;
/* 0x9FC */ int mField_0x9FC;
static u8 sUnk0;
static u32 sUnk1;
static dCcD_SrcSph sSphSrc;
};
#endif