zNPCTypeBossPlankton by LivewireCB · Pull Request #531 · bfbbdecomp/bfbb

LivewireCB · 2025-05-08T16:51:03Z

A little bit of work in zNPCTypeBossPlankton. Mainly some enter and exits for his states.

* More xMath3 work * This isnt matching

* zNPCTypeCommon: Add declaration for zNPCCommon::HaveLOSToPos * zNPCTypeAmbient: Add declarations for zNPCJellly ActLikeOctopus and JellyBoneWorldPos * zFX: Add overload declarations for zFX_SpawnBubbleTrail * xFX: Add overload declaration for xFXStreakUpdate * zNPCGoalAmbient: Nearly 100% match for all zNPCGoalJellyBumped functions * zNPCGoalAmbient: Fix flipped registers in CalcEndPoint implementation

* zNPCTypeVillager: Limit scope of g_sndTrax_Villager * zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * zNPCTypeBossSandy: Unextern floats and match most data * Sandy: Several function matches + some WIP * Sandy: Fix regression in ZNPC_AnimTable_BossSandy and increase matchingness

* Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file

* Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file * 40% - 92% for some NCIN_Par functions in zNPCFXCinematic * Pointer name fixes for NCIN_Par functions in zNPCFXCinematic + one 100% zTalkBox function * Deleted static variables top of script

* zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * zNPCTypeBossSandy: sit, getUp, runToRope, clothesline callbacks * zNPCTypeBossSandy: zNPCGoalBossSandyIdle virtual implementations * Fix: Remove redef of SandyLimbSpring bc rebasing is hard

…nctions (#519) * Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file * 40% - 92% for some NCIN_Par functions in zNPCFXCinematic * Pointer name fixes for NCIN_Par functions in zNPCFXCinematic + one 100% zTalkBox function * Deleted static variables top of script * Working more on zNPCFXCinematic with one 100% and started some others. * Working more on zNPCFXCinematic with one 100% and started some others. * Fixed a minor error in zNPCFXCinematic * Fixed a minor error in zTalkBox * Fixed another minor error in zTalkBox * Fixed formatting and removed a zTalkBox function

* Match most of iMix * Correct MIXUnMute signature * Hack around not being able to use _AXVPB. Having issues including it for some reason.

* zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * Fix: Remove redef of SandyLimbSpring bc rebasing is hard * zNPCTypeBossSandy: Taunt, Chase, and Melee goal virtual method impls * zNPCTypeBossSandy: NoHead Goal Enter match, Process WIP

* first fn * save * moreo prrogress * static vars * hangable_reset * setfollow * setupfx * stub fns * cleanup * fix build

)

* zNPCSpawner: Matches and additional function definitions * Config: Use more VS Code-friendly settings

github-actions · 2025-05-08T16:52:17Z

🆗 ✅

+1346 bytes
🆗 Bot Rating: A fantastic contribution! ✨🎉

No Regressions 🎉

Progress: 22

📈 main/SB/Game/zNPCTypeDutchman - .text +340 bytes -> 10.97%
📈 main/SB/Game/zNPCTypeBossPlankton - .text +723 bytes -> 11.16%
📈 main/SB/Game/zNPCTypeDutchman - .text +76 bytes -> 8.17%
📈 main/SB/Game/zNPCTypeBossPlankton - .data +199 bytes -> 48.57%
📈 main/SB/Game/zNPCTypeDutchman - .data +4 bytes -> 64.29%
📈 main/SB/Game/zNPCTypeDutchman - .sdata2 +3 bytes -> 1.01%
📈 main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::play_sound(int, const xVec3*, float) +4 bytes -> 1.41%
📈 main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBeam::Enter(float, void*) +72 bytes -> 40.91%
📈 main/SB/Game/zNPCTypeDutchman - zNPCGoalDutchmanIdle::Process(en_trantype*, float, void*, xScene*) +20 bytes -> 85.71%
✅ main/SB/Game/zNPCTypeDutchman - zNPCGoalDutchmanDeath::Process(en_trantype*, float, void*, xScene*) +156 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonHunt::Enter(float, void*) +148 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonStun::Enter(float, void*) +120 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonDizzy::Enter(float, void*) +120 bytes -> 100.00%
📈 main/SB/Game/zNPCTypeDutchman - zNPCGoalDutchmanDeath::Exit(float, void*) +96 bytes -> 80.00%
📈 main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBomb::create(int, RyzMemGrow*, void*) +4 bytes -> 3.57%
📈 main/SB/Game/zNPCTypeDutchman - zNPCGoalDutchmanDisappear::create(int, RyzMemGrow*, void*) +68 bytes -> 60.71%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonStun::Exit(float, void*) +100 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonHunt::Exit(float, void*) +88 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeDutchman - zNPCGoalDutchmanDisappear::zNPCGoalDutchmanDisappear(int, zNPCDutchman&) +76 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBomb::Enter(float, void*) +32 bytes -> 100.00%
✅ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBomb::Exit(float, void*) +32 bytes -> 100.00%
📈 main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::get_player_loc() +4 bytes -> 16.67%

JoshSanch · 2025-05-08T16:53:36Z

my goat

mattbruv and others added 30 commits March 28, 2025 21:45

ship it, YOLO

1620763

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

14fa5eb

test

869d131

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

a4121cc

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

7d1abcb

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

dfe2fe1

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

17beb0a

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

9d3b36a

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

d581911

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

08752c9

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

b80b505

BossSB2 functions and mem offsets

371797f

b upd

0bb02b1

Merge branch 'main' into dev2

106a439

wip push

a96d1e8

push fix

1326187

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

15c17d9

Merge branch 'main' into dev2

f6e9c89

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

a8fe36e

Merge branch 'main' into dev2

52cdd27

couple of bossplankton functions.

165d8b9

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

bd5ca44

Merge branch 'main' into dev2

bbe0951

znpcmessenger function fix

d282032

Merge branch 'main' of https://github.com/bfbbdecomp/bfbb

35274fa

Merge branch 'main' into dev2

9ad6c7e

More xMath3 work (#513)

1831bfb

* More xMath3 work * This isnt matching

Update 🆗 bot

d0f5c2a

Redberd36 and others added 16 commits May 7, 2025 22:40

xSnd work (#517)

8090d4a

xCM work (#520)

320ff60

Match most of iMix (#522)

155a222

* Match most of iMix * Correct MIXUnMute signature * Hack around not being able to use _AXVPB. Having issues including it for some reason.

Robosandy: Progress (#523)

72d16df

* zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * Fix: Remove redef of SandyLimbSpring bc rebasing is hard * zNPCTypeBossSandy: Taunt, Chase, and Melee goal virtual method impls * zNPCTypeBossSandy: NoHead Goal Enter match, Process WIP

zEntHangable progress (#524)

a5578fc

* first fn * save * moreo prrogress * static vars * hangable_reset * setfollow * setupfx * stub fns * cleanup * fix build

zCamera: 95% match on zCameraFlyUpdate (#525)

267a5a0

zNPCSupplement work (#526)

86edb60

zCamera: Equiv/Near Equiv for more functions (#527)

d6ba7af

zNPCSupport work (#528)

5c34c6a

zCamera: zCameraFlyRestoreBackup and zCameraRewardUpdate functions (#529

02ce069

)

zNPCSpawner: Matches and additional function definitions (#530)

6e054a3

* zNPCSpawner: Matches and additional function definitions * Config: Use more VS Code-friendly settings

Little bit of zNPCtypeBossPlankton

793784c

JoshSanch merged commit 3184e32 into bfbbdecomp:main May 8, 2025
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zNPCTypeBossPlankton#531

zNPCTypeBossPlankton#531
JoshSanch merged 46 commits intobfbbdecomp:mainfrom
LivewireCB:dev2

LivewireCB commented May 8, 2025

Uh oh!

github-actions bot commented May 8, 2025

Uh oh!

JoshSanch commented May 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

LivewireCB commented May 8, 2025

Uh oh!

github-actions bot commented May 8, 2025

🆗 ✅

No Regressions 🎉

Progress: 22

Uh oh!

JoshSanch commented May 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants