rnd-20060112-1-src

[rocksndiamonds.git] / src / game_em / synchro_2.c

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 662ad2e53630f521ee873bf3be648d9c682c0419..119d86a5832c1fd7d229d0e5b96057388937fce5 100644 (file)
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -20,7 +20,7 @@ void synchro_2(void)
 {
   register unsigned int x = 0;
   register unsigned int y = 1;
-  register unsigned long random = Random;
+  register unsigned long random = RandomEM;
   register unsigned short *cave_cache = Cave[y]; /* might be a win */
   unsigned long score = 0;
 
@@ -348,7 +348,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -356,6 +356,16 @@ void synchro_2(void)
        case Yacid_splash_wB:
        case Xplant:
        case Yplant:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -479,12 +489,22 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
        case Yacid_splash_eB:
        case Yacid_splash_wB:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -516,13 +536,23 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
        case Yacid_splash_eB:
        case Yacid_splash_wB:
        case Zplayer:
+#if 1
+        case Xfake_acid_1:
+        case Xfake_acid_2:
+        case Xfake_acid_3:
+        case Xfake_acid_4:
+        case Xfake_acid_5:
+        case Xfake_acid_6:
+        case Xfake_acid_7:
+        case Xfake_acid_8:
+#endif
          Cave[y][x] = Ystone_sB;
          Cave[y+1][x] = Ystone_s;
          Next[y][x] = Xblank;
@@ -764,7 +794,7 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play_element_sound(x, y, SAMPLE_wonderfall, Xstone);
+           play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
            goto loop;
          }
 
@@ -794,7 +824,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -915,7 +945,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -952,7 +982,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -999,7 +1029,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_n_e;
          Next[y][x] = Xbug_goe;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
@@ -1031,7 +1061,7 @@ void synchro_2(void)
          if (Cave[y-2][x-1] == Xblank)
            Cave[y-2][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1044,13 +1074,13 @@ void synchro_2(void)
          Cave[y-1][x] = Ybug_n;
          Next[y][x] = Xblank;
          Next[y-1][x] = Xbug_n;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_n_w;
          Next[y][x] = Xbug_gow;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
       }
 
@@ -1081,7 +1111,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_e_s;
          Next[y][x] = Xbug_gos;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
@@ -1113,7 +1143,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1126,13 +1156,13 @@ void synchro_2(void)
          Cave[y][x+1] = Ybug_e;
          Next[y][x] = Xblank;
          Next[y][x+1] = Xbug_e;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_e_n;
          Next[y][x] = Xbug_gon;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
       }
 
@@ -1163,7 +1193,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_s_w;
          Next[y][x] = Xbug_gow;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
@@ -1195,7 +1225,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1208,13 +1238,13 @@ void synchro_2(void)
          Cave[y+1][x] = Ybug_s;
          Next[y][x] = Xblank;
          Next[y+1][x] = Xbug_s;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_s_e;
          Next[y][x] = Xbug_goe;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
       }
 
@@ -1245,7 +1275,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ybug_w_n;
          Next[y][x] = Xbug_gon;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
@@ -1277,7 +1307,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1290,13 +1320,13 @@ void synchro_2(void)
          Cave[y][x-1] = Ybug_w;
          Next[y][x] = Xblank;
          Next[y][x-1] = Xbug_w;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
 
        default:
          Cave[y][x] = Ybug_w_s;
          Next[y][x] = Xbug_gos;
-         play_sound(x, y, SAMPLE_bug);
+         play_element_sound(x, y, SAMPLE_bug, element);
          goto loop;
       }
 
@@ -1327,7 +1357,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_n_w;
          Next[y][x] = Xtank_gow;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
@@ -1359,7 +1389,7 @@ void synchro_2(void)
          if (Cave[y-2][x-1] == Xblank)
            Cave[y-2][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1372,13 +1402,13 @@ void synchro_2(void)
          Cave[y-1][x] = Ytank_n;
          Next[y][x] = Xblank;
          Next[y-1][x] = Xtank_n;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_n_e;
          Next[y][x] = Xtank_goe;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
       }
 
@@ -1409,7 +1439,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_e_n;
          Next[y][x] = Xtank_gon;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
@@ -1441,7 +1471,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1454,13 +1484,13 @@ void synchro_2(void)
          Cave[y][x+1] = Ytank_e;
          Next[y][x] = Xblank;
          Next[y][x+1] = Xtank_e;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_e_s;
          Next[y][x] = Xtank_gos;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
       }
 
@@ -1491,7 +1521,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_s_e;
          Next[y][x] = Xtank_goe;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
@@ -1523,7 +1553,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1536,13 +1566,13 @@ void synchro_2(void)
          Cave[y+1][x] = Ytank_s;
          Next[y][x] = Xblank;
          Next[y+1][x] = Xtank_s;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_s_w;
          Next[y][x] = Xtank_gow;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
       }
 
@@ -1573,7 +1603,7 @@ void synchro_2(void)
        case Zplayer:
          Cave[y][x] = Ytank_w_s;
          Next[y][x] = Xtank_gos;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
@@ -1605,7 +1635,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -1618,13 +1648,13 @@ void synchro_2(void)
          Cave[y][x-1] = Ytank_w;
          Next[y][x] = Xblank;
          Next[y][x-1] = Xtank_w;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
 
        default:
          Cave[y][x] = Ytank_w_n;
          Next[y][x] = Xtank_gon;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_tank, element);
          goto loop;
       }
 
@@ -1739,8 +1769,8 @@ void synchro_2(void)
            goto android_move;
        }
 
-       Next[y][x] = temp; /* the item we chose to clone */
-       play_element_sound(x, y, SAMPLE_android, temp);
+       Next[y][x] = temp;      /* the item we chose to clone */
+       play_element_sound(x, y, SAMPLE_android_clone, temp);
 
        switch (RANDOM & 7)
        {
@@ -1881,7 +1911,7 @@ void synchro_2(void)
          dy = 0;
        }
 
-       Next[y][x] = Xblank; /* assume we will move */
+       Next[y][x] = Xblank;    /* assume we will move */
        temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3;
 
        if (RANDOM & 1)
@@ -2012,7 +2042,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_nB;
       Cave[y-1][x] = Yandroid_n;
       Next[y-1][x] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_ne:
@@ -2020,7 +2050,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_neB;
       Cave[y-1][x+1] = Yandroid_ne;
       Next[y-1][x+1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_e:
@@ -2028,7 +2058,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_eB;
       Cave[y][x+1] = Yandroid_e;
       Next[y][x+1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_se:
@@ -2036,7 +2066,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_seB;
       Cave[y+1][x+1] = Yandroid_se;
       Next[y+1][x+1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_s:
@@ -2044,7 +2074,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_sB;
       Cave[y+1][x] = Yandroid_s;
       Next[y+1][x] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_sw:
@@ -2052,7 +2082,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_swB;
       Cave[y+1][x-1] = Yandroid_sw;
       Next[y+1][x-1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_w:
@@ -2060,7 +2090,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_wB;
       Cave[y][x-1] = Yandroid_w;
       Next[y][x-1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     android_nw:
@@ -2068,7 +2098,7 @@ void synchro_2(void)
       Cave[y][x] = Yandroid_nwB;
       Cave[y-1][x-1] = Yandroid_nw;
       Next[y-1][x-1] = Xandroid;
-      play_sound(x, y, SAMPLE_tank);
+      play_element_sound(x, y, SAMPLE_android_move, element);
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -2090,7 +2120,7 @@ void synchro_2(void)
          if (Cave[y-2][x-1] == Xblank)
            Cave[y-2][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2100,7 +2130,7 @@ void synchro_2(void)
          Cave[y-1][x] = Yandroid_n;
          Next[y][x] = Xblank;
          Next[y-1][x] = Xandroid;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2124,7 +2154,7 @@ void synchro_2(void)
          if (Cave[y-2][x-1] == Xblank)
            Cave[y-2][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2134,7 +2164,7 @@ void synchro_2(void)
          Cave[y-1][x] = Yandroid_n;
          Next[y][x] = Xblank;
          Next[y-1][x] = Xandroid_1_n;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2160,7 +2190,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2170,7 +2200,7 @@ void synchro_2(void)
          Cave[y][x+1] = Yandroid_e;
          Next[y][x] = Xblank;
          Next[y][x+1] = Xandroid;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2194,7 +2224,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2204,7 +2234,7 @@ void synchro_2(void)
          Cave[y][x+1] = Yandroid_e;
          Next[y][x] = Xblank;
          Next[y][x+1] = Xandroid_1_e;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2230,7 +2260,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2240,7 +2270,7 @@ void synchro_2(void)
          Cave[y+1][x] = Yandroid_s;
          Next[y][x] = Xblank;
          Next[y+1][x] = Xandroid;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2264,7 +2294,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2274,7 +2304,7 @@ void synchro_2(void)
          Cave[y+1][x] = Yandroid_s;
          Next[y][x] = Xblank;
          Next[y+1][x] = Xandroid_1_s;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2300,7 +2330,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2310,7 +2340,7 @@ void synchro_2(void)
          Cave[y][x-1] = Yandroid_w;
          Next[y][x] = Xblank;
          Next[y][x-1] = Xandroid;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2334,7 +2364,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2344,7 +2374,7 @@ void synchro_2(void)
          Cave[y][x-1] = Yandroid_w;
          Next[y][x] = Xblank;
          Next[y][x-1] = Xandroid_1_w;
-         play_sound(x, y, SAMPLE_tank);
+         play_element_sound(x, y, SAMPLE_android_move, element);
          goto loop;
 
        default:
@@ -2370,7 +2400,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2524,7 +2554,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2561,7 +2591,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2593,7 +2623,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2656,7 +2686,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2688,7 +2718,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2751,7 +2781,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2891,7 +2921,7 @@ void synchro_2(void)
       {
        Cave[y][x+1] = Ydiamond_eat;
        Next[y][x+1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2899,7 +2929,7 @@ void synchro_2(void)
       {
        Cave[y+1][x] = Ydiamond_eat;
        Next[y+1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2907,7 +2937,7 @@ void synchro_2(void)
       {
        Cave[y][x-1] = Ydiamond_eat;
        Next[y][x-1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2915,7 +2945,7 @@ void synchro_2(void)
       {
        Cave[y-1][x] = Ydiamond_eat;
        Next[y-1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2935,7 +2965,7 @@ void synchro_2(void)
          if (Cave[y-2][x-1] == Xblank)
            Cave[y-2][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -2952,7 +2982,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-         play_sound(x, y, SAMPLE_eater);
+         play_element_sound(x, y, SAMPLE_eater, element);
          goto loop;
       }
 
@@ -2963,7 +2993,7 @@ void synchro_2(void)
       {
        Cave[y+1][x] = Ydiamond_eat;
        Next[y+1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2971,7 +3001,7 @@ void synchro_2(void)
       {
        Cave[y][x-1] = Ydiamond_eat;
        Next[y][x-1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2979,7 +3009,7 @@ void synchro_2(void)
       {
        Cave[y-1][x] = Ydiamond_eat;
        Next[y-1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -2987,7 +3017,7 @@ void synchro_2(void)
       {
        Cave[y][x+1] = Ydiamond_eat;
        Next[y][x+1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3007,7 +3037,7 @@ void synchro_2(void)
          if (Cave[y-1][x] == Xblank)
            Cave[y-1][x] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3024,7 +3054,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-         play_sound(x, y, SAMPLE_eater);
+         play_element_sound(x, y, SAMPLE_eater, element);
          goto loop;
       }
 
@@ -3035,7 +3065,7 @@ void synchro_2(void)
       {
        Cave[y][x-1] = Ydiamond_eat;
        Next[y][x-1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3043,7 +3073,7 @@ void synchro_2(void)
       {
        Cave[y-1][x] = Ydiamond_eat;
        Next[y-1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3051,7 +3081,7 @@ void synchro_2(void)
       {
        Cave[y][x+1] = Ydiamond_eat;
        Next[y][x+1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3059,7 +3089,7 @@ void synchro_2(void)
       {
        Cave[y+1][x] = Ydiamond_eat;
        Next[y+1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3079,7 +3109,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3096,7 +3126,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w;
-         play_sound(x, y, SAMPLE_eater);
+         play_element_sound(x, y, SAMPLE_eater, element);
          goto loop;
       }
 
@@ -3107,7 +3137,7 @@ void synchro_2(void)
       {
        Cave[y-1][x] = Ydiamond_eat;
        Next[y-1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3115,7 +3145,7 @@ void synchro_2(void)
       {
        Cave[y][x+1] = Ydiamond_eat;
        Next[y][x+1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3123,7 +3153,7 @@ void synchro_2(void)
       {
        Cave[y+1][x] = Ydiamond_eat;
        Next[y+1][x] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3131,7 +3161,7 @@ void synchro_2(void)
       {
        Cave[y][x-1] = Ydiamond_eat;
        Next[y][x-1] = Xblank;
-       play_element_sound(x, y, SAMPLE_eater, Xdiamond);
+       play_element_sound(x, y, SAMPLE_eater_eat, element);
        goto loop;
       }
 
@@ -3151,7 +3181,7 @@ void synchro_2(void)
          if (Cave[y-1][x-2] == Xblank)
            Cave[y-1][x-2] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3168,7 +3198,7 @@ void synchro_2(void)
 
        default:
          Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s;
-         play_sound(x, y, SAMPLE_eater);
+         play_element_sound(x, y, SAMPLE_eater, element);
          goto loop;
       }
 
@@ -3232,7 +3262,7 @@ void synchro_2(void)
              if (Cave[y-2][x-1] == Xblank)
                Cave[y-2][x-1] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -3267,7 +3297,7 @@ void synchro_2(void)
                Cave[y][x+1] = Yacid_splash_eB;
              if (Cave[y][x-1] == Xblank)
                Cave[y][x-1] = Yacid_splash_wB;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -3305,7 +3335,7 @@ void synchro_2(void)
              if (Cave[y-1][x] == Xblank)
                Cave[y-1][x] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -3340,7 +3370,7 @@ void synchro_2(void)
              if (Cave[y-1][x-2] == Xblank)
                Cave[y-1][x-2] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -3384,7 +3414,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3519,7 +3549,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3556,7 +3586,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3581,7 +3611,7 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play_element_sound(x, y, SAMPLE_wonderfall, Xemerald);
+           play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
            goto loop;
          }
 
@@ -3611,7 +3641,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3746,7 +3776,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3783,7 +3813,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3808,7 +3838,7 @@ void synchro_2(void)
            }
 
            Next[y][x] = Xblank;
-           play_element_sound(x, y, SAMPLE_wonderfall, Xdiamond);
+           play_element_sound(x, y, SAMPLE_wonderfall, Xwonderwall);
            goto loop;
          }
 
@@ -3838,7 +3868,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xdrip_stretchB;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -3930,7 +3960,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -4050,7 +4080,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -4087,7 +4117,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xblank;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -4142,7 +4172,7 @@ void synchro_2(void)
              if (Cave[y-2][x-1] == Xblank)
                Cave[y-2][x-1] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -4175,7 +4205,7 @@ void synchro_2(void)
              if (Cave[y-1][x] == Xblank)
                Cave[y-1][x] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -4208,7 +4238,7 @@ void synchro_2(void)
              if (Cave[y][x-1] == Xblank)
                Cave[y][x-1] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -4241,7 +4271,7 @@ void synchro_2(void)
              if (Cave[y-1][x-2] == Xblank)
                Cave[y-1][x-2] = Yacid_splash_wB;
              Next[y][x] = Xblank;
-             play_sound(x, y, SAMPLE_acid);
+             play_element_sound(x, y, SAMPLE_acid, Xacid_1);
              goto loop;
 
            case Xblank:
@@ -4292,6 +4322,38 @@ void synchro_2(void)
       Next[y][x] = Xacid_1;
       goto loop;
 
+    case Xfake_acid_1:
+      Next[y][x] = Xfake_acid_2;
+      goto loop;
+
+    case Xfake_acid_2:
+      Next[y][x] = Xfake_acid_3;
+      goto loop;
+
+    case Xfake_acid_3:
+      Next[y][x] = Xfake_acid_4;
+      goto loop;
+
+    case Xfake_acid_4:
+      Next[y][x] = Xfake_acid_5;
+      goto loop;
+
+    case Xfake_acid_5:
+      Next[y][x] = Xfake_acid_6;
+      goto loop;
+
+    case Xfake_acid_6:
+      Next[y][x] = Xfake_acid_7;
+      goto loop;
+
+    case Xfake_acid_7:
+      Next[y][x] = Xfake_acid_8;
+      goto loop;
+
+    case Xfake_acid_8:
+      Next[y][x] = Xfake_acid_1;
+      goto loop;
+
     /* --------------------------------------------------------------------- */
 
     case Xball_1:
@@ -4455,7 +4517,11 @@ void synchro_2(void)
        }
       }
 
+#if 1
+      lev.ball_pos = (lev.ball_pos + 1) % lev.num_ball_arrays;
+#else
       lev.ball_pos = (lev.ball_pos + 1) & 7;
+#endif
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -4528,6 +4594,8 @@ void synchro_2(void)
        Next[y][x] = Xexit_1;
       }
 
+      play_element_sound(x, y, SAMPLE_exit_open, Xexit);
+
       goto loop;
 
     case Xexit_1:
@@ -4606,7 +4674,7 @@ void synchro_2(void)
          if (Cave[y][x-1] == Xblank)
            Cave[y][x-1] = Yacid_splash_wB;
          Next[y][x] = Xsand_stonesand_4;
-         play_sound(x, y, SAMPLE_acid);
+         play_element_sound(x, y, SAMPLE_acid, Xacid_1);
          goto loop;
 
        case Xblank:
@@ -4823,7 +4891,7 @@ void synchro_2(void)
   if (ply1.alive || ply2.alive)
     lev.score += score; /* only get a score if someone is alive */
 
-  Random = random;
+  RandomEM = random;
 
   {
     void *temp = Cave;