ELEC2645 (2018/19)
/
el17yfk
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: mbed FXOS8700CQ mbed-rtos
Revision 34:3ddfaa217eca, committed 2019-05-09
- Comitter:
- yfkwok
- Date:
- Thu May 09 00:41:05 2019 +0000
- Parent:
- 33:f7ec806e14b6
- Commit message:
- 09/05/2019 - Last commit before submission
Changed in this revision
| Score/Score.cpp | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/Score/Score.cpp Wed May 08 23:57:04 2019 +0000
+++ b/Score/Score.cpp Thu May 09 00:41:05 2019 +0000
@@ -708,40 +708,40 @@
draw_grad(lcd, cha, 1, 84);
pad.tone(NOTE_C5,0.46/2);
wait(0.46/2);
- pad.tone(NOTE_G3,0.46);
+ pad.tone(NOTE_G3,0.44);
wait(0.46/2);
draw_grad(lcd, cha, 1, 74);
wait(0.46/2);
draw_grad(lcd, cha, 1, 64);
- pad.tone(NOTE_G3,0.46/4);
+ pad.tone(NOTE_G3,0.44/4);
wait(0.46/4);
- pad.tone(NOTE_G3,0.46/4);
+ pad.tone(NOTE_G3,0.44/4);
wait(0.46/4);
draw_grad(lcd, cha, 1, 54);
- pad.tone(NOTE_G3,0.46/2);
+ pad.tone(NOTE_G3,0.44/2);
wait(0.46/2);
draw_grad(lcd, cha, 1, 44);
- pad.tone(NOTE_G3,0.46/2);
+ pad.tone(NOTE_G3,0.44/2);
wait(0.46/2);
draw_grad(lcd, cha, 1, 34);
- pad.tone(NOTE_G3,0.46);
+ pad.tone(NOTE_G3,0.44);
wait(0.46/2);
draw_grad(lcd, cha, 1, 24);
wait(0.46/2);
// bar 3
- pad.tone(NOTE_G3,0.46/2);
+ pad.tone(NOTE_G3,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_G3,0.46);
+ pad.tone(NOTE_G3,0.44);
wait(0.46);
- pad.tone(NOTE_G3,0.46/4);
+ pad.tone(NOTE_G3,0.44/4);
wait(0.46/4);
- pad.tone(NOTE_G3,0.46/4);
+ pad.tone(NOTE_G3,0.44/4);
wait(0.46/4);
- pad.tone(NOTE_G3,0.46/2);
+ pad.tone(NOTE_G3,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_G3,0.46/2);
+ pad.tone(NOTE_G3,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_G3,0.46);
+ pad.tone(NOTE_G3,0.44);
wait(0.46);
// bar 4
pad.tone(NOTE_C5,0.46*1.5);
@@ -951,18 +951,18 @@
pad.tone(NOTE_D5,0.46);
wait(0.46);
// bar 20
- pad.tone(NOTE_C5,0.46/2);
+ pad.tone(NOTE_C5,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_C5,0.46);
+ pad.tone(NOTE_C5,0.44);
wait(0.46);
- pad.tone(NOTE_C5,0.46/4);
+ pad.tone(NOTE_C5,0.44/4);
wait(0.46/4);
- pad.tone(NOTE_C5,0.46/4);
+ pad.tone(NOTE_C5,0.44/4);
wait(0.46/4);
- pad.tone(NOTE_C5,0.46/2);
+ pad.tone(NOTE_C5,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_C5,0.46/2);
+ pad.tone(NOTE_C5,0.44/2);
wait(0.46/2);
- pad.tone(NOTE_C5,0.46);
+ pad.tone(NOTE_C5,0.44);
wait(0.46);
}
\ No newline at end of file
--- a/main.cpp Wed May 08 23:57:04 2019 +0000
+++ b/main.cpp Thu May 09 00:41:05 2019 +0000
@@ -147,7 +147,7 @@
if(select == 1){
music.congrats(pad, lcd, select, year); // Display congratulation screen for choosing the starter pokemon
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A); // Instruct to press A to continue
+ lcd.drawSprite(2,40,9,8,(int*)button_A); // Instruct to press A to continue
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -162,7 +162,7 @@
else if(select == 0){
music.congrats(pad, lcd, select, year);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -177,7 +177,7 @@
else if(select == 2){
music.congrats(pad, lcd, select, year);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -370,7 +370,7 @@
if(select == 1){
music.evolution_music(pad, lcd, select, year); // Play the evolution animation and music for the chosen pokemon
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -383,7 +383,7 @@
else if(select == 0){
music.evolution_music(pad, lcd, select, year); // Play the evolution animation and music for the chosen pokemon
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -396,7 +396,7 @@
else if(select == 2){
music.evolution_music(pad, lcd, select, year); // Play the evolution animation and music for the chosen pokemon
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -418,7 +418,7 @@
if(select == 1){
music.evolution_music(pad, lcd, select, year);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -431,7 +431,7 @@
else if(select == 0){
music.evolution_music(pad, lcd, select, year);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -444,7 +444,7 @@
else if(select == 2){
music.evolution_music(pad, lcd, select, year);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);
@@ -462,7 +462,7 @@
grad.Grad_title(pad, lcd, select);
wait(1.0);
while(pad.check_event(Gamepad::A_PRESSED) == false){
- lcd.drawSprite(2,39,9,8,(int*)button_A);
+ lcd.drawSprite(2,40,9,8,(int*)button_A);
lcd.refresh();
wait(0.3);
lcd.printString(" ",0,5);