diff options
| author | Evan <eroelke@gmail.com> | 2019-12-02 20:58:12 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 14:54:52 -0700 |
| commit | f1bd7a41cc1e2bcd730a0c2c6c5c4c618044f631 (patch) | |
| tree | d1292eeef6904b3a5f032bc5494fbc65f68915d6 /src/battle_anim_effects_2.c | |
| parent | 5c40e5ea212c947b1853a8c8dc23dcb8d882bf90 (diff) | |
resolve compiler errors
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rw-r--r-- | src/battle_anim_effects_2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 32ed2fba9..cea915921 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -13,7 +13,6 @@ #include "sound.h" #include "trig.h" #include "util.h" -#include "constants/rgb.h" #include "constants/songs.h" void sub_80A6E48(struct Sprite *); @@ -344,7 +343,7 @@ const struct SpriteTemplate gWaterPulseRingSpriteTemplate = //gUnknown_83E3CE8 .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gWaterPulseRingAffineAnimTable, - .callback = AnimWaterPulseRing, + .callback = sub_80AC6D8, }; const struct SpriteTemplate gEggThrowSpriteTemplate = //gUnknown_83E3D00 @@ -3096,7 +3095,7 @@ static void FakeOutStep2(u8 taskId) { gTasks[taskId].data[11] = 0x88; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_LIGHTEN); - BlendPalettes(sub_80A75AC(1, 0, 0, 0, 0, 0, 0), 16, RGB(31, 31, 31)); + BlendPalettes(sub_8075BE8(1, 0, 0, 0, 0, 0, 0), 16, RGB(31, 31, 31)); } else if (gTasks[taskId].data[10] > 4) { |