summaryrefslogtreecommitdiff
path: root/src/fldeff_dig.c
diff options
context:
space:
mode:
authorhondew <pokehondew@gmail.com>2020-08-30 14:14:38 -0400
committerhondew <pokehondew@gmail.com>2020-08-30 14:14:38 -0400
commite46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch)
tree76855f3dedad94ba34a8f8b40811a1005107b5ae /src/fldeff_dig.c
parent328aecc96e690c437e52663a1445417e8aa78df6 (diff)
parenta9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff)
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'src/fldeff_dig.c')
-rw-r--r--src/fldeff_dig.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c
index ee5caa0df..c3ab989cd 100644
--- a/src/fldeff_dig.c
+++ b/src/fldeff_dig.c
@@ -10,8 +10,8 @@
#include "constants/field_effects.h"
// static functions
-static void hm2_dig(void);
-static void sub_8135780(void);
+static void FieldCallback_Dig(void);
+static void StartDigFieldEffect(void);
// text
bool8 SetUpFieldMove_Dig(void)
@@ -19,7 +19,7 @@ bool8 SetUpFieldMove_Dig(void)
if (CanUseDigOrEscapeRopeOnCurMap() == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
- gPostMenuFieldCallback = hm2_dig;
+ gPostMenuFieldCallback = FieldCallback_Dig;
return TRUE;
}
else
@@ -28,7 +28,7 @@ bool8 SetUpFieldMove_Dig(void)
}
}
-static void hm2_dig(void)
+static void FieldCallback_Dig(void)
{
Overworld_ResetStateAfterDigEscRope();
FieldEffectStart(FLDEFF_USE_DIG);
@@ -37,16 +37,16 @@ static void hm2_dig(void)
bool8 FldEff_UseDig(void)
{
- u8 taskId = oei_task_add();
+ u8 taskId = CreateFieldMoveTask();
- gTasks[taskId].data[8] = (u32)sub_8135780 >> 16;
- gTasks[taskId].data[9] = (u32)sub_8135780;
+ gTasks[taskId].data[8] = (u32)StartDigFieldEffect >> 16;
+ gTasks[taskId].data[9] = (u32)StartDigFieldEffect;
if (!ShouldDoBrailleDigEffect())
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
return FALSE;
}
-static void sub_8135780(void)
+static void StartDigFieldEffect(void)
{
u8 taskId;