Skip to content

Match SA1's CreateStageUI & CreateSpecialStageUI #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaceCear merged 4 commits into from
May 24, 2026
Merged

Match SA1's CreateStageUI & CreateSpecialStageUI #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99a2f5d
sa1: match CreateStageUI & CreateSpecialStageUI
SketchyGear May 22, 2026
52cef63
oh yeah, there's this
SketchyGear May 23, 2026
82791ac
little documentation/optimization
SketchyGear May 23, 2026
b8e9b8e
maybe i went a bit overboard...
SketchyGear May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions asm/non_matching/game/sa1/stage/stage_ui__CreateSpecialStageUI.inc
View file
Open in desktop

This file was deleted.

42 changes: 15 additions & 27 deletions src/game/sa1/stage/stage_ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,51 +596,39 @@ void sub_8054068(void)

void CreateStageUI(void)
{
#ifndef NON_MATCHING
register void *dtor asm("r1") = 0;
StageUI_20 *unk20 = NULL;
register Task *t asm("r1") = TaskCreate(Task_StageUIMain, sizeof(StageUI), 0x2180, 0, dtor);
#else
void *dtor = 0;
Task *t = NULL;

StageUI *ui;
StageUI_20 *unk20 = NULL;
Task *t = TaskCreate(Task_StageUIMain, sizeof(StageUI), 0x2180, 0, dtor);
#endif
StageUI *ui = TASK_DATA(t);

t = TaskCreate(Task_StageUIMain, sizeof(StageUI), 0x2180, 0, NULL);

ui = TASK_DATA(t);
ui->unk40 = 0;

// Colons
ui = TASK_DATA(t);
ui = TASK_DATA(t); // copy-paste?
unk20 = &ui->unk20;
unk20->unk1 = 42;
unk20->unk4 = 42;
unk20->unk1 = UI_DIGIT(10);
unk20->unk4 = UI_DIGIT(10);
Comment thread
SketchyGear marked this conversation as resolved.

UiGfxStackInit();
sub_80538BC();
}

// https://decomp.me/scratch/3QSHy
void CreateSpecialStageUI(void)
{
#ifndef NON_MATCHING
register void *dtor asm("r1") = 0;
register Task *t asm("r1");
#else
void *dtor = 0;
Task *t;
#endif
s32 zero;
StageUI *ui;

t = TaskCreate(Task_SpecialStageUIMain, sizeof(StageUI), 0x1180, (zero = 0), dtor);
Task *t = NULL;
t = TaskCreate(Task_SpecialStageUIMain, sizeof(StageUI), 0x1180, 0, NULL);

ui = TASK_DATA(t);
ui->unk40 = zero;
ui->unk40 = 0;

#ifndef NON_MATCHING
ui = TASK_DATA(t);
#endif
ui->unk4C = zero;
// Colons
ui = TASK_DATA(t); // copy-paste?
ui->unk4C = 0;

UiGfxStackInit();
sub_8054068();
Expand Down
Loading