naming and moving stuff

include/audio.h

@@ -1,6 +1,10 @@
 #ifndef AUDIO_H
 #define AUDIO_H
 
+#include "global.h"
+
+#define NUM_BGM 99
+
 typedef enum {
     SFX_NONE,
     BGM_CASTLE_TOURNAMENT,
@@ -258,4 +262,7 @@ typedef enum {
     SONG_RESET_UNK = 0x80100000,
 } Sound;
 
+#define SOUND_REQ_ALL_STOP 0x80010000
+void SoundReq(u32 arg);
+
 #endif // AUDIO_H

include/functions.h

@@ -11,7 +11,6 @@
 #include "structures.h"
 
 // Identified - to be sorted into header files
-extern void SoundReq(u32);
 extern void ShowNPCDialogue(Entity*, Dialog*);
 extern void DoFade(u32, u32);
 extern u32 CheckKinstoneFused(u32);

include/gba/m4a.h

@@ -60,4 +60,12 @@ typedef struct MusicPlayer {
 extern const MusicPlayer gMPlayTable[];
 extern const Song gSongTable[];
 
+void m4aSongNumStart(u16 n);
+void m4aSongNumStartOrContinue(u16 n);
+void m4aSongNumStop(u16 n);
+void m4aMPlayAllStop(void);
+void m4aMPlayTempoControl(MusicPlayerInfo* mplayInfo, u16 tempo);
+void m4aSoundVSyncOn(void);
+void m4aSoundVSyncOff(void);
+
 #endif // GUARD_M4A_INTERNAL_H

include/structures.h

@@ -182,6 +182,23 @@ typedef struct {
 
 extern EntityHandler gUnk_03003DC0;
 
+typedef struct struct_02021EE0 {
+    u16 unk_00;
+    u8 unk_02;
+    u8 unk_03;
+    u16 unk_04;
+    s16 unk_06;
+    s16 unk_08;
+    s16 unk_0a;
+    u16 unk_0c;
+    u16 unk_0e;
+    u16 unk_10;
+    u16 unk_12;
+    u16 currentBgm;
+} struct_02021EE0;
+
+extern struct_02021EE0 gUnk_02021EE0;
+
 extern u8 gUnk_02022740[];
 extern u8 gUnk_02034490[];