Discover g_FileState

This commit is contained in:
Ryan Dwyer
2021-01-04 16:53:20 +10:00
parent 9efe11892a
commit 591c39b04e
7 changed files with 22 additions and 18 deletions
+3 -3
View File
@@ -2786,9 +2786,9 @@ void coreUnloadStage(void)
func00033dd8();
if (var80062940 == 2) {
menuPlaySound(5);
var80062940 = 0;
if (g_FileState == FILESTATE_CHANGINGAGENT) {
menuPlaySound(MENUSOUND_EXPLOSION);
g_FileState = FILESTATE_UNSELECTED;
}
func0f01bea0();
+1 -1
View File
@@ -9,7 +9,7 @@
#include "stagesetup.h"
#include "types.h"
u8 var80062940 = 0;
u8 g_FileState = 0;
u8 var80062944 = 0;
u8 var80062948 = 0;
u8 var8006294c = 0;
+9 -9
View File
@@ -480,8 +480,8 @@ glabel var7f1a863c
/* f01c460: 3c018007 */ lui $at,%hi(g_PlayersWithControl)
/* f01c464: ac200750 */ sw $zero,%lo(g_PlayersWithControl)($at)
.L0f01c468:
/* f01c468: 3c198006 */ lui $t9,%hi(var80062940)
/* f01c46c: 93392940 */ lbu $t9,%lo(var80062940)($t9)
/* f01c468: 3c198006 */ lui $t9,%hi(g_FileState)
/* f01c46c: 93392940 */ lbu $t9,%lo(g_FileState)($t9)
/* f01c470: 3c148007 */ lui $s4,%hi(var800714d8)
/* f01c474: 269414d8 */ addiu $s4,$s4,%lo(var800714d8)
/* f01c478: 5720001b */ bnezl $t9,.L0f01c4e8
@@ -509,8 +509,8 @@ glabel var7f1a863c
/* f01c4d0: 0fc2ebc3 */ jal currentPlayerPause
/* f01c4d4: af001a24 */ sw $zero,0x1a24($t8)
/* f01c4d8: 24190001 */ addiu $t9,$zero,0x1
/* f01c4dc: 3c018006 */ lui $at,%hi(var80062940)
/* f01c4e0: a0392940 */ sb $t9,%lo(var80062940)($at)
/* f01c4dc: 3c018006 */ lui $at,%hi(g_FileState)
/* f01c4e0: a0392940 */ sb $t9,%lo(g_FileState)($at)
.L0f01c4e4:
/* f01c4e4: 8ead0000 */ lw $t5,0x0($s5)
.L0f01c4e8:
@@ -1224,8 +1224,8 @@ glabel var7f1a863c
/* f01cec4: 3c10800a */ lui $s0,%hi(g_SoloSaveFile)
/* f01cec8: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile)
/* f01cecc: 24190002 */ addiu $t9,$zero,0x2
/* f01ced0: 3c018006 */ lui $at,%hi(var80062940)
/* f01ced4: a0392940 */ sb $t9,%lo(var80062940)($at)
/* f01ced0: 3c018006 */ lui $at,%hi(g_FileState)
/* f01ced4: a0392940 */ sb $t9,%lo(g_FileState)($at)
/* f01ced8: 0fc43da6 */ jal savefileLoadDefaults
/* f01cedc: 02002025 */ or $a0,$s0,$zero
/* f01cee0: 0fc43c81 */ jal savefileApplyOptions
@@ -2074,7 +2074,7 @@ glabel var7f1a863c
// }
//
// // c468
// if (var80062940 == 0 && g_Vars.stagenum == STAGE_CITRAINING) {
// if (g_FileState == FILESTATE_UNSELECTED && g_Vars.stagenum == STAGE_CITRAINING) {
// g_PlayersWithControl[0] = false;
//
// if (g_Vars.lvframenum > 30 && g_Vars.tickmode != TICKMODE_CUTSCENE) {
@@ -2084,7 +2084,7 @@ glabel var7f1a863c
// g_Menus[3].unk83c = 0;
// g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
// currentPlayerPause(MENUROOT_FILEMGR);
// var80062940 = 1;
// g_FileState = FILESTATE_SELECTED;
// }
// }
//
@@ -2383,7 +2383,7 @@ glabel var7f1a863c
// }
// } else /*ceb0*/ if (g_MenuData.unk008 == -7) {
// func0f01bea0();
// var80062940 = 2;
// g_FileState = FILESTATE_CHANGINGAGENT;
// savefileLoadDefaults(&g_SoloSaveFile);
// savefileApplyOptions(&g_SoloSaveFile);
// mainSetStageNum(IS4MB() ? STAGE_4MBMENU : STAGE_CITRAINING);
+2 -2
View File
@@ -13415,7 +13415,7 @@ u32 menuChooseMusic(void)
bool func0f0fcbcc(void)
{
if (var80062940 == 0 && g_Vars.stagenum == STAGE_CITRAINING) {
if (g_FileState == FILESTATE_UNSELECTED && g_Vars.stagenum == STAGE_CITRAINING) {
return true;
}
@@ -13777,7 +13777,7 @@ bool func0f0fd1f4(u32 arg0, u32 arg1)
result = false;
}
if (var80062940 == 0) {
if (g_FileState == FILESTATE_UNSELECTED) {
result = false;
}
+2 -2
View File
@@ -66,13 +66,13 @@ void func0f10cb2c(void)
u32 prevplayernum = g_MpPlayerNum;
g_MpPlayerNum = 0;
if (var80062940) {
if (g_FileState != FILESTATE_UNSELECTED) {
if (var80087260 == 0) {
g_Vars.unk000490 = 2;
menuPushRootDialog(&g_4MbMainMenu, MENUROOT_4MBMAINMENU);
}
} else {
var80062940 = 1;
g_FileState = FILESTATE_SELECTED;
for (i = 0; i != 6; i++) {
func0f18800c(i, true);
+4
View File
@@ -668,6 +668,10 @@
#define FILEERROR_PAKDAMAGED 7
#define FILEERROR_DELETENOTEFAILED 8
#define FILESTATE_UNSELECTED 0
#define FILESTATE_SELECTED 1
#define FILESTATE_CHANGINGAGENT 2
#define FILETYPE_SOLO 0
#define FILETYPE_MPSETUP 1
#define FILETYPE_MPPLAYER 2
+1 -1
View File
@@ -82,7 +82,7 @@ extern u32 var800628c8;
extern u32 var800628d4;
extern u32 var80062914;
extern s32 g_NumPlayers;
extern u8 var80062940;
extern u8 g_FileState;
extern u8 var80062944;
extern u8 var80062948;
extern u8 var8006294c;