Skip to content

zNPCTypeKingJelly: register_tweaks work#563

Merged
JoshSanch merged 2 commits intobfbbdecomp:mainfrom
energydrink02:kingjelly_register_tweaks
May 22, 2025
Merged

zNPCTypeKingJelly: register_tweaks work#563
JoshSanch merged 2 commits intobfbbdecomp:mainfrom
energydrink02:kingjelly_register_tweaks

Conversation

@energydrink02
Copy link
Contributor

Not entirely sure if the namespace stuff is correct — I based it on how it's done in other files.

@github-actions
Copy link

🆗 ✅

+8829 bytes
🆗 Bot Rating: You are a decomp GOD, can I have your autograph?

No Regressions 🎉

Progress: 6

📈 main/SB/Game/zNPCTypeKingJelly - .text +8620 bytes -> 39.91%
📈 main/SB/Game/zNPCTypeKingJelly - .rodata +45 bytes -> 3.89%
📈 main/SB/Game/zNPCTypeKingJelly - .sdata2 +165 bytes -> 63.08%
📈 main/SB/Game/zNPCTypeKingJelly - @unnamed@zNPCTypeKingJelly_cpp@::tweak_group::register_tweaks(bool, xModelAssetParam*, unsigned int, const char*) +8568 bytes -> 92.45%
📈 main/SB/Game/zNPCTypeKingJelly - ZNPC_AnimTable_KingJelly() +3 bytes -> 99.81%
main/SB/Game/zNPCTypeKingJelly - @unnamed@zNPCTypeKingJelly_cpp@::tweak_group::load(xModelAssetParam*, unsigned int) +48 bytes -> 100.00%

Copy link
Collaborator

@JoshSanch JoshSanch left a comment

Choose a reason for hiding this comment

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

Awesome work!

Here, I think it's more accurate to move the function implementations into the namespace, as the tweak_group struct definition here is intended to be local to this file (enforced by the anonymous namespace), and so defining it inside the namespace further reinforces this intention.

@github-actions
Copy link

⚠️ 🔥

+8965 bytes
🆗 Bot Rating: You are a decomp GOD, can I have your autograph?

Regressions: 68

⚠️ main/SB/Core/x/xBound - .sdata2 -22 bytes -> 0.00%
⚠️ main/SB/Core/x/xBound - .text -28 bytes -> 85.45%
⚠️ main/SB/Core/x/xCamera - .bss -64 bytes -> 0.00%
⚠️ main/SB/Core/x/xCamera - .data -27 bytes -> 0.00%
⚠️ main/SB/Core/x/xCamera - .sbss -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xCamera - .sdata -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xCamera - .sdata2 -109 bytes -> 9.76%
⚠️ main/SB/Core/x/xCutscene - .bss -864 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - .sbss -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - .text -71 bytes -> 17.21%
⚠️ main/SB/Core/x/xCutscene - .text -64 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - .text -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .sdata -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .text -16 bytes -> 12.55%
⚠️ main/SB/Core/x/xEntMotion - .text -116 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .text -224 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .text -220 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .text -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - .text -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xFFX - .sbss -40 bytes -> 0.00%
⚠️ main/SB/Core/x/xFFX - .text -12 bytes -> 46.25%
⚠️ main/SB/Core/x/xMath - .sbss -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xMemMgr - .sbss -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xordarray - .sdata2 -5 bytes -> 58.33%
⚠️ main/SB/Core/x/xSnd - .sdata2 -14 bytes -> 22.22%
⚠️ main/SB/Game/zCamera - .sbss -6 bytes -> 86.11%
⚠️ main/SB/Game/zGame - .sbss -24 bytes -> 3.57%
⚠️ main/SB/Game/zLight - .bss -320 bytes -> 0.00%
⚠️ main/SB/Game/zLight - .data -88 bytes -> 0.00%
⚠️ main/SB/Game/zLight - .sbss -16 bytes -> 0.00%
⚠️ main/SB/Game/zLight - .sdata2 -8 bytes -> 0.00%
⚠️ main/SB/Game/zScene - .sdata2 -41 bytes -> 36.36%
⚠️ main/SB/Game/zScene - .text -11 bytes -> 95.87%
⚠️ main/SB/Core/gc/iMath3 - .sdata2 -32 bytes -> 0.00%
⚠️ main/SB/Core/gc/iMemMgr - .sbss -24 bytes -> 0.00%
⚠️ main/SB/Core/x/xGrid - .sbss -5 bytes -> 0.00%
⚠️ main/SB/Core/x/xBound - xBoundOBBIsectRay(const xBox*, const xMat4x3*, const xRay3*, xIsect*) -68 bytes -> 71.56%
⚠️ main/SB/Core/x/xBound - xVec3::operator=(const xVec3&) -28 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - xlog(float) -32 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - std::logf(float) -36 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - xCutscene_Render(xCutscene*, xEnt**, int*, float*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - xVec3Lerp(xVec3*, const xVec3*, const xVec3*, float) -64 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - XCSNNosey::CanRenderNow() -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xCutscene - XCSNNosey::UpdatedAnimated(RpAtomic*, RwMatrixTag*, unsigned int, unsigned int) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionReset(xEntMotion*, xScene*) -3 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionMove(xEntMotion*, xScene*, float, xEntFrame*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionTranslate(xEntMotion*, const xVec3*, xMat4x3*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionDebugCB() -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xVec3Equals(const xVec3*, const xVec3*) -116 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xQuatCopy(xQuat*, const xQuat*) -36 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xQuatEquals(const xQuat*, const xQuat*) -76 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xQuatFlip(xQuat*, const xQuat*) -44 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xQuatDot(const xQuat*, const xQuat*) -68 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMPSetSpeed(xEntMotion*, float) -28 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntERIsRetracted(const xEntMotion*) -28 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntERIsRetracting(const xEntMotion*) -48 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntERIsExtended(const xEntMotion*) -48 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntERIsExtending(const xEntMotion*) -24 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionStop(xEntMotion*) -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionRun(xEntMotion*) -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xEntMotionIsStopped(const xEntMotion*) -12 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xSpline3_ArcTotal(xSpline3*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xDrawLine(const xVec3*, const xVec3*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xEntMotion - xDrawSetColor(iColor_tag) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xFFX - xFFXPoolInit(unsigned int) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xFFX - xFFXShakeUpdateEnt(xEnt*, xScene*, float, void*) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xFFX - xFFXShakePoolInit(unsigned int) -4 bytes -> 0.00%
⚠️ main/SB/Game/zScene - zSceneSetup() -11 bytes -> 88.38%

Progress: 17

📈 main/SB/Game/zNPCTypeKingJelly - .text +8620 bytes -> 39.91%
📈 main/SB/Game/zMain - .text +8 bytes -> 50.99%
📈 main/SB/Core/x/xCamera - .text +4 bytes -> 56.36%
📈 main/SB/Game/zNPCTypeKingJelly - .rodata +45 bytes -> 3.89%
📈 main/SB/Core/x/xBound - .text +35 bytes -> 88.32%
main/SB/Core/x/xCamera - .text +16 bytes -> 100.00%
📈 main/SB/Game/zNPCTypeKingJelly - .sdata2 +165 bytes -> 63.08%
📈 main/SB/Game/zMain - .sbss +1 bytes -> 60.00%
main/SB/Core/x/xpkrsvc - .text +4 bytes -> 100.00%
📈 main/SB/Game/zNPCTypeKingJelly - @unnamed@zNPCTypeKingJelly_cpp@::tweak_group::register_tweaks(bool, xModelAssetParam*, unsigned int, const char*) +8568 bytes -> 92.45%
📈 main/SB/Game/zNPCTypeKingJelly - ZNPC_AnimTable_KingJelly() +3 bytes -> 99.81%
main/SB/Core/x/xCamera - xCameraFOV(xCamera*, float, float, float) +4 bytes -> 100.00%
📈 main/SB/Core/x/xBound - xsqrt(float) +104 bytes -> 88.64%
main/SB/Core/x/xCamera - xVec3::operator/=(float) +15 bytes -> 100.00%
main/SB/Game/zNPCTypeKingJelly - @unnamed@zNPCTypeKingJelly_cpp@::tweak_group::load(xModelAssetParam*, unsigned int) +48 bytes -> 100.00%
main/SB/Game/zMain - zLedgeAdjust(zLedgeGrabParams*) +8 bytes -> 100.00%
main/SB/Core/x/xpkrsvc - st_PACKER_ATOC_NODE::Name() const +4 bytes -> 100.00%

@JoshSanch JoshSanch merged commit dd321e0 into bfbbdecomp:main May 22, 2025
5 checks passed
@JoshSanch
Copy link
Collaborator

Great work, thanks! :)

@energydrink02 energydrink02 deleted the kingjelly_register_tweaks branch May 22, 2025 15:23
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