Skip to content

zNPCSupplement work#526

Merged
mattbruv merged 1 commit intobfbbdecomp:mainfrom
escape209:znpcsupplement
Apr 28, 2025
Merged

zNPCSupplement work#526
mattbruv merged 1 commit intobfbbdecomp:mainfrom
escape209:znpcsupplement

Conversation

@escape209
Copy link
Contributor

No description provided.

@github-actions
Copy link

⚠️ 🔥

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

Regressions: 24

⚠️ main/SB/Game/zCamera - .sdata2 -40 bytes -> 10.91%
⚠️ main/SB/Game/zCamera - .text -835 bytes -> 26.96%
⚠️ main/SB/Game/zEntHangable - .rodata -110 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - .sbss -16 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - .text -496 bytes -> 0.00%
⚠️ main/SB/Game/zNPCSupplement - .bss -79488 bytes -> 0.02%
⚠️ main/SB/Game/zCamera - zCameraFlyUpdate(xCamera*, float) -704 bytes -> 0.00%
⚠️ main/SB/Game/zCamera - zFlyKey::operator=(const zFlyKey&) -132 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_SetupFX() -104 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - HangableSetup(zEntHangable*, xEntAsset*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Init(void*, void*) -32 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Init(zEntHangable*, xEntAsset*) -108 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_UpdateFX(zEntHangable*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Update(zEntHangable*, xScene*, float) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangableMountFX(zEntHangable*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangableEventCB(xBase*, xBase*, unsigned int, const float*, xBase*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - HangableIsMovingTooMuch(xVec3*, xVec3*, xVec3*, xVec3*) -8 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_SetMatrix(zEntHangable*, float) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Save(zEntHangable*, xSerial*) -32 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Load(zEntHangable*, xSerial*) -32 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_Reset(zEntHangable*) -80 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_SetShaggy(zEntHangable*, zEnt*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_FollowUpdate(zEntHangable*) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntHangable - zEntHangable_SetFollow(zEntHangable*, zEnt*) -68 bytes -> 0.00%

Progress: 43

📈 main/SB/Game/zNPCSupplement - .text +5855 bytes -> 36.11%
📈 main/SB/Game/zNPCSupplement - .sdata2 +60 bytes -> 19.89%
📈 main/SB/Game/zNPCSupplement - NPARParmTubeConfetti::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +640 bytes -> 99.38%
📈 main/SB/Game/zNPCSupplement - NPARParmSleepyZeez::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +492 bytes -> 99.19%
📈 main/SB/Game/zNPCSupplement - NPARParmTarTarGunk::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +492 bytes -> 99.19%
📈 main/SB/Game/zNPCSupplement - NPARParmFahrwerkz::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +492 bytes -> 99.19%
main/SB/Game/zNPCSupplement - NPARParmChuckSplash::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +400 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_Timestep(float) +171 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPARParmOilBub::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +192 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPARParmVisSplash::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +192 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPARParmTubeSpiral::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*, float) const +184 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPARParmGloveDust::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +172 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPARParmDogBreath::ConfigPar(NPARData*, en_nparmode, const xVec3*, const xVec3*) const +172 bytes -> 100.00%
📈 main/SB/Game/zNPCSupplement - NPAR_EmitTubeSpiral(const xVec3*, const xVec3*, float) +112 bytes -> 82.35%
📈 main/SB/Game/zNPCSupplement - NPAR_EmitTubeSpiralCin(const xVec3*, const xVec3*, float) +112 bytes -> 82.35%
main/SB/Game/zNPCSupplement - NPAR_EmitOilBubble(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitDroplets(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarGunk(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitDoggyBreath(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitVisSplash(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitFireworks(en_nparmode, const xVec3*, const xVec3*) +128 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTubeSparklies(const xVec3*, const xVec3*) +112 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTubeConfetti(const xVec3*, const xVec3*) +108 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitGloveDust(const xVec3*, const xVec3*) +108 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitSleepyZeez(const xVec3*, const xVec3*) +108 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPCC_ShadowCacheReset() +76 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitH2OTrail(const xVec3*) +48 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitOilShieldPop(const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitOilTrailz(const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitOilVapors(const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitOilSplash(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitH2ODrips(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitH2ODrops(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitH2OSpray(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarNozzle(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarTrail(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarSplash(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarSpoil(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitTarTarSmoke(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitDoggyWisps(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitDoggyAttack(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitVSSpray(const xVec3*, const xVec3*) +44 bytes -> 100.00%
main/SB/Game/zNPCSupplement - NPAR_EmitFWExhaust(const xVec3*, const xVec3*) +44 bytes -> 100.00%

@mattbruv mattbruv merged commit 52b94a8 into bfbbdecomp:main Apr 28, 2025
5 checks passed
JoshSanch added a commit that referenced this pull request May 8, 2025
* ship it, YOLO

* test

* BossSB2 functions and mem offsets

* wip push

* push fix

* couple of bossplankton functions.

* znpcmessenger function fix

* More xMath3 work (#513)

* More xMath3 work

* This isnt matching

* Update 🆗 bot

* zNPCGoalAmbient: zNPCGoalJellyBumped Near 100% Match (#514)

* 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

* Robo-Sandy: Function Progress (#515)

* 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

* zNPCFXCinematic -> NPARMgmt::KillAll() 100% (#516)

* 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

* xSnd work (#517)

* 40% - 92% for some NCIN_Par functions in zNPCFXCinematic (#518)

* 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

* xCM work (#520)

* Robo-Sandy Callback Funcs and Idle Goal Impl (#521)

* 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

* Working more on zNPCFXCinematic with one 100% and started on other functions (#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 (#522)

* 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)

* 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)

* first fn

* save

* moreo prrogress

* static vars

* hangable_reset

* setfollow

* setupfx

* stub fns

* cleanup

* fix build

* zCamera: 95% match on zCameraFlyUpdate (#525)

* zNPCSupplement work (#526)

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

* zNPCSupport work (#528)

* zCamera: zCameraFlyRestoreBackup and zCameraRewardUpdate functions (#529)

* zNPCSpawner: Matches and additional function definitions (#530)

* zNPCSpawner: Matches and additional function definitions

* Config: Use more VS Code-friendly settings

* Little bit of zNPCtypeBossPlankton

---------

Co-authored-by: Matt P <mattp3259@gmail.com>
Co-authored-by: escape209 <agtescape@gmail.com>
Co-authored-by: mattbruv <5638426+mattbruv@users.noreply.github.com>
Co-authored-by: Joshua Sanchez <joshuaesanch@gmail.com>
Co-authored-by: Red <53205920+Redberd36@users.noreply.github.com>
@escape209 escape209 deleted the znpcsupplement 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