1 files changed, 13 insertions, 1 deletions

diff --git a/src/sequencer.c b/src/sequencer.c
index 66f1d24..f8b4a58 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -250,6 +250,7 @@ play_step(void) {
                     wave_env = WAV_ENV_OFF;
                     SOUND_WAVE_MODE |= SOUND_WAVE_ENABLE;
                     SOUND_WAVE_FREQ = SOUND_FREQ_RESET | sound_rates[trig->note];
+                    wave_env_ticks = 0;
                 } break;
             }
             wave_freq = sound_rates[trig->note];
@@ -371,6 +372,8 @@ env_start:
             if (wave_env_attack == 0) {
                 memcpy32(SOUND_WAVE_RAM, wave_target, 16);
                 SOUND_WAVE_MODE ^= SOUND_WAVE_BANK_SELECT(1);
+                memcpy32(SOUND_WAVE_RAM, wave_target, 16);
+                SOUND_WAVE_MODE ^= SOUND_WAVE_BANK_SELECT(1);
             } else {
                 wave_env = WAV_ENV_ATTACK;
                 goto env_start;
@@ -399,9 +402,9 @@ env_start:
                 if (wave_env_decay == 0) {
                     wave_env = WAV_ENV_OFF;
                 } else {
-                    wave_env_prog = 0;
                     wave_env = WAV_ENV_DECAY;
                 }
+                wave_env_prog = 0;
             }
             for (size_t j = 0; j < 4; j++) {
                 u32 next = 0;
@@ -451,6 +454,7 @@ env_start:
             int power = powers[wave_env_prog];
             if (++wave_env_prog >= 8) {
                 wave_env = WAV_ENV_END;
+                wave_env_prog = 0;
             }
             for (size_t j = 0; j < 4; j++) {
                 u32 next = 0;
@@ -491,12 +495,20 @@ env_start:
                 SOUND_WAVE_FREQ = SOUND_FREQ_RESET;
                 SOUND_WAVE_CTRL = SOUND_WAVE_MUTE;
                 wave_env = WAV_ENV_END;
+                SOUND_WAVE_MODE = SOUND_WAVE_BANK_SELECT(0);
+                memcpy32(SOUND_WAVE_RAM, wave_zero, 16);
+                SOUND_WAVE_MODE = SOUND_WAVE_BANK_SELECT(1);
+                memcpy32(SOUND_WAVE_RAM, wave_zero, 16);
             }
             return;
         } break;
         case WAV_ENV_END: {
             SOUND_WAVE_FREQ = SOUND_FREQ_RESET;
             SOUND_WAVE_CTRL = SOUND_WAVE_MUTE;
+            SOUND_WAVE_MODE = SOUND_WAVE_BANK_SELECT(0);
+            memcpy32(SOUND_WAVE_RAM, wave_zero, 16);
+            SOUND_WAVE_MODE = SOUND_WAVE_BANK_SELECT(1);
+            memcpy32(SOUND_WAVE_RAM, wave_zero, 16);
             return;
         } break;
     }