XA Audio Progress

Author: Niko

decompile/General/HOWL/h100_Audio_SetState.c

@@ -47,21 +47,12 @@ void DECOMP_Audio_SetState(u_int state)
         }
         break;
     case 9:
-        
-		// hack to save byte budget
-		//CDSYS_XAPlay(XA_type, (int)sdata->desiredXA_1);
 
-        iVar1 = (int)sdata->desiredXA_1 + 1;
-        XA_index = iVar1;
-        if (iVar1 < 0)
-        {
-            XA_index = (int)sdata->desiredXA_1 + 4;
-        }
-        sdata->desiredXA_1 = iVar1 + (XA_index >> 2) * -4;
-		
-		// hack to save byte budget,
-		// jmp to XAPlay call instead of "break"
-		XA_index = iVar1 - 1;
+		// OG game would use desiredXA_RaceIntroIndex
+		// to cycle through 4 different XAs (0,1,2,3),
+		// but all the tracks are the same (unused beta)
+
+		XA_index = 0;
 		goto PLAY_XA;
 		//break;
 
@@ -117,7 +108,7 @@ void DECOMP_Audio_SetState(u_int state)
         DECOMP_Music_Restart();
 
         // set XA
-        XA_index = sdata->desiredXA_3;
+        XA_index = sdata->desiredXA_RaceEndIndex;
 
         if (61 < XA_index)
         {

decompile/General/HOWL/h104_Audio_Update1.c

@@ -342,7 +342,7 @@ void DECOMP_Audio_Update1(void)
             }
 
             // desired XA
-            sdata->desiredXA_3 = uVar1;
+            sdata->desiredXA_RaceEndIndex = uVar1;
 
             DECOMP_Audio_SetState_Safe(0x10);
         }

decompile/General/HOWL/h99_Voiceline_SetDefaults.c

@@ -3,8 +3,11 @@
 void DECOMP_Voiceline_SetDefaults(void)
 {
     sdata->unkAudioState = 0;
-    sdata->desiredXA_1 = 0;
-    sdata->desiredXA_2 = 0;
+	
+#if 0 // unused
+    sdata->desiredXA_RaceIntroIndex = 0;
+    sdata->desiredXA_FinalLapIndex = 0;
+#endif
 
     sdata->WrongWayDirection_bool = false;
 

include/regionsEXE.h

@@ -3895,13 +3895,17 @@ struct sData
 	short unkAudioState;
 
 	// 8008d7f2
-	short desiredXA_1;
+	// unused, OG game would cycle through
+	// 4 RaceIntro XA files (0,1,2,3)
+	short desiredXA_RaceIntroIndex;
 
 	// 8008d7f4
-	int desiredXA_2;
+	// unused, would have changed the Final Lap XA,
+	// (at least assumed? its between Intro and End?) 
+	int desiredXA_FinalLapIndex;
 
 	// 8008d7f8
-	short desiredXA_3;
+	short desiredXA_RaceEndIndex;
 
 	// 8008d7fa
 	short nTropyVoiceCount;