progress

Author: Niko

decompile/General/222/222_Full.c

@@ -431,7 +431,7 @@ void DECOMP_AA_EndEvent_DrawMenu(void)
 	if (gGT->gameMode1 < 0)
 	{
 		// when loading is done, add flag for "spawn near boss door"
-		sdata->Loading.OnBegin.AddBitsConfig8 |= 1;
+		sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
 
 		// when loading is done, remove flag for Boss Mode
 		sdata->Loading.OnBegin.RemBitsConfig0 |= ADVENTURE_BOSS;

decompile/General/MAIN/MainFreeze_06_MenuPtrDefault.c

@@ -200,7 +200,7 @@ void DECOMP_MainFreeze_MenuPtrDefault(struct RectMenu* menu)
 					sdata->Loading.OnBegin.RemBitsConfig0 |= 0x8c000000;
 
 					// When loading is done add bit to spawn driver near boss door
-					sdata->Loading.OnBegin.AddBitsConfig8 |= 1;
+					sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
 				}
 
 				// set levID to level you were in previously

decompile/General/Vehicle/VehBirth_0_TeleportSelf.c

@@ -236,6 +236,7 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
                     else
                     {
                         // spawn on the podium in the adv hub
+						posRot = gGT->level1->ptrSpawnType2_PosRot[1].posCoords;
                         posBottom[0] = posRot->pos[0];
                         posBottom[1] = posRot->pos[1] + 0x80;
                         posBottom[2] = posRot->pos[2];

decompile/WorkInProgress/src/233/233_22_CS_Camera_BoolGotoBoss.c

@@ -18,12 +18,10 @@ u_char DECOMP_CS_Camera_BoolGotoBoss(void)
 	if (gGT->podiumRewardID == 99)
 		return 1;
 
-	// if podiumRewardID is reset to 0 after first frame of boss cutscene,
-	// check if camera has moved to the correct position yet
     struct Instance* inst = gGT->drivers[0]->instSelf;
     short *posCoords = gGT->level1->ptrSpawnType2_PosRot[1].posCoords;
 
-    // TRUE if not at these coordinates
+    // TRUE if TeleportSelf did NOT spawn on podium (goto boss door)
     return 
 		(inst->matrix.t[0] != posCoords[0]) && 
 		(inst->matrix.t[2] != posCoords[2]);

decompile/buildList.txt

@@ -1276,7 +1276,7 @@ common, exe, UI_CupStandings_InputAndDraw, 0x0,          General/UI/UI_58_CupSta
 // ====================================================================================================================
 common, exe, VehAfterColl_GetSurface, 0x0,               General/Vehicle/VehAfterColl_0_GetSurface.c
 common, exe, VehAfterColl_GetTerrain, 0x0,               General/Vehicle/VehAfterColl_1_GetTerrain.c
-//common, exe, VehBirth_TeleportSelf, 0x0,                 General/Vehicle/VehBirth_0_TeleportSelf.c
+common, exe, VehBirth_TeleportSelf, 0x0,                 General/Vehicle/VehBirth_0_TeleportSelf.c
 common, exe, VehBirth_TeleportAll, 0x0,                  General/Vehicle/VehBirth_1_TeleportAll.c
 common, exe, VehBirth_GetModelByName, 0x0,               General/Vehicle/VehBirth_2_GetModelByName.c
 common, exe, VehBirth_SetConsts, 0x0,                    General/Vehicle/VehBirth_3_SetConsts.c

ghidra/233.c

@@ -2901,6 +2901,7 @@ undefined4 FUN_800aed48(void)
 		(*(short *)(PTR_DAT_8008d2ac + 0x2572) != 99)
 	) 
   {
+	// gGT->level1->ptrSpawnType2_PosRot[1].posCoords
     psVar2 = *(short **)(*(int *)(*(int *)(PTR_DAT_8008d2ac + 0x160) + 0x144) + 0xc);
 
 	uVar1 = 1;

mods/Modules/AdvDifficulty/src/MainFreeze_MenuPtrDefault.c

@@ -102,7 +102,7 @@ void DECOMP_MainFreeze_MenuPtrDefault(struct RectMenu* menu)
 			if ((int)gameMode < 0) // BOSS Race
 			{
 				sdata->Loading.OnBegin.RemBitsConfig0 |= ADVENTURE_BOSS;
-				sdata->Loading.OnBegin.AddBitsConfig8 |= 1;
+				sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
 			}
 			level_to_load = gGT->prevLEV;
 		}

mods/Modules/AdvDifficulty/src/UI_RaceEnd_MenuBoxFuncPtr.c

@@ -141,7 +141,7 @@ void DECOMP_UI_RaceEnd_MenuProc(struct RectMenu* menu)
         if (gGT->gameMode1 < 0)
         {
           // when loading is done, add flag to spawn near boss door
-          sdata->Loading.OnBegin.AddBitsConfig8 |= 1;
+          sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
 
           // when loading is done, remove flags for
           // boss race, relic race, and crystal challenge