Game-Decompilation/CTR-ModSDK
1
0
Fork 0
mirror of https://github.com/CTR-tools/CTR-ModSDK.git synced 2024-12-02 10:16:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
Niko 2024-01-20 04:32:04 -05:00
parent 32c968ded5
commit 73aeaf75ce
8 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decompile/General/MAIN/MainFrame_RenderFrame.c
View File

@ -689,13 +689,13 @@ void RenderAllHUD(struct GameTracker* gGT)
// not crystal challenge
if((gameMode1 & CRYSTAL_CHALLENGE) == 0)
{
UI_RenderFrame_Racing();
DECOMP_UI_RenderFrame_Racing();
}
// if crystal challenge
else
{
UI_RenderFrame_CrystChall();
DECOMP_UI_RenderFrame_CrystChall();
}
}
@ -753,7 +753,7 @@ void RenderAllHUD(struct GameTracker* gGT)
// if any transition is over
if(gGT->tileView_UI.fadeFromBlack_currentValue > 0xfff)
{
UI_RenderFrame_AdvHub();
DECOMP_UI_RenderFrame_AdvHub();
}
}

4
decompile/General/UI/UI_AAA_BigBlock1.c
View File

@ -13,6 +13,10 @@
#include "UI_JumpMeter_Draw.c"
#include "UI_JumpMeter_Update.c"
#include "UI_DrawSlideMeter.c"
#include "UI_DrawRankedDrivers.c"
#include "UI_RenderFrame_Racing.c"
#include "UI_RenderFrame_AdvHub.c"
#include "UI_RenderFrame_CrystChall.c"
#define JMP(dest) (((unsigned long)dest & 0x3FFFFFF) >> 2 | 0x8000000)
#define JAL(dest) (((unsigned long)dest & 0x3FFFFFF) >> 2 | 0xC000000)

6
decompile/General/UI/UI_DrawRankedDrivers.c
View File

@ -99,7 +99,7 @@ void DECOMP_UI_DrawRankedDrivers(void) {
// draw rank number: '1', '2', '3', '4'
sdata->s_spacebar[0] = (char) iVar15 + '1';
DecalFont_DrawLine(&sdata->s_spacebar, 0x34, iVar12 >> 0x10, 2, txtColor);
DECOMP_DecalFont_DrawLine(&sdata->s_spacebar, 0x34, iVar12 >> 0x10, 2, txtColor);
// add to Y, which mekes it lower on screen
iVar12 = iVar12 + 0x1b0000;
@ -190,12 +190,14 @@ void DECOMP_UI_DrawRankedDrivers(void) {
// === Icon Transitioning ===
if(posXY[0] == -100)
{
#ifndef REBUILD_PS1
UI_Lerp2D_Angular(
&posXY[0],
*curr,
*des,
*psVar13
);
#endif
psVar13[0]++;
@ -206,7 +208,7 @@ void DECOMP_UI_DrawRankedDrivers(void) {
}
}
UI_DrawDriverIcon(
DECOMP_UI_DrawDriverIcon(
gGT->ptrIcons[data.MetaDataCharacters[data.characterIDs[iVar14]].iconID],

6
decompile/General/UI/UI_RenderFrame_CrystChall.c
View File

@ -74,13 +74,15 @@ void DECOMP_UI_RenderFrame_CrystChall(void)
// if you have enough crystals to win the race
if (gGT->numCrystalsInLEV <= player->numCrystals)
{
#ifndef REBUILD_PS1
player->funcPtrs[0] = VehPtr_Freeze_Init;
//turn on 26th bit of Actions Flag set (means racer finished the race)
player->actionsFlagSet |= 0x2000000;
MainGameEnd_Initialize();
}
#endif
}
DECOMP_OtherFX_Play(0x42,1);
@ -141,7 +143,7 @@ LAB_800545e8:
// if not paused, item stopped rolling, and
// weapon roulette sound is playing, then
// stop the sound and remove flag
OtherFX_Stop2(0x5d);
DECOMP_OtherFX_Stop2(0x5d);
gGT->gameMode1 &= ~(ROLLING_ITEM);
return;

5
decompile/General/UI/UI_RenderFrame_Racing.c
View File

@ -113,14 +113,15 @@ void DECOMP_UI_RenderFrame_Racing()
levPtrMap = pointers[ST1_MAP];
}
#ifndef REBUILD_PS1
// If you are not in Relic Race, and not in battle mode,
// and not in time trial
if ((gGT->gameMode1 & (RELIC_RACE | TIME_TRIAL | BATTLE_MODE)) == 0)
{
// cant run on PC yet, drivers dont initialize
#ifndef REBUILD_PC
DECOMP_UI_DrawRankedDrivers();
}
#endif
}
// pointer to first Player thread
playerThread = gGT->threadBuckets[0].thread;

13
decompile/buildList.txt
View File

@ -1,12 +1,12 @@
// 535+38+14+18+16+1+1+7+3+3+3+2+2+3+1+5+3+1+2+12+1+1+2+4+2+4+1+2 = 687 rewritten so far
// 535 for every 'common' and ','
// 533+38+14+18+16+1+1+7+3+3+3+2+2+3+1+5+3+1+2+16+1+1+2+4+2+4+1+2 = 689 rewritten so far
// 533 for every 'common' and ','
// additions for every file that has multiple functions,
// 38 for 230_Block1
// 14 for 230_Block2
// 18 for 230_Block3
// 16 for 232 adv hub
// most others for 231 or VehPtr
// 12 for the 13 UI functions
// 16 for the 13 UI functions
// +1 for DebugFont
// +1 for 222
// +2 for 223
@ -624,14 +624,9 @@ common, exe, UI_DrawPosSuffix, 0x0, General/UI/UI_DrawPosSuffix.c
common, exe, UI_DrawLapCount, 0x0, General/UI/UI_DrawLapCount.c
// UI_DrawBattleScores
// squish 13 functions
// squish 17 functions
common, exe, UI_Weapon_DrawSelf, 0x0, General/UI/UI_AAA_BigBlock1.c
common, exe, UI_DrawRankedDrivers, 0x0, General/UI/UI_DrawRankedDrivers.c
common, exe, UI_RenderFrame_Racing, 0x0, General/UI/UI_RenderFrame_Racing.c
common, exe, UI_RenderFrame_AdvHub, 0x0, General/UI/UI_RenderFrame_AdvHub.c
common, exe, UI_RenderFrame_CrystChall, 0x0, General/UI/UI_RenderFrame_CrystChall.c
common, exe, UI_RaceStart_IntroText1P, 0x0, General/UI/UI_RaceStart_IntroText1P.c
common, exe, UI_RaceEnd_GetDriverClock, 0x0, General/UI/UI_RaceEnd_GetDriverClock.c

2
include/decomp_functions.h
View File

@ -380,6 +380,8 @@ void DECOMP_UI_DrawSpeedBG(void);
void DECOMP_UI_DrawSpeedNeedle(short posX, short posY, struct Driver * driver);
void DECOMP_UI_JumpMeter_Draw(short posX, short posY, struct Driver* driver);
void DECOMP_UI_JumpMeter_Update(struct Driver * d);
void DECOMP_UI_DrawSlideMeter(short posX, short posY, struct Driver* driver);
void DECOMP_UI_DrawRankedDrivers(void);
void DECOMP_UI_RenderFrame_AdvHub(void);
void DECOMP_UI_RenderFrame_Racing();

4
rebuild_PS1/main.c
View File

@ -414,12 +414,8 @@
#include "../decompile/General/UI/UI_DrawPosSuffix.c"
#include "../decompile/General/UI/UI_DrawLapCount.c"
// note to self, still need UI_DrawRankedDrivers,
#include "../decompile/General/UI/UI_AAA_BigBlock1.c"
#include "../decompile/General/UI/UI_RenderFrame_Racing.c"
#include "../decompile/General/UI/UI_RenderFrame_AdvHub.c"
// VEH
#include "../decompile/General/Vehicle/VehInit_Player.c"
#include "../decompile/General/Vehicle/VehInit_NonGhost.c"