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: Characters/Squirtle.cpp

Revision:
31:0d2c19a285f6
Parent:
22:f8f36e88b2ca
--- a/Characters/Squirtle.cpp	Mon May 06 20:37:23 2019 +0000
+++ b/Characters/Squirtle.cpp	Wed May 08 03:03:46 2019 +0000
@@ -191,7 +191,7 @@
     lcd.drawSprite(_pos_x, _pos_y, 21, 23, (int *)squirtle_a3_data);
 }
 
-void Squirtle::evo_1_sprite(N5110 &lcd)
+void Squirtle::evo_1_sprite(N5110 &lcd, int x, int y)
 {
     int evo_1_sprite_data[38][41] = {
         {0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -233,10 +233,10 @@
         {0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0},
         {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
     };
-    lcd.drawSprite(23, 9, 38, 41, (int *)evo_1_sprite_data);
+    lcd.drawSprite(x, y, 38, 41, (int *)evo_1_sprite_data);
 }
 
-void Squirtle::evo_2_sprite(N5110 &lcd)
+void Squirtle::evo_2_sprite(N5110 &lcd, int x, int y)
 {
     int evo_2_sprite_data[47][45] = {
         {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -287,7 +287,7 @@
         {0,0,0,0,0,1,1,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
         {0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     };
-    lcd.drawSprite(20, 2, 47, 45, (int *)evo_2_sprite_data);
+    lcd.drawSprite(x, y, 47, 45, (int *)evo_2_sprite_data);
 }
 
 void Squirtle::evo_3_sprite(N5110 &lcd, int x, int y)