Skip to content

various: fix mismatches in some action stubs and ResourceMgrTask#171

Open
alexgsonic1-pixel wants to merge 1 commit into
zeldaret:masterfrom
alexgsonic1-pixel:master
Open

various: fix mismatches in some action stubs and ResourceMgrTask#171
alexgsonic1-pixel wants to merge 1 commit into
zeldaret:masterfrom
alexgsonic1-pixel:master

Conversation

@alexgsonic1-pixel

@alexgsonic1-pixel alexgsonic1-pixel commented Jun 22, 2026

Copy link
Copy Markdown

Changes

action::On::calc_ and action::Off::calc_

  • Replaced empty ActionEx::calc_() with isFinishedAS(*mTargetIdx_s, *mSeqBankIdx_s) + setFinished()

action::PlayerStoleOpenBase::calc_

  • Replaced stub ActionEx::calc_() with isFinishedAS(0, 0) + setFinished()

ksys::res::ResourceMgrTask::setCompactionStopped

  • Changed || to if/else if to fix register allocation ordering (two cbz swapped)

All functions updated from W/m to O in uking_functions.csv.


This change is Reviewable

Comment thread src/KingSystem/Resource/resResourceMgrTask.cpp Outdated
@Pistonight Pistonight changed the title action: various: fix mismatches in some action stubs and ResourceMgrTask Jun 23, 2026
@alexgsonic1-pixel

Copy link
Copy Markdown
Author

Done — inlined new_counter as suggested and confirmed it still matches with tools/check. All 4 functions pass.

@Pistonight

Copy link
Copy Markdown
Collaborator

Okay, I see you are still working on decompiling other actions. When you are done please change the PR title again to something that fits better (I changed it for you because I thought you were done :p). Then let me know and I can take another look

@alexgsonic1-pixel

Copy link
Copy Markdown
Author

Sorry about the commit noise - was experimenting with batch decompilation and things got messy. Cleaned up now, just the original 4 functions. Title is fine as-is. Ready for review when you have time!

@Pistonight

Copy link
Copy Markdown
Collaborator

No problem, one last thing, can you squash all of your changes into one commit? This allows us to have a clean merge history

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