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

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index 1c9cd8f5..ae4fd764 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -42,12 +42,14 @@ void subAnimateMurphy(int *si)
 
   // 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 dx1 = 0; // same as "*dx" above, but as 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;
 
   ax = PlayField16[*si];
   al = LowByte(ax);
@@ -71,7 +73,9 @@ void subAnimateMurphy(int *si)
 
   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
@@ -79,6 +83,7 @@ void subAnimateMurphy(int *si)
   MurphyDY = 0;
   ClearPos = *si;
   dxPos = *si;
+  dx1 = -1;
   dx2 = -1;
   SeqPos = 0;
   // end of FS
@@ -678,7 +683,8 @@ loc_g_62E2:
 
   MovHighByte(&PlayField16[*si], 0x2A);
   MovingPictureSequencePhase = 0x40; // init picture move sequence
-  dx = aniRedDisk;
+  dx = aniFramesRedDisk;
+  dx1 = aniRedDisk;
   MovLowByte(&RedDiskReleasePhase, 1);
   Mov(&RedDiskReleaseMurphyPos, *si);             // remember Murphy's location
   goto loc_Split;
@@ -688,7 +694,8 @@ loc_g_62E2:
   // ==========================================================================
 
 loc_g_6312:
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLeft);
   PlayField16[*si - FieldWidth] = 0x103;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -699,7 +706,8 @@ loc_g_6312:
   // ==========================================================================
 
 loc_g_6341:
-  dx = aniMurphyEatLeft;
+  dx = aniFramesMurphyEatLeft;
+  dx1 = aniMurphyMoveLeft;
   PlayField16[*si - 1] = 0x203;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -710,7 +718,8 @@ loc_g_6341:
   // ==========================================================================
 
 loc_g_6364:
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLeft);
   PlayField16[*si + FieldWidth] = 0x303;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -721,7 +730,8 @@ loc_g_6364:
   // ==========================================================================
 
 loc_g_6399:
-  dx = aniMurphyEatRight;
+  dx = aniFramesMurphyEatRight;
+  dx1 = aniMurphyMoveRight;
   PlayField16[*si + 1] = 0x403;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -745,8 +755,14 @@ loc_g_63C2:
   // ==========================================================================
 
 loc_g_63D3:
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+#endif
+
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
   PlayField16[*si - FieldWidth] = 0x503;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -770,8 +786,14 @@ loc_g_640B:
   // ==========================================================================
 
 loc_g_641C:
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniMurphyEatLeft;
+#endif
+
+  dx = aniFramesMurphyEatLeft;
+  dx1 = aniMurphyDigLeft;
   PlayField16[*si - 1] = 0x203;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -795,8 +817,14 @@ loc_g_6448:
   // ==========================================================================
 
 loc_g_6459:
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+#endif
+
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
   PlayField16[*si + FieldWidth] = 0x703;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -820,8 +848,14 @@ loc_g_6491:
   // ==========================================================================
 
 loc_g_64A2:
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniMurphyEatRight;
+#endif
+
+  dx = aniFramesMurphyEatRight;
+  dx1 = aniMurphyDigRight;
   PlayField16[*si + 1] = 0x803;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -846,8 +880,14 @@ loc_g_64CE:
 
 loc_g_64DF:
   subCopyImageToScreen(*si, aniMurphyTouchUp);
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniTouchBase;
+#endif
+
+  dx = aniFramesTouchBase;
+  dx1 = aniTouchBase;
   dxPos = *si - FieldWidth;
   MovHighByte(&PlayField16[*si], 0x10);
   goto loc_StopNoSplit;
@@ -871,8 +911,14 @@ loc_g_650C:
 
 loc_g_651D:
   subCopyImageToScreen(*si, aniMurphyTouchLeft);
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniTouchBase;
+#endif
+
+  dx = aniFramesTouchBase;
+  dx1 = aniTouchBase;
   dxPos = *si - 1;
   MovHighByte(&PlayField16[*si], 0x11);
   goto loc_StopNoSplit;
@@ -896,8 +942,14 @@ loc_g_654A:
 
 loc_g_655B:
   subCopyImageToScreen(*si, aniMurphyTouchDown);
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniTouchBase;
+#endif
+
+  dx = aniFramesTouchBase;
+  dx1 = aniTouchBase;
   dxPos = *si + FieldWidth;
   MovHighByte(&PlayField16[*si], 0x12);
   goto loc_StopNoSplit;
@@ -921,8 +973,14 @@ loc_g_6588:
 
 loc_g_6599:
   subCopyImageToScreen(*si, aniMurphyTouchRight);
+#if 1
+  subSoundFX(*si, fiBase, actDigging);
+#else
   subSoundFXBase();
-  dx = aniTouchBase;
+#endif
+
+  dx = aniFramesTouchBase;
+  dx1 = aniTouchBase;
   dxPos = *si + 1;
   MovHighByte(&PlayField16[*si], 0x13);
   goto loc_StopNoSplit;
@@ -932,8 +990,14 @@ loc_g_6599:
   // ==========================================================================
 
 loc_g_65C6:
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+#endif
+
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si - FieldWidth] = 0x903;
   PlayField16[*si] = 0x300;
   *si = *si - FieldWidth;
@@ -944,11 +1008,19 @@ loc_g_65C6:
   // ==========================================================================
 
 loc_g_65FE:
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniEatInfotronLeft;
+#endif
+
+  dx = aniFramesEatInfotronLeft;
+  dx1 = aniEatInfotronLeft;
+#if 0
   dx2 = fiInfotron;
   dx2Step = -1;
   ClearPos = -1;
+#endif
   PlayField16[*si - 1] = 0xA03;
   PlayField16[*si] = 0x300;
   *si = *si - 1;
@@ -959,8 +1031,14 @@ loc_g_65FE:
   // ==========================================================================
 
 loc_g_662A:
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+#endif
+
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si + FieldWidth] = 0xB03;
   PlayField16[*si] = 0x300;
   *si = *si + FieldWidth;
@@ -971,11 +1049,19 @@ loc_g_662A:
   // ==========================================================================
 
 loc_g_6662:
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniEatInfotronRight;
+#endif
+
+  dx = aniFramesEatInfotronRight;
+  dx1 = aniEatInfotronRight;
+#if 0
   dx2 = fiInfotron;
   dx2Step = 1;
   ClearPos = -1;
+#endif
   PlayField16[*si + 1] = 0xC03;
   PlayField16[*si] = 0x300;
   *si = *si + 1;
@@ -987,8 +1073,14 @@ loc_g_6662:
 
 loc_g_668E:
   subCopyImageToScreen(*si, aniMurphyTouchUp);
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniTouchInfotron;
+#endif
+
+  dx = aniFramesTouchInfotron;
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x14);
   MovHighByte(&PlayField16[*si - FieldWidth], 0xFF);
   goto loc_StopNoSplit;
@@ -999,8 +1091,14 @@ loc_g_668E:
 
 loc_g_66C0:
   subCopyImageToScreen(*si, aniMurphyTouchLeft);
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniTouchInfotron;
+#endif
+
+  dx = aniFramesTouchInfotron;
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x15);
   MovHighByte(&PlayField16[*si - 1], 0xFF);
   goto loc_StopNoSplit;
@@ -1011,8 +1109,14 @@ loc_g_66C0:
 
 loc_g_66F2:
   subCopyImageToScreen(*si, aniMurphyTouchDown);
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniTouchInfotron;
+#endif
+
+  dx = aniFramesTouchInfotron;
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x16);
   MovHighByte(&PlayField16[*si + FieldWidth], 0xFF);
   goto loc_StopNoSplit;
@@ -1023,8 +1127,14 @@ loc_g_66F2:
 
 loc_g_6724:
   subCopyImageToScreen(*si, aniMurphyTouchRight);
+#if 1
+  subSoundFX(*si, fiInfotron, actCollecting);
+#else
   subSoundFXInfotron();
-  dx = aniTouchInfotron;
+#endif
+
+  dx = aniFramesTouchInfotron;
+  dx1 = aniTouchInfotron;
   MovHighByte(&PlayField16[*si], 0x17);
   MovHighByte(&PlayField16[*si + 1], 0xFF);
   goto loc_StopNoSplit;
@@ -1043,15 +1153,20 @@ loc_g_6756:
     return;
 
 #if 1
-  if (!game_sp_info.LevelSolved)
+  if (!game_sp.LevelSolved)
     printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber);
 #endif
 
 #if 1
-  game_sp_info.LevelSolved = TRUE;
+  game_sp.LevelSolved = TRUE;
 #endif
 
+#if 1
+  subSoundFX(*si, fiExit, actPassing);
+#else
   subSoundFXExit();
+#endif
+
   data_h_DemoDone = 1; // EP set level success bytes
   LevelStatus = 1; // set Level Status DONE
   EP_GameDemoVar0DAA = 0; // force demo for lead-out
@@ -1069,7 +1184,8 @@ loc_g_6756:
 #endif
 
   LeadOutCounter = 0x40;          // quit: start lead-out
-  dx = aniMurphyExit;
+  dx = aniFramesMurphyExit;
+  dx1 = aniMurphyExit;
   MovHighByte(&PlayField16[*si], 0xD);
   goto loc_StopNoSplit;
 
@@ -1084,7 +1200,8 @@ loc_g_679B:
 
   MovHighByte(&PlayField16[*si - 2], 1);
   subCopyImageToScreen(*si, aniPushLeft); // draw pushing murphy
-  dx = aniZonkRollLeft;
+  dx = aniFramesZonkRollLeft;
+  dx1 = aniZonkRollLeft;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -1106,7 +1223,8 @@ loc_g_67D4:
 
   MovHighByte(&PlayField16[*si + 2], 1);
   subCopyImageToScreen(*si, aniPushRight); // draw pushing murphy
-  dx = aniZonkRollRight;
+  dx = aniFramesZonkRollRight;
+  dx1 = aniZonkRollRight;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -1128,7 +1246,11 @@ loc_g_6817:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si - FieldWidth)][GetY(*si - FieldWidth)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si - FieldWidth, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si - FieldWidth, 0x88); // draw new terminal type
 #endif
@@ -1150,7 +1272,11 @@ loc_g_684E:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si - 1)][GetY(*si - 1)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si - 1, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si - 1, 0x88); // draw new terminal type
 #endif
@@ -1172,7 +1298,11 @@ loc_g_6884:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si + FieldWidth)][GetY(*si + FieldWidth)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si + FieldWidth, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si + FieldWidth, 0x88); // draw new terminal type
 #endif
@@ -1194,7 +1324,11 @@ loc_g_68BA:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si + 1)][GetY(*si + 1)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si + 1, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si + 1, 0x88); // draw new terminal type
 #endif
@@ -1222,7 +1356,8 @@ loc_g_6916:
   if (PlayField16[*si - 2 * FieldWidth] != 0)
     return;
 
-  dx = aniSplitUpDown;
+  dx = aniFramesSplitUpDown;
+  dx1 = aniSplitUpDown;
   dx2Step = -FieldWidth;
   PlayField16[*si] = 0x1803;
   PlayField16[*si - 2 * FieldWidth] = 0x300;
@@ -1236,7 +1371,8 @@ loc_g_693A:
   if (PlayField16[*si - 2] != 0)
     return;
 
-  dx = aniMurphyEatLeft;
+  dx = aniFramesMurphyEatLeft;
+  dx1 = aniMurphyMoveLeft;
   dx2Step = -1;
   PlayField16[*si] = 0x1903;
   PlayField16[*si - 2] = 0x300;
@@ -1250,7 +1386,8 @@ loc_g_695E:
   if (PlayField16[*si + 2 * FieldWidth] != 0)
     return;
 
-  dx = aniSplitUpDown;
+  dx = aniFramesSplitUpDown;
+  dx1 = aniSplitUpDown;
   dx2Step = FieldWidth;
   PlayField16[*si] = 0x1A03;
   PlayField16[*si + 2 * FieldWidth] = 0x300;
@@ -1264,7 +1401,8 @@ loc_g_6982:
   if (PlayField16[*si + 2] != 0)
     return;
 
-  dx = aniMurphyEatRight;
+  dx = aniFramesMurphyEatRight;
+  dx1 = aniMurphyMoveRight;
   dx2Step = 1;
   PlayField16[*si] = 0x1B03;
   PlayField16[*si + 2] = 0x300;
@@ -1279,7 +1417,8 @@ loc_StopSplit:
   // ==========================================================================
 
 loc_g_69A6:
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si] = 0x1C03;
   PlayField16[*si - FieldWidth] = 0x300;
   goto loc_StopNoSplit;
@@ -1289,7 +1428,8 @@ loc_g_69A6:
   // ==========================================================================
 
 loc_g_69CE:
-  dx = aniMurphyEatLeft;
+  dx = aniFramesMurphyEatLeft;
+  dx1 = aniMurphyEatLeft;
   PlayField16[*si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
   PlayField16[*si - 1] = 0x1D03;
   *si = *si - 1;
@@ -1300,7 +1440,8 @@ loc_g_69CE:
   // ==========================================================================
 
 loc_g_69F7:
-  dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+  dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft);
+  dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
   PlayField16[*si] = 0x1E03;
   PlayField16[*si + FieldWidth] = 0x300;
   goto loc_StopNoSplit;
@@ -1310,8 +1451,9 @@ loc_g_69F7:
   // ==========================================================================
 
 loc_g_6A1F:
-  //  dx = aniMurphyEatRightRedDisk 'this sequence is 9 steps long!
-  dx = aniMurphyEatRight;
+  //  dx = aniFramesMurphyEatRightRedDisk 'this sequence is 9 steps long!
+  dx = aniFramesMurphyEatRight;
+  dx1 = aniMurphyEatRight;
   // --------------------------------------------------------------------------
   // BugFix
   // Table data_h_145A, pointed to by table data_h_105E, has a severe bug:
@@ -1345,7 +1487,8 @@ loc_g_6A1F:
   // ==========================================================================
 
 loc_g_6A48:
-  dx = aniTouchRedDisk;
+  dx = aniFramesTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x20);
   MovHighByte(&PlayField16[*si - FieldWidth], 3);
   goto loc_StopNoSplit;
@@ -1355,7 +1498,8 @@ loc_g_6A48:
   // ==========================================================================
 
 loc_g_6A64:
-  dx = aniTouchRedDisk;
+  dx = aniFramesTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x21);
   MovHighByte(&PlayField16[*si - 1], 3);
   goto loc_StopNoSplit;
@@ -1365,7 +1509,8 @@ loc_g_6A64:
   // ==========================================================================
 
 loc_g_6A80:
-  dx = aniTouchRedDisk;
+  dx = aniFramesTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x22);
   MovHighByte(&PlayField16[*si + FieldWidth], 3);
   goto loc_StopNoSplit;
@@ -1375,7 +1520,8 @@ loc_g_6A80:
   // ==========================================================================
 
 loc_g_6A9C:
-  dx = aniTouchRedDisk;
+  dx = aniFramesTouchRedDisk;
+  dx1 = aniTouchRedDisk;
   MovHighByte(&PlayField16[*si], 0x23);
   MovHighByte(&PlayField16[*si + 1], 3);
 
@@ -1392,12 +1538,22 @@ loc_g_6AB8:
     return;
 
   PlayField16[*si - 2 * FieldWidth] = 0x1200;
+#if 0
   subCopyImageToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+#endif
+  dx = aniFramesYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si - FieldWidth;
+#if 1
+  dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
+#else
   dx2 = aniPushUpDown;
+#endif
   dx2Step = FieldWidth;
   PlayField16[*si] = 0x2403;
+#if 1
+  subCopyImageToScreen(*si, dx2);
+#endif
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1410,7 +1566,8 @@ loc_g_6AF1:
 
   PlayField16[*si - 2] = 0x1200;
   subCopyImageToScreen(*si, aniPushLeft);
-  dx = aniYellowDisk;
+  dx = aniFramesYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -1426,12 +1583,22 @@ loc_g_6B2A:
     return;
 
   PlayField16[*si + 2 * FieldWidth] = 0x1200;
+#if 0
   subCopyImageToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+#endif
+  dx = aniFramesYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si + FieldWidth;
+#if 1
+  dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
+#else
   dx2 = aniPushUpDown;
+#endif
   dx2Step = -FieldWidth;
   PlayField16[*si] = 0x2703;
+#if 1
+  subCopyImageToScreen(*si, dx2);
+#endif
   goto loc_MoveNoSplit;
 
   // ==========================================================================
@@ -1444,7 +1611,8 @@ loc_g_6B63:
 
   PlayField16[*si + 2] = 0x1200;
   subCopyImageToScreen(*si, aniPushRight);
-  dx = aniYellowDisk;
+  dx = aniFramesYellowDisk;
+  dx1 = aniYellowDisk;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -1461,7 +1629,8 @@ loc_g_6B9B:
 
   PlayField16[*si - 2] = 0x800;
   subCopyImageToScreen(*si, aniPushLeft);
-  dx = aniOrangeDisk;
+  dx = aniFramesOrangeDisk;
+  dx1 = aniOrangeDisk;
   dxPos = *si - 1;
   dx2 = aniPushLeft;
   dx2Step = 1;
@@ -1481,7 +1650,8 @@ loc_g_6BD3:
 
   PlayField16[*si + 2] = 0x100;
   subCopyImageToScreen(*si, aniPushRight);
-  dx = aniOrangeDisk;
+  dx = aniFramesOrangeDisk;
+  dx1 = aniOrangeDisk;
   dxPos = *si + 1;
   dx2 = aniPushRight;
   dx2Step = -1;
@@ -1512,8 +1682,36 @@ locProceedMovingMurphy: // proceed moving murphy
 
   ax = ax - 1;   // next picture of sequence
   MovingPictureSequencePhase = ax;            // store for later
+
   if (ax == 0) // Sound effects
+#if 1
+  {
+    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;
+    }
+  }
+#else
     subSoundFXPush();
+#endif
 
   bl = HighByte(PlayField16[*si]);
   if (bl == 0xE)        // Push Zonk to left
@@ -1550,6 +1748,12 @@ locProceedMovingMurphy: // proceed moving murphy
   // ==========================================================================
 
 loc_g_6C8F:
+
+#if 1
+  if (SeqPos <= 0)
+    dx1SequenceLength = getSequenceLength(dx1);
+#endif
+
   if (SplitMoveFlag == 0)
   {
     // ++++++++++++++++++++++++++
@@ -1600,12 +1804,15 @@ loc_g_6C8F:
 	   MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY);
 #endif
 
+#if 0
+    // !!! special two-tile animation currently not used !!!
     if (dx2 == fiInfotron) // special case of infotron moving left or right
     {
       tDeltaX = 0;
       tDeltaY = 0;
     }
     else
+#endif
     {
       tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
       tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
@@ -1614,7 +1821,20 @@ loc_g_6C8F:
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
     Tmp = (SeqPos < 0 ? 0 : SeqPos); // 9StepBugFix!(red disk move right)
+
+#if 1
+    if (isSnappingSequence(dx1) && SeqPos == dx1SequenceLength - 1)
+      dx1 = aniSpace;
+#endif
+
+#if 1
+    StretchedSprites.BltImg(X, Y, dx1, Tmp);
+    GfxGraphic[GetX(*si)][GetY(*si)] = -1;	// (Murphy's position)
+    GfxGraphic[GetX(dxPos)][GetY(dxPos)] = -1;	// (snapping position)
+    // printf("::: Tmp: %d\n", Tmp);
+#else
     StretchedSprites.BltEx(X, Y, dx[Tmp]);
+#endif
 
 #if 1
     if (!(dx2 < 0))
@@ -1625,15 +1845,19 @@ loc_g_6C8F:
       tPos = dxPos + dx2Step;
       X = GetStretchX(tPos);
       Y = GetStretchY(tPos);
+#if 0
+    // !!! special two-tile animation currently not used !!!
       if (dx2 == fiInfotron) // special case of infotron moving left or right
       {
         StretchedSprites.BltEx(X, Y, dx[SeqPos] + dx2Step);
       }
       else // pushing something
+#endif
       {
 #if 1
 	// (SeqPos iterates from 0 to 7 while pushing)
         StretchedSprites.BltImg(X + tDeltaX, Y + tDeltaY, dx2, SeqPos);
+	// printf("::: SeqPos: %d\n", SeqPos);
 #else
         StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx2);
 #endif
@@ -1659,19 +1883,33 @@ loc_g_6C8F:
     tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
+#if 1
+    StretchedSprites.BltImg(X, Y, dx1, SeqPos); // plot first murphy
+#else
     StretchedSprites.BltEx(X, Y, dx[SeqPos]); // plot first murphy
+#endif
     tPos = dxPos + dx2Step;
     X = GetStretchX(tPos);
     Y = GetStretchY(tPos);
+#if 1
+    StretchedSprites.BltImg(X + tDeltaX, Y + tDeltaY, dx1, SeqPos); // plot second murphy
+    StretchedSprites.BltImg(X, Y, fiGraphic[LowByte(PlayField16[tPos])], 0); // replot the port on top
+#else
     StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx[SeqPos]); // plot second murphy
     StretchedSprites.BltEx(X, Y, LowByte(PlayField16[tPos])); // replot the port on top
+#endif
     // End of split movement (port)
     // ------------------------------
   } // loc_g_6D1E:'loc_g_6D28:
 
   SeqPos = SeqPos + 1;
+#if 1
+  if (SeqPos < dx1SequenceLength)
+    return;
+#else
   if (dx[SeqPos] > -1)
     return;
+#endif
 
   // Follow-up after movement completed     'loc_g_6D35:
   MurphyXPos = MurphyXPos + MurphyDX;
@@ -2406,7 +2644,12 @@ loc_g_747F:
   RedDiskReleasePhase = 2;
   RedDiskCount = RedDiskCount - 1;
   subDisplayRedDiskCount();
+
+#if 1
+  subSoundFX(*si, fiRedDisk, actDropping);
+#else
   subSoundFXPush();                 // Sound effects
+#endif
 } // subAnimateMurphy
 
 // ==========================================================================
@@ -2558,6 +2801,8 @@ int subSpPortTest(int si)
   return subSpPortTest;
 } // subSpPortTest
 
+#if 0
+
 void subCopyFieldToScreen(int si, int fi)
 {
   int X, Y;
@@ -2569,6 +2814,8 @@ void subCopyFieldToScreen(int si, int fi)
   // +++++++++++++++++++++++++++++++++++++++++
 }
 
+#endif
+
 void subCopyAnimToScreen(int si, int graphic, int sync_frame)
 {
   int X, Y;