Merge branch 'gunstar' into 'master'

Add Gunstar sounds

See merge request KartKrew/Kart!1324
This commit is contained in:
Oni 2023-07-02 03:34:41 +00:00
commit 24752ec059
2 changed files with 181 additions and 0 deletions

View file

@ -1325,6 +1325,97 @@ sfxinfo_t S_sfx[NUMSFX] =
{"krti11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"krti12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR, ""},
// Gunstar Heroes
// Gunstar Heroes
{"gsha0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsha9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshaa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshaf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshb9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshbb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshbc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshbd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshbe", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshbf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc0g", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshc9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshca", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshcb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshcc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshcd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshce", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshcf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshd9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshda", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshdb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshdc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshdd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshde", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshdf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshe9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshea", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gsheb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshec", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshed", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshee", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshef", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshf0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gshf1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
// SRB2kart - Skin sounds
{"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR, ""},
{"klose", false, 64, 96, -1, NULL, 0, SKSKLOSE, -1, LUMPERROR, ""},

View file

@ -1393,6 +1393,96 @@ typedef enum
sfx_krti11,
sfx_krti12,
// Gunstar Heroes
sfx_gsha0,
sfx_gsha1,
sfx_gsha2,
sfx_gsha3,
sfx_gsha4,
sfx_gsha5,
sfx_gsha6,
sfx_gsha7,
sfx_gsha8,
sfx_gsha9,
sfx_gshaa,
sfx_gshab,
sfx_gshac,
sfx_gshad,
sfx_gshae,
sfx_gshaf,
sfx_gshb0,
sfx_gshb1,
sfx_gshb2,
sfx_gshb3,
sfx_gshb4,
sfx_gshb5,
sfx_gshb6,
sfx_gshb7,
sfx_gshb8,
sfx_gshb9,
sfx_gshba,
sfx_gshbb,
sfx_gshbc,
sfx_gshbd,
sfx_gshbe,
sfx_gshbf,
sfx_gshc0a,
sfx_gshc0b,
sfx_gshc0c,
sfx_gshc0d,
sfx_gshc0e,
sfx_gshc0f,
sfx_gshc0g,
sfx_gshc1,
sfx_gshc2,
sfx_gshc3,
sfx_gshc4,
sfx_gshc5,
sfx_gshc6,
sfx_gshc7,
sfx_gshc8,
sfx_gshc9,
sfx_gshca,
sfx_gshcb,
sfx_gshcc,
sfx_gshcd,
sfx_gshce,
sfx_gshcf,
sfx_gshd0,
sfx_gshd1,
sfx_gshd2,
sfx_gshd3,
sfx_gshd4,
sfx_gshd5,
sfx_gshd6,
sfx_gshd7,
sfx_gshd8,
sfx_gshd9,
sfx_gshda,
sfx_gshdb,
sfx_gshdc,
sfx_gshdd,
sfx_gshde,
sfx_gshdf,
sfx_gshe0,
sfx_gshe1,
sfx_gshe2,
sfx_gshe3,
sfx_gshe4,
sfx_gshe5,
sfx_gshe6,
sfx_gshe7,
sfx_gshe8,
sfx_gshe9,
sfx_gshea,
sfx_gsheb,
sfx_gshec,
sfx_gshed,
sfx_gshee,
sfx_gshef,
sfx_gshf0,
sfx_gshf1,
// And LASTLY, Kart's skin sounds.
sfx_kwin,
sfx_klose,