fix merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/rom6.c b/src/rom6.c
index 3a5071034..32b5f52a5 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -59,7 +59,7 @@ static void task08_080C9820(u8 taskId)
     u8 mapObjId;
 
     ScriptContext2_Enable();
-    gPlayerAvatar.unk6 = 1;
+    gPlayerAvatar.preventStep = TRUE;
     mapObjId = gPlayerAvatar.mapObjectId;
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId])
      || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
@@ -112,7 +112,7 @@ static void sub_810B4CC(u8 taskId)
     void (*func)(void) = (void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]);
 
     func();
-    gPlayerAvatar.unk6 = 0;
+    gPlayerAvatar.preventStep = FALSE;
     DestroyTask(taskId);
 }
 
@@ -169,7 +169,7 @@ int SetUpFieldMove_Dig(void)
 
 static void sub_810B5D8(void)
 {
-    sub_8053014();
+    Overworld_ResetStateAfterDigEscRope();
     FieldEffectStart(FLDEFF_USE_DIG);
     gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }