diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-16 01:30:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 01:30:03 -0400 |
| commit | c1da6b29bc853df1a42f08adb9b141de747dae55 (patch) | |
| tree | 4a29484dd11d60bb13edc449adaa2e409f444af4 /src/field_weather_effect.c | |
| parent | 70d0b81fe08e4b3baa5c3c7f8e81909c74477eb7 (diff) | |
| parent | f94540c2b875cff0085149b95728d2f0a0c610eb (diff) | |
Merge pull request #1405 from GriffinRichards/constants-display
Add more usage of DISPLAY constants, misc REG constants
Diffstat (limited to 'src/field_weather_effect.c')
| -rw-r--r-- | src/field_weather_effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 63043885d..0d1e6958c 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -306,7 +306,7 @@ static void UpdateDroughtBlend(u8 taskId) task->tBlendY = 0; task->tBlendDelay = 0; task->tWinRange = REG_WININ; - SetGpuReg(REG_OFFSET_WININ, WIN_RANGE(63, 63)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL | WININ_WIN1_ALL); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_EFFECT_LIGHTEN); SetGpuReg(REG_OFFSET_BLDY, 0); task->tState++; @@ -1537,8 +1537,8 @@ void Ash_InitAll(void) void Ash_Main(void) { gWeatherPtr->ashBaseSpritesX = gSpriteCoordOffsetX & 0x1FF; - while (gWeatherPtr->ashBaseSpritesX >= 240) - gWeatherPtr->ashBaseSpritesX -= 240; + while (gWeatherPtr->ashBaseSpritesX >= DISPLAY_WIDTH) + gWeatherPtr->ashBaseSpritesX -= DISPLAY_WIDTH; switch (gWeatherPtr->initStep) { |