1 files changed, 9 insertions, 10 deletions

diff --git a/src/main.c b/src/main.c
index 222ffd4..cbf781d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -134,10 +134,9 @@ audio_talk(Device *d, u8 b0, u8 w) {
                 c->length <<= 12; // fixed point.
                 c->data = &d->mem[mempeek16(d->dat, 0xc)];
 
-        // TODO: Volume.
-        c->vol = 12; // 0-64
-                // c->volume[0] = d->dat[0xe] >> 4;
-                // c->volume[1] = d->dat[0xe] & 0xf;
+        // Volume (Mono only for now).
+        c->vol = MAX(d->dat[0xe] >> 4, d->dat[0xe] & 0xf); // 0-64
+        c->vol *= 4 / 3;
 
                 // Looping.
                 if (!(d->dat[0xf] & 0x80)) {
@@ -150,16 +149,16 @@ audio_talk(Device *d, u8 b0, u8 w) {
                 c->pitch = d->dat[0xf] & 0x7f;
 
                 // Initialization.
+                u32 sampling_rate = length;
                 if (length > 256) {
-            c->inc = pitch_table_44100[c->pitch];
-                } else {
-            c->inc = pitch_table_variable[c->pitch] * length / AUDIO_FREQ;
+                    sampling_rate = 44100;
         }
+        c->inc = (pitch_table[c->pitch] * sampling_rate) >> 5;
 
             txt_position(0, 0);
-        txt_printf("note: %d     \n", c->pitch);
-        txt_printf("inc: %ld     \n", c->inc);
-        txt_printf("length: %ld     \n", c->length >> 12);
+        txt_printf("note:   %d     \n", c->pitch);
+        txt_printf("inc:    %ld    \n", c->inc);
+        txt_printf("length: %ld    \n", c->length >> 12);
         }
 }