From 91e395a35e3a0e6ab677c7c85019d6a09a0d8e63 Mon Sep 17 00:00:00 2001
From: GeoffreyFrogeye <geoffrey@frogeye.fr>
Date: Tue, 8 Apr 2014 17:33:30 +0200
Subject: [PATCH] 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     |   1 +
 2048.G1A       | Bin 19860 -> 23636 bytes
 2048.c         |  20 +--
 2048.dlr       | 408 ++++++++++---------------------------------------
 FXSH_Build.bat |   2 +-
 5 files changed, 86 insertions(+), 345 deletions(-)

diff --git a/.gitignore b/.gitignore
index eccebd8..aa4cba5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /SDCard/*
 /imgres/*
 *.sublime-*
+*Thumbs.db
\ No newline at end of file
diff --git a/2048.G1A b/2048.G1A
index 15ea015f9f1f94c557cc566de7f318e42182e850..66a1cf3f973a3a9dbc9dab222ac40c0699e7317f 100644
GIT binary patch
delta 5482
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

delta 1734
zcma)7eN0nV6u-AceXlK83@AERO4}6?Y+tJb3U$R61d76-1iPtIUhBSqZVKBHKX@c#
zt^}FrWs8}*G(wie8AaayFacqcMU!ROppRAKaH$kEbH*jsATvaE9))dx?!El(efQjR
zPVV`gd(IoXgu71S<g@24U+DCI-l3TN6W+DYW@r2A_+!b&#V;C67RGYX`4wKZwF~{{
z5wIf@(I8+fAzmSQDls_Sh$$IIOlc3LL~)c-`YvLUODHAwBSu?@82dTIY^D&iaRM>L
zBm9O%a?E){wmVwEb`P9QdcEbkk`C#e?2t7exrgqdP=3&2&zy7w^E_&8ZaY0{@hG*q
zZPJlk4}uvZc^HLZM6~g)F=V`2p&6>2#6h!NK8eRo578~tR`?n^;*D$p9d0^k*c}m!
zMtyLdQO`{~<i@F0o@k@em@Q;FKp{2;Gkwxp=|~2-u~?g!%rcraZPKCcNfcO&=+R|F
zvE;d(D@Ip%&FnI>qYV$Th`#V;g<j;Lv<ER|)c_p;xG38J9Ml6E06tg)2MJeU-cWo#
z>42?k|83x*1Tp!m5mPW`YY}}o;)s7qCH{omTvCh=5)GwY*~Cr19<6hEUA}HlcR6~=
zT28@>ga+~&<>K6I#32t;o-1LB4VtY64I6QNS2=33suG1t8|9GKMhAKky*oiob;NU&
zu!W88%L-HTJF~H!qc=Iq8x@LJq1Le%Y{HaauXV&cvkt*l`4nVIE~P?WKh-dW<i079
z@Cpq#O&EIRwzM!3Ol%~aGVk><qCFF}5pT39MQ7ftth$|)CS<S<(Jvber_7ykRAmx$
z^ZHjHISfZt=wrV3MBk%4Ro*B$Luc;#1JQe=1FA{<ru298HhCcRMFVMdq=6Xv*oYtt
zQ>xK<F9+wNOyH>fIIpE$2K$n^lT!g1+|>Ddc?fU3)*e29^RKm!a}?<`ELTAwHwMll
zx*)kdqak{T8tOBKxHw<5S$Rj+e}k~Hjo3m0vW%@GOIt-E+i>6)L|0Fdl=U-%9~rZc
zCj((J^Gxg@Kycw;g;76vno|b&)Q{i#F!iwOiGvFCq~^}LQ2@a;DeXD6pDdTBayjg9
z%&PyWF;o?_CwE9VMW7kczUc9t;MLf?X2GwJ#SSkdZtyeX-IL`IV0!*cEk8$WM9}S{
zjun|^#FdbCAG7>|Hk@d6|1P-m>Z)MnBa^z_(mJlD+OvI8ucvQ!ceA@TVi5CmQI+Nj
zvcrv7Wo~&OB+fZn`fpzQPe6^xSz#g1{bvz9M!6<fyV<JKygcETA60YA*rLGmx&S%>
zfu4$mN^%ui`~lgaNY!pfwChPDPR*%&G9fjkx8V!Lhz{$dGh$f}P9XYn4f#T$mX!98
zZxtu;EZGsCL+?TKpa;<d*U71Py-KXIgd<QzVwHI*rQ~s}yOh<#x`~A2ZMcT06IMx_
zle{&dMk;ZZ@Lh>(DNR{YtUWoQ<Vw~+J968?V#&>wAIO|ze0Zf@A`{z`<Dl54_^j0r
zC2PgC*s|>Ip?~xXPatMfZ_GZ=E0(Wl!xyF=mKgrOJ_M4)Pp36voJ8uiKjS3cs(S|(
z{J9tEM445m<@3{j6hC{{rSj<+SrXW+&fG3ez3UpqNymIGT8x-}oikkj1_(((ZX16(
z`-~_l$Xy}Yw-#P6YK0g@bOF8x^!RZYQA#y%P!<P(n9EuKegNo|9f39udrlzOk_YoQ
zh>5?%2Z}yTAh)WAiMs|kjw4Mqo9#|eD}4rd3YY>s0z3rV2iye!eWkwvZURDpAmAs!
z4*=+hrB}#IP0k|!rmN)*q-2|lyuYoJ=-nF3kiT9@Pm29cuwVR@Kr0oK-^mxeI)f=V
H-`w*zFRMtR

diff --git a/2048.c b/2048.c
index 3009f38..0e5a55b 100644
--- a/2048.c
+++ b/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;
     	}
diff --git a/2048.dlr b/2048.dlr
index c00e48f..d5d074b 100644
--- a/2048.dlr
+++ b/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
-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
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
 Line=157
 Flags=00001012
 Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=157
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+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
-Line=175
-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
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=188
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=137
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
+Line=321
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=208
-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
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
+Line=323
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=245
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
+Line=330
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=416
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\ECode.c
+Line=343
 Flags=00001012
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=335
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+Line=191
 Flags=00001012
-Sublevel=2
 
 [Breakpoint]
-File=Z:\home\geoffrey\Documents\Programmation\CASIO\2048\2048.c
-Line=355
+File=C:\Users\Geoffrey\Documents\Programmation\CASIO\2048\2048.c
+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
diff --git a/FXSH_Build.bat b/FXSH_Build.bat
index 4d2590a..8cd9d51 100644
--- a/FXSH_Build.bat
+++ b/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