removed some ttc soundeffects

joey toon
i haven't checked if these were removed well tbh i might do that later
also removed whomp in wf

Author: stalechilibeans

levels/wf/script.c

@@ -55,7 +55,7 @@ static const LevelScript script_func_local_3[] = {
     OBJECT(/*model*/ MODEL_THWOMP,            /*pos*/  3530, 1075, -3320, /*angle*/ 0,  180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvThwomp2),
     OBJECT(/*model*/ MODEL_NONE,              /*pos*/  -856,  922,  3819, /*angle*/ 0,    0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBetaFishSplashSpawner),
     OBJECT(/*model*/ MODEL_PIRANHA_PLANT,     /*pos*/  1822, 2560,  -101, /*angle*/ 0,   90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvPiranhaPlant),
-    OBJECT(/*model*/ MODEL_WHOMP,             /*pos*/ -1985, 2560,   604, /*angle*/ 0,    0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvSmallWhomp),
+    //OBJECT(/*model*/ MODEL_WHOMP,             /*pos*/ -1985, 2560,   604, /*angle*/ 0,    0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvSmallWhomp),
     OBJECT(/*model*/ MODEL_BULLET_BILL,       /*pos*/  1280, 3712,   968, /*angle*/ 0,  180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBulletBill),
     OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/     0, 3584,     0, /*angle*/ 0,    0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvTower),
     OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/  1280, 3584,   896, /*angle*/ 0,    0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBulletBillCannon),

src/game/behaviors/heave_ho.inc.c

@@ -18,7 +18,7 @@ void bhv_heave_ho_throw_mario_loop(void) {
         case 1:
             break;
         case 2:
-            cur_obj_play_sound_2(SOUND_OBJ_HEAVEHO_TOSSED);
+            //cur_obj_play_sound_2(SOUND_OBJ_HEAVEHO_TOSSED);
             gMarioObject->oInteractStatus |= INT_STATUS_MARIO_UNK2;
             gMarioStates[0].forwardVel = -45.0f;
             gMarioStates[0].vel[1] = 95.0f;
@@ -122,7 +122,7 @@ void heave_ho_move(void) {
     }
 
     if (o->oForwardVel > 3.0f) {
-        cur_obj_play_sound_1(SOUND_AIR_HEAVEHO_MOVE);
+        //cur_obj_play_sound_1(SOUND_AIR_HEAVEHO_MOVE);
     }
 
     if (o->oAction != 0 && o->oMoveFlags & OBJ_MOVE_MASK_IN_WATER) {

src/game/behaviors/ttc_pendulum.inc.c

@@ -36,7 +36,7 @@ void bhv_ttc_pendulum_update(void) {
         // Play sound
         if (o->oTTCPendulumSoundTimer != 0) {
             if (--o->oTTCPendulumSoundTimer == 0) {
-                cur_obj_play_sound_2(SOUND_GENERAL_PENDULUM_SWING);
+                //cur_obj_play_sound_2(SOUND_GENERAL_PENDULUM_SWING);
             }
         }
 

src/game/behaviors/ttc_rotating_solid.inc.c

@@ -55,7 +55,7 @@ void bhv_ttc_rotating_solid_update(void) {
 
             o->oAngleVelRoll = o->oFaceAngleRoll - startRoll;
             if (o->oAngleVelRoll == 0) {
-                cur_obj_play_sound_2(SOUND_GENERAL2_ROTATING_BLOCK_CLICK);
+                //cur_obj_play_sound_2(SOUND_GENERAL2_ROTATING_BLOCK_CLICK);
 
                 o->oTTCRotatingSolidNumTurns =
                     (o->oTTCRotatingSolidNumTurns + 1) % o->oTTCRotatingSolidNumSides;

src/game/behaviors/ttc_treadmill.inc.c

@@ -43,7 +43,7 @@ void bhv_ttc_treadmill_update(void) {
     if (sMasterTreadmill == o || sMasterTreadmill == NULL) {
         sMasterTreadmill = o;
 
-        cur_obj_play_sound_1(SOUND_ENV_ELEVATOR2);
+        //cur_obj_play_sound_1(SOUND_ENV_ELEVATOR2);
 
         if (gTTCSpeedSetting == TTC_SPEED_RANDOM) {
             // Stay still for 5 frames, then accelerate toward the target speed