summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-23 18:24:30 -0500
committerGitHub <noreply@github.com>2018-05-23 18:24:30 -0500
commitde2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch)
treed8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/battle/anim
parent294d223dd0218c64267b6b6851575150e36593fb (diff)
parent22e6e3532900b2470d0134f1347981d77828b22c (diff)
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/battle/anim')
-rw-r--r--src/battle/anim/evasion.c2
-rw-r--r--src/battle/anim/flash.c2
-rw-r--r--src/battle/anim/scan.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index e7387a52a..c60618a49 100644
--- a/src/battle/anim/evasion.c
+++ b/src/battle/anim/evasion.c
@@ -32,7 +32,7 @@ void sub_80CE7E0(u8 taskId)
gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i];
}
- BlendPalette(r3, 16, 11, 0);
+ BlendPalette(r3, 16, 11, RGB(0, 0, 0));
task->data[3] = 0;
i = 0;
while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0)
diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c
index eaa38e5b7..2799046c8 100644
--- a/src/battle/anim/flash.c
+++ b/src/battle/anim/flash.c
@@ -39,7 +39,7 @@ void sub_80CE3EC(u8 taskId)
sub_8079BF4(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c);
b = b | (0x10000 << IndexOfSpritePaletteTag(0x27D2));
d = IndexOfSpritePaletteTag(0x27D3);
- BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 0x10, 32699);
+ BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31));
gTasks[taskId].func = sub_80CE4D4;
sub_80CE4D4(taskId);
}
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 05859d31c..9f427a9c4 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -159,7 +159,7 @@ static void sub_80CD5A8(struct Sprite* sprite)
sprite->data[1] = 0;
}
- BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], 0x7FFF);
+ BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31));
if (sprite->data[1] == 16)
{
int pal;