Better code readability

diff --git a/Games/Pomppu Paavo.bas b/Games/Pomppu Paavo.bas
index b219d31..4b56e5b 100755 (executable)
--- a/Games/Pomppu Paavo.bas
+++ b/Games/Pomppu Paavo.bas
@@ -17,7 +17,7 @@ DECLARE SUB DrawSprite (p%, o%, m%, fr%, teler%)
 DEFINT A-Z\r
 DIM SHARED graphicsMode\r
 DIM SHARED asciiLevelData(1 TO 20) AS STRING * 31\r
-DIM SHARED hedgehogY, hedgehogX, secondHedgehogY, secondHedgehogX\r
+DIM SHARED FirstCompanionY%, FirstCompanionX%, SecondCompanionY%, SecondCompanionX%\r
 DIM SHARED remainingLives, coinCount\r
 DIM SHARED uks1, uks2, uks3, uks4\r
 DIM SHARED currentLevelNumber\r
@@ -233,10 +233,10 @@ IF b > 0 THEN IF sipp = 10 THEN PUT (a, b), sipp10, OR
 IF b > 0 THEN IF sipp = 20 THEN PUT (a, b), sipp20, OR\r
 IF b > 0 THEN IF sipp = 3 THEN PUT (a, b), sipp3, OR\r
 \r
-GET (hedgehogX, hedgehogY)-(hedgehogX + 10, hedgehogY + 10), siil1\r
-PUT (hedgehogX, hedgehogY), siil, OR\r
-GET (secondHedgehogX, secondHedgehogY)-(secondHedgehogX + 10, secondHedgehogY + 10), siil2\r
-PUT (secondHedgehogX, secondHedgehogY), siil, OR\r
+GET (FirstCompanionX%, FirstCompanionY%)-(FirstCompanionX% + 10, FirstCompanionY% + 10), siil1\r
+PUT (FirstCompanionX%, FirstCompanionY%), siil, OR\r
+GET (SecondCompanionX%, SecondCompanionY%)-(SecondCompanionX% + 10, SecondCompanionY% + 10), siil2\r
+PUT (SecondCompanionX%, SecondCompanionY%), siil, OR\r
 SOUND 0, .8\r
 IF terrainGrid((a + 38) \ 20, (b + 37) \ 20) = "z" THEN eda = -1: r = 9: lke = 0\r
 IF terrainGrid((a + 38) \ 20, (b + 22) \ 20) = "z" THEN eda = -1: r = 9: lke = 0\r
@@ -262,29 +262,29 @@ r1 = r1 + 1: IF r1 > 3 THEN r1 = 0: all = all + 1
 lk = lk + 1: cd = cd - 1\r
 IF objectGrid((a + 30) \ 20, (b + 21) \ 20) = "o" THEN terrainGrid((a + 30) \ 20, (b + 21) \ 20) = "": objectGrid((a + 30) \ 20, (b + 21) \ 20) = "": kustuta = 1\r
 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "a" THEN terrainGrid((a + 30) \ 20, (b + 38) \ 20) = "": objectGrid((a + 30) \ 20, (b + 38) \ 20) = "": kustuta2 = 1\r
-IF terrainGrid((hedgehogX + 25) \ 20, (hedgehogY + 25) \ 20) = "z" THEN siiall = -1\r
-IF terrainGrid((hedgehogX + 30) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = -1\r
-IF terrainGrid((hedgehogX + 20) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = 1\r
-IF terrainGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 25) \ 20) = "z" THEN siiall1 = -1\r
-IF terrainGrid((secondHedgehogX + 30) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = -1\r
-IF terrainGrid((secondHedgehogX + 20) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = 1\r
-IF hedgehogX > 300 THEN siie = -1\r
-IF hedgehogX < 3 THEN siie = 1\r
-IF secondHedgehogX > 300 THEN siie1 = -1\r
-IF secondHedgehogX < 3 THEN siie1 = 1\r
-PUT (secondHedgehogX, secondHedgehogY), siil2, PSET\r
-PUT (hedgehogX, hedgehogY), siil1, PSET\r
+IF terrainGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 25) \ 20) = "z" THEN siiall = -1\r
+IF terrainGrid((FirstCompanionX% + 30) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = -1\r
+IF terrainGrid((FirstCompanionX% + 20) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = 1\r
+IF terrainGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 25) \ 20) = "z" THEN siiall1 = -1\r
+IF terrainGrid((SecondCompanionX% + 30) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = -1\r
+IF terrainGrid((SecondCompanionX% + 20) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = 1\r
+IF FirstCompanionX% > 300 THEN siie = -1\r
+IF FirstCompanionX% < 3 THEN siie = 1\r
+IF SecondCompanionX% > 300 THEN siie1 = -1\r
+IF SecondCompanionX% < 3 THEN siie1 = 1\r
+PUT (SecondCompanionX%, SecondCompanionY%), siil2, PSET\r
+PUT (FirstCompanionX%, FirstCompanionY%), siil1, PSET\r
 IF b > 0 THEN PUT (a, b), mar1, PSET\r
 IF kustuta = 1 THEN kustuta = 0: PUT (((a + 10) \ 20) * 20, (b \ 20) * 20), emptySpaceImage, PSET\r
 IF kustuta1 = 1 THEN kustuta1 = 0: PUT (((a + 10) \ 20) * 20, ((b + 10) \ 20) * 20), emptySpaceImage, PSET\r
 IF kustuta2 = 1 THEN kustuta2 = 0: PUT (((a + 10) \ 20) * 20, ((b + 28) \ 20) * 20), emptySpaceImage, PSET\r
 IF makk = 1 THEN makk = 0: a = a - 20\r
-objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = ""\r
-hedgehogX = hedgehogX + siie\r
-hedgehogY = hedgehogY + siiall\r
-secondHedgehogX = secondHedgehogX + siie1\r
-secondHedgehogY = secondHedgehogY + siiall1\r
-objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "q": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "q"\r
+objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = ""\r
+FirstCompanionX% = FirstCompanionX% + siie\r
+FirstCompanionY% = FirstCompanionY% + siiall\r
+SecondCompanionX% = SecondCompanionX% + siie1\r
+SecondCompanionY% = SecondCompanionY% + siiall1\r
+objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "q": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "q"\r
 siiall = siiall + 1: IF siiall > 2 THEN siiall = 2\r
 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2\r
 a = a + eda\r
@@ -321,10 +321,10 @@ IF b > 0 THEN IF sipp = 10 THEN PUT (a \ 2, b \ 2), sippm10, OR
 IF b > 0 THEN IF sipp = 20 THEN PUT (a \ 2, b \ 2), sippm20, OR\r
 IF b > 0 THEN IF sipp = 3 THEN PUT (a \ 2, b \ 2), sippm3, OR\r
 \r
-GET (hedgehogX \ 2, hedgehogY \ 2)-((hedgehogX + 10) \ 2, (hedgehogY + 10) \ 2), siilm1\r
-PUT (hedgehogX \ 2, hedgehogY \ 2), siilm, OR\r
-GET (secondHedgehogX \ 2, secondHedgehogY \ 2)-((siia1 + 10) \ 2, (secondHedgehogY + 10) \ 2), siilm2\r
-PUT (secondHedgehogX \ 2, secondHedgehogY \ 2), siilm, OR\r
+GET (FirstCompanionX% \ 2, FirstCompanionY% \ 2)-((FirstCompanionX% + 10) \ 2, (FirstCompanionY% + 10) \ 2), siilm1\r
+PUT (FirstCompanionX% \ 2, FirstCompanionY% \ 2), siilm, OR\r
+GET (SecondCompanionX% \ 2, SecondCompanionY% \ 2)-((siia1 + 10) \ 2, (SecondCompanionY% + 10) \ 2), siilm2\r
+PUT (SecondCompanionX% \ 2, SecondCompanionY% \ 2), siilm, OR\r
 SOUND 0, .8\r
 IF terrainGrid((a + 38) \ 20, (b + 37) \ 20) = "z" THEN eda = -1: r = 9: lke = 0\r
 IF terrainGrid((a + 38) \ 20, (b + 22) \ 20) = "z" THEN eda = -1: r = 9: lke = 0\r
@@ -350,29 +350,29 @@ r1 = r1 + 1: IF r1 > 3 THEN r1 = 0: all = all + 1
 lk = lk + 1: cd = cd - 1\r
 IF objectGrid((a + 30) \ 20, (b + 21) \ 20) = "o" THEN terrainGrid((a + 30) \ 20, (b + 21) \ 20) = "": objectGrid((a + 30) \ 20, (b + 21) \ 20) = "": kustuta = 1\r
 IF objectGrid((a + 30) \ 20, (b + 38) \ 20) = "a" THEN terrainGrid((a + 30) \ 20, (b + 38) \ 20) = "": objectGrid((a + 30) \ 20, (b + 38) \ 20) = "": kustuta2 = 1\r
-IF terrainGrid((hedgehogX + 25) \ 20, (hedgehogY + 25) \ 20) = "z" THEN siiall = -1\r
-IF terrainGrid((hedgehogX + 30) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = -1\r
-IF terrainGrid((hedgehogX + 20) \ 20, (hedgehogY + 10) \ 20) = "z" THEN siie = 1\r
-IF terrainGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 25) \ 20) = "z" THEN siiall1 = -1\r
-IF terrainGrid((secondHedgehogX + 30) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = -1\r
-IF terrainGrid((secondHedgehogX + 20) \ 20, (secondHedgehogY + 10) \ 20) = "z" THEN siie1 = 1\r
-IF hedgehogX > 600 THEN siie = -1\r
-IF hedgehogX < 3 THEN siie = 1\r
-IF secondHedgehogX > 600 THEN siie1 = -1\r
-IF secondHedgehogX < 3 THEN siie1 = 1\r
-PUT (secondHedgehogX \ 2, secondHedgehogY \ 2), siilm2, PSET\r
-PUT (hedgehogX \ 2, hedgehogY \ 2), siilm1, PSET\r
+IF terrainGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 25) \ 20) = "z" THEN siiall = -1\r
+IF terrainGrid((FirstCompanionX% + 30) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = -1\r
+IF terrainGrid((FirstCompanionX% + 20) \ 20, (FirstCompanionY% + 10) \ 20) = "z" THEN siie = 1\r
+IF terrainGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 25) \ 20) = "z" THEN siiall1 = -1\r
+IF terrainGrid((SecondCompanionX% + 30) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = -1\r
+IF terrainGrid((SecondCompanionX% + 20) \ 20, (SecondCompanionY% + 10) \ 20) = "z" THEN siie1 = 1\r
+IF FirstCompanionX% > 600 THEN siie = -1\r
+IF FirstCompanionX% < 3 THEN siie = 1\r
+IF SecondCompanionX% > 600 THEN siie1 = -1\r
+IF SecondCompanionX% < 3 THEN siie1 = 1\r
+PUT (SecondCompanionX% \ 2, SecondCompanionY% \ 2), siilm2, PSET\r
+PUT (FirstCompanionX% \ 2, FirstCompanionY% \ 2), siilm1, PSET\r
 IF b > 0 THEN PUT (a \ 2, b \ 2), marm1, PSET\r
 IF kustuta = 1 THEN kustuta = 0: PUT (((a + 10) \ 20) * 10, (b \ 20) * 10), emptySpaceImageS, PSET\r
 IF kustuta1 = 1 THEN kustuta1 = 0: PUT (((a + 10) \ 20) * 10, ((b + 10) \ 20) * 10), emptySpaceImageS, PSET\r
 IF kustuta2 = 1 THEN kustuta2 = 0: PUT (((a + 10) \ 20) * 10, ((b + 28) \ 20) * 10), emptySpaceImageS, PSET\r
 IF makk = 1 THEN makk = 0: a = a - 20\r
-objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = ""\r
-hedgehogX = hedgehogX + siie\r
-hedgehogY = hedgehogY + siiall\r
-secondHedgehogX = secondHedgehogX + siie1\r
-secondHedgehogY = secondHedgehogY + siiall1\r
-objectGrid((secondHedgehogX + 25) \ 20, (secondHedgehogY + 8) \ 20) = "q": objectGrid((hedgehogX + 25) \ 20, (hedgehogY + 8) \ 20) = "q"\r
+objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = ""\r
+FirstCompanionX% = FirstCompanionX% + siie\r
+FirstCompanionY% = FirstCompanionY% + siiall\r
+SecondCompanionX% = SecondCompanionX% + siie1\r
+SecondCompanionY% = SecondCompanionY% + siiall1\r
+objectGrid((SecondCompanionX% + 25) \ 20, (SecondCompanionY% + 8) \ 20) = "q": objectGrid((FirstCompanionX% + 25) \ 20, (FirstCompanionY% + 8) \ 20) = "q"\r
 siiall = siiall + 1: IF siiall > 2 THEN siiall = 2\r
 siiall1 = siiall1 + 1: IF siiall1 > 2 THEN siiall1 = 2\r
 a = a + eda\r
@@ -837,10 +837,10 @@ END SUB
 \r
 SUB LoadLevel (y)\r
 125\r
-hedgehogX = 0\r
-hedgehogY = 0\r
+FirstCompanionX% = 0\r
+FirstCompanionY% = 0\r
 aiia1 = 0\r
-secondHedgehogY = 0\r
+SecondCompanionY% = 0\r
 FOR a1 = 1 TO 32\r
 FOR b1 = 1 TO 20\r
 terrainGrid(a1, b1) = ""\r
@@ -1134,8 +1134,8 @@ IF q$ = "m" THEN PUT (D * 20, e * 20), solidBlockImage, PSET: terrainGrid(D + 1,
 IF q$ = "o" THEN PUT (D * 20, e * 20), kast, PSET: terrainGrid(D + 1, e + 1) = "z": objectGrid(D + 1, e + 1) = "o"\r
 IF q$ = "." THEN PUT (D * 20, e * 20), taht, PSET\r
 IF q$ = "-" THEN PUT (D * 20, e * 20), pilv, PSET\r
-IF q$ = "x" THEN hedgehogX = D * 20: hedgehogY = (e + 1) * 20\r
-IF q$ = "y" THEN secondHedgehogX = D * 20: secondHedgehogY = (e + 1) * 20\r
+IF q$ = "x" THEN FirstCompanionX% = D * 20: FirstCompanionY% = (e + 1) * 20\r
+IF q$ = "y" THEN SecondCompanionX% = D * 20: SecondCompanionY% = (e + 1) * 20\r
 IF q$ = "1" THEN PUT (D * 20, e * 20), munt, PSET: terrainGrid(D + 1, e + 1) = "1"\r
 IF q$ = "p" THEN PUT (D * 20, (e * 20) + 10), poosas, PSET\r
 IF q$ = "h" THEN PUT (D * 20, e * 20), aken, PSET\r
@@ -1157,8 +1157,8 @@ IF q$ = "m" THEN PUT (D * 10, e * 10), solidBlockImageS, PSET: terrainGrid(D + 1
 IF q$ = "o" THEN PUT (D * 10, e * 10), kastm, PSET: terrainGrid(D + 1, e + 1) = "z": objectGrid(D + 1, e + 1) = "o"\r
 IF q$ = "." THEN PUT (D * 10, e * 10), tahtm, PSET\r
 IF q$ = "-" THEN PUT (D * 10, e * 10), pilvm, PSET\r
-IF q$ = "x" THEN hedgehogX = D * 20: hedgehogY = (e + 1) * 20\r
-IF q$ = "y" THEN secondHedgehogX = D * 20: secondHedgehogY = (e + 1) * 20\r
+IF q$ = "x" THEN FirstCompanionX% = D * 20: FirstCompanionY% = (e + 1) * 20\r
+IF q$ = "y" THEN SecondCompanionX% = D * 20: SecondCompanionY% = (e + 1) * 20\r
 IF q$ = "1" THEN PUT (D * 10, e * 10), muntm, PSET: terrainGrid(D + 1, e + 1) = "1"\r
 IF q$ = "p" THEN PUT (D * 10, (e * 10) + 5), poosasm, PSET\r
 IF q$ = "h" THEN PUT (D * 10, e * 10), akenm, PSET\r