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

format

Browse Source
This commit is contained in:
lepelog
2026-06-29 00:24:16 +02:00
parent abfd3771a0
commit 13b68b65df
5 changed files with 88 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/npc/d_a_npc_bee.h
+11 -12
View File
@@ -38,7 +38,7 @@ public:
/* 0x009 */ u8 mAttackTimer;
/* 0x00A */ u8 mIsAttacking;
/* 0x00B */ u8 mWallReflectTimer;
/* 0x00C */ s16 mTimer; // only counts up, used for kinda random calculations
/* 0x00C */ s16 mTimer; // only counts up, used for kinda random calculations
/* 0x00E */ s16 mFlyingStatesTimer; // used for vanishing after flying up and something else
/* 0x010 */ f32 mCrawlingSpeed;
/* 0x014 */ f32 mSpeed;
@@ -53,10 +53,9 @@ public:
/* 0x06C */ dCcD_Linked_Sph mCollider;
};
class dAcNpcBee_c : public dAcEnBase_c {
public:
dAcNpcBee_c(): mRes(nullptr) {}
dAcNpcBee_c() : mRes(nullptr) {}
virtual ~dAcNpcBee_c() {}
virtual bool createHeap() override;
virtual int create() override;
@@ -65,18 +64,18 @@ public:
virtual int doDelete() override;
u32 updateSwarmBeeColliders();
void actuallyUpdateSwarmBees();
void handleBeeCrawlingOnHive(dAcNpcBeeSingleBee* bee);
void handleBeeFlyingStates(dAcNpcBeeSingleBee* bee);
void handleBeeRising(dAcNpcBeeSingleBee* bee);
s32 beeCheckWallFloorCollision(dAcNpcBeeSingleBee* bee);
void handleBeeBlownAway(dAcNpcBeeSingleBee* bee);
void handleBeeCrawlingOnHive(dAcNpcBeeSingleBee *bee);
void handleBeeFlyingStates(dAcNpcBeeSingleBee *bee);
void handleBeeRising(dAcNpcBeeSingleBee *bee);
s32 beeCheckWallFloorCollision(dAcNpcBeeSingleBee *bee);
void handleBeeBlownAway(dAcNpcBeeSingleBee *bee);
private:
/* 0x0378 */ u8 mSwarmBeeCount;
/* 0x0379 */ u8 mRumbleTimer; // rumble timer
/* 0x037A */ u8 mSceneflag;
/* 0x037B */ u8 field_0x037B; // padding
/* 0x037C */ s16 mFrameCounter; // used to only search for new targets every 16 frames
/* 0x037B */ u8 field_0x037B; // padding
/* 0x037C */ s16 mFrameCounter; // used to only search for new targets every 16 frames
/* 0x037E */ u8 field_0x037E[2]; // padding
/* 0x0380 */ f32 mAttackActorDistFromHome;
/* 0x0384 */ u8 field_0x0384[4]; // padding?
@@ -87,8 +86,8 @@ private:
/* 0xB818 */ dAcRef_c<dAcObjBase_c> mAttackRef;
/* 0xB824 */ dColliderLinkedList mColliderList;
/* 0xB830 */ mVec3_c mAliveBeePos; // overwritten by all alive bees, so it's the last on in the list
/* 0xB83C */ dAcObjBase_c* mAttackActor;
/* 0xB840 */ dAcOSpore_c* mSporeActor;
/* 0xB83C */ dAcObjBase_c *mAttackActor;
/* 0xB840 */ dAcOSpore_c *mSporeActor;
};
#endif
include/d/a/npc/d_a_npc_honeycomb.h
+6 -6
View File
@@ -9,12 +9,12 @@ public:
dAcNpcHc_c() {}
virtual ~dAcNpcHc_c() {}
// private:
/* 0x378 */ u8 field_0x378[0x915-0x378];
/* 0x915 */ u8 field_0x915;
/* 0x916 */ u8 field_0x916;
/* 0x917 */ u8 field_0x917[0x928-0x917];
/* 0x928 */ mVec3_c field_0x928;
// private:
/* 0x378 */ u8 field_0x378[0x915 - 0x378];
/* 0x915 */ u8 field_0x915;
/* 0x916 */ u8 field_0x916;
/* 0x917 */ u8 field_0x917[0x928 - 0x917];
/* 0x928 */ mVec3_c field_0x928;
};
#endif
include/d/a/obj/d_a_obj_spore.h
+2 -2
View File
@@ -9,7 +9,7 @@ public:
dAcOSpore_c() {}
virtual ~dAcOSpore_c() {}
static fLiNdBa_c* getListHead();
static fLiNdBa_c *getListHead();
s32 getSporeType() const {
return mParams & 0xF;
}
@@ -18,7 +18,7 @@ public:
}
private:
static fLiMgBa_c sSpores;
static fLiMgBa_c sSpores;
};
#endif
include/toBeSorted/d_unk_mdl_stuff_2.h
+1 -1
View File
@@ -14,7 +14,7 @@
/** a process for drawing shapes directly */
class dShpProcBase_c : public m3d::proc_c {
public:
dShpProcBase_c(): mLightSetId(1) {}
dShpProcBase_c() : mLightSetId(1) {}
virtual ~dShpProcBase_c() {}
void setResMat(nw4r::g3d::ResMat mat);