diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-17 08:53:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 08:53:24 -0400 |
| commit | d52f2aa5712d042f344409d8925ed80d7109706e (patch) | |
| tree | bd32fd38e0409fa6f899b6fbc02433bbccb3a237 /src/ice.c | |
| parent | f8915246a77a4453135ac3a4e6a61c098d557451 (diff) | |
| parent | 8a64f8b431b0d68453f8d4302474926adf407bb1 (diff) | |
Merge pull request #305 from PikalaxALT/field_weather
Field weather
Diffstat (limited to 'src/ice.c')
| -rw-r--r-- | src/ice.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -944,7 +944,7 @@ void AnimTask_Haze1(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); sub_80752A0(&animBg); - LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap); LoadPalette(&gUnknown_83C2CE0, animBg.paletteId * 16, 32); if (IsContest()) @@ -1042,7 +1042,7 @@ void AnimTask_LoadMistTiles(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); sub_80752A0(&animBg); - LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap); LoadPalette(&gUnknown_83C2CE0, animBg.paletteId * 16, 32); if (IsContest()) |