Diff: Score/Score.cpp

Revision:

6:9104692d6c8c

Parent:

5:bc0691d02fd5

Child:

7:d9850dcf59e7

--- a/Score/Score.cpp	Mon Apr 08 00:41:25 2019 +0000
+++ b/Score/Score.cpp	Wed Apr 10 17:52:45 2019 +0000
@@ -361,8 +361,10 @@
 
 void Score::evolution_music(Gamepad &pad, N5110 &lcd, int cha, int year)
 {
+    int x = 84;
+    int y = 12;
     // bar 1
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G5,0.5/4);
     wait(0.5/4);
     pad.tone(NOTE_D5,0.5/4);
@@ -380,7 +382,7 @@
     lcd.refresh();
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     wait(0.25);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
@@ -389,7 +391,7 @@
     wait(0.25);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
     lcd.clear();
@@ -397,7 +399,7 @@
     wait(0.25);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     wait(0.25);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
@@ -406,44 +408,53 @@
     pad.tone(NOTE_A4,0.5);
     wait(0.5);
     // bar 4
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
     lcd.clear();
     lcd.refresh();
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
     lcd.clear();
     lcd.refresh();
     pad.tone(NOTE_G4,0.5/2);
     wait(0.5);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
     lcd.clear();
     lcd.refresh();
     wait(0.25);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
     lcd.clear();
     lcd.refresh();
     wait(0.25);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_G4,0.5/2);
     wait(0.25);
     lcd.clear();
     lcd.refresh();
     wait(0.25);
-    draw(lcd, cha, year);
+    draw(lcd, cha, year, x, y);
     pad.tone(NOTE_B4,0.5);
     wait(0.25);
     lcd.clear();
     lcd.refresh();
     wait(0.25);
+    year = year + 1;
+    while(x > -170){
+        if(year == 3) {
+            draw(lcd, cha, year, x, y);
+            x = x - 31;
+            wait(0.125);
+        }
+    }
+    year = year - 1;
     congrats(pad, lcd, cha, year);
 }
 
@@ -474,11 +485,15 @@
     wait(0.8);
 }
 
-void Score::draw(N5110 &lcd, int cha, int year)
+void Score::draw(N5110 &lcd, int cha, int year, int x, int y)
 {
     lcd.clear();
     if(year == 1 && cha == 1) {_s1.evo_1_sprite(lcd);}
+    else if(year == 1 && cha == 2) {_c1.evo_1_sprite(lcd);}
     else if (year == 2 && cha == 1) {_s1.evo_2_sprite(lcd);}
+    else if (year == 2 && cha == 2) {_c1.evo_2_sprite(lcd);}
+    else if (year == 3 && cha == 1) {_s1.evo_3_sprite(lcd, x, y);}
+    else if (year == 3 && cha == 2) {_c1.evo_3_sprite(lcd, x, y);}
     lcd.refresh();
 }
 
@@ -486,8 +501,11 @@
 {
     lcd.clear();
     if(year == 0 && cha == 1) {_s1.evo_1_cong(lcd);}
+    else if(year == 0 && cha == 2) {_c1.evo_2_cong(lcd);}
     else if(year == 1 && cha == 1) {_s1.evo_2_cong(lcd);}
+    else if(year == 1 && cha == 2) {_c1.evo_2_cong(lcd);}
     else if (year == 2 && cha == 1) {_s1.evo_3_cong(lcd);}
+    else if (year == 2 && cha == 2) {_c1.evo_3_cong(lcd);}
     lcd.refresh();
 }