Skip to content

Match SA1's CreateStageUI & CreateSpecialStageUI - #270

Merged
JaceCear merged 4 commits into
SAT-R:mainfrom
SketchyGear:main
May 24, 2026
Merged

Match SA1's CreateStageUI & CreateSpecialStageUI#270
JaceCear merged 4 commits into
SAT-R:mainfrom
SketchyGear:main

Conversation

@SketchyGear

@SketchyGearSketchyGear commented May 22, 2026

Copy link
Copy Markdown
Contributor

Matching versions of Advance 1's stage_ui functions:

CreateStageUI
CreateSpecialStageUI

@SketchyGear
sa1: match CreateStageUI & CreateSpecialStageUI
99a2f5d
now we only need to figure out StageUI_DrawTimer and sub_8053BAC, horray!
@SketchyGear
oh yeah, there's this
52cef63
delete the target asm file, since, apparently, web github can't do multiple stuff at a single commit, for some reason
@SketchyGear
little documentation/optimization
82791ac
hopefully, we find a way to make proper use of the original code's (possible) debug behavior... or i could be exaggerating over what was originally just the devs playing safe!
eh, either theory works, i guess
@JaceCear

JaceCear commented May 23, 2026

Copy link
Copy Markdown
Collaborator

Thank you @SketchyGear!

You can remove the NON_MATCHING directives, though. (also the "why would anyone..." comment)
They just make the code less readable (we try using them as little as possible), and modern compilers won't care about the pointers being set to NULL before getting set.

That'll likely be optimized out without manual intervention.

But it is a good preventative measure to have them, in case someone tried using the Task pointer before proper initialization, and there's no need to split the logic off like that.

@SketchyGear
maybe i went a bit overboard...
b8e9b8e
revert the previous commit, basically
(web GitHub also doesn't support commit reverting, what a surprise!)
@SketchyGear

SketchyGear commented May 23, 2026•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

there you go! i guess i really exaggerated a bit when i originally committed that, lol
anyways, thanks for the feedback! will make sure everything is crystal clear in future matchings like these! 👍

JaceCear
JaceCear reviewed May 23, 2026
View reviewed changes
Comment threadsrc/game/sa1/stage/stage_ui.c
JaceCear
JaceCear approved these changes May 24, 2026
View reviewed changes

@JaceCearJaceCear left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@JaceCear
JaceCear merged commit 978cf77 into SAT-R:mainMay 24, 2026
38 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JaceCearJaceCearJaceCear approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SketchyGear@JaceCear