summaryrefslogtreecommitdiff
path: root/src/fldeff_flash.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-16 05:59:10 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-16 05:59:10 -0400
commit65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch)
tree250c345d17b8d8f910d327d98f577afddfb3a64a /src/fldeff_flash.c
parent2749948eebe65aa8b55738d820e4a0252dd45c1a (diff)
parent25f45ffa8441b0f0a999355c9755782ccb4809dc (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'src/fldeff_flash.c')
-rw-r--r--src/fldeff_flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 3cb91d4b1..2d25928b8 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -96,7 +96,7 @@ bool8 SetUpFieldMove_Flash(void)
static void FieldCallback_Flash(void)
{
- u8 taskId = oei_task_add();
+ u8 taskId = CreateFieldMoveTask();
gFieldEffectArguments[0] = GetCursorSelectionMonId();
gTasks[taskId].data[8] = (uintptr_t)FldEff_UseFlash >> 16;
gTasks[taskId].data[9] = (uintptr_t)FldEff_UseFlash;
@@ -106,7 +106,7 @@ static void FldEff_UseFlash(void)
{
PlaySE(SE_W115);
FlagSet(FLAG_SYS_USE_FLASH);
- ScriptContext1_SetupScript(EventScript_FldEffFlash);
+ ScriptContext1_SetupScript(EventScript_UseFlash);
}
static void CB2_ChangeMapMain(void)