do you mean hot or warm

chee · May 29, 2020 · 4773efc · 4773efc
1 parent 53482f9
commit 4773efc
Show file tree

Hide file tree

Showing 28 changed files with 472 additions and 8,418 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,2 +1,2 @@
-UseTab: ForIndentation
+UseTab: Never
 BreakBeforeBraces: Attach
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-arm7/build
-arm9/build
 *.arm7
-*.elf
+*.elf
+build/
diff --git a/.gitignore.ZILESAVE b/.gitignore.ZILESAVE
@@ -0,0 +1,3 @@
+build
+*.arm7
+*.elf
diff --git a/prettychips.arm9 b/prettychips.arm9
diff --git a/prettychips.nds b/prettychips.nds
diff --git a/source/adsr.c b/source/adsr.c
@@ -21,6 +21,7 @@
 
 #include "adsr.h"
 #include <math.h>
+#include <nds.h>
 
 void initADSR(ADSR *ptr) {
   resetADSR(ptr);
@@ -124,7 +125,7 @@ int getState(ADSR *ptr) { return ptr->state; }
 
 void resetADSR(ADSR *ptr) {
   ptr->gate = 0;
-  ptr->state = env_attack;
+  ptr->state = env_idle;
   ptr->output = 0.0;
 }
 

diff --git a/source/adsr.h b/source/adsr.h
@@ -18,9 +18,6 @@
 //  purposes, free or commercial.
 //
 
-#ifndef ADRS_h
-#define ADRS_h
-
 enum envState {
   env_idle = 0,
   env_attack,
@@ -62,4 +59,3 @@ void setTargetRatioA(ADSR *ptr, float targetRatio);
 void setTargetRatioDR(ADSR *ptr, float targetRatio);
 void resetADSR(ADSR *ptr);
 void initADSR(ADSR *ptr);
-#endif
diff --git a/source/extras.c b/source/extras.c
diff --git a/source/extras.h b/source/extras.h
diff --git a/source/globals.c b/source/globals.c
diff --git a/source/globals.h b/source/globals.h