ELEC2645 (2018/19) / Mbed 2 deprecated el17yfk

Game codes for Pokemon Academy Yiu Fai Kwok - 201198802 I have read the University Regulations on Plagiarism and state that the work covered by this declaration is my own and does not contain any unacknowledged work from other sources.

Dependencies:   mbed FXOS8700CQ mbed-rtos

Diff: Score/Score.cpp

Revision:
7:d9850dcf59e7
Parent:
6:9104692d6c8c
diff -r 9104692d6c8c -r d9850dcf59e7 Score/Score.cpp
--- a/Score/Score.cpp	Wed Apr 10 17:52:45 2019 +0000
+++ b/Score/Score.cpp	Thu Apr 11 15:27:58 2019 +0000
@@ -447,8 +447,8 @@
     lcd.refresh();
     wait(0.25);
     year = year + 1;
-    while(x > -170){
-        if(year == 3) {
+    if(year == 3){
+        while(x > -20){
             draw(lcd, cha, year, x, y);
             x = x - 31;
             wait(0.125);
@@ -490,10 +490,10 @@
     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);}
+    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();
 }
 
@@ -504,8 +504,8 @@
     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);}
+    else if(year == 2 && cha == 1) {_s1.evo_3_cong(lcd);}
+    else if(year == 2 && cha == 2) {_c1.evo_3_cong(lcd);}
     lcd.refresh();
 }