diff options
| author | Wiz <94323898+GBAWiz420@users.noreply.github.com> | 2021-11-14 16:51:56 -0500 |
|---|---|---|
| committer | Wiz <94323898+GBAWiz420@users.noreply.github.com> | 2021-11-14 17:08:03 -0500 |
| commit | 927f9d27dfcbf8ff169475e3d32e8e27a8591d1e (patch) | |
| tree | d0b72fb6e1e1dfdce024894706833e560ab72214 | |
| parent | 70577e844ddcb8092ab9e55dd0dd7993f68f4122 (diff) | |
Designate gBattleAnimBgImage_Attract and related as arrays
| -rw-r--r-- | include/graphics.h | 6 | ||||
| -rwxr-xr-x | src/battle_anim_effects_2.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/graphics.h b/include/graphics.h index eeb8f65a3..e2fe5cf77 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4637,9 +4637,9 @@ extern const u32 gBattleAnimSpritePal_RedHeart[]; extern const u32 gBattleAnimSpritePal_RedOrb[]; extern const u32 gBattleAnimSpritePal_EyeSparkle[]; extern const u32 gBattleAnimSpritePal_PinkHeart[]; -extern const u32 gBattleAnimBgImage_Attract; -extern const u32 gBattleAnimBgPalette_Attract; -extern const u32 gBattleAnimBgTilemap_Attract; +extern const u32 gBattleAnimBgImage_Attract[]; +extern const u32 gBattleAnimBgPalette_Attract[]; +extern const u32 gBattleAnimBgTilemap_Attract[]; extern const u32 gBattleAnimSpritePal_Angel[]; extern const u32 gBattleAnimSpritePal_Devil[]; extern const u32 gBattleAnimSpritePal_Swipe[]; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index c2a89ed4b..36e959ca0 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -3259,9 +3259,9 @@ void AnimTask_HeartsBackground(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); GetBattleAnimBg1Data(&animBg); - AnimLoadCompressedBgGfx(animBg.bgId, &gBattleAnimBgImage_Attract, animBg.tilesOffset); - AnimLoadCompressedBgTilemapHandleContest(&animBg, &gBattleAnimBgTilemap_Attract, FALSE); - LoadCompressedPalette(&gBattleAnimBgPalette_Attract, animBg.paletteId * 16, 32); + AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Attract, animBg.tilesOffset); + AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Attract, FALSE); + LoadCompressedPalette(gBattleAnimBgPalette_Attract, animBg.paletteId * 16, 32); gTasks[taskId].func = AnimTask_HeartsBackground_Step; } |