diff --git a/Source/automap.cpp b/Source/automap.cpp
index 0f4258185..84f0c7d3a 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -114,7 +114,7 @@ void InitAutomap()
 		return;
 	}
 
-	dwTiles >>= 1;
+	dwTiles /= 2;
 	pTmp = pAFile;
 
 	for (i = 1; i <= dwTiles; i++) {
@@ -252,7 +252,7 @@ void DrawAutomap()
 
 		for (j = 0; j < cells; j++) {
 			WORD maptype = GetAutomapType(mapx + j, mapy - j, TRUE);
-			if (maptype)
+			if (maptype != 0)
 				DrawAutomapTile(x, sy, maptype);
 			x += AmLine64;
 		}
@@ -261,7 +261,7 @@ void DrawAutomap()
 		y = sy + AmLine16;
 		for (j = 0; j <= cells; j++) {
 			WORD maptype = GetAutomapType(mapx + j, mapy - j, TRUE);
-			if (maptype)
+			if (maptype != 0)
 				DrawAutomapTile(x, y, maptype);
 			x += AmLine64;
 		}
@@ -388,7 +388,7 @@ void DrawAutomapTile(int sx, int sy, WORD automap_type)
 			DrawLine(sx, sy, x1, y2, COLOR_DIM);
 			DrawLine(sx, sy, x2, y2, COLOR_DIM);
 		}
-		if (!(flags & (MAPFLAG_VERTDOOR | MAPFLAG_VERTGRATE | MAPFLAG_VERTARCH)))
+		if ((flags & (MAPFLAG_VERTDOOR | MAPFLAG_VERTGRATE | MAPFLAG_VERTARCH)) == 0)
 			DrawLine(sx, sy - AmLine16, sx - AmLine32, sy, COLOR_DIM);
 	}
 
@@ -421,7 +421,7 @@ void DrawAutomapTile(int sx, int sy, WORD automap_type)
 			DrawLine(sx, sy, x1, y2, COLOR_DIM);
 			DrawLine(sx, sy, x2, y2, COLOR_DIM);
 		}
-		if (!(flags & (MAPFLAG_HORZDOOR | MAPFLAG_HORZGRATE | MAPFLAG_HORZARCH)))
+		if ((flags & (MAPFLAG_HORZDOOR | MAPFLAG_HORZGRATE | MAPFLAG_HORZARCH)) == 0)
 			DrawLine(sx, sy - AmLine16, sx + AmLine32, sy, COLOR_DIM);
 	}
 
@@ -531,7 +531,7 @@ void DrawAutomapItem(int x, int y, BYTE color)
 
 	x1 = x - AmLine32 / 2;
 	y1 = y - AmLine16 / 2;
-	x2 = AmLine64 / 2 + x1;
+	x2 = x1 + AmLine64 / 2;
 	y2 = y1 + AmLine32 / 2;
 	DrawLine(x, y1, x1, y, color);
 	DrawLine(x, y1, x2, y, color);
@@ -673,9 +673,9 @@ void DrawAutomapText()
 			nextline = 50;
 		}
 	}
-	if (setlevel)
+	if (setlevel) {
 		PrintGameStr(8, nextline, quest_level_names[(BYTE)setlvlnum], COL_GOLD);
-	else if (currlevel) {
+	} else if (currlevel) {
 #ifdef HELLFIRE
 		if (currlevel < 17 || currlevel > 20) {
 			if (currlevel < 21 || currlevel > 24)
diff --git a/Source/codec.cpp b/Source/codec.cpp
index 04f81d0fc..0411fcefd 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -12,6 +12,8 @@ typedef struct CodecSignature {
 	WORD unused;
 } CodecSignature;
 
+#define BLOCKSIZE 64
+
 int codec_decode(BYTE *pbSrcDst, DWORD size, char *pszPassword)
 {
 	char buf[128];
@@ -20,20 +22,20 @@ int codec_decode(BYTE *pbSrcDst, DWORD size, char *pszPassword)
 	CodecSignature *sig;
 
 	codec_init_key(0, pszPassword);
-	if (size <= 8)
+	if (size <= sizeof(CodecSignature))
 		return 0;
-	size = size - 8;
-	if (size % 64 != 0)
+	size -= sizeof(CodecSignature);
+	if (size % BLOCKSIZE != 0)
 		return 0;
-	for (i = size; i != 0; pbSrcDst += 64, i -= 64) {
-		memcpy(buf, pbSrcDst, 64);
+	for (i = size; i != 0; pbSrcDst += BLOCKSIZE, i -= BLOCKSIZE) {
+		memcpy(buf, pbSrcDst, BLOCKSIZE);
 		SHA1Result(0, dst);
-		for (int j = 0; j < 64; j++) {
+		for (int j = 0; j < BLOCKSIZE; j++) {
 			buf[j] ^= dst[j % SHA1HashSize];
 		}
 		SHA1Calculate(0, buf, NULL);
 		memset(dst, 0, sizeof(dst));
-		memcpy(pbSrcDst, buf, 64);
+		memcpy(pbSrcDst, buf, BLOCKSIZE);
 	}
 
 	memset(buf, 0, sizeof(buf));
@@ -48,7 +50,7 @@ int codec_decode(BYTE *pbSrcDst, DWORD size, char *pszPassword)
 		goto error;
 	}
 
-	size += sig->last_chunk_size - 64;
+	size += sig->last_chunk_size - BLOCKSIZE;
 	SHA1Clear();
 	return size;
 error:
@@ -67,7 +69,7 @@ void codec_init_key(int unused, char *pszPassword)
 	srand(0x7058);
 
 	keyInit = key;
-	for (i = 0; i < 136; i++) {
+	for (i = 0; i < sizeof(key); i++) {
 		*keyInit = rand();
 		keyInit++;
 	}
@@ -81,7 +83,7 @@ void codec_init_key(int unused, char *pszPassword)
 	SHA1Reset(0);
 	SHA1Calculate(0, pw, digest);
 	SHA1Clear();
-	for (i = 0; (DWORD)i < 136; i++)
+	for (i = 0; i < sizeof(key); i++)
 		key[i] ^= digest[i % SHA1HashSize];
 	memset(pw, 0, sizeof(pw));
 	memset(digest, 0, sizeof(digest));
@@ -94,9 +96,9 @@ void codec_init_key(int unused, char *pszPassword)
 
 DWORD codec_get_encoded_len(DWORD dwSrcBytes)
 {
-	if (dwSrcBytes % 64 != 0)
-		dwSrcBytes += 64 - (dwSrcBytes % 64);
-	return dwSrcBytes + 8;
+	if (dwSrcBytes % BLOCKSIZE != 0)
+		dwSrcBytes += BLOCKSIZE - (dwSrcBytes % BLOCKSIZE);
+	return dwSrcBytes + sizeof(CodecSignature);
 }
 
 void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, char *pszPassword)
@@ -114,19 +116,19 @@ void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, char *pszPassword)
 
 	last_chunk = 0;
 	while (size != 0) {
-		chunk = size < 64 ? size : 64;
+		chunk = size < BLOCKSIZE ? size : BLOCKSIZE;
 		memcpy(buf, pbSrcDst, chunk);
-		if (chunk < 64)
-			memset(buf + chunk, 0, 64 - chunk);
+		if (chunk < BLOCKSIZE)
+			memset(buf + chunk, 0, BLOCKSIZE - chunk);
 		SHA1Result(0, dst);
 		SHA1Calculate(0, buf, NULL);
-		for (int j = 0; j < 64; j++) {
+		for (int j = 0; j < BLOCKSIZE; j++) {
 			buf[j] ^= dst[j % SHA1HashSize];
 		}
 		memset(dst, 0, sizeof(dst));
-		memcpy(pbSrcDst, buf, 64);
+		memcpy(pbSrcDst, buf, BLOCKSIZE);
 		last_chunk = chunk;
-		pbSrcDst += 64;
+		pbSrcDst += BLOCKSIZE;
 		size -= chunk;
 	}
 	memset(buf, 0, sizeof(buf));
@@ -134,7 +136,7 @@ void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, char *pszPassword)
 	sig = (CodecSignature *)pbSrcDst;
 	sig->error = 0;
 	sig->unused = 0;
-	sig->checksum = *(DWORD *)tmp;
+	sig->checksum = *(DWORD *)&tmp[0];
 	sig->last_chunk_size = last_chunk;
 	SHA1Clear();
 }
diff --git a/Source/control.cpp b/Source/control.cpp
index 6281d1b43..c22a99dec 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1335,7 +1335,7 @@ void InitControlPan()
 		pMultiBtns = LoadFileInMem("CtrlPan\\P8But2.CEL", NULL);
 		pTalkBtns = LoadFileInMem("CtrlPan\\TalkButt.CEL", NULL);
 		sgbPlrTalkTbl = 0;
-		sgszTalkMsg[0] = 0;
+		sgszTalkMsg[0] = '\0';
 		for (i = 0; i < MAX_PLRS; i++)
 			whisper[i] = TRUE;
 		for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++)
@@ -1847,7 +1847,7 @@ void CPrintString(int y, char *str, BOOL center, int lines)
 
 	lineOffset = 0;
 	lineStart = lineOffsets[lines][y] + PANEL_LEFT;
-	if (center == 1) {
+	if (center == TRUE) {
 		strWidth = 0;
 		tmp = str;
 		while (*tmp) {
@@ -2179,7 +2179,7 @@ void DrawLevelUpIcon()
 {
 	int nCel;
 
-	if (!stextflag) {
+	if (stextflag == STORE_NONE) {
 		nCel = lvlbtndown ? 3 : 2;
 		ADD_PlrStringXY(PANEL_LEFT + 0, PANEL_TOP - 49, PANEL_LEFT + 120, "Level Up", COL_WHITE);
 		CelDraw(40 + PANEL_X, -17 + PANEL_Y, pChrButtons, nCel, 41);
@@ -2572,7 +2572,7 @@ void DrawGoldSplit(int amount)
 	ADD_PlrStringXY(366, 121, 600, "you want to remove?", COL_GOLD);
 	if (amount > 0) {
 		sprintf(tempstr, "%u", amount);
-		PrintGameStr(388, 140, tempstr, 0);
+		PrintGameStr(388, 140, tempstr, COL_WHITE);
 		for (i = 0; i < tempstr[i]; i++) {
 			screen_x += fontkern[fontframe[gbFontTransTbl[(BYTE)tempstr[i]]]] + 1;
 		}
@@ -2607,7 +2607,7 @@ void control_drop_gold(char vkey)
 		input[strlen(input) - 1] = '\0';
 		dropGoldValue = atoi(input);
 	} else if (vkey - '0' >= 0 && vkey - '0' <= 9) {
-		if (dropGoldValue || atoi(input) <= initialDropGoldValue) {
+		if (dropGoldValue != 0 || atoi(input) <= initialDropGoldValue) {
 			input[strlen(input)] = vkey;
 			if (atoi(input) > initialDropGoldValue)
 				return;
@@ -2690,7 +2690,7 @@ void DrawTalkPan()
 	CelBlitFrame(gpBuffer + x, pSPentSpn2Cels, frame, 12);
 	frame = (frame & 7) + 1;
 	talk_btn = 0;
-	for (i = 0; i < 4; i++) {
+	for (i = 0; i < MAX_PLRS; i++) {
 		if (i == myplr)
 			continue;
 		if (whisper[i]) {
@@ -2726,8 +2726,9 @@ char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color)
 	int width;
 
 	x += 264;
+	y += 182 + PANEL_TOP;
 	width = x;
-	*nOffset = PitchTbl[y + 182 + PANEL_TOP] + x;
+	*nOffset = PitchTbl[y] + x;
 	while (*msg) {
 
 		c = fontframe[gbFontTransTbl[(BYTE)*msg]];
@@ -2735,7 +2736,7 @@ char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color)
 		if (width > 514 + PANEL_LEFT)
 			return msg;
 		msg++;
-		if (c) {
+		if (c != 0) {
 			PrintChar(*nOffset, c, color);
 		}
 		*nOffset += fontkern[c] + 1;
@@ -2813,7 +2814,7 @@ void control_type_message()
 	}
 
 	talkflag = TRUE;
-	sgszTalkMsg[0] = 0;
+	sgszTalkMsg[0] = '\0';
 	frame = 1;
 	for (i = 0; i < 3; i++) {
 		talkbtndown[i] = FALSE;
@@ -2889,7 +2890,7 @@ void control_press_enter()
 	int i;
 	BYTE talk_save;
 
-	if (sgszTalkMsg[0]) {
+	if (sgszTalkMsg[0] != 0) {
 #ifdef HELLFIRE
 		int pmask;
 		pmask = 0;
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 26bc8f2c9..969f9c375 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -94,7 +94,7 @@ const int InvItemHeight[] = {
 
 void InitCursor()
 {
-	/// ASSERT: assert(! pCursCels);
+	assert(! pCursCels);
 	pCursCels = LoadFileInMem("Data\\Inv\\Objcurs.CEL", NULL);
 #ifdef HELLFIRE
 	pCursCels2 = LoadFileInMem("Data\\Inv\\Objcurs2.CEL", NULL);
@@ -210,14 +210,14 @@ void CheckCursMove()
 	sy = MouseY;
 
 	if (chrflag || questlog) {
-		if (sx >= 160) {
-			sx -= 160;
+		if (sx >= SCREEN_WIDTH / 4) {
+			sx -= SCREEN_WIDTH / 4;
 		} else {
 			sx = 0;
 		}
 	} else if (invflag || sbookflag) {
-		if (sx <= 320) {
-			sx += 160;
+		if (sx <= SCREEN_WIDTH / 2) {
+			sx += SCREEN_WIDTH / 4;
 		} else {
 			sx = 0;
 		}
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index b64ac9474..52b504e37 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -8,19 +8,19 @@
 #include "../DiabloUI/diabloui.h"
 
 HWND ghMainWnd;
-int glMid1Seed[NUMLEVELS];
-int glMid2Seed[NUMLEVELS];
+int glMid1Seed[NUMLEVELS + 1];
+int glMid2Seed[NUMLEVELS + 1];
 int gnLevelTypeTbl[NUMLEVELS];
 int MouseX;
 int MouseY;
 BOOL gbGameLoopStartup;
 DWORD glSeedTbl[NUMLEVELS];
 BOOL gbRunGame;
-int glMid3Seed[NUMLEVELS];
+int glMid3Seed[NUMLEVELS + 1];
 BOOL gbRunGameResult;
 BOOL zoomflag;
 BOOL gbProcessPlayers;
-int glEndSeed[NUMLEVELS];
+int glEndSeed[NUMLEVELS + 1];
 BOOL gbLoadGame;
 HINSTANCE ghInst;
 int DebugMonsters[10];
@@ -334,7 +334,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	if (lpCmdLine[0] == '\0') {
 		content[0] = '\0';
 		if (file = fopen("command.txt", "r")) {
-			fgets(content, 255, file);
+			fgets(content, sizeof(content) / sizeof(char), file);
 			lpCmdLine = content;
 			fclose(file);
 		}
@@ -400,19 +400,22 @@ void diablo_parse_flags(char *args)
 		while (isspace(*args)) {
 			args++;
 		}
-		if (_strnicmp("dd_emulate", args, strlen("dd_emulate")) == 0) {
-			gbEmulate = 1;
-			args += strlen("dd_emulate");
+		static char de[] = "dd_emulate";
+		if (_strnicmp(de, args, strlen(de)) == 0) {
+			gbEmulate = TRUE;
+			args += strlen(de);
 			continue;
 		}
-		if (_strnicmp("dd_backbuf", args, strlen("dd_backbuf")) == 0) {
-			gbBackBuf = 1;
-			args += strlen("dd_backbuf");
+		static char db[] = "dd_backbuf";
+		if (_strnicmp(db, args, strlen(db)) == 0) {
+			gbBackBuf = TRUE;
+			args += strlen(db);
 			continue;
 		}
-		if (_strnicmp("ds_noduplicates", args, strlen("ds_noduplicates")) == 0) {
+		static char ds[] = "ds_noduplicates";
+		if (_strnicmp(ds, args, strlen(ds)) == 0) {
 			gbDupSounds = FALSE;
-			args += strlen("ds_noduplicates");
+			args += strlen(ds);
 			continue;
 		}
 #ifdef HELLFIRE
@@ -458,25 +461,25 @@ void diablo_parse_flags(char *args)
 #ifdef _DEBUG
 		switch (c) {
 		case '^':
-			debug_mode_key_inverted_v = 1;
+			debug_mode_key_inverted_v = TRUE;
 			break;
 		case '$':
-			debug_mode_dollar_sign = 1;
+			debug_mode_dollar_sign = TRUE;
 			break;
 		case 'b':
 			/*
-			debug_mode_key_b = 1;
+			debug_mode_key_b = TRUE;
 		*/
 			break;
 		case 'd':
-			showintrodebug = 0;
-			debug_mode_key_d = 1;
+			showintrodebug = FALSE;
+			debug_mode_key_d = TRUE;
 			break;
 		case 'f':
 			EnableFrameCount();
 			break;
 		case 'i':
-			debug_mode_key_i = 1;
+			debug_mode_key_i = TRUE;
 			break;
 		case 'j':
 			/*
@@ -527,7 +530,7 @@ void diablo_parse_flags(char *args)
 			DebugMonsters[debugmonsttypes++] = i;
 			break;
 		case 'n':
-			showintrodebug = 0;
+			showintrodebug = FALSE;
 			break;
 		case 'q':
 			while (isspace(*args)) {
@@ -552,7 +555,7 @@ void diablo_parse_flags(char *args)
 			setseed = i;
 			break;
 		case 's':
-			debug_mode_key_s = 1;
+			debug_mode_key_s = TRUE;
 			break;
 		case 't':
 			leveldebug = TRUE;
@@ -571,7 +574,7 @@ void diablo_parse_flags(char *args)
 			visiondebug = TRUE;
 			break;
 		case 'w':
-			debug_mode_key_w = 1;
+			debug_mode_key_w = TRUE;
 			break;
 		case 'x':
 			fullscreen = FALSE;
@@ -603,11 +606,11 @@ void diablo_init_screen()
 LONG __stdcall diablo_TopLevelExceptionFilter(PEXCEPTION_POINTERS pExc)
 {
 	dx_cleanup();
-	init_cleanup(0);
+	init_cleanup(FALSE);
 	if (lpTopLevelExceptionFilter)
 		return lpTopLevelExceptionFilter(pExc);
 
-	return 0;
+	return EXCEPTION_CONTINUE_SEARCH;
 }
 #endif
 
@@ -615,12 +618,12 @@ BOOL diablo_find_window(LPCSTR lpClassName)
 {
 	HWND hWnd, active;
 
-	hWnd = FindWindow(lpClassName, 0);
-	if (!hWnd)
+	hWnd = FindWindow(lpClassName, NULL);
+	if (hWnd == NULL)
 		return FALSE;
 
 	active = GetLastActivePopup(hWnd);
-	if (active)
+	if (active != NULL)
 		hWnd = active;
 
 	active = GetTopWindow(hWnd);
@@ -688,7 +691,7 @@ void diablo_reload_process(HINSTANCE hInstance)
 		ExitProcess(0);
 	}
 
-	if (InterlockedIncrement(plMap) == 0) {
+	if (InterlockedIncrement(&plMap[0]) == 0) {
 		plMap[1] = GetCurrentProcessId();
 	} else {
 		hPrev = GetForegroundWindow();
@@ -905,7 +908,7 @@ LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 BOOL LeftMouseDown(int wParam)
 {
-	if (!gmenu_left_mouse(TRUE) && !control_check_talk_btn() && !sgnTimeoutCurs) {
+	if (!gmenu_left_mouse(TRUE) && !control_check_talk_btn() && sgnTimeoutCurs == CURSOR_NONE) {
 		if (deathflag) {
 			control_check_btn_press();
 		} else if (PauseMode != 2) {
@@ -913,7 +916,7 @@ BOOL LeftMouseDown(int wParam)
 				doom_close();
 			} else if (spselflag) {
 				SetSpell();
-			} else if (stextflag) {
+			} else if (stextflag != STORE_NONE) {
 				CheckStoreBtn();
 			} else if (MouseY < PANEL_TOP) {
 				if (!gmenu_is_active() && !TryIconCurs()) {
@@ -932,10 +935,10 @@ BOOL LeftMouseDown(int wParam)
 					} else if (pcurs >= CURSOR_FIRSTITEM) {
 						if (TryInvPut()) {
 							NetSendCmdPItem(TRUE, CMD_PUTITEM, cursmx, cursmy);
-							SetCursor_(CURSOR_HAND);
+							NewCursor(CURSOR_HAND);
 						}
 					} else {
-						if (plr[myplr]._pStatPts && !spselflag)
+						if (plr[myplr]._pStatPts != 0 && !spselflag)
 							CheckLvlBtn();
 						if (!lvlbtndown)
 							return LeftMouseCmd(wParam == MK_SHIFT + MK_LBUTTON);
@@ -946,7 +949,7 @@ BOOL LeftMouseDown(int wParam)
 					CheckInvScrn();
 				DoPanBtn();
 				if (pcurs > CURSOR_HAND && pcurs < CURSOR_FIRSTITEM)
-					SetCursor_(CURSOR_HAND);
+					NewCursor(CURSOR_HAND);
 			}
 		}
 	}
@@ -958,7 +961,7 @@ BOOL LeftMouseCmd(BOOL bShift)
 {
 	BOOL bNear;
 
-	/// ASSERT: assert(MouseY < 352); // PANEL_TOP
+	assert(MouseY < PANEL_TOP); // 352
 
 	if (leveltype == DTYPE_TOWN) {
 		if (pcursitem != -1 && pcurs == CURSOR_HAND)
@@ -1024,21 +1027,21 @@ BOOL TryIconCurs()
 		if (pcursinvitem != -1) {
 			CheckIdentify(myplr, pcursinvitem);
 		} else {
-			SetCursor_(CURSOR_HAND);
+			NewCursor(CURSOR_HAND);
 		}
 		return TRUE;
 	} else if (pcurs == CURSOR_REPAIR) {
 		if (pcursinvitem != -1) {
 			DoRepair(myplr, pcursinvitem);
 		} else {
-			SetCursor_(CURSOR_HAND);
+			NewCursor(CURSOR_HAND);
 		}
 		return TRUE;
 	} else if (pcurs == CURSOR_RECHARGE) {
 		if (pcursinvitem != -1) {
 			DoRecharge(myplr, pcursinvitem);
 		} else {
-			SetCursor_(CURSOR_HAND);
+			NewCursor(CURSOR_HAND);
 		}
 		return TRUE;
 #ifdef HELLFIRE
@@ -1058,10 +1061,10 @@ BOOL TryIconCurs()
 		} else {
 			NetSendCmdLocParam2(TRUE, CMD_TSPELLXY, cursmx, cursmy, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell));
 		}
-		SetCursor_(CURSOR_HAND);
+		NewCursor(CURSOR_HAND);
 		return TRUE;
 	} else if (pcurs == CURSOR_DISARM && pcursobj == -1) {
-		SetCursor_(CURSOR_HAND);
+		NewCursor(CURSOR_HAND);
 		return TRUE;
 	}
 
@@ -1078,7 +1081,7 @@ void LeftMouseUp()
 		ReleaseChrBtns();
 	if (lvlbtndown)
 		ReleaseLvlBtn();
-	if (stextflag)
+	if (stextflag != STORE_NONE)
 		ReleaseStoreBtn();
 }
 
@@ -1087,7 +1090,7 @@ void RightMouseDown()
 	if (!gmenu_is_active() && sgnTimeoutCurs == CURSOR_NONE && PauseMode != 2 && !plr[myplr]._pInvincible) {
 		if (doomflag) {
 			doom_close();
-		} else if (!stextflag) {
+		} else if (stextflag == STORE_NONE) {
 			if (spselflag) {
 				SetSpell();
 			} else if (MouseY >= SPANEL_HEIGHT
@@ -1098,7 +1101,7 @@ void RightMouseDown()
 					if (pcursinvitem == -1 || !UseInvItem(myplr, pcursinvitem))
 						CheckPlrSpell();
 				} else if (pcurs > CURSOR_HAND && pcurs < CURSOR_FIRSTITEM) {
-					SetCursor_(CURSOR_HAND);
+					NewCursor(CURSOR_HAND);
 				}
 			}
 		}
@@ -1132,7 +1135,7 @@ void diablo_hotkey_msg(DWORD dwMsg)
 	}
 
 	strcat(szFileName, "\\Diablo.ini");
-	/// ASSERT: assert(dwMsg < sizeof(spszMsgTbl) / sizeof(spszMsgTbl[0]));
+	assert(dwMsg < sizeof(spszMsgTbl) / sizeof(spszMsgTbl[0]));
 	GetPrivateProfileString("NetMsg", spszMsgHotKeyTbl[dwMsg], spszMsgTbl[dwMsg], szMsg, sizeof(szMsg), szFileName);
 	NetSendCmdString(-1, szMsg);
 }
@@ -1150,7 +1153,7 @@ void PressKey(int vkey)
 	}
 
 	if (deathflag) {
-		if (sgnTimeoutCurs != 0) {
+		if (sgnTimeoutCurs != CURSOR_NONE) {
 			return;
 		}
 		if (vkey == VK_F9) {
@@ -1180,7 +1183,7 @@ void PressKey(int vkey)
 		return;
 	}
 
-	if (sgnTimeoutCurs != 0 || dropGoldFlag) {
+	if (sgnTimeoutCurs != CURSOR_NONE || dropGoldFlag) {
 		return;
 	}
 	if (vkey == VK_PAUSE) {
@@ -1202,7 +1205,7 @@ void PressKey(int vkey)
 	} else if (vkey == VK_F1) {
 		if (helpflag) {
 			helpflag = FALSE;
-		} else if (stextflag) {
+		} else if (stextflag != STORE_NONE) {
 			ClearPanel();
 			AddPanelString("No help available", TRUE); /// BUGFIX: message isn't displayed
 			AddPanelString("while in stores", TRUE);
@@ -1365,7 +1368,7 @@ void diablo_pause_game()
  */
 void PressChar(int vkey)
 {
-	if (gmenu_is_active() || control_talk_last_key(vkey) || sgnTimeoutCurs != 0 || deathflag) {
+	if (gmenu_is_active() || control_talk_last_key(vkey) || sgnTimeoutCurs != CURSOR_NONE || deathflag) {
 		return;
 	}
 	if ((char)vkey == 'p' || (char)vkey == 'P') {
@@ -1395,7 +1398,7 @@ void PressChar(int vkey)
 		return;
 	case 'I':
 	case 'i':
-		if (!stextflag) {
+		if (stextflag == STORE_NONE) {
 			sbookflag = FALSE;
 			invflag = !invflag;
 			if (!invflag || chrflag) {
@@ -1411,7 +1414,7 @@ void PressChar(int vkey)
 		return;
 	case 'C':
 	case 'c':
-		if (!stextflag) {
+		if (stextflag == STORE_NONE) {
 			questlog = FALSE;
 			chrflag = !chrflag;
 			if (!chrflag || invflag) {
@@ -1427,7 +1430,7 @@ void PressChar(int vkey)
 		return;
 	case 'Q':
 	case 'q':
-		if (!stextflag) {
+		if (stextflag == STORE_NONE) {
 			chrflag = FALSE;
 			if (!questlog) {
 				StartQuestlog();
@@ -1442,7 +1445,7 @@ void PressChar(int vkey)
 		return;
 	case 'S':
 	case 's':
-		if (!stextflag) {
+		if (stextflag == STORE_NONE) {
 			invflag = FALSE;
 			if (!spselflag) {
 				DoSpeedBook();
@@ -1454,7 +1457,7 @@ void PressChar(int vkey)
 		return;
 	case 'B':
 	case 'b':
-		if (!stextflag) {
+		if (stextflag == STORE_NONE) {
 			invflag = FALSE;
 			sbookflag = !sbookflag;
 		}
@@ -1640,7 +1643,7 @@ void PressChar(int vkey)
 
 void LoadLvlGFX()
 {
-	/// ASSERT: assert(! pDungeonCels);
+	assert(! pDungeonCels);
 
 	switch (leveltype) {
 	case DTYPE_TOWN:
@@ -1710,7 +1713,7 @@ void LoadLvlGFX()
 
 void LoadAllGFX()
 {
-	/// ASSERT: assert(! pSpeedCels);
+	assert(! pSpeedCels);
 	pSpeedCels = DiabloAllocPtr(0x100000);
 	IncProgress();
 	IncProgress();
@@ -1921,7 +1924,7 @@ void LoadGameLevel(BOOL firstflag, int lvldir)
 			ResyncMPQuests();
 #ifndef SPAWN
 	} else {
-		/// ASSERT: assert(! pSpeedCels);
+		assert(! pSpeedCels);
 		pSpeedCels = DiabloAllocPtr(0x100000);
 		LoadSetMap();
 		IncProgress();
@@ -1996,7 +1999,7 @@ void LoadGameLevel(BOOL firstflag, int lvldir)
 		{
 			items_427ABA(RowOfCornerStone, ColOfCornerStone);
 		}
-		if ( quests[Q_NAKRUL]._qactive == 3 && currlevel == 24 ) // TODO: fix quest struct
+		if ( quests[Q_NAKRUL]._qactive == QUEST_DONE && currlevel == 24 ) // TODO: fix quest struct
 		{
 			objects_454BA8();
 		}
@@ -2053,7 +2056,7 @@ void game_logic()
 		return;
 	}
 
-	if (!gmenu_is_active() && sgnTimeoutCurs == 0) {
+	if (!gmenu_is_active() && sgnTimeoutCurs == CURSOR_NONE) {
 		CheckCursMove();
 		track_process();
 	}
@@ -2096,13 +2099,13 @@ void timeout_cursor(BOOL bTimeout)
 			ClearPanel();
 			AddPanelString("-- Network timeout --", TRUE);
 			AddPanelString("-- Waiting for players --", TRUE);
-			SetCursor_(CURSOR_HOURGLASS);
+			NewCursor(CURSOR_HOURGLASS);
 			force_redraw = 255;
 		}
 		scrollrt_draw_game_screen(TRUE);
-	} else if (sgnTimeoutCurs) {
+	} else if (sgnTimeoutCurs != CURSOR_NONE) {
 		SetCursor_(sgnTimeoutCurs);
-		sgnTimeoutCurs = 0;
+		sgnTimeoutCurs = CURSOR_NONE;
 		ClearPanel();
 		force_redraw = 255;
 	}
diff --git a/Source/diablo.h b/Source/diablo.h
index d59cee476..7e764d07a 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -7,19 +7,19 @@
 #define __DIABLO_H__
 
 extern HWND ghMainWnd;
-extern int glMid1Seed[NUMLEVELS];
-extern int glMid2Seed[NUMLEVELS];
+extern int glMid1Seed[NUMLEVELS + 1];
+extern int glMid2Seed[NUMLEVELS + 1];
 extern int gnLevelTypeTbl[NUMLEVELS];
 extern int MouseX;
 extern int MouseY;
 extern BOOL gbGameLoopStartup;
 extern DWORD glSeedTbl[NUMLEVELS];
 extern BOOL gbRunGame;
-extern int glMid3Seed[NUMLEVELS];
+extern int glMid3Seed[NUMLEVELS + 1];
 extern BOOL gbRunGameResult;
 extern BOOL zoomflag;
 extern BOOL gbProcessPlayers;
-extern int glEndSeed[NUMLEVELS];
+extern int glEndSeed[NUMLEVELS + 1];
 extern BOOL gbLoadGame;
 extern HINSTANCE ghInst;
 extern int DebugMonsters[10];
diff --git a/Source/doom.cpp b/Source/doom.cpp
index c77d98f69..844c2c550 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -58,7 +58,7 @@ void doom_alloc_cel()
 void doom_cleanup()
 {
 #ifdef HELLFIRE
-	if (pDoomCel) {
+	if (pDoomCel != NULL) {
 		MemFreeDbg(pDoomCel);
 		pDoomCel = NULL;
 	}
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index deeb473e6..b525bc783 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -62,7 +62,7 @@ void dthread_start()
 	}
 
 	sghWorkToDoEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-	if (!sghWorkToDoEvent) {
+	if (sghWorkToDoEvent == NULL) {
 		error_buf = TraceLastError();
 		app_fatal("dthread:1\n%s", error_buf);
 	}
@@ -83,7 +83,7 @@ unsigned int __stdcall dthread_handler(void *data)
 	DWORD dwMilliseconds;
 
 	while (dthread_running) {
-		if (!sgpInfoHead && WaitForSingleObject(sghWorkToDoEvent, INFINITE) == -1) {
+		if (!sgpInfoHead && WaitForSingleObject(sghWorkToDoEvent, INFINITE) == WAIT_FAILED) {
 			error_buf = TraceLastError();
 			app_fatal("dthread4:\n%s", error_buf);
 		}
@@ -126,7 +126,7 @@ void dthread_cleanup()
 	dthread_running = FALSE;
 	SetEvent(sghWorkToDoEvent);
 	if (sghThread != INVALID_HANDLE_VALUE && glpDThreadId != GetCurrentThreadId()) {
-		if (WaitForSingleObject(sghThread, INFINITE) == -1) {
+		if (WaitForSingleObject(sghThread, INFINITE) == WAIT_FAILED) {
 			error_buf = TraceLastError();
 			app_fatal("dthread3:\n(%s)", error_buf);
 		}
diff --git a/Source/dx.cpp b/Source/dx.cpp
index ce9c25d90..b6b114f11 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -44,12 +44,12 @@ static void dx_create_back_buffer()
 	}
 
 	memset(&ddsd, 0, sizeof(ddsd));
-	ddsd.dwWidth = BUFFER_WIDTH;
-	ddsd.lPitch = BUFFER_WIDTH;
 	ddsd.dwSize = sizeof(ddsd);
 	ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
 	ddsd.dwHeight = BUFFER_HEIGHT;
+	ddsd.dwWidth = BUFFER_WIDTH;
+	ddsd.lPitch = BUFFER_WIDTH;
 	ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
 	error_code = lpDDSPrimary->GetPixelFormat(&ddsd.ddpfPixelFormat);
 	if (error_code != DD_OK)
@@ -99,9 +99,9 @@ void dx_init(HWND hWnd)
 	BOOL bSuccess;
 	GUID *lpGUID;
 
-	/// ASSERT: assert(! gpBuffer);
-	/// ASSERT: assert(! sgdwLockCount);
-	/// ASSERT: assert(! sgpBackBuf);
+	assert(! gpBuffer);
+	assert(! sgdwLockCount);
+	assert(! sgpBackBuf);
 
 	SetFocus(hWnd);
 	ShowWindow(hWnd, SW_SHOWNORMAL);
@@ -157,7 +157,7 @@ void dx_init(HWND hWnd)
 	GdiSetBatchLimit(1);
 	dx_create_back_buffer();
 	bSuccess = SDrawManualInitialize(hWnd, lpDDInterface, lpDDSPrimary, NULL, NULL, lpDDSBackBuf, lpDDPalette, NULL);
-	/// ASSERT: assert(bSuccess);
+	assert(bSuccess);
 }
 
 static void lock_buf_priv()
diff --git a/Source/effects.cpp b/Source/effects.cpp
index 7c40d78ba..6d87a4d1f 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -27,263 +27,263 @@ const char MonstSndChar[] = { 'a', 'h', 'd', 's' };
 TSFX sgSFX[] = {
 	// clang-format off
 	// bFlags,                   pszName,                       pSnd
-	{ SFX_MISC,                  "Sfx\\Misc\\Walk1.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Walk2.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Walk3.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Walk4.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\BFire.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Fmag.wav",         NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Tmag.wav",         NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Lghit.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Lghit1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Swing.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Swing2.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Dead.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Walk1.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Walk2.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Walk3.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Walk4.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\BFire.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Fmag.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Tmag.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Lghit.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Lghit1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Swing.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Swing2.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Dead.wav",         NULL },
 #ifdef HELLFIRE
-	{ SFX_MISC,                  "Sfx\\Misc\\Sting1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\FBallBow.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Sting1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\FBallBow.wav",     NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Misc\\Questdon.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Armrfkd.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Barlfire.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Barrel.wav",      NULL },
+	{ sfx_STREAM,                "Sfx\\Misc\\Questdon.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Armrfkd.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Barlfire.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Barrel.wav",      NULL },
 #ifdef HELLFIRE
-	{ SFX_MISC,                  "Sfx\\Items\\PodPop8.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\PodPop5.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\UrnPop3.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\UrnPop2.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\PodPop8.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\PodPop5.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\UrnPop3.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\UrnPop2.wav",     NULL },
 #endif
-	{ SFX_MISC,                  "Sfx\\Items\\Bhit.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Bhit1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Chest.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Doorclos.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Dooropen.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipanvl.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipaxe.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipblst.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipbody.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipbook.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipbow.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipcap.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipharm.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Fliplarm.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipmag.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipmag1.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipmush.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flippot.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipring.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Fliprock.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipscrl.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipshld.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipsign.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipstaf.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Flipswor.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Gold.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Hlmtfkd.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invanvl.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invaxe.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invblst.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invbody.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invbook.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invbow.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invcap.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invgrab.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invharm.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invlarm.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invmush.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invpot.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invring.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invrock.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invscrol.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invshiel.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invsign.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invstaf.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Invsword.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Lever.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Magic.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Magic1.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Readbook.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Sarc.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Shielfkd.wav",    NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Swrdfkd.wav",     NULL },
-	{ SFX_UI,                    "Sfx\\Items\\Titlemov.wav",    NULL },
-	{ SFX_UI,                    "Sfx\\Items\\Titlslct.wav",    NULL },
-	{ SFX_UI,                    "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Trap.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast1.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast10.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast12.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast2.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast3.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast4.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast5.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast6.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast7.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast8.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cast9.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Healing.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Repair.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Acids1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Acids2.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Apoc.wav",         NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Arrowall.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Bldboil.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Blodstar.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Blsimpt.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Bonesp.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Bsimpct.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Caldron.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Cbolt.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Chltning.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\DSerp.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Elecimp1.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Elementl.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Ethereal.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Fball.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Fbolt1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Fbolt2.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Firimp1.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Firimp2.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Flamwave.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Flash.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Fountain.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Golum.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Golumded.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Gshrine.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Guard.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Grdlanch.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Holybolt.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Hyper.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Infravis.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Invisibl.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Invpot.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Lning1.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Ltning.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Mshield.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Bhit.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Bhit1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Chest.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Doorclos.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Dooropen.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipanvl.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipaxe.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipblst.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipbody.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipbook.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipbow.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipcap.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipharm.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Fliplarm.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipmag.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipmag1.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipmush.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flippot.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipring.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Fliprock.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipscrl.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipshld.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipsign.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipstaf.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Flipswor.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Gold.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Hlmtfkd.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invanvl.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invaxe.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invblst.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invbody.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invbook.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invbow.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invcap.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invgrab.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invharm.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invlarm.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invmush.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invpot.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invring.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invrock.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invscrol.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invshiel.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invsign.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invstaf.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Invsword.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Lever.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Magic.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Magic1.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Readbook.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Sarc.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Shielfkd.wav",    NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Swrdfkd.wav",     NULL },
+	{ sfx_UI,                    "Sfx\\Items\\Titlemov.wav",    NULL },
+	{ sfx_UI,                    "Sfx\\Items\\Titlslct.wav",    NULL },
+	{ sfx_UI,                    "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Trap.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast1.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast10.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast12.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast2.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast3.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast4.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast5.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast6.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast7.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast8.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cast9.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Healing.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Repair.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Acids1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Acids2.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Apoc.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Arrowall.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Bldboil.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Blodstar.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Blsimpt.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Bonesp.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Bsimpct.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Caldron.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Cbolt.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Chltning.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\DSerp.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Elecimp1.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Elementl.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Ethereal.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Fball.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Fbolt1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Fbolt2.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Firimp1.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Firimp2.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Flamwave.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Flash.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Fountain.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Golum.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Golumded.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Gshrine.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Guard.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Grdlanch.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Holybolt.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Hyper.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Infravis.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Invisibl.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Invpot.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Lning1.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Ltning.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Mshield.wav",      NULL },
 #ifdef HELLFIRE
-	{ SFX_MISC,                  "Sfx\\Misc\\NestXpld.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\NestXpld.wav",     NULL },
 #endif
-	{ SFX_MISC,                  "Sfx\\Misc\\Nova.wav",         NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Portal.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Puddle.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Resur.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Scurse.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Scurimp.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Sentinel.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Shatter.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Soulfire.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Spoutlop.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Spoutstr.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Storm.wav",        NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Trapdis.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Teleport.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Vtheft.wav",       NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Wallloop.wav",     NULL },
-	{ SFX_MISC,                  "Sfx\\Misc\\Wallstrt.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Nova.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Portal.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Puddle.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Resur.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Scurse.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Scurimp.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Sentinel.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Shatter.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Soulfire.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Spoutlop.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Spoutstr.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Storm.wav",        NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Trapdis.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Teleport.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Vtheft.wav",       NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Wallloop.wav",     NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\Wallstrt.wav",     NULL },
 #ifdef HELLFIRE
-	{ SFX_MISC,                  "Sfx\\Misc\\LMag.wav",         NULL },
+	{ sfx_MISC,                  "Sfx\\Misc\\LMag.wav",         NULL },
 #endif
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid03.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid04.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid05.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid06.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid07.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid08.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid09.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid10.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid11.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid12.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid13.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid14.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid15.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid16.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid17.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid18.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid19.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid20.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid21.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid22.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid23.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid24.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid25.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid26.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid27.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid28.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid29.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid30.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid03.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid04.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid05.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid06.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid07.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid08.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid09.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid10.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid11.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid12.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid13.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid14.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid15.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid16.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid17.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid18.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid19.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid20.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid21.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid22.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid23.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid24.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid25.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid26.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid27.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid28.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid29.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid30.wav",   NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid31.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid31.wav",   NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid32.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid33.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid34.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid35.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid36.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid37.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid38.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid39.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bmaid40.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith08.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith09.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith10.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith11.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith12.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith13.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith14.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith15.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith16.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith17.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith18.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith19.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith20.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith21.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith22.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith23.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith24.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith25.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith26.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith27.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith28.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith29.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith30.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith31.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith32.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith33.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith34.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith35.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith36.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith37.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith38.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith39.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith40.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith41.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith42.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith43.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid32.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid33.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid34.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid35.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid36.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid37.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid38.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid39.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bmaid40.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith08.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith09.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith10.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith11.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith13.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith14.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith15.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith16.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith17.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith18.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith19.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith20.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith21.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith22.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith23.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith24.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith25.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith26.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith27.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith28.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith29.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith30.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith31.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith32.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith33.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith34.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith35.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith36.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith37.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith38.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith39.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith40.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith41.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith42.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith43.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith44.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith44.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith45.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith46.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith47.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith48.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith49.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith50.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith51.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith52.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith53.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith54.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith55.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Bsmith56.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith45.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith46.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith47.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith48.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith49.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith50.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith51.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith52.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith53.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith54.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith55.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Bsmith56.wav",  NULL },
 #endif
 	{ 0,                         "Sfx\\Towners\\Cow1.wav",      NULL },
 	{ 0,                         "Sfx\\Towners\\Cow2.wav",      NULL },
@@ -292,812 +292,812 @@ TSFX sgSFX[] = {
 	{ 0,                         "Sfx\\Towners\\Cow8.wav",      NULL },
 #endif
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Deadguy2.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk03.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk04.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk05.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk06.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk07.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk08.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk09.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk10.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk11.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk12.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk13.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk14.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk15.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk16.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk17.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk18.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk19.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk20.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk21.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk22.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk23.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk24.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk25.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk26.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Deadguy2.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk03.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk04.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk05.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk06.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk07.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk08.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk09.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk10.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk11.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk12.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk13.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk14.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk15.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk16.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk17.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk18.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk19.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk20.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk21.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk22.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk23.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk24.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk25.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk26.wav",   NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk27.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk27.wav",   NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk28.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk29.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk30.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk31.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk32.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk33.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk34.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Drunk35.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer08.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer09.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer10.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer11.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer12.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer13.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer14.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer15.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer16.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer17.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer18.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer19.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer20.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer21.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer22.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer23.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer24.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer25.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer26.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer27.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer28.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer29.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer30.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer31.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer32.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer33.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer34.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer35.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer36.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk28.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk29.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk30.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk31.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk32.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk33.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk34.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Drunk35.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer08.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer09.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer10.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer11.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer13.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer14.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer15.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer16.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer17.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer18.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer19.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer20.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer21.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer22.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer23.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer24.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer25.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer26.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer27.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer28.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer29.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer30.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer31.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer32.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer33.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer34.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer35.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer36.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer37.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer37.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer38.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer39.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer40.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer41.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer42.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer43.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer44.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer45.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer46.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Healer47.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy08.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy09.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy10.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy11.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy12.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy13.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy14.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy15.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy16.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy17.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy18.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy19.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy20.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy21.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy22.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy23.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy24.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy25.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy26.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy27.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy28.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy29.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy30.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy31.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer38.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer39.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer40.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer41.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer42.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer43.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer44.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer45.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer46.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Healer47.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy08.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy09.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy10.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy11.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy13.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy14.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy15.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy16.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy17.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy18.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy19.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy20.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy21.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy22.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy23.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy24.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy25.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy26.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy27.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy28.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy29.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy30.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy31.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy32.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy32.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy33.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy34.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy35.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy36.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy37.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy38.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy39.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy40.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy41.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy42.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Pegboy43.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest00.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Priest07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt00.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt08.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt09.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt10.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt11.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt12.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt13.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt14.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt15.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt16.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt17.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt18.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt19.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt20.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt21.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt22.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt23.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt24.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy33.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy34.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy35.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy36.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy37.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy38.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy39.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy40.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy41.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy42.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Pegboy43.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest00.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Priest07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt00.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt08.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt09.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt10.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt11.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt13.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt14.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt15.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt16.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt17.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt18.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt19.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt20.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt21.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt22.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt23.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt24.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt25.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt25.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt26.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt27.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt28.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt29.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt30.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt31.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt32.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt33.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt34.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt35.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt36.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt37.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Storyt38.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt26.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt27.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt28.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt29.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt30.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt31.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt32.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt33.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt34.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt35.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt36.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt37.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Storyt38.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown00.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown00.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown02.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown03.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown04.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown05.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown06.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown07.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown08.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown09.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown10.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown11.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown12.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown13.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown14.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown15.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown16.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown17.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown18.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown19.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown20.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown21.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown22.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown23.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown24.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown25.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown26.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown27.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown28.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown29.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown30.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown31.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown32.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown33.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown34.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown35.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown02.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown03.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown04.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown05.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown06.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown07.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown08.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown09.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown10.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown11.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown13.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown14.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown15.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown16.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown17.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown18.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown19.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown20.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown21.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown22.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown23.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown24.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown25.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown26.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown27.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown28.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown29.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown30.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown31.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown32.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown33.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown34.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown35.wav",  NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown36.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown36.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown37.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown38.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown39.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown40.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown41.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown42.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown43.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown44.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Tavown45.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch03.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch04.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch05.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch06.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch07.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch08.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch09.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch10.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch11.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch12.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch13.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch14.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch15.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch16.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch17.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch18.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch19.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch20.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch21.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch22.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch23.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch24.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch25.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch26.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch27.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch28.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch29.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch30.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch31.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch32.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch33.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch34.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch35.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch36.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch37.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown37.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown38.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown39.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown40.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown41.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown42.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown43.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown44.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Tavown45.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch03.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch04.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch05.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch06.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch07.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch08.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch09.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch10.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch11.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch12.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch13.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch14.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch15.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch16.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch17.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch18.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch19.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch20.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch21.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch22.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch23.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch24.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch25.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch26.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch27.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch28.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch29.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch30.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch31.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch32.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch33.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch34.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch35.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch36.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch37.wav",   NULL },
 #endif
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch38.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch38.wav",   NULL },
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch39.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch40.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch41.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch42.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch43.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch44.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch45.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch46.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch47.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch48.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch49.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Witch50.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Towners\\Wound01.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage01.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage02.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage03.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage04.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage05.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage06.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage07.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage08.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage09.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage10.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage11.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage12.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage13.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage14.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage15.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage16.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage17.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage18.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage19.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage20.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage21.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage22.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage23.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage24.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage25.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage26.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage27.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage28.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage29.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage30.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage31.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage32.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage33.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage34.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage35.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage36.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage37.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage38.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage39.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage40.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage41.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage42.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage43.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage44.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage45.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage46.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage47.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage48.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage49.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage50.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage51.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage52.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage53.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage54.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage55.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage56.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage57.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage58.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage59.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage60.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage61.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage62.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage63.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage64.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage65.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage66.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage67.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage68.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage69.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage69b.wav",  NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage70.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage71.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage72.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage73.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage74.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage75.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage76.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage77.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage78.wav",   NULL },
-	{ SFX_SORCEROR,              "Sfx\\Sorceror\\Mage79.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage80.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage81.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage82.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage83.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage84.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage85.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage86.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage87.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage88.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage89.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage90.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage91.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage92.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage93.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage94.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage95.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage96.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage97.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage98.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage99.wav",   NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage100.wav",  NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage101.wav",  NULL },
-	{ SFX_STREAM | SFX_SORCEROR, "Sfx\\Sorceror\\Mage102.wav",  NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue01.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue02.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue03.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue04.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue05.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue06.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue07.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue08.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue09.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue10.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue11.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue12.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue13.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue14.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue15.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue16.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue17.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue18.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue19.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue20.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue21.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue22.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue23.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue24.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue25.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue26.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue27.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue28.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue29.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue30.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue31.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue32.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue33.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue34.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue35.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue36.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue37.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue38.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue39.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue40.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue41.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue42.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue43.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue44.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue45.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue46.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue47.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue48.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue49.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue50.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue51.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue52.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue53.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue54.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue55.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue56.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue57.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue58.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue59.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue60.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue61.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue62.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue63.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue64.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue65.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue66.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue67.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue68.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue69.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue69b.wav",    NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue70.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue71.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue72.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue73.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue74.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue75.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue76.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue77.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue78.wav",     NULL },
-	{ SFX_ROGUE,                 "Sfx\\Rogue\\Rogue79.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue80.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue81.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue82.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue83.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue84.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue85.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue86.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue87.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue88.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue89.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue90.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue91.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue92.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue93.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue94.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue95.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue96.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue97.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue98.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue99.wav",     NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue100.wav",    NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue101.wav",    NULL },
-	{ SFX_STREAM | SFX_ROGUE,    "Sfx\\Rogue\\Rogue102.wav",    NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior01.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior02.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior03.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior04.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior05.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior06.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior07.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior08.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior09.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior10.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior11.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior12.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch39.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch40.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch41.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch42.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch43.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch44.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch45.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch46.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch47.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch48.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch49.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Witch50.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Towners\\Wound01.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage01.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage02.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage03.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage04.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage05.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage06.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage07.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage08.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage09.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage10.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage11.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage12.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage13.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage14.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage15.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage16.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage17.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage18.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage19.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage20.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage21.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage22.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage23.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage24.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage25.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage26.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage27.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage28.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage29.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage30.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage31.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage32.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage33.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage34.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage35.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage36.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage37.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage38.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage39.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage40.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage41.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage42.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage43.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage44.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage45.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage46.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage47.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage48.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage49.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage50.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage51.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage52.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage53.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage54.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage55.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage56.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage57.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage58.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage59.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage60.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage61.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage62.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage63.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage64.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage65.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage66.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage67.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage68.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage69.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage69b.wav",  NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage70.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage71.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage72.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage73.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage74.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage75.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage76.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage77.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage78.wav",   NULL },
+	{ sfx_SORCEROR,              "Sfx\\Sorceror\\Mage79.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage80.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage81.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage82.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage83.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage84.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage85.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage86.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage87.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage88.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage89.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage90.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage91.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage92.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage93.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage94.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage95.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage96.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage97.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage98.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage99.wav",   NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage100.wav",  NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage101.wav",  NULL },
+	{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage102.wav",  NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue01.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue02.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue03.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue04.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue05.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue06.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue07.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue08.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue09.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue10.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue11.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue12.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue13.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue14.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue15.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue16.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue17.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue18.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue19.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue20.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue21.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue22.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue23.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue24.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue25.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue26.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue27.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue28.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue29.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue30.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue31.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue32.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue33.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue34.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue35.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue36.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue37.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue38.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue39.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue40.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue41.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue42.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue43.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue44.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue45.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue46.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue47.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue48.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue49.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue50.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue51.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue52.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue53.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue54.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue55.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue56.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue57.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue58.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue59.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue60.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue61.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue62.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue63.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue64.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue65.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue66.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue67.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue68.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue69.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue69b.wav",    NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue70.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue71.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue72.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue73.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue74.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue75.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue76.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue77.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue78.wav",     NULL },
+	{ sfx_ROGUE,                 "Sfx\\Rogue\\Rogue79.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue80.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue81.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue82.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue83.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue84.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue85.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue86.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue87.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue88.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue89.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue90.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue91.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue92.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue93.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue94.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue95.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue96.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue97.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue98.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue99.wav",     NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue100.wav",    NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue101.wav",    NULL },
+	{ sfx_STREAM | sfx_ROGUE,    "Sfx\\Rogue\\Rogue102.wav",    NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior01.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior02.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior03.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior04.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior05.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior06.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior07.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior08.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior09.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior10.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior11.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior12.wav",  NULL },
 #endif
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior13.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior14.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario14b.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario14c.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior15.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario15b.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario15c.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior16.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario16b.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario16c.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior17.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior18.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior19.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior20.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior21.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior22.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior23.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior24.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior25.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior26.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior27.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior28.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior29.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior30.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior31.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior32.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior33.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior34.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior35.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior36.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior37.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior38.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior39.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior40.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior41.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior42.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior43.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior44.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior45.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior46.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior47.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior48.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior49.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior50.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior51.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior52.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior53.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior54.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior55.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior56.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior57.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior58.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior59.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior60.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior61.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior62.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior63.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior64.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior65.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior66.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior67.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior68.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior69.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Wario69b.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior70.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior71.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior72.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior73.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior74.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior75.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior76.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior77.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior78.wav",  NULL },
-	{ SFX_WARRIOR,               "Sfx\\Warrior\\Warior79.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior13.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior14.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario14b.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario14c.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior15.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario15b.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario15c.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior16.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario16b.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario16c.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior17.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior18.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior19.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior20.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior21.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior22.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior23.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior24.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior25.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior26.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior27.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior28.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior29.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior30.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior31.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior32.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior33.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior34.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior35.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior36.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior37.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior38.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior39.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior40.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior41.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior42.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior43.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior44.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior45.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior46.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior47.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior48.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior49.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior50.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior51.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior52.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior53.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior54.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior55.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior56.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior57.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior58.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior59.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior60.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior61.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior62.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior63.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior64.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior65.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior66.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior67.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior68.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior69.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Wario69b.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior70.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior71.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior72.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior73.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior74.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior75.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior76.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior77.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior78.wav",  NULL },
+	{ sfx_WARRIOR,               "Sfx\\Warrior\\Warior79.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior80.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior81.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior82.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior83.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior84.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior85.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior86.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior87.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior88.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior89.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior90.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior91.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior92.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior93.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior94.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior95.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario95b.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario95c.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario95d.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario95e.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario95f.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior80.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior81.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior82.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior83.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior84.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior85.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior86.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior87.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior88.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior89.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior90.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior91.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior92.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior93.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior94.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior95.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario95b.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario95c.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario95d.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario95e.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario95f.wav",  NULL },
 #endif
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario96b.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario97.wav",   NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario98.wav",   NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Warior99.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario96b.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario97.wav",   NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario98.wav",   NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Warior99.wav",  NULL },
 #ifndef SPAWN
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario100.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario101.wav",  NULL },
-	{ SFX_STREAM | SFX_WARRIOR,  "Sfx\\Warrior\\Wario102.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario100.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario101.wav",  NULL },
+	{ sfx_STREAM | sfx_WARRIOR,  "Sfx\\Warrior\\Wario102.wav",  NULL },
 #endif
 #ifdef HELLFIRE
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk01.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk08.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk09.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk10.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk11.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk12.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk13.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk14.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk15.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk16.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk24.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk27.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk29.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk34.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk35.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk43.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk46.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk49.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk50.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk52.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk54.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk55.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk56.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk61.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk62.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk68.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk69.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk69b.wav",      NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk70.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk71.wav",       NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_MONK,                  "Sfx\\Monk\\Monk79.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk80.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk82.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk83.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk87.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk88.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk89.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk91.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk92.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk94.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk95.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk96.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk97.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk98.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Monk\\Monk99.wav",       NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
-	{ SFX_STREAM | SFX_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk01.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk08.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk09.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk10.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk11.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk12.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk13.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk14.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk15.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk16.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk24.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk27.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk29.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk34.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk35.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk43.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk46.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk49.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk50.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk52.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk54.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk55.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk56.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk61.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk62.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk68.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk69.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk69b.wav",      NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk70.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk71.wav",       NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_MONK,                  "Sfx\\Monk\\Monk79.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk80.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk82.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk83.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk87.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk88.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk89.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk91.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk92.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk94.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk95.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk96.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk97.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk98.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Monk\\Monk99.wav",       NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
+	{ sfx_STREAM | sfx_MONK,     "Sfx\\Misc\\blank.wav",        NULL },
 #endif
 #ifndef SPAWN
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar01.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar02.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar03.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar04.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar05.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar06.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar07.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar08.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Narrator\\Nar09.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Misc\\Lvl16int.wav",     NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Butcher.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Garbud01.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Garbud02.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Garbud03.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Garbud04.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Izual01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Lach01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Lach02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Lach03.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Laz01.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Laz02.wav",    NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Sking01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Snot01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Snot02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Snot03.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Warlrd01.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Wlock01.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Zhar01.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\Zhar02.wav",   NULL },
-	{ SFX_STREAM,                "Sfx\\Monsters\\DiabloD.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar01.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar02.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar03.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar04.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar05.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar06.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar07.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar08.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Narrator\\Nar09.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Misc\\Lvl16int.wav",     NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Butcher.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Garbud01.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Garbud02.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Garbud03.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Garbud04.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Izual01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Lach01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Lach02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Lach03.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Laz01.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Laz02.wav",    NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Sking01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Snot01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Snot02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Snot03.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Warlrd01.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Wlock01.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Zhar01.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\Zhar02.wav",   NULL },
+	{ sfx_STREAM,                "Sfx\\Monsters\\DiabloD.wav",  NULL },
 #endif
 #ifdef HELLFIRE
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer1.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer2.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer2A.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer3.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer4.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer5.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer6.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer7.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer8.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Farmer9.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\TEDDYBR1.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\TEDDYBR2.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\TEDDYBR3.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\TEDDYBR4.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER1.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER2.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER3.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER4.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER8.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER6.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\DEFILER7.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL1.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL2.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL3.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL4.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL5.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NAKRUL6.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\NARATR3.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT1.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT2.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT3.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT4.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT4A.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT5.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT6.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT7.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT8.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT9.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT10.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT11.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\COWSUT12.wav", NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Skljrn1.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr6.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr7.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr8.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr5.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr9.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\Naratr4.wav",  NULL },
-	{ SFX_STREAM,                "Sfx\\Hellfire\\TRADER1.wav",  NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Cropen.wav",      NULL },
-	{ SFX_MISC,                  "Sfx\\Items\\Crclos.wav",      NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer1.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer2.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer2A.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer3.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer4.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer5.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer6.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer7.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer8.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Farmer9.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\TEDDYBR1.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\TEDDYBR2.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\TEDDYBR3.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\TEDDYBR4.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER1.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER2.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER3.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER4.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER8.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER6.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\DEFILER7.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL1.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL2.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL3.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL4.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL5.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NAKRUL6.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\NARATR3.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT1.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT2.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT3.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT4.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT4A.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT5.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT6.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT7.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT8.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT9.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT10.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT11.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\COWSUT12.wav", NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Skljrn1.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr6.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr7.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr8.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr5.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr9.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\Naratr4.wav",  NULL },
+	{ sfx_STREAM,                "Sfx\\Hellfire\\TRADER1.wav",  NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Cropen.wav",      NULL },
+	{ sfx_MISC,                  "Sfx\\Items\\Crclos.wav",      NULL },
 #endif
 	// clang-format on
 };
 
 #ifdef HELLFIRE
-#define PLRSFXS (SFX_WARRIOR | SFX_ROGUE | SFX_SORCEROR | SFX_MONK)
+#define PLRSFXS (sfx_WARRIOR | sfx_ROGUE | sfx_SORCEROR | sfx_MONK)
 #else
-#define PLRSFXS (SFX_WARRIOR | SFX_ROGUE | SFX_SORCEROR)
+#define PLRSFXS (sfx_WARRIOR | sfx_ROGUE | sfx_SORCEROR)
 #endif
 
 BOOL effect_is_playing(int nSFX)
@@ -1106,7 +1106,7 @@ BOOL effect_is_playing(int nSFX)
 	if (sfx->pSnd)
 		return snd_playing(sfx->pSnd);
 
-	if (sfx->bFlags & SFX_STREAM)
+	if (sfx->bFlags & sfx_STREAM)
 		return sfx == sgpStreamSFX;
 
 	return FALSE;
@@ -1205,14 +1205,14 @@ BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan)
 	x -= plr[myplr]._px;
 	y -= plr[myplr]._py;
 
-	pan = (x - y) << 8;
+	pan = (x - y) * 256;
 	*plPan = pan;
 
 	if (abs(pan) > 6400)
 		return FALSE;
 
 	volume = abs(x) > abs(y) ? abs(x) : abs(y);
-	volume <<= 6;
+	volume *= 64;
 	*plVolume = volume;
 
 	if (volume >= 6400)
@@ -1240,7 +1240,7 @@ void PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y)
 		return;
 	}
 
-	if (!(pSFX->bFlags & (SFX_STREAM | SFX_MISC)) && pSFX->pSnd != 0 && snd_playing(pSFX->pSnd)) {
+	if (!(pSFX->bFlags & (sfx_STREAM | sfx_MISC)) && pSFX->pSnd != 0 && snd_playing(pSFX->pSnd)) {
 		return;
 	}
 
@@ -1250,7 +1250,7 @@ void PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y)
 		return;
 	}
 
-	if (pSFX->bFlags & SFX_STREAM) {
+	if (pSFX->bFlags & sfx_STREAM) {
 		stream_play(pSFX, lVolume, lPan);
 		return;
 	}
@@ -1266,8 +1266,8 @@ void stream_play(TSFX *pSFX, int lVolume, int lPan)
 {
 	BOOL success;
 
-	/// ASSERT: assert(pSFX);
-	/// ASSERT: assert(pSFX->bFlags & sfx_STREAM);
+	assert(pSFX);
+	assert(pSFX->bFlags & sfx_STREAM);
 	stream_stop();
 	lVolume += sound_get_or_set_sound_volume(1);
 	if (lVolume >= VOLUME_MIN) {
@@ -1281,7 +1281,7 @@ void stream_play(TSFX *pSFX, int lVolume, int lPan)
 		SFileEnableDirectAccess(TRUE);
 #endif
 		if (!success) {
-			sghStream = 0;
+			sghStream = NULL;
 		} else {
 			if (!SFileDdaBeginEx(sghStream, 0x40000, 0, 0, lVolume, lPan, 0))
 				stream_stop();
@@ -1416,18 +1416,18 @@ void sound_init()
 	if (gbMaxPlayers > 1) {
 		mask = PLRSFXS;
 	} else if (plr[myplr]._pClass == PC_WARRIOR) {
-		mask = SFX_WARRIOR;
+		mask = sfx_WARRIOR;
 	} else if (plr[myplr]._pClass == PC_ROGUE) {
-		mask = SFX_ROGUE;
+		mask = sfx_ROGUE;
 	} else if (plr[myplr]._pClass == PC_SORCERER) {
-		mask = SFX_SORCEROR;
+		mask = sfx_SORCEROR;
 #ifdef HELLFIRE
 	} else if (plr[myplr]._pClass == PC_MONK) {
-		mask = SFX_MONK;
+		mask = sfx_MONK;
 	} else if (plr[myplr]._pClass == PC_BARD) {
-		mask = SFX_ROGUE;
+		mask = sfx_ROGUE;
 	} else if (plr[myplr]._pClass == PC_BARBARIAN) {
-		mask = SFX_WARRIOR;
+		mask = sfx_WARRIOR;
 #endif
 	} else {
 		app_fatal("effects:1");
@@ -1445,7 +1445,7 @@ void priv_sound_init(BYTE bLoadMask)
 		return;
 	}
 
-	pc = bLoadMask & (PLRSFXS);
+	pc = bLoadMask & PLRSFXS;
 	bLoadMask ^= pc;
 
 	for (i = 0; i < sizeof(sgSFX) / sizeof(TSFX); i++) {
@@ -1453,7 +1453,7 @@ void priv_sound_init(BYTE bLoadMask)
 			continue;
 		}
 
-		if (sgSFX[i].bFlags & SFX_STREAM) {
+		if (sgSFX[i].bFlags & sfx_STREAM) {
 			continue;
 		}
 
@@ -1471,7 +1471,7 @@ void priv_sound_init(BYTE bLoadMask)
 
 void ui_sound_init()
 {
-	priv_sound_init(SFX_UI);
+	priv_sound_init(sfx_UI);
 }
 
 void __stdcall effects_play_sound(char *snd_file)
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index dd4d0a4a2..368b291f0 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -6,17 +6,15 @@
 #include "all.h"
 #include "../3rdParty/PKWare/pkware.h"
 
-DWORD hashtable[1280];
+DWORD hashtable[5][256];
 
-void Decrypt(void *block, DWORD size, DWORD key)
+void Decrypt(DWORD *castBlock, DWORD size, DWORD key)
 {
-	DWORD *castBlock;
 	DWORD seed, i;
 
-	castBlock = (DWORD *)block;
 	seed = 0xEEEEEEEE;
 	for (i = 0; i < (size >> 2); i++) {
-		seed += hashtable[0x400 + (key & 0xFF)];
+		seed += hashtable[4][(key & 0xFF)];
 		*castBlock ^= seed + key;
 		seed += *castBlock + (seed << 5) + 3;
 		key = ((~key << 0x15) + 0x11111111) | (key >> 0x0B);
@@ -24,16 +22,14 @@ void Decrypt(void *block, DWORD size, DWORD key)
 	}
 }
 
-void Encrypt(void *block, DWORD size, DWORD key)
+void Encrypt(DWORD *castBlock, DWORD size, DWORD key)
 {
-	DWORD *castBlock;
 	DWORD seed, i, ch;
 
-	castBlock = (DWORD *)block;
 	seed = 0xEEEEEEEE;
 	for (i = 0; i < (size >> 2); i++) {
 		ch = *castBlock;
-		seed += hashtable[0x400 + (key & 0xFF)];
+		seed += hashtable[4][(key & 0xFF)];
 		*castBlock ^= seed + key;
 		seed += ch + (seed << 5) + 3;
 		key = ((~key << 0x15) + 0x11111111) | (key >> 0x0B);
@@ -51,7 +47,7 @@ DWORD Hash(const char *s, int type)
 	while (s != NULL && *s) {
 		ch = *s++;
 		ch = toupper(ch);
-		seed1 = hashtable[(type << 8) + ch] ^ (seed1 + seed2);
+		seed1 = hashtable[type][ch] ^ (seed1 + seed2);
 		seed2 += ch + seed1 + (seed2 << 5) + 3;
 	}
 	return seed1;
@@ -69,24 +65,23 @@ void InitHash()
 			seed = (125 * seed + 3) % 0x2AAAAB;
 			ch = (seed & 0xFFFF);
 			seed = (125 * seed + 3) % 0x2AAAAB;
-			hashtable[i + j * 256] = ch << 16 | (seed & 0xFFFF);
+			hashtable[i][j] = ch << 16 | (seed & 0xFFFF);
 		}
 	}
 }
 
-int PkwareCompress(void *buf, int size)
+int PkwareCompress(BYTE *srcData, int size)
 {
-	BYTE *srcData, *destData;
+	BYTE *destData;
 	char *ptr;
 	unsigned int destSize, type, dsize;
 	TDataInfo param;
 
-	srcData = (BYTE *)buf;
 	ptr = (char *)DiabloAllocPtr(CMP_BUFFER_SIZE);
 
 	destSize = 2 * size;
-	if (destSize < 8192)
-		destSize = 8192;
+	if (destSize < 2 * 4096)
+		destSize = 2 * 4096;
 
 	destData = (BYTE *)DiabloAllocPtr(destSize);
 
@@ -140,14 +135,13 @@ void __cdecl PkwareBufferWrite(char *buf, unsigned int *size, void *param)
 	pInfo->destOffset += *size;
 }
 
-void PkwareDecompress(void *param, int recv_size, int dwMaxBytes)
+void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes)
 {
 	char *ptr;
-	BYTE *pbInBuff, *pbOutBuff;
+	BYTE *pbOutBuff;
 	TDataInfo info;
 
 	ptr = (char *)DiabloAllocPtr(CMP_BUFFER_SIZE);
-	pbInBuff = (BYTE *)param;
 	pbOutBuff = DiabloAllocPtr(dwMaxBytes);
 
 	info.srcData = pbInBuff;
diff --git a/Source/encrypt.h b/Source/encrypt.h
index 552bed221..6d02bf6e4 100644
--- a/Source/encrypt.h
+++ b/Source/encrypt.h
@@ -6,15 +6,15 @@
 #ifndef __ENCRYPT_H__
 #define __ENCRYPT_H__
 
-extern DWORD hashtable[1280];
+extern DWORD hashtable[5][256];
 
-void Decrypt(void *block, DWORD size, DWORD key);
-void Encrypt(void *block, DWORD size, DWORD key);
+void Decrypt(DWORD *castBlock, DWORD size, DWORD key);
+void Encrypt(DWORD *castBlock, DWORD size, DWORD key);
 DWORD Hash(const char *s, int type);
 void InitHash();
-int PkwareCompress(void *buf, int size);
+int PkwareCompress(BYTE *srcData, int size);
 unsigned int __cdecl PkwareBufferRead(char *buf, unsigned int *size, void *param);
 void __cdecl PkwareBufferWrite(char *buf, unsigned int *size, void *param);
-void PkwareDecompress(void *param, int recv_size, int dwMaxBytes);
+void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes);
 
 #endif /* __ENCRYPT_H__ */
diff --git a/Source/engine.cpp b/Source/engine.cpp
index 2107a8333..6fe623b17 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -83,10 +83,10 @@ void CelBlit(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWidth)
 	int w;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -191,10 +191,10 @@ void CelDraw(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth)
 	BYTE *pRLEBytes;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pRLEBytes = CelGetFrame(pCelBuff, nCel, &nDataSize);
@@ -214,10 +214,10 @@ void CelBlitFrame(BYTE *pBuff, BYTE *pCelBuff, int nCel, int nWidth)
 	BYTE *pRLEBytes;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(pBuff != NULL);
-	if (!pBuff)
+	if (pBuff == NULL)
 		return;
 
 	pRLEBytes = CelGetFrame(pCelBuff, nCel, &nDataSize);
@@ -241,10 +241,10 @@ void CelClippedDraw(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int Ce
 	int nDataStart, nDataSize, nDataCap;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -287,10 +287,10 @@ void CelClippedBlit(BYTE *pBuff, BYTE *pCelBuff, int nCel, int nWidth, int CelSk
 	int nDataStart, nDataSize, nDataCap;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(pBuff != NULL);
-	if (!pBuff)
+	if (pBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -326,10 +326,10 @@ void CelBlitLight(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWidth)
 	BYTE *tbl;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -487,10 +487,10 @@ void CelBlitLightTrans(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWid
 	BYTE *tbl;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -681,10 +681,10 @@ void CelDrawLight(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth)
 	BYTE *pDecodeTo, *pRLEBytes;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pRLEBytes = CelGetFrame(pCelBuff, nCel, &nDataSize);
@@ -713,10 +713,10 @@ void CelClippedDrawLight(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, i
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -761,10 +761,10 @@ void CelClippedBlitLightTrans(BYTE *pBuff, BYTE *pCelBuff, int nCel, int nWidth,
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(pBuff != NULL);
-	if (!pBuff)
+	if (pBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -812,10 +812,10 @@ void CelDrawLightRed(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int C
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -840,7 +840,7 @@ void CelDrawLightRed(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int C
 
 	idx = light4flag ? 1024 : 4096;
 	if (light == 2)
-		idx += 256;
+		idx += 256; // gray colors
 	if (light >= 4)
 		idx += (light - 1) << 8;
 
@@ -930,13 +930,13 @@ void CelBlitSafe(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWidth)
 	int w;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -1055,10 +1055,10 @@ void CelClippedDrawSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, in
 	int nDataStart, nDataSize, nDataCap;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -1101,10 +1101,10 @@ void CelClippedBlitSafe(BYTE *pBuff, BYTE *pCelBuff, int nCel, int nWidth, int C
 	int nDataStart, nDataSize, nDataCap;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(pBuff != NULL);
-	if (!pBuff)
+	if (pBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -1140,13 +1140,13 @@ void CelBlitLightSafe(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWidt
 	BYTE *tbl;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -1316,13 +1316,13 @@ void CelBlitLightTransSafe(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int
 	BYTE *tbl;
 
 	/// ASSERT: assert(pDecodeTo != NULL);
-	if (!pDecodeTo)
+	if (pDecodeTo == NULL)
 		return;
 	/// ASSERT: assert(pRLEBytes != NULL);
-	if (!pRLEBytes)
+	if (pRLEBytes == NULL)
 		return;
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -1527,10 +1527,10 @@ void CelDrawLightSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -1575,7 +1575,7 @@ void CelClippedBlitLightTransSafe(BYTE *pBuff, BYTE *pCelBuff, int nCel, int nWi
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -1623,10 +1623,10 @@ void CelDrawLightRedSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, i
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
@@ -1651,7 +1651,7 @@ void CelDrawLightRedSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, i
 
 	idx = light4flag ? 1024 : 4096;
 	if (light == 2)
-		idx += 256;
+		idx += 256; // gray colors
 	if (light >= 4)
 		idx += (light - 1) << 8;
 
@@ -1752,10 +1752,10 @@ void CelBlitWidth(BYTE *pBuff, int x, int y, int wdt, BYTE *pCelBuff, int nCel,
 	BYTE *pRLEBytes, *dst, *end;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(pBuff != NULL);
-	if (!pBuff)
+	if (pBuff == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -1878,10 +1878,10 @@ void CelBlitOutline(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int nWid
 	BYTE *pRLEBytes, *dst;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -1906,11 +1906,11 @@ void CelBlitOutline(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int nWid
 		mov		nDataCap, eax
 	}
 
-	if (!nDataStart) return;
+	if (nDataStart == 0) return;
 
 	if (CelCap == 8)
 		nDataCap = 0;
-	if (nDataCap)
+	if (nDataCap != 0)
 		nDataSize = nDataCap - nDataStart;
 	else
 		nDataSize -= nDataStart;
@@ -2026,10 +2026,10 @@ void CelBlitOutlineSafe(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int
 	BYTE *pRLEBytes, *dst;
 
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
 	/// ASSERT: assert(gpBuffer);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 
 #ifdef USE_ASM
@@ -2054,11 +2054,11 @@ void CelBlitOutlineSafe(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int
 		mov		nDataCap, eax
 	}
 
-	if (!nDataStart) return;
+	if (nDataStart == 0) return;
 
 	if (CelCap == 8)
 		nDataCap = 0;
-	if (nDataCap)
+	if (nDataCap != 0)
 		nDataSize = nDataCap - nDataStart;
 	else
 		nDataSize -= nDataStart;
@@ -2656,7 +2656,7 @@ BYTE *LoadFileInMem(char *pszName, DWORD *pdwFileLen)
  * @param p Target buffer
  * @return Size of file
  */
-DWORD LoadFileWithMem(const char *pszName, void *p)
+DWORD LoadFileWithMem(const char *pszName, BYTE *p)
 {
 	DWORD dwFileLen;
 	HANDLE hsFile;
@@ -2741,17 +2741,17 @@ void Cl2Draw(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int CelSkip,
 	int nDataStart, nDataSize;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -2937,17 +2937,17 @@ void Cl2DrawOutline(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int nWid
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3156,17 +3156,17 @@ void Cl2DrawLightTbl(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int C
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3185,7 +3185,7 @@ void Cl2DrawLightTbl(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int C
 
 	idx = light4flag ? 1024 : 4096;
 	if (light == 2)
-		idx += 256;
+		idx += 256; // gray colors
 	if (light >= 4)
 		idx += (light - 1) << 8;
 
@@ -3372,17 +3372,17 @@ void Cl2DrawLight(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int CelS
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3422,17 +3422,17 @@ void Cl2DrawSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int CelSk
 	int nDataStart, nDataSize;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3631,17 +3631,17 @@ void Cl2DrawOutlineSafe(char col, int sx, int sy, BYTE *pCelBuff, int nCel, int
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3863,17 +3863,17 @@ void Cl2DrawLightTblSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, i
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
@@ -3892,7 +3892,7 @@ void Cl2DrawLightTblSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, i
 
 	idx = light4flag ? 1024 : 4096;
 	if (light == 2)
-		idx += 256;
+		idx += 256; // gray colors
 	if (light >= 4)
 		idx += (light - 1) << 8;
 
@@ -4092,17 +4092,17 @@ void Cl2DrawLightSafe(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int
 	DWORD *pFrameTable;
 
 	/// ASSERT: assert(gpBuffer != NULL);
-	if (!gpBuffer)
+	if (gpBuffer == NULL)
 		return;
 	/// ASSERT: assert(pCelBuff != NULL);
-	if (!pCelBuff)
+	if (pCelBuff == NULL)
 		return;
-	/// ASSERT: assert(nCel > 0);
+	assert(nCel > 0);
 	if (nCel <= 0)
 		return;
 
 	pFrameTable = (DWORD *)pCelBuff;
-	/// ASSERT: assert(nCel <= (int) pFrameTable[0]);
+	assert(nCel <= (int)pFrameTable[0]);
 	pRLEBytes = &pCelBuff[pFrameTable[nCel]];
 	nDataStart = *(WORD *)&pRLEBytes[CelSkip];
 	if (!nDataStart)
diff --git a/Source/engine.h b/Source/engine.h
index 9027445b8..9fce6d3a4 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -62,7 +62,7 @@ void engine_debug_trap(BOOL show_cursor);
 BYTE *DiabloAllocPtr(DWORD dwBytes);
 void mem_free_dbg(void *p);
 BYTE *LoadFileInMem(char *pszName, DWORD *pdwFileLen);
-DWORD LoadFileWithMem(const char *pszName, void *p);
+DWORD LoadFileWithMem(const char *pszName, BYTE *p);
 void Cl2ApplyTrans(BYTE *p, BYTE *ttbl, int nCel);
 void Cl2Draw(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth, int CelSkip, int CelCap);
 void Cl2Blit(BYTE *pDecodeTo, BYTE *pRLEBytes, int nDataSize, int nWidth);
diff --git a/Source/error.cpp b/Source/error.cpp
index 4495e8623..e4272b2d0 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -122,7 +122,7 @@ void DrawDiabloMsg()
 		sy += 12;
 	}
 
-	/// ASSERT: assert(gpBuffer);
+	assert(gpBuffer);
 
 #define TRANS_RECT_X (PANEL_LEFT + 104)
 #define TRANS_RECT_Y (DIALOG_TOP - 8)
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index a00bfa9ce..b106b5ddb 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -12,31 +12,31 @@ BOOL jogging_opt = TRUE;
 #endif
 
 /** Contains the game menu items of the single player menu. */
-TMenuItem sgSingleMenu[6] = {
-	// clang-format off
-	//   dwFlags, pszStr,        fnMenu
-	{ GMENU_ENABLED, "Save Game",   &gamemenu_save_game },
-	{ GMENU_ENABLED, "Options",     &gamemenu_options   },
-	{ GMENU_ENABLED, "New Game",    &gamemenu_new_game  },
-	{ GMENU_ENABLED, "Load Game",   &gamemenu_load_game },
-	{ GMENU_ENABLED, "Quit Diablo", &gamemenu_quit_game },
-	{ GMENU_ENABLED, NULL, NULL }
-	// clang-format on
+TMenuItem sgSingleMenu[] = {
+// clang-format off
+//	  dwFlags,       pszStr,         fnMenu
+	{ GMENU_ENABLED, "Save Game",    &gamemenu_save_game  },
+	{ GMENU_ENABLED, "Options",      &gamemenu_options    },
+	{ GMENU_ENABLED, "New Game",     &gamemenu_new_game   },
+	{ GMENU_ENABLED, "Load Game",    &gamemenu_load_game  },
+	{ GMENU_ENABLED, "Quit Diablo",  &gamemenu_quit_game  },
+	{ GMENU_ENABLED, NULL,           NULL }
+// clang-format on
 };
 /** Contains the game menu items of the multi player menu. */
-TMenuItem sgMultiMenu[5] = {
-	// clang-format off
-	//   dwFlags, pszStr,            fnMenu
+TMenuItem sgMultiMenu[] = {
+// clang-format off
+//	  dwFlags,       pszStr,            fnMenu
 	{ GMENU_ENABLED, "Options",         &gamemenu_options      },
 	{ GMENU_ENABLED, "New Game",        &gamemenu_new_game     },
 	{ GMENU_ENABLED, "Restart In Town", &gamemenu_restart_town },
 	{ GMENU_ENABLED, "Quit Diablo",     &gamemenu_quit_game    },
-	{ GMENU_ENABLED, NULL,              NULL                   }
-	// clang-format on
+	{ GMENU_ENABLED, NULL,              NULL                   },
+// clang-format on
 };
-TMenuItem sgOptionsMenu[6] = {
-	// clang-format off
-	//                     dwFlags, pszStr,          fnMenu
+TMenuItem sgOptionsMenu[] = {
+// clang-format off
+//	  dwFlags,                      pszStr,          fnMenu
 	{ GMENU_ENABLED | GMENU_SLIDER, NULL,            &gamemenu_music_volume  },
 	{ GMENU_ENABLED | GMENU_SLIDER, NULL,            &gamemenu_sound_volume  },
 	{ GMENU_ENABLED | GMENU_SLIDER, "Gamma",         &gamemenu_gamma         },
@@ -45,14 +45,20 @@ TMenuItem sgOptionsMenu[6] = {
 #else
 	{ GMENU_ENABLED | GMENU_SLIDER, NULL,            &gamemenu_loadjog },
 #endif
-	{ GMENU_ENABLED               , "Previous Menu", &gamemenu_previous    },
-	{ GMENU_ENABLED               , NULL,            NULL                    }
-	// clang-format on
+	{ GMENU_ENABLED               , "Previous Menu", &gamemenu_previous      },
+	{ GMENU_ENABLED               , NULL,            NULL                    },
+// clang-format on
 };
 /** Specifies the menu names for music enabled and disabled. */
-char *music_toggle_names[] = { "Music", "Music Disabled" };
+char *music_toggle_names[] = {
+	"Music",
+	"Music Disabled",
+};
 /** Specifies the menu names for sound enabled and disabled. */
-char *sound_toggle_names[] = { "Sound", "Sound Disabled" };
+char *sound_toggle_names[] = {
+	"Sound",
+	"Sound Disabled",
+};
 #ifdef HELLFIRE
 char *jogging_toggle_names[] = { "Jog", "Walk", "Fast Walk" };
 #endif
@@ -63,17 +69,11 @@ char *color_cycling_toggle_names[] = { "Color Cycling Off", "Color Cycling On" }
 
 void gamemenu_on()
 {
-	void (*proc)(TMenuItem *);
-	TMenuItem *item;
-
 	if (gbMaxPlayers == 1) {
-		proc = gamemenu_update_single;
-		item = sgSingleMenu;
+		gmenu_set_items(sgSingleMenu, gamemenu_update_single);
 	} else {
-		proc = gamemenu_update_multi;
-		item = sgMultiMenu;
+		gmenu_set_items(sgMultiMenu, gamemenu_update_multi);
 	}
-	gmenu_set_items(item, proc);
 	PressEscKey();
 }
 
@@ -87,7 +87,7 @@ void gamemenu_update_single(TMenuItem *pMenuItems)
 	if (plr[myplr]._pmode != PM_DEATH && !deathflag)
 		enable = TRUE;
 
-	gmenu_enable(sgSingleMenu, enable);
+	gmenu_enable(&sgSingleMenu[0], enable);
 }
 
 void gamemenu_update_multi(TMenuItem *pMenuItems)
@@ -97,7 +97,7 @@ void gamemenu_update_multi(TMenuItem *pMenuItems)
 
 void gamemenu_off()
 {
-	gmenu_set_items(0, NULL);
+	gmenu_set_items(NULL, NULL);
 }
 
 void gamemenu_handle_previous()
@@ -283,7 +283,7 @@ void gamemenu_music_volume(BOOL bActivate)
 #endif
         }
     } else {
-        volume = gamemenu_slider_music_sound(sgOptionsMenu);
+        volume = gamemenu_slider_music_sound(&sgOptionsMenu[0]);
         sound_get_or_set_music_volume(volume);
         if (volume == VOLUME_MIN) {
             if (gbMusicOn) {
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index ba488e287..1576a8069 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -23,7 +23,7 @@ int SpeedFrameTbl[128][16];
 /**
  * List of transparancy masks to use for dPieces
  */
-char block_lvid[2049];
+char block_lvid[MAXTILES + 1];
 int level_frame_count[MAXTILES];
 int tile_defs[MAXTILES];
 WORD level_frame_types[MAXTILES];
@@ -32,20 +32,20 @@ int nlevel_frames;
 /**
  * List of light blocking dPieces
  */
-BOOLEAN nBlockTable[2049];
+BOOLEAN nBlockTable[MAXTILES + 1];
 /**
  * List of path blocking dPieces
  */
-BOOLEAN nSolidTable[2049];
+BOOLEAN nSolidTable[MAXTILES + 1];
 /**
  * List of transparent dPieces
  */
-BOOLEAN nTransTable[2049];
+BOOLEAN nTransTable[MAXTILES + 1];
 /**
  * List of missile blocking dPieces
  */
-BOOLEAN nMissileTable[2049];
-BOOLEAN nTrapTable[2049];
+BOOLEAN nMissileTable[MAXTILES + 1];
+BOOLEAN nTrapTable[MAXTILES + 1];
 int dminx;
 int dminy;
 int dmaxx;
@@ -382,7 +382,7 @@ void MakeSpeedCels()
 	if (total_frames > 128)
 		total_frames = 128;
 
-	frameidx = 0; /* move into loop ? */
+	frameidx = 0;
 
 	if (light4flag)
 		blk_cnt = 3;
@@ -501,7 +501,7 @@ void MakeSpeedCels()
 
 	for (y = 0; y < MAXDUNY; y++) {
 		for (x = 0; x < MAXDUNX; x++) {
-			if (dPiece[x][y]) {
+			if (dPiece[x][y] != 0) {
 				pMap = &dpiece_defs_map_2[x][y];
 				for (i = 0; i < blocks; i++) {
 					if (pMap->mt[i]) {
@@ -557,7 +557,7 @@ void SetDungeonMicros()
 		for (x = 0; x < MAXDUNX; x++) {
 			lv = dPiece[x][y];
 			pMap = &dpiece_defs_map_2[x][y];
-			if (lv) {
+			if (lv != 0) {
 				lv--;
 				if (leveltype != DTYPE_HELL)
 					pPiece = (WORD *)&pLevelPieces[20 * lv];
@@ -634,7 +634,7 @@ void DRLG_CopyTrans(int sx, int sy, int dx, int dy)
 void DRLG_ListTrans(int num, BYTE *List)
 {
 	int i;
-	BYTE x1, x2, y1, y2;
+	BYTE x1, y1, x2, y2;
 
 	for (i = 0; i < num; i++) {
 		x1 = *List++;
@@ -648,7 +648,7 @@ void DRLG_ListTrans(int num, BYTE *List)
 void DRLG_AreaTrans(int num, BYTE *List)
 {
 	int i;
-	BYTE x1, x2, y1, y2;
+	BYTE x1, y1, x2, y2;
 
 	for (i = 0; i < num; i++) {
 		x1 = *List++;
@@ -681,7 +681,7 @@ void DRLG_SetPC()
 
 	for (j = 0; j < h; j++) {
 		for (i = 0; i < w; i++) {
-			dFlags[i + x][j + y] |= 8;
+			dFlags[i + x][j + y] |= BFLAG_POPULATED;
 		}
 	}
 }
@@ -698,7 +698,7 @@ void Make_SetPC(int x, int y, int w, int h)
 
 	for (j = 0; j < dh; j++) {
 		for (i = 0; i < dw; i++) {
-			dFlags[i + dx][j + dy] |= 8;
+			dFlags[i + dx][j + dy] |= BFLAG_POPULATED;
 		}
 	}
 }
diff --git a/Source/gendung.h b/Source/gendung.h
index 3a34834b2..1cd240605 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -21,17 +21,17 @@ extern BYTE *pLevelPieces;
 extern BYTE *pDungeonCels;
 extern BYTE *pSpeedCels;
 extern int SpeedFrameTbl[128][16];
-extern char block_lvid[2049];
+extern char block_lvid[MAXTILES + 1];
 extern int level_frame_count[MAXTILES];
 extern int tile_defs[MAXTILES];
 extern WORD level_frame_types[MAXTILES];
 extern int level_frame_sizes[MAXTILES];
 extern int nlevel_frames;
-extern BOOLEAN nBlockTable[2049];
-extern BOOLEAN nSolidTable[2049];
-extern BOOLEAN nTransTable[2049];
-extern BOOLEAN nMissileTable[2049];
-extern BOOLEAN nTrapTable[2049];
+extern BOOLEAN nBlockTable[MAXTILES + 1];
+extern BOOLEAN nSolidTable[MAXTILES + 1];
+extern BOOLEAN nTransTable[MAXTILES + 1];
+extern BOOLEAN nMissileTable[MAXTILES + 1];
+extern BOOLEAN nTrapTable[MAXTILES + 1];
 extern int dminx;
 extern int dminy;
 extern int dmaxx;
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 13cfdcf6f..210d3e6ac 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -23,7 +23,7 @@ BYTE *sgpLogo;
 int sgCurrentMenuIdx;
 
 /** Maps from font index to bigtgold.cel frame number. */
-const BYTE lfontframe[127] = {
+const BYTE lfontframe[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -36,11 +36,11 @@ const BYTE lfontframe[127] = {
 	26, 42, 0, 43, 0, 0, 0, 1, 2, 3,
 	4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
 	14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 20, 0, 21, 0
+	24, 25, 26, 20, 0, 21, 0, 0
 };
 
 /** Maps from bigtgold.cel frame number to character width. */
-const BYTE lfontkern[56] = {
+const BYTE lfontkern[] = {
 	18, 33, 21, 26, 28, 19, 19, 26, 25, 11,
 	12, 25, 19, 34, 28, 32, 20, 32, 28, 20,
 	28, 36, 35, 46, 33, 33, 24, 11, 23, 22,
@@ -66,7 +66,7 @@ void gmenu_print_text(int x, int y, char *pszStr)
 	while (*pszStr) {
 		c = gbFontTransTbl[(BYTE)*pszStr++];
 		c = lfontframe[c];
-		if (c)
+		if (c != 0)
 			CelDrawLight(x, y, BigTGold_cel, c, 46);
 		x += lfontkern[c] + 2;
 	}
@@ -88,8 +88,8 @@ void gmenu_init_menu()
 	LogoAnim_frame = 1;
 #endif
 	sgpCurrentMenu = NULL;
-	sgpCurrItem = 0;
-	dword_63447C = 0;
+	sgpCurrItem = NULL;
+	dword_63447C = NULL;
 	sgCurrentMenuIdx = 0;
 	mouseNavigation = FALSE;
 #ifdef HELLFIRE
@@ -280,7 +280,7 @@ BOOL gmenu_presskeys(int vkey)
 		break;
 	case VK_ESCAPE:
 		PlaySFX(IS_TITLEMOV);
-		gmenu_set_items(0, 0);
+		gmenu_set_items(NULL, NULL);
 		break;
 	case VK_SPACE:
 		return FALSE;
@@ -418,7 +418,7 @@ void gmenu_slider_set(TMenuItem *pItem, int min, int max, int value)
 {
 	int nSteps;
 
-	/// ASSERT: assertassert(pItem, "gmenu.cpp", 445);
+	assert(pItem);
 	nSteps = (int)(pItem->dwFlags & 0xFFF000) >> 12;
 	if (nSteps < 2)
 		nSteps = 2;
diff --git a/Source/gmenu.h b/Source/gmenu.h
index 8cdb3878c..2f028b214 100644
--- a/Source/gmenu.h
+++ b/Source/gmenu.h
@@ -40,7 +40,7 @@ void gmenu_slider_steps(TMenuItem *pItem, int dwTicks);
 
 /* rdata */
 
-extern const BYTE lfontframe[127];
-extern const BYTE lfontkern[56];
+extern const BYTE lfontframe[];
+extern const BYTE lfontkern[];
 
 #endif /* __GMENU_H__ */
diff --git a/Source/items.cpp b/Source/items.cpp
index 369a6f948..666d2bf32 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -139,7 +139,7 @@ char *ItemDropNames[] = {
 	"teddys1",
 	"cows1",
 	"donkys1",
-	"mooses1"
+	"mooses1",
 #endif
 };
 BYTE ItemAnimLs[] = {
@@ -186,7 +186,7 @@ BYTE ItemAnimLs[] = {
 	10,
 	15,
 	15,
-	15
+	15,
 #endif
 };
 int ItemDropSnds[] = {
@@ -233,7 +233,7 @@ int ItemDropSnds[] = {
 	IS_FMUSH,
 	IS_FHARM,
 	IS_FLARM,
-	IS_FLARM
+	IS_FLARM,
 #endif
 };
 int ItemInvSnds[] = {
@@ -280,7 +280,7 @@ int ItemInvSnds[] = {
 	IS_IMUSH,
 	IS_IHARM,
 	IS_ILARM,
-	IS_ILARM
+	IS_ILARM,
 #endif
 };
 #ifdef HELLFIRE
diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp
index 1c08a34c8..3a30ba285 100644
--- a/Source/monstdat.cpp
+++ b/Source/monstdat.cpp
@@ -188,183 +188,334 @@ MonsterData monsterdata[] = {
 	// clang-format on
 };
 
-char MonstConvTbl[128] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-	10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-	20, 21, 22, 23, 24, 25, 26, 27, 29, 30,
-	31, 32, 34, 35, 36, 37, 38, 40, 39, 41,
-	42, 43, 44, 45, 46, 47, 48, 49, 50, 52,
-	53, 54, 55, 56, 57, 59, 58, 60, 61, 62,
-	63, 64, 65, 66, 67, 68, 69, 70, 71, 0,
-	0, 0, 0, 72, 73, 74, 75, 0, 0, 0,
-	0, 77, 76, 78, 79, 81, 82, 83, 84, 85,
-	86, 87, 88, 89, 90, 92, 91, 93, 94, 95,
-	96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-	106, 107, 108, 0, 110, 0, 109, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 80, 111
+/**
+ * Map between .DUN file value and monster type enum
+ */
+#ifdef HELLFIRE
+int MonstConvTbl[] = {
+#else
+BYTE MonstConvTbl[] = {
+#endif
+	MT_NZOMBIE,
+	MT_BZOMBIE,
+	MT_GZOMBIE,
+	MT_YZOMBIE,
+	MT_RFALLSP,
+	MT_DFALLSP,
+	MT_YFALLSP,
+	MT_BFALLSP,
+	MT_WSKELAX,
+	MT_TSKELAX,
+	MT_RSKELAX,
+	MT_XSKELAX,
+	MT_RFALLSD,
+	MT_DFALLSD,
+	MT_YFALLSD,
+	MT_BFALLSD,
+	MT_NSCAV,
+	MT_BSCAV,
+	MT_WSCAV,
+	MT_YSCAV,
+	MT_WSKELBW,
+	MT_TSKELBW,
+	MT_RSKELBW,
+	MT_XSKELBW,
+	MT_WSKELSD,
+	MT_TSKELSD,
+	MT_RSKELSD,
+	MT_XSKELSD,
+	MT_SNEAK,
+	MT_STALKER,
+	MT_UNSEEN,
+	MT_ILLWEAV,
+	MT_NGOATMC,
+	MT_BGOATMC,
+	MT_RGOATMC,
+	MT_GGOATMC,
+	MT_FIEND,
+	MT_GLOOM,
+	MT_BLINK,
+	MT_FAMILIAR,
+	MT_NGOATBW,
+	MT_BGOATBW,
+	MT_RGOATBW,
+	MT_GGOATBW,
+	MT_NACID,
+	MT_RACID,
+	MT_BACID,
+	MT_XACID,
+	MT_SKING,
+	MT_FAT,
+	MT_MUDMAN,
+	MT_TOAD,
+	MT_FLAYED,
+	MT_WYRM,
+	MT_CAVSLUG,
+	MT_DEVOUR,
+	MT_DVLWYRM,
+	MT_NMAGMA,
+	MT_YMAGMA,
+	MT_BMAGMA,
+	MT_WMAGMA,
+	MT_HORNED,
+	MT_MUDRUN,
+	MT_FROSTC,
+	MT_OBLORD,
+	MT_BONEDMN,
+	MT_REDDTH,
+	MT_LTCHDMN,
+	MT_UDEDBLRG,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_INCIN,
+	MT_FLAMLRD,
+	MT_DOOMFIRE,
+	MT_HELLBURN,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_RSTORM,
+	MT_STORM,
+	MT_STORML,
+	MT_MAEL,
+	MT_WINGED,
+	MT_GARGOYLE,
+	MT_BLOODCLW,
+	MT_DEATHW,
+	MT_MEGA,
+	MT_GUARD,
+	MT_VTEXLRD,
+	MT_BALROG,
+	MT_NSNAKE,
+	MT_RSNAKE,
+	MT_GSNAKE,
+	MT_BSNAKE,
+	MT_NBLACK,
+	MT_RTBLACK,
+	MT_BTBLACK,
+	MT_RBLACK,
+	MT_UNRAV,
+	MT_HOLOWONE,
+	MT_PAINMSTR,
+	MT_REALWEAV,
+	MT_SUCCUBUS,
+	MT_SNOWWICH,
+	MT_HLSPWN,
+	MT_SOLBRNR,
+	MT_COUNSLR,
+	MT_MAGISTR,
+	MT_CABALIST,
+	MT_ADVOCATE,
+	MT_NZOMBIE,
+	MT_DIABLO,
+	MT_NZOMBIE,
+	MT_GOLEM,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_NZOMBIE,
+	MT_BIGFALL,
+	MT_DARKMAGE,
+#ifdef HELLFIRE
+	MT_HELLBOAR,
+	MT_STINGER,
+	MT_PSYCHORB,
+	MT_ARACHNON,
+	MT_FELLTWIN,
+	MT_HORKSPWN,
+	MT_STINGER,
+	MT_PSYCHORB,
+	MT_ARACHNON,
+	MT_LASHWORM,
+	MT_TORCHANT,
+	MT_HORKDMN,
+	MT_DEFILER,
+	MT_GRAVEDIG,
+	MT_TOMBRAT,
+	MT_FIREBAT,
+	MT_SKLWING,
+	MT_LICH,
+	MT_CRYPTDMN,
+	MT_FIREBAT,
+	MT_SKLWING,
+	MT_LICH,
+	MT_BICLOPS,
+	MT_FLESTHNG,
+	MT_REAPER,
+	MT_NAKRUL,
+#endif
 };
 
+#define MAT_NEVER  0
+#define MAT_ALWAYS 1
+#define MAT_RETAIL 2
 /**
- * 0 = Never avalible
- * 1 = Avalible in retail and shareware
- * 2 = avalible in retail only
+ * Define what version a monster type is available in
  */
 #ifdef HELLFIRE
 int MonstAvailTbl[] = {
 #else
 BYTE MonstAvailTbl[] = {
 #endif
-	1, // Zombie
-	1, // Ghoul
-	1, // Rotting Carcass
-	1, // Black Death
-	1, // Fallen One
-	1, // Carver
-	1, // Devil Kin
-	1, // Dark One
-	1, // Skeleton
-	1, // Corpse Axe
-	1, // Burning Dead
-	1, // Horror
-	1, // Fallen One
-	1, // Carver
-	1, // Devil Kin
-	1, // Dark One
-	1, // Scavenger
-	1, // Plague Eater
-	1, // Shadow Beast
-	1, // Bone Gasher
-	1, // Skeleton
-	1, // Corpse Bow
-	1, // Burning Dead
-	1, // Horror
-	1, // Skeleton Captain
-	1, // Corpse Captain
-	1, // Burning Dead Captain
-	1, // Horror Captain
-	0, // Invisible Lord
-	2, // Hidden
-	2, // Stalker
-	2, // Unseen
-	2, // Illusion Weaver
+	MAT_ALWAYS, // Zombie
+	MAT_ALWAYS, // Ghoul
+	MAT_ALWAYS, // Rotting Carcass
+	MAT_ALWAYS, // Black Death
+	MAT_ALWAYS, // Fallen One
+	MAT_ALWAYS, // Carver
+	MAT_ALWAYS, // Devil Kin
+	MAT_ALWAYS, // Dark One
+	MAT_ALWAYS, // Skeleton
+	MAT_ALWAYS, // Corpse Axe
+	MAT_ALWAYS, // Burning Dead
+	MAT_ALWAYS, // Horror
+	MAT_ALWAYS, // Fallen One
+	MAT_ALWAYS, // Carver
+	MAT_ALWAYS, // Devil Kin
+	MAT_ALWAYS, // Dark One
+	MAT_ALWAYS, // Scavenger
+	MAT_ALWAYS, // Plague Eater
+	MAT_ALWAYS, // Shadow Beast
+	MAT_ALWAYS, // Bone Gasher
+	MAT_ALWAYS, // Skeleton
+	MAT_ALWAYS, // Corpse Bow
+	MAT_ALWAYS, // Burning Dead
+	MAT_ALWAYS, // Horror
+	MAT_ALWAYS, // Skeleton Captain
+	MAT_ALWAYS, // Corpse Captain
+	MAT_ALWAYS, // Burning Dead Captain
+	MAT_ALWAYS, // Horror Captain
+	MAT_NEVER,  // Invisible Lord
+	MAT_RETAIL, // Hidden
+	MAT_RETAIL, // Stalker
+	MAT_RETAIL, // Unseen
+	MAT_RETAIL, // Illusion Weaver
 #ifdef HELLFIRE
-	2, // Satyr Lord
+	MAT_RETAIL, // Satyr Lord
 #else
-	0, // Lord Sayter
+	MAT_NEVER,  // Lord Sayter
 #endif
-	2, // Flesh Clan
-	2, // Stone Clan
-	2, // Fire Clan
-	2, // Night Clan
-	1, // Fiend
-	1, // Blink
-	1, // Gloom
-	1, // Familiar
-	2, // Flesh Clan
-	2, // Stone Clan
-	2, // Fire Clan
-	2, // Night Clan
-	2, // Acid Beast
-	2, // Poison Spitter
-	2, // Pit Beast
-	2, // Lava Maw
-	0, // Skeleton King
-	0, // The Butcher
-	2, // Overlord
-	2, // Mud Man
-	2, // Toad Demon
-	2, // Flayed One
-	0, // Wyrm
-	0, // Cave Slug
-	0, // Devil Wyrm
-	0, // Devourer
-	2, // Magma Demon
-	2, // Blood Stone
-	2, // Hell Stone
-	2, // Lava Lord
-	2, // Horned Demon
-	2, // Mud Runner
-	2, // Frost Charger
-	2, // Obsidian Lord
-	0, // Bone Demon (oldboned in Hellfire)
-	0, // Red Death
-	0, // Litch Demon
-	0, // Undead Balrog
-	0, // Incinerator
-	0, // Flame Lord
-	0, // Doom Fire
-	0, // Hell Burner
-	2, // Red Storm
-	2, // Storm Rider
-	2, // Storm Lord
-	2, // Maelstorm
+	MAT_RETAIL, // Flesh Clan
+	MAT_RETAIL, // Stone Clan
+	MAT_RETAIL, // Fire Clan
+	MAT_RETAIL, // Night Clan
+	MAT_ALWAYS, // Fiend
+	MAT_ALWAYS, // Blink
+	MAT_ALWAYS, // Gloom
+	MAT_ALWAYS, // Familiar
+	MAT_RETAIL, // Flesh Clan
+	MAT_RETAIL, // Stone Clan
+	MAT_RETAIL, // Fire Clan
+	MAT_RETAIL, // Night Clan
+	MAT_RETAIL, // Acid Beast
+	MAT_RETAIL, // Poison Spitter
+	MAT_RETAIL, // Pit Beast
+	MAT_RETAIL, // Lava Maw
+	MAT_NEVER,  // Skeleton King
+	MAT_NEVER,  // The Butcher
+	MAT_RETAIL, // Overlord
+	MAT_RETAIL, // Mud Man
+	MAT_RETAIL, // Toad Demon
+	MAT_RETAIL, // Flayed One
+	MAT_NEVER,  // Wyrm
+	MAT_NEVER,  // Cave Slug
+	MAT_NEVER,  // Devil Wyrm
+	MAT_NEVER,  // Devourer
+	MAT_RETAIL, // Magma Demon
+	MAT_RETAIL, // Blood Stone
+	MAT_RETAIL, // Hell Stone
+	MAT_RETAIL, // Lava Lord
+	MAT_RETAIL, // Horned Demon
+	MAT_RETAIL, // Mud Runner
+	MAT_RETAIL, // Frost Charger
+	MAT_RETAIL, // Obsidian Lord
+	MAT_NEVER,  // Bone Demon (oldboned in Hellfire)
+	MAT_NEVER,  // Red Death
+	MAT_NEVER,  // Litch Demon
+	MAT_NEVER,  // Undead Balrog
+	MAT_NEVER,  // Incinerator
+	MAT_NEVER,  // Flame Lord
+	MAT_NEVER,  // Doom Fire
+	MAT_NEVER,  // Hell Burner
+	MAT_RETAIL, // Red Storm
+	MAT_RETAIL, // Storm Rider
+	MAT_RETAIL, // Storm Lord
+	MAT_RETAIL, // Maelstorm
 #ifdef HELLFIRE
-	2, // Devil Kin Brute
+	MAT_RETAIL, // Devil Kin Brute
 #else
-	0, // Devil Kin Brute
+	MAT_NEVER,  // Devil Kin Brute
 #endif
-	2, // Winged-Demon
-	2, // Gargoyle
-	2, // Blood Claw
-	2, // Death Wing
-	2, // Slayer
-	2, // Guardian
-	2, // Vortex Lord
-	2, // Balrog
-	2, // Cave Viper
-	2, // Fire Drake
-	2, // Gold Viper
-	2, // Azure Drake
-	2, // Black Knight
-	2, // Doom Guard
-	2, // Steel Lord
-	2, // Blood Knight
+	MAT_RETAIL, // Winged-Demon
+	MAT_RETAIL, // Gargoyle
+	MAT_RETAIL, // Blood Claw
+	MAT_RETAIL, // Death Wing
+	MAT_RETAIL, // Slayer
+	MAT_RETAIL, // Guardian
+	MAT_RETAIL, // Vortex Lord
+	MAT_RETAIL, // Balrog
+	MAT_RETAIL, // Cave Viper
+	MAT_RETAIL, // Fire Drake
+	MAT_RETAIL, // Gold Viper
+	MAT_RETAIL, // Azure Drake
+	MAT_RETAIL, // Black Knight
+	MAT_RETAIL, // Doom Guard
+	MAT_RETAIL, // Steel Lord
+	MAT_RETAIL, // Blood Knight
 #ifdef HELLFIRE
-	2, // The Shredded
+	MAT_RETAIL, // The Shredded
 #else
-	0, // Unraveler
+	MAT_NEVER,  // Unraveler
 #endif
-	0, // Hollow One
-	0, // Pain Master
-	0, // Reality Weaver
-	2, // Succubus
-	2, // Snow Witch
-	2, // Hell Spawn
-	2, // Soul Burner
-	2, // Counselor
-	2, // Magistrate
-	2, // Cabalist
-	2, // Advocate
-	0, // Golem
-	0, // The Dark Lord
-	0, // The Arch-Litch Malignus
+	MAT_NEVER,  // Hollow One
+	MAT_NEVER,  // Pain Master
+	MAT_NEVER,  // Reality Weaver
+	MAT_RETAIL, // Succubus
+	MAT_RETAIL, // Snow Witch
+	MAT_RETAIL, // Hell Spawn
+	MAT_RETAIL, // Soul Burner
+	MAT_RETAIL, // Counselor
+	MAT_RETAIL, // Magistrate
+	MAT_RETAIL, // Cabalist
+	MAT_RETAIL, // Advocate
+	MAT_NEVER,  // Golem
+	MAT_NEVER,  // The Dark Lord
+	MAT_NEVER,  // The Arch-Litch Malignus
 #ifdef HELLFIRE
-	2, // Hellboar
-	2, // Stinger
-	2, // Psychorb
-	2, // Arachnon
-	2, // Felltwin
-	2, // Hork Spawn
-	2, // Venomtail
-	2, // Necromorb
-	2, // Spider Lord
-	2, // Lashworm
-	2, // Torchant
-	0, // Hork Demon
-	0, // Hell Bug
-	2, // Gravedigger
-	2, // Tomb Rat
-	2, // Firebat
-	2, // Skullwing
-	2, // Lich
-	2, // Crypt Demon
-	2, // Hellbat
-	2, // Bone Demon
-	2, // Arch Lich
-	2, // Biclops
-	2, // Flesh Thing
-	2, // Reaper
-	0, // Na-Krul
+	MAT_RETAIL, // Hellboar
+	MAT_RETAIL, // Stinger
+	MAT_RETAIL, // Psychorb
+	MAT_RETAIL, // Arachnon
+	MAT_RETAIL, // Felltwin
+	MAT_RETAIL, // Hork Spawn
+	MAT_RETAIL, // Venomtail
+	MAT_RETAIL, // Necromorb
+	MAT_RETAIL, // Spider Lord
+	MAT_RETAIL, // Lashworm
+	MAT_RETAIL, // Torchant
+	MAT_NEVER,  // Hork Demon
+	MAT_NEVER,  // Hell Bug
+	MAT_RETAIL, // Gravedigger
+	MAT_RETAIL, // Tomb Rat
+	MAT_RETAIL, // Firebat
+	MAT_RETAIL, // Skullwing
+	MAT_RETAIL, // Lich
+	MAT_RETAIL, // Crypt Demon
+	MAT_RETAIL, // Hellbat
+	MAT_RETAIL, // Bone Demon
+	MAT_RETAIL, // Arch Lich
+	MAT_RETAIL, // Biclops
+	MAT_RETAIL, // Flesh Thing
+	MAT_RETAIL, // Reaper
+	MAT_NEVER,  // Na-Krul
 #endif
 };
 
diff --git a/Source/monstdat.h b/Source/monstdat.h
index 809a51eb2..0808e6a10 100644
--- a/Source/monstdat.h
+++ b/Source/monstdat.h
@@ -7,10 +7,11 @@
 #define __MONSTDAT_H__
 
 extern MonsterData monsterdata[];
-extern char MonstConvTbl[128];
 #ifdef HELLFIRE
+extern int MonstConvTbl[];
 extern int MonstAvailTbl[];
 #else
+extern BYTE MonstConvTbl[];
 extern BYTE MonstAvailTbl[];
 #endif
 extern UniqMonstStruct UniqMonst[];
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 6d33ffdb6..6d1ca02a6 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -7,7 +7,7 @@
 #include "../3rdParty/Storm/Source/storm.h"
 
 DWORD sgdwMpqOffset;
-char mpq_buf[4096];
+BYTE mpq_buf[4096];
 _HASHENTRY *sgpHashTbl;
 /** Has the savegame-file been modified in memory. */
 BOOL save_archive_modified;
@@ -466,7 +466,7 @@ BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar)
 			if (!ReadFile(sghArchive, sgpBlockTbl, 0x8000, &dwTemp, NULL))
 				goto on_error;
 			key = Hash("(block table)", 3);
-			Decrypt(sgpBlockTbl, 0x8000, key);
+			Decrypt((DWORD *)sgpBlockTbl, 0x8000, key);
 		}
 		sgpHashTbl = (_HASHENTRY *)DiabloAllocPtr(0x8000);
 		memset(sgpHashTbl, 255, 0x8000);
@@ -476,7 +476,7 @@ BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar)
 			if (!ReadFile(sghArchive, sgpHashTbl, 0x8000, &dwTemp, NULL))
 				goto on_error;
 			key = Hash("(hash table)", 3);
-			Decrypt(sgpHashTbl, 0x8000, key);
+			Decrypt((DWORD *)sgpHashTbl, 0x8000, key);
 		}
 		return TRUE;
 	}
@@ -615,9 +615,9 @@ BOOL mpqapi_write_block_table()
 	if (SetFilePointer(sghArchive, 104, NULL, FILE_BEGIN) == -1)
 		return FALSE;
 
-	Encrypt(sgpBlockTbl, 0x8000, Hash("(block table)", 3));
+	Encrypt((DWORD *)sgpBlockTbl, 0x8000, Hash("(block table)", 3));
 	success = WriteFile(sghArchive, sgpBlockTbl, 0x8000, &NumberOfBytesWritten, 0);
-	Decrypt(sgpBlockTbl, 0x8000, Hash("(block table)", 3));
+	Decrypt((DWORD *)sgpBlockTbl, 0x8000, Hash("(block table)", 3));
 	return success && NumberOfBytesWritten == 0x8000;
 }
 
@@ -629,9 +629,9 @@ BOOL mpqapi_write_hash_table()
 	if (SetFilePointer(sghArchive, 32872, NULL, FILE_BEGIN) == -1)
 		return FALSE;
 
-	Encrypt(sgpHashTbl, 0x8000, Hash("(hash table)", 3));
+	Encrypt((DWORD *)sgpHashTbl, 0x8000, Hash("(hash table)", 3));
 	success = WriteFile(sghArchive, sgpHashTbl, 0x8000, &NumberOfBytesWritten, 0);
-	Decrypt(sgpHashTbl, 0x8000, Hash("(hash table)", 3));
+	Decrypt((DWORD *)sgpHashTbl, 0x8000, Hash("(hash table)", 3));
 	return success && NumberOfBytesWritten == 0x8000;
 }
 
diff --git a/Source/mpqapi.h b/Source/mpqapi.h
index ff6e61129..3f9e2f33a 100644
--- a/Source/mpqapi.h
+++ b/Source/mpqapi.h
@@ -6,7 +6,7 @@
 #ifndef __MPQAPI_H__
 #define __MPQAPI_H__
 
-extern char mpq_buf[4096];
+extern BYTE mpq_buf[4096];
 extern BOOL save_archive_modified;
 extern BOOLEAN save_archive_open;
 
diff --git a/enums.h b/enums.h
index 4f1195628..bf10122c9 100644
--- a/enums.h
+++ b/enums.h
@@ -1386,14 +1386,14 @@ typedef enum _sfx_id {
 } _sfx_id;
 
 typedef enum sfx_flag {
-	SFX_STREAM   = 0x01,
-	SFX_MISC     = 0x02,
-	SFX_UI       = 0x04,
-	SFX_MONK     = 0x08,
-	SFX_ROGUE    = 0x10,
-	SFX_WARRIOR  = 0x20,
-	SFX_SORCEROR = 0x40,
-	SFX_LOADED   = 0x80,
+	sfx_STREAM   = 0x01,
+	sfx_MISC     = 0x02,
+	sfx_UI       = 0x04,
+	sfx_MONK     = 0x08,
+	sfx_ROGUE    = 0x10,
+	sfx_WARRIOR  = 0x20,
+	sfx_SORCEROR = 0x40,
+	sfx_LOADED   = 0x80,
 } sfx_flag;
 
 typedef enum item_equip_type {
@@ -1768,8 +1768,8 @@ typedef enum _monster_id {
 	MT_ADVOCATE = 0x6C,
 	MT_GOLEM    = 0x6D,
 	MT_DIABLO   = 0x6E,
+	MT_DARKMAGE = 0x6F,
 #ifdef HELLFIRE
-	MT_DARKMAGE = 0x6F, /* not counted in enum in vanilla */
 	MT_HELLBOAR = 0x70,
 	MT_STINGER  = 0x71,
 	MT_PSYCHORB = 0x72,
@@ -1796,8 +1796,10 @@ typedef enum _monster_id {
 	MT_FLESTHNG = 0x87,
 	MT_REAPER   = 0x88,
 	MT_NAKRUL   = 0x89,
-#endif
 	NUM_MTYPES,
+#else
+	NUM_MTYPES  = 0x6F, /// BUGFIX the count is off by one
+#endif
 } _monster_id;
 
 // this enum contains indexes from UniqMonst array for special unique monsters (usually quest related)