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_effects_1.c | |
| parent | 200c82e01a94dbe535e6ed8768d8afad4444d4d2 (diff) | |
| parent | 8f74dda3e443d561b21d6b267aa71d14aed05031 (diff) | |
Merge pull request #316 from PikalaxALT/various_documentation
Various documentation
Diffstat (limited to 'src/battle_anim_effects_1.c')
| -rw-r--r-- | src/battle_anim_effects_1.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 33b5ceacc..d1f75ff8f 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -1,10 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" #include "battle_interface.h" -#include "gpu_regs.h" -#include "palette.h" #include "random.h" -#include "sound.h" #include "trig.h" #include "util.h" #include "constants/songs.h" @@ -4321,7 +4319,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite) sprite->data[1] = 0; } - BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE); + BlendPalettes(SelectBattleAnimSpriteAndBgPalettes(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE); if (sprite->data[1] == 16) { int pal; @@ -4981,7 +4979,7 @@ void AnimTask_FadeScreenBlueStep(u8); void AnimTask_FadeScreenBlue(u8 taskId) { - int a = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; + int a = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; int b; int c; int d; @@ -4996,7 +4994,7 @@ void AnimTask_FadeScreenBlue(u8 taskId) gTasks[taskId].data[7] = 13; gTasks[taskId].data[8] = 14; gTasks[taskId].data[9] = 15; - b = sub_8075CB8(1, 1, 1, 1); + b = SelectBattlerSpritePalettes(1, 1, 1, 1); c = a | b; StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); |