diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 73a1f679a..04205a8b1 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -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; diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 2a88bb68c..feb8a9a90 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -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); diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 3ea237bbb..6bc2d675d 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -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(); } diff --git a/src/game/propobj.c b/src/game/propobj.c index b06df9dd5..d05016446 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -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) { diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 1f110f831..952f6a5de 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -644,7 +644,6 @@ void mainLoop(void) OSMesg msg; s32 index; s32 numplayers; - s32 stagenum; func0f175f98(); diff --git a/src/lib/lib_15860.c b/src/lib/lib_15860.c index 564666f53..fc0a60973 100644 --- a/src/lib/lib_15860.c +++ b/src/lib/lib_15860.c @@ -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;