X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=1c9cd8f5dd6c58836d2d045eb2b5ae56e487279f;hb=672811c21f07da548a4cdc5e9e14b459bcad1829;hp=b4c16780aac1b3e81951fd61236c09140e74b4a5;hpb=8d3d7d213a9691455a49544624bf380e85f43461;p=rocksndiamonds.git

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index b4c16780..1c9cd8f5 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -11,59 +11,84 @@ static boolean subMoveKillsMurphy(int si, int ax, int bl);
 
 // --- Option Explicit
 
+#if 1
+
+#define LocalStretch 			(2)
+#define MurphyZoomFactor		(ZoomFactor)
+
+#else
+
 #define LocalStretch 			(1)
+#define MurphyZoomFactor		(1)
+
+#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;
+#if 1
+  int ax, al, bl, i, X, Y;
+  int time1, time2;
+#else
   int ax, al, bx, bl, i, X, Y;
+#endif
   int tDeltaX, tDeltaY, tPos, Tmp;
 
   // Variables that hold information about the animation sequence
-  int *dx; // an array of image positions in moving.mpx, finalized with -1
-  int dx2; // an additional image position of a second sprite, for instance: yellow disk if pushed
-  int MurphyDX, MurphyDY; // murphys move steps
-  int SeqPos; // index into dx()
-  int ClearPos; // Position to clear before blitting sprites, none=-1
-  int dxPos; // field-position  to draw dx(SeqPos)
-  int dx2Step; // position of dx2 relative to dx-position
-
-  ax = PlayField16[si];
+  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 0
+  printf("::: Murphy.c: subAnimateMurphy(): %d [%d] [%d]\n",
+	 YawnSleepCounter, FrameCounter, TimerVar);
+#endif
+
   if (al != fiMurphy)
   {
     MurphyMoveCounter = 0;             // We have no Murphy! Exit!
-    return subAnimateMurphy;
+
+    return;
   }
 
   MurphyMoveCounter = 1;             // We have a Murphy!
-  MurphyExplodePos = si;
+  MurphyExplodePos = *si;
   if (ax != 3) // yes--go proceed moving murphy?
     goto locProceedMovingMurphy;
 
   // FS: reset moving sequence variables
   MurphyDX = 0;
   MurphyDY = 0;
-  ClearPos = si;
-  dxPos = si;
+  ClearPos = *si;
+  dxPos = *si;
   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
+    bl = LowByte(PlayField16[*si - FieldWidth]); // check above
     if (! (bl == fiPortUp || bl == fiPortUpAndDown || bl == fiPortAllDirections))
     {
-      if (PlayField16[si + FieldWidth] == 0) // gravity on and space below!
+      if (PlayField16[*si + FieldWidth] == 0) // gravity on and space below!
         ScratchGravity = 1;
     }
   } // loc_g_5E8B:
@@ -72,6 +97,10 @@ int subAnimateMurphy(int si)
   if (bl != 0) // a key was pressed!
     goto locKeyPressed5FCF;
 
+#if 0
+  printf("::: Murphy.c: !!! %d [%d]\n", DemoKeyCode, GravityFlag);
+#endif
+
   RedDiskReleaseFlag = 1;
   if (ScratchGravity != 0) // gravity pulls & space below?'-> force Space up to down
   {
@@ -79,73 +108,167 @@ int subAnimateMurphy(int si)
     goto loc_g_6364;
   }
 
+#if 1
+
+#if 0
+  ax = (TimerVar & 3);
+  if (ax != 0)
+    return;
+#endif
+
+  // ------------------------------------------------------------------
+  // Murphy's YAWN & SLEEP sequence, counted down by YawnSleepCounter:
+
+  YawnSleepCounter = YawnSleepCounter + 1;
+
+  if (YawnSleepCounter < 16)
+    return;
+
+  if (YawnSleepCounter < 2000)
+  {
+    // normal grin
+    // (default: single graphic, no animation)
+    subCopyAnimToScreen(*si, aniMurphy, YawnSleepCounter - 16);
+
+    return;
+  }
+
+  if (YawnSleepCounter < 4000)
+  {
+    // yawn! and look depressed afterwards...
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 2000);
+
+    return;
+  }
+
+  if (YawnSleepCounter < 6400)
+  {
+    // yawn again!
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 4000);
+
+    return;
+  }
+
+  // time1 = 6400 + 12 * 8;	// (default: 6496 == 6400 + 12 * 8)
+  time1 = 6400 + 12 * 10;
+
+  if (YawnSleepCounter < time1)
+  {
+    // yawn again! - third time
+    // (default: 12 animation frames with delay of 8)
+    subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 6400);
+
+    return;
+  }
+
+  // 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)
+    {
+      // no sleep -- go back to "wait and start yawning" phase
+      YawnSleepCounter = 144;
+
+      return;
+    }
+    else
+    {
+      // go to sleep (right side)
+      // (default: 3 animation frames with delay of 64)
+      subCopyAnimToScreen(*si, aniMurphySleepRight, YawnSleepCounter - time1);
+
+      return;
+    }
+  }
+
+  // go to sleep (left side)
+  // (default: 3 animation frames with delay of 64)
+  subCopyAnimToScreen(*si, aniMurphySleepLeft, YawnSleepCounter - time1);
+
+  return;
+
+  // end of YAWN-SLEEP-Sequence
+
+#else
+
   ax = (TimerVar & 3);
   if (ax != 0)
-    return subAnimateMurphy;
+    return;
 
   // ------------------------------------------------------------------
   // Murphy's YAWN & SLEEP sequence, counted down by YawnSleepCounter:
   YawnSleepCounter = YawnSleepCounter + 1;
   if (YawnSleepCounter == 4)
   {
-    subCopyFieldToScreen(si, fiMurphy); // normal grin
-    return subAnimateMurphy;
+    subCopyFieldToScreen(*si, fiMurphy); // normal grin
+    return;
   } // loc_g_5ECE:
 
   if (YawnSleepCounter <= 500) // loc_g_5ED7:
-    return subAnimateMurphy;
+    return;
 
   if (YawnSleepCounter <= 522)
   {
     bx = (YawnSleepCounter - 500) / 2;
-    subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn! and look depressed afterwards...
-    return subAnimateMurphy;
+    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn! and look depressed afterwards...
+    return;
   } // loc_g_5F00:
 
   if (YawnSleepCounter <= 1000)
-    return subAnimateMurphy;
+    return;
 
   if (YawnSleepCounter <= 1022)
   {
     bx = (YawnSleepCounter - 1000) / 2;
-    subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn again!
-    return subAnimateMurphy;
+    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn again!
+    return;
   } // loc_g_5F32:
 
   if (YawnSleepCounter <= 1600) // loc_g_5F3B:
-    return subAnimateMurphy;
+    return;
 
   if (YawnSleepCounter <= 1622)
   {
     bx = (YawnSleepCounter - 1600) / 2;
-    subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn again! - third time
-    return subAnimateMurphy;
+    subCopyFieldToScreen(*si, aniMurphyYawn + bx); // yawn again! - third time
+    return;
   } // loc_g_5F64:
 
   if (YawnSleepCounter > 1654)
-    return subAnimateMurphy;
+    return;
 
-  if (PlayField16[si - 1] == 0)
+  if (PlayField16[*si - 1] == 0)
   {
-    if (PlayField16[si + 1] == 0)
+    if (PlayField16[*si + 1] == 0)
     {
       YawnSleepCounter = 36;
-      return subAnimateMurphy;
+      return;
 
     }
     else
     {
       bx = (YawnSleepCounter - 1622) / 16;
-      subCopyFieldToScreen(si, aniMurphySleepRight + bx); // go to sleep
-      return subAnimateMurphy;
+      subCopyFieldToScreen(*si, aniMurphySleepRight + bx); // go to sleep
+      return;
     }
   } // loc_g_5F81:
 
   bx = (YawnSleepCounter - 1622) / 16;
-  subCopyFieldToScreen(si, aniMurphySleepLeft + bx); // go to sleep
-  return subAnimateMurphy;
+  subCopyFieldToScreen(*si, aniMurphySleepLeft + bx); // go to sleep
+
+  return;
 
   // end of YAWN-SLEEP-Sequence
+
+#endif
+
   // ------------------------------------------------------------------
   // ==========================================================================
   //                       (Direct Jump) a key was pressed
@@ -155,24 +278,24 @@ locKeyPressed5FCF:
   if (ScratchGravity == 0)
     goto loc_g_6003;
 
-  if (PlayField16[si + FieldWidth] != 0)
+  if (PlayField16[*si + FieldWidth] != 0)
     goto loc_g_6003;
 
   if (bl == keyUp)
   {
-    if (PlayField16[si - FieldWidth] == fiBase)
+    if (PlayField16[*si - FieldWidth] == fiBase)
       goto loc_g_6003;
 
   }
   else if (bl == keyLeft)
   {
-    if (PlayField16[si - 1] == fiBase)
+    if (PlayField16[*si - 1] == fiBase)
       goto loc_g_6003;
 
   }
   else if (bl == keyRight)
   {
-    if (PlayField16[si + 1] == fiBase)
+    if (PlayField16[*si + 1] == fiBase)
       goto loc_g_6003;
   } // loc_g_6001:
 
@@ -235,7 +358,7 @@ loc_g_6003:
 
     default:
       RedDiskReleaseFlag = 0;
-      return subAnimateMurphy;
+      return;
       break;
   }
 
@@ -247,7 +370,7 @@ loc_g_6078:
   // FS:
   MurphyDY = -2;
   // end of FS
-  ax = PlayField16[si - FieldWidth];
+  ax = PlayField16[*si - FieldWidth];
   al = LowByte(ax);
   if (ax == fiSpace)
     goto loc_g_6312;
@@ -276,10 +399,10 @@ loc_g_6078:
   if (al == fiYellowDisk)
     goto loc_g_6AB8;
 
-  if (! subMoveKillsMurphy(si - FieldWidth, ax, bl))
+  if (! subMoveKillsMurphy(*si - FieldWidth, ax, bl))
     goto loc_g_6078;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving right to left ...
@@ -290,7 +413,7 @@ loc_g_60DA:
   MurphyDX = -2;
   // end of FS
   MurphyVarFaceLeft = 1;
-  ax = PlayField16[si - 1];
+  ax = PlayField16[*si - 1];
   al = LowByte(ax);
   if (ax == fiSpace)
     goto loc_g_6341;
@@ -325,10 +448,10 @@ loc_g_60DA:
   if (ax == fiOrangeDisk)
     goto loc_g_6B9B;
 
-  if (! subMoveKillsMurphy(si - 1, ax, bl))
+  if (! subMoveKillsMurphy(*si - 1, ax, bl))
     goto loc_g_60DA;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving up to down ...
@@ -338,7 +461,7 @@ loc_g_6154:
   // FS:
   MurphyDY = 2;
   // end of FS
-  ax = PlayField16[si + FieldWidth];
+  ax = PlayField16[*si + FieldWidth];
   al = LowByte(ax);
   if (ax == fiSpace)
     goto loc_g_6364;
@@ -367,10 +490,10 @@ loc_g_6154:
   if (al == fiYellowDisk)
     goto loc_g_6B2A;
 
-  if (! subMoveKillsMurphy(si + FieldWidth, ax, bl))
+  if (! subMoveKillsMurphy(*si + FieldWidth, ax, bl))
     goto loc_g_6154;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // moving left to right ...
@@ -381,7 +504,7 @@ loc_g_61B6:
   MurphyDX = 2;
   // end of FS
   MurphyVarFaceLeft = 0;
-  ax = PlayField16[si + 1];
+  ax = PlayField16[*si + 1];
   al = LowByte(ax);
   if (ax == fiSpace)
     goto loc_g_6399;
@@ -416,10 +539,10 @@ loc_g_61B6:
   if (ax == fiOrangeDisk)
     goto loc_g_6BD3;
 
-  if (! subMoveKillsMurphy(si + 1, ax, bl))
+  if (! subMoveKillsMurphy(*si + 1, ax, bl))
     goto loc_g_61B6;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching down to up ...
@@ -428,9 +551,9 @@ loc_g_61B6:
 loc_g_622E:
   // FS:
   ClearPos = -1;
-  dxPos = si - FieldWidth;
+  dxPos = *si - FieldWidth;
   // end of FS
-  ax = PlayField16[si - FieldWidth];
+  ax = PlayField16[*si - FieldWidth];
   al = LowByte(ax);
   al = LowByte(ax);
   if (ax == fiBase)
@@ -448,7 +571,7 @@ loc_g_622E:
   if (al == fiRedDisk)
     goto loc_g_6A48;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching right to left ...
@@ -457,10 +580,10 @@ loc_g_622E:
 loc_g_6258:
   // FS:
   ClearPos = -1;
-  dxPos = si - 1;
+  dxPos = *si - 1;
   // end of FS
   MurphyVarFaceLeft = 1;
-  ax = PlayField16[si - 1];
+  ax = PlayField16[*si - 1];
   al = LowByte(ax);
   if (ax == fiBase)
     goto loc_g_651D;
@@ -477,7 +600,7 @@ loc_g_6258:
   if (al == fiRedDisk)
     goto loc_g_6A64;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching up to down ...
@@ -486,9 +609,9 @@ loc_g_6258:
 loc_g_6288:
   // FS:
   ClearPos = -1;
-  dxPos = si + FieldWidth;
+  dxPos = *si + FieldWidth;
   // end of FS
-  ax = PlayField16[si + FieldWidth];
+  ax = PlayField16[*si + FieldWidth];
   al = LowByte(ax);
   if (ax == fiBase)
     goto loc_g_655B;
@@ -505,7 +628,7 @@ loc_g_6288:
   if (al == fiRedDisk)
     goto loc_g_6A80;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // touching left to right ...
@@ -514,10 +637,10 @@ loc_g_6288:
 loc_g_62B2:
   // FS:
   ClearPos = -1;
-  dxPos = si + 1;
+  dxPos = *si + 1;
   // end of FS
   MurphyVarFaceLeft = 0;
-  ax = PlayField16[si + 1];
+  ax = PlayField16[*si + 1];
   al = LowByte(ax);
   if (ax == fiBase)
     goto loc_g_6599;
@@ -534,7 +657,7 @@ loc_g_62B2:
   if (al == fiRedDisk)
     goto loc_g_6A9C;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Release Red disk: no move ...
@@ -545,19 +668,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);
+  MovHighByte(&PlayField16[*si], 0x2A);
   MovingPictureSequencePhase = 0x40; // init picture move sequence
   dx = aniRedDisk;
   MovLowByte(&RedDiskReleasePhase, 1);
-  Mov(&RedDiskReleaseMurphyPos, si);             // remember Murphy's location
+  Mov(&RedDiskReleaseMurphyPos, *si);             // remember Murphy's location
   goto loc_Split;
 
   // ==========================================================================
@@ -565,10 +688,10 @@ loc_g_62E2:
   // ==========================================================================
 
 loc_g_6312:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si - FieldWidth] = 0x103;
-  PlayField16[si] = 0x300;
-  si = si - FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si - FieldWidth] = 0x103;
+  PlayField16[*si] = 0x300;
+  *si = *si - FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -577,9 +700,9 @@ loc_g_6312:
 
 loc_g_6341:
   dx = aniMurphyEatLeft;
-  PlayField16[si - 1] = 0x203;
-  PlayField16[si] = 0x300;
-  si = si - 1;
+  PlayField16[*si - 1] = 0x203;
+  PlayField16[*si] = 0x300;
+  *si = *si - 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -587,10 +710,10 @@ loc_g_6341:
   // ==========================================================================
 
 loc_g_6364:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si + FieldWidth] = 0x303;
-  PlayField16[si] = 0x300;
-  si = si + FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si + FieldWidth] = 0x303;
+  PlayField16[*si] = 0x300;
+  *si = *si + FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -599,9 +722,9 @@ loc_g_6364:
 
 loc_g_6399:
   dx = aniMurphyEatRight;
-  PlayField16[si + 1] = 0x403;
-  PlayField16[si] = 0x300;
-  si = si + 1;
+  PlayField16[*si + 1] = 0x403;
+  PlayField16[*si] = 0x300;
+  *si = *si + 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -609,23 +732,24 @@ loc_g_6399:
   // ==========================================================================
 
 loc_g_63C2:
-  if (SgnHighByte(PlayField16[si - FieldWidth]) >= 0)
+  if (SgnHighByte(PlayField16[*si - FieldWidth]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si - FieldWidth] = fiBase;
+  PlayField16[*si - FieldWidth] = fiBase;
   // ==========================================================================
   // BASE moving down to up
   // ==========================================================================
 
 loc_g_63D3:
   subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si - FieldWidth] = 0x503;
-  PlayField16[si] = 0x300;
-  si = si - FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si - FieldWidth] = 0x503;
+  PlayField16[*si] = 0x300;
+  *si = *si - FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -633,13 +757,14 @@ loc_g_63D3:
   // ==========================================================================
 
 loc_g_640B:
-  if (SgnHighByte(PlayField16[si - 1]) >= 0)
+  if (SgnHighByte(PlayField16[*si - 1]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si - 1] = fiBase;
+  PlayField16[*si - 1] = fiBase;
   // ==========================================================================
   // BASE moving right to left
   // ==========================================================================
@@ -647,9 +772,9 @@ loc_g_640B:
 loc_g_641C:
   subSoundFXBase();
   dx = aniMurphyEatLeft;
-  PlayField16[si - 1] = 0x203;
-  PlayField16[si] = 0x300;
-  si = si - 1;
+  PlayField16[*si - 1] = 0x203;
+  PlayField16[*si] = 0x300;
+  *si = *si - 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -657,23 +782,24 @@ loc_g_641C:
   // ==========================================================================
 
 loc_g_6448:
-  if (SgnHighByte(PlayField16[si + FieldWidth]) >= 0)
+  if (SgnHighByte(PlayField16[*si + FieldWidth]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si + FieldWidth] = fiBase;
+  PlayField16[*si + FieldWidth] = fiBase;
   // ==========================================================================
   // BASE moving up to down
   // ==========================================================================
 
 loc_g_6459:
   subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si + FieldWidth] = 0x703;
-  PlayField16[si] = 0x300;
-  si = si + FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si + FieldWidth] = 0x703;
+  PlayField16[*si] = 0x300;
+  *si = *si + FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -681,13 +807,14 @@ loc_g_6459:
   // ==========================================================================
 
 loc_g_6491:
-  if (SgnHighByte(PlayField16[si + 1]) >= 0)
+  if (SgnHighByte(PlayField16[*si + 1]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si + 1] = fiBase;
+  PlayField16[*si + 1] = fiBase;
   // ==========================================================================
   // BASE moving left to right
   // ==========================================================================
@@ -695,9 +822,9 @@ loc_g_6491:
 loc_g_64A2:
   subSoundFXBase();
   dx = aniMurphyEatRight;
-  PlayField16[si + 1] = 0x803;
-  PlayField16[si] = 0x300;
-  si = si + 1;
+  PlayField16[*si + 1] = 0x803;
+  PlayField16[*si] = 0x300;
+  *si = *si + 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -705,23 +832,24 @@ loc_g_64A2:
   // ==========================================================================
 
 loc_g_64CE:
-  if (SgnHighByte(PlayField16[si - FieldWidth]) >= 0)
+  if (SgnHighByte(PlayField16[*si - FieldWidth]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si - FieldWidth] = fiBase;
+  PlayField16[*si - FieldWidth] = fiBase;
   // ==========================================================================
   // BASE touching down to up
   // ==========================================================================
 
 loc_g_64DF:
-  subCopyFieldToScreen(si, aniMurphyTouchUp);
+  subCopyImageToScreen(*si, aniMurphyTouchUp);
   subSoundFXBase();
   dx = aniTouchBase;
-  dxPos = si - FieldWidth;
-  MovHighByte(&PlayField16[si], 0x10);
+  dxPos = *si - FieldWidth;
+  MovHighByte(&PlayField16[*si], 0x10);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -729,23 +857,24 @@ loc_g_64DF:
   // ==========================================================================
 
 loc_g_650C:
-  if (SgnHighByte(PlayField16[si - 1]) >= 0)
+  if (SgnHighByte(PlayField16[*si - 1]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si - 1] = fiBase;
+  PlayField16[*si - 1] = fiBase;
   // ==========================================================================
   // BASE touching right to left
   // ==========================================================================
 
 loc_g_651D:
-  subCopyFieldToScreen(si, aniMurphyTouchLeft);
+  subCopyImageToScreen(*si, aniMurphyTouchLeft);
   subSoundFXBase();
   dx = aniTouchBase;
-  dxPos = si - 1;
-  MovHighByte(&PlayField16[si], 0x11);
+  dxPos = *si - 1;
+  MovHighByte(&PlayField16[*si], 0x11);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -753,23 +882,24 @@ loc_g_651D:
   // ==========================================================================
 
 loc_g_654A:
-  if (SgnHighByte(PlayField16[si + FieldWidth]) >= 0)
+  if (SgnHighByte(PlayField16[*si + FieldWidth]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si + FieldWidth] = fiBase;
+  PlayField16[*si + FieldWidth] = fiBase;
   // ==========================================================================
   // BASE touching up to down
   // ==========================================================================
 
 loc_g_655B:
-  subCopyFieldToScreen(si, aniMurphyTouchDown);
+  subCopyImageToScreen(*si, aniMurphyTouchDown);
   subSoundFXBase();
   dx = aniTouchBase;
-  dxPos = si + FieldWidth;
-  MovHighByte(&PlayField16[si], 0x12);
+  dxPos = *si + FieldWidth;
+  MovHighByte(&PlayField16[*si], 0x12);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -777,23 +907,24 @@ loc_g_655B:
   // ==========================================================================
 
 loc_g_6588:
-  if (SgnHighByte(PlayField16[si + 1]) >= 0)
+  if (SgnHighByte(PlayField16[*si + 1]) >= 0)
   {
-    ExplodeFieldSP(si);                 // Explode
-    return subAnimateMurphy;
+    ExplodeFieldSP(*si);                 // Explode
+
+    return;
   }
 
-  PlayField16[si + 1] = fiBase;
+  PlayField16[*si + 1] = fiBase;
   // ==========================================================================
   // BASE touching left to right
   // ==========================================================================
 
 loc_g_6599:
-  subCopyFieldToScreen(si, aniMurphyTouchRight);
+  subCopyImageToScreen(*si, aniMurphyTouchRight);
   subSoundFXBase();
   dx = aniTouchBase;
-  dxPos = si + 1;
-  MovHighByte(&PlayField16[si], 0x13);
+  dxPos = *si + 1;
+  MovHighByte(&PlayField16[*si], 0x13);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -802,10 +933,10 @@ loc_g_6599:
 
 loc_g_65C6:
   subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si - FieldWidth] = 0x903;
-  PlayField16[si] = 0x300;
-  si = si - FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si - FieldWidth] = 0x903;
+  PlayField16[*si] = 0x300;
+  *si = *si - FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -818,9 +949,9 @@ loc_g_65FE:
   dx2 = fiInfotron;
   dx2Step = -1;
   ClearPos = -1;
-  PlayField16[si - 1] = 0xA03;
-  PlayField16[si] = 0x300;
-  si = si - 1;
+  PlayField16[*si - 1] = 0xA03;
+  PlayField16[*si] = 0x300;
+  *si = *si - 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -829,10 +960,10 @@ loc_g_65FE:
 
 loc_g_662A:
   subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si + FieldWidth] = 0xB03;
-  PlayField16[si] = 0x300;
-  si = si + FieldWidth;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si + FieldWidth] = 0xB03;
+  PlayField16[*si] = 0x300;
+  *si = *si + FieldWidth;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -845,9 +976,9 @@ loc_g_6662:
   dx2 = fiInfotron;
   dx2Step = 1;
   ClearPos = -1;
-  PlayField16[si + 1] = 0xC03;
-  PlayField16[si] = 0x300;
-  si = si + 1;
+  PlayField16[*si + 1] = 0xC03;
+  PlayField16[*si] = 0x300;
+  *si = *si + 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -855,11 +986,11 @@ loc_g_6662:
   // ==========================================================================
 
 loc_g_668E:
-  subCopyFieldToScreen(si, aniMurphyTouchUp);
+  subCopyImageToScreen(*si, aniMurphyTouchUp);
   subSoundFXInfotron();
   dx = aniTouchInfotron;
-  MovHighByte(&PlayField16[si], 0x14);
-  MovHighByte(&PlayField16[si - FieldWidth], 0xFF);
+  MovHighByte(&PlayField16[*si], 0x14);
+  MovHighByte(&PlayField16[*si - FieldWidth], 0xFF);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -867,11 +998,11 @@ loc_g_668E:
   // ==========================================================================
 
 loc_g_66C0:
-  subCopyFieldToScreen(si, aniMurphyTouchLeft);
+  subCopyImageToScreen(*si, aniMurphyTouchLeft);
   subSoundFXInfotron();
   dx = aniTouchInfotron;
-  MovHighByte(&PlayField16[si], 0x15);
-  MovHighByte(&PlayField16[si - 1], 0xFF);
+  MovHighByte(&PlayField16[*si], 0x15);
+  MovHighByte(&PlayField16[*si - 1], 0xFF);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -879,11 +1010,11 @@ loc_g_66C0:
   // ==========================================================================
 
 loc_g_66F2:
-  subCopyFieldToScreen(si, aniMurphyTouchDown);
+  subCopyImageToScreen(*si, aniMurphyTouchDown);
   subSoundFXInfotron();
   dx = aniTouchInfotron;
-  MovHighByte(&PlayField16[si], 0x16);
-  MovHighByte(&PlayField16[si + FieldWidth], 0xFF);
+  MovHighByte(&PlayField16[*si], 0x16);
+  MovHighByte(&PlayField16[*si + FieldWidth], 0xFF);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -891,11 +1022,11 @@ loc_g_66F2:
   // ==========================================================================
 
 loc_g_6724:
-  subCopyFieldToScreen(si, aniMurphyTouchRight);
+  subCopyImageToScreen(*si, aniMurphyTouchRight);
   subSoundFXInfotron();
   dx = aniTouchInfotron;
-  MovHighByte(&PlayField16[si], 0x17);
-  MovHighByte(&PlayField16[si + 1], 0xFF);
+  MovHighByte(&PlayField16[*si], 0x17);
+  MovHighByte(&PlayField16[*si + 1], 0xFF);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -909,7 +1040,16 @@ loc_g_6756:
   MurphyDY = 0;
   // end of FS
   if (LowByte(InfotronsNeeded) != 0)
-    return subAnimateMurphy;
+    return;
+
+#if 1
+  if (!game_sp_info.LevelSolved)
+    printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber);
+#endif
+
+#if 1
+  game_sp_info.LevelSolved = TRUE;
+#endif
 
   subSoundFXExit();
   data_h_DemoDone = 1; // EP set level success bytes
@@ -930,7 +1070,7 @@ loc_g_6756:
 
   LeadOutCounter = 0x40;          // quit: start lead-out
   dx = aniMurphyExit;
-  MovHighByte(&PlayField16[si], 0xD);
+  MovHighByte(&PlayField16[*si], 0xD);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -938,17 +1078,17 @@ loc_g_6756:
   // ==========================================================================
 
 loc_g_679B:
-  ax = PlayField16[si - 2];
+  ax = PlayField16[*si - 2];
   if (ax != 0)
-    return subAnimateMurphy;
+    return;
 
-  MovHighByte(&PlayField16[si - 2], 1);
-  subCopyFieldToScreen(si, aniPushLeft); // draw pushing murphy
+  MovHighByte(&PlayField16[*si - 2], 1);
+  subCopyImageToScreen(*si, aniPushLeft); // draw pushing murphy
   dx = aniZonkRollLeft;
-  dxPos = si - 1;
+  dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
-  MovHighByte(&PlayField16[si], 0xE);
+  MovHighByte(&PlayField16[*si], 0xE);
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -956,21 +1096,21 @@ loc_g_679B:
   // ==========================================================================
 
 loc_g_67D4:
-  ax = PlayField16[si + 2];
+  ax = PlayField16[*si + 2];
   if (ax != 0)
-    return subAnimateMurphy;
+    return;
 
-  ax = PlayField16[si + FieldWidth + 1];
+  ax = PlayField16[*si + FieldWidth + 1];
   if (ax == 0) // zonk falls
-    return subAnimateMurphy;
+    return;
 
-  MovHighByte(&PlayField16[si + 2], 1);
-  subCopyFieldToScreen(si, aniPushRight); // draw pushing murphy
+  MovHighByte(&PlayField16[*si + 2], 1);
+  subCopyImageToScreen(*si, aniPushRight); // draw pushing murphy
   dx = aniZonkRollRight;
-  dxPos = si + 1;
+  dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
-  MovHighByte(&PlayField16[si], 0xF);
+  MovHighByte(&PlayField16[*si], 0xF);
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -978,15 +1118,21 @@ 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
-  TerminalState[si - FieldWidth] = 8;
+#if 1
+  // draw new terminal type
+  subCopyImageToScreen(*si - FieldWidth, aniTerminalActive);
+#else
+  subCopyFieldToScreen(*si - FieldWidth, 0x88); // draw new terminal type
+#endif
+  TerminalState[*si - FieldWidth] = 8;
   goto loc_g_68F0;
 
   // ==========================================================================
@@ -994,15 +1140,21 @@ 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
-  TerminalState[si - 1] = 8;
+#if 1
+  // draw new terminal type
+  subCopyImageToScreen(*si - 1, aniTerminalActive);
+#else
+  subCopyFieldToScreen(*si - 1, 0x88); // draw new terminal type
+#endif
+  TerminalState[*si - 1] = 8;
   goto loc_g_68F0;
 
   // ==========================================================================
@@ -1010,15 +1162,21 @@ 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
-  TerminalState[si + FieldWidth] = 8;
+#if 1
+  // draw new terminal type
+  subCopyImageToScreen(*si + FieldWidth, aniTerminalActive);
+#else
+  subCopyFieldToScreen(*si + FieldWidth, 0x88); // draw new terminal type
+#endif
+  TerminalState[*si + FieldWidth] = 8;
   goto loc_g_68F0;
 
   // ==========================================================================
@@ -1026,15 +1184,21 @@ 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
-  TerminalState[si + 1] = 8;
+#if 1
+  // draw new terminal type
+  subCopyImageToScreen(*si + 1, aniTerminalActive);
+#else
+  subCopyFieldToScreen(*si + 1, 0x88); // draw new terminal type
+#endif
+  TerminalState[*si + 1] = 8;
   // ==========================================================================
   // common TERMINAL stuff moving/touching from all directions
   // ==========================================================================
@@ -1048,20 +1212,20 @@ loc_g_68F0:
       ExplodeFieldSP (i);
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // PORT down to up, VERTICAL PORT, CROSS PORT all moving down to up
   // ==========================================================================
 
 loc_g_6916:
-  if (PlayField16[si - 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si - 2 * FieldWidth] != 0)
+    return;
 
   dx = aniSplitUpDown;
   dx2Step = -FieldWidth;
-  PlayField16[si] = 0x1803;
-  PlayField16[si - 2 * FieldWidth] = 0x300;
+  PlayField16[*si] = 0x1803;
+  PlayField16[*si - 2 * FieldWidth] = 0x300;
   goto loc_StopSplit;
 
   // ==========================================================================
@@ -1069,13 +1233,13 @@ loc_g_6916:
   // ==========================================================================
 
 loc_g_693A:
-  if (PlayField16[si - 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si - 2] != 0)
+    return;
 
   dx = aniMurphyEatLeft;
   dx2Step = -1;
-  PlayField16[si] = 0x1903;
-  PlayField16[si - 2] = 0x300;
+  PlayField16[*si] = 0x1903;
+  PlayField16[*si - 2] = 0x300;
   goto loc_StopSplit;
 
   // ==========================================================================
@@ -1083,13 +1247,13 @@ loc_g_693A:
   // ==========================================================================
 
 loc_g_695E:
-  if (PlayField16[si + 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si + 2 * FieldWidth] != 0)
+    return;
 
   dx = aniSplitUpDown;
   dx2Step = FieldWidth;
-  PlayField16[si] = 0x1A03;
-  PlayField16[si + 2 * FieldWidth] = 0x300;
+  PlayField16[*si] = 0x1A03;
+  PlayField16[*si + 2 * FieldWidth] = 0x300;
   goto loc_StopSplit;
 
   // ==========================================================================
@@ -1097,13 +1261,13 @@ loc_g_695E:
   // ==========================================================================
 
 loc_g_6982:
-  if (PlayField16[si + 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si + 2] != 0)
+    return;
 
   dx = aniMurphyEatRight;
   dx2Step = 1;
-  PlayField16[si] = 0x1B03;
-  PlayField16[si + 2] = 0x300;
+  PlayField16[*si] = 0x1B03;
+  PlayField16[*si + 2] = 0x300;
 
 loc_StopSplit:
   MovingPictureSequencePhase = 0; // stop picture move sequence
@@ -1115,9 +1279,9 @@ loc_StopSplit:
   // ==========================================================================
 
 loc_g_69A6:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si] = 0x1C03;
-  PlayField16[si - FieldWidth] = 0x300;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si] = 0x1C03;
+  PlayField16[*si - FieldWidth] = 0x300;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1126,9 +1290,9 @@ loc_g_69A6:
 
 loc_g_69CE:
   dx = aniMurphyEatLeft;
-  PlayField16[si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
-  PlayField16[si - 1] = 0x1D03;
-  si = si - 1;
+  PlayField16[*si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
+  PlayField16[*si - 1] = 0x1D03;
+  *si = *si - 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1136,9 +1300,9 @@ loc_g_69CE:
   // ==========================================================================
 
 loc_g_69F7:
-  dx = (MurphyVarFaceLeft == 0 ?  aniMurphyEatUpRight :  aniMurphyEatUpRight);
-  PlayField16[si] = 0x1E03;
-  PlayField16[si + FieldWidth] = 0x300;
+  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  PlayField16[*si] = 0x1E03;
+  PlayField16[*si + FieldWidth] = 0x300;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1158,16 +1322,22 @@ loc_g_6A1F:
   // We only correct Murphies x-location here, when the sequence starts.
   // 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
+    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
   // end of BugFix
   // --------------------------------------------------------------------------
-  PlayField16[si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
-  PlayField16[si + 1] = 0x1F03;
-  si = si + 1;
+  PlayField16[*si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
+  PlayField16[*si + 1] = 0x1F03;
+  *si = *si + 1;
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1176,8 +1346,8 @@ loc_g_6A1F:
 
 loc_g_6A48:
   dx = aniTouchRedDisk;
-  MovHighByte(&PlayField16[si], 0x20);
-  MovHighByte(&PlayField16[si - FieldWidth], 3);
+  MovHighByte(&PlayField16[*si], 0x20);
+  MovHighByte(&PlayField16[*si - FieldWidth], 3);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1186,8 +1356,8 @@ loc_g_6A48:
 
 loc_g_6A64:
   dx = aniTouchRedDisk;
-  MovHighByte(&PlayField16[si], 0x21);
-  MovHighByte(&PlayField16[si - 1], 3);
+  MovHighByte(&PlayField16[*si], 0x21);
+  MovHighByte(&PlayField16[*si - 1], 3);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1196,8 +1366,8 @@ loc_g_6A64:
 
 loc_g_6A80:
   dx = aniTouchRedDisk;
-  MovHighByte(&PlayField16[si], 0x22);
-  MovHighByte(&PlayField16[si + FieldWidth], 3);
+  MovHighByte(&PlayField16[*si], 0x22);
+  MovHighByte(&PlayField16[*si + FieldWidth], 3);
   goto loc_StopNoSplit;
 
   // ==========================================================================
@@ -1206,8 +1376,8 @@ loc_g_6A80:
 
 loc_g_6A9C:
   dx = aniTouchRedDisk;
-  MovHighByte(&PlayField16[si], 0x23);
-  MovHighByte(&PlayField16[si + 1], 3);
+  MovHighByte(&PlayField16[*si], 0x23);
+  MovHighByte(&PlayField16[*si + 1], 3);
 
 loc_StopNoSplit:
   MovingPictureSequencePhase = 0; // stop picture move sequence
@@ -1218,16 +1388,16 @@ loc_StopNoSplit:
   // ==========================================================================
 
 loc_g_6AB8:
-  if (PlayField16[si - 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si - 2 * FieldWidth] != 0)
+    return;
 
-  PlayField16[si - 2 * FieldWidth] = 0x1200;
-  subCopyFieldToScreen(si, aniPushRight);
+  PlayField16[*si - 2 * FieldWidth] = 0x1200;
+  subCopyImageToScreen(*si, aniPushRight);
   dx = aniYellowDisk;
-  dxPos = si - FieldWidth;
+  dxPos = *si - FieldWidth;
   dx2 = aniPushUpDown;
   dx2Step = FieldWidth;
-  PlayField16[si] = 0x2403;
+  PlayField16[*si] = 0x2403;
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1235,16 +1405,16 @@ loc_g_6AB8:
   // ==========================================================================
 
 loc_g_6AF1:
-  if (PlayField16[si - 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si - 2] != 0)
+    return;
 
-  PlayField16[si - 2] = 0x1200;
-  subCopyFieldToScreen(si, aniPushLeft);
+  PlayField16[*si - 2] = 0x1200;
+  subCopyImageToScreen(*si, aniPushLeft);
   dx = aniYellowDisk;
-  dxPos = si - 1;
+  dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
-  PlayField16[si] = 0x2503;
+  PlayField16[*si] = 0x2503;
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1252,16 +1422,16 @@ loc_g_6AF1:
   // ==========================================================================
 
 loc_g_6B2A:
-  if (PlayField16[si + 2 * FieldWidth] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si + 2 * FieldWidth] != 0)
+    return;
 
-  PlayField16[si + 2 * FieldWidth] = 0x1200;
-  subCopyFieldToScreen(si, aniPushRight);
+  PlayField16[*si + 2 * FieldWidth] = 0x1200;
+  subCopyImageToScreen(*si, aniPushRight);
   dx = aniYellowDisk;
-  dxPos = si + FieldWidth;
+  dxPos = *si + FieldWidth;
   dx2 = aniPushUpDown;
   dx2Step = -FieldWidth;
-  PlayField16[si] = 0x2703;
+  PlayField16[*si] = 0x2703;
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1269,16 +1439,16 @@ loc_g_6B2A:
   // ==========================================================================
 
 loc_g_6B63:
-  if (PlayField16[si + 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si + 2] != 0)
+    return;
 
-  PlayField16[si + 2] = 0x1200;
-  subCopyFieldToScreen(si, aniPushRight);
+  PlayField16[*si + 2] = 0x1200;
+  subCopyImageToScreen(*si, aniPushRight);
   dx = aniYellowDisk;
-  dxPos = si + 1;
+  dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
-  PlayField16[si] = 0x2603;
+  PlayField16[*si] = 0x2603;
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1286,16 +1456,16 @@ loc_g_6B63:
   // ==========================================================================
 
 loc_g_6B9B:
-  if (PlayField16[si - 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si - 2] != 0)
+    return;
 
-  PlayField16[si - 2] = 0x800;
-  subCopyFieldToScreen(si, aniPushLeft);
+  PlayField16[*si - 2] = 0x800;
+  subCopyImageToScreen(*si, aniPushLeft);
   dx = aniOrangeDisk;
-  dxPos = si - 1;
+  dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
-  PlayField16[si] = 0x2803;
+  PlayField16[*si] = 0x2803;
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1303,19 +1473,19 @@ loc_g_6B9B:
   // ==========================================================================
 
 loc_g_6BD3:
-  if (PlayField16[si + 2] != 0)
-    return subAnimateMurphy;
+  if (PlayField16[*si + 2] != 0)
+    return;
 
-  if (PlayField16[si + FieldWidth + 1] == 0) // falling goes before pushing
-    return subAnimateMurphy;
+  if (PlayField16[*si + FieldWidth + 1] == 0) // falling goes before pushing
+    return;
 
-  PlayField16[si + 2] = 0x100;
-  subCopyFieldToScreen(si, aniPushRight);
+  PlayField16[*si + 2] = 0x100;
+  subCopyImageToScreen(*si, aniPushRight);
   dx = aniOrangeDisk;
-  dxPos = si + 1;
+  dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
-  PlayField16[si] = 0x2903;
+  PlayField16[*si] = 0x2903;
   // ==========================================================================
   // Copy screen animation action table to action work space
   // (To paint sequence: Push Zonk/Disk / release red disk / Port passing)
@@ -1345,7 +1515,7 @@ locProceedMovingMurphy: // proceed moving murphy
   if (ax == 0) // Sound effects
     subSoundFXPush();
 
-  bl = HighByte(PlayField16[si]);
+  bl = HighByte(PlayField16[*si]);
   if (bl == 0xE)        // Push Zonk to left
     goto loc_g_6F7E;
 
@@ -1373,7 +1543,7 @@ locProceedMovingMurphy: // proceed moving murphy
   if (bl == 0x2A)       // Red disk release timer
     goto loc_g_716E;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Paint frame of MOVING.DAT sequence
@@ -1384,10 +1554,51 @@ loc_g_6C8F:
   {
     // ++++++++++++++++++++++++++
     // Begin of normal movement
+#if 1
+    MurphyScreenXPos = MurphyScreenXPos + MurphyDX * MurphyZoomFactor;
+    MurphyScreenYPos = MurphyScreenYPos + MurphyDY * MurphyZoomFactor;
+#else
     MurphyScreenXPos = MurphyScreenXPos + MurphyDX;
     MurphyScreenYPos = MurphyScreenYPos + MurphyDY;
+#endif
+
+
+#if 0
+  printf("::: %04d [%03ld, %02d] ----------> %s [%d] [%d, %d] [%d, %d] [%d]\n",
+	 TimerVar,
+	 DemoOffset - DemoPointer, DemoKeyRepeatCounter,
+	 (DemoKeyCode == keyNone	? "(none)"		:
+	  DemoKeyCode == keyLeft	? "left"		:
+	  DemoKeyCode == keyRight	? "right"		:
+	  DemoKeyCode == keyUp		? "up"			:
+	  DemoKeyCode == keyDown	? "down"		:
+	  DemoKeyCode == keySpace	? "space"		:
+	  DemoKeyCode == keySpaceLeft	? "space + left"	:
+	  DemoKeyCode == keySpaceRight	? "space + right"	:
+	  DemoKeyCode == keySpaceUp	? "space + up"		:
+	  DemoKeyCode == keySpaceDown	? "space + down"	: "(unknown)"),
+	 DemoKeyCode,
+	 MurphyScreenXPos, MurphyScreenYPos,
+	 MurphyPosIndex % 60, MurphyPosIndex / 60,
+	 ClearPos);
+#endif
+
+#if 0
+  Delay(500);
+#endif
+
+#if 1
+    if (!(ClearPos < 0)) // clear field that murphy is leaving
+      subCopyImageToScreen(ClearPos, aniSpace);
+#else
     if (! ClearPos < 0) // clear field that murphy is leaving
       subCopyFieldToScreen(ClearPos, 0);
+#endif
+
+#if 0
+    printf("::: ---------------> %d, %d [%d, %d]\n",
+	   MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY);
+#endif
 
     if (dx2 == fiInfotron) // special case of infotron moving left or right
     {
@@ -1402,9 +1613,14 @@ loc_g_6C8F:
 
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
-    Tmp = (SeqPos < 0 ?  0 :  0); // 9StepBugFix!(red disk move right)
+    Tmp = (SeqPos < 0 ? 0 : SeqPos); // 9StepBugFix!(red disk move right)
     StretchedSprites.BltEx(X, Y, dx[Tmp]);
+
+#if 1
+    if (!(dx2 < 0))
+#else
     if (! dx2 < 0)
+#endif
     {
       tPos = dxPos + dx2Step;
       X = GetStretchX(tPos);
@@ -1415,7 +1631,12 @@ loc_g_6C8F:
       }
       else // pushing something
       {
+#if 1
+	// (SeqPos iterates from 0 to 7 while pushing)
+        StretchedSprites.BltImg(X + tDeltaX, Y + tDeltaY, dx2, SeqPos);
+#else
         StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx2);
+#endif
       }
     }
 
@@ -1426,9 +1647,14 @@ 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;
-    subCopyFieldToScreen(ClearPos, 0); // clear the field that murphy leaves
+#endif
+    subCopyImageToScreen(ClearPos, aniSpace); // clear the field that murphy leaves
     tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
     tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
     X = GetStretchX(dxPos) + tDeltaX;
@@ -1445,13 +1671,13 @@ loc_g_6C8F:
 
   SeqPos = SeqPos + 1;
   if (dx[SeqPos] > -1)
-    return subAnimateMurphy;
+    return;
 
   // Follow-up after movement completed     'loc_g_6D35:
   MurphyXPos = MurphyXPos + MurphyDX;
   MurphyYPos = MurphyYPos + MurphyDY;
-  bl = HighByte(PlayField16[si]);  // animation phase
-  MovHighByte(&PlayField16[si], 0);
+  bl = HighByte(PlayField16[*si]);  // animation phase
+  MovHighByte(&PlayField16[*si], 0);
 
   if (bl == 0x1)    // space, moving up
     goto loc_g_6EC8;
@@ -1580,7 +1806,8 @@ loc_g_6C8F:
     goto loc_g_747F;
 
   ExitToMenuFlag = 1;
-  return subAnimateMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving up
@@ -1592,9 +1819,10 @@ loc_g_6EBA:
 
   subDisplayInfotronsNeeded();
 loc_g_6EC8: // space, base
-  PlayField16[si] = fiMurphy;
-  subAdjustZonksInfotronsAboveMurphy(si + FieldWidth);
-  return subAnimateMurphy;
+  PlayField16[*si] = fiMurphy;
+  subAdjustZonksInfotronsAboveMurphy(*si + FieldWidth);
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving left
@@ -1606,9 +1834,10 @@ loc_g_6ED8:
 
   subDisplayInfotronsNeeded();
 loc_g_6EE6: // space, base
-  PlayField16[si] = fiMurphy;
-  subAdjustZonksInfotronsAboveMurphy(si + 1);
-  return subAnimateMurphy;
+  PlayField16[*si] = fiMurphy;
+  subAdjustZonksInfotronsAboveMurphy(*si + 1);
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving down
@@ -1620,11 +1849,12 @@ loc_g_6EF6:
 
   subDisplayInfotronsNeeded();
 loc_g_6F04: // space, base
-  if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
-    PlayField16[si - FieldWidth] = 0;
+  if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
+    PlayField16[*si - FieldWidth] = 0;
 
-  PlayField16[si] = fiMurphy;
-  return subAnimateMurphy;
+  PlayField16[*si] = fiMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, moving right
@@ -1636,9 +1866,10 @@ loc_g_71B6:
 
   subDisplayInfotronsNeeded();
 loc_g_71C4: // space, base
-  subAdjustZonksInfotronsAboveMurphy(si - 1);
-  PlayField16[si] = fiMurphy;
-  return subAnimateMurphy;
+  subAdjustZonksInfotronsAboveMurphy(*si - 1);
+  PlayField16[*si] = fiMurphy;
+
+  return;
 
   // ==========================================================================
   //                       infotron, touching up
@@ -1650,10 +1881,10 @@ loc_g_71D4:
 
   subDisplayInfotronsNeeded();
 loc_g_71E2: // base
-  if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
-    PlayField16[si - FieldWidth] = 0;
+  if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
+    PlayField16[*si - FieldWidth] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching left
@@ -1665,10 +1896,10 @@ loc_g_71F0:
 
   subDisplayInfotronsNeeded();
 loc_g_71FE: // base
-  if (LowByte(PlayField16[si - 1]) != fiExplosion)
-    PlayField16[si - 1] = 0;
+  if (LowByte(PlayField16[*si - 1]) != fiExplosion)
+    PlayField16[*si - 1] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching down
@@ -1680,10 +1911,10 @@ loc_g_720C:
 
   subDisplayInfotronsNeeded();
 loc_g_721A: // base
-  if (LowByte(PlayField16[si + FieldWidth]) != fiExplosion)
-    PlayField16[si + FieldWidth] = 0;
+  if (LowByte(PlayField16[*si + FieldWidth]) != fiExplosion)
+    PlayField16[*si + FieldWidth] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       infotron, touching right
@@ -1695,38 +1926,40 @@ loc_g_7228:
 
   subDisplayInfotronsNeeded();
 loc_g_7236: // base
-  if (LowByte(PlayField16[si + 1]) != fiExplosion)
-    PlayField16[si + 1] = 0;
+  if (LowByte(PlayField16[*si + 1]) != fiExplosion)
+    PlayField16[*si + 1] = 0;
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       zonk, pushing left
   // ==========================================================================
 
 loc_g_6F18:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
+
+  PlayField16[*si - 1] = fiMurphy;
+  PlayField16[*si - 2] = fiZonk;
+  subExplodeSnikSnaksBelow(*si - 2);
+  *si = *si - 1;
 
-  PlayField16[si - 1] = fiMurphy;
-  PlayField16[si - 2] = fiZonk;
-  subExplodeSnikSnaksBelow(si - 2);
-  si = si - 1;
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       zonk, pushing right
   // ==========================================================================
 
 loc_g_6F3B:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  PlayField16[si + 1] = fiMurphy;
-  PlayField16[si + 2] = fiZonk;
-  subExplodeSnikSnaksBelow(si + 2);
-  si = si + 1;
-  return subAnimateMurphy;
+  PlayField16[*si + 1] = fiMurphy;
+  PlayField16[*si + 2] = fiZonk;
+  subExplodeSnikSnaksBelow(*si + 2);
+  *si = *si + 1;
+
+  return;
 
   // ==========================================================================
   //                       exit
@@ -1734,135 +1967,148 @@ loc_g_6F3B:
 
 loc_g_6F77:
   ExitToMenuFlag = 1;
-  return subAnimateMurphy;
+
+#if 1
+  PlayField16[*si] = fiSpace;	// remove Murphy from playfield after exiting
+#endif
+
+  return;
 
   // ==========================================================================
   //               Push Zonk from right to left
   // ==========================================================================
 
 loc_g_6F7E:
-  if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiZonk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiZonk)
+    return;
+
+  PlayField16[*si] = fiMurphy; // else restore - no more zonk pushing!
+  PlayField16[*si - 1] = fiZonk;
+  if (LowByte(PlayField16[*si - 2]) != fiExplosion)
+    PlayField16[*si - 2] = 0;
 
-  PlayField16[si] = fiMurphy; // else restore - no more zonk pushing!
-  PlayField16[si - 1] = fiZonk;
-  if (LowByte(PlayField16[si - 2]) != fiExplosion)
-    PlayField16[si - 2] = 0;
+  subCopyImageToScreen(*si, aniMurphy);
 
-  subCopyFieldToScreen(si, fiMurphy);
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       Push Zonk from left to right
   // ==========================================================================
 
 loc_g_6FBC:
-  if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiZonk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiZonk)
+    return;
+
+  PlayField16[*si] = fiMurphy; // else restore - no more zonk pushing!
+  PlayField16[*si + 1] = fiZonk;
+  if (LowByte(PlayField16[*si + 2]) != fiExplosion)
+    PlayField16[*si + 2] = 0;
 
-  PlayField16[si] = fiMurphy; // else restore - no more zonk pushing!
-  PlayField16[si + 1] = fiZonk;
-  if (LowByte(PlayField16[si + 2]) != fiExplosion)
-    PlayField16[si + 2] = 0;
+  subCopyImageToScreen(*si, aniMurphy);
 
-  subCopyFieldToScreen(si, fiMurphy);
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //               Push orange disk from right to left
   // ==========================================================================
 
 loc_g_6FFA:
-  if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiOrangeDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiOrangeDisk)
+    return;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si - 1] = fiOrangeDisk;
-  if (LowByte(PlayField16[si - 2]) != fiExplosion)
-    PlayField16[si - 2] = 0;
+  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
   // ==========================================================================
 
 loc_g_7038:
-  if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiOrangeDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiOrangeDisk)
+    return;
+
+  PlayField16[*si] = fiMurphy; // else restore - no more pushing!
+  PlayField16[*si + 1] = fiOrangeDisk;
+  if (LowByte(PlayField16[*si + 2]) != fiExplosion)
+    PlayField16[*si + 2] = 0;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si + 1] = fiOrangeDisk;
-  if (LowByte(PlayField16[si + 2]) != fiExplosion)
-    PlayField16[si + 2] = 0;
+  subCopyImageToScreen(*si, aniMurphy);
 
-  subCopyFieldToScreen(si, fiMurphy);
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //               Push yellow disk from down to up
   // ==========================================================================
 
 loc_g_7076:
-  if (DemoKeyCode == keyUp && PlayField16[si - FieldWidth] == fiYellowDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyUp && PlayField16[*si - FieldWidth] == fiYellowDisk)
+    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;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si - FieldWidth] = fiYellowDisk;
-  if (LowByte(PlayField16[si - 2 * FieldWidth]) != fiExplosion)
-    PlayField16[si - 2 * FieldWidth] = 0;
+  subCopyImageToScreen(*si, aniMurphy);
 
-  subCopyFieldToScreen(si, fiMurphy);
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //               Push yellow disk from right to left
   // ==========================================================================
 
 loc_g_70B4:
-  if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiYellowDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyLeft && PlayField16[*si - 1] == fiYellowDisk)
+    return;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si - 1] = fiYellowDisk;
-  if (LowByte(PlayField16[si - 2]) != fiExplosion)
-    PlayField16[si - 2] = 0;
+  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
   // ==========================================================================
 
 loc_g_70F2:
-  if (DemoKeyCode == keyDown && PlayField16[si + FieldWidth] == fiYellowDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyDown && PlayField16[*si + FieldWidth] == fiYellowDisk)
+    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;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si + FieldWidth] = fiYellowDisk;
-  if (LowByte(PlayField16[si + 2 * FieldWidth]) != fiExplosion)
-    PlayField16[si + 2 * FieldWidth] = 0;
+  subCopyImageToScreen(*si, aniMurphy);
 
-  subCopyFieldToScreen(si, fiMurphy);
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //               Push yellow disk from left to right
   // ==========================================================================
 
 loc_g_7130:
-  if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiYellowDisk)
-    return subAnimateMurphy;
+  if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiYellowDisk)
+    return;
 
-  PlayField16[si] = fiMurphy; // else restore - no more pushing!
-  PlayField16[si + 1] = fiYellowDisk;
-  if (LowByte(PlayField16[si + 2]) != fiExplosion)
-    PlayField16[si + 2] = 0;
+  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)
@@ -1871,292 +2117,308 @@ loc_g_7130:
 loc_g_716E:
   if (DemoKeyCode != keySpace)
   {
-    PlayField16[si] = fiMurphy;
-    subCopyFieldToScreen(si, fiMurphy);
+    PlayField16[*si] = fiMurphy;
+    subCopyImageToScreen(*si, aniMurphy);
     RedDiskReleasePhase = 0;
   }
   else if (MovingPictureSequencePhase == 0x20)
   {
-    subCopyFieldToScreen(si, 43);  // anxious murphy
+#if 1
+    // anxious murphy, dropping red disk
+    subCopyImageToScreen(*si, aniMurphyDropping);
+#else
+    subCopyFieldToScreen(*si, 43);  // anxious murphy
+#endif
     RedDiskReleasePhase = 1;
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Special port down to up
   // ==========================================================================
 
 loc_g_7244:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  PlayField16[si - 2 * FieldWidth] = fiMurphy;
+  PlayField16[*si - 2 * FieldWidth] = fiMurphy;
   SplitMoveFlag = 0;
-  si = si - FieldWidth;
-  if (HighByte(PlayField16[si]) == 1)
-    subSpPortTest(si);
+  *si = *si - FieldWidth;
+  if (HighByte(PlayField16[*si]) == 1)
+    subSpPortTest(*si);
+
+  *si = *si - FieldWidth;
 
-  si = si - FieldWidth;
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Special port right to left
   // ==========================================================================
 
 loc_g_7272:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  PlayField16[si - 2] = fiMurphy;
+  PlayField16[*si - 2] = fiMurphy;
   SplitMoveFlag = 0;
-  si = si - 1;
-  if (HighByte(PlayField16[si]) == 1)
-    subSpPortTest(si);
+  *si = *si - 1;
+  if (HighByte(PlayField16[*si]) == 1)
+    subSpPortTest(*si);
+
+  *si = *si - 1;
 
-  si = si - 1;
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Special port up to down
   // ==========================================================================
 
 loc_g_729F:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  PlayField16[si + 2 * FieldWidth] = fiMurphy;
+  PlayField16[*si + 2 * FieldWidth] = fiMurphy;
   SplitMoveFlag = 0;
-  si = si + FieldWidth;
-  if (HighByte(PlayField16[si]) == 1)
-    subSpPortTest(si);
+  *si = *si + FieldWidth;
+  if (HighByte(PlayField16[*si]) == 1)
+    subSpPortTest(*si);
+
+  *si = *si + FieldWidth;
 
-  si = si + FieldWidth;
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Special port left to right
   // ==========================================================================
 
 loc_g_72CD:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  PlayField16[si + 2] = fiMurphy;
+  PlayField16[*si + 2] = fiMurphy;
   SplitMoveFlag = 0;
-  si = si + 1;
-  if (HighByte(PlayField16[si]) == 1)
-    subSpPortTest(si);
+  *si = *si + 1;
+  if (HighByte(PlayField16[*si]) == 1)
+    subSpPortTest(*si);
 
-  si = si + 1;
-  return subAnimateMurphy;
+  *si = *si + 1;
+
+  return;
 
   // ==========================================================================
   // Move Red Disk up
   // ==========================================================================
 
 loc_g_72FA:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
+
+  *si = *si - FieldWidth;
+  PlayField16[*si] = fiMurphy;
+  subEatRedDisk(*si); // inc+show Murphy's red disks
 
-  si = si - FieldWidth;
-  PlayField16[si] = fiMurphy;
-  subEatRedDisk(si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Move Red Disk left
   // ==========================================================================
 
 loc_g_7318:
-  if (LowByte(PlayField16[si + 1]) != fiExplosion)
-    PlayField16[si + 1] = 0;
+  if (LowByte(PlayField16[*si + 1]) != fiExplosion)
+    PlayField16[*si + 1] = 0;
+
+  PlayField16[*si] = fiMurphy;
+  subEatRedDisk(*si); // inc+show Murphy's red disks
 
-  PlayField16[si] = fiMurphy;
-  subEatRedDisk(si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Move Red Disk down
   // ==========================================================================
 
 loc_g_7333:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
+
+  *si = *si + FieldWidth;
+  PlayField16[*si] = fiMurphy;
+  subEatRedDisk(*si); // inc+show Murphy's red disks
 
-  si = si + FieldWidth;
-  PlayField16[si] = fiMurphy;
-  subEatRedDisk(si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Move Red Disk right
   // ==========================================================================
 
 loc_g_7351:
-  if (LowByte(PlayField16[si - 1]) != fiExplosion)
-    PlayField16[si - 1] = 0;
+  if (LowByte(PlayField16[*si - 1]) != fiExplosion)
+    PlayField16[*si - 1] = 0;
 
-  PlayField16[si] = fiMurphy;
-  subEatRedDisk(si); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  PlayField16[*si] = fiMurphy;
+  subEatRedDisk(*si); // inc+show Murphy's red disks
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk up
   // ==========================================================================
 
 loc_g_736C:
-  if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
-    PlayField16[si - FieldWidth] = 0;
+  if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
+    PlayField16[*si - FieldWidth] = 0;
+
+  subEatRedDisk(*si - FieldWidth); // inc+show Murphy's red disks
 
-  subEatRedDisk(si - FieldWidth); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Eat Red Disk left
   // ==========================================================================
 
 loc_g_7381:
-  if (LowByte(PlayField16[si - 1]) != fiExplosion)
-    PlayField16[si - 1] = 0;
+  if (LowByte(PlayField16[*si - 1]) != fiExplosion)
+    PlayField16[*si - 1] = 0;
+
+  subEatRedDisk(*si - 1); // inc+show Murphy's red disks
 
-  subEatRedDisk(si - 1); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   // Eat Red Disk down
   // ==========================================================================
 
 loc_g_7396:
-  if (LowByte(PlayField16[si + FieldWidth]) != fiExplosion)
-    PlayField16[si + FieldWidth] = 0;
+  if (LowByte(PlayField16[*si + FieldWidth]) != fiExplosion)
+    PlayField16[*si + FieldWidth] = 0;
 
-  subEatRedDisk(si + FieldWidth); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  subEatRedDisk(*si + FieldWidth); // inc+show Murphy's red disks
+
+  return;
 
   // ==========================================================================
   // Eat Red Disk right
   // ==========================================================================
 
 loc_g_73AB:
-  if (LowByte(PlayField16[si + 1]) != fiExplosion)
-    PlayField16[si + 1] = 0;
+  if (LowByte(PlayField16[*si + 1]) != fiExplosion)
+    PlayField16[*si + 1] = 0;
+
+  subEatRedDisk(*si + 1); // inc+show Murphy's red disks
 
-  subEatRedDisk(si + 1); // inc+show Murphy's red disks
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing up
   // ==========================================================================
 
 loc_g_73C0:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  si = si - FieldWidth;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si - FieldWidth] = fiYellowDisk;
-  return subAnimateMurphy;
+  *si = *si - FieldWidth;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si - FieldWidth] = fiYellowDisk;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing left
   // ==========================================================================
 
 loc_g_73DD:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  si = si - 1;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si - 1] = fiYellowDisk;
-  return subAnimateMurphy;
+  *si = *si - 1;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si - 1] = fiYellowDisk;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk, pushing down
   // ==========================================================================
 
 loc_g_73FA:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  si = si + FieldWidth;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si + FieldWidth] = fiYellowDisk;
-  return subAnimateMurphy;
+  *si = *si + FieldWidth;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si + FieldWidth] = fiYellowDisk;
+
+  return;
 
   // ==========================================================================
   //                       yellow disk pushing right
   // ==========================================================================
 
 loc_g_7417:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  si = si + 1;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si + 1] = fiYellowDisk;
-  return subAnimateMurphy;
+  *si = *si + 1;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si + 1] = fiYellowDisk;
+
+  return;
 
   // ==========================================================================
   //                       orange disk, pushing left
   // ==========================================================================
 
 loc_g_7434:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
+
+  *si = *si - 1;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si - 1] = fiOrangeDisk;
 
-  si = si - 1;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si - 1] = fiOrangeDisk;
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                       orange disk, pushing right
   // ==========================================================================
 
 loc_g_7451:
-  if (LowByte(PlayField16[si]) != fiExplosion)
-    PlayField16[si] = 0;
+  if (LowByte(PlayField16[*si]) != fiExplosion)
+    PlayField16[*si] = 0;
 
-  si = si + 1;
-  PlayField16[si] = fiMurphy;
-  PlayField16[si + 1] = fiOrangeDisk;
-  if (PlayField16[si + FieldWidth + 1] == 0) // make it fall down if below is empty
+  *si = *si + 1;
+  PlayField16[*si] = fiMurphy;
+  PlayField16[*si + 1] = fiOrangeDisk;
+  if (PlayField16[*si + FieldWidth + 1] == 0) // make it fall down if below is empty
   {
-    MovHighByte(&PlayField16[si + 1], 0x20);
-    MovHighByte(&PlayField16[si + FieldWidth + 1], fiOrangeDisk);
+    MovHighByte(&PlayField16[*si + 1], 0x20);
+    MovHighByte(&PlayField16[*si + FieldWidth + 1], fiOrangeDisk);
   }
 
-  return subAnimateMurphy;
+  return;
 
   // ==========================================================================
   //                     Release a red disk
   // ==========================================================================
 
 loc_g_747F:
-  PlayField16[si] = fiMurphy;
+  PlayField16[*si] = fiMurphy;
   RedDiskReleasePhase = 2;
   RedDiskCount = RedDiskCount - 1;
   subDisplayRedDiskCount();
   subSoundFXPush();                 // Sound effects
-
-  return subAnimateMurphy;
 } // 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
 
 // ==========================================================================
@@ -2247,6 +2509,34 @@ int subSpPortTest(int si)
 
   int i, cx, bx;
 
+#if 1
+  cx = LInfo.SpecialPortCount; // number of special ports
+
+  for (i = 0; i < cx; i++)
+  {
+#if 1
+    /* this assumes that PortLocation is stored as big endian */
+    bx = LInfo.SpecialPort[i].PortLocation;
+#else
+    /* this assumes that PortLocation is stored as little endian */
+    bx = HighByte(LInfo.SpecialPort[i].PortLocation);
+    MovHighByte(&bx, LowByte(LInfo.SpecialPort[i].PortLocation));
+#endif
+
+    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!
+
+      break;
+    }
+  }
+
+#else
+
   cx = LInfo.SpecialPortCount; // number of special ports
   for (i = 1; i <= cx; i++)
   {
@@ -2261,9 +2551,9 @@ int subSpPortTest(int si)
         //        RandomTime = RandomTime Xor RandomSeed 'is RandomTime used at all? no!
         i = cx + 1;
       }
-
     }
   }
+#endif
 
   return subSpPortTest;
 } // subSpPortTest
@@ -2279,6 +2569,22 @@ 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.BltImg(X, Y, graphic, sync_frame);
+  // +++++++++++++++++++++++++++++++++++++++++
+}
+
+void subCopyImageToScreen(int si, int graphic)
+{
+  subCopyAnimToScreen(si, graphic, 0);
+}
+
 static void subEatRedDisk(int si)
 {
   if (AllowRedDiskCheat == 0)
@@ -2294,10 +2600,8 @@ static void subEatRedDisk(int si)
   subDisplayRedDiskCount();
 }
 
-int subAdjustZonksInfotronsAboveMurphy(int si)
+void subAdjustZonksInfotronsAboveMurphy(int si)
 {
-  int subAdjustZonksInfotronsAboveMurphy;
-
   int ax;
 
   if (LowByte(PlayField16[si]) != fiExplosion)
@@ -2312,7 +2616,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];
@@ -2324,7 +2628,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];
@@ -2333,7 +2637,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];
@@ -2342,6 +2647,4 @@ loc_g_15E8: // zonk/infotron above right
     MovHighByte(&PlayField16[si - FieldWidth + 1], 0x50); // make roll left
     PlayField16[si - FieldWidth] = 0x8888;
   }
-
-  return subAdjustZonksInfotronsAboveMurphy;
 } // subAdjustZonksInfotronsAboveMurphy