update m4a library

4 files changed, 7 insertions, 84 deletions

diff --git a/include/functions.h b/include/functions.h
index ae6c8c8..89b93dc 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -16,83 +16,6 @@ void sub_11F0(int arg0);
 void sub_11FC(void);
 void sub_1340(void);
 
-// src/m4a_2.c
-
-/*
-u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust);
-void UnusedDummyFunc();
-void MPlayContinue(struct MusicPlayerInfo *mplayInfo);
-void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aSoundInit(void);
-void m4aSoundMain(void);
-void m4aSongNumStart(u16 n);
-void m4aSongNumStartOrChange(u16 n);
-void m4aSongNumStartOrContinue(u16 n);
-void m4aSongNumStop(u16 n);
-void m4aSongNumContinue(u16 n);
-void m4aMPlayAllStop(void);
-void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
-void m4aMPlayAllContinue(void);
-void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
-void MPlayExtender(struct CgbChannel *cgbChans);
-void MusicPlayerJumpTableCopy(void);
-void ClearChain(void *x);
-void Clear64byte(void *x);
-void SoundInit(struct SoundInfo *soundInfo);
-void SampleFreqSet(u32 freq);
-void m4aSoundMode(u32 mode);
-void SoundClear(void);
-void m4aSoundVSyncOff(void);
-void m4aSoundVSyncOn(void);
-void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount);
-void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader);
-void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo);
-void FadeOutBody(struct MusicPlayerInfo *mplayInfo);
-void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust);
-void CgbOscOff(u8 chanNum);
-void CgbModVol(struct CgbChannel *chan);
-
-// src/m4a_4.c
-
-void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
-void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch);
-void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
-void ClearModM(struct MusicPlayerTrack *track);
-void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth);
-void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed);
-void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xcmd_0C(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void ply_xcmd_0D(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void DummyFunc(void);
-void SetPokemonCryVolume(u8 val);
-void SetPokemonCryPanpot(s8 val);
-void SetPokemonCryPitch(s16 val);
-void SetPokemonCryLength(u16 val);
-void SetPokemonCryRelease(u8 val);
-void SetPokemonCryProgress(u32 val);
-int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
-void SetPokemonCryChorus(s8 val);
-void SetPokemonCryStereo(u32 val);
-void SetPokemonCryPriority(u8 val);
-*/
-
 // src/main.c
 
 void AgbMain(void);
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 339a077..0bd6ed7 100755
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -100,7 +100,7 @@ struct CgbChannel
     u8 le;
     u8 sw;
     u32 fr;
-    u32 wp;
+    u32 *wp;
     u32 cp;
     u32 tp;
     u32 pp;
diff --git a/include/m4a.h b/include/m4a.h
index 9ab70a6..4e6c236 100755
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -3,15 +3,13 @@
 
 #include "gba/m4a_internal.h"
 
-// TODO: import m4a library from pokeemerald
-
 void m4aSoundVSync(void);
 void m4aSoundVSyncOn(void);
 
 void m4aSoundInit(void);
 void m4aSoundMain(void);
-void m4aSongNumStart(u16);
-void m4aSongNumStop(u16 n);
+void m4aSongNumStart(u16 n);
+void m4aSongNumStartOrChange(u16 n);
 void m4aMPlayAllStop(void);
 void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
 void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
@@ -20,7 +18,9 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
-extern struct MusicPlayerInfo gMPlayInfo_02032EE0;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct SoundInfo gSoundInfo;
 
 #endif //GUARD_M4A_H
diff --git a/include/variables.h b/include/variables.h
index 9990083..6a74cb7 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -56,7 +56,7 @@ extern u8 gUnknown_02002808[];
 //extern ? gCgbChans;
 //extern ? gPokemonCryTracks;
 //extern ? gPokemonCrySong;
-//extern ? gMPlayInfo_02032EE0;
+//extern ? gMPlayInfo_BGM;
 //extern ? gMPlayMemAccArea;
 extern const u16 gWildMonLocations[][2][8];
 extern const s16 gUnknown_08055C44[];