This commit is contained in:
Niko 2023-12-24 04:18:52 -05:00
parent e7b6dc8391
commit 0f5394db1e
5 changed files with 40 additions and 9 deletions

View File

@ -9,7 +9,7 @@ u_char DECOMP_CAM_Path_Move(int frameIndex, short *position, short *rotation, sh
short *move;
// get number of position on track
numPos = CAM_Path_GetNumPoints();
numPos = DECOMP_CAM_Path_GetNumPoints();
if (frameIndex < 0) return 0;
if (frameIndex >= numPos) return 0;

View File

@ -409,7 +409,31 @@ FinishLoading:
(gGT->level1 != 0) && // for ND Box
(gGT->levelID != MAIN_MENU_LEVEL)
)
{
{
// placeholder until 233 CS_Garage_MenuBox is done,
// remember to correct the LOAD_TenStages "case 4"
if (gGT->levelID == ADVENTURE_CHARACTER_SELECT)
{
if(gGT->tileView[0].pos[0] != 0x24c)
{
if(gGT->level2 == 0)
{
// no relevence, just boolean for camera
gGT->level2 = 1;
int x = 0;
int y = 0;
DECOMP_CAM_Path_Move(x, &gGT->tileView[0].pos, &gGT->tileView[0].rot, &y);
}
}
}
else
{
// no relevence, just boolean for camera
gGT->level2 = 0;
}
// placeholder until 233 is done
if (gGT->levelID == NAUGHTY_DOG_CRATE)
{
gGT->tileView[0].pos[0] = 0;

View File

@ -1,5 +1,9 @@
#include <common.h>
void DECOMP_CAM_ClearScreen(struct GameTracker* gGT);
int DECOMP_CAM_Path_GetNumPoints(void);
u_char DECOMP_CAM_Path_Move(int frameIndex, short *position, short *rotation, short *param_4);
void DECOMP_CDSYS_SetXAToLang(int lang);
void DECOMP_CDSYS_XAPlay(int categoryID, int xaID);
void DECOMP_CDSYS_XAPauseAtEnd();

View File

@ -344,14 +344,15 @@ void TEST_226(
if (otZ > 8)
{
if (otZ < 4080)
{
if ((p->tpage & 0x40) == 0)
setSemiTrans(p, true);
if (otZ > 4080)
otZ = 4080;
if ((p->tpage & 0x40) == 0)
setSemiTrans(p, true);
AddPrim((u_long*)ot + (otZ >> 2), pCurr);
primMem->curr = pNext;
}
AddPrim((u_long*)ot + (otZ >> 2), pCurr);
primMem->curr = pNext;
}
}
}

View File

@ -14,6 +14,8 @@
#include "../decompile/General/MAIN/MainMain.c"
#include "../decompile/General/CAMERA/CAM_01_ClearScreen.c"
#include "../decompile/General/CAMERA/CAM_04_Path_GetNumPoints.c"
#include "../decompile/General/CAMERA/CAM_05_Path_Move.c"
#include "../decompile/General/CDSYS/CDSYS_c01_Init.c"
#include "../decompile/General/CDSYS/CDSYS_c02_GetFilePosInt.c"