Skip to content

QOL fixes for decomp #235

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 8 commits into
base: main
Choose a base branch
from
Draft

QOL fixes for decomp #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61ea58d
bugfix tokens
Aug 6, 2025
44eaa8b
Merge branch 'CTR-tools:main' into decomp_pr
kkv0n Oct 5, 2025
95e4bc6
QOL fixes
Oct 5, 2025
fa01d45
lol
Oct 5, 2025
1db176b
big refactor plus mistakes
Oct 6, 2025
3c08eaa
minimap working
Oct 7, 2025
64bf48e
scratchpad progress
Oct 7, 2025
5737db3
update file names
Oct 7, 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
2 changes: 1 addition & 1 deletion config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"optimization": 4,
"debug": 1,
"psyq": 0,
"mininoob": 0,
"mininoob": 0,
"8mb": 1
},
"versions":
Expand Down
10 changes: 5 additions & 5 deletions decompile/General/221/221_Full.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void DECOMP_CC_EndEvent_DrawMenu()
else bitIndex = hub[gGT->levelID-NITRO_COURT]; //0x12

// first purple token at 0x6f
bitIndex += 0x6f;
bitIndex += PRIZE_CRYSTAL_CH;

adv = &sdata->advProgress;
boolLose = driver->numCrystals < gGT->numCrystalsInLEV;
Expand All @@ -74,8 +74,8 @@ void DECOMP_CC_EndEvent_DrawMenu()
elapsedFrames,
FPS_DOUBLE(0x14));

sdata->ptrMenuCrystal->matrix.t[0] = DECOMP_UI_ConvertX_2(posXY[0], 0x200);
sdata->ptrMenuCrystal->matrix.t[1] = DECOMP_UI_ConvertY_2(posXY[1], 0x200);
sdata->ptrMenuCrystal->matrix.t.x = DECOMP_UI_ConvertX_2(posXY[0], 0x200);
sdata->ptrMenuCrystal->matrix.t.y = DECOMP_UI_ConvertY_2(posXY[1], 0x200);

DECOMP_UI_DrawNumCrystal(posXY[0]+0xf, posXY[1]-0x10, driver);

Expand Down Expand Up @@ -163,8 +163,8 @@ void DECOMP_CC_EndEvent_DrawMenu()
// make token visible
tokenInst->flags &= ~(HIDE_MODEL);

tokenInst->matrix.t[0] = DECOMP_UI_ConvertX_2(posXY[0], 0x200);
tokenInst->matrix.t[1] = DECOMP_UI_ConvertY_2(0xA2-0x18, 0x200);
tokenInst->matrix.t.x = DECOMP_UI_ConvertX_2(posXY[0], 0x200);
tokenInst->matrix.t.y = DECOMP_UI_ConvertY_2(0xA2-0x18, 0x200);

// grow token after first second
if(elapsedFrames > FPS_DOUBLE(30))
Expand Down
32 changes: 16 additions & 16 deletions decompile/General/222/222_Full.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void DECOMP_AA_EndEvent_DrawMenu(void)


// If you have not unlocked this CTR Token
bitIndex = gGT->levelID + 0x4c;
bitIndex = gGT->levelID + PRIZE_TOKEN_RACE;
*(int *)&letterPos[0] = *(int *)&hudCTR[0];
if (CHECK_ADV_BIT(adv->rewards, bitIndex) == 0)
{
Expand Down Expand Up @@ -181,8 +181,8 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
elapsedFrames, FPS_DOUBLE(8));

hudToken->flags &= ~HIDE_MODEL;
hudToken->matrix.t[0] = hudT->matrix.t[0];
hudToken->matrix.t[1] = DECOMP_UI_ConvertY_2(letterPos[1] + 0x18, 0x200);
hudToken->matrix.t.x = hudT->matrix.t.x;
hudToken->matrix.t.y = DECOMP_UI_ConvertY_2(letterPos[1] + 0x18, 0x200);

// variable reuse, frame timers
lerpStartY = FPS_DOUBLE(120);
Expand Down Expand Up @@ -218,8 +218,8 @@ void DECOMP_AA_EndEvent_DrawMenu(void)

for (i = 0; i < 3; i++)
{
hudLetters[i]->matrix.t[0] = DECOMP_UI_ConvertX_2(letterPos[0] + (scaleDown * (i * 12)) + (i * 29), 0x200);
hudLetters[i]->matrix.t[1] = DECOMP_UI_ConvertY_2(letterPos[1] - (i & 1), 0x200);
hudLetters[i]->matrix.t.x = DECOMP_UI_ConvertX_2(letterPos[0] + (scaleDown * (i * 12)) + (i * 29), 0x200);
hudLetters[i]->matrix.t.y = DECOMP_UI_ConvertY_2(letterPos[1] - (i & 1), 0x200);
}
}

Expand All @@ -239,16 +239,16 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
(elapsedFrames > FPS_DOUBLE(6*i)) &&

// letter not fully off-screen
(-300 < hudLetters[i]->matrix.t[1])
(-300 < hudLetters[i]->matrix.t.y)
)
{
letter = hudLetters[i]->thread->object;

// move X position (yes, C-Letter only, Naughty Dog bug?)
hudLetters[0]->matrix.t[0] += letter->vel[0];
hudLetters[0]->matrix.t.x += letter->vel[0];

// make the letter fall off the screen
hudLetters[i]->matrix.t[1] -= letter->vel[1];
hudLetters[i]->matrix.t.y -= letter->vel[1];

if (FPS_HALF(-0x14) < letter->vel[1])
{
Expand Down Expand Up @@ -418,7 +418,7 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
sdata->Loading.OnBegin.RemBitsConfig0 |= (ADVENTURE_BOSS | TOKEN_RACE);

// If you are in boss mode
if (gGT->gameMode1 < 0)
if ((gGT->gameMode1 & ADVENTURE_BOSS) != 0)
{
sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
}
Expand All @@ -439,14 +439,14 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
levSpawn = gGT->prevLEV;

// If you are in boss mode
if (gGT->gameMode1 < 0)
if ((gGT->gameMode1 & ADVENTURE_BOSS) != 0)
{

// bitIndex of keys unlocked, and boss beaten
bitIndex = gGT->bossID + 0x5e;
bitIndex = gGT->bossID + PRIZE_BOSS_KEY;

// If the number of keys you have is less than 4
if (gGT->bossID < 4)
if (gGT->bossID < BOSS_OXIDE)
{
// only if first time beating boss
if (CHECK_ADV_BIT(adv->rewards, bitIndex) == 0)
Expand Down Expand Up @@ -475,7 +475,7 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
adv->rewards[3] |= 0x80004;

// if beaten oxide 2nd time
if(gGT->bossID == 5)
if(gGT->bossID == BOSS_OXIDEFINAL)
{
// beat 2nd time
adv->rewards[3] |= 0x100008;
Expand All @@ -492,7 +492,7 @@ void DECOMP_AA_EndEvent_DrawMenu(void)

// if trophy is not won,
// Dingo Bingo needs to win trophy and token in the same race
bitIndex = gGT->levelID + 6;
bitIndex = gGT->levelID + PRIZE_TROPHY_RACE;
if (CHECK_ADV_BIT(adv->rewards, bitIndex) == 0)
{
// unlock tropy
Expand Down Expand Up @@ -633,8 +633,8 @@ void DECOMP_AA_EndEvent_DisplayTime(short driverId, short param_2)
lerpEndX, lerpEndY,
currFrame, endFrame);

bigNum->matrix.t[0] = posXY[0];
bigNum->matrix.t[1] = posXY[1];
bigNum->matrix.t.x = posXY[0];
bigNum->matrix.t.y = posXY[1];

// interpolate scale to 0x1e00
DECOMP_UI_Lerp2D_Linear(
Expand Down
Loading