Merge branch 'followers' into followers-expanded-id

data/scripts/field_move_scripts.inc

@@ -376,6 +376,24 @@ EventScript_EndSurface::
 	releaseall
 	end
 
+EventScript_DigCommon:
+	callfunc ScrFunc_IsFollowerFieldMoveUser
+	.2byte VAR_0x8004
+	setfieldeffectargument 3, VAR_0x8004 @ skip pose if true
+	dofieldeffect FLDEFF_USE_DIG
+	waitstate
+EventScript_DigSealedChamber:: @ fallthrough
+	setflag FLAG_SAFE_FOLLOWER_MOVEMENT
+	call_if_eq VAR_0x8004, TRUE, EventScript_FollowerFieldMove
+	callnative DoBrailleDigEffect
+	releaseall
+	end
+
+@ Use Dig from party menu
+EventScript_UseDig::
+	lockall
+	goto EventScript_DigCommon
+
 Text_CantDive:
 	.string "The sea is deep here. A POKéMON\n"
 	.string "may be able to go underwater.$"

include/event_scripts.h

@@ -404,6 +404,7 @@ extern const u8 EventScript_FailSweetScent[];
 extern const u8 EventScript_UseFlash[];
 extern const u8 EventScript_UseCut[];
 extern const u8 EventScript_UseRockSmash[];
+extern const u8 EventScript_UseDig[];
 
 //player pc
 extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC[];

remote_build.sh

@@ -25,7 +25,8 @@ git push build --force-with-lease
 if [[ $retVal -eq 0 ]]; then
     commit_msg=$(git log -1 --pretty=%B)
     if [[ "$commit_msg" == "$temp_commit_msg" ]]; then
-        git reset "$old_head" &>/dev/null
+        # Keep i(N)tent to add
+        git reset --mixed -N "$old_head" &>/dev/null
     fi
 fi
 set -x

src/braille_puzzles.c

@@ -87,7 +87,6 @@ void DoBrailleDigEffect(void)
     DrawWholeMapView();
     PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_BRAILLE_DIG);
-    UnlockPlayerFieldControls();
 }
 
 bool8 CheckRelicanthWailord(void)

src/fldeff_dig.c

@@ -1,11 +1,13 @@
 #include "global.h"
 #include "braille_puzzles.h"
+#include "event_scripts.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "fldeff.h"
 #include "item_use.h"
 #include "overworld.h"
 #include "party_menu.h"
+#include "script.h"
 #include "sprite.h"
 #include "constants/field_effects.h"
 
@@ -31,8 +33,8 @@ bool8 SetUpFieldMove_Dig(void)
 static void FieldCallback_Dig(void)
 {
     Overworld_ResetStateAfterDigEscRope();
-    FieldEffectStart(FLDEFF_USE_DIG);
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
+    ScriptContext_SetupScript(EventScript_UseDig);
 }
 
 bool8 FldEff_UseDig(void)
@@ -53,7 +55,8 @@ static void StartDigFieldEffect(void)
     FieldEffectActiveListRemove(FLDEFF_USE_DIG);
     if (ShouldDoBrailleDigEffect())
     {
-        DoBrailleDigEffect();
+        // EventScript_DigSealedChamber handles DoBrailleDigEffect call
+        ScriptContext_Enable();
     }
     else
     {