multiple fixes

1 files changed, 4 insertions, 5 deletions

diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c
index b38cac7e0..3a28c1adc 100644
--- a/src/fldeff_dig.c
+++ b/src/fldeff_dig.c
@@ -8,7 +8,7 @@
 #include "sprite.h"
 #include "constants/map_objects.h"
 
-static void hm2_dig(void);
+static void FieldCallback_Dig(void);
 static void sub_80C9AFC(void);
 
 bool8 SetUpFieldMove_Dig(void)
@@ -16,13 +16,13 @@ bool8 SetUpFieldMove_Dig(void)
     if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = hm2_dig;
+        gPostMenuFieldCallback = FieldCallback_Dig;
         return TRUE;
     }
     return FALSE;
 }
 
-static void hm2_dig(void)
+static void FieldCallback_Dig(void)
 {
     Overworld_ResetStateAfterDigEscRope();
     FieldEffectStart(FLDEFF_USE_DIG);
@@ -33,8 +33,7 @@ bool8 FldEff_UseDig(void)
 {
     u8 taskId = oei_task_add();
 
-    gTasks[taskId].data[8] = (u32)sub_80C9AFC >> 16;
-    gTasks[taskId].data[9] = (u32)sub_80C9AFC;
+    FLDEFF_SET_FUNC_TO_DATA(sub_80C9AFC);
     SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
     return FALSE;
 }