diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /src/ice.c | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'src/ice.c')
| -rw-r--r-- | src/ice.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -998,7 +998,7 @@ void AnimTask_Haze1(u8 taskId) SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); sub_80A6B30(&animBg); - LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0); LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32); @@ -1105,7 +1105,7 @@ void AnimTask_LoadMistTiles(u8 taskId) SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); sub_80A6B30(&animBg); - LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0); LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32); |