Skip to content

Fix more warnings #221

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Fix more warnings #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
978f81d
Fix a bunch of warnings.
TheUbMunster Jun 22, 2025
abe9b3c
global scratchpad/extended/dcache
TheUbMunster Jun 22, 2025
d6d74af
take a look at coll findscrub
TheUbMunster Jun 23, 2025
da7e372
Global scratchpad attempt 2
TheUbMunster Jun 23, 2025
84f1775
unify dcache under one global variable
TheUbMunster Sep 16, 2025
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
4 changes: 2 additions & 2 deletions decompile/General/231/231_014_RB_Potion_ThTick_InAir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void DECOMP_RB_Potion_ThTick_InAir(struct Thread* t)

SPS->ptr_mesh_info = gGT->level1->ptr_mesh_info;

COLL_SearchBSP_CallbackQUADBLK((u_int*)&posBottom, (u_int*)&posTop, SPS, 0); //the method signature goes posTop, posBottom? is this a bug?
COLL_SearchBSP_CallbackQUADBLK(posBottom, posTop, SPS, 0); //the method signature goes posTop, posBottom? is this a bug?

RB_MakeInstanceReflective(SPS, inst);

Expand Down Expand Up @@ -115,7 +115,7 @@ void DECOMP_RB_Potion_ThTick_InAir(struct Thread* t)
posBottom[1] = inst->matrix.t[1] - 0x900;
posBottom[2] = inst->matrix.t[2];

COLL_SearchBSP_CallbackQUADBLK((u_int*)&posBottom, (u_int*)&posTop, SPS, 0);
COLL_SearchBSP_CallbackQUADBLK(posBottom, posTop, SPS, 0);

// quadblock exists far below potion, dont destroy
if (SPS->boolDidTouchQuadblock != 0) return;
Expand Down
4 changes: 2 additions & 2 deletions decompile/General/231/231_024_RB_MovingExplosive_ThTick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ LAB_800adc08:;

sps->ptr_mesh_info = gGT->level1->ptr_mesh_info;

COLL_SearchBSP_CallbackQUADBLK((u_int*)&posA, (u_int*)&posB, sps, 0);
COLL_SearchBSP_CallbackQUADBLK(posA, posB, sps, 0);

RB_MakeInstanceReflective(sps,inst);

Expand Down Expand Up @@ -309,7 +309,7 @@ LAB_800adc08:;
posA[1] = inst->matrix.t[1] - 0x900;
posA[2] = inst->matrix.t[2];

COLL_SearchBSP_CallbackQUADBLK((u_int*)&posA, (u_int*)&posB, sps, 0);
COLL_SearchBSP_CallbackQUADBLK(posA, posB, sps, 0);

// if still nothing, then explode
if (sps->boolDidTouchQuadblock == 0)
Expand Down
2 changes: 1 addition & 1 deletion decompile/General/231/231_073_RB_Default_LInB.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void DECOMP_RB_Default_LInB(struct Instance* inst)
*(short*)&scratch[0x112] = var + 0x80;

COLL_SearchBSP_CallbackQUADBLK(
(u_int*)&scratch[0x108], (u_int*)&scratch[0x110], (struct ScratchpadStruct*)&scratch[0x118], 0); //this scratchpadstruct is +0x118 from 0x1f800000, that may be a problem? all other function calls I've seen just pass 0x1f800000
(short*)&scratch[0x108], (short*)&scratch[0x110], (struct ScratchpadStruct*)&scratch[0x118], 0); //this scratchpadstruct is +0x118 from 0x1f800000, that may be a problem? all other function calls I've seen just pass 0x1f800000

RB_MakeInstanceReflective((struct ScratchpadStruct*)&scratch[0x118], inst);
}
1 change: 0 additions & 1 deletion decompile/General/233/233_33_CS_Podium_FullScene_Init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

void CS_Podium_Stand_Init(u_short *);
void CS_Podium_Prize_Init(u_int, char*, short *);
int CS_Thread_Init(u_int, char*, short *, short, u_int);
void CS_Camera_ThTick_Podium(int param_1);

void DECOMP_CS_Podium_FullScene_Init()
Expand Down
6 changes: 3 additions & 3 deletions decompile/General/BOTS/BOTS_13_CollideWithOtherAI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void DECOMP_BOTS_CollideWithOtherAI(struct Driver* robot_1, struct Driver* robot
short botPathIndex = robot_1->botData.botPath;

// pointer to navFrame
nfCurr = &robot_1->botData.botNavFrame;
nfCurr = robot_1->botData.botNavFrame;
nfNext = nfCurr + 1;

// iVar4
Expand All @@ -33,13 +33,13 @@ void DECOMP_BOTS_CollideWithOtherAI(struct Driver* robot_1, struct Driver* robot
if (sdata->NavPath_ptrHeader[botPathIndex]->last <= (struct NavFrame*)nfNext)
{
// loop back to first navFrame
nfNext = &sdata->NavPath_ptrNavFrameArray[botPathIndex];
nfNext = sdata->NavPath_ptrNavFrameArray[botPathIndex];
}
}
else
{
// pointer to nav frame
nfNext = &robot_1->botData.botNavFrame;
nfNext = robot_1->botData.botNavFrame;

// iVar4
estimatePos = robot_1->botData.estimatePos;
Expand Down
2 changes: 1 addition & 1 deletion decompile/General/BOTS/BOTS_16_Driver_Convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void DECOMP_BOTS_Driver_Convert(struct Driver* d)

// If all 3 are checked, quit
if (navPathIndex == initialNavPathIndex)
return NULL;
return;
}

memset(&d->botData, 0, sizeof(struct BotData));
Expand Down
Loading