Skip to content

Start zShrapnel#553

Merged
mattbruv merged 2 commits intobfbbdecomp:mainfrom
energydrink02:shrapnel
May 18, 2025
Merged

Start zShrapnel#553
mattbruv merged 2 commits intobfbbdecomp:mainfrom
energydrink02:shrapnel

Conversation

@energydrink02
Copy link
Contributor

Started working on zShrapnel with some full matched functions and several equivalents (left some functions that are beyond my capabilities empty but needed for matching other functions/variables)

@github-actions
Copy link

🆗 ✅

+26333 bytes
🆗 Bot Rating: If I could feel emotions, I would be crying tears of joy right now.

No Regressions 🎉

Progress: 40

📈 main/SB/Core/x/xCollide - .text +132 bytes -> 5.96%
main/SB/Game/zShrapnel - .bss +20864 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - .text +4988 bytes -> 44.05%
📈 main/SB/Game/zShrapnel - .rodata +116 bytes -> 91.38%
📈 main/SB/Game/zShrapnel - .sdata2 +46 bytes -> 36.59%
main/SB/Game/zShrapnel - .text +100 bytes -> 100.00%
main/SB/Game/zShrapnel - .data +72 bytes -> 100.00%
main/SB/Game/zShrapnel - .sbss +16 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_DestructObjInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.34%
main/SB/Game/zShrapnel - zFrag_ProjectileManager(float) +1040 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_BB03FloorInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.55%
📈 main/SB/Game/zShrapnel - zShrapnel_SpongebobInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.68%
main/SB/Game/zShrapnel - zFrag_DefaultInit(zFrag*, zFragAsset*) +500 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_GlobalRobotInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +3 bytes -> 0.82%
📈 main/SB/Game/zShrapnel - zShrapnel_GameInit() +232 bytes -> 63.74%
📈 main/SB/Game/zShrapnel - zFrag_LightningManager(float) +272 bytes -> 89.47%
📈 main/SB/Game/zShrapnel - zShrapnel_CinematicInit(zShrapnelAsset*, RpAtomic*, RwMatrixTag*, xVec3*, void (*)(zFrag*, zFragAsset*)) +220 bytes -> 73.33%
main/SB/Game/zShrapnel - zShrapnel_Update(float) +260 bytes -> 100.00%
main/SB/Game/zShrapnel - zFragLoc_InitDir(zFragLocation*, xVec3*, xModelInstance*) +252 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_ParticleManager(float) +240 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DefaultSoundUpdate(zFrag*, float) +232 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zFrag_ProjectileRenderer() +4 bytes -> 1.72%
main/SB/Game/zShrapnel - zFrag_DefaultLightningUpdate(zFrag*, float) +220 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DefaultParticleUpdate(zFrag*, float) +176 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zFrag_ProjectileCollData(zFrag*) +172 bytes -> 97.73%
main/SB/Game/zShrapnel - zFrag_SoundManager(float) +160 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_Alloc(zFragType) +148 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DeleteProjectile(zFrag*) +144 bytes -> 100.00%
main/SB/Core/x/xCollide - xParabolaRecenter(xParabola*, float) +132 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - BB03FloorChildCB(zFrag*, zFragAsset*) +4 bytes -> 3.23%
📈 main/SB/Game/zShrapnel - zFrag_Free(zFrag*) +100 bytes -> 86.21%
main/SB/Game/zShrapnel - zShrapnel_ProjectileSceneInit(zFragProjectileAsset*) +112 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_Reset() +112 bytes -> 100.00%
main/SB/Game/zShrapnel - xMat3x3RMulVec(xVec3*, const xMat3x3*, const xVec3*) +100 bytes -> 100.00%
main/SB/Game/zShrapnel - CinFragCB(zFrag*, zFragAsset*) +88 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_SetShrapnelAssetInitCB(zShrapnelAsset*) +48 bytes -> 60.00%
main/SB/Game/zShrapnel - zFragLoc_Setup(zFragLocation*, xModelInstance*) +72 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_Render() +64 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_ParticleSceneInit(zFragParticleAsset*) +60 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_BB03FloorChildInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +40 bytes -> 100.00%

Copy link
Member

@mattbruv mattbruv left a comment

Choose a reason for hiding this comment

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

Excellent work, just address the one issue and this should be good to merge.

@github-actions
Copy link

🆗 ✅

+26333 bytes
🆗 Bot Rating: If I could feel emotions, I would be crying tears of joy right now.

No Regressions 🎉

Progress: 40

📈 main/SB/Core/x/xCollide - .text +132 bytes -> 5.96%
main/SB/Game/zShrapnel - .bss +20864 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - .text +4988 bytes -> 44.05%
📈 main/SB/Game/zShrapnel - .rodata +116 bytes -> 91.38%
📈 main/SB/Game/zShrapnel - .sdata2 +46 bytes -> 36.59%
main/SB/Game/zShrapnel - .text +100 bytes -> 100.00%
main/SB/Game/zShrapnel - .data +72 bytes -> 100.00%
main/SB/Game/zShrapnel - .sbss +16 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_DestructObjInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.34%
main/SB/Game/zShrapnel - zFrag_ProjectileManager(float) +1040 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_BB03FloorInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.55%
📈 main/SB/Game/zShrapnel - zShrapnel_SpongebobInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +4 bytes -> 0.68%
main/SB/Game/zShrapnel - zFrag_DefaultInit(zFrag*, zFragAsset*) +500 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_GlobalRobotInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +3 bytes -> 0.82%
📈 main/SB/Game/zShrapnel - zShrapnel_GameInit() +232 bytes -> 63.74%
📈 main/SB/Game/zShrapnel - zFrag_LightningManager(float) +272 bytes -> 89.47%
📈 main/SB/Game/zShrapnel - zShrapnel_CinematicInit(zShrapnelAsset*, RpAtomic*, RwMatrixTag*, xVec3*, void (*)(zFrag*, zFragAsset*)) +220 bytes -> 73.33%
main/SB/Game/zShrapnel - zShrapnel_Update(float) +260 bytes -> 100.00%
main/SB/Game/zShrapnel - zFragLoc_InitDir(zFragLocation*, xVec3*, xModelInstance*) +252 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_ParticleManager(float) +240 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DefaultSoundUpdate(zFrag*, float) +232 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zFrag_ProjectileRenderer() +4 bytes -> 1.72%
main/SB/Game/zShrapnel - zFrag_DefaultLightningUpdate(zFrag*, float) +220 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DefaultParticleUpdate(zFrag*, float) +176 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zFrag_ProjectileCollData(zFrag*) +172 bytes -> 97.73%
main/SB/Game/zShrapnel - zFrag_SoundManager(float) +160 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_Alloc(zFragType) +148 bytes -> 100.00%
main/SB/Game/zShrapnel - zFrag_DeleteProjectile(zFrag*) +144 bytes -> 100.00%
main/SB/Core/x/xCollide - xParabolaRecenter(xParabola*, float) +132 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - BB03FloorChildCB(zFrag*, zFragAsset*) +4 bytes -> 3.23%
📈 main/SB/Game/zShrapnel - zFrag_Free(zFrag*) +100 bytes -> 86.21%
main/SB/Game/zShrapnel - zShrapnel_ProjectileSceneInit(zFragProjectileAsset*) +112 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_Reset() +112 bytes -> 100.00%
main/SB/Game/zShrapnel - xMat3x3RMulVec(xVec3*, const xMat3x3*, const xVec3*) +100 bytes -> 100.00%
main/SB/Game/zShrapnel - CinFragCB(zFrag*, zFragAsset*) +88 bytes -> 100.00%
📈 main/SB/Game/zShrapnel - zShrapnel_SetShrapnelAssetInitCB(zShrapnelAsset*) +48 bytes -> 60.00%
main/SB/Game/zShrapnel - zFragLoc_Setup(zFragLocation*, xModelInstance*) +72 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_Render() +64 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_ParticleSceneInit(zFragParticleAsset*) +60 bytes -> 100.00%
main/SB/Game/zShrapnel - zShrapnel_BB03FloorChildInit(zShrapnelAsset*, xModelInstance*, xVec3*, void (*)(zFrag*, zFragAsset*)) +40 bytes -> 100.00%

@mattbruv mattbruv merged commit 1a6049b into bfbbdecomp:main May 18, 2025
5 checks passed
@energydrink02 energydrink02 deleted the shrapnel branch May 18, 2025 20:41
JoshSanch pushed a commit that referenced this pull request May 19, 2025
* iTRC work + file cleanup

* removed most of CheckResetButton

* Big work to zMain

* Another big update to zMainParseIni

* Start zShrapnel (#553)

* zShrapnel work

* fix include

* zCameraTweak: Progress (#552)

* zCameraTweak: Progress for most functions

* zCameraTweak: Implement zCameraTweakGlobal_Update and clang-format

* zCameraTweak: Remove empty space and format

* zCameraTweak: Better name for local

* iTRC work + file cleanup

* removed most of CheckResetButton

* Big work to zMain

* Another big update to zMainParseIni

* MainParseINI update + cleanup

* Review Fixes

* Review Fixes 2

---------

Co-authored-by: energydrink02 <136357605+energydrink02@users.noreply.github.com>
Co-authored-by: Sebastián Meljem <95201472+0x5abe@users.noreply.github.com>
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