1 files changed, 21 insertions, 51 deletions

diff --git a/src/main.c b/src/main.c
index 30452e1..8b36226 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,23 +13,6 @@
 // TODO: Cleanup OBJ/OAM memory copying and access.
 //
 
-//
-// BIOS calls
-//
-
-int hblank_counter = 0;
-
-void
-irs_hblank_func() {
-    hblank_counter++;
-    if (DISP_VCOUNT >= 160) {
-        PAL_BUFFER_BG[0] = rgb15(0, 0, 0);
-    } else {
-        u16 clr = (DISP_VCOUNT / 8);
-        PAL_BUFFER_BG[0] = rgb15(clr, 0, 31 - clr);
-    }
-}
-
 int main(void) {
     // Configure the display in mode 0 to show OBJs, where tile memory is
     // sequential.
@@ -46,24 +29,18 @@ int main(void) {
     // Register interrupts.
     irq_init();
     irs_set(IRQ_VBLANK, irs_stub);
-    irs_set(IRQ_HBLANK, irs_hblank_func);
 
     // turn sound on
     SOUND_STATUS = SOUND_ENABLE;
     SOUND_DMG_MASTER = sound_volume(SOUND_SQUARE1 | SOUND_SQUARE2, 7);
     SOUND_DSOUND_MASTER = SOUND_DMG100;
 
-    char *note_names[] = {
-        "C"  , "C#" , "D"  , "D#" ,
-        "E"  , "F"  , "F#" , "G"  ,
-        "G#" , "A"  , "A#" , "B"
-    };
     int frame_counter = 0;
-    Note active_note = NOTE_C;
-    u8 octave = 0;
+    Note active_note = NOTE_C_4;
+    int octave_diff = 0;
     bool playing = false;
     bool new_note = false;
-    u8 interval = 1;
+    u8 interval = 4;
     while(true) {
         bios_vblank_wait();
         poll_keys();
@@ -72,49 +49,39 @@ int main(void) {
         txt_clear_line();
 
         if (key_pressed(KEY_B)) {
-            active_note = NOTE_C;
+            active_note = NOTE_C_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_A)) {
-            active_note = NOTE_D;
+            active_note = NOTE_D_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_LEFT)) {
-            active_note = NOTE_E;
+            active_note = NOTE_E_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_DOWN)) {
-            active_note = NOTE_F;
+            active_note = NOTE_F_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_RIGHT)) {
-            active_note = NOTE_G;
+            active_note = NOTE_G_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_UP)) {
-            active_note = NOTE_A;
+            active_note = NOTE_A_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_L)) {
-            active_note = NOTE_B;
+            active_note = NOTE_B_4 + 12 * octave_diff;
             new_note = true;
-            octave = 0;
         } else if (key_pressed(KEY_R)) {
-            active_note = NOTE_C;
+            active_note = NOTE_C_5 + 12 * octave_diff;
             new_note = true;
-            octave = 1;
         }
         if (key_pressed(KEY_START)) {
-            interval++;
+            octave_diff = CLAMP(octave_diff + 1, -2, 3);
         }
         if (key_pressed(KEY_SELECT)) {
-            interval--;
+            octave_diff = CLAMP(octave_diff - 1, -2, 3);
         }
 
         if (key_curr > 0) {
-            txt_printf(" Playing: %s + %s\n",
-                    note_names[active_note],
-                    (note_names[(active_note + interval) % 12]));
+            txt_printf(" Playing: %s\n", note_names[active_note]);
             playing = true;
         } else {
             playing = false;
@@ -122,10 +89,13 @@ int main(void) {
 
         if (playing) {
             if (new_note) {
-                SOUND_SQUARE1_CTRL = SOUND_SQUARE_ENV_VOL(4) | SOUND_SQUARE_ENV_TIME(0);
-                SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(4) | SOUND_SQUARE_ENV_TIME(0);
-                SOUND_SQUARE1_FREQ = SOUND_SQUARE_RESET | sound_rate(active_note, octave);
-                SOUND_SQUARE2_FREQ = SOUND_SQUARE_RESET | sound_rate((active_note + interval) % 12, octave);
+                // SOUND_SQUARE1_SWEEP = 3 | (1 << 3) | (2 << 4);
+                // SOUND_SQUARE1_CTRL = SOUND_SQUARE_ENV_VOL(15) | SOUND_SQUARE_ENV_TIME(0x7);
+                // SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(15) | SOUND_SQUARE_ENV_TIME(0);
+                SOUND_SQUARE1_CTRL = SOUND_SQUARE_ENV_VOL(15) | SOUND_SQUARE_ENV_TIME(4) | SOUND_SQUARE_ENV_INC | SOUND_SQUARE_DUTY(3);
+                // SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(15) | SOUND_SQUARE_ENV_TIME(4) | SOUND_SQUARE_ENV_INC;
+                SOUND_SQUARE1_FREQ = SOUND_SQUARE_RESET | sound_rates[active_note];
+                // SOUND_SQUARE2_FREQ = SOUND_SQUARE_RESET | sound_rate((active_note + interval) % 12, octave);
             }
             new_note = false;
         } else {