Decompile musicTick

src/include/bss.h

@@ -255,8 +255,8 @@ extern s32 g_MusicStageNum;
 extern struct var800aa5d8 var800aa5d8[40];
 extern struct var800aaa38 var800aaa38[3];
 extern u32 g_AudioXReasonsActive[4];
-extern u32 var800aaa78[4];
-extern u32 g_AudioXReasonDurations[4];
+extern s32 g_MusicXReasonMinDurations[4];
+extern s32 g_MusicXReasonMaxDurations[4];
 extern u32 *g_LangBanks[69];
 extern void *var800aabb4;
 extern struct var800aabb8 *var800aabb8;

src/include/commands.h

@@ -2248,8 +2248,8 @@
 	label,
 
 /**
- * Starts the X music theme. The music will play for the given number of seconds
- * before reverting to the primary track.
+ * Starts the X music theme. The music will play for a duration between minsecs
+ * and maxsecs before reverting to the primary track.
  *
  * The xreason argument is expected to be an XREASON constant. The command can
  * be called multiple times with different XREASONs and durations, essentially
@@ -2257,14 +2257,15 @@
  * is still in its duration. In practice this feature is not used - xreason is
  * always 1 (XREASON_DEFAULT).
  *
- * The u2 argument appears to be a timer value as well, but its purpose is
- * unknown.
+ * The minsecs argument is expected to be smaller than maxsecs. Between minsecs
+ * and maxsecs, the engine only plays the track if the reason is still set.
+ * Once maxsecs is reached the track is stopped regardless.
  */
-#define play_x_track(xreason, u2, seconds) \
+#define play_x_track(xreason, minsecs, maxsecs) \
 	mkshort(0x00f9), \
 	xreason, \
-	u2, \
-	seconds,
+	minsecs, \
+	maxsecs,
 
 /**
  * Stops the X music which has the given reason. If there is no other reason to

src/include/data.h

@@ -457,13 +457,13 @@ extern s32 var80082050;
 extern u32 g_GfxNumSwaps;
 extern s32 g_NumReasonsToEndMpMatch;
 extern u32 var800840c4;
-extern u32 var800840d8;
+extern u32 g_MusicNrgIsPlaying;
 extern u32 var800840e0;
 extern u32 var800840e4;
-extern u32 var800840f0;
-extern u32 var800840f4;
-extern u32 var800840f8;
-extern u32 var800840fc;
+extern s32 g_MusicDeathTimer240;
+extern s32 var800840f4;
+extern s32 var800840f8;
+extern s32 var800840fc;
 extern bool g_Jpn;
 #if VERSION >= VERSION_PAL_FINAL
 extern s32 g_LanguageId;

src/include/game/music.h

@@ -23,8 +23,8 @@ void musicStartMenu2(s32 tracknum);
 void musicSetStageAndStartMusic(s32 stagenum);
 void musicSetStage(s32 stagenum);
 void musicReset(void);
-void func0f16da2c(void);
-void func0f16daa4(void);
+void musicStartNrg(void);
+void musicStopNrg(void);
 void musicStartForMenu(void);
 void musicResumeAfterUnpause(void);
 void musicStartSoloDeath(void);
@@ -38,7 +38,7 @@ void musicStartCutscene(s32 tracknum);
 void musicEndCutscene(void);
 void musicStartTemporary(s32 tracknum);
 void musicEndAmbient(void);
-void musicSetXReason(s32 index, u32 arg1, u32 duration);
+void musicSetXReason(s32 reason, u32 minsecs, u32 maxsecs);
 void musicUnsetXReason(s32 reason);
 void func0f16e138(void);
 

src/include/lib/music.h

@@ -10,6 +10,6 @@ bool music00011780(s32 *arg0, u32 arg1);
 bool musicStopAll(u32 arg0);
 bool music000118f4(s32 *arg0, u32 arg1);
 void music0001190c(void);
-void music00011d84(void);
+void musicTick(void);
 
 #endif