zNPCTypeKingJelly: Additional Function and Data Matching by JoshSanch · Pull Request #767 · bfbbdecomp/bfbb

JoshSanch · 2026-07-28T04:52:35Z

No description provided.

github-actions · 2026-07-28T04:54:26Z

`main/SB/Core/x/xSnd`

	Section	From	To	Bytes
️⚠️	`.sdata2`	76.92%	66.67%	--3
️⚠️	`.text`	49.50%	46.04%	--223

	Function	From	To	Bytes
️⚠️	`xSndProcessSoundPos(const xVec3, xVec3)`	75.36%	0.00%	--223

`main/SB/Game/zFX`

	Section	From	To	Bytes
️⚠️	`.data`	40.74%	0.00%	--88
️⚠️	`.rodata`	62.91%	55.41%	--82
️⚠️	`.sbss`	100.00%	44.44%	--13
️⚠️	`.sdata`	100.00%	0.00%	--16
️⚠️	`.sdata2`	86.79%	23.53%	--75
️⚠️	`.text`	42.44%	8.95%	--6133

	Function	From	To	Bytes
️⚠️	`zFX_SceneEnter(RpWorld*)`	100.00%	0.00%	--236
️⚠️	`zFXGooEnable(RpAtomic*, int)`	90.88%	0.00%	--908
️⚠️	`zFXGooUpdateInstance(zFXGooInstance*, float)`	99.62%	0.00%	--1056
️⚠️	`zFXGooRenderAtomic(RpAtomic*)`	88.92%	0.00%	--1269
️⚠️	`zFXGooFreeze(RpAtomic, const xVec3, xVec3*)`	96.11%	0.00%	--603
️⚠️	`zFXGooIs(xEnt*, float&, unsigned int)`	98.31%	0.00%	--487
️⚠️	`zFXGooEventSetWarb(xEnt, const float)`	100.00%	0.00%	--364
️⚠️	`zFXGooEventSetFreezeDuration(xEnt*, float)`	100.00%	0.00%	--524
️⚠️	`zFXGooEventMelt(xEnt*)`	93.23%	0.00%	--496
️⚠️	`zFXGooFreezeTimeLeft()`	100.00%	0.00%	--124
️⚠️	`zFX_SpawnBubbleHit(const xVec3, unsigned int, const xVec3, const xVec3*, float)`	0.85%	0.00%	--4
️⚠️	`@unnamed@zFX_cpp@::model_is_preinstanced(RpAtomic*)`	100.00%	0.00%	--56
️⚠️	`xDebugAddTweak(const char, const char, const tweak_callback, void, unsigned int)`	100.00%	0.00%	--4

`main/SB/Game/zVolume`

	Section	From	To	Bytes
️⚠️	`.sbss`	100.00%	0.00%	--16
️⚠️	`.sdata2`	100.00%	0.00%	--8

	Function	From	To	Bytes

`main/SB/Core/gc/iModel`

	Section	From	To	Bytes
️⚠️	`.rodata`	100.00%	73.68%	--12
️⚠️	`.sbss`	100.00%	86.84%	--6
️⚠️	`.sdata2`	100.00%	71.43%	--11
️⚠️	`.text`	94.34%	65.70%	--2157

	Function	From	To	Bytes
️⚠️	`FindAndInstanceAtomicCallback(RpAtomic, void)`	94.11%	93.72%	--1
️⚠️	`iModelStreamRead(RwStream*)`	97.36%	0.00%	--611
️⚠️	`iModelCull(RpAtomic, RwMatrixTag)`	93.78%	88.03%	--17
️⚠️	`iModelVertEval(RpAtomic, unsigned int, unsigned int, RwMatrixTag, xVec3, xVec3)`	99.83%	2.37%	--229
️⚠️	`iModelNormalEval(xVec3, const RpAtomic&, const RwMatrixTag, unsigned long, int, const xVec3*)`	100.00%	2.09%	--262
️⚠️	`iModelTagUserData(xModelTag, RpAtomic, float, float, float, int)`	100.00%	1.36%	--406
️⚠️	`xModelTag::operator=(const xModelTag&)`	14.88%	0.00%	--10
️⚠️	`iModelTagInternal(xModelTag, RpAtomic, float, float, float, int)`	100.00%	1.35%	--410
️⚠️	`iModelSetMaterialAlpha(RpAtomic*, unsigned char)`	79.83%	3.33%	--91
️⚠️	`iModelMaterialMul(RpAtomic*, float, float, float)`	93.59%	3.12%	--115

`main/SB/Game/zNPCMgr`

	Section	From	To	Bytes

	Function	From	To	Bytes

`main/SB/Game/zNPCTypeRobot`

	Section	From	To	Bytes
️⚠️	`.data`	67.36%	67.09%	--12
️⚠️	`.text`	36.58%	36.53%	--32

	Function	From	To	Bytes
️⚠️	`ZNPC_Robot_Startup()`	97.67%	88.12%	--32

`main/SB/Game/zNPCTypeAmbient`

	Section	From	To	Bytes
️⚠️	`.data`	98.02%	65.26%	--304
️⚠️	`.rodata`	91.96%	88.99%	--7
️⚠️	`.sdata2`	68.42%	54.41%	--13
️⚠️	`.text`	65.81%	52.95%	--984

	Function	From	To	Bytes
️⚠️	`ZNPC_Create_Ambient(int, RyzMemGrow, void)`	100.00%	1.73%	--318
️⚠️	`zNPCAmbient::Init(xEntAsset*)`	100.00%	0.00%	--72
️⚠️	`zNPCAmbient::AnimPick(int, en_NPC_GOAL_SPOT, xGoal*)`	100.00%	0.00%	--88
️⚠️	`zNPCAmbient::NPCMessage(NPCMsg*)`	19.11%	0.00%	--46
️⚠️	`zNPCJelly::AnimPick(int, en_NPC_GOAL_SPOT, xGoal*)`	100.00%	96.14%	--9
️⚠️	`zNPCJelly::PlayWithAlpha(float)`	2.00%	0.00%	--4
️⚠️	`zNPCJelly::PumpFaster()`	74.44%	0.00%	--128
️⚠️	`zNPCJelly::JellyBoneWorldPos(xVec3*, int) const`	1.61%	0.00%	--4
️⚠️	`zNPCJelly::PlayWithLightnin()`	2.13%	0.00%	--3
️⚠️	`zNPCJelly::ActLikeOctopus()`	66.05%	0.00%	--116
️⚠️	`zNPCNeptune::AnimPick(int, en_NPC_GOAL_SPOT, xGoal*)`	2.64%	0.00%	--5
️⚠️	`zNPCMimeFish::AnimPick(int, en_NPC_GOAL_SPOT, xGoal*)`	100.00%	0.00%	--88
️⚠️	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	100.00%	0.00%	--100

`main/SB/Game/zNPCTypeKingJelly`

	Section	From	To	Bytes
📈	`.bss`	0.00%	94.74%	+3781
📈	`.data`	54.96%	76.13%	+193
📈	`.rodata`	3.89%	4.23%	+14
✅	`.sbss`	0.00%	100.00%	+24
📈	`.sdata2`	70.39%	74.34%	+12
📈	`.text`	41.05%	46.53%	+1886

	Function	From	To	Bytes
✅	`@unnamed@zNPCTypeKingJelly_cpp@::init_sound()`	0.00%	100.00%	+172
📈	`@unnamed@zNPCTypeKingJelly_cpp@::play_sound_immediate(int, const xVec3*)`	0.00%	81.48%	+198
📈	`@unnamed@zNPCTypeKingJelly_cpp@::play_sound(int, const xVec3*)`	4.12%	94.12%	+122
✅	`@unnamed@zNPCTypeKingJelly_cpp@::sound_update(float)`	0.00%	100.00%	+168
📈	`@unnamed@zNPCTypeKingJelly_cpp@::set_ring_segments(const xVec3&, float, float)`	0.00%	39.84%	+256
✅	`@unnamed@zNPCTypeKingJelly_cpp@::updown_ring_update(lightning_ring&, float)`	0.00%	100.00%	+152
✅	`@unnamed@zNPCTypeKingJelly_cpp@::expand_ring_update(lightning_ring&, float)`	0.00%	100.00%	+164
✅	`zNPCKingJelly::zNPCKingJelly(int)`	0.00%	100.00%	+96
📈	`@unnamed@zNPCTypeKingJelly_cpp@::tweak_group::register_tweaks(bool, xModelAssetParam, unsigned int, const char)`	99.70%	99.93%	+21
✅	`zNPCKingJelly::Damage(en_NPC_DAMAGE_TYPE, xBase, const xVec3)`	0.00%	100.00%	+228
✅	`zNPCKingJelly::update_camera(float)`	0.00%	100.00%	+76
✅	`zNPCKingJelly::set_life(int)`	0.00%	100.00%	+232

`main/SB/Game/zNPCTypeBossPlankton`

	Section	From	To	Bytes
️⚠️	`.text`	48.52%	48.48%	--12

	Function	From	To	Bytes
️⚠️	`zNPCBPlankton::disable_emitter(xParEmitter&) const`	100.00%	25.00%	--12

`main/SB/Core/x/xCM`

	Section	From	To	Bytes
️⚠️	`.rodata`	100.00%	0.00%	--536
️⚠️	`.sdata`	100.00%	0.00%	--8
️⚠️	`.sdata2`	100.00%	36.36%	--25
️⚠️	`.text`	91.31%	20.00%	--1568

	Function	From	To	Bytes
️⚠️	`xCMcolor_scale(iColor_tag, float)`	67.46%	0.00%	--129
️⚠️	`xColorInit(iColor_tag*, unsigned char, unsigned char, unsigned char, unsigned char)`	100.00%	0.00%	--20
️⚠️	`xCMrender(float, xCreditsData*)`	93.58%	0.00%	--1426
✅	`xCMupdate(float)`	91.50%	100.00%	+6

SquareMan · 2026-07-28T05:23:31Z

+        }
+
+        S32 size = 0.5f + ((2.0f * radius * PI) / segment_length);
+        size = (size + 7) & ~7;


Does ALIGN_NEXT from macros.h work here?

it does not :(

SquareMan · 2026-07-28T05:35:57Z

Have you checked the regressions? I think your branch just needs to be rebased

…pdown_ring_update, expand_ring_update, and sound_update

github-actions · 2026-07-29T01:54:25Z

`main/SB/Game/zNPCTypeKingJelly`

	Section	From	To	Bytes
📈	`.bss`	0.00%	94.74%	+3781
📈	`.data`	54.96%	76.13%	+193
📈	`.rodata`	3.89%	4.23%	+14
✅	`.sbss`	0.00%	100.00%	+24
📈	`.sdata2`	70.39%	74.34%	+12
📈	`.text`	41.05%	46.53%	+1886

	Function	From	To	Bytes
✅	`@unnamed@zNPCTypeKingJelly_cpp@::init_sound()`	0.00%	100.00%	+172
📈	`@unnamed@zNPCTypeKingJelly_cpp@::play_sound_immediate(int, const xVec3*)`	0.00%	81.48%	+198
📈	`@unnamed@zNPCTypeKingJelly_cpp@::play_sound(int, const xVec3*)`	4.12%	94.12%	+122
✅	`@unnamed@zNPCTypeKingJelly_cpp@::sound_update(float)`	0.00%	100.00%	+168
📈	`@unnamed@zNPCTypeKingJelly_cpp@::set_ring_segments(const xVec3&, float, float)`	0.00%	39.84%	+256
✅	`@unnamed@zNPCTypeKingJelly_cpp@::updown_ring_update(lightning_ring&, float)`	0.00%	100.00%	+152
✅	`@unnamed@zNPCTypeKingJelly_cpp@::expand_ring_update(lightning_ring&, float)`	0.00%	100.00%	+164
✅	`zNPCKingJelly::zNPCKingJelly(int)`	0.00%	100.00%	+96
📈	`@unnamed@zNPCTypeKingJelly_cpp@::tweak_group::register_tweaks(bool, xModelAssetParam, unsigned int, const char)`	99.70%	99.93%	+21
✅	`zNPCKingJelly::Damage(en_NPC_DAMAGE_TYPE, xBase, const xVec3)`	0.00%	100.00%	+228
✅	`zNPCKingJelly::update_camera(float)`	0.00%	100.00%	+76
✅	`zNPCKingJelly::set_life(int)`	0.00%	100.00%	+232

JoshSanch requested a review from SquareMan July 28, 2026 04:53

SquareMan reviewed Jul 28, 2026

View reviewed changes

JoshSanch added 6 commits July 28, 2026 20:52

zNPCTypeKingJelly: Sound func matching progress and data matching

604a94f

zNPCTypeKingJelly: 100% function match for update_camera and set_life

a455050

zNPCTypeKingJelly: 100% match on constructor

43b6195

zNPCTypeKingJelly: Move sound_flags to .rodata

18963b3

zNPCTypeKingJelly: WIP for set_ring_segments, 100% code matches for u…

1b1d0fb

…pdown_ring_update, expand_ring_update, and sound_update

zNPCTypeKingJelly: 100% match for Damage function

de507de

JoshSanch force-pushed the zNPCTypeKingJelly branch from 2f46170 to de507de Compare July 29, 2026 01:52

JoshSanch merged commit 3e85465 into bfbbdecomp:main Jul 29, 2026
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

zNPCTypeKingJelly: Additional Function and Data Matching - #767

zNPCTypeKingJelly: Additional Function and Data Matching#767
JoshSanch merged 6 commits into
bfbbdecomp:mainfrom
JoshSanch:zNPCTypeKingJelly

JoshSanch commented Jul 28, 2026

Uh oh!

github-actions Bot commented Jul 28, 2026

Uh oh!

SquareMan Jul 28, 2026

Uh oh!

JoshSanch Jul 29, 2026

Uh oh!

SquareMan commented Jul 28, 2026

Uh oh!

github-actions Bot commented Jul 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

JoshSanch commented Jul 28, 2026

Uh oh!

github-actions Bot commented Jul 28, 2026

main/SB/Core/x/xSnd

main/SB/Game/zFX

main/SB/Game/zVolume

main/SB/Core/gc/iModel

main/SB/Game/zNPCMgr

main/SB/Game/zNPCTypeRobot

main/SB/Game/zNPCTypeAmbient

main/SB/Game/zNPCTypeKingJelly

main/SB/Game/zNPCTypeBossPlankton

main/SB/Core/x/xCM

Uh oh!

SquareMan Jul 28, 2026

Choose a reason for hiding this comment

Uh oh!

JoshSanch Jul 29, 2026

Choose a reason for hiding this comment

Uh oh!

SquareMan commented Jul 28, 2026

Uh oh!

github-actions Bot commented Jul 29, 2026

main/SB/Game/zNPCTypeKingJelly

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

`main/SB/Core/x/xSnd`

`main/SB/Game/zFX`

`main/SB/Game/zVolume`

`main/SB/Core/gc/iModel`

`main/SB/Game/zNPCMgr`

`main/SB/Game/zNPCTypeRobot`

`main/SB/Game/zNPCTypeAmbient`

`main/SB/Game/zNPCTypeKingJelly`

`main/SB/Game/zNPCTypeBossPlankton`

`main/SB/Core/x/xCM`

`main/SB/Game/zNPCTypeKingJelly`