1 files changed, 29 insertions, 5 deletions

diff --git a/src/common.h b/src/common.h
index d78f11a..f0c0886 100644
--- a/src/common.h
+++ b/src/common.h
@@ -561,8 +561,8 @@ int bios_div(int num, int denom);
 typedef enum {
     SOUND_SQUARE1 = (0x1 << 0),
     SOUND_SQUARE2 = (0x1 << 1),
-    SOUND_WAVE =    (0x4 << 2),
-    SOUND_NOISE =   (0x8 << 3),
+    SOUND_WAVE =    (0x1 << 2),
+    SOUND_NOISE =   (0x1 << 3),
 } SoundChannel;
 
 u16
@@ -602,9 +602,33 @@ sound_volume(SoundChannel channels, u8 volume) {
 #define SOUND_SWEEP_DIR(N)    ((N) << 0x3)
 #define SOUND_SWEEP_TIME(N)   ((N) << 0x4)
 
-// DMG square frequency bits.
-#define SOUND_SQUARE_TIMED (1 << 0xE)
-#define SOUND_SQUARE_RESET (1 << 0xF)
+// DMG frequency bits (Square/Wave).
+#define SOUND_FREQ_TIMED (1 << 0xE)
+#define SOUND_FREQ_RESET (1 << 0xF)
+
+// DMG wave ram.
+#define SOUND_WAVE_RAM_0 *((vu32*)(MEM_IO + 0x90))
+#define SOUND_WAVE_RAM_1 *((vu32*)(MEM_IO + 0x94))
+#define SOUND_WAVE_RAM_2 *((vu32*)(MEM_IO + 0x98))
+#define SOUND_WAVE_RAM_3 *((vu32*)(MEM_IO + 0x9C))
+
+// DMG wave control bits.
+#define SOUND_WAVE_LENGTH(N) (N)
+#define SOUND_WAVE_MUTE     0x0
+#define SOUND_WAVE_VOL_100  (0x1 << 0xD)
+#define SOUND_WAVE_VOL_75   (0x4 << 0xD)
+#define SOUND_WAVE_VOL_50   (0x2 << 0xD)
+#define SOUND_WAVE_VOL_25   (0x3 << 0xD)
+
+// DMG wave mode bits.
+#define SOUND_WAVE_BANK_MODE(N)   ((N) << 0x5)
+#define SOUND_WAVE_BANK_SELECT(N) ((N) << 0x6)
+#define SOUND_WAVE_ENABLE         (1 << 0x7)
+
+typedef u8 WaveBank[32];
+
+// typedef u32 WaveBank[4];
+#define SOUND_WAVE_RAM ((WaveBank*)(MEM_IO + 0x90))
 
 typedef enum {
     NOTE_C_2       , NOTE_C_SHARP_2 , NOTE_D_2       , NOTE_D_SHARP_2 ,