From 3551509ed8226a1d467c9923ffb351bb385ad741 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 17 Apr 2017 14:38:56 +0100
Subject: [PATCH] * Remaster the sound stacking methodology such that the same
sound effect updates its previous position rather than heading to the bottom.
* Put brackets around the sound names on the reccomendation of a friend who
works with disability in gaming. * Update a bunch of sound names to better
match what they actually do in SRB2.
---
src/s_sound.c | 21 ++++---
src/screen.c | 2 +-
src/sounds.c | 170 +++++++++++++++++++++++++-------------------------
3 files changed, 100 insertions(+), 93 deletions(-)
diff --git a/src/s_sound.c b/src/s_sound.c
index 829ff0a980..2add1cf941 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -594,22 +594,29 @@ dontplay:
if (cv_closedcaptioning.value && sfx->caption[0] != '/')
{
UINT8 i, set = 7, moveup = 255;
-
+ boolean same = false;
for (i = 0; i < set; i++)
{
- boolean same = ((sfx == closedcaptions[i].s) || (closedcaptions[i].s && fastcmp(sfx->caption, closedcaptions[i].s->caption)));
- if (same
- || !(closedcaptions[i].c || closedcaptions[i].s) || (sfx->priority >= closedcaptions[i].s->priority))
+ same = ((sfx == closedcaptions[i].s) || (closedcaptions[i].s && fastcmp(sfx->caption, closedcaptions[i].s->caption)));
+ if (same)
{
set = i;
- if (closedcaptions[i].s && !same && (sfx->priority >= closedcaptions[i].s->priority))
- moveup = i;
break;
}
}
- if (sfx != closedcaptions[set].s)
+ if (!same)
{
+ for (i = 0; i < set; i++)
+ {
+ if (!(closedcaptions[i].c || closedcaptions[i].s) || (sfx->priority >= closedcaptions[i].s->priority))
+ {
+ set = i;
+ if (closedcaptions[i].s && (sfx->priority >= closedcaptions[i].s->priority))
+ moveup = i;
+ break;
+ }
+ }
for (i = 7; i > set; i--)
{
if (sfx == closedcaptions[i].s)
diff --git a/src/screen.c b/src/screen.c
index c2352283de..223f0a4943 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -488,7 +488,7 @@ void SCR_ClosedCaptions(void)
}
}
V_DrawRightAlignedString(vid.width-(20*vid.dupx), y,
- flags, va("%c %s", dir, (closedcaptions[i].s->caption[0] ? closedcaptions[i].s->caption : closedcaptions[i].s->name)));
+ flags, va("%c [%s]", dir, (closedcaptions[i].s->caption[0] ? closedcaptions[i].s->caption : closedcaptions[i].s->name)));
}
}
}
diff --git a/src/sounds.c b/src/sounds.c
index 3a4c9cd5e9..2edb2c204f 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -40,10 +40,10 @@ sfxinfo_t S_sfx[NUMSFX] =
{"altdi2", false, 192, 16, -1, NULL, 0, SKSPLDET2, -1, LUMPERROR, "Dying"},
{"altdi3", false, 192, 16, -1, NULL, 0, SKSPLDET3, -1, LUMPERROR, "Dying"},
{"altdi4", false, 192, 16, -1, NULL, 0, SKSPLDET4, -1, LUMPERROR, "Dying"},
- {"altow1", false, 192, 16, -1, NULL, 0, SKSPLPAN1, -1, LUMPERROR, "Spilled rings"},
- {"altow2", false, 192, 16, -1, NULL, 0, SKSPLPAN2, -1, LUMPERROR, "Spilled rings"},
- {"altow3", false, 192, 16, -1, NULL, 0, SKSPLPAN3, -1, LUMPERROR, "Spilled rings"},
- {"altow4", false, 192, 16, -1, NULL, 0, SKSPLPAN4, -1, LUMPERROR, "Spilled rings"},
+ {"altow1", false, 192, 16, -1, NULL, 0, SKSPLPAN1, -1, LUMPERROR, "Ring loss"},
+ {"altow2", false, 192, 16, -1, NULL, 0, SKSPLPAN2, -1, LUMPERROR, "Ring loss"},
+ {"altow3", false, 192, 16, -1, NULL, 0, SKSPLPAN3, -1, LUMPERROR, "Ring loss"},
+ {"altow4", false, 192, 16, -1, NULL, 0, SKSPLPAN4, -1, LUMPERROR, "Ring loss"},
{"victr1", false, 64, 16, -1, NULL, 0, SKSPLVCT1, -1, LUMPERROR, "/"},
{"victr2", false, 64, 16, -1, NULL, 0, SKSPLVCT2, -1, LUMPERROR, "/"},
{"victr3", false, 64, 16, -1, NULL, 0, SKSPLVCT3, -1, LUMPERROR, "/"},
@@ -93,23 +93,23 @@ sfxinfo_t S_sfx[NUMSFX] =
{"amwtr6", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running water"},
{"amwtr7", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running water"},
{"amwtr8", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running water"},
- {"bubbl1", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Small bubble"},
- {"bubbl2", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Small bubble"},
- {"bubbl3", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Small bubble"},
- {"bubbl4", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Small bubble"},
- {"bubbl5", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Small bubble"},
- {"floush", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shallow water"},
- {"splash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"},
- {"splish", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"}, // Splish Tails 12-08-2000
- {"wdrip1", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip2", false, 8 , 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip3", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip4", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip5", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip6", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip7", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wdrip8", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dripping water"},
- {"wslap", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water slap"}, // Water Slap Tails 12-13-2000
+ {"bubbl1", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"bubbl2", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"bubbl3", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"bubbl4", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"bubbl5", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"floush", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"},
+ {"splash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, // labeling sfx_splash as "glub" and sfx_splish as "splash" seems wrong but isn't
+ {"splish", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Splish Tails 12-08-2000
+ {"wdrip1", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip2", false, 8 , 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip3", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip4", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip5", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip6", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip7", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wdrip8", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"},
+ {"wslap", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Water Slap Tails 12-13-2000
{"doora1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"},
{"doorb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"},
@@ -130,7 +130,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"rocks2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"},
{"rocks3", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"},
{"rocks4", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"},
- {"rumbam", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Violent rumbling"},
+ {"rumbam", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
{"rumble", false, 64, 24, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
// Game objects, etc
@@ -148,8 +148,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"fizzle", false, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Electric fizzle"},
{"gbeep", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous beeping"}, // Grenade beep
{"wepfir", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weapon firing"}, // defaults to thok
- {"ghit" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goo splash"},
- {"gloop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"},
+ {"ghit" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop splash"},
+ {"gloop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"},
{"gspray", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop sling"},
{"gravch", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Recycler"},
{"itemup", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"},
@@ -162,8 +162,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"monton", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Golden Monitor activated"},
{"pogo" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical pogo"},
{"pop" , false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"},
- {"rail1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rail weapon fired"},
- {"rail2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rail weapon crash"},
+ {"rail1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Railgun fired"},
+ {"rail2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Railgun crash"},
{"rlaunc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Missile fired"},
{"shield", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pity Shield"}, // generic GET!
{"wirlsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind Shield"}, // Whirlwind GET!
@@ -171,47 +171,47 @@ sfxinfo_t S_sfx[NUMSFX] =
{"elemsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Elemental Shield"}, // Elemental GET!
{"armasg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon Shield"}, // Armaggeddon GET!
{"attrsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction Shield"}, // Attract GET!
- {"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield loss"}, // You LOSE!
+ {"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, // You LOSE!
{"spdpad", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speedpad"},
{"spkdth", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"},
{"spring", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"},
{"statu1", true, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"},
{"statu2", true, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"},
{"strpst", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, // Starpost Sound Tails 07-04-2002
- {"supert", true, 127, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Super transformation"},
+ {"supert", true, 127, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"},
{"telept", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dash"},
{"tink" , false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tink"},
{"token" , true, 224, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Token"}, // SS token
{"trfire", true, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Laser fired"},
- {"trpowr", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Charging"},
+ {"trpowr", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"turhit", false, 40, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hit"},
{"wdjump", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind jump"},
{"mswarp", false, 60, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning out"},
- {"mspogo", false, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Crunch"},
+ {"mspogo", false, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Breaking through"},
{"boingf", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bouncing"},
{"corkp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork fired"},
{"corkh", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork hit"},
// Menu, interface
{"chchng", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score tally done"},
- {"dwnind", false, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"},
+ {"dwnind", false, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thinking about air"},
{"emfind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Radar beep"},
{"flgcap", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flag capture"},
{"menu1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"},
{"oneup", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Extra life"},
{"ptally", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score tally"}, // Point tally is identical to menu for now
- {"radio", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chatter"},
+ {"radio", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Notification"},
{"wepchg", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weapon change"}, // Weapon switch is identical to menu for now
- {"wtrdng", true, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thinking about air"}, // make sure you can hear the DING DING! Tails 03-08-2000
+ {"wtrdng", true, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, // make sure you can hear the DING DING! Tails 03-08-2000
{"zelda", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"},
// NiGHTS
- {"ideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Finishing the stage"},
- {"xideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Finishing the stage"}, // Xmas
+ {"ideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"},
+ {"xideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"}, // Xmas
{"nbmper", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"},
{"nxbump", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, // Xmas
- {"ncitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got logo"},
- {"nxitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got logo"}, // Xmas
+ {"ncitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"},
+ {"nxitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"}, // Xmas
{"ngdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"},
{"nxdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"}, // Xmas
{"drill1", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drill start"},
@@ -222,9 +222,9 @@ sfxinfo_t S_sfx[NUMSFX] =
{"hoop1", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop"},
{"hoop2", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop+"},
{"hoop3", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop++"},
- {"hidden", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up discovery"},
+ {"hidden", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"},
{"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Paraloop"},
- {"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Countdown"},
+ {"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous Countdown"},
// Mario
{"koopfr" , true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"},
@@ -232,17 +232,17 @@ sfxinfo_t S_sfx[NUMSFX] =
{"mario2", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Koopa shell"},
{"mario3", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up"},
{"mario4", true, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got coin"},
- {"mario5", false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goomba stomp"},
+ {"mario5", false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boot"},
{"mario6", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"},
{"mario7", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"},
{"mario8", false, 48, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"},
- {"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collecting power-up"},
+ {"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Emerging"},
{"marioa", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Extra life"},
- {"thwomp", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp stomp"},
+ {"thwomp", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp"},
// Black Eggman
- {"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Bomb explosion"},
- {"bechrg", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Charging"},
+ {"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"},
+ {"bechrg", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"becrsh", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Crash"},
{"bedeen", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic crash"},
{"bedie1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman crying"},
@@ -252,11 +252,11 @@ sfxinfo_t S_sfx[NUMSFX] =
{"befire", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing goop"},
{"beflap", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"},
{"begoop", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"},
- {"begrnd", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic hit"},
- {"behurt", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic crash"},
+ {"begrnd", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"},
+ {"behurt", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman shocked"},
{"bejet1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Jetpack charge"},
{"belnch", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"},
- {"beoutb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Empty chamber"},
+ {"beoutb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Failed shot"},
{"beragh", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman screaming"},
{"beshot", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"},
{"bestep", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical stomp"},
@@ -265,7 +265,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"bewar2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"},
{"bewar3", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"},
{"bewar4", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"},
- {"bexpld", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Missile explosion"},
+ {"bexpld", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"},
{"bgxpld", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"},
// Cybrakdemon
@@ -280,20 +280,20 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Skid"},
{"s3k37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"},
{"s3k38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble gasp"},
- {"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"},
- {"s3k3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"},
+ {"s3k3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield"},
{"s3k3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"},
- {"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning"},
+ {"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spin"},
{"s3k3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"},
- {"s3k3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fire Shield"},
- {"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water Shield"},
+ {"s3k3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flame Shield"},
+ {"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble Shield"},
{"s3k40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction zoom"},
- {"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning shield"},
+ {"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning Shield"},
{"s3k42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Twinspin"},
{"s3k43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fire burst"},
{"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"},
{"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning zap"},
- {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Super transformation"},
+ {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"},
{"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising sand"},
{"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic clink"},
{"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rock"},
@@ -306,13 +306,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Siren"},
{"s3k51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling bomb"},
{"s3k52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"},
- {"s3k53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Charging"},
+ {"s3k53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"s3k54", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, // MetalSonic shot fire
- {"s3k55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving on track"},
- {"s3k56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"s3k57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water"},
+ {"s3k55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"},
+ {"s3k56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy landing"},
+ {"s3k57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"},
{"s3k58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"},
- {"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing platform"},
+ {"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"},
{"s3k5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"},
{"s3k5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"},
{"s3k5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric spark"},
@@ -323,46 +323,46 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drilling"},
{"s3k62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"},
{"s3k63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"},
- {"s3k64", false, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"},
+ {"s3k64", false, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Clatter"},
{"s3k65", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got blue sphere"}, // Blue Spheres
{"s3k66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage clear"},
{"s3k67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"},
- {"s3k68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Super possibilities"},
+ {"s3k68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Unknown possibilities"},
{"s3k69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Switch click"},
{"s3k6a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage clear"},
{"s3k6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"s3k6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting from the ground"},
+ {"s3k6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"},
{"s3k6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3k6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical damage"},
{"s3k6f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
- {"s3k70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Seperation"},
- {"s3k71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3k70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"},
+ {"s3k71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Basic Shield"},
{"s3k72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"},
{"s3k73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"},
- {"s3k74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical clink"},
+ {"s3k74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gong"},
{"s3k75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"},
{"s3k76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"},
{"s3k77", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Balloon pop"},
{"s3k78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"},
{"s3k79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric charge"},
{"s3k7a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising from lava"},
- {"s3k7b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper bounce"},
+ {"s3k7b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"},
{"s3k7c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"},
{"s3k7d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3k7e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Eating dirt"},
{"s3k7f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Freeze"},
{"s3k80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice spike burst"},
- {"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing large object"},
- {"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting from the ground"},
- {"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing bridge"},
- {"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Releasing"},
+ {"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"},
+ {"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"},
+ {"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
+ {"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering down"},
{"s3k86", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"},
{"s3k87", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"},
- {"s3k88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic clink"},
- {"s3k89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sufficiently advanced tech."},
+ {"s3k88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic squeak"},
+ {"s3k89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Advanced technology"},
{"s3k8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boing"},
- {"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chop"},
+ {"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thwack"},
{"s3k8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3k8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
@@ -381,15 +381,15 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k9b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"},
{"s3k9c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Super Emerald"},
{"s3k9d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Targeting"},
- {"s3k9e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic clink"},
- {"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Super transformation"},
+ {"s3k9e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wham"},
+ {"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"},
{"s3ka0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"},
{"s3ka1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"},
{"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lift"},
- {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Robotic power up"},
+ {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction failure"},
{"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Countdown beep"},
{"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"},
{"s3ka9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"},
@@ -402,13 +402,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score tally done"},
{"s3kb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"},
{"s3kb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"},
- {"s3kb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Big ring warp"},
+ {"s3kb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"},
{"s3kb4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"},
- {"s3kb5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3kb5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Clink"},
{"s3kb6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash launch"},
- {"s3kb7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rolling tumbler"},
+ {"s3kb7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tumbler"},
{"s3kb8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling signpost"},
- {"s3kb9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spilled rings"},
+ {"s3kb9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ring loss"},
{"s3kba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flight"},
{"s3kbb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tired flight"},
{"s3kbcs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
@@ -440,8 +440,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, // ditto
{"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"},
{"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, // ditto
- {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto
+ {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
+ {"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominuous rumbling"}, // ditto
{"s3kccs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"},
{"s3kccl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"}, // ditto
{"s3kcds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
--
GitLab