Fixed some game logic

* Each tile can only merge once per move
* Game update correctly after just moving
* Slowed down animation because it looked weird out of the emulator
* Fixed a single typo

.gitignore

@@ -3,3 +3,4 @@
 /SDCard/*
 /imgres/*
 *.sublime-*
+*Thumbs.db

2048.c

@@ -56,7 +56,7 @@ bool Game_over = false;
 bool Game_won = false;
 bool Game_keepPlaying = true;
 
-int storage_bestScore = 0;
+int Storage_bestScore = 0;
 
 Grid Grid_grid;
 
@@ -124,7 +124,7 @@ int Grid_avaiableCellsAmount() {
 }
 
 void storage_setBestScore(int bestScore) {
-	storage_bestScore = bestScore;
+	Storage_bestScore = bestScore;
 	// Sauvegarder dans la mémoire
 }
 
@@ -184,7 +184,7 @@ int Screen_drawMovingTiles(float percentage) {
 }
 
 void Screen_updateScore() {
-	PrintXY(100, 14, "0", 1);
+    PrintXY(100, 14, "0", 1);
 }
 
 void Screen_updateBestScore() {
@@ -211,7 +211,7 @@ void Screen_actuate() {
 
 	SaveDisp(SAVEDISP_PAGE1);
 
-	for (i = 0; i <= 1; i += 0.02) {
+	for (i = 0; i <= 1; i += 0.01) {
 		RestoreDisp(SAVEDISP_PAGE1);
 		Screen_drawMovingTiles(i);
 		ML_display_vram();
@@ -238,7 +238,7 @@ void Screen_actuate() {
 
 
 void Game_actuate() {
-	if (storage_bestScore < Game_score) {
+	if (Storage_bestScore < Game_score) {
 		storage_setBestScore(Game_score);
 	}
 	Screen_actuate();
@@ -315,6 +315,7 @@ bool Game_moveTile(Tile tile, Cell cell) {
 		tile.x = cell.x;
 		tile.y = cell.y;
 		Grid_insertTile(tile);
+		return true;
 	}
 }
 
@@ -382,7 +383,7 @@ void Game_move(int direction) { // 0: up, 1: right, 2: down, 3: left
 				position = Game_findFarthestPosition(cell, vector);
 				next = position.next;
 				farthest = position.farthest;
-				if (Grid_cellContent(next).value == tile.value && !tile.hasMerged) { // Merge
+				if (Grid_cellContent(next).value == tile.value && !tile.hasMerged && !Grid_cellContent(next).hasMerged) { // Merge
 					merged.x = next.x;
 					merged.y = next.y;
 					merged.value = tile.value + 1;
@@ -486,13 +487,6 @@ int AddIn_main(int isAppli, unsigned short OptionNum) {
     		case KEY_CTRL_DEL:
     			initGame();
     			break;
-    		/*case KEY_CHAR_PLUS: // DEBUG
-    			Game_addRandomTile();
-    			Game_actuate();
-    			break;
-    		case KEY_CHAR_STORE: // DEBUG
-    			Game_actuate();
-    			break;*/
     		default:
     			break;
     	}

2048.dlr

@@ -1,489 +1,235 @@
 [DLSimRunSpace]
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=184
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=149
 Flags=00001012
+Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=130
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=198
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=204
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=210
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=150
 Flags=00001012
-Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=117
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=124
 Flags=00001012
-Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=151
 Flags=00001012
-Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=147
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=157
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=158
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=54
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=54
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=49
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=47
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=46
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=45
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=55
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=55
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=147
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=147
 Flags=00001012
 Sublevel=3
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=220
 Flags=00001012
 Sublevel=1
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=210
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=220
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=117
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=208
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=78
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=78
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=411
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=170
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=170
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=176
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=180
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=316
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=324
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=324
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=326
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=327
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=329
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=330
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=326
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=327
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=327
-Flags=00001012
-Sublevel=3
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=333
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=335
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=176
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=176
-Flags=00001012
-Sublevel=3
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=330
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=333
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=333
-Flags=00001012
-Sublevel=3
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=339
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=340
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=341
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=347
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=348
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=348
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=355
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=473
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=509
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=470
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=337
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=476
-Flags=00001012
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=124
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=316
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=329
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=339
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=341
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=150
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=151
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=157
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=157
+Line=149
 Flags=00001012
-Sublevel=3
+Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=158
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=175
+Line=188
-Flags=00001012
-Sublevel=1
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=175
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=140
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
-Line=137
+Line=321
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
-Line=208
+Line=323
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=347
-Flags=00001012
-Sublevel=2
-
-[Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=238
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
-Line=245
+Line=330
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
-Line=416
+Line=343
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=335
+Line=191
 Flags=00001012
-Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=355
+Line=477
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=474
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=475
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=197
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=194
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=473
+Flags=00001012
+
+[Breakpoint]
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=189
 Flags=00001012
-Sublevel=2

FXSH_Build.bat

@@ -10,7 +10,7 @@ if exist FXADDINror.bin  del FXADDINror.bin
 cd ..
 if not exist debug\FXADDINror.bin  goto error
 
-"C:\CASIO SDK\Tools\MakeAddinHeader363.exe" "Z:\home\geoffrey\Documents\Programmation\CASIO\2048"
+"C:\CASIO SDK\Tools\MakeAddinHeader363.exe" "C:\Users\Geoffrey\Documents\Programmation\CASIO\2048"
 if not exist 2048.G1A  goto error
 echo Build has completed.
 goto end