summaryrefslogtreecommitdiff
path: root/include/m4a.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/m4a.h')
-rw-r--r--include/m4a.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/m4a.h b/include/m4a.h
index fd3701e14..93190a86d 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -1,22 +1,15 @@
#ifndef GUARD_M4A_H
#define GUARD_M4A_H
-#include "global.h"
-
#include "gba/m4a_internal.h"
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct MusicPlayerInfo gMPlayInfo_SE1;
-extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern struct MusicPlayerInfo gMPlayInfo_SE3;
-extern struct SoundInfo gSoundInfo;
-
void m4aSoundVSync(void);
void m4aSoundVSyncOn(void);
void m4aSoundInit(void);
void m4aSoundMain(void);
-void m4aSongNumStart(u16);
+void m4aSongNumStart(u16 n);
+void m4aSongNumStartOrChange(u16 n);
void m4aSongNumStop(u16 n);
void m4aMPlayAllStop(void);
void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
@@ -25,6 +18,12 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_SE3;
+extern struct SoundInfo gSoundInfo;
+
extern const struct SongHeader mus_victory_gym_leader;
#endif //GUARD_M4A_H