xEntBoulder work by escape209 · Pull Request #649 · bfbbdecomp/bfbb

escape209 · 2025-11-19T15:06:51Z

Few variable names not right but I feel like I need to understand the code better to give more accurate variable names.

github-actions · 2025-11-19T15:08:29Z

`main/SB/Core/x/xEntBoulder`

	Section	From	To	Bytes
✅	`.bss`	0.00%	100.00%	+1464
✅	`.data`	0.00%	100.00%	+192
✅	`.rodata`	0.00%	100.00%	+80
✅	`.sdata`	0.00%	100.00%	+8
📈	`.sdata2`	14.29%	96.00%	+84
📈	`.text`	3.00%	79.14%	+8835

	Function	From	To	Bytes
📈	`xEntBoulder_Render(xEnt*)`	0.00%	96.25%	+277
📈	`xEntBoulder_Init(xEntBoulder, xEntAsset)`	0.00%	99.86%	+531
✅	`xEntBoulder_ApplyForces(xEntCollis*)`	0.00%	100.00%	+236
✅	`xEntBoulder_RealBUpdate(xEnt, xVec3)`	0.00%	100.00%	+104
📈	`xEntBoulder_Update(xEntBoulder, xScene, float)`	0.00%	99.98%	+3495
✅	`xEntBoulder_KilledBySurface(xEntBoulder, xScene, float)`	0.00%	100.00%	+616
✅	`xEntBoulder_Kill(xEntBoulder*)`	0.00%	100.00%	+116
📈	`xEntBoulder_BubbleBowl(float)`	0.00%	97.20%	+828
✅	`xEntBoulder_Reset(xEntBoulder, xScene)`	0.00%	100.00%	+348
✅	`xBoulderGenerator_Init(xBase&, xDynAsset&, unsigned long)`	0.00%	100.00%	+32
✅	`xBoulderGenerator_Init(xBoulderGenerator, xBoulderGeneratorAsset)`	0.00%	100.00%	+428
✅	`xBoulderGenerator_Reset(xBoulderGenerator*)`	0.00%	100.00%	+120
✅	`BoulderGen_GiveBirth(xBoulderGenerator*, int)`	0.00%	100.00%	+68
✅	`GetBoulderForGenerating(xBoulderGenerator*)`	0.00%	100.00%	+360
✅	`xBoulderGenerator_Launch(xBoulderGenerator, xVec3, float)`	0.00%	100.00%	+424
✅	`xBoulderGenerator_EventCB(xBase, xBase, unsigned int, const float, xBase)`	0.00%	100.00%	+752
✅	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	0.00%	100.00%	+100

github-actions · 2025-11-19T16:09:17Z

`main/SB/Core/x/xEntBoulder`

	Section	From	To	Bytes
✅	`.bss`	0.00%	100.00%	+1464
✅	`.data`	0.00%	100.00%	+192
✅	`.rodata`	0.00%	100.00%	+80
✅	`.sdata`	0.00%	100.00%	+8
📈	`.sdata2`	14.29%	96.00%	+84
📈	`.text`	3.00%	79.14%	+8835

	Function	From	To	Bytes
📈	`xEntBoulder_Render(xEnt*)`	0.00%	96.25%	+277
📈	`xEntBoulder_Init(xEntBoulder, xEntAsset)`	0.00%	99.86%	+531
✅	`xEntBoulder_ApplyForces(xEntCollis*)`	0.00%	100.00%	+236
✅	`xEntBoulder_RealBUpdate(xEnt, xVec3)`	0.00%	100.00%	+104
📈	`xEntBoulder_Update(xEntBoulder, xScene, float)`	0.00%	99.98%	+3495
✅	`xEntBoulder_KilledBySurface(xEntBoulder, xScene, float)`	0.00%	100.00%	+616
✅	`xEntBoulder_Kill(xEntBoulder*)`	0.00%	100.00%	+116
📈	`xEntBoulder_BubbleBowl(float)`	0.00%	97.20%	+828
✅	`xEntBoulder_Reset(xEntBoulder, xScene)`	0.00%	100.00%	+348
✅	`xBoulderGenerator_Init(xBase&, xDynAsset&, unsigned long)`	0.00%	100.00%	+32
✅	`xBoulderGenerator_Init(xBoulderGenerator, xBoulderGeneratorAsset)`	0.00%	100.00%	+428
✅	`xBoulderGenerator_Reset(xBoulderGenerator*)`	0.00%	100.00%	+120
✅	`BoulderGen_GiveBirth(xBoulderGenerator*, int)`	0.00%	100.00%	+68
✅	`GetBoulderForGenerating(xBoulderGenerator*)`	0.00%	100.00%	+360
✅	`xBoulderGenerator_Launch(xBoulderGenerator, xVec3, float)`	0.00%	100.00%	+424
✅	`xBoulderGenerator_EventCB(xBase, xBase, unsigned int, const float, xBase)`	0.00%	100.00%	+752
✅	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	0.00%	100.00%	+100

github-actions · 2025-11-19T17:47:14Z

`main/SB/Core/x/xEntBoulder`

	Section	From	To	Bytes
✅	`.bss`	0.00%	100.00%	+1464
✅	`.data`	0.00%	100.00%	+192
✅	`.rodata`	0.00%	100.00%	+80
✅	`.sdata`	0.00%	100.00%	+8
📈	`.sdata2`	14.29%	96.00%	+84
📈	`.text`	3.00%	79.14%	+8835

	Function	From	To	Bytes
📈	`xEntBoulder_Render(xEnt*)`	0.00%	96.25%	+277
📈	`xEntBoulder_Init(xEntBoulder, xEntAsset)`	0.00%	99.86%	+531
✅	`xEntBoulder_ApplyForces(xEntCollis*)`	0.00%	100.00%	+236
✅	`xEntBoulder_RealBUpdate(xEnt, xVec3)`	0.00%	100.00%	+104
📈	`xEntBoulder_Update(xEntBoulder, xScene, float)`	0.00%	99.98%	+3495
✅	`xEntBoulder_KilledBySurface(xEntBoulder, xScene, float)`	0.00%	100.00%	+616
✅	`xEntBoulder_Kill(xEntBoulder*)`	0.00%	100.00%	+116
📈	`xEntBoulder_BubbleBowl(float)`	0.00%	97.20%	+828
✅	`xEntBoulder_Reset(xEntBoulder, xScene)`	0.00%	100.00%	+348
✅	`xBoulderGenerator_Init(xBase&, xDynAsset&, unsigned long)`	0.00%	100.00%	+32
✅	`xBoulderGenerator_Init(xBoulderGenerator, xBoulderGeneratorAsset)`	0.00%	100.00%	+428
✅	`xBoulderGenerator_Reset(xBoulderGenerator*)`	0.00%	100.00%	+120
✅	`BoulderGen_GiveBirth(xBoulderGenerator*, int)`	0.00%	100.00%	+68
✅	`GetBoulderForGenerating(xBoulderGenerator*)`	0.00%	100.00%	+360
✅	`xBoulderGenerator_Launch(xBoulderGenerator, xVec3, float)`	0.00%	100.00%	+424
✅	`xBoulderGenerator_EventCB(xBase, xBase, unsigned int, const float, xBase)`	0.00%	100.00%	+752
✅	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	0.00%	100.00%	+100

JoshSanch · 2025-11-19T23:58:39Z

src/SB/Core/x/xEntBoulder.cpp

+    xVec3 shadVec;
+    F32 radius;
+
+    if ((model != NULL) && (xEntIsVisible(ent) != 0))


Suggested change

if ((model != NULL) && (xEntIsVisible(ent) != 0))

if ((model != NULL) && (xEntIsVisible(ent) != FALSE))

JoshSanch · 2025-11-20T00:01:56Z

src/SB/Core/x/xEntBoulder.cpp

+            case 0:
+                if (ent->flags & 0x40)
+                {
+                    if (iModelCull(model->Data, model->Mat) == 0)


Suggested change

if (iModelCull(model->Data, model->Mat) == 0)

if (!iModelCull(model->Data, model->Mat))

JoshSanch · 2025-11-20T00:02:15Z

src/SB/Core/x/xEntBoulder.cpp

+                    shadVec.y = model->Mat->pos.y - 10.0f;
+                    shadVec.z = model->Mat->pos.z;
+
+                    if (iModelCullPlusShadow(model->Data, model->Mat, &shadVec, &shadowResult) == 0)


Suggested change

if (iModelCullPlusShadow(model->Data, model->Mat, &shadVec, &shadowResult) == 0)

if (!iModelCullPlusShadow(model->Data, model->Mat, &shadVec, &shadowResult))

JoshSanch · 2025-11-20T00:07:23Z

src/SB/Core/x/xEntBoulder.cpp

+                        xModelRender(model);
+                    }
+
+                    if (shadowResult == 0)


Generally opt for !truthyValue instead of truthyValue == 0/FALSE) - it's more aligned with project conventions.

JoshSanch · 2025-11-20T00:08:46Z

src/SB/Core/x/xEntBoulder.cpp

+    xEntBoulderAsset* basset;
+
+    xEntInit(ent, asset);
+    ent->collType = 4;


Please use the coll types xEnt.h, such as XENT_COLLTYPE_DYN.

JoshSanch · 2025-11-20T00:09:28Z

src/SB/Core/x/xEntBoulder.cpp

+    xEntInit(ent, asset);
+    ent->collType = 4;
+    ent->collLev = 4;
+    ent->bound.type = 1;


Bound type macros can be find in xBound.h - please use that instead.

src/SB/Core/x/xEntBoulder.cpp

github-actions · 2025-11-20T10:22:54Z

`main/SB/Core/x/xEntBoulder`

	Section	From	To	Bytes
✅	`.bss`	0.00%	100.00%	+1464
✅	`.data`	0.00%	100.00%	+192
✅	`.rodata`	0.00%	100.00%	+80
✅	`.sdata`	0.00%	100.00%	+8
📈	`.sdata2`	14.29%	96.00%	+84
📈	`.text`	3.00%	79.14%	+8835

	Function	From	To	Bytes
📈	`xEntBoulder_Render(xEnt*)`	0.00%	96.25%	+277
📈	`xEntBoulder_Init(xEntBoulder, xEntAsset)`	0.00%	99.86%	+531
✅	`xEntBoulder_ApplyForces(xEntCollis*)`	0.00%	100.00%	+236
✅	`xEntBoulder_RealBUpdate(xEnt, xVec3)`	0.00%	100.00%	+104
📈	`xEntBoulder_Update(xEntBoulder, xScene, float)`	0.00%	99.98%	+3495
✅	`xEntBoulder_KilledBySurface(xEntBoulder, xScene, float)`	0.00%	100.00%	+616
✅	`xEntBoulder_Kill(xEntBoulder*)`	0.00%	100.00%	+116
📈	`xEntBoulder_BubbleBowl(float)`	0.00%	97.20%	+828
✅	`xEntBoulder_Reset(xEntBoulder, xScene)`	0.00%	100.00%	+348
✅	`xBoulderGenerator_Init(xBase&, xDynAsset&, unsigned long)`	0.00%	100.00%	+32
✅	`xBoulderGenerator_Init(xBoulderGenerator, xBoulderGeneratorAsset)`	0.00%	100.00%	+428
✅	`xBoulderGenerator_Reset(xBoulderGenerator*)`	0.00%	100.00%	+120
✅	`BoulderGen_GiveBirth(xBoulderGenerator*, int)`	0.00%	100.00%	+68
✅	`GetBoulderForGenerating(xBoulderGenerator*)`	0.00%	100.00%	+360
✅	`xBoulderGenerator_Launch(xBoulderGenerator, xVec3, float)`	0.00%	100.00%	+424
✅	`xBoulderGenerator_EventCB(xBase, xBase, unsigned int, const float, xBase)`	0.00%	100.00%	+752
✅	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	0.00%	100.00%	+100

`main/dolphin/src/ax/AXAlloc`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	97.44%	--31

	Function	From	To	Bytes
️⚠️	`AXAcquireVoice`	100.00%	91.59%	--31

`main/dolphin/src/ax/AXCL`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	84.77%	--277

	Function	From	To	Bytes
️⚠️	`__AXNextFrame`	100.00%	83.81%	--277

`main/dolphin/src/ax/AXOut`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	80.41%	--391

	Function	From	To	Bytes
️⚠️	`__AXOutInit`	100.00%	57.79%	--391

`main/dolphin/src/ax/AXVPB`

	Section	From	To	Bytes
️⚠️	`.data`	100.00%	51.11%	--109
️⚠️	`.text`	100.00%	90.69%	--431

	Function	From	To	Bytes
️⚠️	`__AXServiceVPB`	100.00%	90.61%	--175
️⚠️	`__AXSyncPBs`	100.00%	84.64%	--97
️⚠️	`__AXVPBInit`	100.00%	68.88%	--159

`main/dolphin/src/ax/DSPCode`

	Section	From	To	Bytes
️⚠️	`.data`	100.00%	17.67%	--6480
️⚠️	`.sdata`	100.00%	0.00%	--8

	Function	From	To	Bytes

`main/dolphin/src/card/CARDUnlock`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	99.23%	--36

	Function	From	To	Bytes
️⚠️	`__CARDUnlock`	100.00%	98.75%	--36

`main/dolphin/src/exi/EXIBios`

	Section	From	To	Bytes

	Function	From	To	Bytes

`main/dolphin/src/gx/GXInit`

	Section	From	To	Bytes

	Function	From	To	Bytes

`main/dolphin/src/gx/GXFifo`

	Section	From	To	Bytes

	Function	From	To	Bytes

`main/dolphin/src/gx/GXGeometry`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	99.49%	--4

	Function	From	To	Bytes
️⚠️	`__GXSendFlushPrim`	100.00%	96.62%	--4

`main/dolphin/src/gx/GXLight`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	95.44%	--70

	Function	From	To	Bytes
️⚠️	`GXSetChanAmbColor`	100.00%	92.50%	--18
️⚠️	`GXSetChanMatColor`	100.00%	92.50%	--18
️⚠️	`GXSetChanCtrl`	100.00%	80.98%	--34

`main/dolphin/src/gx/GXPixel`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	86.18%	--222

	Function	From	To	Bytes
️⚠️	`GXSetFog`	100.00%	85.40%	--80
️⚠️	`GXSetFogRangeAdj`	100.00%	51.27%	--142

`main/dolphin/src/os/init/__start`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	99.48%	--4

	Function	From	To	Bytes
️⚠️	`InitMetroTRK_BBA`	100.00%	0.00%	--4

`main/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp`

	Section	From	To	Bytes
️⚠️	`.text`	100.00%	0.00%	--32

	Function	From	To	Bytes
️⚠️	`TRKAccessFile`	100.00%	0.00%	--8
️⚠️	`TRKOpenFile`	100.00%	0.00%	--8
️⚠️	`TRKCloseFile`	100.00%	0.00%	--8
️⚠️	`TRKPositionFile`	100.00%	0.00%	--8

`main/debugger/embedded/MetroTRK/Processor/ppc/Generic/__exception`

	Section	From	To	Bytes
️⚠️	`.init`	100.00%	0.00%	--7988

	Function	From	To	Bytes
️⚠️	`gTRKInterruptVectorTable`	100.00%	0.00%	--7988

github-actions · 2025-11-20T10:59:30Z

`main/SB/Core/x/xEntBoulder`

	Section	From	To	Bytes
✅	`.bss`	0.00%	100.00%	+1464
✅	`.data`	0.00%	100.00%	+192
✅	`.rodata`	0.00%	100.00%	+80
✅	`.sdata`	0.00%	100.00%	+8
📈	`.sdata2`	14.29%	96.00%	+84
📈	`.text`	3.00%	79.14%	+8835

	Function	From	To	Bytes
📈	`xEntBoulder_Render(xEnt*)`	0.00%	96.25%	+277
📈	`xEntBoulder_Init(xEntBoulder, xEntAsset)`	0.00%	99.86%	+531
✅	`xEntBoulder_ApplyForces(xEntCollis*)`	0.00%	100.00%	+236
✅	`xEntBoulder_RealBUpdate(xEnt, xVec3)`	0.00%	100.00%	+104
📈	`xEntBoulder_Update(xEntBoulder, xScene, float)`	0.00%	99.98%	+3495
✅	`xEntBoulder_KilledBySurface(xEntBoulder, xScene, float)`	0.00%	100.00%	+616
✅	`xEntBoulder_Kill(xEntBoulder*)`	0.00%	100.00%	+116
📈	`xEntBoulder_BubbleBowl(float)`	0.00%	97.20%	+828
✅	`xEntBoulder_Reset(xEntBoulder, xScene)`	0.00%	100.00%	+348
✅	`xBoulderGenerator_Init(xBase&, xDynAsset&, unsigned long)`	0.00%	100.00%	+32
✅	`xBoulderGenerator_Init(xBoulderGenerator, xBoulderGeneratorAsset)`	0.00%	100.00%	+428
✅	`xBoulderGenerator_Reset(xBoulderGenerator*)`	0.00%	100.00%	+120
✅	`BoulderGen_GiveBirth(xBoulderGenerator*, int)`	0.00%	100.00%	+68
✅	`GetBoulderForGenerating(xBoulderGenerator*)`	0.00%	100.00%	+360
✅	`xBoulderGenerator_Launch(xBoulderGenerator, xVec3, float)`	0.00%	100.00%	+424
✅	`xBoulderGenerator_EventCB(xBase, xBase, unsigned int, const float, xBase)`	0.00%	100.00%	+752
✅	`xMat3x3RMulVec(xVec3, const xMat3x3, const xVec3*)`	0.00%	100.00%	+100

JoshSanch

Thanks!

escape209 marked this pull request as draft November 19, 2025 15:26

escape209 marked this pull request as ready for review November 19, 2025 16:15

JoshSanch requested changes Nov 20, 2025

View reviewed changes

escape209 added 4 commits November 20, 2025 10:57

xEntBoulder work

e779b1a

Some touch-ups

baaf6a4

Correct sBubbleStreakID declaration

b39bcfd

Address feedback + couple more improvements

4f95046

escape209 force-pushed the xentboulder branch from 4223784 to 4f95046 Compare November 20, 2025 10:57

JoshSanch approved these changes Nov 21, 2025

View reviewed changes

JoshSanch merged commit 80dcce6 into bfbbdecomp:main Nov 21, 2025
5 checks passed

	if ((model != NULL) && (xEntIsVisible(ent) != 0))
	if ((model != NULL) && (xEntIsVisible(ent) != FALSE))

	if (iModelCull(model->Data, model->Mat) == 0)
	if (!iModelCull(model->Data, model->Mat))

	if (iModelCullPlusShadow(model->Data, model->Mat, &shadVec, &shadowResult) == 0)
	if (!iModelCullPlusShadow(model->Data, model->Mat, &shadVec, &shadowResult))

Conversation

escape209 commented Nov 19, 2025

Uh oh!

github-actions bot commented Nov 19, 2025

main/SB/Core/x/xEntBoulder

Uh oh!

github-actions bot commented Nov 19, 2025

main/SB/Core/x/xEntBoulder

Uh oh!

github-actions bot commented Nov 19, 2025

main/SB/Core/x/xEntBoulder

Uh oh!

JoshSanch Nov 19, 2025

Choose a reason for hiding this comment

Uh oh!

JoshSanch Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

JoshSanch Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

JoshSanch Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

JoshSanch Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

JoshSanch Nov 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Nov 20, 2025

main/SB/Core/x/xEntBoulder

main/dolphin/src/ax/AXAlloc

main/dolphin/src/ax/AXCL

main/dolphin/src/ax/AXOut

main/dolphin/src/ax/AXVPB

main/dolphin/src/ax/DSPCode

main/dolphin/src/card/CARDUnlock

main/dolphin/src/exi/EXIBios

main/dolphin/src/gx/GXInit

main/dolphin/src/gx/GXFifo

main/dolphin/src/gx/GXGeometry

main/dolphin/src/gx/GXLight

main/dolphin/src/gx/GXPixel

main/dolphin/src/os/init/__start

main/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp

main/debugger/embedded/MetroTRK/Processor/ppc/Generic/__exception

Uh oh!

github-actions bot commented Nov 20, 2025

main/SB/Core/x/xEntBoulder

Uh oh!

JoshSanch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

`main/SB/Core/x/xEntBoulder`

`main/SB/Core/x/xEntBoulder`

`main/SB/Core/x/xEntBoulder`

`main/SB/Core/x/xEntBoulder`

`main/dolphin/src/ax/AXAlloc`

`main/dolphin/src/ax/AXCL`

`main/dolphin/src/ax/AXOut`

`main/dolphin/src/ax/AXVPB`

`main/dolphin/src/ax/DSPCode`

`main/dolphin/src/card/CARDUnlock`

`main/dolphin/src/exi/EXIBios`

`main/dolphin/src/gx/GXInit`

`main/dolphin/src/gx/GXFifo`

`main/dolphin/src/gx/GXGeometry`

`main/dolphin/src/gx/GXLight`

`main/dolphin/src/gx/GXPixel`

`main/dolphin/src/os/init/__start`

`main/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp`

`main/debugger/embedded/MetroTRK/Processor/ppc/Generic/__exception`

`main/SB/Core/x/xEntBoulder`