decompile up to sub_80F8598

5 files changed, 69 insertions, 18 deletions

diff --git a/include/bard_music.h b/include/bard_music.h
new file mode 100644
index 000000000..8b547ff39
--- /dev/null
+++ b/include/bard_music.h
@@ -0,0 +1,43 @@
+#ifndef GUARD_BARD_MUSIC_H
+#define GUARD_BARD_MUSIC_H
+
+struct BardSound
+{
+    u8 pad_00[48];
+};
+
+struct UnkBard
+{
+    /*0x00*/ u8 var00;
+    /*0x01*/ s8 var01;
+    /*0x02*/ u16 var02;
+    /*0x04*/ u16 var04;
+    /*0x06*/ u16 var06;
+};
+
+struct UnkBard3
+{
+    /*0x00*/ u16 var00;
+    /*0x02*/ u16 var02;
+    /*0x04*/ s16 var04;
+    /*0x06*/ u16 var06;
+};
+
+struct UnkBard2
+{
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 var02;
+    /*0x03*/ u8 var03;
+    /*0x04*/ s16 var04;
+    /*0x06*/ u16 volume;
+    /*0x08*/ s16 pitch;
+    /*0x0A*/ s16 var0A;
+    /*0x0C*/ u16 var0C[6];
+    /*0x18*/ struct UnkBard3 var18[6];
+};
+
+struct BardSound *sub_814A2D0(u16 arg0, u16 arg1);
+s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2);
+
+#endif  // GUARD_BARD_MUSIC_H
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 572b77711..ff92fcc40 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -404,10 +404,6 @@ void SampleFreqSet(u32 freq);
 void m4aSoundVSyncOn(void);
 void m4aSoundVSyncOff(void);
 
-void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
-void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 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);
diff --git a/include/global.h b/include/global.h
index bb501ac93..67039d50e 100644
--- a/include/global.h
+++ b/include/global.h
@@ -457,14 +457,14 @@ struct MauvilleManCommon
 
 struct MauvilleManBard
 {
-               u8 id;
-               u8 unk_2D95;
-    /*0x2D96*/ u16 songLyrics[6];
-    /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
-    /*0x2DAE*/ u8 playerName[8];
-    /*0x2DB6*/ u8 filler_2DB6[0x3];
-    /*0x2DB9*/ u8 playerTrainerId[4];
-               u8 unk_2DBD;
+    /*0x00*/ u8 id;
+    /*0x01*/ u8 unk_2D95;
+    /*0x02*/ u16 songLyrics[6];
+    /*0x0E*/ u16 mauvilleOldMan_ecArray2[6];
+    /*0x1A*/ u8 playerName[8];
+    /*0x22*/ u8 filler_2DB6[0x3];
+    /*0x25*/ u8 playerTrainerId[4];
+    /*0x29*/ u8 unk_2DBD;
 }; /*size = 0x2C*/
 
 struct MauvilleManHipster
@@ -484,18 +484,24 @@ struct MauvilleManTrader
 struct MauvilleManStoryteller
 {
     u8 id;
+    u8 unk1;
+    u8 filler2[2];
+    u8 unk4[4];
+    u8 unk8[4][7];
+    u8 unk24[2][4];  // unknown length
 };
 
 struct MauvilleManGiddy
 {
-    u8 id;
-    u8 unk1;
-    u8 unk2;
-    u16 mauvilleOldMan_ecArray[10];
-    u8 mauvilleOldMan_ecArray2[12];
-    u8 fillerF[0x2];
+    /*0x00*/ u8 id;
+    /*0x01*/ u8 unk1;
+    /*0x02*/ u8 questionNum;
+    /*0x04*/ u16 mauvilleOldMan_ecArray[10];
+    /*0x18*/ u8 questionList[12];
+    /*0x24*/ u8 fillerF[0x2];
 }; /*size = 0x2C*/
 
+
 typedef union OldMan
 {
     struct MauvilleManCommon common;
diff --git a/include/m4a.h b/include/m4a.h
index b6c8f9072..7d016c98b 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -16,4 +16,9 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
+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);
+
 #endif //GUARD_M4A_H
diff --git a/include/trader.h b/include/trader.h
index e8691be6e..832a04b65 100644
--- a/include/trader.h
+++ b/include/trader.h
@@ -2,5 +2,6 @@
 #define GUARD_TRADER_H
 
 void TraderSetup(void);
+void sub_8109A20(void);
 
 #endif // GUARD_TRADER_H