* System.c: Root counters are finally working, YAY!

* Sfx.c: SfxStopMusic() was relying on global timer to be increased under ISR, but this is not true anymore!
* Other minor changes on EndAnimation.c.

1 files changed, 9 insertions, 12 deletions

diff --git a/Source/EndAnimation.c b/Source/EndAnimation.c
index 75edc85..21d23e3 100644
--- a/Source/EndAnimation.c
+++ b/Source/EndAnimation.c
@@ -48,8 +48,6 @@ static GsSprite EndAnimationDisplay;
 
 void EndAnimation(void)
 {
-	uint8_t randIndex = 0;
-
 	GfxSaveDisplayData(&EndAnimationDisplay);
 
 	GfxSetGlobalLuminance(NORMAL_LUMINANCE);
@@ -61,7 +59,7 @@ void EndAnimation(void)
 	}
 	else
 	{
-		randIndex = rand() % (END_ANIMATION_MAX_RAND_VALUE + 1);
+		uint8_t randIndex = SystemRand(END_ANIMATION_SQUARES, END_ANIMATION_MAX_RAND_VALUE);
 
 		switch(randIndex)
 		{
@@ -81,14 +79,12 @@ void EndAnimation(void)
 			break;
 		}
 
-		SfxStopMusic();
+		//~ SfxStopMusic();
 	}
 }
 
 void EndAnimationFadeOut(void)
 {
-	uint8_t i;
-
 	while (1)
 	{
 		if ( GfxGetGlobalLuminance() > 0)
@@ -100,6 +96,8 @@ void EndAnimationFadeOut(void)
 		}
 		else
 		{
+			uint8_t i;
+
 			GsSortCls(0,0,0);
 
 			for (i = 0 ; i < 2 ; i++)
@@ -149,7 +147,10 @@ void EndAnimationLine(void)
 
 void EndAnimationSquares(void)
 {
-	uint16_t i, j, k;
+	uint16_t i;
+	uint16_t j;
+	uint16_t k;
+
 	uint16_t randInd = 0;
 	bool sqPos[END_ANIMATION_SQUARES_TOTAL];
 	uint16_t sqCounter = END_ANIMATION_SQUARES_TOTAL;
@@ -171,9 +172,6 @@ void EndAnimationSquares(void)
 		{
 			randInd = SystemRand(0,maxIndex);
 
-			/*Serial_printf("randInd = %d\t",randInd);
-			Serial_printf("sqPos[randInd] = %d\n", sqPos[randInd]);*/
-
 			if (sqPos[randInd] == false)
 			{
 				sqPos[randInd] = true;
@@ -195,7 +193,6 @@ void EndAnimationSquares(void)
 					break;
 				}
 			}
-
 		}while (1);
 
 		GfxSortSprite(&EndAnimationDisplay);
@@ -223,7 +220,7 @@ void EndAnimationSquares(void)
 			for (k = 0 ; k < 2 ; k++)
 			{
 				// Draw two frames to ensure black display
-				GsSortCls(0,0,0);
+				GsSortCls(0, 0, 0);
 				GfxDrawScene_Slow();
 			}
 		}