summaryrefslogtreecommitdiff
path: root/src/menu2.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-04-11 19:21:51 -0400
committerGitHub <noreply@github.com>2019-04-11 19:21:51 -0400
commit24bb85896d9e670c0fa419dc7cb6c96b5d0806c7 (patch)
treeeba61257e555461f5d9662fea9477561bef51adf /src/menu2.c
parent532907559304e1b32f8efa76e2fb8a2fc526ec02 (diff)
parentc85f726224bbe53502ba98557d2c89eef89d7fbd (diff)
Merge pull request #47 from PikalaxALT/roamer
Roamer
Diffstat (limited to 'src/menu2.c')
-rw-r--r--src/menu2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu2.c b/src/menu2.c
index e83b1bff2..ec244b8f7 100644
--- a/src/menu2.c
+++ b/src/menu2.c
@@ -768,7 +768,7 @@ void sub_819A080(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u
#define tEvWhich data[6]
#define tEvStepCount data[8]
-void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority)
+void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority)
{
u8 taskId = CreateTask(Task_SmoothBlendLayers, priority);
gTasks[taskId].tEvA = eva_start << 8;
@@ -781,7 +781,7 @@ void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end
SetGpuReg(REG_OFFSET_BLDALPHA, (evb_start << 8) | eva_start);
}
-bool8 OakSpeech_IsBlendTaskActive(void)
+bool8 IsBlendTaskActive(void)
{
return FuncIsActiveTask(Task_SmoothBlendLayers);
}