diff --git a/configure.py b/configure.py
index 1963ef3d3..cc6a0d5ba 100644
--- a/configure.py
+++ b/configure.py
@@ -535,7 +535,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Game/zGrid.cpp"),
             Object(Matching, "SB/Game/zNPCGoalScript.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCSndTable.cpp"),
-            Object(NonMatching, "SB/Game/zNPCSndLists.cpp"),
+            Object(Matching, "SB/Game/zNPCSndLists.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeDuplotron.cpp"),
             Object(NonMatching, "SB/Core/x/xModelBucket.cpp"),
             Object(NonMatching, "SB/Game/zShrapnel.cpp"),
diff --git a/src/SB/Game/zNPCGoalVillager.h b/src/SB/Game/zNPCGoalVillager.h
index e37fb6573..bbb0da4c8 100644
--- a/src/SB/Game/zNPCGoalVillager.h
+++ b/src/SB/Game/zNPCGoalVillager.h
@@ -167,13 +167,6 @@ struct zNPCGoalBoySwim : zNPCGoalCommon
     }
 };
 
-struct NPCSndProp
-{
-    en_NPC_SOUND sndtype;
-    int flg_snd;
-    float tym_delayNext;
-};
-
 xFactoryInst* GOALCreate_Villager(S32 who, RyzMemGrow* grow, void*);
 
 #endif
diff --git a/src/SB/Game/zNPCSndLists.cpp b/src/SB/Game/zNPCSndLists.cpp
new file mode 100644
index 000000000..658df5c0e
--- /dev/null
+++ b/src/SB/Game/zNPCSndLists.cpp
@@ -0,0 +1,196 @@
+#include "zNPCSndLists.h"
+
+NPCSndProp g_sndProps[] = {
+    { NPC_STYP_ENCOUNTER, 0x400, 1.0f },   { NPC_STYP_LAUGH, 0xC00, 7.0f },
+    { NPC_STYP_ALERT, 0x400, 0.0f },       { NPC_STYP_CLANKING, 0x400, 0.75f },
+    { NPC_STYP_RESPAWN, 0x200, 0.75f },    { NPC_STYP_WARNBANG, 0x200, 0.1f },
+    { NPC_STYP_OUCH, 0x200, 0.1f },        { NPC_STYP_DIZZY, 0x200, 0.1f },
+    { NPC_STYP_EXCLAIM, 0x200, 0.5f },     { NPC_STYP_CHEERING, 0xA00, 0.25f },
+    { NPC_STYP_LIGHTNING, 0xA00, 0.1f },   { NPC_STYP_DANCE, 0x400, 0.2f },
+    { NPC_STYP_DEATH, 0x2200, 1.0f },      { NPC_STYP_DEATHJELLY, 0x2C00, 1.0f },
+    { NPC_STYP_TIKIEXPLODE, 0x400, 0.1f }, { NPC_STYP_TIKITHUNDER, 0x1A00, 0.1f },
+    { NPC_STYP_LISTEND, 0x200, -1.0f },
+};
+NPCSndTrax g_sndTrax_Universal[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_General[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Villager[] = {
+    { NPC_STYP_EXCLAIM, "bad_notes_accguitar1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_accguitar2", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_banjo1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_banjo2", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_banjo3", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_bassone1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_bassone2", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_bassone3", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_piano1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_piano2", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_piano3", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_piano4", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_trumpet1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_trumpet2", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_trumpet3", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_ukeleli", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_violin1", 0 },
+    { NPC_STYP_EXCLAIM, "bad_notes_violin2", 0 },
+    { NPC_STYP_EXCLAIM, "cover", 0 },
+    { NPC_STYP_EXCLAIM, "drum", 0 },
+    { NPC_STYP_EXCLAIM, "Check", 0 },
+    { NPC_STYP_EXCLAIM, "xylo_1", 0 },
+    { NPC_STYP_EXCLAIM, "xylo_2", 0 },
+    { NPC_STYP_EXCLAIM, "xylo_3", 0 },
+    { NPC_STYP_EXCLAIM, "xylo_4", 0 },
+    { NPC_STYP_EXCLAIM, "xylo_5", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Squidward[] = {
+    { NPC_STYP_EXCLAIM, "clarinet_1", 0 }, { NPC_STYP_EXCLAIM, "clarinet_2", 0 },
+    { NPC_STYP_EXCLAIM, "clarinet_3", 0 }, { NPC_STYP_EXCLAIM, "clarinet_4", 0 },
+    { NPC_STYP_EXCLAIM, "clarinet_5", 0 }, { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerCoStar[] = {
+    { NPC_STYP_EXCLAIM, "Bounce", 0 },       { NPC_STYP_EXCLAIM, "Bowl_hitplate", 0 },
+    { NPC_STYP_EXCLAIM, "Bump_beep1", 0 },   { NPC_STYP_EXCLAIM, "Bump_hit1", 0 },
+    { NPC_STYP_EXCLAIM, "Bump_hit2", 0 },    { NPC_STYP_EXCLAIM, "Bus_dooropen", 0 },
+    { NPC_STYP_EXCLAIM, "CarAlarm", 0 },     { NPC_STYP_EXCLAIM, "Check1", 0 },
+    { NPC_STYP_EXCLAIM, "Gate_hit2", 0 },    { NPC_STYP_EXCLAIM, "Metal_tube_hit", 0 },
+    { NPC_STYP_EXCLAIM, "NPC_GL_jump", 0 },  { NPC_STYP_EXCLAIM, "Pop_in", 0 },
+    { NPC_STYP_EXCLAIM, "Pop_out", 0 },      { NPC_STYP_EXCLAIM, "Sailflap", 0 },
+    { NPC_STYP_EXCLAIM, "SlapLeaf_hit", 0 }, { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerMale[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerFemale[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerElder[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerEldess[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerBoy[] = {
+    { NPC_STYP_CHEERING, "laugh", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_VillagerGirl[] = {
+    { NPC_STYP_CHEERING, "laugh", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Neptune[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Jelly[] = {
+    { NPC_STYP_OUCH, "mnu4_exit", 0 },
+    { NPC_STYP_DEATHJELLY, "mnu4_Pop_in", 0 },
+    { NPC_STYP_ENCOUNTER, "Jellyfish_charge", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_TikiShared[] = {
+    { NPC_STYP_TIKISTACK, "Tiki_St_land2", 0 },
+    { NPC_STYP_TIKIEXPLODE, "Tiki_Wd_dest", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_TikiThunder[] = {
+    { NPC_STYP_TIKITHUNDER, "Tiki_Th_Light", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Duplotron[] = {
+    { NPC_STYP_WARNBANG, "Dupli_full", 0 },
+    { NPC_STYP_CLANKING, "Dupli_idle", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Robot[] = {
+    { NPC_STYP_LAUGH, "RSB_laugh_8", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Fodder[] = {
+    { NPC_STYP_OUCH, "Fod_hit", 0 },
+    { NPC_STYP_ALERT, "Fod_alert", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_FodBomb[] = {
+    { NPC_STYP_DEATH, "Fod_destroy", 0 },   { NPC_STYP_ALERT, "Fod3_alert", 0 },
+    { NPC_STYP_WARNBANG, "Fod3_alert", 0 }, { NPC_STYP_ATTACK, "Fod3_attack", 0 },
+    { NPC_STYP_OUCH, "Fod_hit", 0 },        { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_FodBzzt[] = {
+    { NPC_STYP_OUCH, "Fod_hit", 0 },
+    { NPC_STYP_ALERT, "Fod2_alert", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Chomper[] = {
+    { NPC_STYP_OUCH, "Fod_hit", 0 },
+    { NPC_STYP_ALERT, "Fod4_alert1", 0 },
+    { NPC_STYP_ATTACK, "Fod4_attack", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Hammer[] = {
+    { NPC_STYP_ALERT, "Ham_alert", 0 },
+    { NPC_STYP_OUCH, "Ham_hit1", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_TarTar[] = {
+    { NPC_STYP_ALERT, "Tar_alert", 0 },
+    { NPC_STYP_OUCH, "Tar_damage", 0 },
+    { NPC_STYP_DIZZY, "Tar_damage", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Glove[] = {
+    { NPC_STYP_ALERT, "Glove_alert", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Monsoon[] = {
+    { NPC_STYP_ALERT, "Mon_alert", 0 },
+    { NPC_STYP_LIGHTNING, "Mon_Light", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Sleepy[] = {
+    { NPC_STYP_ATTACK, "ST_attack", 0 },
+    { NPC_STYP_OUCH, "ST_hit", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Chuck[] = {
+    { NPC_STYP_ALERT, "Chu_alert", 0 },  { NPC_STYP_WEPLAUNCH, "Chu_cock", 0 },
+    { NPC_STYP_ATTACK, "Chu_throw", 0 }, { NPC_STYP_OUCH, "Fod_hit", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_ArfArf[] = {
+    { NPC_STYP_DIZZY, "Arf_death2", 0 },
+    { NPC_STYP_PUNCH, "Arf_attack2", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_ArfDog[] = {
+    { NPC_STYP_OUCH, "ArfD_stunned", 0 },
+    { NPC_STYP_WARNBANG, "Fod3_attack", 0 },
+    { NPC_STYP_DEATH, "Fod_hit", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Tubelet[] = {
+    { NPC_STYP_ALERT, "Tube_alert", 0 }, { NPC_STYP_UNBONKED, "Tube_spawn", 0 },
+    { NPC_STYP_BONKED, "Tube_pop", 0 },  { NPC_STYP_WARNBANG, "Tube_pop", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Slick[] = {
+    { NPC_STYP_ALERT, "Slk_alert1", 0 }, { NPC_STYP_DIZZY, "Slk_hit1", 0 },
+    { NPC_STYP_OUCH, "Slk_hit2", 0 },    { NPC_STYP_ATTACK, "Slk_attack1", 0 },
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_KingJelly[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_Dutchman[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+NPCSndTrax g_sndTrax_BossSandy[] = {
+    { NPC_STYP_LISTEND, NULL, 0 },
+};
+
+// leftovers from the dwarf
+//NPCSndTrax g_sndTrax_Prawn[] = { { NPC_STYP_LISTEND, NULL, 0 }, };
+//NPCSndTrax g_sndTrax_BossPat[] = { { NPC_STYP_LISTEND, NULL, 0 }, };
+//NPCSndTrax g_sndTrax_BossSB[] = { { NPC_STYP_LISTEND, NULL, 0 }, };
diff --git a/src/SB/Game/zNPCSndLists.h b/src/SB/Game/zNPCSndLists.h
new file mode 100644
index 000000000..ebd1b95e7
--- /dev/null
+++ b/src/SB/Game/zNPCSndLists.h
@@ -0,0 +1,53 @@
+#ifndef ZNPCSNDLISTS_H
+#define ZNPCSNDLISTS_H
+
+#include <types.h>
+
+enum en_NPC_SOUND
+{
+    NPC_STYP_BOGUS = -2,
+    NPC_STYP_LISTEND = 0,
+    NPC_STYP_ENCOUNTER,
+    NPC_STYP_CLANKING,
+    NPC_STYP_EXCLAIM,
+    NPC_STYP_OUCH,
+    NPC_STYP_CHEERING,
+    NPC_STYP_RESPAWN,
+    NPC_STYP_ALERT,
+    NPC_STYP_DIZZY,
+    NPC_STYP_DANCE,
+    NPC_STYP_LAUGH,
+    NPC_STYP_ATTACK,
+    NPC_STYP_PUNCH,
+    NPC_STYP_WEPLAUNCH,
+    NPC_STYP_LIGHTNING,
+    NPC_STYP_WARNBANG,
+    NPC_STYP_DEATH,
+    NPC_STYP_DEATHJELLY,
+    NPC_STYP_BONKED,
+    NPC_STYP_UNBONKED,
+    NPC_STYP_TIKISTACK,
+    NPC_STYP_TIKIEXPLODE,
+    NPC_STYP_TIKITHUNDER,
+    NPC_STYP_XSFXTALK,
+    NPC_STYP_ONELINER,
+    NPC_STYP_ONELINERTOO,
+    NPC_STYP_NOMORE,
+    NPC_STYP_FORCE = 0x7fffffff
+};
+
+struct NPCSndProp
+{
+    en_NPC_SOUND sndtype;
+    S32 flg_snd;
+    F32 tym_delayNext;
+};
+
+struct NPCSndTrax
+{
+    en_NPC_SOUND typ_sound;
+    const char* nam_sound;
+    U32 aid_sound;
+};
+
+#endif
diff --git a/src/SB/Game/zNPCSndTable.h b/src/SB/Game/zNPCSndTable.h
index 717d41611..aac481227 100644
--- a/src/SB/Game/zNPCSndTable.h
+++ b/src/SB/Game/zNPCSndTable.h
@@ -1,47 +1,9 @@
 #ifndef ZNPCSNDTABLE_H
 #define ZNPCSNDTABLE_H
 
-#include <types.h>
-
-enum en_NPC_SOUND
-{
-    NPC_STYP_BOGUS = -2,
-    NPC_STYP_LISTEND = 0,
-    NPC_STYP_ENCOUNTER,
-    NPC_STYP_CLANKING,
-    NPC_STYP_EXCLAIM,
-    NPC_STYP_OUCH,
-    NPC_STYP_CHEERING,
-    NPC_STYP_RESPAWN,
-    NPC_STYP_ALERT,
-    NPC_STYP_DIZZY,
-    NPC_STYP_DANCE,
-    NPC_STYP_LAUGH,
-    NPC_STYP_ATTACK,
-    NPC_STYP_PUNCH,
-    NPC_STYP_WEPLAUNCH,
-    NPC_STYP_LIGHTNING,
-    NPC_STYP_WARNBANG,
-    NPC_STYP_DEATH,
-    NPC_STYP_DEATHJELLY,
-    NPC_STYP_BONKED,
-    NPC_STYP_UNBONKED,
-    NPC_STYP_TIKISTACK,
-    NPC_STYP_TIKIEXPLODE,
-    NPC_STYP_TIKITHUNDER,
-    NPC_STYP_XSFXTALK,
-    NPC_STYP_ONELINER,
-    NPC_STYP_ONELINERTOO,
-    NPC_STYP_NOMORE,
-    NPC_STYP_FORCE = 0x7fffffff
-};
+#include "zNPCSndLists.h"
 
-struct NPCSndTrax
-{
-    en_NPC_SOUND typ_sound;
-    char* nam_sound;
-    U32 aid_sound;
-};
+#include <types.h>
 
 struct NPCSndQueue //0x14
 {