Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant

Added constant for NUM_SNOWFLAKE_SPRITES
pret · Jul 27, 2024 · 30f8ccf · 30f8ccf
2 parents 7316e54 + 91b48a1
commit 30f8ccf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/constants/field_weather.h b/include/constants/field_weather.h
@@ -8,6 +8,7 @@
 #define NUM_FOG_DIAGONAL_SPRITES     20
 #define NUM_SANDSTORM_SPRITES        20
 #define NUM_SWIRL_SANDSTORM_SPRITES  5
+#define NUM_SNOWFLAKE_SPRITES        16
 
 // Controls how the weather should be changing the screen palettes.
 #define WEATHER_PAL_STATE_CHANGING_WEATHER   0

diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
@@ -770,7 +770,7 @@ void Snow_InitVars(void)
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->targetColorMapIndex = 3;
     gWeatherPtr->colorMapStepDelay = 20;
-    gWeatherPtr->targetSnowflakeSpriteCount = 16;
+    gWeatherPtr->targetSnowflakeSpriteCount = NUM_SNOWFLAKE_SPRITES;
     gWeatherPtr->snowflakeVisibleCounter = 0;
 }