diff --git a/Assets/dll/dsda.wbx.zst b/Assets/dll/dsda.wbx.zst
index 1e461d073c..5cd6d2bc31 100644
Binary files a/Assets/dll/dsda.wbx.zst and b/Assets/dll/dsda.wbx.zst differ
diff --git a/waterbox/dsda/BizhawkInterface.c b/waterbox/dsda/BizhawkInterface.c
index 8982c88698..63ffc19844 100644
--- a/waterbox/dsda/BizhawkInterface.c
+++ b/waterbox/dsda/BizhawkInterface.c
@@ -2,6 +2,40 @@
 
 bool foundIWAD = false;
 bool wipeDone = true;
+int last_automap_input[4] = { 0 };
+
+void send_input(struct PackedPlayerInput *inputs, int playerId)
+{
+  local_cmds[playerId].forwardmove = inputs->RunSpeed;
+  local_cmds[playerId].sidemove    = inputs->StrafingSpeed;
+  local_cmds[playerId].angleturn   = (shorttics || !longtics) ? inputs->TurningSpeed << 8 : inputs->TurningSpeed;
+
+  if (inputs->Fire == 1)   local_cmds[playerId].buttons |= 0b00000001;
+  if (inputs->Action == 1) local_cmds[playerId].buttons |= 0b00000010;
+
+  if (inputs->WeaponSelect != 0)
+  {
+    local_cmds[playerId].buttons |= BT_CHANGE;
+    local_cmds[playerId].buttons |= (inputs->WeaponSelect - 1)<<BT_WEAPONSHIFT;
+  }
+
+  local_cmds[playerId].lookfly = inputs->FlyLook;
+  local_cmds[playerId].arti    = inputs->ArtifactUse;
+  
+  if (inputs->EndPlayer == 1) local_cmds[playerId].arti |= 0b01000000;
+  if (inputs->Jump      == 1) local_cmds[playerId].arti |= 0b10000000;
+
+  if (inputs->Automap && !last_automap_input[playerId])
+  {
+    if (automap_input)
+      AM_Stop(true);
+    else
+      AM_Start(true);
+  }
+  last_automap_input[playerId] = inputs->Automap;
+
+  // printf("ForwardSpeed: %d - sideMove:     %d - angleTurn:    %d - buttons: %u\n", forwardSpeed, strafingSpeed, turningSpeed, local_cmds[playerId].buttons);
+}
 
 ECL_EXPORT void dsda_get_audio(int *n, void **buffer)
 {
@@ -43,73 +77,11 @@ ECL_EXPORT bool dsda_frame_advance(struct PackedPlayerInput *player1Inputs, stru
   // Setting inputs
   headlessClearTickCommand();
 
-  // Setting Player 1 inputs
-  headlessSetTickCommand
-  (
-    0,
-    player1Inputs->RunSpeed,
-    player1Inputs->StrafingSpeed,
-    player1Inputs->TurningSpeed,
-    player1Inputs->Fire,
-    player1Inputs->Action,
-    player1Inputs->WeaponSelect,
-    player1Inputs->Automap,
-    player1Inputs->FlyLook,
-    player1Inputs->ArtifactUse,
-    player1Inputs->Jump,
-    player1Inputs->EndPlayer
-  );
-
-  // Setting Player 2 inputs
-  headlessSetTickCommand
-  (
-    1,
-    player2Inputs->RunSpeed,
-    player2Inputs->StrafingSpeed,
-    player2Inputs->TurningSpeed,
-    player2Inputs->Fire,
-    player2Inputs->Action,
-    player2Inputs->WeaponSelect,
-    player2Inputs->Automap,
-    player2Inputs->FlyLook,
-    player2Inputs->ArtifactUse,
-    player2Inputs->Jump,
-    player2Inputs->EndPlayer
-  );
-
-  // Setting Player 3 inputs
-  headlessSetTickCommand
-  (
-    2,
-    player3Inputs->RunSpeed,
-    player3Inputs->StrafingSpeed,
-    player3Inputs->TurningSpeed,
-    player3Inputs->Fire,
-    player3Inputs->Action,
-    player3Inputs->WeaponSelect,
-    player3Inputs->Automap,
-    player3Inputs->FlyLook,
-    player3Inputs->ArtifactUse,
-    player3Inputs->Jump,
-    player3Inputs->EndPlayer
-  );
-
-  // Setting Player 4 inputs
-  headlessSetTickCommand
-  (
-    3,
-    player4Inputs->RunSpeed,
-    player4Inputs->StrafingSpeed,
-    player4Inputs->TurningSpeed,
-    player4Inputs->Fire,
-    player4Inputs->Action,
-    player4Inputs->WeaponSelect,
-    player4Inputs->Automap,
-    player4Inputs->FlyLook,
-    player4Inputs->ArtifactUse,
-    player4Inputs->Jump,
-    player4Inputs->EndPlayer
-  );
+  // Setting Players inputs
+  send_input(player1Inputs, 0);
+  send_input(player2Inputs, 1);
+  send_input(player3Inputs, 2);
+  send_input(player4Inputs, 3);
 
   // Enabling/Disabling rendering, as required
   if (!renderInfo->RenderVideo) headlessDisableVideoRendering();
diff --git a/waterbox/dsda/BizhawkInterface.h b/waterbox/dsda/BizhawkInterface.h
index 7d5578871b..fc1211d51b 100644
--- a/waterbox/dsda/BizhawkInterface.h
+++ b/waterbox/dsda/BizhawkInterface.h
@@ -2,6 +2,8 @@
 #define __BIZHAWK_INTERFACE__
 
 #include "emulibc.h"
+
+#include "am_map.h"
 #include "d_main.h"
 #include "d_player.h"
 #include "doomstat.h"
@@ -10,6 +12,7 @@
 #include "i_sound.h"
 #include "i_video.h"
 #include "p_mobj.h"
+
 #include "dsda/args.h"
 #include "dsda/settings.h"
 
diff --git a/waterbox/dsda/core b/waterbox/dsda/core
index 3bb3753888..256a718b96 160000
--- a/waterbox/dsda/core
+++ b/waterbox/dsda/core
@@ -1 +1 @@
-Subproject commit 3bb375388836ac6187cce61cc39ca50ae8b06a98
+Subproject commit 256a718b96a0fb68faae5f0530e1018d19a1d770