summaryrefslogtreecommitdiff
path: root/src/battle_anim_effects_3.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-18 15:25:46 -0400
committerGitHub <noreply@github.com>2021-03-18 15:25:46 -0400
commited16a7409ae9c808a110975dec1930f9f949a6d6 (patch)
tree662be8b474b9c50264fc49262cbaf21769479516 /src/battle_anim_effects_3.c
parent5075067ecd8718ab96a063946662c71fe3ef5369 (diff)
parentc5aa5d37229e5692355e4b3979b6cafbcad7caee (diff)
Merge pull request #403 from PikalaxALT/battle_multi_buffer
Battle documentation (14032021)
Diffstat (limited to 'src/battle_anim_effects_3.c')
-rw-r--r--src/battle_anim_effects_3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index c259755df..4778cb55e 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2216,7 +2216,7 @@ void AnimTask_TransformMon(u8 taskId)
break;
case 2:
HandleSpeciesGfxDataChange(gBattleAnimAttacker, gBattleAnimTarget, gTasks[taskId].data[10]);
- sub_8075300(&animBg, gBattleAnimAttacker);
+ GetBattleAnimBgDataByPriorityRank(&animBg, gBattleAnimAttacker);
if (IsContest())
position = 0;
else
@@ -2287,7 +2287,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
- sub_80752A0(&animBg);
+ GetBattleAnimBg1Data(&animBg);
AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
@@ -2348,8 +2348,8 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
}
break;
case 4:
- sub_80752A0(&animBg);
- sub_8075358(animBg.bgId);
+ GetBattleAnimBg1Data(&animBg);
+ InitBattleAnimBg(animBg.bgId);
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
@@ -2467,7 +2467,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
- sub_80752A0(&animBg);
+ GetBattleAnimBg1Data(&animBg);
AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
@@ -2540,8 +2540,8 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
gTasks[taskId].data[0] = 1;
break;
case 5:
- sub_80752A0(&animBg);
- sub_8075358(animBg.bgId);
+ GetBattleAnimBg1Data(&animBg);
+ InitBattleAnimBg(animBg.bgId);
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);