diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 196a590fa..b35315ed3 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -5,7 +5,7 @@ int icursH28;
 int cursW;
 int pcursmonst;
 int icursW28;
-void *pCursCels;
+BYTE *pCursCels;
 int icursH;
 
 // inv_item value
diff --git a/Source/cursor.h b/Source/cursor.h
index 64a336921..5fbb42419 100644
--- a/Source/cursor.h
+++ b/Source/cursor.h
@@ -7,7 +7,7 @@ extern int icursH28;
 extern int cursW;
 extern int pcursmonst;
 extern int icursW28;
-extern void *pCursCels;
+extern BYTE *pCursCels;
 extern int icursH;
 extern char pcursinvitem;
 extern int icursW;
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 3b7a68af6..2c89ba600 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -8,7 +8,7 @@ int seed_index;
 int level_seeds[NUMLEVELS];
 int seed_table[4096];
 
-void *pSquareCel;
+BYTE *pSquareCel;
 char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 
diff --git a/Source/debug.h b/Source/debug.h
index 61160f98e..d3dacf707 100644
--- a/Source/debug.h
+++ b/Source/debug.h
@@ -2,7 +2,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-extern void *pSquareCel;
+extern BYTE *pSquareCel;
 extern char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 extern char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
 
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 0383993a5..50e58a4c0 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -327,7 +327,7 @@ void diablo_parse_flags(char *args)
 			gbBackBuf = 1;
 			args += strlen("dd_backbuf");
 		} else if (_strnicmp("ds_noduplicates", args, strlen("ds_noduplicates")) == 0) {
-			gbDupSounds = 0;
+			gbDupSounds = FALSE;
 			args += strlen("ds_noduplicates");
 		} else {
 			c = tolower(*args);
diff --git a/Source/error.cpp b/Source/error.cpp
index 51d74ccf9..919041a8f 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -85,21 +85,21 @@ void DrawDiabloMsg()
 	int i, len, off, width, sx, sy;
 	BYTE c;
 
-	CelDecodeOnly(165, 318, (BYTE *)pSTextSlidCels, 1, 12);
-	CelDecodeOnly(591, 318, (BYTE *)pSTextSlidCels, 4, 12);
-	CelDecodeOnly(165, 366, (BYTE *)pSTextSlidCels, 2, 12);
-	CelDecodeOnly(591, 366, (BYTE *)pSTextSlidCels, 3, 12);
+	CelDecodeOnly(165, 318, pSTextSlidCels, 1, 12);
+	CelDecodeOnly(591, 318, pSTextSlidCels, 4, 12);
+	CelDecodeOnly(165, 366, pSTextSlidCels, 2, 12);
+	CelDecodeOnly(591, 366, pSTextSlidCels, 3, 12);
 
 	sx = 173;
 	for (i = 0; i < 35; i++) {
-		CelDecodeOnly(sx, 318, (BYTE *)pSTextSlidCels, 5, 12);
-		CelDecodeOnly(sx, 366, (BYTE *)pSTextSlidCels, 7, 12);
+		CelDecodeOnly(sx, 318, pSTextSlidCels, 5, 12);
+		CelDecodeOnly(sx, 366, pSTextSlidCels, 7, 12);
 		sx += 12;
 	}
 	sy = 330;
 	for (i = 0; i < 3; i++) {
-		CelDecodeOnly(165, sy, (BYTE *)pSTextSlidCels, 6, 12);
-		CelDecodeOnly(591, sy, (BYTE *)pSTextSlidCels, 8, 12);
+		CelDecodeOnly(165, sy, pSTextSlidCels, 6, 12);
+		CelDecodeOnly(591, sy, pSTextSlidCels, 8, 12);
 		sy += 12;
 	}
 
diff --git a/Source/inv.cpp b/Source/inv.cpp
index 6874b3a7f..048981b74 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1,7 +1,7 @@
 #include "diablo.h"
 
 BOOL invflag;
-void *pInvCels;
+BYTE *pInvCels;
 BOOL drawsbarflag;
 int sgdwLastTime; // check name
 
@@ -170,7 +170,7 @@ void DrawInv()
 	BOOL invtest[40];
 	int frame, frame_width, colour, screen_x, screen_y, i, j, ii;
 
-	CelDecodeOnly(384, 511, (BYTE *)pInvCels, 1, 320);
+	CelDecodeOnly(384, 511, pInvCels, 1, 320);
 
 	if (plr[myplr].InvBody[INVLOC_HEAD]._itype != ITYPE_NONE) {
 		InvDrawSlotBack(517, 219, 2 * INV_SLOT_SIZE_PX, 2 * INV_SLOT_SIZE_PX);
@@ -186,13 +186,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, 517, 219, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, 517, 219, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) {
-			CelDrawHdrOnly(517, 219, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(517, 219, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(517, 219, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(517, 219, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -210,13 +210,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_RING_LEFT]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, 432, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, 432, 365, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_RING_LEFT]._iStatFlag) {
-			CelDrawHdrOnly(432, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(432, 365, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(432, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(432, 365, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -234,13 +234,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_RING_RIGHT]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, 633, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, 633, 365, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_RING_RIGHT]._iStatFlag) {
-			CelDrawHdrOnly(633, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(633, 365, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(633, 365, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(633, 365, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -258,13 +258,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_AMULET]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, 589, 220, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, 589, 220, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_AMULET]._iStatFlag) {
-			CelDrawHdrOnly(589, 220, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(589, 220, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(589, 220, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(589, 220, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -285,13 +285,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_HAND_LEFT]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iStatFlag) {
-			CelDrawHdrOnly(screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(screen_x, screen_y, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(screen_x, screen_y, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iLoc == ILOC_TWOHAND) {
@@ -303,7 +303,7 @@ void DrawInv()
 			    frame_width == INV_SLOT_SIZE_PX
 			        ? &gpBuffer[SCREENXY(581, 160)]
 			        : &gpBuffer[SCREENXY(567, 160)],
-			    (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			    pCursCels, frame, frame_width, 0, 8);
 
 			cel_transparency_active = 0;
 		}
@@ -325,13 +325,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) {
-			CelDrawHdrOnly(screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(screen_x, screen_y, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(screen_x, screen_y, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(screen_x, screen_y, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -349,13 +349,13 @@ void DrawInv()
 			if (!plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) {
 				colour = ICOL_RED;
 			}
-			CelDecodeClr(colour, 517, 320, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, 517, 320, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) {
-			CelDrawHdrOnly(517, 320, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(517, 320, pCursCels, frame, frame_width, 0, 8);
 		} else {
-			CelDrawHdrLightRed(517, 320, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(517, 320, pCursCels, frame, frame_width, 0, 8, 1);
 		}
 	}
 
@@ -390,19 +390,19 @@ void DrawInv()
 				    colour,
 				    InvRect[j + SLOTXY_INV_FIRST].X + 64,
 				    InvRect[j + SLOTXY_INV_FIRST].Y + 159,
-				    (BYTE *)pCursCels, frame, frame_width, 0, 8);
+				    pCursCels, frame, frame_width, 0, 8);
 			}
 
 			if (plr[myplr].InvList[ii]._iStatFlag) {
 				CelDrawHdrOnly(
 				    InvRect[j + SLOTXY_INV_FIRST].X + 64,
 				    InvRect[j + SLOTXY_INV_FIRST].Y + 159,
-				    (BYTE *)pCursCels, frame, frame_width, 0, 8);
+				    pCursCels, frame, frame_width, 0, 8);
 			} else {
 				CelDrawHdrLightRed(
 				    InvRect[j + SLOTXY_INV_FIRST].X + 64,
 				    InvRect[j + SLOTXY_INV_FIRST].Y + 159,
-				    (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+				    pCursCels, frame, frame_width, 0, 8, 1);
 			}
 		}
 	}
@@ -434,13 +434,13 @@ void DrawInvBelt()
 				colour = ICOL_BLUE;
 			if (!plr[myplr].SpdList[i]._iStatFlag)
 				colour = ICOL_RED;
-			CelDecodeClr(colour, InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDecodeClr(colour, InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, pCursCels, frame, frame_width, 0, 8);
 		}
 
 		if (plr[myplr].SpdList[i]._iStatFlag)
-			CelDrawHdrOnly(InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, (BYTE *)pCursCels, frame, frame_width, 0, 8);
+			CelDrawHdrOnly(InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, pCursCels, frame, frame_width, 0, 8);
 		else
-			CelDrawHdrLightRed(InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, (BYTE *)pCursCels, frame, frame_width, 0, 8, 1);
+			CelDrawHdrLightRed(InvRect[i + 65].X + 64, InvRect[i + 65].Y + 159, pCursCels, frame, frame_width, 0, 8, 1);
 
 		if (AllItemsList[plr[myplr].SpdList[i].IDidx].iUsable
 		    && plr[myplr].SpdList[i]._iStatFlag
diff --git a/Source/items.cpp b/Source/items.cpp
index 29f809304..3ab8b9f1b 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -2884,7 +2884,7 @@ void PrintItemPower(char plidx, ItemStruct *x)
 
 void DrawUTextBack()
 {
-	CelDecodeOnly(88, 487, (BYTE *)pSTextBoxCels, 1, 271);
+	CelDecodeOnly(88, 487, pSTextBoxCels, 1, 271);
 
 #define TRANS_RECT_X 27
 #define TRANS_RECT_Y 28
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 4d15cd67d..1e6798864 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -6,8 +6,8 @@ int qtextSpd;
 char qtextflag;
 int scrolltexty;
 int sgLastScroll;
-void *pMedTextCels;
-void *pTextBoxCels;
+BYTE *pMedTextCels;
+BYTE *pTextBoxCels;
 
 const BYTE mfontframe[127] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -66,7 +66,7 @@ void InitQTextMsg(int m)
 
 void DrawQTextBack()
 {
-	CelDecodeOnly(88, 487, (BYTE *)pTextBoxCels, 1, 591);
+	CelDecodeOnly(88, 487, pTextBoxCels, 1, 591);
 
 #define TRANS_RECT_X 27
 #define TRANS_RECT_Y 28
@@ -241,7 +241,7 @@ void DrawQText()
 				p++;
 			}
 			if (c != 0) {
-				PrintQTextChr(tx, ty, (BYTE *)pMedTextCels, c);
+				PrintQTextChr(tx, ty, pMedTextCels, c);
 			}
 			tx += mfontkern[c] + 2;
 		}
diff --git a/Source/minitext.h b/Source/minitext.h
index 851ac220c..d1250e7d3 100644
--- a/Source/minitext.h
+++ b/Source/minitext.h
@@ -7,8 +7,8 @@ extern char *qtextptr;
 extern int qtextSpd;
 extern char qtextflag;
 extern int scrolltexty;
-extern void *pMedTextCels;
-extern void *pTextBoxCels;
+extern BYTE *pMedTextCels;
+extern BYTE *pTextBoxCels;
 
 void FreeQuestText();
 void InitQuestText();
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index cbcb1f2df..63e6a32f9 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -705,7 +705,7 @@ void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, int dy,
 	negMon = dMonster[sx][sy - 1];
 
 	if (visiondebug && bFlag & BFLAG_LIT) {
-		Cel2DecodeHdrOnly(pBuff, (BYTE *)pSquareCel, 1, 64, 0, 8);
+		Cel2DecodeHdrOnly(pBuff, pSquareCel, 1, 64, 0, 8);
 	}
 	if (MissilePreFlag && bFlag & BFLAG_MISSILE) {
 		DrawClippedMissile(sx, sy, dx, dy, 0, 8, 1);
@@ -1171,7 +1171,7 @@ void scrollrt_draw_clipped_dungeon_2(BYTE *pBuff, int sx, int sy, int skipChunks
 	negMon = dMonster[sx][sy - 1];
 
 	if (visiondebug && bFlag & BFLAG_LIT) {
-		Cel2DecodeHdrOnly(pBuff, (BYTE *)pSquareCel, 1, 64, CelSkip, 8);
+		Cel2DecodeHdrOnly(pBuff, pSquareCel, 1, 64, CelSkip, 8);
 	}
 	if (MissilePreFlag && bFlag & BFLAG_MISSILE) {
 		DrawClippedMissile(sx, sy, dx, dy, CelSkip, 8, 1);
@@ -1601,7 +1601,7 @@ void scrollrt_draw_dungeon(BYTE *pBuff, int sx, int sy, int capChunks, int CelCa
 	negMon = dMonster[sx][sy - 1];
 
 	if (visiondebug && bFlag & BFLAG_LIT) {
-		CelDecodeHdrOnly(pBuff, (BYTE *)pSquareCel, 1, 64, 0, CelCap);
+		CelDecodeHdrOnly(pBuff, pSquareCel, 1, 64, 0, CelCap);
 	}
 	tx = dx - 96;
 	ty = dy - 16;
@@ -2322,14 +2322,14 @@ void scrollrt_draw_cursor_item()
 		if (!plr[myplr].HoldItem._iStatFlag) {
 			col = PAL16_RED + 5;
 		}
-		CelDrawHdrClrHL(col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, (BYTE *)pCursCels, pcurs, cursW, 0, 8);
+		CelDrawHdrClrHL(col, mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
 		if (col != PAL16_RED + 5) {
-			Cel2DrawHdrOnly(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, (BYTE *)pCursCels, pcurs, cursW, 0, 8);
+			Cel2DrawHdrOnly(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
 		} else {
-			Cel2DrawHdrLightRed(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, (BYTE *)pCursCels, pcurs, cursW, 0, 8, 1);
+			Cel2DrawHdrLightRed(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8, 1);
 		}
 	} else {
-		Cel2DrawHdrOnly(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, (BYTE *)pCursCels, pcurs, cursW, 0, 8);
+		Cel2DrawHdrOnly(mx + SCREEN_X, my + cursH + SCREEN_Y - 1, pCursCels, pcurs, cursW, 0, 8);
 	}
 }
 
diff --git a/Source/sound.cpp b/Source/sound.cpp
index f64af1a1e..47851b756 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -12,9 +12,9 @@ LPDIRECTSOUNDBUFFER sglpDSB;
 
 /* data */
 
-BYTE gbMusicOn = TRUE;
-BYTE gbSoundOn = TRUE;
-BYTE gbDupSounds = TRUE;
+BOOLEAN gbMusicOn = TRUE;
+BOOLEAN gbSoundOn = TRUE;
+BOOLEAN gbDupSounds = TRUE;
 int sgnMusicTrack = 6;
 char *sgszMusicTracks[NUM_MUSIC] = {
 	"Music\\DTowne.wav",
diff --git a/Source/sound.h b/Source/sound.h
index 831001b81..f584f4e76 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -31,9 +31,9 @@ int sound_get_or_set_sound_volume(int volume);
 
 /* data */
 
-extern BYTE gbMusicOn;
-extern BYTE gbSoundOn;
-extern BYTE gbDupSounds;
+extern BOOLEAN gbMusicOn;
+extern BOOLEAN gbSoundOn;
+extern BOOLEAN gbDupSounds;
 extern char unk_volume[4][2];
 
 #endif /* __SOUND_H__ */
diff --git a/Source/stores.cpp b/Source/stores.cpp
index e66fee67f..604894195 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -6,7 +6,7 @@ int stextlhold;
 ItemStruct boyitem;
 int stextshold;
 ItemStruct premiumitem[6];
-void *pSTextBoxCels;
+BYTE *pSTextBoxCels;
 int premiumlevel;
 int talker;
 STextStruct stext[24];
@@ -21,7 +21,7 @@ int numpremium;
 ItemStruct healitem[20];
 ItemStruct golditem;
 char storehidx[48];
-void *pSTextSlidCels;
+BYTE *pSTextSlidCels;
 int stextvhold;
 int stextsel;
 char stextscrldbtn;
@@ -130,7 +130,7 @@ void FreeStoreMem()
 
 void DrawSTextBack()
 {
-	CelDecodeOnly(408, 487, (BYTE *)pSTextBoxCels, 1, 271);
+	CelDecodeOnly(408, 487, pSTextBoxCels, 1, 271);
 
 #define TRANS_RECT_X 347
 #define TRANS_RECT_Y 28
@@ -247,16 +247,16 @@ void DrawSArrows(int y1, int y2)
 	yd1 = SStringY[y1] + 204;
 	yd2 = SStringY[y2] + 204;
 	if (stextscrlubtn != -1)
-		CelDecodeOnly(665, yd1, (BYTE *)pSTextSlidCels, 12, 12);
+		CelDecodeOnly(665, yd1, pSTextSlidCels, 12, 12);
 	else
-		CelDecodeOnly(665, yd1, (BYTE *)pSTextSlidCels, 10, 12);
+		CelDecodeOnly(665, yd1, pSTextSlidCels, 10, 12);
 	if (stextscrldbtn != -1)
-		CelDecodeOnly(665, yd2, (BYTE *)pSTextSlidCels, 11, 12);
+		CelDecodeOnly(665, yd2, pSTextSlidCels, 11, 12);
 	else
-		CelDecodeOnly(665, yd2, (BYTE *)pSTextSlidCels, 9, 12);
+		CelDecodeOnly(665, yd2, pSTextSlidCels, 9, 12);
 	yd1 += 12;
 	for (yd3 = yd1; yd3 < yd2; yd3 += 12) {
-		CelDecodeOnly(665, yd3, (BYTE *)pSTextSlidCels, 14, 12);
+		CelDecodeOnly(665, yd3, pSTextSlidCels, 14, 12);
 	}
 	if (stextsel == 22)
 		yd3 = stextlhold;
@@ -266,7 +266,7 @@ void DrawSArrows(int y1, int y2)
 		yd3 = 1000 * (stextsval + ((yd3 - stextup) >> 2)) / (storenumh - 1) * (SStringY[y2] - SStringY[y1] - 24) / 1000;
 	else
 		yd3 = 0;
-	CelDecodeOnly(665, SStringY[y1 + 1] + 204 + yd3, (BYTE *)pSTextSlidCels, 13, 12);
+	CelDecodeOnly(665, SStringY[y1 + 1] + 204 + yd3, pSTextSlidCels, 13, 12);
 }
 
 void DrawSTextHelp()
diff --git a/Source/stores.h b/Source/stores.h
index 496e989fe..5fcac1297 100644
--- a/Source/stores.h
+++ b/Source/stores.h
@@ -8,7 +8,7 @@ extern int stextlhold;
 extern ItemStruct boyitem;
 extern int stextshold;
 extern ItemStruct premiumitem[6];
-extern void *pSTextBoxCels;
+extern BYTE *pSTextBoxCels;
 extern int premiumlevel;
 extern int talker;
 extern STextStruct stext[24];
@@ -23,7 +23,7 @@ extern int numpremium;
 extern ItemStruct healitem[20];
 extern ItemStruct golditem;
 extern char storehidx[48];
-extern void *pSTextSlidCels;
+extern BYTE *pSTextSlidCels;
 extern int stextvhold;
 extern int stextsel;
 extern char stextscrldbtn;
diff --git a/Source/textdat.cpp b/Source/textdat.cpp
index fb7c0b693..4b6639180 100644
--- a/Source/textdat.cpp
+++ b/Source/textdat.cpp
@@ -506,4 +506,4 @@ const TextDataStruct alltext[259] = {
 	{ "Thank goodness you've returned!\nMuch has changed since you lived here, my friend. All was peaceful until the dark riders came and destroyed our village. Many were cut down where they stood, and those who took up arms were slain or dragged away to become slaves - or worse. The church at the edge of town has been desecrated and is being used for dark rituals. The screams that echo in the night are inhuman, but some of our townsfolk may yet survive. Follow the path that lies between my tavern and the blacksmith shop to find the church and save who you can. \n \nPerhaps I can tell you more if we speak again. Good luck.|",
 	    1, 5, TSFX_TAVERN0 }
 };
-const int gdwAllTextEntries = 259; /* unused */
+const DWORD gdwAllTextEntries = 259; /* unused */
diff --git a/Source/textdat.h b/Source/textdat.h
index 3b0a695c0..96445a648 100644
--- a/Source/textdat.h
+++ b/Source/textdat.h
@@ -3,6 +3,6 @@
 #define __TEXTDAT_H__
 
 extern const TextDataStruct alltext[259];
-extern const int gdwAllTextEntries;
+extern const DWORD gdwAllTextEntries;
 
 #endif /* __TEXTDAT_H__ */