From 99ec579debc63991f16e08ef906111ad556edad5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 16:29:33 -0400 Subject: Name symbols in battle_anim_special.c --- src/battle_anim_effects_2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_anim_effects_2.c') diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index ac4e9db30..9d9bc8b2e 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -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,7 +3282,7 @@ static void HeartsBackground_Step(u8 taskId) } break; case 3: - sub_80752A0(&animBg); + GetBattleAnimBg1Data(&animBg); sub_8075358(animBg.bgId); gTasks[taskId].data[12]++; break; @@ -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,7 +3370,7 @@ static void ScaryFace_Step(u8 taskId) } break; case 3: - sub_80752A0(&animBg); + GetBattleAnimBg1Data(&animBg); sub_8075358(1); sub_8075358(2); gTasks[taskId].data[12]++; -- cgit v1.2.3 From 10f0222d280c2b30c34bd326428f1a0e50c6c570 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 08:24:53 -0400 Subject: Battle controller opponent sync labels from emerald --- src/battle_anim_effects_2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_anim_effects_2.c') diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 9d9bc8b2e..3dacfe9ba 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -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); } -- cgit v1.2.3 From d86c9b097628577e91a6ab5b0609fa61790945a2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 08:49:31 -0400 Subject: Document battle_anim_mons, 1 --- src/battle_anim_effects_2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_anim_effects_2.c') diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 3dacfe9ba..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); } @@ -3283,7 +3283,7 @@ static void HeartsBackground_Step(u8 taskId) break; case 3: GetBattleAnimBg1Data(&animBg); - sub_8075358(animBg.bgId); + InitBattleAnimBg(animBg.bgId); gTasks[taskId].data[12]++; break; case 4: @@ -3371,8 +3371,8 @@ static void ScaryFace_Step(u8 taskId) break; case 3: GetBattleAnimBg1Data(&animBg); - sub_8075358(1); - sub_8075358(2); + InitBattleAnimBg(1); + InitBattleAnimBg(2); gTasks[taskId].data[12]++; // fall through case 4: -- cgit v1.2.3