github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sa1: clean up ui digit structs, fix port compilation

Browse Source
This commit is contained in:
Oliver Bell committed 2026-05-18 23:09:36 +01:00
1 parent 4b9e063452
commit 28df2ca13c
2 files changed
+6 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/game/sa1/stage/stage_ui.h
+3 -1
View File
@@ -36,7 +36,9 @@ typedef struct {
} StageUI_20;
typedef struct {
/* 0x00 */ u8 digitsRings[8];
/* 0x00 */ u8 digitsRings[3];
/* 0x04 */ s16 unk4; // unused
/* 0x06 */ s16 unk6; // unused
/* 0x08 */ s16 unk8;
/* 0x0A */ s16 unkA;
/* 0x0C */ s16 unkC;
src/game/sa1/stage/stage_ui.c
+3 -10
View File
@@ -103,12 +103,9 @@ void Task_StageUIMain(void)
} else {
remainder = gRingCount;
for (i = 0; i < 3; i++) {
for (i = 0; i < (s32)ARRAY_COUNT(ui->digitsRings); i++) {
remainder0 = Div(remainder, 10);
// ui->digitsRings[2 - i] = UI_DIGIT(remainder - (remainder0 * 10));
ui->digitsRings[2 - i] = UI_DIGIT(remainder - ((remainder0 << 3) + (remainder0 << 1)));
remainder = remainder0;
}
}
@@ -121,11 +118,9 @@ void Task_StageUIMain(void)
remainder = gLevelScore;
for (i = 8; i >= 0; i--) {
for (i = ARRAY_COUNT(ui->unk10.unk0) - 2; i >= 0; i--) {
remainder0 = Div(remainder, 10);
ptr[i] = UI_DIGIT(remainder - ((remainder0 << 3) + (remainder0 << 1)));
remainder = remainder0;
}
@@ -497,11 +492,9 @@ NONMATCH("asm/non_matching/game/sa1/stage/stage_ui__Task_SpecialStageUIMain.inc"
unk10->unk0[2] = UI_DIGIT(9);
} else {
remainder = gSpecialStageTargetRings;
for (i = 0; i < (s32)ARRAY_COUNT(unk10->unk0); i++) {
for (i = 0; i < (s32)ARRAY_COUNT(ui->digitsRings); i++) {
remainder0 = Div(remainder, 10);
unk10->unk0[2 - i] = UI_DIGIT(remainder - ((remainder0 << 3) + (remainder0 << 1)));
remainder = remainder0;
}
}