beetle tag actor by coleslaw456 · Pull Request #306 · zeldaret/ss

coleslaw456 · 2026-04-03T02:29:30Z

Functions match ~100% and rodata is 90%. There's a 00 00 00 00 at the beginning of the data that has no references. There is one unused (and unknown) class variable and type of zone that sets an unknown flag (0x80) in boomerang.

decomp-dev · 2026-04-03T02:44:13Z

Report for SOUE01 (`d3ce728` - `9e70ed0`)

Total functions: 76970 (-1)
📈 Matched code: 24.67% (+0.00%, +416 bytes)

✅ 3 new matches

Unit	Item	Bytes	Before	After
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c::isWithinSphere(const mVec3_c&) const`	+252	0.00%	100.00%
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c::updateBeetle(dAcBoomerang_c&)`	+88	0.00%	100.00%
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c_classInit()`	+1	99.95%	100.00%

📈 4 improvements in unmatched items

Unit	Item	Bytes	Before	After
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c::actorExecute()`	+379	0.00%	99.79%
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c::isWithinCylinder(const mVec3_c&) const`	+359	0.00%	99.96%
`d_t_beetleNP/REL/d/t/d_t_beetle`	`dTgBeetle_c::create()`	+330	0.00%	99.64%
`d_t_beetleNP/REL/d/t/d_t_beetle`	`.rodata`	+21	0.00%	90.91%

elijah-thomas774

Please Format files and remove unneeded headers (should be marked by clangd)

elijah-thomas774 · 2026-04-07T02:57:20Z

+    u32 fn_302_210();
+    virtual int actorExecute();


Suggested change

u32 fn_302_210();

virtual int actorExecute();

virtual int doDelete() override;

virtual int draw() override;

virtual int actorExecute() override;

elijah-thomas774 · 2026-04-07T02:58:49Z

+    u32 isWithinSphere(const mVec3_c& param) const;
+    u32 isWithinCylinder(const mVec3_c& param) const;
+    void updateBeetle(dAcBoomerang_c& boomerang);
+    u32 fn_302_3A0();


fn_302_210 renamed to doDelete
fn_302_3A0 renamed to draw

if unsure, check the vtable assignment

Suggested change

u32 fn_302_3A0();

elijah-thomas774 · 2026-04-07T02:59:20Z

+    };

 private:
+    /* 0xFC */ mMtx_c matrix1;


Suggested change

/* 0xFC */ mMtx_c matrix1;

/* 0x0FC */ mMtx_c mMatrix1;

elijah-thomas774 · 2026-04-07T03:01:17Z

+		}
+		dAcObjBase_c::create(fProfile::CO_TEST, mRoomID, 0, &mPosition, &mRotation, &mScale, 0xFFFFFFFF);
+
+		return 0x2;


PACK_RESULT_e

Suggested change

return 0x2;

return FAILED;

elijah-thomas774 · 2026-04-07T03:01:33Z

+			}
+		}
+		matrixCreateFromPosRotYScale(matrix1, mPosition, mRotation.y, mScale, nullptr, 0);
+		return 0x1;


Suggested change

return 0x1;

return SUCCEEDED;

elijah-thomas774 · 2026-04-07T03:02:50Z

+int dTgBeetle_c::actorExecute()  {
+	if (mPastOnly == 1 && !mActorSubtype) {
+		if (dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(mRoomID, mPosition, nullptr, 1.0f) == 0) {
+			return 1;


I think you get the point. the pre/do/post create/delete/execute/draw functions usually return this type

Suggested change

return 1;

return SUCCEEDED;

elijah-thomas774 · 2026-04-07T03:04:46Z

+			mScale.x = mScale.x * 0.01f;
+			mScale.y = mScale.y * 0.01f;
+			mScale.z = mScale.z * 0.01f;


Suggested change

mScale.x = mScale.x * 0.01f;

mScale.y = mScale.y * 0.01f;

mScale.z = mScale.z * 0.01f;

mScale *= 0.01f;

elijah-thomas774 · 2026-04-07T03:05:03Z

+			mZoneType = mParams & 0xF;
+			mZoneShape = (mParams >> 4) & 3;
+			mUnknown = mParams >> 6;
+			mBeetleFlag = mParams >> 0xE;
+			mPastOnly = (mParams >> 0x16) & 3;


use getFromParams

elijah-thomas774 · 2026-04-07T03:06:21Z

+		}
+	}
+
+	if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID & 0xFFFF, mBeetleFlag) || mActorSubtype) {


mask unneeded - was cause of regalloc

Suggested change

if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID & 0xFFFF, mBeetleFlag) || mActorSubtype) {

if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mBeetleFlag) || mActorSubtype) {

elijah-thomas774 · 2026-04-07T03:08:01Z

+	diff.y /= mScale.y;
+	diff.z /= mScale.z;
+
+	if (EGG::Math<float>::sqrt(diff.squareMagXZ()) <= 0.01f && diff.y <= 0.5f) {


Suggested change

if (EGG::Math<float>::sqrt(diff.squareMagXZ()) <= 0.01f && diff.y <= 0.5f) {

if (diff.absXZ() <= 1.0f && diff.y <= 0.5f) {

elijah-thomas774

Porbably not meant to be with Beetle tag actor PR, but did some review anyways.

elijah-thomas774 · 2026-04-11T18:23:58Z

+
+    bool temp = (mLinkage.mState == 1 && mLinkage.mType == 6);
+    if (temp) {
+        startSound(0x9f4);


look at d_snd_wzsound.h for sound enum

elijah-thomas774 · 2026-04-11T18:26:02Z

+    bool temp = (mLinkage.mState == 1 && mLinkage.mType == 6);
+    if (temp) {


if (getLinkage().checkConnection(dLinkage_c::CONNECTION_6)

elijah-thomas774 · 2026-04-11T18:27:34Z

+    if ((field_7ec & 1) && field_7d8->GetActor() != nullptr) {
+        temp = true;
+    }


this is probably one of the collision structures ChkXXHit() function

elijah-thomas774 · 2026-04-11T18:28:00Z

+void dAcPumpkin_c::initializeState_Wait() {
+
+    field_0x908 = 0;
+    mActorProperties = mActorProperties | 1;


when setting/unsetting mActorProperties, use the set/unsetActorProperty function and enum

elijah-thomas774 · 2026-04-11T18:28:34Z

+    mVelocity.x = mVec3_c::Zero.x;
+    mVelocity.z = mVec3_c::Zero.z;
+    mVelocity.y = mVec3_c::Zero.y;


mVelocity = mVec3_c::Zero is probably fine here

elijah-thomas774 · 2026-04-11T18:30:25Z

+    /* 0x3cc?*/ dBgS_AcchCir* field_0x3cc;
+    /* 0x40c?*/ u8 field_0x40c;
+    /* spacer*/ u8 spacer[1370];
+    /* 0x744?*/ u8 field_0x744;
+    /* 0x7ec?*/ u8 field_7ec;
+    /* 0x7d8?*/ cCcD_GAtTgCoCommonBase* field_7d8;
+    /* 0x79C?*/ u32 pumpkinState;//??
+    /* 0x8cc?*/ dFlowBase_c*  something;
+    /* 0x870?*/ u32 field_0x870;
+    /* 0x908?*/ f32 field_0x908;
+    /* 0x90C?*/ f32 field_0x90C;
+    /* 0x914?*/ float field0x914[21];
+    /* 0x9b8?*/ u32 field0x9b8;
+    /* 0x9db?*/ u8 field_0x9db;
+    /* 0x99c?*/ u8 field_99c;
+    /* 0xa14?*/ u8 field_a14;
+    /* 0xa15?*/ u8 field_a15;
+    /* 0xa16?*/ u8 field_a16;
+    /* 0xa17?*/ u8 field_a17;


usually uppercase for offset comments.

float -> f32

field_0x prefix

This reverts commit ca69176.

coleslaw456 · 2026-04-20T04:06:56Z

Oops pushed that pumpkin commit to the wrong branch. Thanks for the review though I'll definitely need it. I'll review your suggestions and finish beetle soon

coleslaw456 and others added 3 commits April 2, 2026 22:22

beetle tag actor

aa27f61

Merge branch 'zeldaret:main' into main

43a2528

Fixed matrix function

bdefadd

elijah-thomas774 reviewed Apr 7, 2026

View reviewed changes

some garbage pumpkin

ca69176

elijah-thomas774 reviewed Apr 11, 2026

View reviewed changes

Revert "some garbage pumpkin"

9e70ed0

This reverts commit ca69176.

-    u32 fn_302_210();
-    virtual int actorExecute();
+    virtual int doDelete() override;
+    virtual int draw() override;
+    virtual int actorExecute() override;

	if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID & 0xFFFF, mBeetleFlag) \|\| mActorSubtype) {
	if (!SceneflagManager::sInstance->checkBoolFlag(mRoomID, mBeetleFlag) \|\| mActorSubtype) {

	if (EGG::Math<float>::sqrt(diff.squareMagXZ()) <= 0.01f && diff.y <= 0.5f) {
	if (diff.absXZ() <= 1.0f && diff.y <= 0.5f) {

		bool temp = (mLinkage.mState == 1 && mLinkage.mType == 6);
		if (temp) {

Conversation

coleslaw456 commented Apr 3, 2026

Uh oh!

decomp-dev Bot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Report for SOUE01 (d3ce728 - 9e70ed0)

Uh oh!

elijah-thomas774 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elijah-thomas774 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coleslaw456 commented Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

decomp-dev Bot commented Apr 3, 2026 •

edited

Loading

Report for SOUE01 (`d3ce728` - `9e70ed0`)