Skip to content

zNPC stuff#583

Merged
JoshSanch merged 1 commit intobfbbdecomp:mainfrom
escape209:work
Jun 17, 2025
Merged

zNPC stuff#583
JoshSanch merged 1 commit intobfbbdecomp:mainfrom
escape209:work

Conversation

@escape209
Copy link
Contributor

No description provided.

@github-actions
Copy link

🆗 ✅

+2310 bytes
🆗 Bot Rating: Amazing contribution, you are the decomp GOAT 🐐

No Regressions 🎉

Progress: 26

📈 main/SB/Game/zNPCGoalRobo - .text +1747 bytes -> 22.71%
📈 main/SB/Game/zNPCGoalRobo - .data +7 bytes -> 63.06%
📈 main/SB/Game/zNPCGoalRobo - .sdata2 +3 bytes -> 15.62%
📈 main/SB/Game/zNPCTypeCommon - .sdata2 +12 bytes -> 18.29%
main/SB/Game/zNPCGoalRobo - zNPCGoalRespawn::Enter(float, void*) +260 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalTubeAttack::MarySpinUp(float) +176 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertGlove::Enter(float, void*) +160 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalTubeLasso::Process(en_trantype*, float, void*, xScene*) +148 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertSleepy::Enter(float, void*) +144 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalRespawn::Exit(float, void*) +144 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAttackChuck::Enter(float, void*) +132 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAttackSlick::Enter(float, void*) +124 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertFodBomb::Enter(float, void*) +120 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertFodBomb::Detonate() +120 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalPatCarry::Enter(float, void*) +112 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalDogDash::HoundPlayer(float) +108 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon_Timestep(xScene*, float) +92 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimTimeRemain(xAnimState*) +92 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::MatPosSet(xVec3*) +76 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimDuration(xAnimState*) +68 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::FirstAssigned() +52 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimCurStateID() +52 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::CanDoSplines() +40 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCPlyrSnd_Update(float) +36 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimTimeCurrent() +20 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCPlyrSnd_Reset() +12 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.

Looks good! Please run a clang format pass on all of the files updated here and then you'll be good for merging.

@github-actions
Copy link

🆗 ✅

+2310 bytes
🆗 Bot Rating: Amazing contribution, you are the decomp GOAT 🐐

No Regressions 🎉

Progress: 26

📈 main/SB/Game/zNPCGoalRobo - .text +1747 bytes -> 22.71%
📈 main/SB/Game/zNPCGoalRobo - .data +7 bytes -> 63.06%
📈 main/SB/Game/zNPCGoalRobo - .sdata2 +3 bytes -> 15.62%
📈 main/SB/Game/zNPCTypeCommon - .sdata2 +12 bytes -> 18.29%
main/SB/Game/zNPCGoalRobo - zNPCGoalRespawn::Enter(float, void*) +260 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalTubeAttack::MarySpinUp(float) +176 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertGlove::Enter(float, void*) +160 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalTubeLasso::Process(en_trantype*, float, void*, xScene*) +148 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertSleepy::Enter(float, void*) +144 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalRespawn::Exit(float, void*) +144 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAttackChuck::Enter(float, void*) +132 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAttackSlick::Enter(float, void*) +124 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertFodBomb::Enter(float, void*) +120 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalAlertFodBomb::Detonate() +120 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalPatCarry::Enter(float, void*) +112 bytes -> 100.00%
main/SB/Game/zNPCGoalRobo - zNPCGoalDogDash::HoundPlayer(float) +108 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon_Timestep(xScene*, float) +92 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimTimeRemain(xAnimState*) +92 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::MatPosSet(xVec3*) +76 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimDuration(xAnimState*) +68 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::FirstAssigned() +52 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimCurStateID() +52 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::CanDoSplines() +40 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCPlyrSnd_Update(float) +36 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCCommon::AnimTimeCurrent() +20 bytes -> 100.00%
main/SB/Game/zNPCTypeCommon - zNPCPlyrSnd_Reset() +12 bytes -> 100.00%

@escape209
Copy link
Contributor Author

Done. There's a couple instances of incidental reformatting in those files, but it'll be fine.

@JoshSanch JoshSanch merged commit 43fe4ad into bfbbdecomp:main Jun 17, 2025
5 checks passed
@escape209 escape209 deleted the work branch July 22, 2025 17:15
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