diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-03 19:25:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 19:25:01 -0400 |
| commit | c47eca8a182a2a202cd65e2af93e9ef322d8674c (patch) | |
| tree | 30cc360cbf4b2f3250864aa28cc88a728074e3db /src/battle_anim_special.c | |
| parent | 200c82e01a94dbe535e6ed8768d8afad4444d4d2 (diff) | |
| parent | 8f74dda3e443d561b21d6b267aa71d14aed05031 (diff) | |
Merge pull request #316 from PikalaxALT/various_documentation
Various documentation
Diffstat (limited to 'src/battle_anim_special.c')
| -rw-r--r-- | src/battle_anim_special.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 7590c0e58..621ee9039 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -1,19 +1,14 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_main.h" #include "battle_controllers.h" #include "battle_interface.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" #include "graphics.h" #include "m4a.h" -#include "main.h" -#include "palette.h" #include "pokeball.h" -#include "sound.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" @@ -666,7 +661,7 @@ void sub_80EF344(u8 taskId) priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; gTasks[taskId].data[10] = LaunchBallStarsTask(x, y + 32, priority, subpriority, ballId); - selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); gTasks[taskId].data[0]++; break; |