mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-18 14:12:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Warnings Fixes (#45)

Browse Source 
* fox_option and fox_title warnings

* Couple small warnings

* Fix all remaining warnings

* Run make format

* make tools on its own

* Fix warnings introduced in last master version

* Better use of the drawGfx union
This commit is contained in:
Ryan Myers
2023-12-08 16:58:37 -05:00
committed by GitHub
parent 8dbe02a3b4
commit 392305e919
10 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_display.c
+2 -2
View File
@@ -287,7 +287,7 @@ void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f* min, Vec3f* max, s32*
for (var_s0 = sp44; (s32) (*var_s0 >> 0x38) != G_ENDDL && var_s0 - sp44 < len; var_s0++) {
switch ((s32) (*var_s0 >> 0x38)) {
case G_DL:
Animation_FindBoundingBox((Gfx*) (*var_s0 & 0xFFFFFFFF), (*var_s0 >> 0x20) & 0xFFFF, min, max, vtxFound,
Animation_FindBoundingBox(*var_s0 & 0xFFFFFFFF, (*var_s0 >> 0x20) & 0xFFFF, min, max, vtxFound,
vtxCount, vtxList);
break;
case G_VTX:
@@ -719,7 +719,7 @@ f32 Math_RadToDeg(f32 rAngle) {
return rAngle;
}
s32* func_8009F7B4(Gfx** gfxPtr, u8 width, u8 height) {
u16* func_8009F7B4(Gfx** gfxPtr, u8 width, u8 height) {
u16* spB4;
u16 norm;
src/main/main.c
+1 -1
View File
@@ -213,7 +213,7 @@ void Graphics_SetTask(void) {
gGfxTask->task.t.ucode_size = SP_UCODE_SIZE;
gGfxTask->task.t.ucode_data = (u64*) &gF3dexData;
gGfxTask->task.t.ucode_data_size = SP_UCODE_DATA_SIZE;
gGfxTask->task.t.dram_stack = &D_80281000;
gGfxTask->task.t.dram_stack = D_80281000;
gGfxTask->task.t.dram_stack_size = SP_DRAM_STACK_SIZE8;
gGfxTask->task.t.output_buff = (u64*) &D_802A7800;
gGfxTask->task.t.output_buff_size = (u64*) &D_802D7800;
src/main/sf_A4B50.c
+2 -2
View File
@@ -240,7 +240,7 @@ void func_800A4C40(UnkStruct_D_80178280* arg0) {
}
} else {
D_80161A64 = 0;
func_8001A55C(&arg0->unk_460[0], 0x1100000B);
func_8001A55C(&arg0->unk_460[0].x, 0x1100000B);
}
}
}
@@ -336,7 +336,7 @@ void func_800A5338(void) {
var_s0->obj.rot.y = D_80178310[j].unk_C;
func_800612B8(&var_s0->unk_1C, var_s0->obj.id);
if (var_s0->obj.id == 1) {
var_s0->unk_1C.draw = D_6020760;
var_s0->unk_1C.drawGfx = D_6020760;
}
var_s0++;
}
src/overlays/ovl_EBFBE0/fox_title.c
+10 -10
View File
@@ -19,10 +19,10 @@ s32 pad_D_EBFBE0_801AD9F0[4] = { 0, 0, 0, 0 };
//! TODO: Symbols for segmented addresses
Animation D_EBFBE0_801ADA00[4] = {
{ 0x0602F8E0, 0x06035024, 0x0602FBAC },
{ 0x060305C0, 0x060338DC, 0x0603088C },
{ 0x06031DB8, 0x0603531C, 0x06032084 },
{ 0x06031120, 0x06036278, 0x060313AC },
{ (AnimationHeader*) 0x0602F8E0, (AnimationHeader*) 0x06035024, (SkelAnime*) 0x0602FBAC },
{ (AnimationHeader*) 0x060305C0, (AnimationHeader*) 0x060338DC, (SkelAnime*) 0x0603088C },
{ (AnimationHeader*) 0x06031DB8, (AnimationHeader*) 0x0603531C, (SkelAnime*) 0x06032084 },
{ (AnimationHeader*) 0x06031120, (AnimationHeader*) 0x06036278, (SkelAnime*) 0x060313AC },
};
u16* D_EBFBE0_801ADA30[5] = {
@@ -1249,7 +1249,7 @@ void func_EBFBE0_8018A644(void) {
if (D_EBFBE0_801B7BEC == 795) {
func_8001A838(0x49000014);
func_8001A55C(&D_EBFBE0_801B84D8, 0x0140001C);
func_8001A55C(&D_EBFBE0_801B84D8.x, 0x0140001C);
D_EBFBE0_801B82C0 = 0;
@@ -2033,7 +2033,7 @@ void func_EBFBE0_8018CC30(UnkStruct_D_EBFBE0_801B8294* arg0, s32 arg1, f32 arg2)
var_a3 = 2;
}
func_EBFBE0_8018CD9C(&pos, &arg0[D_EBFBE0_801B8298], D_EBFBE0_801B828C, var_a3);
func_EBFBE0_8018CD9C(&pos[0], &arg0[D_EBFBE0_801B8298], D_EBFBE0_801B828C, var_a3);
D_80177978 = pos[0].x;
D_80177980 = pos[0].y;
D_80177988 = pos[0].z;
@@ -2450,8 +2450,8 @@ void func_EBFBE0_8018E67C(s32 arg0) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_0, sp5C, &sp60);
Animation_DrawSkeleton(0, D_EBFBE0_801ADA00[arg0].skelanime, &sp60, NULL, NULL, NULL, &gIdentityMatrix);
Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_0, sp5C, sp60);
Animation_DrawSkeleton(0, D_EBFBE0_801ADA00[arg0].skelanime, sp60, NULL, NULL, NULL, &gIdentityMatrix);
if (arg0 == 2) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
@@ -2515,7 +2515,7 @@ void func_EBFBE0_8018EA78(s32 arg0) {
Matrix_SetGfxMtx(&gMasterDisp);
Math_SmoothStepToVec3fArray(sp48, D_EBFBE0_801B86E0[arg0], 1,
Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_4, sp44, &sp48), 0.2f, 100.0f,
Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_4, sp44, sp48), 0.2f, 100.0f,
0.0001f);
Animation_DrawSkeleton(1, D_EBFBE0_801ADA00[arg0].skelanime, D_EBFBE0_801B86E0[arg0], func_EBFBE0_8018EDC8, NULL,
&arg0, &gIdentityMatrix);
@@ -3350,7 +3350,7 @@ void func_EBFBE0_801918FC(void) {
}
void func_EBFBE0_801919C4(u16** arg0, s32 arg1) {
D_80178720 = (s32) arg0;
D_80178720 = arg0;
D_80178724 = 0;
D_80178308 = arg0[D_80178724];
D_80177D68 = arg1;