Attempt to decompile titleRenderPdLogo

This commit is contained in:
Ryan Dwyer 2022-01-03 18:43:27 +10:00
parent 67bc89168d
commit 7e4e380ff4
9 changed files with 922 additions and 488 deletions

View File

@ -5250,7 +5250,7 @@ bool aiNoOp00db(void)
bool aiEndLevel(void)
{
if (debugAllowEndLevel()) {
if (var800624a4) {
if (g_IsTitleDemo) {
mainChangeToStage(STAGE_TITLE);
} else if (g_Vars.autocutplaying) {
g_Vars.autocutfinished = true;

View File

@ -3459,7 +3459,7 @@ void func0f0b9a20(void)
void currentPlayerEndCutscene(void)
{
if (var800624a4) {
if (g_IsTitleDemo) {
mainChangeToStage(STAGE_TITLE);
} else if (g_Vars.autocutplaying) {
g_Vars.autocutfinished = true;
@ -3855,7 +3855,7 @@ void func0f0ba010(void)
void cameraDoAnimation(s16 animnum)
{
if ((!var800624a4 && !g_Vars.autocutplaying)
if ((!g_IsTitleDemo && !g_Vars.autocutplaying)
|| !g_Vars.in_cutscene
|| !g_CutsceneSkipRequested) {
joyDisableTemporarily();
@ -13977,7 +13977,7 @@ glabel func0f0bfc7c
/* f0bfce0: af220064 */ sw $v0,0x64($t9)
/* f0bfce4: 8e490284 */ lw $t1,0x284($s2)
/* f0bfce8: 24040002 */ addiu $a0,$zero,0x2
/* f0bfcec: 0fc59e6c */ jal gfxAllocate4Words
/* f0bfcec: 0fc59e6c */ jal gfxAllocateLookAt
/* f0bfcf0: ad220068 */ sw $v0,0x68($t1)
/* f0bfcf4: 8fa80110 */ lw $t0,0x110($sp)
/* f0bfcf8: 8e430284 */ lw $v1,0x284($s2)
@ -14192,7 +14192,7 @@ glabel func0f0bfc7c
// g_Vars.currentplayer->matrix64 = gfxAllocateMatrix();
// g_Vars.currentplayer->matrix68 = gfxAllocateMatrix();
//
// spcc = gfxAllocate4Words(2);
// spcc = gfxAllocateLookAt(2);
//
// sp74.x = (cam_pos->x - g_Vars.currentplayer->globaldrawworldoffset.x) * scale;
// sp74.y = (cam_pos->y - g_Vars.currentplayer->globaldrawworldoffset.y) * scale;

View File

@ -138,7 +138,7 @@ void *gfxAllocateMatrix(void)
return ptr;
}
void *gfxAllocate4Words(s32 count)
void *gfxAllocateLookAt(s32 count)
{
void *ptr = g_GfxMemPos;
g_GfxMemPos += count * 0x10;

View File

@ -8127,16 +8127,16 @@ void lvTick(void)
|| joyGetStickX(3) > 10
|| joyGetStickX(3) < -10
|| joyGetStickY(3) > 10
|| joyGetStickY(3) < -10) && var800624a4) {
|| joyGetStickY(3) < -10) && g_IsTitleDemo) {
if (g_Vars.stagenum != STAGE_TITLE) {
titleSetNextMode(TITLEMODE_SKIP);
mainChangeToStage(STAGE_TITLE);
}
var800624a4 = 0;
g_IsTitleDemo = false;
}
if (g_Vars.stagenum < STAGE_TITLE && !var800624a4 && !g_Vars.in_cutscene) {
if (g_Vars.stagenum < STAGE_TITLE && !g_IsTitleDemo && !g_Vars.in_cutscene) {
if (joyGetButtons(0, 0xffff) == 0
&& joyGetStickX(0) < 10
&& joyGetStickX(0) > -10
@ -8157,12 +8157,12 @@ void lvTick(void)
&& joyGetStickX(3) > -10
&& joyGetStickY(3) < 10
&& joyGetStickY(3) > -10) {
var800624b0 += g_Vars.diffframe60;
g_TitleIdleTime60 += g_Vars.diffframe60;
} else {
var800624b0 = 0;
g_TitleIdleTime60 = 0;
}
} else {
var800624b0 = 0;
g_TitleIdleTime60 = 0;
}
g_NumReasonsToEndMpMatch = 0;

View File

@ -740,7 +740,7 @@ void musicEndCutscene(void)
{
g_Vars.dontplaynrg = false;
if (var800624a4 == 0) {
if (!g_IsTitleDemo) {
musicQueueStopEvent(TRACKTYPE_PRIMARY);
musicQueueStopEvent(TRACKTYPE_AMBIENT);
musicStartPrimary(0.5f);

File diff suppressed because it is too large Load Diff

View File

@ -112,8 +112,8 @@ extern f32 var80061634;
extern bool g_NbombsActive;
extern s32 g_WeatherActive;
extern u32 var80062410;
extern s32 var800624a4;
extern u32 var800624b0;
extern bool g_IsTitleDemo;
extern u32 g_TitleIdleTime60;
extern s32 g_TitleMode;
extern s32 g_TitleNextMode;
extern u32 g_TitleDelayedTimer;

View File

@ -8,7 +8,7 @@ void gfxInitMemory(void);
Gfx *gfxGetMasterDisplayList(void);
struct gfxvtx *gfxAllocateVertices(s32 count);
void *gfxAllocateMatrix(void);
void *gfxAllocate4Words(s32 count);
void *gfxAllocateLookAt(s32 count);
void *gfxAllocateColours(s32 count);
void *gfxAllocate(u32 size);
void gfxSwapBuffers(void);

View File

@ -20,8 +20,8 @@ Gfx *titleRenderLegal(Gfx *gdl);
void titleInitPdLogo(void);
void titleExitPdLogo(void);
void titleTickPdLogo(void);
u32 func0f017248(void);
void func0f017980(void);
Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, s32 arg2, f32 arg3, s32 arg4, f32 arg5, Mtxf *arg6, struct gfxvtx *vertices, u32 *colours);
void titleSkipToPdTitle(void);
Gfx *titleRenderPdLogo(Gfx *gdl);
void titleInitRarePresents(void);
void titleExitRarePresents(void);