diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:17 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:33 -0500 |
commit | b93101bbebaae9be44b9b4ada81766264135cca9 (patch) | |
tree | 73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /src/ice.c | |
parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) |
Merge master into ObjEvent rename
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); |