diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/ice.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/ice.c')
| -rw-r--r-- | src/ice.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -941,7 +941,7 @@ void AnimTask_Haze1(u8 taskId) gBattle_BG1_Y = 0; SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80752A0(&animBg); + GetBattleAnimBg1Data(&animBg); LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap); LoadPalette(&gUnknown_83C2CE0, animBg.paletteId * 16, 32); @@ -992,9 +992,9 @@ static void AnimTask_Haze2(u8 taskId) } break; case 3: - sub_80752A0(&animBg); - sub_8075358(1); - sub_8075358(2); + GetBattleAnimBg1Data(&animBg); + InitBattleAnimBg(1); + InitBattleAnimBg(2); ++gTasks[taskId].data[12]; // fall through case 4: @@ -1039,7 +1039,7 @@ void AnimTask_LoadMistTiles(u8 taskId) gBattle_BG1_Y = 0; SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80752A0(&animBg); + GetBattleAnimBg1Data(&animBg); LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimFogTilemap); LoadPalette(&gUnknown_83C2CE0, animBg.paletteId * 16, 32); @@ -1087,9 +1087,9 @@ static void AnimTask_OverlayFogTiles(u8 taskId) } break; case 3: - sub_80752A0(&animBg); - sub_8075358(1); - sub_8075358(2); + GetBattleAnimBg1Data(&animBg); + InitBattleAnimBg(1); + InitBattleAnimBg(2); ++gTasks[taskId].data[12]; // fall through case 4: @@ -1230,7 +1230,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite) sprite->data[2] = -0x10; ++sprite->data[7]; sprite->pos2.x = sprite->pos2.y = 0; - sub_8075678(sprite); + BattleAnim_InitLinearTranslationWithDuration(sprite); } break; case 2: |