vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots 

- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
This commit is contained in:
TehRealSalt 2018-11-11 17:30:30 -05:00
parent fa989f2f7f
commit 93ab9850a3
9 changed files with 159 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_game.c
View File

@ -1552,7 +1552,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (((player->mo && player->speed > 0) // Moving if (((player->mo && player->speed > 0) // Moving
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn || (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|| (player->spectator || objectplacing)) // Not a physical player || (player->spectator || objectplacing)) // Not a physical player
&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout && !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out turning
lang += (cmd->angleturn<<16); lang += (cmd->angleturn<<16);
cmd->angleturn = (INT16)(lang >> 16); cmd->angleturn = (INT16)(lang >> 16);

12
src/info.c
View File

@ -14907,7 +14907,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate S_NULL, // missilestate
S_NULL, // deathstate S_NULL, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_mcitm1, // deathsound sfx_itpick, // deathsound
0, // speed 0, // speed
24*FRACUNIT, // radius 24*FRACUNIT, // radius
24*FRACUNIT, // height 24*FRACUNIT, // height
@ -15319,7 +15319,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // display offset 0, // display offset
100, // mass 100, // mass
1, // damage 1, // damage
sfx_fake, // activesound sfx_cdfm28, // activesound
MF_SPECIAL|MF_BOUNCE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags MF_SPECIAL|MF_BOUNCE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -15913,7 +15913,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // display offset 0, // display offset
100, // mass 100, // mass
1, // damage 1, // damage
sfx_bomb, // activesound sfx_s3k5c, // activesound
MF_BOUNCE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags MF_BOUNCE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -17182,7 +17182,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // display offset 0, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
sfx_clash, // activesound sfx_s259, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_SCENERY|MF_RUNSPAWNFUNC|MF_DONTENCOREMAP, // flags MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_SCENERY|MF_RUNSPAWNFUNC|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -19580,7 +19580,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate S_NULL, // missilestate
S_RINGEXPLODE, // deathstate S_RINGEXPLODE, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_mkpop, // deathsound sfx_s1c1, // deathsound
30, // speed 30, // speed
16<<FRACBITS, // radius 16<<FRACBITS, // radius
64<<FRACBITS, // height 64<<FRACBITS, // height
@ -19705,7 +19705,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EBARRELIDLE, // spawnstate S_EBARRELIDLE, // spawnstate
1, // spawnhealth 1, // spawnhealth
S_EBARREL1, // seestate S_EBARREL1, // seestate
sfx_bomb, // seesound sfx_s3k5c, // seesound
0, // reactiontime 0, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate

23
src/k_kart.c
View File

@ -896,7 +896,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
// This makes the roulette produce the random noises. // This makes the roulette produce the random noises.
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player)) if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
{ {
#define PLAYROULETTESND S_StartSound(NULL, sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8)); #define PLAYROULETTESND S_StartSound(NULL, sfx_itrol1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
if (splitscreen) if (splitscreen)
{ {
if (players[displayplayer].kartstuff[k_itemroulette]) if (players[displayplayer].kartstuff[k_itemroulette])
@ -947,7 +947,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
if (P_IsLocalPlayer(player)) if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_mkitmE); S_StartSound(NULL, sfx_itrole);
return; return;
} }
@ -991,7 +991,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
player->kartstuff[k_roulettetype] = 0; // This too player->kartstuff[k_roulettetype] = 0; // This too
if (P_IsLocalPlayer(player)) if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_mkitmF); S_StartSound(NULL, sfx_itrolf);
} }
//} //}
@ -2407,8 +2407,8 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t angle
if (source && source->player) if (source && source->player)
th->cvmem = source->player->skincolor; th->cvmem = source->player->skincolor;
else else
th->cvmem = SKINCOLOR_RED; th->cvmem = SKINCOLOR_KETCHUP;
//fallthrough /* FALLTHRU */
case MT_JAWZ_DUD: case MT_JAWZ_DUD:
S_StartSound(th, th->info->activesound); S_StartSound(th, th->info->activesound);
break; break;
@ -2476,7 +2476,9 @@ static void K_SpawnDriftSparks(player_t *player)
spark->color = SKINCOLOR_KETCHUP; spark->color = SKINCOLOR_KETCHUP;
} }
else else
{
spark->color = SKINCOLOR_SAPPHIRE; spark->color = SKINCOLOR_SAPPHIRE;
}
if ((player->kartstuff[k_drift] > 0 && player->cmd.driftturn > 0) // Inward drifts if ((player->kartstuff[k_drift] > 0 && player->cmd.driftturn > 0) // Inward drifts
|| (player->kartstuff[k_drift] < 0 && player->cmd.driftturn < 0)) || (player->kartstuff[k_drift] < 0 && player->cmd.driftturn < 0))
@ -2521,6 +2523,7 @@ static void K_SpawnAIZDust(player_t *player)
return; return;
travelangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); travelangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
//S_StartSound(player->mo, sfx_s3k47);
{ {
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale)); newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
@ -4509,6 +4512,12 @@ static void K_KartDrift(player_t *player, boolean onground)
if (player->kartstuff[k_driftcharge] + driftadditive >= dsone) if (player->kartstuff[k_driftcharge] + driftadditive >= dsone)
K_SpawnDriftSparks(player); K_SpawnDriftSparks(player);
// Sound whenever you get a different tier of sparks
if ((player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone)
|| (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo)
|| (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree))
S_StartSound(player->mo, sfx_s3ka2);
player->kartstuff[k_driftcharge] += driftadditive; player->kartstuff[k_driftcharge] += driftadditive;
player->kartstuff[k_driftend] = 0; player->kartstuff[k_driftend] = 0;
} }
@ -5254,8 +5263,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
// So now it's time to burn some rubber! // So now it's time to burn some rubber!
if (player->speed < 2 && leveltime > starttime && cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE && cmd->driftturn != 0) if (player->speed < 2 && leveltime > starttime && cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE && cmd->driftturn != 0)
{ {
if (leveltime % 20 == 0) if (leveltime % 8 == 0)
S_StartSound(player->mo, sfx_mkslid); S_StartSound(player->mo, sfx_s224);
} }
// Squishing // Squishing

2
src/p_enemy.c
View File

@ -8676,7 +8676,7 @@ void A_RandomShadowFrame(mobj_t *actor)
fire = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_THOK); fire = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_THOK);
P_SetMobjStateNF(fire, S_QUICKBOOM1); P_SetMobjStateNF(fire, S_QUICKBOOM1);
P_SetScale(fire, 4<<FRACBITS); P_SetScale(fire, 4<<FRACBITS);
fire->color = SKINCOLOR_RED; fire->color = SKINCOLOR_KETCHUP;
S_StartSound(actor->target, sfx_fire2); S_StartSound(actor->target, sfx_fire2);
} }
} }

3
src/p_mobj.c
View File

@ -8323,6 +8323,9 @@ void P_MobjThinker(mobj_t *mobj)
else else
mobj->color = SKINCOLOR_SILVER; mobj->color = SKINCOLOR_SILVER;
if (!S_SoundPlaying(mobj, sfx_cdfm17))
S_StartSound(mobj, sfx_cdfm17);
K_MatchGenericExtraFlags(mobj, mobj->target); K_MatchGenericExtraFlags(mobj, mobj->target);
if (leveltime & 1) if (leveltime & 1)
mobj->flags2 |= MF2_DONTDRAW; mobj->flags2 |= MF2_DONTDRAW;

8
src/p_user.c
View File

@ -6738,13 +6738,13 @@ static void P_MovePlayer(player_t *player)
// Drifting sound // Drifting sound
// Start looping the sound now. // Start looping the sound now.
if (leveltime % 50 == 0 && onground && player->kartstuff[k_drift] != 0) if (leveltime % 50 == 0 && onground && player->kartstuff[k_drift] != 0)
S_StartSound(player->mo, sfx_mkdrft); S_StartSound(player->mo, sfx_drift);
// Leveltime being 50 might take a while at times. We'll start it up once, isntantly. // Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
else if (!S_SoundPlaying(player->mo, sfx_mkdrft) && onground && player->kartstuff[k_drift] != 0) else if (!S_SoundPlaying(player->mo, sfx_drift) && onground && player->kartstuff[k_drift] != 0)
S_StartSound(player->mo, sfx_mkdrft); S_StartSound(player->mo, sfx_drift);
// Ok, we'll stop now. // Ok, we'll stop now.
else if (player->kartstuff[k_drift] == 0) else if (player->kartstuff[k_drift] == 0)
S_StopSoundByID(player->mo, sfx_mkdrft); S_StopSoundByID(player->mo, sfx_drift);
K_MoveKartPlayer(player, onground); K_MoveKartPlayer(player, onground);
//} //}

29
src/s_sound.c
View File

@ -769,30 +769,27 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
case sfx_thok: case sfx_thok:
sfx_id = sfx_mario7; sfx_id = sfx_mario7;
break; break;
// case sfx_pop: case sfx_pop:
// sfx_id = sfx_mkitem; // SRB2kart sfx_id = sfx_mario5;
// break; break;
case sfx_jump: case sfx_jump:
sfx_id = sfx_mario6; sfx_id = sfx_mario6;
break; break;
// case sfx_shield: case sfx_shield:
// sfx_id = sfx_mario3; sfx_id = sfx_mario3;
// break; break;
case sfx_itemup: case sfx_itemup:
sfx_id = sfx_None; sfx_id = sfx_mario4;
break;
case sfx_tink:
sfx_id = sfx_mario1;
break; break;
// case sfx_tink:
// sfx_id = sfx_mario1;
// break;
// case sfx_cgot: // case sfx_cgot:
// sfx_id = sfx_mario9; // sfx_id = sfx_mario9;
// break; // break;
case sfx_lose: // case sfx_lose:
sfx_id = sfx_mario2; // sfx_id = sfx_mario2;
break; // break;
case sfx_prloop:
sfx_id = sfx_bomb2;
break;
default: default:
break; break;
} }

185
src/sounds.c
View File

@ -266,7 +266,7 @@ sfxinfo_t S_sfx[NUMSFX] =
// Sonic 1 sounds // Sonic 1 sounds
{"s1a0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1a1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1a2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Monty Mole attach
{"s1a3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1a4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1a5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -275,8 +275,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Monty Mole twitch
{"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Misc. obstacle destroyed
{"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1af", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1af", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -284,20 +284,20 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s1b1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Toggle all items
{"s1b5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1b9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1b9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1ba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Toggle item
{"s1bb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1bb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Thwomp drop
{"s1bc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1bc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1bd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Ballhog bounce {"s1bd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Ballhog bounce
{"s1be", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1be", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1bf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1bf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Monokuma death
{"s1c2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -305,7 +305,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s1c6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1c9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1c9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Item hit w/ voices off
{"s1ca", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1ca", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1cb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1cb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s1cc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s1cc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -365,13 +365,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s250", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s250", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s251", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s251", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s252", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s252", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s253", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // 1st place finish {"s253", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // 1st place finish
{"s254", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s254", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s255", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s255", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s256", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s256", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s257", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s257", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s258", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s258", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s259", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s259", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Item clashing
{"s25a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s25b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -404,7 +404,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart item shield {"s3k3a", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart item shield
{"s3k3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -417,7 +417,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Thunder Shield use {"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Thunder Shield use
{"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart AIZ dust
{"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart bump sound {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart bump sound
{"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -438,7 +438,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Mine tick {"s3k5c", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Mine tick
{"s3k5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k5e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k5e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -469,7 +469,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k7a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k7a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k7b", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart successful hit {"s3k7b", false, 96, 16, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart successful hit
{"s3k7c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k7c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k7d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k7d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k7e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k7e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -477,7 +477,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Overcharged start boost
{"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k86", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k86", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -496,7 +496,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Orbinaut {"s3k96", false, 128, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Orbinaut
{"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -508,7 +508,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart drift spark gain
{"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -542,7 +542,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kbel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kbel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kbfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kbfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kbfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kbfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kc0s", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Jawz {"s3kc0s", false, 192, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Jawz
{"s3kc0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kc1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kc1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -577,7 +577,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kd0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd1l", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kd3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kd3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -600,13 +600,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever) // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever)
{"3db06", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Bumper stolen {"3db06", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Bumper stolen
{"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// Sonic CD sounds // Sonic CD sounds
{"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Undercharged start boost
{"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Sneaker boost {"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Sneaker boost
{"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -623,9 +623,9 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm15", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm15", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm17", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm17", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Brake drift ambient
{"cdfm18", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm18", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm19", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm19", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // CD SS1 UFO death
{"cdfm20", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm20", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm21", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm21", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm22", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm22", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -634,7 +634,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm25", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm25", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm26", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm26", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm27", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm27", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm28", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm28", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Eggman item landing
{"cdfm29", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm29", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm31", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm31", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -645,7 +645,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm39", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Mine deployed {"cdfm39", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Mine deployed
{"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -676,10 +676,10 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Trail item dragging {"cdfm70", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Trail item dragging
{"cdfm71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // CD SS1 UFO hit
{"cdfm74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -695,15 +695,15 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdpcm6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdpcm6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdpcm7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdpcm7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdpcm8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdpcm8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdpcm9", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // No damage taken {"cdpcm9", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // No damage taken
// Knuckles Chaotix sounds // Knuckles Chaotix sounds
{"kc2a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc2a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc2b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc2b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc2c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc2c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc2d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc2d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc2e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc2e", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Item box gotten
{"kc2f", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Pogo Spring use {"kc2f", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Spring pad
{"kc30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc31", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // NO CONTEST explosion {"kc31", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // NO CONTEST explosion
{"kc32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -726,7 +726,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc46", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Shrink use {"kc46", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Shrink use
{"kc47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Vote picked {"kc48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Vote picked
{"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -743,10 +743,10 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc57", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // SPB locked in {"kc57", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // SPB locked in
{"kc58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc59", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Shrink {"kc59", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Shrink
{"kc5a", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Grow {"kc5a", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Grow
{"kc5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -756,7 +756,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // SPB ambient
{"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -768,59 +768,53 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kc6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart // SRB2kart
{"lkt1", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"slip", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Spinout
{"lkt2", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"screec", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Tight turning screech
{"lkt3", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"drift", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Drifting ambient
{"mlap", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"ruburn", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Rubber-burn turn ambient
{"sboost", true, 90, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Respawn Drop Dash
{"mush", false, 90, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"tossed", false, 192, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Item fired
{"kinvnc", false, 140, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"itpick", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Pick up HUD drop
{"kgrow", false, 140, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"peel", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Edited S25A for banana landing
{"bomb", false, 110, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"hogbom", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Ballhog explosions
{"bomb2", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"zio3", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Thunder Shield use
{"peel", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"kpogos", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Pogo Spring use
{"slip", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"alarmi", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Invincibility alarm
{"fake", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"alarmg", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Grow alarm
{"grnshl", false, 120, 64, -1, NULL, 0, -1, -1, LUMPERROR}, {"kinvnc", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Invincibility music
{"redshl", false, 130, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"kgrow", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Grow music
{"shbrk", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol1", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Roulette spinning
{"mkdrft", false, 52, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol2", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkslid", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol3", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitem", false, 80, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol4", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm1", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol5", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm2", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol6", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm3", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol7", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm4", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrol8", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm5", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrolf", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Roulette end
{"mkitm6", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"itrole", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Roulette end (Eggman)
{"mkitm7", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"vroom", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Krew opening vroom
{"mkitm8", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"chaooo", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Chao audience cheer
{"mkitmF", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"yeeeah", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Voting picks you
{"mkitmE", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"noooo1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Voting picks hell (by chance)
{"clash", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"noooo2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Voting picks hell (on purpose)
{"tossed", false, 150, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"ruby1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Phantom Ruby charge up
{"shelit", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR}, {"ruby2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Phantom Ruby teleport
{"vroom", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"tcart", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Twinkle Cart
{"boing", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"bfare", false, 128, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Pleasure Castle fanfare
{"alarmi", false, 140, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"merry", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Pleasure Castle merry-go-round ambient
{"alarmg", false, 140, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"bowlh", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Pleasure Castle pins
{"screec", false, 52, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"tppop", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Pleasure Castle bombs
{"yeeeah", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"hsdoor", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Red Barrage Area door
{"noooo1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"hstrn", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Red Barrage Area train
{"noooo2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"aspkb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Red Barrage Area spikeballs
{"ruby1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"wind1", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Midnight Channel monsters
{"ruby2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"fire2", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"hogbom", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"chain", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Mementos Reaper
{"kpogos", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"mkuma", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Trigger Happy Havoc Monokuma
{"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"toada", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Arid Sands Toad scream
{"zio3", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"itfree", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // :shitsfree:
{"wind1", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"dbgsal", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR}, // Debug notification
{"fire2", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"chain", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"mcitm1", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"chaooo", false, 110, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"itfree", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2Kart - Engine sounds // SRB2Kart - Engine sounds
// Engine class A // Engine class A
@ -950,21 +944,6 @@ sfxinfo_t S_sfx[NUMSFX] =
{"krti11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR}, {"krti11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
{"krti12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR}, {"krti12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
// SOC_CHAO SFX
{"mkuma", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkpop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"bfare", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"merry", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"bowlh", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"tcart", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"tppop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"toada", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"hsdoor",false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"hstrn", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"aspkb", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"msmnj1",false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"msmnj2",false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart - Skin sounds // SRB2kart - Skin sounds
{"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR}, {"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR},
{"klose", false, 64, 96, -1, NULL, 0, SKSKLOSE, -1, LUMPERROR}, {"klose", false, 64, 96, -1, NULL, 0, SKSKLOSE, -1, LUMPERROR},

87
src/sounds.h
View File

@ -843,57 +843,51 @@ typedef enum
sfx_kc6e, sfx_kc6e,
// SRB2kart // SRB2kart
sfx_lkt1,
sfx_lkt2,
sfx_lkt3,
sfx_mlap,
sfx_sboost,
sfx_mush,
sfx_kinvnc,
sfx_kgrow,
sfx_bomb,
sfx_bomb2,
sfx_peel,
sfx_slip, sfx_slip,
sfx_fake, sfx_screec,
sfx_grnshl, sfx_drift,
sfx_redshl, sfx_ruburn,
sfx_shbrk, sfx_ddash,
sfx_mkdrft,
sfx_mkslid,
sfx_mkitem,
sfx_mkitm1,
sfx_mkitm2,
sfx_mkitm3,
sfx_mkitm4,
sfx_mkitm5,
sfx_mkitm6,
sfx_mkitm7,
sfx_mkitm8,
sfx_mkitmF,
sfx_mkitmE,
sfx_clash,
sfx_tossed, sfx_tossed,
sfx_shelit, sfx_itpick,
sfx_vroom, sfx_peel,
sfx_boing, sfx_hogbom,
sfx_zio3,
sfx_kpogos,
sfx_alarmi, sfx_alarmi,
sfx_alarmg, sfx_alarmg,
sfx_screec, sfx_kinvnc,
sfx_kgrow,
sfx_itrol1,
sfx_itrol2,
sfx_itrol3,
sfx_itrol4,
sfx_itrol5,
sfx_itrol6,
sfx_itrol7,
sfx_itrol8,
sfx_itrolf,
sfx_itrole,
sfx_vroom,
sfx_chaooo,
sfx_yeeeah, sfx_yeeeah,
sfx_noooo1, sfx_noooo1,
sfx_noooo2, sfx_noooo2,
sfx_ruby1, sfx_ruby1,
sfx_ruby2, sfx_ruby2,
sfx_hogbom, sfx_tcart,
sfx_kpogos, sfx_bfare,
sfx_ddash, sfx_merry,
sfx_zio3, sfx_bowlh,
sfx_tppop,
sfx_hsdoor,
sfx_hstrn,
sfx_aspkb,
sfx_wind1, sfx_wind1,
sfx_fire2, sfx_fire2,
sfx_chain, sfx_chain,
sfx_mcitm1, sfx_mkuma,
sfx_chaooo, sfx_toada,
sfx_itfree, sfx_itfree,
sfx_dbgsal, sfx_dbgsal,
@ -1025,21 +1019,6 @@ typedef enum
sfx_krti11, sfx_krti11,
sfx_krti12, sfx_krti12,
// SOC_CHAO hardcode
sfx_mkuma,
sfx_mkpop,
sfx_bfare,
sfx_merry,
sfx_bowlh,
sfx_tcart,
sfx_tppop,
sfx_toada,
sfx_hsdoor,
sfx_hstrn,
sfx_aspkb,
sfx_msmnj1,
sfx_msmnj2,
// And LASTLY, Kart's skin sounds. // And LASTLY, Kart's skin sounds.
sfx_kwin, sfx_kwin,
sfx_klose, sfx_klose,