Skip to content

Match 97% of Mogucchi#1899

Merged
ThatNintendoNerd merged 16 commits intoSMGCommunity:masterfrom
NextOp-Next:Mogucchi
Apr 7, 2026
Merged

Match 97% of Mogucchi#1899
ThatNintendoNerd merged 16 commits intoSMGCommunity:masterfrom
NextOp-Next:Mogucchi

Conversation

@NextOp-Next
Copy link
Copy Markdown
Contributor

Includes new inlines for TRotation3 that are needed for certain matches in this TU. Also includes very early MogucchiHill class definitions, which are most likely wrong but are not in the scope of this PR.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented Apr 2, 2026

Report for RMGK01 (cd8a11f - 44bb9af)

📈 Matched code: 46.71% (+0.09%, +5020 bytes)
📈 Matched data: 21.39% (+0.03%, +548 bytes)

✅ 42 new matches
Unit Item Bytes Before After
main/Game/Enemy/Mogucchi Mogucchi::exeScatter() +556 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::receiveAttackByBodySensor(unsigned long, HitSensor*, HitSensor*) +488 0.00% 100.00%
main/Game/Enemy/Mogucchi .data +415 20.29% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::init(const JMapInfoIter&) +356 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::receiveAttackBySpinSensor(unsigned long, HitSensor*, HitSensor*) +328 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::exeStroll() +272 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::calcAttackDir(JGeometry::TVec3<float>*, const JGeometry::TVec3<float>&, const JGeometry::TVec3<float>&) const +248 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::attackSensor(HitSensor*, HitSensor*) +232 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::initSensor() +196 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::createMogucchiHill() +172 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::reflectStarPointer2P() +168 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::exeDie() +164 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::exeDive() +160 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::exeDown() +152 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::updatePosition() +148 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::makeEulerRotation() +136 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::receiveMsgPlayerAttack(unsigned long, HitSensor*, HitSensor*) +128 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::kill() +116 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::calcScatterVec(const JGeometry::TVec3<float>&, const JGeometry::TVec3<float>&) +112 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::createHole() +104 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::makeActorAppeared() +100 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::initAfterPlacement() +96 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::checkHipDrop() const +92 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::control() +88 0.00% 100.00%
main/Game/Enemy/Mogucchi __sinit_\Mogucchi_cpp +76 0.00% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::Mogucchi(const char*) +72 44.34% 100.00%
main/Game/Enemy/Mogucchi Mogucchi::updateStrollSpeed() +44 0.00% 100.00%
main/Game/Enemy/Mogucchi .sbss +24 0.00% 100.00%
main/Game/Enemy/Mogucchi @unnamed@Mogucchi_cpp@::MogucchiNrvStroll::MogucchiNrvStroll() +16 0.00% 100.00%
main/Game/Enemy/Mogucchi @unnamed@Mogucchi_cpp@::MogucchiNrvAppearDown::MogucchiNrvAppearDown() +16 0.00% 100.00%

...and 12 more new matches

📈 4 improvements in unmatched items
Unit Item Bytes Before After
main/Game/Enemy/Mogucchi Mogucchi::exeAppearDown() +267 0.00% 99.97%
main/Game/Enemy/Mogucchi Mogucchi::updateReferenceMtx() +261 0.00% 64.00%
main/Game/Enemy/Mogucchi .sdata2 +71 0.00% 89.47%
main/Game/Enemy/MogucchiHill MogucchiHill::MogucchiHill(LiveActor*, long, const char*) +41 0.00% 20.37%

@@ -0,0 +1,5 @@
#include "Game/Enemy/MogucchiHill.hpp"
#include "Game/LiveActor/LiveActor.hpp"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This include directive is redundant, as the corresponding header file already includes it.

Comment on lines +382 to +385
bool isDown = false;
if (isNerve(&MogucchiNrvDown::sInstance) || isNerve(&MogucchiNrvAppearDown::sInstance) || isNerve(&MogucchiNrvDive::sInstance)) {
isDown = true;
}
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be simplified to the following?

bool isDown = isNerve(&MogucchiNrvDown::sInstance) || isNerve(&MogucchiNrvAppearDown::sInstance) || isNerve(&MogucchiNrvDive::sInstance);

@NextOp-Next NextOp-Next marked this pull request as draft April 7, 2026 19:47
@NextOp-Next
Copy link
Copy Markdown
Contributor Author

Requested changes should have been addressed.

@NextOp-Next NextOp-Next marked this pull request as ready for review April 7, 2026 19:53
@ThatNintendoNerd ThatNintendoNerd merged commit d932913 into SMGCommunity:master Apr 7, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants