Diff: main/main.cpp

Revision:

31:becb8f6bf7b7

Parent:

30:d454d0cb72bc

Child:

32:5403bb974294

--- a/main/main.cpp	Tue Apr 16 21:16:33 2019 +0000
+++ b/main/main.cpp	Tue Apr 23 18:18:57 2019 +0000
@@ -47,11 +47,11 @@
 void pointer_position(int menu_number);
 void ship_movement();
 void menuSelection();
-//void introMusic();
+void introMusic();
 
 ScreenOption current_screen = ScreenOption_Menu;
 
-//int low_frequency_music_counter = 0;
+int low_frequency_music_counter = 0;
 
 void intro();
 
@@ -79,12 +79,14 @@
     //Stop just a few pixels above the bottom screen border.
     while (!gamepad.check_event(gamepad.START_PRESSED)){
         lcd.clear();
+        //introMusic();
         introPartOneText();
         if (start_game_text_counter >= 2){
             lcd.printString("Press START",10,5);
             if (start_game_text_counter == 4){start_game_text_counter = 0;}  
         }
         start_game_text_counter += 1;
+   
         lcd.refresh();          
     }
 }
@@ -118,6 +120,7 @@
         
         introPartOneText();
         //introMusic();
+        gamepad.tone(200,2);
         
         lcd.refresh();
         wait(0.01);
@@ -132,6 +135,7 @@
         drawSprite(lineThree.pos, intro_line_three_sprite);
         lcd.refresh();
         wait(0.1);
+        introMusic();
     } 
 }
 /**@brief
@@ -174,16 +178,16 @@
     }
 }
 
-/*void introMusic(){   
-    if (low_frequency_music_counter == 0){ gamepad.tone(90,1);}
-    else if (low_frequency_music_counter == 1){gamepad.tone(60,1);}
-    else if (low_frequency_music_counter == 2){gamepad.tone(90,1);}
-    else if (low_frequency_music_counter == 3){gamepad.tone(60,1);}
-    else if (low_frequency_music_counter == 4){gamepad.tone(90,1);}
-    else if (low_frequency_music_counter == 5){gamepad.tone(60,1);}
-    else if (low_frequency_music_counter== 6){
+void introMusic(){   
+    if (low_frequency_music_counter == 0){ gamepad.tone(90,2);}
+    else if (low_frequency_music_counter == 2){gamepad.tone(60,2);}
+    else if (low_frequency_music_counter == 4){gamepad.tone(190,2);}
+    else if (low_frequency_music_counter == 6){gamepad.tone(60,2);}
+    else if (low_frequency_music_counter == 8){gamepad.tone(90,2);}
+    else if (low_frequency_music_counter == 10){gamepad.tone(160,2);}
+    else if (low_frequency_music_counter== 12){
         gamepad.tone(90,1);
         low_frequency_music_counter = 0;
     }
     low_frequency_music_counter++;    
-}*/
\ No newline at end of file
+}
\ No newline at end of file