bugfix MaskHint from LOAD optimizations

Author: Niko

decompile/General/232/232_35_AH_MaskHint_Update.c

@@ -152,39 +152,42 @@ void DECOMP_AH_MaskHint_Update()
 				break;
 			}
 
-			if (sdata->modelMaskHints3D != 0)
+			// Should be pointless,
+			// Mask will always be loaded by the end
+			// of the first 3-second spawn (curr < spawnFrame, break)
+			#if 0
+			// wait for mask to finish loading
+			if (sdata->load_inProgress != 0) break;
+			if (sdata->modelMaskHints3D == NULL) break;
+			#endif
+			
+			if(
+				((D232.maskWarppadBoolInterrupt & 1) != 0) ||
+				((gGT->cameraDC[0].flags & 0x800) != 0)
+			  )
 			{
-				if(
-					((D232.maskWarppadBoolInterrupt & 1) != 0) ||
-					((gGT->cameraDC[0].flags & 0x800) != 0)
-				  )
-				{
-					DECOMP_AH_MaskHint_LerpVol(0x1000);
-					
-					DECOMP_AH_MaskHint_SpawnParticles
-						(0x18, &D232.emSet_maskLeave[0], 0x1000);
+				DECOMP_AH_MaskHint_LerpVol(0x1000);
+				
+				DECOMP_AH_MaskHint_SpawnParticles
+					(0x18, &D232.emSet_maskLeave[0], 0x1000);
 
-					DECOMP_VehTalkMask_PlayXA((struct Instance*)sdata->modelMaskHints3D, D232.maskHintID);
-					
-					if (
-						((gGT->gameMode1 & ADVENTURE_ARENA) != 0) &&
-						
-						// Not "Welcome to Adventure" or "You need a Boss Key"
-						(D232.maskHintID != 0) &&
-						(D232.maskHintID != 0x18)
-					) 
-					{
-						// hide UI map
-						gGT->hudFlags |= 0x10;
-					}
+				DECOMP_VehTalkMask_PlayXA((struct Instance*)sdata->modelMaskHints3D, D232.maskHintID);
+				
+				if (
+					((gGT->gameMode1 & ADVENTURE_ARENA) != 0) &&
 
-					sdata->AkuAkuHintState++;
-					break;
+					// Not "Welcome to Adventure" or "You need a Boss Key"
+					(D232.maskHintID != 0) &&
+					(D232.maskHintID != 0x18)
+				) 
+				{
+					// hide UI map
+					gGT->hudFlags |= 0x10;
 				}
+				
+				sdata->AkuAkuHintState++;
+				break;
 			}
-			
-			// if sdata->modelMaskHints3D == NULL,
-			// stay here forever stuck
 			break;
 
 		case 4: {

decompile/General/Vehicle/VehTalkMask_0_ThTick.c

@@ -9,7 +9,10 @@ void DECOMP_VehTalkMask_ThTick(struct Thread* t)
 
 	int scale = mhObj->scale;
 
-	if(sdata->modelMaskHints3D != 0)
+	if(
+		(sdata->modelMaskHints3D != 0) &&
+		(sdata->load_inProgress == 0)
+	  )
 	{
 		mhInst->model = sdata->modelMaskHints3D;
 		scale *= 2;