Matched StinkBugSmall at 97% by BlocksumoGuys · Pull Request #1901 · SMGCommunity/Petari

BlocksumoGuys · 2026-04-16T01:26:41Z

No description provided.

decomp-dev · 2026-04-16T01:30:16Z

Report for RMGK01 (`178771a` - `00f15c5`)

📈 Matched code: 47.16% (+0.03%, +1364 bytes)
📈 Matched data: 21.53% (+0.00%, +72 bytes)

✅ 10 new matches

Unit	Item	Bytes	Before	After
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::init(const JMapInfoIter&)`	+560	0.00%	100.00%
`main/Game/Enemy/StinkBugSmall`	`NrvStinkBugSmall::StinkBugSmallNrvDashSignEnd::execute(Spine*) const`	+65	10.56%	100.00%
`main/Game/Enemy/StinkBugSmall`	`NrvStinkBugSmall::StinkBugSmallNrvShake::execute(Spine*) const`	+61	11.18%	100.00%
`main/Game/Enemy/StinkBugSmall`	`.sdata2`	+29	61.11%	100.00%
`main/Game/Enemy/StinkBugSmall`	`NrvStinkBugSmall::StinkBugSmallNrvDPDSwoon::executeOnEnd(Spine*) const`	+24	0.00%	100.00%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::StinkBugSmall(const char*)`	+3	96.84%	100.00%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exeWait()`	+1	99.85%	100.00%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exeDashSign()`	+1	99.93%	100.00%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::tryDPDSwoon()`	+1	99.97%	100.00%
`main/Game/NameObj/NameObjFactory`	`NameObj* @unnamed@NameObjFactory_cpp@::createNameObj<StinkBugSmall>(const char*)`	+1	99.94%	100.00%

📈 11 improvements in unmatched items

Unit	Item	Bytes	Before	After
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::attackSensor(HitSensor, HitSensor)`	+333	0.00%	99.17%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::control()`	+286	0.00%	70.29%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::initAfterPlacement()`	+175	0.00%	99.82%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::calcAndSetBaseMtx()`	+155	0.00%	99.49%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exeBack()`	+43	74.15%	92.03%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::receiveMsgPlayerAttack(unsigned long, HitSensor, HitSensor)`	+37	87.71%	96.45%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exeDash()`	+24	86.51%	97.96%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exePanic()`	+13	93.93%	99.95%
`main/Game/Enemy/StinkBugSmall`	`.data`	+2	32.35%	32.58%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::exeHipDropDown()`	0	99.93%	99.96%
`main/Game/Enemy/StinkBugSmall`	`StinkBugSmall::kill()`	0	99.93%	99.96%

ThatNintendoNerd

Please cleanup unnecessary include directives in both the header and source files, as many are redundant from being included in other header files.

ThatNintendoNerd · 2026-04-16T01:30:48Z

+    if (!isNerve(&NrvStinkBugSmall::StinkBugSmallNrvHipDropDown::sInstance)) {
+        if (_C4 && getSensor("body")) {
+            return;
+        }
+        if (!isNerve(&NrvStinkBugSmall::StinkBugSmallNrvAttack::sInstance) && isNerve(&NrvStinkBugSmall::StinkBugSmallNrvDPDSwoon::sInstance) &&
+            MR::isSensorPlayer(pSender) && MR::isSensorEnemyAttack(pReceiver)) {
+            if (MR::isPlayerDamaging()) {
+                MR::sendMsgPush(pReceiver, pSender);
+                return;
+            }
+            if (isHitHorn(pSender, pReceiver, mScale.x * 20.0f)) {
+                if (MR::sendMsgEnemyAttackStrong(pReceiver, pSender)) {
+                    MR::emitEffectHitBetweenSensors(this, pSender, pReceiver, 0.0f, nullptr);
+                    if (isNerve(&NrvStinkBugSmall::StinkBugSmallNrvDash::sInstance)) {
+                        setNerve(&NrvStinkBugSmall::StinkBugSmallNrvAttack::sInstance);
+                    }
+                }
+            }
+        }
+    }
+}


Can this function be restructured to take advantage of guard clauses instead of nested conditional statements?

ThatNintendoNerd · 2026-04-16T01:31:25Z

+    TPos3f v9;
+    MR::calcMtxFromGravityAndZAxis(&v9, this, mGravity, _8C);
+    MtxPtr v2 = getBaseMtx();
+    MR::blendMtx(v2, v9, 0.30000001f, v9);


This precision is not necessary so long as the literal matches without it.

ThatNintendoNerd · 2026-04-16T01:32:01Z

+                JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, -v6);
+                JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, 2.0f);


Prefer use of mVelocity->scaleAdd instead of directly calling the corresponding JMath function.

I could not use it reliably for some reasons.

ThatNintendoNerd · 2026-04-16T01:34:24Z

+    TVec3f v10(0.0f, 0.0f, 0.0f);
+    if (MR::isInDeath(this, v10)) {


Can this be written into the function call like MR::isInDeath(this, TVec3f(0.0f, 0.0f, 0.0f)) and still match?

ThatNintendoNerd · 2026-04-16T01:36:26Z

+    } else {
+        if (!tryDPDSwoon() && !tryForceFall() && !isNerve(&NrvStinkBugSmall::StinkBugSmallNrvForceFall::sInstance))


Restructure this into an else if or make use of guard clauses. Don't forget about required curly braces for inner blocks of code.

ThatNintendoNerd · 2026-04-16T01:38:43Z

+// all the return on void functions are used to exit the function, I have not found a way to do it otherwise.
+


This logic is both okay and common and does not warrant a dedicated comment.

BlocksumoGuys · 2026-04-16T09:05:02Z

Most of the requested changes are added.

ThatNintendoNerd · 2026-04-16T17:39:07Z

    }
+    JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, -mGravity.dot(mVelocity));
+    JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, 2.0f);
+    return;


return statements at the end of functions which return void are unnecessary.

ThatNintendoNerd · 2026-04-16T17:40:24Z

+    if (!isNerve(&NrvStinkBugSmall::StinkBugSmallNrvAttack::sInstance) && isNerve(&NrvStinkBugSmall::StinkBugSmallNrvDPDSwoon::sInstance) &&
+        MR::isSensorPlayer(pSender) && MR::isSensorEnemyAttack(pReceiver)) {


Is it possible to use inversion here to employ another guard clause and still keep the match?

It is not possible from my testing.

BlocksumoGuys · 2026-04-16T22:07:13Z

The requested changes have been added along with more matches.

BlocksumoGuys · 2026-04-17T00:53:03Z

Last of my changes were added, no further last minute changes will be added unless requested.

BlocksumoGuys added 14 commits April 12, 2026 03:49

Update StinkBugSmall.cpp

a045e89

Update StinkBugSmall.hpp

4931285

formatting on StinkBugSmall.hpp

5fff752

formatting on StinkBugSmall.cpp

06ef6a2

Update StinkBugSmall.hpp

5728935

Update StinkBugSmall.cpp

6e427bd

Update StinkBugSmall.hpp

0020079

Update StinkBugSmall.cpp

61be282

Update StinkBugSmall.cpp

2b34b24

Update StinkBugSmall.cpp

b029ec8

Re-arranged functions in the source file

a4dc634

Merge branch 'SMGCommunity:master' into master

70c7036

Update StinkBugSmall.hpp

914d21b

Update StinkBugSmall.cpp

e487422

ThatNintendoNerd requested changes Apr 16, 2026

View reviewed changes

BlocksumoGuys added 2 commits April 16, 2026 10:03

Update StinkBugSmall.hpp

b71009a

Update StinkBugSmall.cpp

1493834

BlocksumoGuys changed the title ~~Matched StinkBugSmall at 92%~~ Matched StinkBugSmall at 93% Apr 16, 2026

ThatNintendoNerd requested changes Apr 16, 2026

View reviewed changes

BlocksumoGuys changed the title ~~Matched StinkBugSmall at 93%~~ Matched StinkBugSmall at 94% Apr 16, 2026

StinkBugSmall 94%

8268516

BlocksumoGuys added 2 commits April 17, 2026 01:51

Update StinkBugSmall.hpp

6098290

StinkBugSmall 97%

00f15c5

BlocksumoGuys changed the title ~~Matched StinkBugSmall at 94%~~ Matched StinkBugSmall at 97% Apr 17, 2026

ThatNintendoNerd merged commit 9ee9ca1 into SMGCommunity:master Apr 17, 2026
1 check passed

		JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, -v6);
		JMAVECScaleAdd(&mGravity, &mVelocity, &mVelocity, 2.0f);

		TVec3f v10(0.0f, 0.0f, 0.0f);
		if (MR::isInDeath(this, v10)) {

		} else {
		if (!tryDPDSwoon() && !tryForceFall() && !isNerve(&NrvStinkBugSmall::StinkBugSmallNrvForceFall::sInstance))

		// all the return on void functions are used to exit the function, I have not found a way to do it otherwise.

		if (!isNerve(&NrvStinkBugSmall::StinkBugSmallNrvAttack::sInstance) && isNerve(&NrvStinkBugSmall::StinkBugSmallNrvDPDSwoon::sInstance) &&
		MR::isSensorPlayer(pSender) && MR::isSensorEnemyAttack(pReceiver)) {

Conversation

BlocksumoGuys commented Apr 16, 2026

Uh oh!

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

Uh oh!

Report for RMGK01 (178771a - 00f15c5)

Uh oh!

ThatNintendoNerd left a comment

Choose a reason for hiding this comment

Uh oh!

ThatNintendoNerd Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

BlocksumoGuys commented Apr 16, 2026

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!

BlocksumoGuys commented Apr 16, 2026

Uh oh!

BlocksumoGuys commented Apr 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

decomp-dev Bot commented Apr 16, 2026 •

edited

Loading

Report for RMGK01 (`178771a` - `00f15c5`)

ThatNintendoNerd Apr 16, 2026 •

edited

Loading