boss spawn fix

Author: Niko

decompile/General/222/222_Full.c

@@ -73,12 +73,17 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
 	// if not in Token mode, these won't be used until later;
 	lerpStartY = 0;
 	lerpEndY = 0;
+	
+	// For trophy race, check 1st place
+	int boolWin = (driver->driverRank == 0);
 
-	// If you're in Adventure Mode
-	if ((gGT->gameMode1 & ADVENTURE_MODE) != 0)
+	// If C-T-R token race
+	if ((gGT->gameMode2 & TOKEN_RACE) != 0)
 	{
-		// If you won the race, and you have all 3 letters (C, T, and R)
-		if ((driver->driverRank == 0) && (driver->PickupLetterHUD.numCollected == 3))
+		// add requirement of C-T-R letters
+		boolWin = (boolWin) && (driver->PickupLetterHUD.numCollected == 3);
+		
+		if (boolWin)
 		{
 			// lerp C-T-R letters closer to center by 16 pixels
 			// default (unlocking and frames < 140) or (already unlocked and frames < 300)
@@ -401,43 +406,38 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
 	// If you have not pressed X
 	if ((sdata->AnyPlayerTap & 0x50) == 0)
 		return;
-
-	// clear gamepad input
+	
+	// === If Pressed X ===
+	
 	RECTMENU_ClearInput();
+	
+	sdata->Loading.OnBegin.AddBitsConfig0 |= ADVENTURE_ARENA;
+	sdata->Loading.OnBegin.RemBitsConfig0 |= (ADVENTURE_BOSS | TOKEN_RACE);
 
-	// if event was not won
-	if (driver->driverRank > 0)
+	// If you are in boss mode
+	if (gGT->gameMode1 < 0)
 	{
-		// pass pointer to menu buffer that shows Retry / Exit To Map,
-		// identical to buffer in 221 dll, except this one in EXE space
-		RECTMENU_Show(&data.menuRetryExit);
+		sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
+	}
 
-		// record that the menu is now showing
+	if (!boolWin)
+	{
+		RECTMENU_Show(&data.menuRetryExit);
 		sdata->menuReadyToPass |= 1;
 		return;
 	}
 
-	// If you won the race
-	// If you have pressed X to continue...
+	// === If you won the race ===
 
 	sdata->framesSinceRaceEnded = 0;
 	sdata->numIconsEOR = 1;
 
-	// when loading is done, add flag for "In Adventure Arena"
-	sdata->Loading.OnBegin.AddBitsConfig0 |= ADVENTURE_ARENA;
-
 	// Load the levelID for Adventure Hub that you came from
 	levSpawn = gGT->prevLEV;
 
 	// If you are in boss mode
 	if (gGT->gameMode1 < 0)
 	{
-		// when loading is done, add flag for "spawn near boss door"
-		sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
-
-		// when loading is done, remove flag for Boss Mode
-		sdata->Loading.OnBegin.RemBitsConfig0 |= ADVENTURE_BOSS;
-
 		// bitIndex of keys unlocked, and boss beaten
 		bitIndex = gGT->bossID + 0x5e;
 
@@ -478,18 +478,6 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
 			}
 		}
 	}
-	// if you are in token race
-	else if ((gGT->gameMode2 & 0x8) != 0)
-	{
-		// If you have collected 3 letters (C, T, and R)
-		if (driver->PickupLetterHUD.numCollected == 3)
-		{
-			// set bit to tokens
-			bitIndex = gGT->levelID + 0x4c;
-			// when loading is done, remove flag for CTR Challenge
-			sdata->Loading.OnBegin.RemBitsConfig8 |= TOKEN_RACE;
-		}
-	}
 
 	// if something needs unlocking
 	if(bitIndex > 0)

decompile/General/Vehicle/VehBirth_0_TeleportSelf.c

@@ -23,6 +23,9 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
     struct ScratchpadStruct* sps = (struct ScratchpadStruct*)&scratchpad[0];
 #endif
 
+	int spawnAtBoss = 
+		gGT->gameMode2 & SPAWN_AT_BOSS;
+
     // cheat flags
 	gGT->gameMode2 &= ~(SPAWN_AT_BOSS | 2);
 
@@ -79,10 +82,8 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
 	// if you want to spawn outside boss door
     else if (
 			// After leaving a boss race
-			(
-				// Set in 222 EndRace function
-				((gGT->gameMode2 & SPAWN_AT_BOSS) != 0)
-			) ||
+			(spawnAtBoss) 
+			||
 
 			// Before starting a boss cutscene
 			(
@@ -95,29 +96,25 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
         // position outside boss door
         posRot = &level1->ptrSpawnType2_PosRot[1].posCoords[6];
 
-		// spawn facing boss door
+		// spawn facing TOWARDS boss door,
+		// after winning last trophy on hub
 		rotArr = &posRot->rot[0];
 		rotDeltaY = 0x400;
 
-		// if just beat boss
-		if ((gGT->gameMode2 & SPAWN_AT_BOSS) != 0)
+		// After leaving a boss race
+		if (spawnAtBoss)
 		{
-            // just finished pinstripe boss,
-            if (gGT->prevLEV == HOT_AIR_SKYWAY)
-			{
-				// if spawn by pinstripe, dont face wall
-				if(gGT->levelID == CITADEL_CITY)
-					rotDeltaY = 0x800;
-				
-				// else if spawn by oxide,
-				// do nothing, rotation already faces the door
-			}
+			// spawn facing AWAY from door
+			rotDeltaY = 0xC00;
 
-			// if just beat ANY other boss
-			else
+            if (
+					// Pinstripe -> Citadel (not gemstone)
+					(gGT->prevLEV == HOT_AIR_SKYWAY) &&
+					(gGT->levelID == CITADEL_CITY)
+				)
 			{
-				// spawn facing AWAY from door
-				rotDeltaY = 0xC00;
+				// face to the RIGHT from door
+				rotDeltaY = 0x800;
 			}
 		}
     }