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

More compiler fixes

Browse Source
This commit is contained in:
JaceCear committed 2025-11-16 16:16:44 +01:00
1 parent 1ce1592818
commit 8183757a97
4 files changed
+67 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/character_select.c
+6 -6
View File
@@ -985,7 +985,7 @@ void Task_805ACD8()
}
strc44->overB2.qUnkA = (strc44->unk3C >> 6);
strc44->overB2.unkC = strc44->overB.unkC;
sub_8052F78(&arr[strc44->unk30], &strc44->overB2);
sub_8052F78((const char*)&arr[strc44->unk30], &strc44->overB2);
}
void sub_805ADF0()
@@ -1022,7 +1022,7 @@ void sub_805ADF0()
strc44->unk30 = (strc44->unk30 + 1) & 7;
}
strc44->overB2.qUnkA = (strc44->unk3C >> 6);
sub_8052F78(&arr[strc44->unk30], &strc44->overB2);
sub_8052F78((const char*)&arr[strc44->unk30], &strc44->overB2);
}
void Task_805AE84()
@@ -1377,9 +1377,9 @@ void Task_805B52C()
sub_80528AC(&gfx);
}
}
sub_8052F78(&arr[0][0], &strc20->overB);
sub_8052F78((const char*)&arr[0][0], &strc20->overB);
strc20->overB.unkC += 0x20;
sub_8052F78(&arr[1][0], &strc20->overB);
sub_8052F78((const char*)&arr[1][0], &strc20->overB);
strc20->overB.unkC -= 0x20;
}
@@ -1454,9 +1454,9 @@ void sub_805B694()
if (strc20->overB.unkC < 0x70) {
strc20->overB.unkC = 0x70;
}
sub_8052F78(&arr[0][0], &strc20->overB);
sub_8052F78((const char*)&arr[0][0], &strc20->overB);
strc20->overB.unkC += 0x20;
sub_8052F78(&arr[1][0], &strc20->overB);
sub_8052F78((const char*)&arr[1][0], &strc20->overB);
strc20->overB.unkC -= 0x20;
}
src/game/game_2_1.c
+37 -37
View File
@@ -639,7 +639,7 @@ void Task_805D720()
strc34->unk24 = Mod(strc34->unk24 + 1, 10);
}
sub_8052F78(&sp00[strc34->unk24], &strc34->u.overB);
sub_8052F78((const char*)&sp00[strc34->unk24], &strc34->u.overB);
} else if (unk20 > 49) {
strc34->u.overB.unkC = 0x13;
strc34->u.overB.qUnkA -= 2;
@@ -649,7 +649,7 @@ void Task_805D720()
strc34->unk24 = Mod(strc34->unk24 + 1, 0xA);
}
sub_8052F78(&sp00[strc34->unk24], &strc34->u.overB);
sub_8052F78((const char*)&sp00[strc34->unk24], &strc34->u.overB);
} else if (unk20 > 33) {
strc34->u.overB.unkC -= 6;
strc34->u.overB.qUnkA -= 2;
@@ -659,7 +659,7 @@ void Task_805D720()
strc34->unk24 = Mod(strc34->unk24 + 1, 0xA);
}
sub_8052F78(&sp00[strc34->unk24], &strc34->u.overB);
sub_8052F78((const char*)&sp00[strc34->unk24], &strc34->u.overB);
} else if (unk20 > 0x19) {
strc34->u.overB.qUnkA -= 2;
strc34->u.overB.unkE = 9;
@@ -669,7 +669,7 @@ void Task_805D720()
strc34->unk24 = Mod(strc34->unk24 + 1, 0xA);
}
sub_8052F78(&sp00[strc34->unk24], &strc34->u.overB);
sub_8052F78((const char*)&sp00[strc34->unk24], &strc34->u.overB);
} else if (unk20 > 0xF) {
strc34->u.overB.qUnkA -= 0x1C;
if (strc34->u.overB.qUnkA < 0xF0) {
@@ -678,7 +678,7 @@ void Task_805D720()
strc34->u.overB.qUnkA += 0x20;
strc34->unk24 = Mod((u16)strc34->unk24 + 1, 0xA);
}
sub_8052F78(&sp00[strc34->unk24], &strc34->u.overB);
sub_8052F78((const char*)&sp00[strc34->unk24], &strc34->u.overB);
}
}
}
@@ -714,14 +714,14 @@ void sub_805D81C(void)
strc34->u.strc0.unkC = 0x7EU;
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = (179 - var_r6);
sub_8052F78((&strc34->unk2B[var_r5]), &strc34->u.overB);
sub_8052F78((const char*)&strc34->unk2B[var_r5], &strc34->u.overB);
} else {
s32 divResB = Div(strc34->u.strc0.unk2, 25);
s32 divResA = (strc34->u.strc0.unk2 / 16);
strc34->u.strc0.unkC = ((143 - divResA) - divResB);
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = 0xA3U;
sub_8052C84(&strc34->unk2B[var_r5], &strc34->u.strc0);
sub_8052C84((const char*)&strc34->unk2B[var_r5], &strc34->u.strc0);
}
strc34->u.strc0.unkA = temp_r7;
@@ -826,11 +826,11 @@ void sub_805D9E4()
v = 195;
v -= var_r6;
strc34->u.strc0.unkA = (v - (w * 8));
sub_8052F78(&strc34->unk2B[var_r5], &strc34->u.overB);
sub_8052F78((const char*)&strc34->unk2B[var_r5], &strc34->u.overB);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = (0xBB - var_r6);
sub_8052F78(&gUnknown_08688688[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688688[0], &strc34->u.overB);
}
} else {
s32 divResB = Div((s32)strc34->u.strc0.unk2, 25);
@@ -840,11 +840,11 @@ void sub_805D9E4()
temp_r0 = 7 - var_r5;
strc34->u.strc0.byteCount = temp_r0;
strc34->u.strc0.unkA = (u16)(((6 - temp_r0) * 8) + 0x8F);
sub_8052C84(&strc34->unk2B[var_r5], &strc34->u.strc0);
sub_8052C84((const char*)&strc34->unk2B[var_r5], &strc34->u.strc0);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = 0xB7U;
sub_8052C84((void *)&gUnknown_08688688[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688688[0], &strc34->u.strc0);
}
}
strc34->u.strc0.unkA = temp_r7;
@@ -873,7 +873,7 @@ void Task_805DB04(void)
strc34->u.overB.unkE = 0;
strc34->u.overB.qUnkA = -0x80;
} else {
sub_8052F78(&gUnknown_0868868C[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_0868868C[0], &strc34->u.overB);
}
sub_805D9E4();
@@ -884,11 +884,11 @@ void Task_805DB04(void)
strc34->u.strc0.unk2 = 0x100;
strc34->u.strc0.unkA = 0x29;
strc34->u.strc0.unkC = 0x6D;
sub_8052F78(&gUnknown_0868868C[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_0868868C[0], &strc34->u.overB);
} else {
strc34->u.strc0.unkA = 0x19U;
strc34->u.strc0.unkC = (0x77 - (strc34->u.strc0.unk2 >> 4));
sub_8052C84((void *)&gUnknown_0868868C[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_0868868C[0], &strc34->u.strc0);
}
sub_805D9E4();
@@ -901,7 +901,7 @@ void Task_805DB04(void)
strc34->u.strc0.unk2 = 0x100;
}
sub_8052C84((void *)&gUnknown_0868868C[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_0868868C[0], &strc34->u.strc0);
sub_805D9E4();
}
}
@@ -950,11 +950,11 @@ void sub_805DBF0(void)
v = 195;
v -= var_r6;
strc34->u.strc0.unkA = (v - (w * 8));
sub_8052F78(&strc34->unk2B[var_r5], &strc34->u.overB);
sub_8052F78((const char*)&strc34->unk2B[var_r5], &strc34->u.overB);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = (0xBB - var_r6);
sub_8052F78(&gUnknown_08688688[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688688[0], &strc34->u.overB);
}
} else {
s32 divResB = Div((s32)strc34->u.strc0.unk2, 25);
@@ -964,11 +964,11 @@ void sub_805DBF0(void)
temp_r0 = 7 - var_r5;
strc34->u.strc0.byteCount = temp_r0;
strc34->u.strc0.unkA = (u16)(((6 - temp_r0) * 8) + 0x8F);
sub_8052C84(&strc34->unk2B[var_r5], &strc34->u.strc0);
sub_8052C84((const char*)&strc34->unk2B[var_r5], &strc34->u.strc0);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = 0xB7U;
sub_8052C84((void *)&gUnknown_08688688[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688688[0], &strc34->u.strc0);
}
}
strc34->u.strc0.unkA = temp_r7;
@@ -997,7 +997,7 @@ void Task_805DD10(void)
strc34->u.overB.unkE = 0;
strc34->u.overB.qUnkA = -0x80;
} else {
sub_8052F78(&gUnknown_08688690[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688690[0], &strc34->u.overB);
}
sub_805DBF0();
@@ -1008,11 +1008,11 @@ void Task_805DD10(void)
strc34->u.strc0.unk2 = 0x100;
strc34->u.strc0.unkA = 0x29;
strc34->u.strc0.unkC = 0x5B;
sub_8052F78(&gUnknown_08688690[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688690[0], &strc34->u.overB);
} else {
strc34->u.strc0.unkA = 0x19U;
strc34->u.strc0.unkC = (0x65 - (strc34->u.strc0.unk2 >> 4));
sub_8052C84((void *)&gUnknown_08688690[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688690[0], &strc34->u.strc0);
}
sub_805DBF0();
@@ -1025,7 +1025,7 @@ void Task_805DD10(void)
strc34->u.strc0.unk2 = 0x100;
}
sub_8052C84((void *)&gUnknown_08688690[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688690[0], &strc34->u.strc0);
sub_805DBF0();
}
}
@@ -1075,11 +1075,11 @@ void sub_805DE0C(void)
v = 195;
v -= var_r6;
strc34->u.strc0.unkA = (v - (w * 8));
sub_8052F78(&strc34->unk2B[var_r5], &strc34->u.overB);
sub_8052F78((const char*)&strc34->unk2B[var_r5], &strc34->u.overB);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = (0xBB - var_r6);
sub_8052F78(&gUnknown_08688688[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688688[0], &strc34->u.overB);
}
} else {
s32 divResB = Div((s32)strc34->u.strc0.unk2, 25);
@@ -1089,11 +1089,11 @@ void sub_805DE0C(void)
temp_r0 = 7 - var_r5;
strc34->u.strc0.byteCount = temp_r0;
strc34->u.strc0.unkA = (u16)(((6 - temp_r0) * 8) + 0x8F);
sub_8052C84(&strc34->unk2B[var_r5], &strc34->u.strc0);
sub_8052C84((const char*)&strc34->unk2B[var_r5], &strc34->u.strc0);
} else {
strc34->u.strc0.byteCount = 1;
strc34->u.strc0.unkA = 0xB7U;
sub_8052C84((void *)&gUnknown_08688688[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688688[0], &strc34->u.strc0);
}
}
strc34->u.strc0.unkA = temp_r7;
@@ -1121,7 +1121,7 @@ void Task_805DF2C(void)
strc34->u.overB.unkE = 0;
strc34->u.overB.qUnkA = -0x80;
} else {
sub_8052F78(&gUnknown_08688694[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688694[0], &strc34->u.overB);
}
sub_805DE0C();
@@ -1132,11 +1132,11 @@ void Task_805DF2C(void)
strc34->u.strc0.unk2 = 0x100;
strc34->u.strc0.unkA = 0x29;
strc34->u.strc0.unkC = 0x49;
sub_8052F78(&gUnknown_08688694[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688694[0], &strc34->u.overB);
} else {
strc34->u.strc0.unkA = 0x19U;
strc34->u.strc0.unkC = (0x53 - (strc34->u.strc0.unk2 >> 4));
sub_8052C84((void *)&gUnknown_08688694[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688694[0], &strc34->u.strc0);
}
sub_805DE0C();
@@ -1149,7 +1149,7 @@ void Task_805DF2C(void)
strc34->u.strc0.unk2 = 0x100;
}
sub_8052C84((void *)&gUnknown_08688694[0], &strc34->u.strc0);
sub_8052C84((const char*)&gUnknown_08688694[0], &strc34->u.strc0);
sub_805DE0C();
}
}
@@ -1204,13 +1204,13 @@ void sub_805E018()
if ((strc34->unk29 >> i) & 1) {
strc34->u.overB.unk12 = (13 - (i >> 1));
if (i & 1) {
sub_8052F78(&gUnknown_08688698[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688698[0], &strc34->u.overB);
} else {
sub_8052F78(&gUnknown_08688688[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688688[0], &strc34->u.overB);
}
} else {
strc34->u.overB.unk12 = 0xB;
sub_8052F78(&gUnknown_0868869C[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_0868869C[0], &strc34->u.overB);
}
}
} else if (temp_r1 > 0x31U) {
@@ -1227,13 +1227,13 @@ void sub_805E018()
if ((strc34->unk29 >> i) & 1) {
strc34->u.overB.unk12 = (u16)(0xD - (i >> 1));
if (i & 1) {
sub_8052F78(&gUnknown_08688698[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688698[0], &strc34->u.overB);
} else {
sub_8052F78(&gUnknown_08688688[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_08688688[0], &strc34->u.overB);
}
} else {
strc34->u.overB.unk12 = 0xB;
sub_8052F78(&gUnknown_0868869C[0], &strc34->u.overB);
sub_8052F78((const char*)&gUnknown_0868869C[0], &strc34->u.overB);
}
}
}
src/game/special_stage/game_2_0.c
+6 -6
View File
@@ -544,9 +544,9 @@ void Task_805C740(void)
sub->u.overB.qUnkA += 0x20;
sub->unk1A = Mod(sub->unk1A + 1, 7);
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
} else {
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
}
} else if (sub->unk18 > 0x2D) {
@@ -558,7 +558,7 @@ void Task_805C740(void)
sub->unk1A = Mod(sub->unk1A + 1, 7);
}
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
} else if (sub->unk18 > 0x21) {
sub->u.overB.unkC -= 8;
sub->u.overB.qUnkA -= 2;
@@ -568,7 +568,7 @@ void Task_805C740(void)
sub->unk1A = Mod(sub->unk1A + 1, 7);
}
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
} else if (sub->unk18 > 0x19) {
sub->u.overB.qUnkA -= 2;
sub->u.overB.unkE = 9U;
@@ -578,7 +578,7 @@ void Task_805C740(void)
sub->unk1A = Mod(sub->unk1A + 1, 7);
}
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
} else if (sub->unk18 > 0xF) {
sub->u.overB.qUnkA -= 0x1C;
if (sub->u.overB.qUnkA <= 0xEF) {
@@ -587,7 +587,7 @@ void Task_805C740(void)
sub->u.overB.qUnkA += 0x20;
sub->unk1A = Mod(sub->unk1A + 1, 7);
}
sub_8052F78(&arrA[sub->unk1A], &sub->u.overB);
sub_8052F78((const char*)&arrA[sub->unk1A], &sub->u.overB);
}
}
}
src/game/stage/ui_z.c
+18 -18
View File
@@ -578,10 +578,10 @@ void Task_8055730(void)
if (((strc->unk18 >= 0) && (strc->unk18 <= 105)) || !strc->unk20 || (strc->unk21 != 0)) {
// TODO: Resolve cast!
sub_8052F78(gUnknown_086883AC, (void *)strc);
sub_8052F78((const char*)gUnknown_086883AC, (void *)strc);
} else {
// TODO: Resolve cast!
sub_80530CC(gUnknown_086883AC, (void *)strc);
sub_80530CC((const char*)gUnknown_086883AC, (void *)strc);
}
}
@@ -594,7 +594,7 @@ NONMATCH("asm/non_matching/game/stage/ui__Task_8055798.inc", void Task_8055798(v
s32 r5 = 0;
s16 r6 = -Div((strc->unk18 - 215) << 7, 10);
s16 r8 = r6;
const u8 *r7 = &gUnknown_08688394[0];
const char *r7 = &gUnknown_08688394[0];
for (; r5 < 4; r8 += 0x20, r6 += 0x20, r7++, r5++) {
strc->unk0.unkC = r6;
@@ -612,7 +612,7 @@ NONMATCH("asm/non_matching/game/stage/ui__Task_8055798.inc", void Task_8055798(v
// _08055826 + 0x4
s32 r5 = 0;
const u8 *r6 = &gUnknown_08688394[0];
const char *r6 = &gUnknown_08688394[0];
for (; r5 < 4; r6++, r5++) {
strc->unk0.unkC = r5 * 32;
@@ -638,9 +638,9 @@ NONMATCH("asm/non_matching/game/stage/ui__Task_8055798.inc", void Task_8055798(v
if (r2 >= -0x20) {
if (((strc->unk18 >= 0) && (strc->unk18 <= 105)) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&gUnknown_08688394[r5], (void *)strc); // TODO: cast
sub_8052F78((const char*)&gUnknown_08688394[r5], (void *)strc); // TODO: cast
} else {
sub_80530CC(&gUnknown_08688394[r5], (void *)strc); // TODO: cast
sub_80530CC((const char*)&gUnknown_08688394[r5], (void *)strc); // TODO: cast
}
}
}
@@ -669,9 +669,9 @@ void Task_8055904(void)
if (gCurrentLevel <= LEVEL_INDEX(ZONE_6, ACT_2)) {
if (((strc->unk18 >= 0) && (strc->unk18 <= 105)) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&gUnknown_086883B0[0], (void *)strc); // TODO: cast
sub_8052F78((const char*)&gUnknown_086883B0[0], (void *)strc); // TODO: cast
} else {
sub_80530CC(&gUnknown_086883B0[0], (void *)strc); // TODO: cast
sub_80530CC((const char*)&gUnknown_086883B0[0], (void *)strc); // TODO: cast
}
}
}
@@ -722,9 +722,9 @@ void Task_8055998(void)
}
if ((strc->unk18 >= 0 && strc->unk18 <= 105) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&gUnknown_086883B8[0], (void *)strc);
sub_8052F78((const char*)&gUnknown_086883B8[0], (void *)strc);
} else {
sub_80530CC(&gUnknown_086883B8[0], (void *)strc);
sub_80530CC((const char*)&gUnknown_086883B8[0], (void *)strc);
}
}
@@ -747,9 +747,9 @@ void Task_8055AA0()
}
if ((strc->unk18 >= 0 && strc->unk18 <= 105) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&gUnknown_086883C4[0], (void *)strc);
sub_8052F78((const char*)&gUnknown_086883C4[0], (void *)strc);
} else {
sub_80530CC(&gUnknown_086883C4[0], (void *)strc);
sub_80530CC((const char*)&gUnknown_086883C4[0], (void *)strc);
}
}
@@ -776,9 +776,9 @@ void Task_8055B18()
}
if ((strc->unk18 >= 0 && strc->unk18 <= 105) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&arr0[strc->unk1A], (void *)strc);
sub_8052F78((const char*)&arr0[strc->unk1A], (void *)strc);
} else {
sub_80530CC(&arr0[strc->unk1A], (void *)strc);
sub_80530CC((const char*)&arr0[strc->unk1A], (void *)strc);
}
} else if (strc->unk18 > 25) {
u16 qInitialUnkA = strc->unk0.qUnkA;
@@ -791,9 +791,9 @@ void Task_8055B18()
}
if ((strc->unk18 >= 0 && strc->unk18 <= 105) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&arr0[strc->unk1A], (void *)strc);
sub_8052F78((const char*)&arr0[strc->unk1A], (void *)strc);
} else {
sub_80530CC(&arr0[strc->unk1A], (void *)strc);
sub_80530CC((const char*)&arr0[strc->unk1A], (void *)strc);
}
} else if (strc->unk18 > 15) {
// _08055BC0
@@ -813,9 +813,9 @@ void Task_8055B18()
}
if ((strc->unk18 >= 0 && strc->unk18 <= 105) || !strc->unk20 || (strc->unk21 != 0)) {
sub_8052F78(&arr0[strc->unk1A], (void *)strc);
sub_8052F78((const char*)&arr0[strc->unk1A], (void *)strc);
} else {
sub_80530CC(&arr0[strc->unk1A], (void *)strc);
sub_80530CC((const char*)&arr0[strc->unk1A], (void *)strc);
}
}
}