X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=39826cbc83c81dda90b87693570fca5b4923b1b4;hp=7ff39ab33722c9f41a113c6fa51ce1b313df4719;hb=dec5093fc78bfe1356d764c2432fed6566b2af66;hpb=0d95c7df5f708c3f30e10cab3894082019f8cd6c

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index 7ff39ab3..39826cbc 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -4,65 +4,65 @@
 
 #include "Murphy.h"
 
+
 static void subEatRedDisk(int si);
 static boolean subMoveKillsMurphy(int si, int ax, int bl);
 
-// static char *VB_Name = "modMurphy";
-
-// --- Option Explicit
-
-#if 1
-
 #define LocalStretch 			(2)
 #define MurphyZoomFactor		(ZoomFactor)
 
-#else
 
-#define LocalStretch 			(1)
-#define MurphyZoomFactor		(1)
+// Variables that hold information about the animation sequence
+static int dx1 = 0; // image/animation token
+static int dx2 = 0; // an additional image position of a second sprite, for instance: yellow disk if pushed
+static int MurphyDX = 0, MurphyDY = 0; // murphys move steps
+static int SeqPos = 0; // index into dx()
+static int ClearPos = 0; // Position to clear before blitting sprites, none=-1
+static int dxPos = 0; // field-position  to draw dx(SeqPos)
+static int dx2Step = 0; // position of dx2 relative to dx-position
+static int dx1SequenceLength = 0;
+
+
+void SaveEngineSnapshotValues_SP_Murphy(ListNode **buffers)
+{
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(dx1));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(dx2));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(MurphyDX));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(MurphyDY));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(SeqPos));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(ClearPos));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(dxPos));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(dx2Step));
+  SaveSnapshotBuffer(buffers, ARGS_ADDRESS_AND_SIZEOF(dx1SequenceLength));
+}
 
-#endif
 
 // ==========================================================================
 //                              SUBROUTINE
 // Move Murphy in any direction
 // ==========================================================================
 
-int subAnimateMurphy(int *si)
+void subAnimateMurphy(int *si)
 {
-  int subAnimateMurphy;
-
-  // int ax, al, ah, bx, bl, i, X, Y;
-  // int tX, tY, tDeltaX, tDeltaY, tPos, Tmp;
-  int ax, al, bx, bl, i, X, Y;
+  int ax, al, bl, i, X, Y;
+  int time1, time2;
   int tDeltaX, tDeltaY, tPos, Tmp;
 
-  // Variables that hold information about the animation sequence
-  static int *dx = 0; // an array of image positions in moving.mpx, finalized with -1
-  static int dx2 = 0; // an additional image position of a second sprite, for instance: yellow disk if pushed
-  static int MurphyDX = 0, MurphyDY = 0; // murphys move steps
-  static int SeqPos = 0; // index into dx()
-  static int ClearPos = 0; // Position to clear before blitting sprites, none=-1
-  static int dxPos = 0; // field-position  to draw dx(SeqPos)
-  static int dx2Step = 0; // position of dx2 relative to dx-position
-
   ax = PlayField16[*si];
   al = LowByte(ax);
 
-#if 0
-  printf("::: Murphy.c: subAnimateMurphy(): %d [%d, %d] %d, %d [%d]\n",
-	 *si, *si % 60, *si / 60, ax, al, (al == fiMurphy));
-#endif
-
   if (al != fiMurphy)
   {
     MurphyMoveCounter = 0;             // We have no Murphy! Exit!
-    return subAnimateMurphy;
+
+    return;
   }
 
   MurphyMoveCounter = 1;             // We have a Murphy!
   MurphyExplodePos = *si;
-  if (ax != 3) // yes--go proceed moving murphy?
+
+  // (check if high byte of PlayField16 has stored movement information)
+  if (ax != fiMurphy) // yes--go proceed moving murphy?
     goto locProceedMovingMurphy;
 
   // FS: reset moving sequence variables
@@ -70,14 +70,18 @@ int subAnimateMurphy(int *si)
   MurphyDY = 0;
   ClearPos = *si;
   dxPos = *si;
+  dx1 = -1;
   dx2 = -1;
   SeqPos = 0;
   // end of FS
+
   ScratchGravity = 0; // scratch gravity off
   if (GravityFlag != 0) // Gravity? (1=gravity on)
   {
     bl = LowByte(PlayField16[*si - FieldWidth]); // check above
-    if (! (bl == fiPortUp || bl == fiPortUpAndDown || bl == fiPortAllDirections))
+    if (! (bl == fiPortUp ||
+	   bl == fiPortUpAndDown ||
+	   bl == fiPortAllDirections))
     {
       if (PlayField16[*si + FieldWidth] == 0) // gravity on and space below!
         ScratchGravity = 1;
@@ -88,10 +92,6 @@ int subAnimateMurphy(int *si)
   if (bl != 0) // a key was pressed!
     goto locKeyPressed5FCF;
 
-#if 1
-  printf("::: !!! %d [%d]\n", DemoKeyCode, GravityFlag);
-#endif
-
   RedDiskReleaseFlag = 1;
   if (ScratchGravity != 0) // gravity pulls & space below?'-> force Space up to down
   {
@@ -99,73 +99,86 @@ int subAnimateMurphy(int *si)
     goto loc_g_6364;
   }
 
-  ax = (TimerVar & 3);
-  if (ax != 0)
-    return subAnimateMurphy;
-
   // ------------------------------------------------------------------
   // Murphy's YAWN & SLEEP sequence, counted down by YawnSleepCounter:
+
   YawnSleepCounter = YawnSleepCounter + 1;
-  if (YawnSleepCounter == 4)
+
+  if (YawnSleepCounter < 16)
+    return;
+
+  if (YawnSleepCounter < 2000)
   {
-    subCopyFieldToScreen(*si, fiMurphy); // normal grin
-    return subAnimateMurphy;
-  } // loc_g_5ECE:
+    // normal grin
+    // (default: single graphic, no animation)
+    subCopyAnimToScreen(*si, aniMurphy, YawnSleepCounter - 16);
 
-  if (YawnSleepCounter <= 500) // loc_g_5ED7:
-    return subAnimateMurphy;
+    return;
+  }
 
-  if (YawnSleepCounter <= 522)
+  if (YawnSleepCounter < 4000)
   {
-    bx = (YawnSleepCounter - 500) / 2;
-    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn! and look depressed afterwards...
-    return subAnimateMurphy;
-  } // loc_g_5F00:
+    // yawn! and look depressed afterwards...
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 2000);
 
-  if (YawnSleepCounter <= 1000)
-    return subAnimateMurphy;
+    return;
+  }
 
-  if (YawnSleepCounter <= 1022)
+  if (YawnSleepCounter < 6400)
   {
-    bx = (YawnSleepCounter - 1000) / 2;
-    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn again!
-    return subAnimateMurphy;
-  } // loc_g_5F32:
+    // yawn again!
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 4000);
 
-  if (YawnSleepCounter <= 1600) // loc_g_5F3B:
-    return subAnimateMurphy;
+    return;
+  }
+
+  // time1 = 6400 + 12 * 8;	// (default: 6496 == 6400 + 12 * 8)
+  time1 = 6400 + 12 * 10;
 
-  if (YawnSleepCounter <= 1622)
+  if (YawnSleepCounter < time1)
   {
-    bx = (YawnSleepCounter - 1600) / 2;
-    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn again! - third time
-    return subAnimateMurphy;
-  } // loc_g_5F64:
+    // yawn again! - third time
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 6400);
+
+    return;
+  }
 
-  if (YawnSleepCounter > 1654)
-    return subAnimateMurphy;
+  // time2 = 6496 + 3 * 64;	// (default: 6688 == 6496 + 3 * 64)
+  time2 = 6496 + 3 * 100;
+
+  if (YawnSleepCounter > time2)		// Murphy already went to sleep
+    return;
 
   if (PlayField16[*si - 1] == 0)
   {
     if (PlayField16[*si + 1] == 0)
     {
-      YawnSleepCounter = 36;
-      return subAnimateMurphy;
+      // no sleep -- go back to "wait and start yawning" phase
+      YawnSleepCounter = 144;
 
+      return;
     }
     else
     {
-      bx = (YawnSleepCounter - 1622) / 16;
-      subCopyFieldToScreen(*si, aniMurphySleepRight + bx); // go to sleep
-      return subAnimateMurphy;
+      // go to sleep (right side)
+      // (default: 3 animation frames with delay of 64)
+      subCopyAnimToScreen(*si, aniMurphySleepRight, YawnSleepCounter - time1);
+
+      return;
     }
-  } // loc_g_5F81:
+  }
+
+  // go to sleep (left side)
+  // (default: 3 animation frames with delay of 64)
+  subCopyAnimToScreen(*si, aniMurphySleepLeft, YawnSleepCounter - time1);
 
-  bx = (YawnSleepCounter - 1622) / 16;
-  subCopyFieldToScreen(*si, aniMurphySleepLeft + bx); // go to sleep
-  return subAnimateMurphy;
+  return;
 
   // end of YAWN-SLEEP-Sequence
+
   // ------------------------------------------------------------------
   // ==========================================================================
   //                       (Direct Jump) a key was pressed
@@ -255,7 +268,7 @@ loc_g_6003:
 
     default:
       RedDiskReleaseFlag = 0;
-      return subAnimateMurphy;
+      return;
       break;
   }
 
@@ -299,7 +312,7 @@ loc_g_6078:
   if (! subMoveKillsMurphy(*si - FieldWidth, ax, bl))
     goto loc_g_6078;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving right to left ...
@@ -348,7 +361,7 @@ loc_g_60DA:
   if (! subMoveKillsMurphy(*si - 1, ax, bl))
     goto loc_g_60DA;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving up to down ...
@@ -390,7 +403,7 @@ loc_g_6154:
   if (! subMoveKillsMurphy(*si + FieldWidth, ax, bl))
     goto loc_g_6154;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving left to right ...
@@ -439,7 +452,7 @@ loc_g_61B6:
   if (! subMoveKillsMurphy(*si + 1, ax, bl))
     goto loc_g_61B6;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching down to up ...
@@ -468,7 +481,7 @@ loc_g_622E:
   if (al == fiRedDisk)
     goto loc_g_6A48;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching right to left ...
@@ -497,7 +510,7 @@ loc_g_6258:
   if (al == fiRedDisk)
     goto loc_g_6A64;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching up to down ...
@@ -525,7 +538,7 @@ loc_g_6288:
   if (al == fiRedDisk)
     goto loc_g_6A80;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching left to right ...
@@ -554,7 +567,7 @@ loc_g_62B2:
   if (al == fiRedDisk)
     goto loc_g_6A9C;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Release Red disk: no move ...
@@ -565,19 +578,19 @@ loc_g_62E2:
   ClearPos = -1;
   // end of FS
   if (LowByte(RedDiskCount) == 0)
-    return subAnimateMurphy;
+    return;
 
   if (LowByte(RedDiskReleasePhase) != 0)
-    return subAnimateMurphy;
+    return;
 
   if (LowByte(RedDiskReleaseFlag) != 1)
-    return subAnimateMurphy;
+    return;
 
   MovHighByte(&PlayField16[*si], 0x2A);
   MovingPictureSequencePhase = 0x40; // init picture move sequence
-  dx = aniRedDisk;
+  dx1 = aniRedDisk;
   MovLowByte(&RedDiskReleasePhase, 1);
-  Mov(&RedDiskReleaseMurphyPos, *si);             // remember Murphy's location
+  RedDiskReleaseMurphyPos = *si;             // remember Murphy's location
   goto loc_Split;
 
   // ==========================================================================
@@ -585,7 +598,7 @@ loc_g_62E2:
   // ==========================================================================
 
 loc_g_6312:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLeft);
   PlayField16[*si - FieldWidth] = 0x103;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -596,7 +609,7 @@ loc_g_6312:
   // ==========================================================================
 
 loc_g_6341:
-  dx = aniMurphyEatLeft;
+  dx1 = aniMurphyMoveLeft;
   PlayField16[*si - 1] = 0x203;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -607,7 +620,7 @@ loc_g_6341:
   // ==========================================================================
 
 loc_g_6364:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLeft);
   PlayField16[*si + FieldWidth] = 0x303;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -618,7 +631,7 @@ loc_g_6364:
   // ==========================================================================
 
 loc_g_6399:
-  dx = aniMurphyEatRight;
+  dx1 = aniMurphyMoveRight;
   PlayField16[*si + 1] = 0x403;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -632,7 +645,8 @@ loc_g_63C2:
   if (SgnHighByte(PlayField16[*si - FieldWidth]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si - FieldWidth] = fiBase;
@@ -641,8 +655,9 @@ loc_g_63C2:
   // ==========================================================================
 
 loc_g_63D3:
-  subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
   PlayField16[*si - FieldWidth] = 0x503;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -656,7 +671,8 @@ loc_g_640B:
   if (SgnHighByte(PlayField16[*si - 1]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si - 1] = fiBase;
@@ -665,8 +681,9 @@ loc_g_640B:
   // ==========================================================================
 
 loc_g_641C:
-  subSoundFXBase();
-  dx = aniMurphyEatLeft;
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniMurphyDigLeft;
   PlayField16[*si - 1] = 0x203;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -680,7 +697,8 @@ loc_g_6448:
   if (SgnHighByte(PlayField16[*si + FieldWidth]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si + FieldWidth] = fiBase;
@@ -689,8 +707,9 @@ loc_g_6448:
   // ==========================================================================
 
 loc_g_6459:
-  subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
   PlayField16[*si + FieldWidth] = 0x703;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -704,7 +723,8 @@ loc_g_6491:
   if (SgnHighByte(PlayField16[*si + 1]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si + 1] = fiBase;
@@ -713,8 +733,9 @@ loc_g_6491:
   // ==========================================================================
 
 loc_g_64A2:
-  subSoundFXBase();
-  dx = aniMurphyEatRight;
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniMurphyDigRight;
   PlayField16[*si + 1] = 0x803;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -728,7 +749,8 @@ loc_g_64CE:
   if (SgnHighByte(PlayField16[*si - FieldWidth]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si - FieldWidth] = fiBase;
@@ -737,9 +759,10 @@ loc_g_64CE:
   // ==========================================================================
 
 loc_g_64DF:
-  subCopyFieldToScreen(*si, aniMurphyTouchUp);
-  subSoundFXBase();
-  dx = aniTouchBase;
+  subCopyImageToScreen(*si, aniMurphyTouchUp);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniTouchBase;
   dxPos = *si - FieldWidth;
   MovHighByte(&PlayField16[*si], 0x10);
   goto loc_StopNoSplit;
@@ -752,7 +775,8 @@ loc_g_650C:
   if (SgnHighByte(PlayField16[*si - 1]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si - 1] = fiBase;
@@ -761,9 +785,10 @@ loc_g_650C:
   // ==========================================================================
 
 loc_g_651D:
-  subCopyFieldToScreen(*si, aniMurphyTouchLeft);
-  subSoundFXBase();
-  dx = aniTouchBase;
+  subCopyImageToScreen(*si, aniMurphyTouchLeft);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniTouchBase;
   dxPos = *si - 1;
   MovHighByte(&PlayField16[*si], 0x11);
   goto loc_StopNoSplit;
@@ -776,7 +801,8 @@ loc_g_654A:
   if (SgnHighByte(PlayField16[*si + FieldWidth]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si + FieldWidth] = fiBase;
@@ -785,9 +811,10 @@ loc_g_654A:
   // ==========================================================================
 
 loc_g_655B:
-  subCopyFieldToScreen(*si, aniMurphyTouchDown);
-  subSoundFXBase();
-  dx = aniTouchBase;
+  subCopyImageToScreen(*si, aniMurphyTouchDown);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniTouchBase;
   dxPos = *si + FieldWidth;
   MovHighByte(&PlayField16[*si], 0x12);
   goto loc_StopNoSplit;
@@ -800,7 +827,8 @@ loc_g_6588:
   if (SgnHighByte(PlayField16[*si + 1]) >= 0)
   {
     ExplodeFieldSP(*si);                 // Explode
-    return subAnimateMurphy;
+
+    return;
   }
 
   PlayField16[*si + 1] = fiBase;
@@ -809,9 +837,10 @@ loc_g_6588:
   // ==========================================================================
 
 loc_g_6599:
-  subCopyFieldToScreen(*si, aniMurphyTouchRight);
-  subSoundFXBase();
-  dx = aniTouchBase;
+  subCopyImageToScreen(*si, aniMurphyTouchRight);
+  subSoundFX(*si, fiBase, actDigging);
+
+  dx1 = aniTouchBase;
   dxPos = *si + 1;
   MovHighByte(&PlayField16[*si], 0x13);
   goto loc_StopNoSplit;
@@ -821,8 +850,9 @@ loc_g_6599:
   // ==========================================================================
 
 loc_g_65C6:
-  subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si - FieldWidth] = 0x903;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -833,11 +863,9 @@ loc_g_65C6:
   // ==========================================================================
 
 loc_g_65FE:
-  subSoundFXInfotron();
-  dx = aniEatInfotronLeft;
-  dx2 = fiInfotron;
-  dx2Step = -1;
-  ClearPos = -1;
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniEatInfotronLeft;
   PlayField16[*si - 1] = 0xA03;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -848,8 +876,9 @@ loc_g_65FE:
   // ==========================================================================
 
 loc_g_662A:
-  subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si + FieldWidth] = 0xB03;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -860,11 +889,9 @@ loc_g_662A:
   // ==========================================================================
 
 loc_g_6662:
-  subSoundFXInfotron();
-  dx = aniEatInfotronRight;
-  dx2 = fiInfotron;
-  dx2Step = 1;
-  ClearPos = -1;
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniEatInfotronRight;
   PlayField16[*si + 1] = 0xC03;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -875,9 +902,10 @@ loc_g_6662:
   // ==========================================================================
 
 loc_g_668E:
-  subCopyFieldToScreen(*si, aniMurphyTouchUp);
-  subSoundFXInfotron();
-  dx = aniTouchInfotron;
+  subCopyImageToScreen(*si, aniMurphyTouchUp);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x14);
   MovHighByte(&PlayField16[*si - FieldWidth], 0xFF);
   goto loc_StopNoSplit;
@@ -887,9 +915,10 @@ loc_g_668E:
   // ==========================================================================
 
 loc_g_66C0:
-  subCopyFieldToScreen(*si, aniMurphyTouchLeft);
-  subSoundFXInfotron();
-  dx = aniTouchInfotron;
+  subCopyImageToScreen(*si, aniMurphyTouchLeft);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x15);
   MovHighByte(&PlayField16[*si - 1], 0xFF);
   goto loc_StopNoSplit;
@@ -899,9 +928,10 @@ loc_g_66C0:
   // ==========================================================================
 
 loc_g_66F2:
-  subCopyFieldToScreen(*si, aniMurphyTouchDown);
-  subSoundFXInfotron();
-  dx = aniTouchInfotron;
+  subCopyImageToScreen(*si, aniMurphyTouchDown);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x16);
   MovHighByte(&PlayField16[*si + FieldWidth], 0xFF);
   goto loc_StopNoSplit;
@@ -911,9 +941,10 @@ loc_g_66F2:
   // ==========================================================================
 
 loc_g_6724:
-  subCopyFieldToScreen(*si, aniMurphyTouchRight);
-  subSoundFXInfotron();
-  dx = aniTouchInfotron;
+  subCopyImageToScreen(*si, aniMurphyTouchRight);
+  subSoundFX(*si, fiInfotron, actCollecting);
+
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x17);
   MovHighByte(&PlayField16[*si + 1], 0xFF);
   goto loc_StopNoSplit;
@@ -929,27 +960,14 @@ loc_g_6756:
   MurphyDY = 0;
   // end of FS
   if (LowByte(InfotronsNeeded) != 0)
-    return subAnimateMurphy;
+    return;
 
-  subSoundFXExit();
-  data_h_DemoDone = 1; // EP set level success bytes
-  LevelStatus = 1; // set Level Status DONE
-  EP_GameDemoVar0DAA = 0; // force demo for lead-out
-  if (SavedGameFlag == 0) // saved game running?
-  {
-    if (UpdateTimeFlag != 0)    // update time?
-    {
-      UpdatedFlag = 1; // prevent double update
-      subUpdatePlayingTime();    // update playing time
-    }
-  }
+  game_sp.level_solved = TRUE;
 
-#if 0
-  subUpdateHallOfFame(); // update time + Hall-Of-Fame
-#endif
+  subSoundFX(*si, fiExit, actPassing);
 
   LeadOutCounter = 0x40;          // quit: start lead-out
-  dx = aniMurphyExit;
+  dx1 = aniMurphyExit;
   MovHighByte(&PlayField16[*si], 0xD);
   goto loc_StopNoSplit;
 
@@ -960,11 +978,11 @@ loc_g_6756:
 loc_g_679B:
   ax = PlayField16[*si - 2];
   if (ax != 0)
-    return subAnimateMurphy;
+    return;
 
   MovHighByte(&PlayField16[*si - 2], 1);
-  subCopyFieldToScreen(*si, aniPushLeft); // draw pushing murphy
-  dx = aniZonkRollLeft;
+  subCopyImageToScreen(*si, aniPushLeft); // draw pushing murphy
+  dx1 = aniZonkRollLeft;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -978,15 +996,15 @@ loc_g_679B:
 loc_g_67D4:
   ax = PlayField16[*si + 2];
   if (ax != 0)
-    return subAnimateMurphy;
+    return;
 
   ax = PlayField16[*si + FieldWidth + 1];
   if (ax == 0) // zonk falls
-    return subAnimateMurphy;
+    return;
 
   MovHighByte(&PlayField16[*si + 2], 1);
-  subCopyFieldToScreen(*si, aniPushRight); // draw pushing murphy
-  dx = aniZonkRollRight;
+  subCopyImageToScreen(*si, aniPushRight); // draw pushing murphy
+  dx1 = aniZonkRollRight;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -998,14 +1016,16 @@ loc_g_67D4:
   // ==========================================================================
 
 loc_g_6817:
-  subCopyFieldToScreen(*si, aniMurphyTouchUp);
+  subCopyImageToScreen(*si, aniMurphyTouchUp);
   if (YellowDisksExploded != 0)
   {
-    YawnSleepCounter = 10; // stay hypnotized
-    return subAnimateMurphy;
+    YawnSleepCounter = 40; // stay hypnotized
+
+    return;
   } // loc_g_6838:
 
-  subCopyFieldToScreen(*si - FieldWidth, 0x88); // draw new terminal type
+  // draw new terminal type
+  GfxGraphic[GetX(*si - FieldWidth)][GetY(*si - FieldWidth)] = aniTerminalActive;
   TerminalState[*si - FieldWidth] = 8;
   goto loc_g_68F0;
 
@@ -1014,14 +1034,16 @@ loc_g_6817:
   // ==========================================================================
 
 loc_g_684E:
-  subCopyFieldToScreen(*si, aniMurphyTouchLeft);
+  subCopyImageToScreen(*si, aniMurphyTouchLeft);
   if (YellowDisksExploded != 0)
   {
-    YawnSleepCounter = 10; // stay hypnotized
-    return subAnimateMurphy;
+    YawnSleepCounter = 40; // stay hypnotized
+
+    return;
   } // loc_g_6838:
 
-  subCopyFieldToScreen(*si - 1, 0x88); // draw new terminal type
+  // draw new terminal type
+  GfxGraphic[GetX(*si - 1)][GetY(*si - 1)] = aniTerminalActive;
   TerminalState[*si - 1] = 8;
   goto loc_g_68F0;
 
@@ -1030,14 +1052,16 @@ loc_g_684E:
   // ==========================================================================
 
 loc_g_6884:
-  subCopyFieldToScreen(*si, aniMurphyTouchDown);
+  subCopyImageToScreen(*si, aniMurphyTouchDown);
   if (YellowDisksExploded != 0)
   {
-    YawnSleepCounter = 10; // stay hypnotized
-    return subAnimateMurphy;
+    YawnSleepCounter = 40; // stay hypnotized
+
+    return;
   } // loc_g_6838:
 
-  subCopyFieldToScreen(*si + FieldWidth, 0x88); // draw new terminal type
+  // draw new terminal type
+  GfxGraphic[GetX(*si + FieldWidth)][GetY(*si + FieldWidth)] = aniTerminalActive;
   TerminalState[*si + FieldWidth] = 8;
   goto loc_g_68F0;
 
@@ -1046,14 +1070,16 @@ loc_g_6884:
   // ==========================================================================
 
 loc_g_68BA:
-  subCopyFieldToScreen(*si, aniMurphyTouchRight);
+  subCopyImageToScreen(*si, aniMurphyTouchRight);
   if (YellowDisksExploded != 0)
   {
-    YawnSleepCounter = 10; // stay hypnotized
-    return subAnimateMurphy;
+    YawnSleepCounter = 40; // stay hypnotized
+
+    return;
   } // loc_g_6838:
 
-  subCopyFieldToScreen(*si + 1, 0x88); // draw new terminal type
+  // draw new terminal type
+  GfxGraphic[GetX(*si + 1)][GetY(*si + 1)] = aniTerminalActive;
   TerminalState[*si + 1] = 8;
   // ==========================================================================
   // common TERMINAL stuff moving/touching from all directions
@@ -1068,7 +1094,7 @@ loc_g_68F0:
       ExplodeFieldSP (i);
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // PORT down to up, VERTICAL PORT, CROSS PORT all moving down to up
@@ -1076,9 +1102,9 @@ loc_g_68F0:
 
 loc_g_6916:
   if (PlayField16[*si - 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+    return;
 
-  dx = aniSplitUpDown;
+  dx1 = aniSplitUpDown;
   dx2Step = -FieldWidth;
   PlayField16[*si] = 0x1803;
   PlayField16[*si - 2 * FieldWidth] = 0x300;
@@ -1090,9 +1116,9 @@ loc_g_6916:
 
 loc_g_693A:
   if (PlayField16[*si - 2] != 0)
-    return subAnimateMurphy;
+    return;
 
-  dx = aniMurphyEatLeft;
+  dx1 = aniMurphyMoveLeft;
   dx2Step = -1;
   PlayField16[*si] = 0x1903;
   PlayField16[*si - 2] = 0x300;
@@ -1104,9 +1130,9 @@ loc_g_693A:
 
 loc_g_695E:
   if (PlayField16[*si + 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+    return;
 
-  dx = aniSplitUpDown;
+  dx1 = aniSplitUpDown;
   dx2Step = FieldWidth;
   PlayField16[*si] = 0x1A03;
   PlayField16[*si + 2 * FieldWidth] = 0x300;
@@ -1118,9 +1144,9 @@ loc_g_695E:
 
 loc_g_6982:
   if (PlayField16[*si + 2] != 0)
-    return subAnimateMurphy;
+    return;
 
-  dx = aniMurphyEatRight;
+  dx1 = aniMurphyMoveRight;
   dx2Step = 1;
   PlayField16[*si] = 0x1B03;
   PlayField16[*si + 2] = 0x300;
@@ -1135,7 +1161,7 @@ loc_StopSplit:
   // ==========================================================================
 
 loc_g_69A6:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si] = 0x1C03;
   PlayField16[*si - FieldWidth] = 0x300;
   goto loc_StopNoSplit;
@@ -1145,7 +1171,7 @@ loc_g_69A6:
   // ==========================================================================
 
 loc_g_69CE:
-  dx = aniMurphyEatLeft;
+  dx1 = aniMurphyEatLeft;
   PlayField16[*si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
   PlayField16[*si - 1] = 0x1D03;
   *si = *si - 1;
@@ -1156,7 +1182,7 @@ loc_g_69CE:
   // ==========================================================================
 
 loc_g_69F7:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si] = 0x1E03;
   PlayField16[*si + FieldWidth] = 0x300;
   goto loc_StopNoSplit;
@@ -1167,7 +1193,7 @@ loc_g_69F7:
 
 loc_g_6A1F:
   //  dx = aniMurphyEatRightRedDisk 'this sequence is 9 steps long!
-  dx = aniMurphyEatRight;
+  dx1 = aniMurphyEatRight;
   // --------------------------------------------------------------------------
   // BugFix
   // Table data_h_145A, pointed to by table data_h_105E, has a severe bug:
@@ -1179,13 +1205,8 @@ loc_g_6A1F:
   // Remember that this is not the real bug-fix, but we must live with
   // this existing bug and correct for the consequences of it.
 
-#if 1
-  if (0 == AllowEatRightRedDiskBug) // Murphy's screen x-position
+  if (AllowEatRightRedDiskBug == 0) // Murphy's screen x-position
     MurphyScreenXPos = MurphyScreenXPos - 2 * MurphyZoomFactor;
-#else
-  if (0 == AllowEatRightRedDiskBug) // Murphy's screen x-position
-    MurphyScreenXPos = MurphyScreenXPos - 2;
-#endif
 
   SeqPos = -1;
   // FS: for me this means to blit the first animation frame twice
@@ -1201,7 +1222,7 @@ loc_g_6A1F:
   // ==========================================================================
 
 loc_g_6A48:
-  dx = aniTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x20);
   MovHighByte(&PlayField16[*si - FieldWidth], 3);
   goto loc_StopNoSplit;
@@ -1211,7 +1232,7 @@ loc_g_6A48:
   // ==========================================================================
 
 loc_g_6A64:
-  dx = aniTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x21);
   MovHighByte(&PlayField16[*si - 1], 3);
   goto loc_StopNoSplit;
@@ -1221,7 +1242,7 @@ loc_g_6A64:
   // ==========================================================================
 
 loc_g_6A80:
-  dx = aniTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x22);
   MovHighByte(&PlayField16[*si + FieldWidth], 3);
   goto loc_StopNoSplit;
@@ -1231,7 +1252,7 @@ loc_g_6A80:
   // ==========================================================================
 
 loc_g_6A9C:
-  dx = aniTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x23);
   MovHighByte(&PlayField16[*si + 1], 3);
 
@@ -1245,15 +1266,15 @@ loc_StopNoSplit:
 
 loc_g_6AB8:
   if (PlayField16[*si - 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si - 2 * FieldWidth] = 0x1200;
-  subCopyFieldToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si - FieldWidth;
-  dx2 = aniPushUpDown;
+  dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
   dx2Step = FieldWidth;
   PlayField16[*si] = 0x2403;
+  subCopyImageToScreen(*si, dx2);
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1262,11 +1283,11 @@ loc_g_6AB8:
 
 loc_g_6AF1:
   if (PlayField16[*si - 2] != 0)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si - 2] = 0x1200;
-  subCopyFieldToScreen(*si, aniPushLeft);
-  dx = aniYellowDisk;
+  subCopyImageToScreen(*si, aniPushLeft);
+  dx1 = aniYellowDisk;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -1279,15 +1300,15 @@ loc_g_6AF1:
 
 loc_g_6B2A:
   if (PlayField16[*si + 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si + 2 * FieldWidth] = 0x1200;
-  subCopyFieldToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si + FieldWidth;
-  dx2 = aniPushUpDown;
+  dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
   dx2Step = -FieldWidth;
   PlayField16[*si] = 0x2703;
+  subCopyImageToScreen(*si, dx2);
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1296,11 +1317,11 @@ loc_g_6B2A:
 
 loc_g_6B63:
   if (PlayField16[*si + 2] != 0)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si + 2] = 0x1200;
-  subCopyFieldToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+  subCopyImageToScreen(*si, aniPushRight);
+  dx1 = aniYellowDisk;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -1313,11 +1334,11 @@ loc_g_6B63:
 
 loc_g_6B9B:
   if (PlayField16[*si - 2] != 0)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si - 2] = 0x800;
-  subCopyFieldToScreen(*si, aniPushLeft);
-  dx = aniOrangeDisk;
+  subCopyImageToScreen(*si, aniPushLeft);
+  dx1 = aniOrangeDisk;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -1330,14 +1351,14 @@ loc_g_6B9B:
 
 loc_g_6BD3:
   if (PlayField16[*si + 2] != 0)
-    return subAnimateMurphy;
+    return;
 
   if (PlayField16[*si + FieldWidth + 1] == 0) // falling goes before pushing
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si + 2] = 0x100;
-  subCopyFieldToScreen(*si, aniPushRight);
-  dx = aniOrangeDisk;
+  subCopyImageToScreen(*si, aniPushRight);
+  dx1 = aniOrangeDisk;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -1368,8 +1389,32 @@ locProceedMovingMurphy: // proceed moving murphy
 
   ax = ax - 1;   // next picture of sequence
   MovingPictureSequencePhase = ax;            // store for later
+
   if (ax == 0) // Sound effects
-    subSoundFXPush();
+  {
+    switch (HighByte(PlayField16[*si]))
+    {
+      case 0xE:
+      case 0xF:
+	subSoundFX(*si, fiZonk, actPushing);
+	break;
+
+      case 0x28:
+      case 0x29:
+	subSoundFX(*si, fiOrangeDisk, actPushing);
+	break;
+
+      case 0x24:
+      case 0x25:
+      case 0x26:
+      case 0x27:
+	subSoundFX(*si, fiYellowDisk, actPushing);
+	break;
+
+      default:
+	break;
+    }
+  }
 
   bl = HighByte(PlayField16[*si]);
   if (bl == 0xE)        // Push Zonk to left
@@ -1399,60 +1444,49 @@ locProceedMovingMurphy: // proceed moving murphy
   if (bl == 0x2A)       // Red disk release timer
     goto loc_g_716E;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Paint frame of MOVING.DAT sequence
   // ==========================================================================
 
 loc_g_6C8F:
+
+  if (SeqPos <= 0)
+    dx1SequenceLength = getSequenceLength(dx1);
+
   if (SplitMoveFlag == 0)
   {
     // ++++++++++++++++++++++++++
     // Begin of normal movement
-#if 1
     MurphyScreenXPos = MurphyScreenXPos + MurphyDX * MurphyZoomFactor;
     MurphyScreenYPos = MurphyScreenYPos + MurphyDY * MurphyZoomFactor;
-#else
-    MurphyScreenXPos = MurphyScreenXPos + MurphyDX;
-    MurphyScreenYPos = MurphyScreenYPos + MurphyDY;
-#endif
-    if (! ClearPos < 0) // clear field that murphy is leaving
-      subCopyFieldToScreen(ClearPos, 0);
-
-#if 0
-    printf("::: ---------------> %d, %d [%d, %d]\n",
-	   MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY);
-#endif
-
-    if (dx2 == fiInfotron) // special case of infotron moving left or right
-    {
-      tDeltaX = 0;
-      tDeltaY = 0;
-    }
-    else
-    {
-      tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
-      tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
-    }
+
+    if (!(ClearPos < 0)) // clear field that murphy is leaving
+      subCopyImageToScreen(ClearPos, aniSpace);
+
+    tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
+    tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
 
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
-    Tmp = (SeqPos < 0 ?  0 :  0); // 9StepBugFix!(red disk move right)
-    StretchedSprites.BltEx(X, Y, dx[Tmp]);
-    if (! dx2 < 0)
+    Tmp = (SeqPos < 0 ? 0 : SeqPos); // 9StepBugFix!(red disk move right)
+
+    if (isSnappingSequence(dx1) && SeqPos == dx1SequenceLength - 1)
+      dx1 = aniSpace;
+
+    DDSpriteBuffer_BltImg(X, Y, dx1, Tmp);
+    GfxGraphic[GetX(*si)][GetY(*si)] = -1;	// (Murphy's position)
+    GfxGraphic[GetX(dxPos)][GetY(dxPos)] = -1;	// (snapping position)
+
+    if (!(dx2 < 0))
     {
       tPos = dxPos + dx2Step;
       X = GetStretchX(tPos);
       Y = GetStretchY(tPos);
-      if (dx2 == fiInfotron) // special case of infotron moving left or right
-      {
-        StretchedSprites.BltEx(X, Y, dx[SeqPos] + dx2Step);
-      }
-      else // pushing something
-      {
-        StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx2);
-      }
+
+      // (SeqPos iterates from 0 to 7 while pushing)
+      DDSpriteBuffer_BltImg(X + tDeltaX, Y + tDeltaY, dx2, SeqPos);
     }
 
     // End of normal movement
@@ -1462,31 +1496,27 @@ loc_g_6C8F:
   {
     // ++++++++++++++++++++++++++++++++
     // Begin of split movement (port)
-#if 1
     MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX * MurphyZoomFactor;
     MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY * MurphyZoomFactor;
-#else
-    MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX;
-    MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY;
-#endif
-    subCopyFieldToScreen(ClearPos, 0); // clear the field that murphy leaves
+    subCopyImageToScreen(ClearPos, aniSpace); // clear the field that murphy leaves
     tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
     tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
-    StretchedSprites.BltEx(X, Y, dx[SeqPos]); // plot first murphy
+    DDSpriteBuffer_BltImg(X, Y, dx1, SeqPos); // plot first murphy
+
     tPos = dxPos + dx2Step;
     X = GetStretchX(tPos);
     Y = GetStretchY(tPos);
-    StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx[SeqPos]); // plot second murphy
-    StretchedSprites.BltEx(X, Y, LowByte(PlayField16[tPos])); // replot the port on top
+    DDSpriteBuffer_BltImg(X + tDeltaX, Y + tDeltaY, dx1, SeqPos); // plot second murphy
+    DDSpriteBuffer_BltImg(X, Y, fiGraphic[LowByte(PlayField16[tPos])], 0); // replot the port on top
     // End of split movement (port)
     // ------------------------------
   } // loc_g_6D1E:'loc_g_6D28:
 
   SeqPos = SeqPos + 1;
-  if (dx[SeqPos] > -1)
-    return subAnimateMurphy;
+  if (SeqPos < dx1SequenceLength)
+    return;
 
   // Follow-up after movement completed     'loc_g_6D35:
   MurphyXPos = MurphyXPos + MurphyDX;
@@ -1621,7 +1651,8 @@ loc_g_6C8F:
     goto loc_g_747F;
 
   ExitToMenuFlag = 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving up
@@ -1631,11 +1662,11 @@ loc_g_6EBA:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6EC8: // space, base
   PlayField16[*si] = fiMurphy;
   subAdjustZonksInfotronsAboveMurphy(*si + FieldWidth);
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving left
@@ -1645,11 +1676,11 @@ loc_g_6ED8:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6EE6: // space, base
   PlayField16[*si] = fiMurphy;
   subAdjustZonksInfotronsAboveMurphy(*si + 1);
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving down
@@ -1659,13 +1690,13 @@ loc_g_6EF6:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6F04: // space, base
   if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
     PlayField16[*si - FieldWidth] = 0;
 
   PlayField16[*si] = fiMurphy;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving right
@@ -1675,11 +1706,11 @@ loc_g_71B6:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71C4: // space, base
   subAdjustZonksInfotronsAboveMurphy(*si - 1);
   PlayField16[*si] = fiMurphy;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, touching up
@@ -1689,12 +1720,11 @@ loc_g_71D4:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71E2: // base
   if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
     PlayField16[*si - FieldWidth] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching left
@@ -1704,12 +1734,11 @@ loc_g_71F0:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71FE: // base
   if (LowByte(PlayField16[*si - 1]) != fiExplosion)
     PlayField16[*si - 1] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching down
@@ -1719,12 +1748,11 @@ loc_g_720C:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_721A: // base
   if (LowByte(PlayField16[*si + FieldWidth]) != fiExplosion)
     PlayField16[*si + FieldWidth] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching right
@@ -1734,12 +1762,11 @@ loc_g_7228:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_7236: // base
   if (LowByte(PlayField16[*si + 1]) != fiExplosion)
     PlayField16[*si + 1] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       zonk, pushing left
@@ -1753,7 +1780,8 @@ loc_g_6F18:
   PlayField16[*si - 2] = fiZonk;
   subExplodeSnikSnaksBelow(*si - 2);
   *si = *si - 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       zonk, pushing right
@@ -1767,7 +1795,8 @@ loc_g_6F3B:
   PlayField16[*si + 2] = fiZonk;
   subExplodeSnikSnaksBelow(*si + 2);
   *si = *si + 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       exit
@@ -1775,7 +1804,10 @@ loc_g_6F3B:
 
 loc_g_6F77:
   ExitToMenuFlag = 1;
-  return subAnimateMurphy;
+
+  PlayField16[*si] = fiSpace;	// remove Murphy from playfield after exiting
+
+  return;
 
   // ==========================================================================
   //               Push Zonk from right to left
@@ -1783,15 +1815,16 @@ loc_g_6F77:
 
 loc_g_6F7E:
   if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiZonk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more zonk pushing!
   PlayField16[*si - 1] = fiZonk;
   if (LowByte(PlayField16[*si - 2]) != fiExplosion)
     PlayField16[*si - 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //                       Push Zonk from left to right
@@ -1799,15 +1832,16 @@ loc_g_6F7E:
 
 loc_g_6FBC:
   if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiZonk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more zonk pushing!
   PlayField16[*si + 1] = fiZonk;
   if (LowByte(PlayField16[*si + 2]) != fiExplosion)
     PlayField16[*si + 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push orange disk from right to left
@@ -1815,15 +1849,16 @@ loc_g_6FBC:
 
 loc_g_6FFA:
   if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiOrangeDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si - 1] = fiOrangeDisk;
   if (LowByte(PlayField16[*si - 2]) != fiExplosion)
     PlayField16[*si - 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push orange disk from left to right
@@ -1831,15 +1866,16 @@ loc_g_6FFA:
 
 loc_g_7038:
   if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiOrangeDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si + 1] = fiOrangeDisk;
   if (LowByte(PlayField16[*si + 2]) != fiExplosion)
     PlayField16[*si + 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push yellow disk from down to up
@@ -1847,15 +1883,16 @@ loc_g_7038:
 
 loc_g_7076:
   if (DemoKeyCode == keyUp && PlayField16[*si - FieldWidth] == fiYellowDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si - FieldWidth] = fiYellowDisk;
   if (LowByte(PlayField16[*si - 2 * FieldWidth]) != fiExplosion)
     PlayField16[*si - 2 * FieldWidth] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push yellow disk from right to left
@@ -1863,15 +1900,16 @@ loc_g_7076:
 
 loc_g_70B4:
   if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiYellowDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si - 1] = fiYellowDisk;
   if (LowByte(PlayField16[*si - 2]) != fiExplosion)
     PlayField16[*si - 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push yellow disk from up to down
@@ -1879,15 +1917,16 @@ loc_g_70B4:
 
 loc_g_70F2:
   if (DemoKeyCode == keyDown && PlayField16[*si + FieldWidth] == fiYellowDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si + FieldWidth] = fiYellowDisk;
   if (LowByte(PlayField16[*si + 2 * FieldWidth]) != fiExplosion)
     PlayField16[*si + 2 * FieldWidth] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               Push yellow disk from left to right
@@ -1895,15 +1934,16 @@ loc_g_70F2:
 
 loc_g_7130:
   if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiYellowDisk)
-    return subAnimateMurphy;
+    return;
 
   PlayField16[*si] = fiMurphy; // else restore - no more pushing!
   PlayField16[*si + 1] = fiYellowDisk;
   if (LowByte(PlayField16[*si + 2]) != fiExplosion)
     PlayField16[*si + 2] = 0;
 
-  subCopyFieldToScreen(*si, fiMurphy);
-  return subAnimateMurphy;
+  subCopyImageToScreen(*si, aniMurphy);
+
+  return;
 
   // ==========================================================================
   //               time red disk release (space)
@@ -1913,16 +1953,17 @@ loc_g_716E:
   if (DemoKeyCode != keySpace)
   {
     PlayField16[*si] = fiMurphy;
-    subCopyFieldToScreen(*si, fiMurphy);
+    subCopyImageToScreen(*si, aniMurphy);
     RedDiskReleasePhase = 0;
   }
   else if (MovingPictureSequencePhase == 0x20)
   {
-    subCopyFieldToScreen(*si, 43);  // anxious murphy
+    // anxious murphy, dropping red disk
+    subCopyImageToScreen(*si, aniMurphyDropping);
     RedDiskReleasePhase = 1;
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Special port down to up
@@ -1939,7 +1980,8 @@ loc_g_7244:
     subSpPortTest(*si);
 
   *si = *si - FieldWidth;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Special port right to left
@@ -1956,7 +1998,8 @@ loc_g_7272:
     subSpPortTest(*si);
 
   *si = *si - 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Special port up to down
@@ -1973,7 +2016,8 @@ loc_g_729F:
     subSpPortTest(*si);
 
   *si = *si + FieldWidth;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Special port left to right
@@ -1990,7 +2034,8 @@ loc_g_72CD:
     subSpPortTest(*si);
 
   *si = *si + 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Move Red Disk up
@@ -2003,7 +2048,8 @@ loc_g_72FA:
   *si = *si - FieldWidth;
   PlayField16[*si] = fiMurphy;
   subEatRedDisk(*si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Move Red Disk left
@@ -2015,7 +2061,8 @@ loc_g_7318:
 
   PlayField16[*si] = fiMurphy;
   subEatRedDisk(*si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Move Red Disk down
@@ -2028,7 +2075,8 @@ loc_g_7333:
   *si = *si + FieldWidth;
   PlayField16[*si] = fiMurphy;
   subEatRedDisk(*si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Move Red Disk right
@@ -2040,7 +2088,8 @@ loc_g_7351:
 
   PlayField16[*si] = fiMurphy;
   subEatRedDisk(*si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk up
@@ -2051,7 +2100,8 @@ loc_g_736C:
     PlayField16[*si - FieldWidth] = 0;
 
   subEatRedDisk(*si - FieldWidth); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk left
@@ -2062,7 +2112,8 @@ loc_g_7381:
     PlayField16[*si - 1] = 0;
 
   subEatRedDisk(*si - 1); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk down
@@ -2073,7 +2124,8 @@ loc_g_7396:
     PlayField16[*si + FieldWidth] = 0;
 
   subEatRedDisk(*si + FieldWidth); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk right
@@ -2084,7 +2136,8 @@ loc_g_73AB:
     PlayField16[*si + 1] = 0;
 
   subEatRedDisk(*si + 1); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing up
@@ -2097,7 +2150,8 @@ loc_g_73C0:
   *si = *si - FieldWidth;
   PlayField16[*si] = fiMurphy;
   PlayField16[*si - FieldWidth] = fiYellowDisk;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing left
@@ -2110,7 +2164,8 @@ loc_g_73DD:
   *si = *si - 1;
   PlayField16[*si] = fiMurphy;
   PlayField16[*si - 1] = fiYellowDisk;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing down
@@ -2123,7 +2178,8 @@ loc_g_73FA:
   *si = *si + FieldWidth;
   PlayField16[*si] = fiMurphy;
   PlayField16[*si + FieldWidth] = fiYellowDisk;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk pushing right
@@ -2136,7 +2192,8 @@ loc_g_7417:
   *si = *si + 1;
   PlayField16[*si] = fiMurphy;
   PlayField16[*si + 1] = fiYellowDisk;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       orange disk, pushing left
@@ -2149,7 +2206,8 @@ loc_g_7434:
   *si = *si - 1;
   PlayField16[*si] = fiMurphy;
   PlayField16[*si - 1] = fiOrangeDisk;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       orange disk, pushing right
@@ -2168,7 +2226,7 @@ loc_g_7451:
     MovHighByte(&PlayField16[*si + FieldWidth + 1], fiOrangeDisk);
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                     Release a red disk
@@ -2178,26 +2236,20 @@ loc_g_747F:
   PlayField16[*si] = fiMurphy;
   RedDiskReleasePhase = 2;
   RedDiskCount = RedDiskCount - 1;
-  subDisplayRedDiskCount();
-  subSoundFXPush();                 // Sound effects
 
-  return subAnimateMurphy;
+  subSoundFX(*si, fiRedDisk, actDropping);
 } // subAnimateMurphy
 
 // ==========================================================================
 //                              SUBROUTINE
 // ==========================================================================
-int subExplodeSnikSnaksBelow(int si)
+void subExplodeSnikSnaksBelow(int si)
 {
-  int subExplodeSnikSnaksBelow;
-
   int ax;
 
   ax = LowByte(PlayField16[si + FieldWidth]);
   if (ax == 0x11 || ax == 0xBB)
     ExplodeFieldSP(si + FieldWidth);
-
-  return subExplodeSnikSnaksBelow;
 } // subExplodeSnikSnaksBelow
 
 // ==========================================================================
@@ -2282,44 +2334,40 @@ loc_g_753F:
 // The 10-port data base is at data_h_0D28, 10 entries of 6 bytes each:
 // (hi),(lo),(gravity),(freeze zonks),(freeze enemies),(unused)
 // ==========================================================================
-int subSpPortTest(int si)
-{
-  int subSpPortTest;
 
-  int i, cx, bx;
+void subSpPortTest(int si)
+{
+  int i;
 
-  cx = LInfo.SpecialPortCount; // number of special ports
-  for (i = 1; i <= cx; i++)
+  for (i = 0; i < LInfo.SpecialPortCount; i++)
   {
+    if (LInfo.SpecialPort[i].PortLocation / 2 == si)
     {
-      bx = HighByte(LInfo.SpecialPort[i].PortLocation);
-      MovHighByte(&bx, LowByte(LInfo.SpecialPort[i].PortLocation));
-      if (bx / 2 == si)
-      {
-        GravityFlag = LInfo.SpecialPort[i].Gravity;
-        FreezeZonks = LInfo.SpecialPort[i].FreezeZonks;
-        SnikSnaksElectronsFrozen = LInfo.SpecialPort[i].FreezeEnemies;
-        //        RandomTime = RandomTime Xor RandomSeed 'is RandomTime used at all? no!
-        i = cx + 1;
-      }
+      GravityFlag              = LInfo.SpecialPort[i].Gravity;
+      FreezeZonks              = LInfo.SpecialPort[i].FreezeZonks;
+      SnikSnaksElectronsFrozen = LInfo.SpecialPort[i].FreezeEnemies;
 
+      break;
     }
   }
+}
 
-  return subSpPortTest;
-} // subSpPortTest
-
-void subCopyFieldToScreen(int si, int fi)
+void subCopyAnimToScreen(int si, int graphic, int sync_frame)
 {
   int X, Y;
 
   // +++++++++++++++++++++++++++++++++++++++++
   X = GetStretchX(si);
   Y = GetStretchY(si);
-  StretchedSprites.BltEx(X, Y, fi);
+  DDSpriteBuffer_BltImg(X, Y, graphic, sync_frame);
   // +++++++++++++++++++++++++++++++++++++++++
 }
 
+void subCopyImageToScreen(int si, int graphic)
+{
+  subCopyAnimToScreen(si, graphic, 0);
+}
+
 static void subEatRedDisk(int si)
 {
   if (AllowRedDiskCheat == 0)
@@ -2332,13 +2380,10 @@ static void subEatRedDisk(int si)
   }
 
   RedDiskCount = (RedDiskCount + 1) % 256;
-  subDisplayRedDiskCount();
 }
 
-int subAdjustZonksInfotronsAboveMurphy(int si)
+void subAdjustZonksInfotronsAboveMurphy(int si)
 {
-  int subAdjustZonksInfotronsAboveMurphy;
-
   int ax;
 
   if (LowByte(PlayField16[si]) != fiExplosion)
@@ -2353,7 +2398,7 @@ int subAdjustZonksInfotronsAboveMurphy(int si)
     MovHighByte(&PlayField16[si - FieldWidth], 0x40); // make falling straigt down
   }
 
-  return subAdjustZonksInfotronsAboveMurphy;
+  return;
 
 loc_g_15A8: // empty above
   ax = PlayField16[si - FieldWidth - 1];
@@ -2365,7 +2410,7 @@ loc_g_15B6:
   if (ax == fiZonk || ax == fiInfotron)
     goto loc_g_15E8;
 
-  return subAdjustZonksInfotronsAboveMurphy;
+  return;
 
 loc_g_15C5: // zonk/infotron above left
   ax = PlayField16[si - 1];
@@ -2374,7 +2419,8 @@ loc_g_15C5: // zonk/infotron above left
 
   MovHighByte(&PlayField16[si - FieldWidth - 1], 0x60); // make roll right
   PlayField16[si - FieldWidth] = 0x8888;
-  return subAdjustZonksInfotronsAboveMurphy;
+
+  return;
 
 loc_g_15E8: // zonk/infotron above right
   ax = PlayField16[si + 1];
@@ -2383,6 +2429,4 @@ loc_g_15E8: // zonk/infotron above right
     MovHighByte(&PlayField16[si - FieldWidth + 1], 0x50); // make roll left
     PlayField16[si - FieldWidth] = 0x8888;
   }
-
-  return subAdjustZonksInfotronsAboveMurphy;
-} // subAdjustZonksInfotronsAboveMurphy
+}