Match `Kabokuri` by NextOp-Next · Pull Request #1982 · SMGCommunity/Petari

NextOp-Next · 2026-08-17T19:59:02Z

Draft PR to indicate I'm working on it. Currently matched but has a data swap.

~~PR includes incompatible changes in pf_entry, I assume it's due to an unfortunate pull during GitHub's outage today? I wouldn't know how to fix it.~~

Conflict has been resolved.

decomp-dev · 2026-08-17T20:06:11Z

Report for RMGK01 (`7dfccae` - `b3db674`)

📈 Matched code: 66.29% (+0.09%, +5068 bytes)
📈 Matched data: 30.90% (+0.04%, +588 bytes)

✅ 54 new matches

Unit	Item	Bytes	Before	After
`main/Game/Enemy/Kabokuri`	`Kabokuri::init(const JMapInfoIter&)`	+728	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`.data`	+362	23.38%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::addVelocityToRailPoint(float)`	+332	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::updatePose()`	+280	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeHitAttacked()`	+272	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::attackSensor(HitSensor, HitSensor)`	+244	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::receiveMsgPlayerAttack(unsigned long, HitSensor, HitSensor)`	+208	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeBreak()`	+192	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::isEnableTrampled() const`	+188	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeWalk()`	+168	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::initSensor()`	+164	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::requestHitAttacked(HitSensor, HitSensor)`	+128	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeTrampled()`	+128	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeHipDropped()`	+128	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::isEnablePointBind() const`	+128	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeDropFire()`	+120	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::addVelocityBase()`	+112	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeWait()`	+108	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::isEnableAttack() const`	+108	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`__sinit_\Kabokuri_cpp`	+108	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeAttacksuccess()`	+104	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::exeStarPieceHitted()`	+104	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::calcAndSetBaseMtx()`	+96	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::requestHipDropped()`	+92	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::tryPointBind()`	+92	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::isEnablePush() const`	+88	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::control()`	+84	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::requestStarPieceHitted()`	+84	0.00%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::Kabokuri(const char*)`	+78	41.64%	100.00%
`main/Game/Enemy/Kabokuri`	`Kabokuri::requestTrampled()`	+76	0.00%	100.00%

...and 24 more new matches

📈 6 improvements in unmatched items

Unit	Item	Bytes	Before	After
`main/RVL_SDK/vf/pf_fat16`	`VFiPFFAT16_ReadFATEntryPage`	+318	22.24%	93.26%
`main/RVL_SDK/vf/pf_fat16`	`VFiPFFAT16_WriteFATEntryPage`	+44	76.53%	86.16%
`main/RVL_SDK/vf/pf_fat16`	`VFiPFFAT16_WriteFATEntry`	+38	74.97%	99.74%
`main/RVL_SDK/vf/pf_fat16`	`VFiPFFAT16_ReadFATEntry`	+12	83.81%	87.30%
`main/RVL_SDK/vf/pf_fat32`	`VFiPFFAT32_WriteFATEntryPage`	+11	96.90%	99.03%
`main/RVL_SDK/vf/pf_fat32`	`VFiPFFAT32_ReadFATEntryPage`	+8	97.72%	99.48%

MrL314 · 2026-08-18T07:19:17Z

+    TVec3f* gravity = &mGravity;
+    mFrontVec.scaleAdd(-gravity->dot(mFrontVec), *gravity, mFrontVec);


This pattern should be mFrontVec.orthogonalize(mGravity); ignore if not matching.

MrL314 · 2026-08-18T07:20:28Z

+    MR::initDefaultPos(this, rIter);
+    initRailRider(rIter);
+    MR::moveCoordAndTransToNearestRailPos(this);
+    MR::makeQuatAndFrontFromRotate(&_9C, &mFrontVec, this);


_9C can be named mRotationQuat or similar

MrL314 · 2026-08-18T07:21:14Z

+    mKuribo->makeActorDead();
+
+    // "Broken model"
+    _90 = MR::createModelObjMapObjStrongLight("壊れモデル", "KabokuriBreak", getBaseMtx());


_90 can be named mBreakModel

MrL314 · 2026-08-18T07:23:47Z

+    TVec3f* upVec;
+    if (MR::isBindedGround(this)) {
+        upVec = const_cast< TVec3f* >(MR::getGroundNormal(this));
+    } else {
+        TVec3f v2 = -mGravity;
+        upVec = &v2;
+    }
+
+    MR::blendQuatUpFront(&_9C, *upVec, mFrontVec, ::sUpVecBlendRate, ::sFrontVecBlendRate);


Can this logic be rewritten with an inline ternary? instead of *upVec, MR::isBindedGround(this) ? MR::getGroundNormal(this) : -mGravity

MrL314 · 2026-08-18T07:28:00Z

+    /* 0xAC */ TVec3f mFrontVec;
+    /* 0xB8 */ u32 _B8;
+    /* 0xBC */ bool mIsFloating;
+    /* 0xBD */ u8 _BD;


This is a bool, and can be named mIsAttachedToRail or something similar. Make sure to update assignments to use boolean values

MrL314 · 2026-08-18T07:28:25Z

+#include "Game/Util/RailUtil.hpp"
+#include "Game/Util/SoundUtil.hpp"
+#include "Game/Util/StarPointerUtil.hpp"
+#include "revolution/types.h"


Unnecessary include

MrL314 · 2026-08-18T07:29:25Z

+
+Kabokuri::Kabokuri(const char* pName)
+    : LiveActor(pName), mKuribo(nullptr), _90(nullptr), mAnimeScale(nullptr), _98(nullptr), _9C(0.0f, 0.0f, 0.0f, 1.0f), mFrontVec(0.0f, 0.0f, 1.0f),
+      _B8(-1), _BD(0) {


Default value arguments can be left blank (in this case _BD())

Is this necessary, considering _BD (now mWillGenerateFire) is a bool (initialized to false)? Isn't being explicit better in ctors?

Think of it like invoking the default constructor for a class or struct. It's the same notation.

MrL314 · 2026-08-18T07:32:00Z

+    mAnimeScale = new AnimScaleController(nullptr);
+    mAnimeScale->setParamTight();
+
+    _98 = new WalkerStateBindStarPointer(this, mAnimeScale);


_98 can be renamed to mStateBindStartPointer for consistency with other Kuribo files

MrL314 · 2026-08-18T08:26:47Z

+    /* 0x98 */ WalkerStateBindStarPointer* mStateBindStartPointer;
+    /* 0x9C */ TQuat4f mRotationQuat;
+    /* 0xAC */ TVec3f mFrontVec;
+    /* 0xB8 */ u32 _B8;


Type should be s32 considering ctor default is -1

NextOp-Next · 2026-08-18T08:34:54Z

Requested changes should be addressed.

ThatNintendoNerd · 2026-08-18T20:22:28Z

 class Kabokuri : public LiveActor {
 public:
    Kabokuri(const char*);
    virtual ~Kabokuri();


You can probably remove the declaration and definition of the destructor in favor of the compiler-generated destructor, assuming the new order of the function matches the target object file.

ThatNintendoNerd · 2026-08-18T20:23:53Z

+        return;
+    }
+
+    makeActorAppeared();


It's fine to just use an else if statement here.

ThatNintendoNerd · 2026-08-18T20:26:22Z

+    MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f);
+}
+
+void Kabokuri::addVelocityToRailPoint(f32 vel) {


It might be clearer to name the parameter speed, since speed is a scalar, but velocity is a vector. The function uses speed to add to velocity.

ThatNintendoNerd · 2026-08-18T20:29:29Z

+
+Kabokuri::Kabokuri(const char* pName)
+    : LiveActor(pName), mKuribo(nullptr), _90(nullptr), mAnimeScale(nullptr), _98(nullptr), _9C(0.0f, 0.0f, 0.0f, 1.0f), mFrontVec(0.0f, 0.0f, 1.0f),
+      _B8(-1), _BD(0) {


Think of it like invoking the default constructor for a class or struct. It's the same notation.

ThatNintendoNerd · 2026-08-18T20:30:42Z

+    /* 0xBC */ bool mIsFloating;
+
+    /// @brief Generates fire on every point of the rail reached, except the first one.
+    /* 0xBD */ bool mWillGenerateFire;


mIsValidDropFire might be more in line with developer verbiage.

NextOp-Next · 2026-08-19T05:55:33Z

Requested changes should be addressed.

ThatNintendoNerd

Very minor oversights from my initial pass. After correcting these two things, should be ready to merge.

ThatNintendoNerd · 2026-08-19T07:11:51Z

+    static const f32 sNormalFreq = 0.9f;
+    static const f32 sNormalGravity = 0.2f;
+    static const f32 sRailCoordStepInterval = 50.0f;
+    static const u32 sWaitTime = 60;


Should be s32.

ThatNintendoNerd · 2026-08-19T07:15:17Z

+class AnimScaleController;
+class WalkerStateBindStarPointer;
+class Kuribo;
+class ModelObj;


Organize alphabetically.

NextOp-Next · 2026-08-19T07:24:49Z

Should be good to go!

shibbo and others added 11 commits August 16, 2026 22:14

pf_entry pf_fat16 and pf_fat32` improvements

f9b3842

improvements in pf_file

8fb5747

Kabokuri header and nerves

d1301a6

Kabokuri 45%

e090c20

Kabokuri 55%

3f7f0b4

Kabokuri 80%

3a06ca2

Kabokuri 99%

e803b17

Kabokuri match

b66a776

Kabokuri .data splits fix

43224ce

More Kabokuri debug consts

9556d08

Merge branch 'master' into Kabokuri

4fab3f1

More Kabokuri consts

71ef9e7

MrL314 requested changes Aug 18, 2026

View reviewed changes

NextOp-Next added 7 commits August 18, 2026 09:43

More consts, member renaming

92f70b5

Kabokuri orthogonalize

0f725f8

Kabokuri inlined ternary

a6cffa7

Kabokuri's WalkerStateBindStarPointer* member renaming

9ffdde8

Remove unnecessary include

303c61b

Light docs

8032be0

Implicit initializer list with null values

d0c2c6d

MrL314 requested changes Aug 18, 2026

View reviewed changes

Kabokuri _B8 is signed

dd7654c

NextOp-Next marked this pull request as ready for review August 18, 2026 08:34

ThatNintendoNerd requested changes Aug 18, 2026

View reviewed changes

NextOp-Next added 4 commits August 19, 2026 07:48

Implicit dtor

6b1002b

Add an else

f6af44c

vel -> speed

cfdf22f

mWillGenerateFire -> mIsValidDropFire

a7e2b6e

ThatNintendoNerd requested changes Aug 19, 2026

View reviewed changes

Minor fixes

b3db674

ThatNintendoNerd merged commit c6367aa into SMGCommunity:master Aug 19, 2026
1 check passed

		TVec3f* gravity = &mGravity;
		mFrontVec.scaleAdd(-gravity->dot(mFrontVec), *gravity, mFrontVec);

Uh oh!

Conversation

NextOp-Next commented Aug 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Report for RMGK01 (7dfccae - b3db674)

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!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NextOp-Next commented Aug 18, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NextOp-Next commented Aug 19, 2026

Uh oh!

ThatNintendoNerd 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!

NextOp-Next commented Aug 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

NextOp-Next commented Aug 17, 2026 •

edited

Loading

decomp-dev Bot commented Aug 17, 2026 •

edited

Loading

Report for RMGK01 (`7dfccae` - `b3db674`)