rename flags

Author: Niko

decompile/General/INSTANCE/INSTANCE_06_LevInitAll.c

@@ -96,7 +96,7 @@ void DECOMP_INSTANCE_LevInitAll(struct InstDef *levInstDef, int numInst)
 		{
 			// Only continue if LEV instances are enabled,
 			// they may be disabled due to podium scene on adv hub
-			if ((gGT->gameMode2 & DISABLE_LEV_INSTANCE) == 0)
+			if ((gGT->gameMode2 & NO_LEV_INSTANCE) == 0)
 			{
 				meta = DECOMP_COLL_LevModelMeta(modelID);
 

decompile/General/LOAD/LOAD_44_TenStages.c

@@ -96,7 +96,7 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;

decompile/General/MAIN/MainFrame_08_RenderFrame.c

@@ -840,7 +840,7 @@ void RenderAllHUD(struct GameTracker* gGT)
 						#endif
 
 						// allow instances again
-						gGT->gameMode2 &= ~(DISABLE_LEV_INSTANCE);
+						gGT->gameMode2 &= ~(NO_LEV_INSTANCE);
 
 						// fade transition
 						gGT->pushBuffer_UI.fadeFromBlack_desiredResult = 0x1000;

include/namespace_Main.h

@@ -45,16 +45,12 @@ enum GameMode2
 	LEV_SWAP 		= 0x20,
 	// 0x40?
 	CREDITS 		= 0x80,
-
-	DISABLE_LEV_INSTANCE = 0x100,
-
+	NO_LEV_INSTANCE = 0x100,
 	CHEAT_WUMPA 	= 0x200,
 	CHEAT_MASK 		= 0x400,
 	CHEAT_TURBO		= 0x800,
-
-	// & 0x1000 - FIRST_TIME_WIN_CUP
-	// & 0x2000 - FIRST_TIME_UNLOCK_BATTLE_MAP
-
+	CUP_NEW_WIN 	= 0x1000,
+	CUP_NEW_BATTLE 	= 0x2000,
 	VEH_FREEZE_DOOR = 0x4000,
 	CHEAT_INVISIBLE	= 0x8000,
 	CHEAT_ENGINE	= 0x10000,

mods/Levels/Legacy/RoadToRainbow/src/LOAD_TenStages.c

@@ -126,7 +126,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader*
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;

mods/Levels/Legacy/TileTrauma/src/LOAD_TenStages.c

@@ -124,7 +124,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader*
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;

mods/Levels/Legacy/WallTest/src/LOAD_TenStages.c

@@ -124,7 +124,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader*
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;

mods/Levels/Legacy/WorkingLapTest/src/LOAD_TenStages.c

@@ -124,7 +124,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader*
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;

mods/Levels/PS1_TrackROM/src/load_lev.c

@@ -109,7 +109,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader*
 
 			// disable certain game mode flags
 			gGT->gameMode1 &= ~(GAME_CUTSCENE | END_OF_RACE | ADVENTURE_ARENA | MAIN_MENU);
-			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | DISABLE_LEV_INSTANCE);
+			gGT->gameMode2 &= ~(LEV_SWAP | CREDITS | NO_LEV_INSTANCE);
 
 			gGT->visMem1 = 0;
 			gGT->visMem2 = 0;