diff options
| author | Evan <eroelke@gmail.com> | 2019-12-02 20:58:12 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-02 20:58:12 -0700 |
| commit | f2eb137154f1afe98ed86f883662a01ba318efa6 (patch) | |
| tree | d1292eeef6904b3a5f032bc5494fbc65f68915d6 /src/battle_anim_effects_1.c | |
| parent | 1f51c4ce846e54b8d4f491084954a010a217182c (diff) | |
resolve compiler errors
Diffstat (limited to 'src/battle_anim_effects_1.c')
| -rw-r--r-- | src/battle_anim_effects_1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 9d820b628..ff0927f88 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -13,7 +13,6 @@ #include "sound.h" #include "trig.h" #include "util.h" -#include "constants/rgb.h" #include "constants/songs.h" // RAM @@ -4373,7 +4372,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite) sprite->data[1] = 0; } - BlendPalettes(sub_80A75AC(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31)); + BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31)); if (sprite->data[1] == 16) { int pal; @@ -5029,7 +5028,7 @@ void AnimTask_FadeScreenBlueStep(u8); void AnimTask_FadeScreenBlue(u8 taskId) { - int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; + int a = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; int b; int c; int d; @@ -5044,7 +5043,7 @@ void AnimTask_FadeScreenBlue(u8 taskId) gTasks[taskId].data[7] = 13; gTasks[taskId].data[8] = 14; gTasks[taskId].data[9] = 15; - b = sub_80A76C4(1, 1, 1, 1); + b = sub_8075CB8(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)); |