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/battle_anim_effects_2.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rw-r--r-- | src/battle_anim_effects_2.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index ac4e9db30..dcffedb0e 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1738,7 +1738,7 @@ void AnimCoinThrow(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = r6; sprite->data[4] = r7; - sprite->callback = sub_80756A4; + sprite->callback = BattleAnim_InitAndRunLinearTranslationWithDuration; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -2992,12 +2992,12 @@ void AnimTask_LoadMusicNotesPals(u8 taskId) for (i = 1; i < 3; i++) paletteNums[i] = AllocSpritePalette(ANIM_SPRITES_START - i); - gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000); - LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->field_17C); + gMonSpritesGfxPtr->multiUseBuffer = AllocZeroed(0x2000); + LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->multiUseBuffer); for (i = 0; i < 3; i++) - LoadPalette(&gMonSpritesGfxPtr->field_17C[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32); + LoadPalette(&gMonSpritesGfxPtr->multiUseBuffer[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32); - FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_17C); + FREE_AND_SET_NULL(gMonSpritesGfxPtr->multiUseBuffer); DestroyAnimVisualTask(taskId); } @@ -3232,7 +3232,7 @@ void AnimTask_HeartsBackground(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); AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBg_AttractTilemap); AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBg_AttractGfx, animBg.tilesOffset); LoadCompressedPalette(gBattleAnimBg_AttractPal, animBg.paletteId * 16, 32); @@ -3282,8 +3282,8 @@ static void HeartsBackground_Step(u8 taskId) } break; case 3: - sub_80752A0(&animBg); - sub_8075358(animBg.bgId); + GetBattleAnimBg1Data(&animBg); + InitBattleAnimBg(animBg.bgId); gTasks[taskId].data[12]++; break; case 4: @@ -3313,7 +3313,7 @@ void AnimTask_ScaryFace(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); if (IsContest()) LZDecompressVram(gBattleAnimBgTilemap_ScaryFaceContest, animBg.bgTilemap); @@ -3370,9 +3370,9 @@ static void ScaryFace_Step(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: |