falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile creditsRequestAltTitle

This commit is contained in:
Ryan Dwyer 2021-01-15 22:06:10 +10:00
parent 2047fd96a7
commit 91eb9e35c7
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/game/credits.c
View File

@ -35,8 +35,8 @@ const char var7f1b57c0[] = "tload";
const char var7f1b57c8[] = "dump";
u32 var8007f130 = 0x00000000;
u32 var8007f134 = 0x00000000;
u32 var8007f138 = 0x00000000;
bool g_CreditsAltTitleRequested = false;
bool g_CreditsUsingAltTitle = false;
u32 var8007f13c = 0x3e4ccccd;
u32 var8007f140 = 0x00010001;
u32 var8007f144 = 0x02010001;
@ -4274,7 +4274,7 @@ void creditsTick(void)
}
if (var800a416c == 0) {
if (var8007f138) {
if (g_CreditsUsingAltTitle) {
musicSetStage(STAGE_CREDITS);
musicStartPrimary(0);
} else {
@ -4576,8 +4576,8 @@ glabel var7f1b5948
/* f13b43c: 02002025 */ or $a0,$s0,$zero
/* f13b440: 00408025 */ or $s0,$v0,$zero
.L0f13b444:
/* f13b444: 3c0c8008 */ lui $t4,%hi(var8007f138)
/* f13b448: 8d8cf138 */ lw $t4,%lo(var8007f138)($t4)
/* f13b444: 3c0c8008 */ lui $t4,%hi(g_CreditsUsingAltTitle)
/* f13b448: 8d8cf138 */ lw $t4,%lo(g_CreditsUsingAltTitle)($t4)
/* f13b44c: 00002025 */ or $a0,$zero,$zero
/* f13b450: 51800018 */ beqzl $t4,.L0f13b4b4
/* f13b454: 8fbf001c */ lw $ra,0x1c($sp)
@ -4710,7 +4710,7 @@ glabel var7f1b5948
// }
// }
//
// if (var8007f138 && contGetButtonsPressedThisFrame(0, 0xffcf)) {
// if (g_CreditsUsingAltTitle && contGetButtonsPressedThisFrame(0, 0xffcf)) {
// g_TitleNextStage = STAGE_CITRAINING;
//
// setNumPlayers(1);
@ -4763,10 +4763,10 @@ void creditsInit(void)
g_CreditsData->unk3414 = g_CreditsData->unk343c;
g_CreditsData->unk3468 = 60;
var8007f138 = var8007f134;
g_CreditsUsingAltTitle = g_CreditsAltTitleRequested;
if (var8007f134) {
var8007f134 = 0;
if (g_CreditsAltTitleRequested) {
g_CreditsAltTitleRequested = false;
g_CreditsData->unk41f4 = 0;
g_CreditsData->unk4204 = 0x474;
@ -4775,10 +4775,7 @@ void creditsInit(void)
currentPlayerConfigureVi();
}
GLOBAL_ASM(
glabel func0f13b660
/* f13b660: 240e0001 */ addiu $t6,$zero,0x1
/* f13b664: 3c018008 */ lui $at,%hi(var8007f134)
/* f13b668: 03e00008 */ jr $ra
/* f13b66c: ac2ef134 */ sw $t6,%lo(var8007f134)($at)
);
void creditsRequestAltTitle(void)
{
g_CreditsAltTitleRequested = true;
}

4
src/game/title.c
View File

@ -1317,9 +1317,9 @@ void titleTickPdLogo(void)
var8009ccb8 = 1 - var8009ccb8;
if (var80062734) {
if (g_AltTitle && g_Is4Mb != true) {
if (g_AltTitle && !IS4MB()) {
g_TitleMode = TITLEMODE_SKIP;
func0f13b660();
creditsRequestAltTitle();
g_TitleNextStage = STAGE_CREDITS; // for alt title screen
setNumPlayers(1);
mainSetStageNum(g_TitleNextStage);

2
src/include/game/credits.h
View File

@ -26,7 +26,7 @@ u32 func0f13ae04(void);
void creditsTick(void);
Gfx *creditsRender(Gfx *gdl);
void creditsInit(void);
void func0f13b660(void);
void creditsRequestAltTitle(void);
struct creditsbgtype {
s16 unk00;

2
src/include/game/data/data_020df0.h
View File

@ -154,7 +154,7 @@ extern u32 var8007f110;
extern u32 var8007f120;
extern u32 var8007f124;
extern u32 var8007f130;
extern u32 var8007f134;
extern bool g_CreditsAltTitleRequested;
extern u32 var8007f13c;
extern u32 var8007f3cc;
extern u32 var8007f410;