From b31317889d2b75fc486eb801596e0fb31364387b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 30 Mar 2020 08:52:49 -0400 Subject: Partial doc of battle anim utility funcs --- src/battle_anim_effects_1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_anim_effects_1.c') diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 33b5ceacc..2e740df33 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -4321,7 +4321,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 +4981,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 +4996,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)); -- cgit v1.2.3 From 898bd244386da9be97b128128384117080792440 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 Apr 2020 20:40:15 -0400 Subject: gflib propagation, 1 --- src/battle_anim_effects_1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/battle_anim_effects_1.c') diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 2e740df33..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" -- cgit v1.2.3