Merge pull request #320 from ModusCreateOrg/316

316
ModusCreateOrg · Dec 16, 2017 · 4471003 · 4471003
2 parents d35b5fb + 2301dea
commit 4471003
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 49 deletions.
diff --git a/Evade2/Attract.cpp b/Evade2/Attract.cpp
@@ -9,14 +9,13 @@ static const char scout_text[] PROGMEM = "SCOUT";
 static const char bomber_text[] PROGMEM = "BOMBER";
 static const char assault_text[] PROGMEM = "ASSAULT";
 
-static const char credits1[] PROGMEM = "CRAFTED BY\nMODUS CREATE\nDECEMBER 2017.\n\nHAPPY HOLIDAYS!";
-static const char credits2[] PROGMEM = "DESIGN BY:\nJAY GARCIA";
-static const char credits3[] PROGMEM = "MUSIC BY:\nJAY GARCIA\nDELIO BRIGNOLI";
-static const char credits4[] PROGMEM = "ART BY:\nMICHAEL TINTIUC\nJAY GARCIA";
-static const char credits5[] PROGMEM = "PROGRAMMING BY:\nJAY GARCIA\nDELIO BRIGNOLI\nMICHAEL TINTIUC\nMIKE SCHWARTZ";
+static const char credits1[] PROGMEM = "CRAFTED BY:\nMODUS CREATE\nDECEMBER 2017.\nHAPPY HOLIDAYS!\n\nhttp://modus.co";
+static const char credits2[] PROGMEM = "DESIGN and MUSIC:\nJAY GARCIA";
+static const char credits3[] PROGMEM = "ART:\nMICHAEL TINTIUC\nJON VAN DALEN\nJD JONES\nJAY GARCIA";
+static const char credits4[] PROGMEM = "PROGRAMMING:\nMIKE SCHWARTZ\nJAY GARCIA\nDELIO BRIGNOLI\nMICHAEL TINTIUC\nANDY DENNIS";
 
 const BYTE MAX_SCREEN = 2;
-const BYTE MAX_CREDITS = 4;
+const BYTE MAX_CREDITS = 3;
 
 struct attract_data {
   BYTE screen;
@@ -67,9 +66,9 @@ static void init_screen(attract_data *ad, BYTE x = 6, BYTE y = 6) {
       case 3:
         ad->text = credits4;
         break;
-      case 4:
-        ad->text = credits5;
-        break;
+      // case 4:
+      //   ad->text = credits5;
+      //   break;
     }
   }
 

diff --git a/Evade2/Font.cpp b/Evade2/Font.cpp
@@ -71,16 +71,8 @@ static const PROGMEM BYTE *const charset[] = {
 #else
   NULL,
 #endif
-#ifdef FULL_CHARSET
   font_period,
-#else
-  NULL,
-#endif 
-#ifdef FULL_CHARSET
   font_fslash,
-#else
-  NULL,
-#endif
   font_0,
   font_1,
   font_2,

diff --git a/Evade2/Sound.cpp b/Evade2/Sound.cpp
@@ -9,8 +9,9 @@ static Arduboy2Audio audio;
 
 // Todo change to <ATMLib.h> once we publish
 #include "sound/SFX.h"
-// #include "sound/evade2_00_intro.h"
+#include "sound/evade2_00_intro.h"
 #include "sound/evade2_00_intro_alt_smaller.h"
+#include "sound/evade2_01_stage_1.h"
 #include "sound/evade2_01_stage_1_alt_smaller.h"
 #include "sound/evade2_02_stage_1_boss.h"
 #include "sound/evade2_03_stage_2_alt_smaller.h"
@@ -66,6 +67,7 @@ void Sound::stfu() {
 void Sound::play_score(BYTE id) {
   static const PROGMEM UBYTE *const songs[] = {
     (UBYTE *)&evade2_00_intro_alt_smaller,   // 0 INTRO_SONG
+    // (UBYTE *)&evade2_01_stage_1, // 1 STAGE_1_SONG
     (UBYTE *)&evade2_01_stage_1_alt_smaller, // 1 STAGE_1_SONG
     (UBYTE *)&evade2_02_stage_1_boss,        // 2 STAGE_1_BOSS_SONG
     (UBYTE *)&evade2_03_stage_2_alt_smaller, // 3 STAGE_2_SONG

diff --git a/Evade2/charset.h b/Evade2/charset.h
@@ -517,6 +517,7 @@ const PROGMEM BYTE font_comma[] = {
   -1, 1, -1, 2,
   -1, 2, -2, 3,
 };
+#endif
 
 const PROGMEM BYTE font_period[] = {
   //      9,		 // width
@@ -527,14 +528,13 @@ const PROGMEM BYTE font_period[] = {
 };
 
 
-#endif
 const PROGMEM BYTE font_colon[] = {
   //      9,		 // width
   //      9,		 // height
   2, // Number of rows of coords
      //    x1   y1   x2   y2
   -1, -4, -1, -3,
-  -1, 2, -1, 3,
+  -1, 3, -1, 4,
 };
 
 #ifdef FULL_CHARSET
@@ -564,6 +564,7 @@ const PROGMEM BYTE font_minus[] = {
      //    x1   y1   x2   y2
   -3, -1, 1, -1,
 };
+#endif
 
 const PROGMEM BYTE font_fslash[] = {
   //      9,		 // width
@@ -573,6 +574,7 @@ const PROGMEM BYTE font_fslash[] = {
   -4, 2, 2, -4,
 };
 
+#ifdef FULL_CHARSET
 const PROGMEM BYTE font_bslash[] = {
   //      9,		 // width
   //      9,		 // height

diff --git a/Evade2/sound/SFX.h b/Evade2/sound/SFX.h
@@ -9,14 +9,10 @@ const PROGMEM struct sfx1_data {
   .fmt = ATM_SCORE_FMT_MINIMAL_MONO,
   .pattern0 = {
     ATM_CMD_M_SET_TEMPO(22),
-    ATM_CMD_M_SET_VOLUME(63),
-    ATM_CMD_I_NOTE_F5,
-    ATM_CMD_M_DELAY_TICKS(3),
-    ATM_CMD_I_NOTE_C4,
-    ATM_CMD_M_DELAY_TICKS(2),
-    ATM_CMD_I_NOTE_C3,
-    ATM_CMD_M_DELAY_TICKS(2),    
-    ATM_CMD_I_NOTE_OFF,
+    ATM_CMD_M_SET_VOLUME(110),
+    ATM_CMD_M_SLIDE_FREQ_ON(-50),
+    ATM_CMD_I_NOTE_E5,
+
     ATM_CMD_M_DELAY_TICKS(11),
     ATM_CMD_I_STOP,
   },
@@ -30,14 +26,9 @@ const PROGMEM struct SFX_enemy_shoot_data {
   .fmt = ATM_SCORE_FMT_MINIMAL_MONO,
   .pattern0 = {
     ATM_CMD_M_SET_TEMPO(22),
-    ATM_CMD_M_SET_VOLUME(63),
-    ATM_CMD_I_NOTE_C3,
-    ATM_CMD_M_DELAY_TICKS(3),
-    ATM_CMD_I_NOTE_C4,
-    ATM_CMD_M_DELAY_TICKS(2),
-    ATM_CMD_I_NOTE_F5,
-    ATM_CMD_M_DELAY_TICKS(2),    
-    ATM_CMD_I_NOTE_OFF,
+    ATM_CMD_M_SET_VOLUME(110),
+    ATM_CMD_M_SLIDE_FREQ_ON(50),
+    ATM_CMD_I_NOTE_E4,
     ATM_CMD_M_DELAY_TICKS(11),
     ATM_CMD_I_STOP,
   },
@@ -53,7 +44,7 @@ const PROGMEM struct SFX_player_hit_data {
   .fmt = ATM_SCORE_FMT_MINIMAL_MONO,
   .pattern0 = {
     ATM_CMD_M_SET_TEMPO(1),
-    ATM_CMD_M_SET_VOLUME(110),
+    ATM_CMD_M_SET_VOLUME(128),
     ATM_CMD_I_NOTE_F3,
     ATM_CMD_M_DELAY_TICKS(2),
     ATM_CMD_I_NOTE_F2,

diff --git a/Evade2/sound/evade2_11_get_ready.h b/Evade2/sound/evade2_11_get_ready.h
@@ -13,10 +13,11 @@
 #define DEFINE_PATTERN(pattern_id, values) const uint8_t pattern_id[] = values;
 #endif
 
-/* pattern (channel) / bytes = 7*/
+/* pattern (channel) / bytes = 9*/
 #define evade2_11_get_ready_pattern0_data { \
-    ATM_CMD_M_SET_VOLUME(110), \
-    ATM_CMD_M_SET_TEMPO(5), \
+    ATM_CMD_M_SET_VOLUME(120), \
+    ATM_CMD_M_SLIDE_FREQ_ON(70), \
+    ATM_CMD_M_SET_TEMPO(17), \
     ATM_CMD_M_CALL(4), \
     ATM_CMD_M_SET_LOOP_PATTERN(0), \
     ATM_CMD_I_STOP, \
@@ -41,16 +42,12 @@ DEFINE_PATTERN(evade2_11_get_ready_pattern2_array, evade2_11_get_ready_pattern2_
 }
 DEFINE_PATTERN(evade2_11_get_ready_pattern3_array, evade2_11_get_ready_pattern3_data);
 
-/* pattern (tune) / "Pattern 1" / bytes = 9*/
+/* pattern (tune) / "Pattern 1" / bytes = 3*/
 #define evade2_11_get_ready_pattern4_data { \
-    ATM_CMD_I_NOTE_C4_, \
-    ATM_CMD_M_DELAY_TICKS(2), \
-    ATM_CMD_I_NOTE_F4_, \
-    ATM_CMD_M_DELAY_TICKS(2), \
+    ATM_CMD_I_NOTE_C4, \
+    ATM_CMD_M_DELAY_TICKS(4), \
     ATM_CMD_I_NOTE_G4_, \
-    ATM_CMD_M_DELAY_TICKS(2), \
-    ATM_CMD_I_NOTE_C5, \
-    ATM_CMD_M_DELAY_TICKS(2), \
+    ATM_CMD_M_DELAY_TICKS(4), \
     ATM_CMD_I_RETURN, \
 }
 DEFINE_PATTERN(evade2_11_get_ready_pattern4_array, evade2_11_get_ready_pattern4_data);

diff --git a/Evade2/src/ATMLib2/atm_synth.h b/Evade2/src/ATMLib2/atm_synth.h
@@ -22,7 +22,7 @@
 #else
 #define ATM_HAS_FX_NOISE_RETRIG (1)
 #define ATM_HAS_FX_NOTE_RETRIG (1)
-#define ATM_HAS_FX_SLIDE (0)
+#define ATM_HAS_FX_SLIDE (1)
 #define ATM_HAS_FX_LFO (0)
 #define ATM_HAS_FX_GLISSANDO (0)
 #define ATM_HAS_FX_LOOP (1)