Skip to content

zAssetTypes done for now#588

Merged
SquareMan merged 3 commits intomainfrom
zAssetTypes
Sep 1, 2025
Merged

zAssetTypes done for now#588
SquareMan merged 3 commits intomainfrom
zAssetTypes

Conversation

@SquareMan
Copy link
Member

Looks to be Equivalent but I haven't tested it in Dolphin. Holding off on marking it Equivalent in configure.py for now.

@SquareMan SquareMan requested a review from JoshSanch August 10, 2025 10:49
@github-actions
Copy link

🆗 ✅

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

No Regressions 🎉

Progress: 9

📈 main/SB/Game/zAssetTypes - .text +1768 bytes -> 96.36%
main/SB/Game/zAssetTypes - .data +2 bytes -> 100.00%
📈 main/SB/Game/zAssetTypes - .rodata +5 bytes -> 99.42%
main/SB/Game/zAssetTypes - .sbss +5 bytes -> 100.00%
main/SB/Game/zAssetTypes - .sdata2 +19 bytes -> 100.00%
📈 main/SB/Game/zAssetTypes - .sdata +8 bytes -> 62.50%
main/SB/Game/zAssetTypes - ATBL_Read(void*, unsigned int, void*, unsigned int, unsigned int*) +1196 bytes -> 100.00%
main/SB/Game/zAssetTypes - soundEffectCB(unsigned int, xAnimActiveEffect*, xAnimSingle*, void*) +536 bytes -> 100.00%
main/SB/Game/zAssetTypes - FindAssetCB(unsigned int, char*) +36 bytes -> 100.00%

@SquareMan
Copy link
Member Author

After playing around in Jellyfish Fields the game seems normal so I'll mark this one as equivalent

@github-actions
Copy link

⚠️ 🔥

+3878 bytes
🆗 Bot Rating: Amazing contribution, you are the decomp GOAT 🐐

Regressions: 84

⚠️ main/SB/Core/x/xScrFx - .bss -136 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - .sbss -28 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - .sdata -2 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - .sdata2 -26 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - .text -637 bytes -> 0.16%
⚠️ main/SB/Game/zEntPlayerOOBState - .text -112 bytes -> 5.84%
⚠️ main/SB/Game/zTalkBox - .bss -18254 bytes -> 49.79%
⚠️ main/SB/Game/zTalkBox - .text -272 bytes -> 9.64%
⚠️ main/SB/Game/zNPCTypeBossSB2 - .text -103 bytes -> 29.74%
⚠️ main/SB/Game/zNPCTypeBossPlankton - .bss -761 bytes -> 25.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - .data -25 bytes -> 69.83%
⚠️ main/SB/Game/zNPCTypeBossPlankton - .sdata2 -4 bytes -> 67.35%
⚠️ main/SB/Game/zNPCTypeBossPlankton - .text -2023 bytes -> 36.35%
⚠️ main/SB/Game/zNPCTypeDutchman - .bss -904 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeDutchman - .text -4 bytes -> 32.86%
⚠️ main/SB/Core/x/xScrFx - xScrFxInit() -44 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxReset() -32 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxUpdate(RwCamera*, float) -96 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxRender(RwCamera*) -64 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxDrawScreenSizeRectangle() -69 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxFadeInit() -48 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - InterpCol(float, unsigned char, unsigned char) -4 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxFade(iColor_tag*, iColor_tag*, float, void (*)(void), int) -12 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxStopFade() -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxIsFading() -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxLetterBoxInit() -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxLetterboxReset() -16 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxLetterBoxSetSize(float) -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxLetterBoxSetAlpha(unsigned char) -8 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxLetterbox(int) -80 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFxIsLetterbox() -24 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFXGlareInit() -52 bytes -> 0.00%
⚠️ main/SB/Core/x/xScrFx - xScrFXGlareReset() -32 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerOOBState - oob_state::@unnamed@zEntPlayerOOBState_cpp@::reset_camera() -72 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerOOBState - oob_state::@unnamed@zEntPlayerOOBState_cpp@::set_rect_vert(rwGameCube2DVertex&, float, float, float, iColor_tag, float) -4 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerOOBState - oob_state::@unnamed@zEntPlayerOOBState_cpp@::drop_state_type::supdate_fade_in(oob_state::@unnamed@zEntPlayerOOBState_cpp@::drop_state_type&, xScene&, float&) -32 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerOOBState - oob_state::@unnamed@zEntPlayerOOBState_cpp@::drop_state_type::update_fade_in(xScene&, float&) -4 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::speak_stop() -120 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::trigger(unsigned int) -36 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::trigger_pads(unsigned int) -264 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::state_type::start() -4 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::state_type::stop() -4 bytes -> 0.00%
⚠️ main/SB/Game/zTalkBox - ztalkbox::permit(unsigned int, unsigned int) -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossSB2 - @unnamed@zNPCTypeBossSB2_cpp@::reset_sound() -56 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossSB2 - @unnamed@zNPCTypeBossSB2_cpp@::tweak_group::load(xModelAssetParam*, unsigned int) -48 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::get_player_loc() -19 bytes -> 16.67%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::reset_sound() -40 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::kill_sound(int, unsigned int) -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::kill_sound(int) -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::play_beam_fly_sound(xLaserBoltEmitter::bolt&, void*) -72 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::kill_beam_fly_sound(xLaserBoltEmitter::bolt&, void*) -68 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::play_beam_fire_sound(xLaserBoltEmitter::bolt&, void*) -44 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::play_beam_hit_sound(xLaserBoltEmitter::bolt&, void*) -44 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::Setup() -72 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::PostSetup() -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::Reset() -63 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::SysEvent(xBase*, xBase*, unsigned int, const float*, xBase*, int*) -40 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::RenderExtraPostParticles() -88 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::ParseINI() -64 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::tweak_group::load(xModelAssetParam*, unsigned int) -48 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - @unnamed@zNPCTypeBossPlankton_cpp@::update_move_accel(xVec3&, zNPCBPlankton::move_info&, float) -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::reset_territories() -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::update_follow(float) -40 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::check_player_damage() -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::init_beam() -276 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::setup_beam() -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::reset_beam() -36 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::vanish() -84 bytes -> 4.55%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::reappear() -104 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::next_territory() -88 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::have_cronies() const -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::sickum() -4 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::here_boy() -12 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::follow_player() -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCBPlankton::follow_camera() -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonIdle::Enter(float, void*) -116 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonIdle::Exit(float, void*) -88 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonAttack::Enter(float, void*) -152 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonAttack::Exit(float, void*) -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonAmbush::Enter(float, void*) -16 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonAmbush::Exit(float, void*) -32 bytes -> 0.00%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBeam::Enter(float, void*) -100 bytes -> 40.91%
⚠️ main/SB/Game/zNPCTypeBossPlankton - zNPCGoalBPlanktonBeam::Exit(float, void*) -56 bytes -> 48.28%
⚠️ main/SB/Game/zNPCTypeDutchman - @unnamed@zNPCTypeDutchman_cpp@::set_volume(int, unsigned int, float) -4 bytes -> 0.00%

Progress: 13

📈 main/SB/Game/zAssetTypes - .text +1768 bytes -> 96.36%
main/SB/Game/zAssetTypes - .data +2 bytes -> 100.00%
📈 main/SB/Game/zNPCTypeBossPlankton - .rodata +1883 bytes -> 77.64%
📈 main/SB/Game/zAssetTypes - .rodata +5 bytes -> 99.42%
main/SB/Game/zAssetTypes - .sbss +5 bytes -> 100.00%
main/SB/Game/zAssetTypes - .sdata2 +19 bytes -> 100.00%
📈 main/SB/Game/zAssetTypes - .sdata +8 bytes -> 62.50%
main/SB/Game/zAssetTypes - ATBL_Read(void*, unsigned int, void*, unsigned int, unsigned int*) +1196 bytes -> 100.00%
main/SB/Game/zAssetTypes - soundEffectCB(unsigned int, xAnimActiveEffect*, xAnimSingle*, void*) +536 bytes -> 100.00%
📈 main/SB/Game/zTalkBox - @unnamed@zTalkBox_cpp@::cb_dispatch(xBase*, xBase*, unsigned int, const float*, xBase*) +44 bytes -> 98.11%
main/SB/Game/zTalkBox - ztalkbox::show() +108 bytes -> 100.00%
main/SB/Game/zTalkBox - ztalkbox::stop_wait(unsigned int) +36 bytes -> 100.00%
main/SB/Game/zAssetTypes - FindAssetCB(unsigned int, char*) +36 bytes -> 100.00%

@github-actions
Copy link

github-actions bot commented Sep 1, 2025

🆗 ✅

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

No Regressions 🎉

Progress: 9

📈 main/SB/Game/zAssetTypes - .text +1768 bytes -> 96.36%
main/SB/Game/zAssetTypes - .data +2 bytes -> 100.00%
📈 main/SB/Game/zAssetTypes - .rodata +5 bytes -> 99.42%
main/SB/Game/zAssetTypes - .sbss +5 bytes -> 100.00%
main/SB/Game/zAssetTypes - .sdata2 +19 bytes -> 100.00%
📈 main/SB/Game/zAssetTypes - .sdata +8 bytes -> 62.50%
main/SB/Game/zAssetTypes - ATBL_Read(void*, unsigned int, void*, unsigned int, unsigned int*) +1196 bytes -> 100.00%
main/SB/Game/zAssetTypes - soundEffectCB(unsigned int, xAnimActiveEffect*, xAnimSingle*, void*) +536 bytes -> 100.00%
main/SB/Game/zAssetTypes - FindAssetCB(unsigned int, char*) +36 bytes -> 100.00%

@SquareMan SquareMan merged commit 69d209b into main Sep 1, 2025
10 checks passed
@SquareMan SquareMan deleted the zAssetTypes branch September 1, 2025 05:03
LivewireCB pushed a commit to LivewireCB/bfbb-decomp that referenced this pull request Sep 2, 2025
* Progress

* zAssetTypes done for now

* Mark zAssetTypes equivalent
SquareMan added a commit that referenced this pull request Sep 22, 2025
* ported zNPCSupport code, zNPCTypeCommon

* build fix

* zNPCTypeBossPlankton & zNPCTypeBossSB2 work (#589)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox, xScrFx & misc (#590)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox work and xScrFx

* Floating point error handler func

* zAssetTypes done for now (#588)

* Progress

* zAssetTypes done for now

* Mark zAssetTypes equivalent

* Couple functions in zNPCMessenger. Misc fixes

* build fix

* xFX work and misc

* Dutchman + misc

* Review Fixes

---------

Co-authored-by: Steven Casper <sebastiancasper3@gmail.com>
JoshSanch pushed a commit that referenced this pull request Oct 3, 2025
* ported zNPCSupport code, zNPCTypeCommon

* build fix

* zNPCTypeBossPlankton & zNPCTypeBossSB2 work (#589)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox, xScrFx & misc (#590)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox work and xScrFx

* Floating point error handler func

* zAssetTypes done for now (#588)

* Progress

* zAssetTypes done for now

* Mark zAssetTypes equivalent

* ported zNPCSupport code, zNPCTypeCommon

* Cleaned code

* Forgot to remove %

---------

Co-authored-by: Steven Casper <sebastiancasper3@gmail.com>
JoshSanch pushed a commit that referenced this pull request Oct 18, 2025
* ported zNPCSupport code, zNPCTypeCommon

* build fix

* zNPCTypeBossPlankton & zNPCTypeBossSB2 work (#589)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox, xScrFx & misc (#590)

* ported zNPCSupport code, zNPCTypeCommon

* build fix

* BossSB2 & BossPlankton

* zTalkbox work and xScrFx

* Floating point error handler func

* zAssetTypes done for now (#588)

* Progress

* zAssetTypes done for now

* Mark zAssetTypes equivalent

* ported zNPCSupport code, zNPCTypeCommon

* Cleaned code

* Forgot to remove %

* zNPCGoalRobo

---------

Co-authored-by: Steven Casper <sebastiancasper3@gmail.com>
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