diff --git a/decompile/General/LOAD/LOAD_A40_Hub_Main.c b/decompile/General/LOAD/LOAD_A40_Hub_Main.c index ee911ecda..6d86547a6 100644 --- a/decompile/General/LOAD/LOAD_A40_Hub_Main.c +++ b/decompile/General/LOAD/LOAD_A40_Hub_Main.c @@ -9,11 +9,13 @@ void DECOMP_LOAD_Hub_Main(int bigfilePtr) gGT = sdata->gGT; + #if 1 // not in the OG game, but for some reason decomp // needs it to prevent crashing on Nitro Court, // something bugs in 4P Life Limit that makes stepFlagSet // try to make the advHub flip, maybe from null AI data? if((gGT->gameMode1 & ADVENTURE_ARENA) == 0) return; + #endif int stepFlagSet = gGT->drivers[0]->stepFlagSet; int nextLevelID = (stepFlagSet & 0x30) >> 4; diff --git a/decompile/General/LOAD/LOAD_A45_TenStages.c b/decompile/General/LOAD/LOAD_A45_TenStages.c index 4301e4935..595332898 100644 --- a/decompile/General/LOAD/LOAD_A45_TenStages.c +++ b/decompile/General/LOAD/LOAD_A45_TenStages.c @@ -588,10 +588,10 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH gGT->visMem1 = lev->visMem; // if LEV is valid - if (gGT->level1 != 0) + if (lev != 0) { // Load Icons and IconGroups from LEV - DECOMP_DecalGlobal_Store(gGT, gGT->level1->levTexLookup); + DECOMP_DecalGlobal_Store(gGT, lev->levTexLookup); } DECOMP_DebugFont_Init(gGT); diff --git a/decompile/General/MAIN/MainInit_JitPoolsNew.c b/decompile/General/MAIN/MainInit_JitPoolsNew.c index 0c833d393..106a66c82 100644 --- a/decompile/General/MAIN/MainInit_JitPoolsNew.c +++ b/decompile/General/MAIN/MainInit_JitPoolsNew.c @@ -141,10 +141,10 @@ void DECOMP_MainInit_JitPoolsNew(struct GameTracker *gGT) int numDriver = uVar7 >> 9; - if ((gameMode & MAIN_MENU) != 0) numDriver = 4; if (gGT->numPlyrCurrGame == 2) numDriver = 6; if (gGT->numPlyrCurrGame > 2) numDriver = 4; if ((gameMode & TIME_TRIAL) != 0) numDriver = 3; + if ((gameMode & MAIN_MENU) != 0) numDriver = 4; #ifdef USE_ONLINE numDriver = 8;