zMain by LivewireCB · Pull Request #561 · bfbbdecomp/bfbb

LivewireCB · 2025-05-21T02:55:56Z

Cleanup and function implementations on zMain

github-actions · 2025-05-21T02:57:20Z

⚠️ 🔥

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

Regressions: 1

⚠️ main/SB/Game/zMain - .sbss -5 bytes -> 36.36%

Progress: 8

📈 main/SB/Game/zMain - .text +1504 bytes -> 61.24%
📈 main/SB/Game/zMain - .rodata +35 bytes -> 87.11%
📈 main/SB/Game/zMain - zMainParseINIGlobals(xIniFile*) +3 bytes -> 77.55%
📈 main/SB/Game/zMain - zMainLoop() +764 bytes -> 57.53%
📈 main/SB/Game/zMain - zMainLoadFontHIP() +264 bytes -> 93.24%
📈 main/SB/Game/zMain - zMainShowProgressBar() +216 bytes -> 85.94%
📈 main/SB/Game/zMain - zMainMemCardQueryPost(int, int, int, int) +116 bytes -> 72.50%
📈 main/SB/Game/zMain - zMainMemCardRenderText(const char*, bool) +140 bytes -> 92.11%

JoshSanch

Great work overall! Lots of small things here that I wanted to call your attention to so excuse the overly short review comments by the end.

JoshSanch · 2025-05-22T03:21:05Z

src/SB/Game/zMain.cpp

 void zMainShowProgressBar()
 {
+    S32 progBar;
+    size_t sVar2;


Please give sVar2 a semantically appropriate name based on its usage.

JoshSanch · 2025-05-22T03:22:23Z

src/SB/Game/zMain.cpp

+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);
+    xSTPreLoadScene(0x464f4e54, NULL, 0x1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);
+    xSTQueueSceneAssets(0x464f4e54, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);


Please replace usages of 0x464f4e54 with the char literal representation 'FONT', which is more readable and more likely to be what Heavy Iron used here.

JoshSanch · 2025-05-22T03:22:49Z

src/SB/Game/zMain.cpp

+    xSTDisconnect(0x464f4e54, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);


Please additionally address these usages of 0x464f4e54.

JoshSanch · 2025-05-22T03:23:27Z

src/SB/Game/zMain.cpp

+    xSTPreLoadScene(0x504c4154, 0, 1);
+    xSTQueueSceneAssets(0x504c4154, 1);


This is equivalent to 'PLAT'.

JoshSanch · 2025-05-22T03:25:05Z

src/SB/Game/zMain.cpp

+    xSTDisconnect(0x504c4154, 1);
+    zMainShowProgressBar();
+    iTimeGet();
+    xShadowSimple_Init();
+    globals.pickupTable = (zAssetPickupTable*)xSTFindAssetByType(0x5049434b, 0, 0);
+    // globals.pickupTable = zPickupTableInit();
+    // zPickupTableInit hasnt been implemented yet
+    xMemPushBase();
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5534, 0);
+    iTimeDiffSec(time);
+    xSTPreLoadScene(0x4d4e5534, 0, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5534, 0);
+    iTimeDiffSec(time);
+    xSTQueueSceneAssets(0x4d4e5534, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5534, 0);
+    iTimeDiffSec(time);
+    do
+    {
+        xSTLoadStep(time);
+    } while (time < 1.0f);
+    xSTDisconnect(0x4d4e5534, 1);
+    zMainShowProgressBar();
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5534, 0);
+    iTimeDiffSec(time);
+    xMemPushBase();
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5535, 0);
+    iTimeDiffSec(time);
+    xSTPreLoadScene(0x4d4e5535, 0, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5535, 0);
+    iTimeDiffSec(time);
+    xSTQueueSceneAssets(0x4d4e5535, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5535, 0);
+    iTimeDiffSec(time);
+    do
+    {
+        xSTLoadStep(time);
+    } while (time < 1.0f);
+    xSTDisconnect(0x4d4e5535, 1);
+    zMainShowProgressBar();
+    time = iTimeGet();
+    xUtil_idtag2string(0x4d4e5535, 0);
+    iTimeDiffSec(time);
+    xModelInit();
+    xModelPoolInit(0x20, 0x40);
+    xModelPoolInit(0x28, 8);
+    xModelPoolInit(0x38, 1);


Make sure that any integer that can be better expressed by a char literal (e.g 'PLAT', 'FONT') is substituted with that char literal here.

JoshSanch · 2025-05-22T03:27:02Z

src/SB/Game/zMain.cpp

+    cam = iCameraCreate(0x280, 0x1e0, 0);
+    RwCameraClear(cam, colour, clearMode);
+    RwCameraBeginUpdate(cam);
+    render_mem_card_no_space(needed, available, neededFiles, unk0);
+    RwCameraEndUpdate(cam);
+    RwCameraShowRaster(cam, 0, 1);
+    iCameraDestroy(cam);
+}
+
+void zMainMemCardRenderText(const char* a, bool enabled)
+{
+    RwCamera* cam = 0;
+    RwRGBA* colour = 0;
+    RwInt32 clearMode = 3;
+
+    cam = iCameraCreate(0x280, 0x1e0, 0);
+    RwCameraClear(cam, colour, clearMode);
+    RwCameraBeginUpdate(cam);


These are meant to specify the screen dimensions 640 x 480 - please replace the hex values with their integer equivalents.

JoshSanch · 2025-05-22T03:27:53Z

src/SB/Game/zMain.cpp

+    RwCameraBeginUpdate(cam);
+    RenderText(a, enabled);
+    RwCameraEndUpdate(cam);
+    RwCameraShowRaster(cam, 0, 1);


Are either of these integers better represented using TRUE/FALSE?

JoshSanch · 2025-05-22T03:28:21Z

src/SB/Game/zMain.cpp

+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);
+    xSTPreLoadScene(0x464f4e54, NULL, 0x1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);
+    iTimeDiffSec(time);
+    xSTQueueSceneAssets(0x464f4e54, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);


Please substitute char literals here as well

JoshSanch · 2025-05-22T03:28:31Z

src/SB/Game/zMain.cpp

+    xSTDisconnect(0x464f4e54, 1);
+    time = iTimeGet();
+    xUtil_idtag2string(0x464f4e54, 0);


More char literals

github-actions · 2025-05-22T17:21:01Z

🆗 ✅

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

No Regressions 🎉

Progress: 8

📈 main/SB/Game/zMain - .text +1504 bytes -> 61.18%
📈 main/SB/Game/zMain - .rodata +35 bytes -> 87.11%
📈 main/SB/Game/zMain - zMainParseINIGlobals(xIniFile*) +3 bytes -> 77.55%
📈 main/SB/Game/zMain - zMainLoop() +764 bytes -> 57.53%
📈 main/SB/Game/zMain - zMainLoadFontHIP() +264 bytes -> 93.24%
📈 main/SB/Game/zMain - zMainShowProgressBar() +216 bytes -> 85.94%
📈 main/SB/Game/zMain - zMainMemCardQueryPost(int, int, int, int) +116 bytes -> 72.50%
📈 main/SB/Game/zMain - zMainMemCardRenderText(const char*, bool) +140 bytes -> 92.11%

github-actions · 2025-05-22T17:46:08Z

🆗 ✅

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

No Regressions 🎉

Progress: 8

📈 main/SB/Game/zMain - .text +1560 bytes -> 61.56%
📈 main/SB/Game/zMain - .rodata +35 bytes -> 87.11%
📈 main/SB/Game/zMain - zMainParseINIGlobals(xIniFile*) +3 bytes -> 77.55%
📈 main/SB/Game/zMain - zMainLoop() +820 bytes -> 61.75%
📈 main/SB/Game/zMain - zMainLoadFontHIP() +264 bytes -> 93.24%
📈 main/SB/Game/zMain - zMainShowProgressBar() +216 bytes -> 85.94%
📈 main/SB/Game/zMain - zMainMemCardQueryPost(int, int, int, int) +116 bytes -> 72.50%
📈 main/SB/Game/zMain - zMainMemCardRenderText(const char*, bool) +140 bytes -> 92.11%

JoshSanch

Nearly there, some straggling ints that should have char literal substitutions.

src/SB/Game/zMain.cpp

github-actions · 2025-05-22T19:43:55Z

🆗 ✅

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

No Regressions 🎉

Progress: 8

📈 main/SB/Game/zMain - .text +1552 bytes -> 61.51%
📈 main/SB/Game/zMain - .rodata +35 bytes -> 87.11%
📈 main/SB/Game/zMain - zMainParseINIGlobals(xIniFile*) +3 bytes -> 77.55%
📈 main/SB/Game/zMain - zMainLoop() +812 bytes -> 61.14%
📈 main/SB/Game/zMain - zMainLoadFontHIP() +264 bytes -> 93.24%
📈 main/SB/Game/zMain - zMainShowProgressBar() +216 bytes -> 85.94%
📈 main/SB/Game/zMain - zMainMemCardQueryPost(int, int, int, int) +116 bytes -> 72.50%
📈 main/SB/Game/zMain - zMainMemCardRenderText(const char*, bool) +140 bytes -> 92.11%

JoshSanch

Looks good to me, good work!

zMain work

3166a81

JoshSanch requested changes May 22, 2025

View reviewed changes

merge cus lazy

6700176

review fixes

bd8b013

JoshSanch requested changes May 22, 2025

View reviewed changes

src/SB/Game/zMain.cpp Outdated Show resolved Hide resolved

review fix 2

481c2b9

JoshSanch approved these changes May 22, 2025

View reviewed changes

JoshSanch merged commit dcb19b2 into bfbbdecomp:main May 22, 2025
5 checks passed

		xSTPreLoadScene(0x504c4154, 0, 1);
		xSTQueueSceneAssets(0x504c4154, 1);

Conversation

LivewireCB commented May 21, 2025

Uh oh!

github-actions bot commented May 21, 2025

⚠️ 🔥

Regressions: 1

Progress: 8

Uh oh!

JoshSanch left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented May 22, 2025

🆗 ✅

No Regressions 🎉

Progress: 8

Uh oh!

github-actions bot commented May 22, 2025

🆗 ✅

No Regressions 🎉

Progress: 8

Uh oh!

JoshSanch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented May 22, 2025

🆗 ✅

No Regressions 🎉

Progress: 8

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