Skip to content

MapObjBlock mostly matching#106

Merged
Mrkol merged 3 commits into
doldecomp:mainfrom
TheAzack9:az-mapobjblock
May 19, 2026
Merged

MapObjBlock mostly matching#106
Mrkol merged 3 commits into
doldecomp:mainfrom
TheAzack9:az-mapobjblock

Conversation

@TheAzack9
Copy link
Copy Markdown
Contributor

I changed gekko_ps_copy12 to match, but i'm not sure if there is any issues with the change or not. I can gladly revert it if wanted :)

@decomp-dev
Copy link
Copy Markdown

decomp-dev Bot commented May 18, 2026

Report for GMSJ01 (6e3c02c - 83151a4)

📈 Matched code: 31.07% (+0.12%, +4252 bytes)
📈 Matched data: 40.26% (+0.59%, +3780 bytes)

✅ 40 new matches
Unit Item Bytes Before After
mario/MoveBG/MapObjBlock .data +3000 0.00% 100.00%
mario/MoveBG/MapObjBlock __sinit_MapObjBlock_cpp +764 0.00% 100.00%
mario/MoveBG/MapObjBlock .rodata +496 0.00% 100.00%
mario/MoveBG/MapObjBlock TLeanBlock::control() +364 0.00% 100.00%
mario/MoveBG/MapObjBlock TLeanBlock::calcLeanMtx(float(*)[4]) +336 0.00% 100.00%
mario/MoveBG/MapObjBlock TBrickBlock::receiveMessage(THitActor*, unsigned long) +220 0.00% 100.00%
mario/MoveBG/MapObjBlock TBrickBlock::initMapObj() +200 0.00% 100.00%
mario/MoveBG/MapObjBlock .bss +184 0.00% 100.00%
mario/MoveBG/MapObjBlock TSandBlock::initMapObj() +180 0.00% 100.00%
mario/MoveBG/MapObjBlock TLeanBlock::TLeanBlock(const char*) +168 0.00% 100.00%
mario/MoveBG/MapObjBlock TLeanBlock::touchPlayer(THitActor*) +164 0.00% 100.00%
mario/MoveBG/MapObjBlock TBreakableBlock::~TBreakableBlock() +156 0.00% 100.00%
mario/MoveBG/MapObjBlock TBrickBlock::~TBrickBlock() +156 0.00% 100.00%
mario/MoveBG/MapObjBlock TTelesaBlock::~TTelesaBlock() +156 0.00% 100.00%
mario/MoveBG/MapObjBlock TSuperHipDropBlock::~TSuperHipDropBlock() +156 0.00% 100.00%
mario/MoveBG/MapObjBlock TIceBlock::initMapObj() +144 0.00% 100.00%
mario/MoveBG/MapObjBlock TSandBlock::~TSandBlock() +132 0.00% 100.00%
mario/MoveBG/MapObjBlock TIceBlock::~TIceBlock() +132 0.00% 100.00%
mario/MoveBG/MapObjBlock TSuperHipDropBlock::loadAfter() +132 0.00% 100.00%
mario/MoveBG/MapObjBlock TBreakableBlock::touchPlayer(THitActor*) +92 0.00% 100.00%
mario/MoveBG/MapObjBlock TJuiceBlock::moveObject() +88 0.00% 100.00%
mario/MoveBG/MapObjBlock TJuiceBlock::initMapObj() +84 0.00% 100.00%
mario/MoveBG/MapObjBlock TTelesaBlock::setGroundCollision() +84 0.00% 100.00%
mario/MoveBG/MapObjBlock TSandBlock::touchPlayer(THitActor*) +80 0.00% 100.00%
mario/MoveBG/MapObjBlock .sdata2 +64 0.00% 100.00%
mario/MoveBG/MapObjBlock TLeanBlock::calcDefaultMtx() +56 0.00% 100.00%
mario/MoveBG/MapObjBlock JGeometry::gekko_ps_copy12(void*, void*) +52 0.00% 100.00%
mario/MoveBG/MapObjBlock TJuiceBlock::kill() +52 0.00% 100.00%
mario/MoveBG/MapObjBlock .sdata +32 0.00% 100.00%
mario/MoveBG/MapObjBlock TTelesaBlock::initMapObj() +32 0.00% 100.00%

...and 10 more new matches

📈 9 improvements in unmatched items
Unit Item Bytes Before After
mario/MoveBG/MapObjBlock TSandBlock::control() +603 0.00% 99.89%
mario/MoveBG/MapObjBlock TIceBlock::control() +479 0.00% 99.96%
mario/MoveBG/MapObjBlock TTelesaBlock::perform(unsigned long, JDrama::TGraphics*) +410 0.00% 99.69%
mario/MoveBG/MapObjBlock TIceBlock::touchWater(THitActor*) +391 0.00% 99.93%
mario/MoveBG/MapObjBlock TBrickBlock::kill() +207 0.00% 99.90%
mario/MoveBG/MapObjBlock TSuperHipDropBlock::receiveMessage(THitActor*, unsigned long) +159 0.00% 99.88%
mario/MoveBG/MapObjBlock TLeanBlock::initMapObj() +126 0.00% 98.75%
mario/MoveBG/MapObjBlock TIceBlock::calc() +99 0.00% 99.80%
mario/System/MarNameRefGen_MapObj TMarNameRefGen::getNameRef_MapObj(const char*) const 0 76.64% 76.64%

Comment thread include/MoveBG/MapObjBlock.hpp Outdated
class TSandBlock : public TMapObjBase {
public:
// Fabricated
typedef enum ESandBlockStates {
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.

you don't need the typedef keyword here. Also, as these are enums and not enum classes, please prefer prefixing the names with the type of thing being described, and don't duplicate info that's already given in the parent scope. E.g. with your current code you'd have TSandBlock::Waiting for values and TSandBlock::ESandBlockStates for variable types, which is a bit weird. Instead, lets name the enum EState and the elements STATE_WAITING so that we have TSandBlock::EState state = TSandBlock::STATE_WAITING

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sounds good :)
Fixed in 0e6aa98

@Mrkol Mrkol merged commit 0efa190 into doldecomp:main May 19, 2026
2 checks 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