Rename mainLoop to mainEntry, mainTick to mainLoop, func0000e324 to mainTick and decompile mainLoop

This commit is contained in:
Ryan Dwyer 2020-10-09 17:54:01 +10:00
parent fd19949c14
commit 9d67ee9c57
6 changed files with 7 additions and 8 deletions

View File

@ -1380,7 +1380,7 @@ void weaponAssignToHome(struct weaponobj *weapon, u32 arg1)
} else {
bool giveweapon = true;
if (g_Vars.normmplayerisrunning || g_Vars.unk00031c) {
if (g_Vars.normmplayerisrunning || g_Vars.lvmpbotlevel) {
struct mpweapon *mpweapon;
s32 mpweaponnum;

View File

@ -2463,7 +2463,7 @@ glabel var7f1a863c
// mpSetPaused(0);
// g_Vars.mplayerisrunning = false;
// g_Vars.normmplayerisrunning = false;
// g_Vars.unk00031c = 0;
// g_Vars.lvmpbotlevel = 0;
//
// if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) {
// g_MpSetupSaveFile.locktype = MPLOCKTYPE_NONE;
@ -2488,7 +2488,7 @@ glabel var7f1a863c
// mpSetPaused(0);
// g_Vars.mplayerisrunning = false;
// g_Vars.normmplayerisrunning = false;
// g_Vars.unk00031c = 0;
// g_Vars.lvmpbotlevel = 0;
// titleSetNextStage(STAGE_CITRAINING);
// setNumPlayers(1);
// titleSetNextMode(TITLEMODE_SKIP);

View File

@ -423,7 +423,7 @@ void func0f167e7c(s32 stagenum)
setCurrentPlayerNum(0);
}
if (g_Vars.unk00031c) {
if (g_Vars.lvmpbotlevel) {
func0f187e70();
}
@ -438,7 +438,7 @@ void func0f167e7c(s32 stagenum)
func0f10cb2c();
}
if (g_Is4Mb != true) {
if (!IS4MB()) {
func0f14a3c4();
}

View File

@ -32028,7 +32028,7 @@ void propobjSetDropped(struct prop *prop, u32 reason)
obj->unk48->dropreason = reason;
}
if (g_Vars.unk00031c
if (g_Vars.lvmpbotlevel
&& obj->type == OBJTYPE_WEAPON
&& obj->modelnum != MODEL_CHRBRIEFCASE
&& obj->modelnum != MODEL_CHRDATATHIEF) {

View File

@ -644,7 +644,6 @@ void mainLoop(void)
OSMesg msg;
s32 index;
s32 numplayers;
s32 stagenum;
func0f175f98();

View File

@ -16,7 +16,7 @@ void initGlobalVariables(void)
g_Vars.diffframe60f = 1;
g_Vars.lvframe60 = 0;
g_Vars.lvframenum = 0;
g_Vars.unk00031c = 0;
g_Vars.lvmpbotlevel = 0;
g_Vars.unk000320 = 0;
g_Vars.diffframe60 = 1;
g_Vars.lastframe240 = -1;