diff --git a/Source/control.cpp b/Source/control.cpp
index 6fe39f5..b5227cf 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -485,7 +485,7 @@ LABEL_10:
 		}
 		v20 = &spelldata[1].sTownSpell;
 		v4 = 1;
-		v26 = 1i64;
+		v26 = 1;
 		v23 = 1;
 		v22 = xp - 216;
 		do
@@ -621,7 +621,7 @@ LABEL_66:
 LABEL_68:
 			v20 += 56;
 			++v4;
-			v26 *= 2i64;
+			v26 *= 2;
 			v23 = v4;
 		}
 		while ( (signed int)v20 < (signed int)&spelldata[37].sTownSpell );
@@ -753,7 +753,7 @@ void __fastcall ToggleSpell(int slot)
 			v8 = plr[v3]._pAblSpells[0];
 			v9 = plr[v3]._pAblSpells[1];
 		}
-		if ( v9 & ((unsigned __int64)(1i64 << ((unsigned char)v2 - 1)) >> 32) | v8 & (unsigned int)(1i64 << ((unsigned char)v2 - 1)) )
+		if ( v9 & ((unsigned __int64)(1 << ((unsigned char)v2 - 1)) >> 32) | v8 & (unsigned int)(1 << ((unsigned char)v2 - 1)) )
 		{
 			drawpanflag = 255;
 			plr[v3]._pRSpell = v12;
@@ -2754,7 +2754,7 @@ int __fastcall GetSBookTrans(int ii, unsigned char townok)
 	v7 = townok;
 	v6 = 1;
 	v3 = myplr;
-	if ( ((unsigned __int64)(1i64 << ((unsigned char)ii - 1)) >> 32) & plr[v3]._pISpells[1] | (unsigned int)(1i64 << ((unsigned char)ii - 1)) & plr[v3]._pISpells[0] )
+	if ( ((unsigned __int64)(1 << ((unsigned char)ii - 1)) >> 32) & plr[v3]._pISpells[1] | (unsigned int)(1 << ((unsigned char)ii - 1)) & plr[v3]._pISpells[0] )
 		v6 = 3;
 	result = plr[v3]._pAblSpells[1] & (1 << (ii - 1) >> 31) | plr[v3]._pAblSpells[0] & (1 << (ii - 1));
 	if ( result )
@@ -2800,7 +2800,7 @@ void __cdecl DrawSpellBook()
 	{
 		v2 = *(&attribute_inc_rects[3].h + v9 + 7 * sbooktab);
 		if ( v2 != -1
-		  && v1 & ((unsigned __int64)(1i64 << ((unsigned char)v2 - 1)) >> 32) | v0 & (unsigned int)(1i64 << ((unsigned char)v2 - 1)) )
+		  && v1 & ((unsigned __int64)(1 << ((unsigned char)v2 - 1)) >> 32) | v0 & (unsigned int)(1 << ((unsigned char)v2 - 1)) )
 		{
 			v7 = GetSBookTrans(v2, 1u);
 			SetSpellTrans(v7);
@@ -2929,7 +2929,7 @@ void __cdecl CheckSBook()
 			v3 = myplr;
 			LODWORD(v6) = plr[myplr]._pAblSpells[0];
 			HIDWORD(v6) = plr[myplr]._pAblSpells[1];
-			v4 = 1i64 << ((unsigned char)v2 - 1);
+			v4 = 1 << ((unsigned char)v2 - 1);
 			if ( HIDWORD(v4) & (HIDWORD(v6) | plr[myplr]._pISpells[1] | plr[myplr]._pMemSpells[1]) | (unsigned int)v4 & ((unsigned int)v6 | plr[myplr]._pISpells[0] | plr[myplr]._pMemSpells[0]) )
 			{
 				v5 = 3;
diff --git a/Source/init.cpp b/Source/init.cpp
index dd12b73..31832ff 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -543,7 +543,7 @@ LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM
 }
 
 //----- (0041B184) --------------------------------------------------------
-LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT (__stdcall *SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	LRESULT (__stdcall *result)(HWND, UINT, WPARAM, LPARAM); // eax
 
diff --git a/Source/init.h b/Source/init.h
index 3f65b42..11a652d 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -40,7 +40,7 @@ void __cdecl init_get_file_info();
 LRESULT __stdcall init_palette(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
 void __fastcall init_activate_window(HWND hWnd, bool activated);
 LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT (__stdcall *SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* data */
 extern int init_inf; // weak
@@ -48,4 +48,4 @@ extern int init_inf; // weak
 /* rdata */
 
 extern char gszVersionNumber[260];
-extern char gszProductName[260];
\ No newline at end of file
+extern char gszProductName[260];
diff --git a/Source/items.cpp b/Source/items.cpp
index b565ed3..d07d4d7 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -851,7 +851,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
 	v60 = 0;
 	v52 = 0;
 	v61 = 0;
-	v37 = 0i64;
+	v37 = 0;
 	v49 = 0;
 	v48 = 0;
 	v47 = 0;
@@ -878,7 +878,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
 			v40 = v3;
 			v41 = v2;
 			if ( v7 )
-				v37 |= 1i64 << ((unsigned char)v7 - 1);
+				v37 |= 1 << ((unsigned char)v7 - 1);
 			if ( !*((_BYTE *)v6 - 296) || *(v6 - 75) )
 			{
 				v57 += *(v6 - 28);
@@ -979,7 +979,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
 	plr[v5]._pISpells[0] = v37;
 	plr[v5]._pISpells[1] = HIDWORD(v37);
 	plr[v5]._pDamageMod = v15 / v16;
-	if ( v17 && !(v37 & (1i64 << (_LOBYTE(plr[v5]._pRSpell) - 1))) )
+	if ( v17 && !(v37 & (1 << (_LOBYTE(plr[v5]._pRSpell) - 1))) )
 	{
 		plr[v5]._pRSpell = -1;
 		_LOBYTE(plr[v5]._pRSplType) = 4;
@@ -1143,7 +1143,7 @@ void __fastcall CalcPlrScrolls(int p)
 		{
 			if ( *(v3 - 53) != -1 && (*v3 == IMISC_SCROLL || *v3 == IMISC_SCROLLT) && v3[34] )
 			{
-				v5 = 1i64 << (*((_BYTE *)v3 + 4) - 1);
+				v5 = 1 << (*((_BYTE *)v3 + 4) - 1);
 				plr[v1]._pScrlSpells[0] |= v5;
 				plr[v1]._pScrlSpells[1] |= HIDWORD(v5);
 			}
@@ -1158,7 +1158,7 @@ void __fastcall CalcPlrScrolls(int p)
 	{
 		if ( *(v6 - 53) != -1 && (*v6 == IMISC_SCROLL || *v6 == IMISC_SCROLLT) && v6[34] )
 		{
-			v8 = 1i64 << (*((_BYTE *)v6 + 4) - 1);
+			v8 = 1 << (*((_BYTE *)v6 + 4) - 1);
 			plr[v1]._pScrlSpells[0] |= v8;
 			plr[v1]._pScrlSpells[1] |= HIDWORD(v8);
 		}
@@ -1192,7 +1192,7 @@ void __fastcall CalcPlrStaff(int pnum)
 	plr[v1]._pISpells[1] = 0;
 	if ( !v2 && plr[v1].InvBody[4]._iStatFlag && plr[v1].InvBody[4]._iCharges > 0 )
 	{
-		v3 = 1i64 << (_LOBYTE(plr[v1].InvBody[4]._iSpell) - 1);
+		v3 = 1 << (_LOBYTE(plr[v1].InvBody[4]._iSpell) - 1);
 		plr[v1]._pISpells[0] = v3;
 		plr[v1]._pISpells[1] = HIDWORD(v3);
 	}
@@ -4668,7 +4668,7 @@ LABEL_71:
 					if ( v24 != 2 )
 						return;
 					v25 = p;
-					*(_QWORD *)plr[p]._pMemSpells |= 1i64 << ((unsigned char)spl - 1);
+					*(_QWORD *)plr[p]._pMemSpells |= 1 << ((unsigned char)spl - 1);
 					v26 = &plr[p]._pSplLvl[spl];
 					if ( *v26 < 15 )
 						++*v26;
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 9369ed0..93b0874 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -912,40 +912,40 @@ int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
 	v9 = y1;
 	v4 = x1;
 	strcpy((char *)Dirs, "c");
-	*(_QWORD *)&Dirs[0][2] = 0i64;
+	*(_QWORD *)&Dirs[0][2] = 0;
 	*(_DWORD *)&Dirs[0][10] = 0;
 	*(_WORD *)&Dirs[0][14] = 0;
-	*(_QWORD *)&Dirs[1][0] = 0x1010102i64;
-	*(_QWORD *)&Dirs[1][8] = 0i64;
-	*(_QWORD *)&Dirs[2][0] = 0x1010101010102i64;
-	*(_QWORD *)&Dirs[2][8] = 0i64;
-	*(_QWORD *)&Dirs[3][0] = 0x101010101010102i64;
-	*(_QWORD *)&Dirs[3][8] = 1i64;
-	*(_QWORD *)&Dirs[4][0] = 0x101010101010202i64;
-	*(_QWORD *)&Dirs[4][8] = 0x1010101i64;
-	*(_QWORD *)&Dirs[5][0] = 0x101010101010202i64;
-	*(_QWORD *)&Dirs[5][8] = 0x10101010101i64;
-	*(_QWORD *)&Dirs[6][0] = 0x101010101010202i64;
-	*(_QWORD *)&Dirs[6][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[7][0] = 0x101010101020202i64;
-	*(_QWORD *)&Dirs[7][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[8][0] = 0x101010101020202i64;
-	*(_QWORD *)&Dirs[8][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[9][0] = 0x101010102020202i64;
-	*(_QWORD *)&Dirs[9][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[10][0] = 0x101010102020202i64;
-	*(_QWORD *)&Dirs[10][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[11][0] = 0x101010102020202i64;
-	*(_QWORD *)&Dirs[11][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[12][0] = 0x101010202020202i64;
-	*(_QWORD *)&Dirs[12][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[13][0] = 0x101010202020202i64;
-	*(_QWORD *)&Dirs[13][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[14][0] = 0x101020202020202i64;
-	*(_QWORD *)&Dirs[14][8] = 0x101010101010101i64;
+	*(_QWORD *)&Dirs[1][0] = 0x1010102;
+	*(_QWORD *)&Dirs[1][8] = 0;
+	*(_QWORD *)&Dirs[2][0] = 0x1010101010102;
+	*(_QWORD *)&Dirs[2][8] = 0;
+	*(_QWORD *)&Dirs[3][0] = 0x101010101010102;
+	*(_QWORD *)&Dirs[3][8] = 1;
+	*(_QWORD *)&Dirs[4][0] = 0x101010101010202;
+	*(_QWORD *)&Dirs[4][8] = 0x1010101;
+	*(_QWORD *)&Dirs[5][0] = 0x101010101010202;
+	*(_QWORD *)&Dirs[5][8] = 0x10101010101;
+	*(_QWORD *)&Dirs[6][0] = 0x101010101010202;
+	*(_QWORD *)&Dirs[6][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[7][0] = 0x101010101020202;
+	*(_QWORD *)&Dirs[7][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[8][0] = 0x101010101020202;
+	*(_QWORD *)&Dirs[8][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[9][0] = 0x101010102020202;
+	*(_QWORD *)&Dirs[9][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[10][0] = 0x101010102020202;
+	*(_QWORD *)&Dirs[10][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[11][0] = 0x101010102020202;
+	*(_QWORD *)&Dirs[11][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[12][0] = 0x101010202020202;
+	*(_QWORD *)&Dirs[12][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[13][0] = 0x101010202020202;
+	*(_QWORD *)&Dirs[13][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[14][0] = 0x101020202020202;
+	*(_QWORD *)&Dirs[14][8] = 0x101010101010101;
 	lltour[1] = 0;
-	*(_QWORD *)&Dirs[15][0] = 0x101020202020202i64;
-	*(_QWORD *)&Dirs[15][8] = 0x101010101010101i64;
+	*(_QWORD *)&Dirs[15][0] = 0x101020202020202;
+	*(_QWORD *)&Dirs[15][8] = 0x101010101010101;
 	lrtoul[0] = 3;
 	lrtoul[1] = 4;
 	lrtoul[2] = 5;
@@ -1000,40 +1000,40 @@ int __fastcall GetDirection16(int x1, int y1, int x2, int y2)
 	v9 = y1;
 	v4 = x1;
 	strcpy((char *)Dirs, "c");
-	*(_QWORD *)&Dirs[0][2] = 0i64;
+	*(_QWORD *)&Dirs[0][2] = 0;
 	*(_DWORD *)&Dirs[0][10] = 0;
 	*(_WORD *)&Dirs[0][14] = 0;
-	*(_QWORD *)&Dirs[1][0] = 0x1010204i64;
-	*(_QWORD *)&Dirs[1][8] = 0i64;
-	*(_QWORD *)&Dirs[2][0] = 0x101010101020304i64;
-	*(_QWORD *)&Dirs[2][8] = 0i64;
-	*(_QWORD *)&Dirs[3][0] = 0x101010202030304i64;
-	*(_QWORD *)&Dirs[3][8] = 0x1010101i64;
-	*(_QWORD *)&Dirs[4][0] = 0x101010202030404i64;
-	*(_QWORD *)&Dirs[4][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[5][0] = 0x102020203030404i64;
-	*(_QWORD *)&Dirs[5][8] = 0x101010101010101i64;
-	*(_QWORD *)&Dirs[6][0] = 0x202020203030404i64;
-	*(_QWORD *)&Dirs[6][8] = 0x101010101010102i64;
-	*(_QWORD *)&Dirs[7][0] = 0x202030303030404i64;
-	*(_QWORD *)&Dirs[7][8] = 0x101010101010202i64;
-	*(_QWORD *)&Dirs[8][0] = 0x202030303040404i64;
-	*(_QWORD *)&Dirs[8][8] = 0x101010101020202i64;
-	*(_QWORD *)&Dirs[9][0] = 0x203030303040404i64;
-	*(_QWORD *)&Dirs[9][8] = 0x101010102020202i64;
-	*(_QWORD *)&Dirs[10][0] = 0x303030303040404i64;
-	*(_QWORD *)&Dirs[10][8] = 0x101020202020202i64;
-	*(_QWORD *)&Dirs[11][0] = 0x303030303040404i64;
-	*(_QWORD *)&Dirs[11][8] = 0x102020202020203i64;
-	*(_QWORD *)&Dirs[12][0] = 0x303030304040404i64;
-	*(_QWORD *)&Dirs[12][8] = 0x202020202020303i64;
-	*(_QWORD *)&Dirs[13][0] = 0x303030304040404i64;
-	*(_QWORD *)&Dirs[13][8] = 0x202020202020303i64;
-	*(_QWORD *)&Dirs[14][0] = 0x303030304040404i64;
-	*(_QWORD *)&Dirs[14][8] = 0x202020202030303i64;
+	*(_QWORD *)&Dirs[1][0] = 0x1010204;
+	*(_QWORD *)&Dirs[1][8] = 0;
+	*(_QWORD *)&Dirs[2][0] = 0x101010101020304;
+	*(_QWORD *)&Dirs[2][8] = 0;
+	*(_QWORD *)&Dirs[3][0] = 0x101010202030304;
+	*(_QWORD *)&Dirs[3][8] = 0x1010101;
+	*(_QWORD *)&Dirs[4][0] = 0x101010202030404;
+	*(_QWORD *)&Dirs[4][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[5][0] = 0x102020203030404;
+	*(_QWORD *)&Dirs[5][8] = 0x101010101010101;
+	*(_QWORD *)&Dirs[6][0] = 0x202020203030404;
+	*(_QWORD *)&Dirs[6][8] = 0x101010101010102;
+	*(_QWORD *)&Dirs[7][0] = 0x202030303030404;
+	*(_QWORD *)&Dirs[7][8] = 0x101010101010202;
+	*(_QWORD *)&Dirs[8][0] = 0x202030303040404;
+	*(_QWORD *)&Dirs[8][8] = 0x101010101020202;
+	*(_QWORD *)&Dirs[9][0] = 0x203030303040404;
+	*(_QWORD *)&Dirs[9][8] = 0x101010102020202;
+	*(_QWORD *)&Dirs[10][0] = 0x303030303040404;
+	*(_QWORD *)&Dirs[10][8] = 0x101020202020202;
+	*(_QWORD *)&Dirs[11][0] = 0x303030303040404;
+	*(_QWORD *)&Dirs[11][8] = 0x102020202020203;
+	*(_QWORD *)&Dirs[12][0] = 0x303030304040404;
+	*(_QWORD *)&Dirs[12][8] = 0x202020202020303;
+	*(_QWORD *)&Dirs[13][0] = 0x303030304040404;
+	*(_QWORD *)&Dirs[13][8] = 0x202020202020303;
+	*(_QWORD *)&Dirs[14][0] = 0x303030304040404;
+	*(_QWORD *)&Dirs[14][8] = 0x202020202030303;
 	lrtoul[2] = 0;
-	*(_QWORD *)&Dirs[15][0] = 0x303030304040404i64;
-	*(_QWORD *)&Dirs[15][8] = 0x202020203030303i64;
+	*(_QWORD *)&Dirs[15][0] = 0x303030304040404;
+	*(_QWORD *)&Dirs[15][8] = 0x202020203030303;
 	urtoll[0] = 6;
 	urtoll[1] = 7;
 	urtoll[2] = 8;
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 26c0bec..850dbee 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -141,105 +141,105 @@ int ObjTypeConv[113] =
 };
 ObjDataStruct AllObjects[99] =
 {
-	{ 1,  OFILE_L1BRAZ,   1,  4,  1,   255, 255, 1, 1, 26, 64,  1, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_L1DOORS,  1,  4,  1,   255, 255, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 1,  OFILE_L1DOORS,  1,  4,  1,   255, 255, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 3,  OFILE_SKULFIRE, 0,  0,  0,   3,   255, 1, 2, 11, 96,  1, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_LEVER,	1,  4,  1,   255, 255, 0, 1, 1,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_CHEST1,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_CHEST2,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_CHEST3,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 3,  OFILE_CANDLE2,  0,  0,  0,   1,   255, 1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   255, 0, 2, 0,  96,  1, 1, 1, 0, 0, 0 },
-	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   255, 0, 1, 0,  96,  1, 1, 1, 0, 0, 0 },
-	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   255, 0, 3, 0,  96,  1, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_SKULPILE, 1,  4,  0,   255, 255, 0, 0, 1,  96,  1, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_CRUXSK1,  0,  0,  0,   255, 255, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
-	{ 2,  OFILE_CRUXSK2,  0,  0,  0,   255, 255, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
-	{ 2,  OFILE_CRUXSK3,  0,  0,  0,   255, 255, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
-	{ 1,  OFILE_ROCKSTAN, 5,  5,  0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_ANGEL,	0,  0,  0,   255, 255, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
-	{ 2,  OFILE_BOOK2,	0,  0,  0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 2,  OFILE_BURNCROS, 0,  0,  0,   255, 255, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_NUDE2,	0,  0,  0,   255, 255, 1, 3, 6,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_SWITCH4,  16, 16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_TNUDEM,   13, 16, 0,   255, 6,   0, 1, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_L1BRAZ,   1,  4,  1,   -1, -1, 1, 1, 26, 64,  1, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_L1DOORS,  1,  4,  1,   -1, -1, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 1,  OFILE_L1DOORS,  1,  4,  1,   -1, -1, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 3,  OFILE_SKULFIRE, 0,  0,  0,   3,   -1, 1, 2, 11, 96,  1, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_LEVER,	1,  4,  1,   -1, -1, 0, 1, 1,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_CHEST1,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_CHEST2,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_CHEST3,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 3,  OFILE_CANDLE2,  0,  0,  0,   1,   -1, 1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   -1, 0, 2, 0,  96,  1, 1, 1, 0, 0, 0 },
+	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   -1, 0, 1, 0,  96,  1, 1, 1, 0, 0, 0 },
+	{ 3,  OFILE_BANNER,   0,  0,  0,   3,   -1, 0, 3, 0,  96,  1, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_SKULPILE, 1,  4,  0,   -1, -1, 0, 0, 1,  96,  1, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_L1BRAZ,   0,  0,  0,   -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_CRUXSK1,  0,  0,  0,   -1, -1, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
+	{ 2,  OFILE_CRUXSK2,  0,  0,  0,   -1, -1, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
+	{ 2,  OFILE_CRUXSK3,  0,  0,  0,   -1, -1, 0, 1, 15, 96,  1, 0, 1, 1, 3, 0 },
+	{ 1,  OFILE_ROCKSTAN, 5,  5,  0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_ANGEL,	0,  0,  0,   -1, -1, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
+	{ 2,  OFILE_BOOK2,	0,  0,  0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 2,  OFILE_BURNCROS, 0,  0,  0,   -1, -1, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_NUDE2,	0,  0,  0,   -1, -1, 1, 3, 6,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_SWITCH4,  16, 16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_TNUDEM,   13, 16, 0,   -1, 6,   0, 1, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEM,   13, 16, 0,   6,   6,   0, 2, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEM,   13, 16, 0,   6,   6,   0, 3, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEM,   13, 16, 0,   6,   6,   0, 4, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEW,   13, 16, 0,   6,   6,   0, 1, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEW,   13, 16, 0,   6,   6,   0, 2, 0,  128, 1, 0, 1, 0, 0, 0 },
 	{ 1,  OFILE_TNUDEW,   13, 16, 0,   6,   6,   0, 3, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_TSOUL,	13, 16, 0,   255, 6,   0, 1, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_TSOUL,	13, 16, 0,   255, 6,   0, 2, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_TSOUL,	13, 16, 0,   255, 6,   0, 3, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_TSOUL,	13, 16, 0,   255, 6,   0, 4, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_TSOUL,	13, 16, 0,   255, 6,   0, 5, 0,  128, 1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_BOOK2,	6,  6,  0,   255, 255, 0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_L2DOORS,  5,  8,  2,   255, 255, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 1,  OFILE_L2DOORS,  5,  8,  2,   255, 255, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 1,  OFILE_WTORCH4,  5,  8,  2,   255, 255, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_WTORCH3,  5,  8,  2,   255, 255, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_WTORCH1,  5,  8,  2,   255, 255, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_WTORCH2,  5,  8,  2,   255, 255, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
-	{ 1,  OFILE_SARC,	 1,  4,  1,   255, 255, 0, 1, 5,  128, 1, 1, 1, 0, 3, 1 },
-	{ 2,  OFILE_FLAME1,   1,  4,  1,   255, 255, 0, 1, 20, 96,  0, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_LEVER,	1,  4,  1,   255, 255, 0, 1, 2,  96,  1, 1, 1, 0, 1, 1 },
-	{ 2,  OFILE_MINIWATR, 1,  4,  1,   255, 255, 1, 1, 10, 64,  1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_BOOK1,	3,  4,  1,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_TRAPHOLE, 1,  16, 0,   255, 255, 0, 1, 0,  64,  0, 1, 1, 0, 0, 0 },
-	{ 1,  OFILE_TRAPHOLE, 1,  16, 0,   255, 255, 0, 2, 0,  64,  0, 1, 1, 0, 0, 0 },
-	{ 2,  OFILE_BCASE,	0,  0,  0,   255, 255, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
-	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   255, 255, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
-	{ 1,  OFILE_BARREL,   1,  16, 0,   255, 255, 0, 1, 9,  96,  1, 1, 1, 1, 3, 0 },
-	{ 1,  OFILE_BARRELEX, 1,  16, 0,   255, 255, 0, 1, 10, 96,  1, 1, 1, 1, 3, 0 },
-	{ 3,  OFILE_LSHRINEG, 0,  0,  0,   1,   255, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_RSHRINEG, 0,  0,  0,   1,   255, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_BOOK2,	0,  0,  0,   3,   255, 0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 3,  OFILE_BCASE,	0,  0,  0,   5,   255, 0, 3, 0,  96,  0, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_BCASE,	0,  0,  0,   5,   255, 0, 4, 0,  96,  0, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_BOOK2,	0,  0,  0,   5,   255, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 3,  OFILE_CANDLE2,  0,  0,  0,   5,   255, 1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
-	{ 3,  OFILE_BLOODFNT, 0,  0,  0,   7,   255, 1, 2, 10, 96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_DECAP,	13, 16, 0,   8,   255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 0 },
-	{ 1,  OFILE_CHEST1,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_CHEST2,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_CHEST3,   1,  16, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ 1,  OFILE_BOOK1,	7,  7,  2,   255, 8,   0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_BOOK1,	5,  5,  2,   255, 9,   0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_PEDISTL,  5,  5,  2,   255, 9,   0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_L3DOORS,  9,  12, 3,   255, 255, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 1,  OFILE_L3DOORS,  9,  12, 3,   255, 255, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
-	{ 3,  OFILE_PFOUNTN,  0,  0,  0,   9,   255, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
-	{ 3,  OFILE_ARMSTAND, 0,  0,  0,   10,  255, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_ARMSTAND, 0,  0,  0,   10,  255, 0, 2, 0,  96,  1, 0, 1, 0, 0, 0 },
-	{ 3,  OFILE_GOATSHRN, 0,  0,  0,   11,  255, 1, 2, 10, 96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_CAULDREN, 13, 16, 0,   255, 255, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
-	{ 3,  OFILE_MFOUNTN,  0,  0,  0,   13,  255, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
-	{ 3,  OFILE_TFOUNTN,  0,  0,  0,   14,  255, 1, 2, 4,  128, 1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_ALTBOY,   0,  0,  1,   255, 15,  0, 1, 0,  128, 1, 1, 1, 0, 0, 0 },
-	{ 1,  OFILE_MCIRL,	0,  0,  1,   255, 15,  0, 1, 0,  96,  0, 1, 1, 0, 0, 0 },
-	{ 1,  OFILE_MCIRL,	0,  0,  1,   255, 15,  0, 1, 0,  96,  0, 1, 1, 0, 0, 0 },
-	{ 1,  OFILE_BKSLBRNT, 4,  12, 0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_CANDLE2,  2,  12, 0,   255, 15,  1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
-	{ 1,  OFILE_BOOK1,	13, 13, 4,   255, 11,  0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
-	{ 1,  OFILE_ARMSTAND, 13, 13, 0,   255, 11,  0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
-	{ 2,  OFILE_WEAPSTND, 13, 13, 0,   255, 11,  0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
-	{ 2,  OFILE_BURNCROS, 0,  0,  0,   15,  255, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
-	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   16,  255, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
-	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   16,  255, 0, 2, 0,  96,  1, 0, 1, 0, 0, 0 },
-	{ 2,  OFILE_MUSHPTCH, 0,  0,  0,   255, 1,   0, 1, 0,  96,  1, 1, 1, 0, 3, 1 },
-	{ 2,  OFILE_LZSTAND,  0,  0,  0,   255, 15,  0, 1, 0,  128, 1, 0, 1, 0, 3, 0 },
-	{ 1,  OFILE_DECAP,	9,  9,  3,   255, 255, 0, 2, 0,  96,  1, 1, 1, 0, 1, 0 },
-	{ 2,  OFILE_CHEST3,   0,  0,  0,   255, 255, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
-	{ -1, 0,			  0,  0,  255, 255, 255, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 }
+	{ 1,  OFILE_TSOUL,	13, 16, 0,   -1, 6,   0, 1, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_TSOUL,	13, 16, 0,   -1, 6,   0, 2, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_TSOUL,	13, 16, 0,   -1, 6,   0, 3, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_TSOUL,	13, 16, 0,   -1, 6,   0, 4, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_TSOUL,	13, 16, 0,   -1, 6,   0, 5, 0,  128, 1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_BOOK2,	6,  6,  0,   -1, -1, 0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_L2DOORS,  5,  8,  2,   -1, -1, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 1,  OFILE_L2DOORS,  5,  8,  2,   -1, -1, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 1,  OFILE_WTORCH4,  5,  8,  2,   -1, -1, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_WTORCH3,  5,  8,  2,   -1, -1, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_WTORCH1,  5,  8,  2,   -1, -1, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_WTORCH2,  5,  8,  2,   -1, -1, 1, 1, 9,  96,  0, 1, 0, 0, 0, 0 },
+	{ 1,  OFILE_SARC,	 1,  4,  1,   -1, -1, 0, 1, 5,  128, 1, 1, 1, 0, 3, 1 },
+	{ 2,  OFILE_FLAME1,   1,  4,  1,   -1, -1, 0, 1, 20, 96,  0, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_LEVER,	1,  4,  1,   -1, -1, 0, 1, 2,  96,  1, 1, 1, 0, 1, 1 },
+	{ 2,  OFILE_MINIWATR, 1,  4,  1,   -1, -1, 1, 1, 10, 64,  1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_BOOK1,	3,  4,  1,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_TRAPHOLE, 1,  16, 0,   -1, -1, 0, 1, 0,  64,  0, 1, 1, 0, 0, 0 },
+	{ 1,  OFILE_TRAPHOLE, 1,  16, 0,   -1, -1, 0, 2, 0,  64,  0, 1, 1, 0, 0, 0 },
+	{ 2,  OFILE_BCASE,	0,  0,  0,   -1, -1, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
+	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   -1, -1, 0, 1, 0,  96,  1, 0, 1, 0, 0, 0 },
+	{ 1,  OFILE_BARREL,   1,  16, 0,   -1, -1, 0, 1, 9,  96,  1, 1, 1, 1, 3, 0 },
+	{ 1,  OFILE_BARRELEX, 1,  16, 0,   -1, -1, 0, 1, 10, 96,  1, 1, 1, 1, 3, 0 },
+	{ 3,  OFILE_LSHRINEG, 0,  0,  0,   1,   -1, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_RSHRINEG, 0,  0,  0,   1,   -1, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_BOOK2,	0,  0,  0,   3,   -1, 0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 3,  OFILE_BCASE,	0,  0,  0,   5,   -1, 0, 3, 0,  96,  0, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_BCASE,	0,  0,  0,   5,   -1, 0, 4, 0,  96,  0, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_BOOK2,	0,  0,  0,   5,   -1, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 3,  OFILE_CANDLE2,  0,  0,  0,   5,   -1, 1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
+	{ 3,  OFILE_BLOODFNT, 0,  0,  0,   7,   -1, 1, 2, 10, 96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_DECAP,	13, 16, 0,   8,   -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 0 },
+	{ 1,  OFILE_CHEST1,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_CHEST2,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_CHEST3,   1,  16, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ 1,  OFILE_BOOK1,	7,  7,  2,   -1, 8,   0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_BOOK1,	5,  5,  2,   -1, 9,   0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_PEDISTL,  5,  5,  2,   -1, 9,   0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_L3DOORS,  9,  12, 3,   -1, -1, 0, 1, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 1,  OFILE_L3DOORS,  9,  12, 3,   -1, -1, 0, 2, 0,  64,  0, 0, 1, 0, 3, 1 },
+	{ 3,  OFILE_PFOUNTN,  0,  0,  0,   9,   -1, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
+	{ 3,  OFILE_ARMSTAND, 0,  0,  0,   10,  -1, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_ARMSTAND, 0,  0,  0,   10,  -1, 0, 2, 0,  96,  1, 0, 1, 0, 0, 0 },
+	{ 3,  OFILE_GOATSHRN, 0,  0,  0,   11,  -1, 1, 2, 10, 96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_CAULDREN, 13, 16, 0,   -1, -1, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
+	{ 3,  OFILE_MFOUNTN,  0,  0,  0,   13,  -1, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
+	{ 3,  OFILE_TFOUNTN,  0,  0,  0,   14,  -1, 1, 2, 4,  128, 1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_ALTBOY,   0,  0,  1,   -1, 15,  0, 1, 0,  128, 1, 1, 1, 0, 0, 0 },
+	{ 1,  OFILE_MCIRL,	0,  0,  1,   -1, 15,  0, 1, 0,  96,  0, 1, 1, 0, 0, 0 },
+	{ 1,  OFILE_MCIRL,	0,  0,  1,   -1, 15,  0, 1, 0,  96,  0, 1, 1, 0, 0, 0 },
+	{ 1,  OFILE_BKSLBRNT, 4,  12, 0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_CANDLE2,  2,  12, 0,   -1, 15,  1, 2, 4,  96,  1, 1, 1, 0, 0, 0 },
+	{ 1,  OFILE_BOOK1,	13, 13, 4,   -1, 11,  0, 4, 0,  96,  1, 1, 1, 0, 3, 0 },
+	{ 1,  OFILE_ARMSTAND, 13, 13, 0,   -1, 11,  0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
+	{ 2,  OFILE_WEAPSTND, 13, 13, 0,   -1, 11,  0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
+	{ 2,  OFILE_BURNCROS, 0,  0,  0,   15,  -1, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
+	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   16,  -1, 0, 1, 0,  96,  1, 0, 1, 0, 3, 0 },
+	{ 2,  OFILE_WEAPSTND, 0,  0,  0,   16,  -1, 0, 2, 0,  96,  1, 0, 1, 0, 0, 0 },
+	{ 2,  OFILE_MUSHPTCH, 0,  0,  0,   -1, 1,   0, 1, 0,  96,  1, 1, 1, 0, 3, 1 },
+	{ 2,  OFILE_LZSTAND,  0,  0,  0,   -1, 15,  0, 1, 0,  128, 1, 0, 1, 0, 3, 0 },
+	{ 1,  OFILE_DECAP,	9,  9,  3,   -1, -1, 0, 2, 0,  96,  1, 1, 1, 0, 1, 0 },
+	{ 2,  OFILE_CHEST3,   0,  0,  0,   -1, -1, 0, 1, 0,  96,  1, 1, 1, 0, 1, 1 },
+	{ -1, 0,			  0,  0,  -1, -1, -1, 0, 0, 0,  0,   0, 0, 0, 0, 0, 0 }
 };
 char *ObjMasterLoadList[56] =
 {
@@ -5456,7 +5456,7 @@ LABEL_47:
 						v60 = random(v7, 37);
 						v7 = v60;
 					}
-					while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)(1i64 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)(1i64 << v60)) );
+					while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)(1 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)(1 << v60)) );
 					v61 = &plr[v53]._pSplLvl[v60 + 1];
 					if ( *v61 < 2 )
 						*v61 = 0;
diff --git a/Source/player.cpp b/Source/player.cpp
index 3379ace..edb576a 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -3938,14 +3938,14 @@ int __fastcall PM_DoSpell(int pnum)
 		if ( !plr[v2]._pSplFrom )
 		{
 			if ( _LOBYTE(plr[v2]._pRSplType) == 2
-			  && !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
+			  && !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
 			{
 				plr[v2]._pRSpell = -1;
 				_LOBYTE(plr[v2]._pRSplType) = 4;
 				drawpanflag = 255;
 			}
 			if ( _LOBYTE(plr[v2]._pRSplType) == 3
-			  && !(plr[v2]._pISpells[1] & ((unsigned __int64)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
+			  && !(plr[v2]._pISpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
 			{
 				plr[v2]._pRSpell = -1;
 				_LOBYTE(plr[v2]._pRSplType) = 4;
@@ -4663,7 +4663,7 @@ void __cdecl ValidatePlayer()
 	__int64 v14; // [esp+Ch] [ebp-8h]
 
 	v0 = 0;
-	v14 = 0i64;
+	v14 = 0;
 	if ( (unsigned int)myplr >= 4 )
 		TermMsg("ValidatePlayer: illegal player %d", myplr);
 	v1 = myplr;
@@ -4711,7 +4711,7 @@ void __cdecl ValidatePlayer()
 	{
 		if ( *v11 != -1 )
 		{
-			v14 |= 1i64 << ((unsigned char)v12 - 1);
+			v14 |= 1 << ((unsigned char)v12 - 1);
 			v13 = &plr[v1]._pSplLvl[v12];
 			if ( *v13 > 15 )
 				*v13 = 15;
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 621872b..9e15b39 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -27,21 +27,21 @@ int ReturnLvl; // idb
 
 QuestData questlist[16] =
 {
-  { 5, 255, DTYPE_NONE, 0, 100, 0, 0, QUEST_INFRA5, "The Magic Rock" },
-  { 9, 255, DTYPE_NONE, 1, 100, 0, 0, QUEST_MUSH8, "Black Mushroom" },
-  { 4, 255, DTYPE_NONE, 2, 100, 0, 0, QUEST_GARBUD1, "Gharbad The Weak" },
-  { 8, 255, DTYPE_NONE, 3, 100, 0, 0, QUEST_ZHAR1, "Zhar the Mad" },
-  { 14, 255, DTYPE_NONE, 4, 100, 0, 0, QUEST_VEIL9, "Lachdanan" },
-  { 15, 255, DTYPE_NONE, 5, 100, 0, 1, QUEST_VILE3, "Diablo" },
+  { 5, -1, DTYPE_NONE, 0, 100, 0, 0, QUEST_INFRA5, "The Magic Rock" },
+  { 9, -1, DTYPE_NONE, 1, 100, 0, 0, QUEST_MUSH8, "Black Mushroom" },
+  { 4, -1, DTYPE_NONE, 2, 100, 0, 0, QUEST_GARBUD1, "Gharbad The Weak" },
+  { 8, -1, DTYPE_NONE, 3, 100, 0, 0, QUEST_ZHAR1, "Zhar the Mad" },
+  { 14, -1, DTYPE_NONE, 4, 100, 0, 0, QUEST_VEIL9, "Lachdanan" },
+  { 15, -1, DTYPE_NONE, 5, 100, 0, 1, QUEST_VILE3, "Diablo" },
   { 2, 2, DTYPE_NONE, 6, 100, 0, 1, QUEST_BUTCH9, "The Butcher" },
-  { 4, 255, DTYPE_NONE, 7, 100, 0, 0, QUEST_BANNER2, "Ogden's Sign" },
-  { 7, 255, DTYPE_NONE, 8, 100, 0, 0, QUEST_BLINDING, "Halls of the Blind" },
-  { 5, 255, DTYPE_NONE, 9, 100, 0, 0, QUEST_BLOODY, "Valor" },
-  { 10, 255, DTYPE_NONE, 10, 100, 0, 0, QUEST_ANVIL5, "Anvil of Fury" },
-  { 13, 255, DTYPE_NONE, 11, 100, 0, 0, QUEST_BLOODWAR, "Warlord of Blood" },
+  { 4, -1, DTYPE_NONE, 7, 100, 0, 0, QUEST_BANNER2, "Ogden's Sign" },
+  { 7, -1, DTYPE_NONE, 8, 100, 0, 0, QUEST_BLINDING, "Halls of the Blind" },
+  { 5, -1, DTYPE_NONE, 9, 100, 0, 0, QUEST_BLOODY, "Valor" },
+  { 10, -1, DTYPE_NONE, 10, 100, 0, 0, QUEST_ANVIL5, "Anvil of Fury" },
+  { 13, -1, DTYPE_NONE, 11, 100, 0, 0, QUEST_BLOODWAR, "Warlord of Blood" },
   { 3, 3, DTYPE_CATHEDRAL, 12, 100, 1, 1, QUEST_KING2, "The Curse of King Leoric" },
-  { 2, 255, DTYPE_CAVES, 13, 100, 4, 0, QUEST_POISON3, "Poisoned Water Supply" },
-  { 6, 255, DTYPE_CATACOMBS, 14, 100, 2, 0, QUEST_BONER, "The Chamber of Bone" },
+  { 2, -1, DTYPE_CAVES, 13, 100, 4, 0, QUEST_POISON3, "Poisoned Water Supply" },
+  { 6, -1, DTYPE_CATACOMBS, 14, 100, 2, 0, QUEST_BONER, "The Chamber of Bone" },
   { 15, 15, DTYPE_CATHEDRAL, 15, 100, 5, 1, QUEST_VILE1, "Archbishop Lazarus" }
 };
 char questxoff[7] = { 0, -1, 0, -1, -2, -1, -2 };
diff --git a/Source/sound.cpp b/Source/sound.cpp
index afebefc..d8d30f1 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -38,7 +38,7 @@ char *sgszMusicTracks[6] =
   "Music\\DLvlD.wav",
   "Music\\Dintro.wav"
 };
-RECT8 QSRect[2] = { { { 15u, 240u }, { 15u, 240u } }, { { 30u, 225u }, { 30u, 225u } } }; /* psx version? */
+RECT8 QSRect[2] = { { { 15, -16 }, { 15, -16 } }, { { 30, -31 }, { 30, -31 } } }; /* psx version? */
 
 //----- (00456CC0) --------------------------------------------------------
 struct sound_cpp_init
diff --git a/Source/world.cpp b/Source/world.cpp
index 2fa0413..a8014a0 100644
--- a/Source/world.cpp
+++ b/Source/world.cpp
@@ -15,7 +15,7 @@ int world_4B325C = 0; // truncated with & 1, some kind of bool??
 unsigned char world_4B3260[5] = { 0u, 0u, 0u, 0u, 0u }; // single mask, int nTileMask
 int world_4B3265 = 0; // speed cel num
 int world_4B3269[5] = { 0, 0, 0, 0, 0 }; // seems to be a single pointer, void *pTileMask
-int tile_draw_masks[3][32] =
+unsigned int tile_draw_masks[3][32] =
 {
 	{
 		0xEAAAAAAA, 0xF5555555, 0xFEAAAAAA, 0xFF555555, 0xFFEAAAAA, 0xFFF55555, 0xFFFEAAAA, 0xFFFF5555,
diff --git a/Source/world.h b/Source/world.h
index 0cdfe7a..8b9b450 100644
--- a/Source/world.h
+++ b/Source/world.h
@@ -23,7 +23,7 @@ extern int world_4B325C;
 extern unsigned char world_4B3260[5];
 extern int world_4B3265;
 extern int world_4B3269[5];
-extern int tile_draw_masks[3][32];
+extern unsigned int tile_draw_masks[3][32];
 extern int world_4B33FD[48];
 extern int world_4B34BD[17];
 extern int world_4B3501[17];
diff --git a/enums.h b/enums.h
index dbf78eb..f27c1ea 100644
--- a/enums.h
+++ b/enums.h
@@ -69,7 +69,7 @@ enum unique_base_item
 	UITYPE_GRISWOLD = 0x42,
 	UITYPE_LGTFORGE = 0x43,
 	UITYPE_LAZSTAFF = 0x44,
-	UITYPE_INVALID = 0xFF,
+	UITYPE_INVALID = -1,
 };
 
 enum item_effect_type
@@ -145,7 +145,7 @@ enum item_effect_type
 	IPL_ADDMANAAC = 0x4D,
 	IPL_FIRERESCLVL = 0x4E,
 	IPL_AC_CURSE = 0x4F,
-	IPL_INVALID = 0xFF,
+	IPL_INVALID = -1,
 };
 
 enum affix_item_type
@@ -1031,7 +1031,7 @@ enum item_equip_type
 	ILOC_AMULET = 0x6,
 	ILOC_UNEQUIPABLE = 0x7,
 	ILOC_BELT = 0x8,
-	ILOC_INVALID = 0xFF,
+	ILOC_INVALID = -1,
 };
 
 enum missile_id
diff --git a/structs.h b/structs.h
index f525609..bacd6ec 100644
--- a/structs.h
+++ b/structs.h
@@ -76,7 +76,7 @@ struct TSFX
 
 struct TMenuItem
 {
-	int dwFlags;
+	unsigned int dwFlags;
 	char *pszStr;
 	void (__cdecl *fnMenu)(); /* fix, should have one arg */
 };
@@ -248,8 +248,8 @@ struct SpellData
 
 struct Coord
 {
-	unsigned char x;
-	unsigned char y;
+	char x;
+	char y;
 };
 
 struct RECT8
@@ -813,7 +813,7 @@ struct PlayerStruct
 	char _pSBkSplType;
 	char _pSplLvl[64];
 	int remove_1;
-	int _pMemSpells[2]; // __declspec(align(8)) 
+	int _pMemSpells[2]; // __declspec(align(8))
 	int _pAblSpells[2];
 	int _pScrlSpells[2];
 	int _pSpellFlags;
@@ -909,7 +909,7 @@ struct PlayerStruct
 	int _pIBonusAC;
 	int _pIBonusDamMod;
 	int remove_2;
-	int _pISpells[2]; //__declspec(align(8)) 
+	int _pISpells[2]; //__declspec(align(8))
 	int _pIFlags;
 	int _pIGetHit;
 	char _pISplLvlAdd;
diff --git a/types.h b/types.h
index e9ca419..6608a2a 100644
--- a/types.h
+++ b/types.h
@@ -32,7 +32,7 @@
 #include "enums.h"
 #include "structs.h"
 
-#include "DiabloUI/_diabloui.h"
+#include "DiabloUI/_DiabloUI.h"
 #include "3rdParty/Storm/Source/_storm.h"
 #include "3rdParty/PKWare/pkware.h"