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 15:13:54 +01:00
1 parent d725de6076
commit 2807a89421
4 files changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/player_name_input_menu.c
+3 -6
View File
@@ -25,7 +25,7 @@ typedef struct {
u16 filler2C;
u16 unk30;
u8 filler32[1];
s16 unk34[16]; // palette?
u16 unk34[16];
s16 unk54;
u16 filler56;
u16 unk58;
@@ -228,8 +228,6 @@ NONMATCH("asm/non_matching/game/player_name_input_menu__sub_8058830.inc", void s
struct Task *sp34;
s32 sp44;
s32 sp48;
s8 *sp58;
s8 *sp5C;
PlayerNameMenu *sp64;
s16 temp_r0_3;
s16 temp_r0_9;
@@ -476,8 +474,7 @@ NONMATCH("asm/non_matching/game/player_name_input_menu__sub_8058830.inc", void s
}
}
}
sp58 = &subroutine_arg0.unk29;
sp5C = &subroutine_arg0.unk29;
if ((A_BUTTON & gPressedKeys) && !(B_BUTTON & gPressedKeys)) {
switch (temp_r6) {
case 0x126:
@@ -576,7 +573,7 @@ NONMATCH("asm/non_matching/game/player_name_input_menu__sub_8058830.inc", void s
subroutine_arg0.uiGfxID = 0x25;
subroutine_arg0.unk2B = 1;
subroutine_arg0.palette = &TASK_GET_MEMBER(PlayerNameMenu, gCurTask, s16, unk34);
subroutine_arg0.palette = &TASK_GET_MEMBER(PlayerNameMenu, gCurTask, u16, unk34);
subroutine_arg0.paletteSize = sizeof(menu->unk34);
subroutine_arg0.unk28 = 1;
subroutine_arg0.unk29 = 1;
src/game/sa1_sa2_shared/collision.c
+2
View File
@@ -1853,6 +1853,8 @@ NONMATCH("asm/non_matching/game/sa1_sa2_shared/collision__sub_800CBBC.inc",
}
PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
return FALSE;
}
END_NONMATCH
src/game/time_attack/records.c
+1 -1
View File
@@ -367,7 +367,7 @@ void sub_806BD24()
overB->unkE = 7;
overB->qUnkA = 0x50;
sub_8052F78(&recs->unkE4[i][0], overB);
sub_8052F78((const char *)&recs->unkE4[i][0], overB);
}
}
src/game/time_attack/results.c
+4 -4
View File
@@ -282,9 +282,9 @@ void sub_8069EE4(u32 unk0)
DisplaySprite(&strc->s2);
temp_r5 = &strc->strc90;
if (unk0 != 0) {
sub_8052F78(strc->unkB4, temp_r5);
sub_8052F78((const char *)strc->unkB4, temp_r5);
} else {
sub_80530CC(strc->unkB4, temp_r5);
sub_80530CC((const char *)strc->unkB4, temp_r5);
}
}
temp_r5 = &strc->strc60;
@@ -304,11 +304,11 @@ void sub_8069EE4(u32 unk0)
strc->unkC0 = Mod(strc->unkC0 + 1, 8);
}
if (unk0 != 0) {
sub_8052F78(&arr[strc->unkC0], temp_r5);
sub_8052F78((const char *)&arr[strc->unkC0], temp_r5);
return;
}
sub_80530CC(&arr[strc->unkC0], temp_r5);
sub_80530CC((const char *)&arr[strc->unkC0], temp_r5);
}
void sub_8069FDC()