diff --git a/Source/automap.cpp b/Source/automap.cpp
index e85f8e83a..4253862ad 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -5,9 +5,9 @@
 USHORT automaptype[512];
 static int MapX;
 static int MapY;
-bool automapflag; // idb
+BOOL automapflag; // idb
 char AMbyte_4B7E4C[32];
-char automapview[DMAXX][DMAXY];
+unsigned char automapview[DMAXX][DMAXY];
 int AutoMapScale; // idb
 int AutoMapXOfs; // weak
 int AutoMapYOfs; // weak
diff --git a/Source/automap.h b/Source/automap.h
index b08dc74ad..c7462e363 100644
--- a/Source/automap.h
+++ b/Source/automap.h
@@ -3,9 +3,9 @@
 #define __AUTOMAP_H__
 
 extern USHORT automaptype[512];
-extern bool automapflag; // idb
+extern BOOL automapflag; // idb
 extern char AMbyte_4B7E4C[32];
-extern char automapview[DMAXX][DMAXY];
+extern unsigned char automapview[DMAXX][DMAXY];
 extern int AutoMapScale; // idb
 extern int AutoMapXOfs; // weak
 extern int AutoMapYOfs; // weak
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 35aeb896d..2b6707242 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -2,386 +2,179 @@
 
 #include "../types.h"
 
-void *tbuff;
+unsigned char *tbuff;
 
 void __fastcall LoadGame(BOOL firstflag)
 {
-	int v1; // esi
-	int v2; // edi
-	int v5; // ebx
-	int v6; // eax
-	int v7; // eax
-	int v8; // ecx
-	bool v9; // sf
-	unsigned char v10; // of
-	int *v11; // esi
-	int *v12; // esi
-	int i; // esi
-	int *v14; // esi
-	int *v15; // esi
-	int j; // esi
-	int *v17; // esi
-	int *v18; // esi
-	int k; // esi
-	int l; // esi
-	signed int v21; // esi
-	int m; // esi
-	int v23; // esi
-	int *v24; // esi
-	int *v25; // esi
-	int n; // esi
-	int *v27; // esi
-	char *v29; // edi
-	char *v30; // edi
-	char *v31; // edi
-	char *v32; // edi
-	int (*v33)[112]; // ebx
-	_DWORD *v34; // edi
-	char *v35; // edi
-	char *v36; // edi
-	char *v37; // edi
-	char *v38; // edi
-	signed int v39; // ebx
-	bool *v40; // edi
-	char *v41; // edi
-	int v42; // esi
-	char dst[260]; // [esp+0h] [ebp-120h]
-	int len; // [esp+104h] [ebp-1Ch]
-	int v46; // [esp+108h] [ebp-18h]
-	int v47; // [esp+10Ch] [ebp-14h]
-	void *ptr; // [esp+110h] [ebp-10h]
-	int v49; // [esp+114h] [ebp-Ch]
-	int from_save; // [esp+118h] [ebp-8h]
-	int quest_num; // [esp+11Ch] [ebp-4h]
+	int i, j;
+	int dwLen;
+	char szName[MAX_PATH];
+	int v1;
+	int v2;
+	int v3;
+	int v42;
+	int v43;
+	int v45;
 
 	FreeGameMem();
 	pfile_remove_temp_files();
-	pfile_get_game_name(dst);
-	ptr = pfile_read(dst, &len);
-	tbuff = ptr;
-	if ( ILoad_2() != 'RETL' )
+	pfile_get_game_name(szName);
+	unsigned char *LoadBuff = (unsigned char *)pfile_read(szName, &dwLen);
+	tbuff = LoadBuff;
+
+	if(ILoad() != 'RETL')
 		TermMsg("Invalid save file");
+
 	setlevel = OLoad();
-	setlvlnum = ILoad();
-	currlevel = ILoad();
-	leveltype = ILoad();
-	v1 = ILoad();
-	v2 = ILoad();
+	setlvlnum = WLoad();
+	currlevel = WLoad();
+	leveltype = WLoad();
+	v1 = WLoad();
+	v2 = WLoad();
 	invflag = OLoad();
 	chrflag = OLoad();
-	v5 = ILoad();
-	v47 = ILoad();
-	v49 = ILoad();
-	v6 = ILoad();
-	quest_num = 0;
-	v46 = v6;
-	do
-	{
-		*(int *)((char *)glSeedTbl + quest_num) = ILoad_2();
-		v7 = ILoad();
-		v8 = quest_num;
-		quest_num += 4;
-		v10 = __OFSUB__(quest_num, 68);
-		v9 = quest_num - 68 < 0;
-		*(int *)((char *)gnLevelTypeTbl + v8) = v7;
+	v3 = WLoad();
+	v43 = WLoad();
+	v45 = WLoad();
+	v42 = WLoad();
+
+	for(i = 0; i < NUMLEVELS; i++) {
+		glSeedTbl[i] = ILoad();
+		gnLevelTypeTbl[i] = WLoad();
 	}
-	while ( v9 ^ v10 );
+
 	LoadPlayer(myplr);
-	quest_num = 0;
-	do
-		LoadQuest(quest_num++);
-	while ( quest_num < MAXQUESTS );
-	quest_num = 0;
-	do
-		LoadPortal(quest_num++);
-	while ( quest_num < MAXPORTAL );
+
+	for(i = 0; i < MAXQUESTS; i++)
+		LoadQuest(i);
+	for(i = 0; i < MAXPORTAL; i++)
+		LoadPortal(i);
+
 	LoadGameLevel(firstflag, 4);
 	SyncInitPlr(myplr);
 	SyncPlrAnim(myplr);
+
 	ViewX = v1;
-	numitems = v47;
-	nummissiles = v49;
 	ViewY = v2;
-	nummonsters = v5;
-	nobjects = v46;
-	v11 = monstkills;
-	do
-	{
-		*v11 = ILoad_2();
-		++v11;
-	}
-	while ( (signed int)v11 < (signed int)&monstkills[MAXMONSTERS] );
-	if ( leveltype )
-	{
-		v12 = monstactive;
-		do
-		{
-			*v12 = ILoad();
-			++v12;
-		}
-		while ( (signed int)v12 < (signed int)&monstactive[MAXMONSTERS] );
-		for ( i = 0; i < nummonsters; ++i )
+	nummonsters = v3;
+	numitems = v43;
+	nummissiles = v45;
+	nobjects = v42;
+
+	for(i = 0; i < MAXMONSTERS; i++)
+		monstkills[i] = ILoad();
+
+	if(leveltype) {
+		for(i = 0; i < MAXMONSTERS; i++)
+			monstactive[i] = WLoad();
+		for(i = 0; i < nummonsters; i++)
 			LoadMonster(monstactive[i]);
-		v14 = missileactive;
-		do
-		{
-			*v14 = BLoad();
-			++v14;
-		}
-		while ( (signed int)v14 < (signed int)&missileactive[MAXMISSILES] );
-		v15 = missileavail;
-		do
-		{
-			*v15 = BLoad();
-			++v15;
-		}
-		while ( (signed int)v15 < (signed int)&missileavail[MAXMISSILES] );
-		for ( j = 0; j < nummissiles; ++j )
-			LoadMissile(missileactive[j]);
-		v17 = objectactive;
-		do
-		{
-			*v17 = BLoad();
-			++v17;
-		}
-		while ( (signed int)v17 < (signed int)&objectactive[MAXOBJECTS] );
-		v18 = objectavail;
-		do
-		{
-			*v18 = BLoad();
-			++v18;
-		}
-		while ( (signed int)v18 < (signed int)&objectavail[MAXOBJECTS] );
-		for ( k = 0; k < nobjects; ++k )
-			LoadObject(objectactive[k]);
-		for ( l = 0; l < nobjects; ++l )
-			SyncObjectAnim(objectactive[l]);
-		numlights = ILoad();
-		v21 = 0;
-		do
-			lightactive[v21++] = BLoad();
-		while ( v21 < 32 );
-		for ( m = 0; m < numlights; ++m )
-			LoadLighting((unsigned char)lightactive[m]);
-		visionid = ILoad();
-		v23 = 0;
-		numvision = ILoad();
-		if ( numvision > 0 )
-		{
-			do
-				LoadVision(v23++);
-			while ( v23 < numvision );
-		}
-	}
-	v24 = itemactive;
-	do
-	{
-		*v24 = BLoad();
-		++v24;
-	}
-	while ( (signed int)v24 < (signed int)&itemactive[MAXITEMS] );
-	v25 = itemavail;
-	do
-	{
-		*v25 = BLoad();
-		++v25;
-	}
-	while ( (signed int)v25 < (signed int)&itemavail[MAXITEMS] );
-	for ( n = 0; n < numitems; ++n )
-		LoadItem(itemactive[n]);
-	v27 = UniqueItemFlag;
-	do
-	{
-		*v27 = OLoad();
-		++v27;
+		for(i = 0; i < MAXMISSILES; i++)
+			missileactive[i] = BLoad();
+		for(i = 0; i < MAXMISSILES; i++)
+			missileavail[i] = BLoad();
+		for(i = 0; i < nummissiles; i++)
+			LoadMissile(missileactive[i]);
+		for(i = 0; i < MAXOBJECTS; i++)
+			objectactive[i] = BLoad();
+		for(i = 0; i < MAXOBJECTS; i++)
+			objectavail[i] = BLoad();
+		for(i = 0; i < nobjects; i++)
+			LoadObject(objectactive[i]);
+		for(i = 0; i < nobjects; i++)
+			SyncObjectAnim(objectactive[i]);
+
+		numlights = WLoad();
+
+		for(i = 0; i < 32; i++)
+			lightactive[i] = BLoad();
+		for(i = 0; i < numlights; i++)
+			LoadLighting((unsigned char)lightactive[i]);
+
+		visionid = WLoad();
+		numvision = WLoad();
+
+		for(i = 0; i < numvision; i++)
+			LoadVision(i);
 	}
-	while ( (signed int)v27 < (signed int)&UniqueItemFlag[128] );
-	quest_num = 0;
-	do
-	{
-		from_save = 112;
-		v29 = (char *)dTransVal + quest_num;
-		do
-		{
-			*v29 = BLoad();
-			v29 += 112;
-			--from_save;
-		}
-		while ( from_save );
-		++quest_num;
+
+	for(i = 0; i < MAXITEMS; i++)
+		itemactive[i] = BLoad();
+	for(i = 0; i < MAXITEMS; i++)
+		itemavail[i] = BLoad();
+	for(i = 0; i < numitems; i++)
+		LoadItem(itemactive[i]);
+	for(i = 0; i < 128; i++)
+		UniqueItemFlag[i] = OLoad();
+
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dTransVal[i][j] = BLoad();
 	}
-	while ( quest_num < 112 );
-	quest_num = 0;
-	do
-	{
-		from_save = 112;
-		v30 = (char *)dFlags + quest_num;
-		do
-		{
-			*v30 = BLoad();
-			v30 += 112;
-			--from_save;
-		}
-		while ( from_save );
-		++quest_num;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dFlags[i][j] = BLoad();
 	}
-	while ( quest_num < 112 );
-	quest_num = 0;
-	do
-	{
-		from_save = 112;
-		v31 = (char *)dPlayer + quest_num;
-		do
-		{
-			*v31 = BLoad();
-			v31 += 112;
-			--from_save;
-		}
-		while ( from_save );
-		++quest_num;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dPlayer[i][j] = BLoad();
 	}
-	while ( quest_num < 112 );
-	quest_num = 0;
-	do
-	{
-		from_save = 112;
-		v32 = (char *)dItem + quest_num;
-		do
-		{
-			*v32 = BLoad();
-			v32 += 112;
-			--from_save;
-		}
-		while ( from_save );
-		++quest_num;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dItem[i][j] = BLoad();
 	}
-	while ( quest_num < 112 );
-	if ( leveltype )
-	{
-		v33 = dMonster;
-		do
-		{
-			v34 = (unsigned int *)v33;
-			from_save = 112;
-			do
-			{
-				*v34 = ILoad();
-				v34 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			v33 = (int (*)[112])((char *)v33 + 4);
+
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dMonster[i][j] = WLoad();
 		}
-		while ( (signed int)v33 < (signed int)dMonster[1] );
-		quest_num = 0;
-		do
-		{
-			from_save = 112;
-			v35 = (char *)dDead + quest_num;
-			do
-			{
-				*v35 = BLoad();
-				v35 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			++quest_num;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dDead[i][j] = BLoad();
 		}
-		while ( quest_num < 112 );
-		quest_num = 0;
-		do
-		{
-			from_save = 112;
-			v36 = (char *)dObject + quest_num;
-			do
-			{
-				*v36 = BLoad();
-				v36 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			++quest_num;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dObject[i][j] = BLoad();
 		}
-		while ( quest_num < 112 );
-		quest_num = 0;
-		do
-		{
-			from_save = 112;
-			v37 = (char *)dTransVal + quest_num;
-			do
-			{
-				*v37 = BLoad();
-				v37 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			++quest_num;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dTransVal[i][j] = BLoad();
 		}
-		while ( quest_num < 112 );
-		quest_num = 0;
-		do
-		{
-			from_save = 112;
-			v38 = (char *)dTransVal2 + quest_num;
-			do
-			{
-				*v38 = BLoad();
-				v38 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			++quest_num;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dTransVal2[i][j] = BLoad();
 		}
-		while ( quest_num < 112 );
-		v39 = 0;
-		do
-		{
-			v40 = (bool *)automapview + v39;
-			from_save = 40;
-			do
-			{
-				*v40 = OLoad();
-				v40 += 40;
-				--from_save;
-			}
-			while ( from_save );
-			++v39;
+		for(j = 0; j < DMAXY; j++) {
+			for(i = 0; i < DMAXX; i++)
+				automapview[i][j] = OLoad();
 		}
-		while ( v39 < 40 );
-		quest_num = 0;
-		do
-		{
-			from_save = 112;
-			v41 = (char *)dMissile + quest_num;
-			do
-			{
-				*v41 = BLoad();
-				v41 += 112;
-				--from_save;
-			}
-			while ( from_save );
-			++quest_num;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dMissile[i][j] = BLoad();
 		}
-		while ( quest_num < 112 );
 	}
-	numpremium = ILoad();
-	premiumlevel = ILoad();
-	v42 = 0;
-	do
-		LoadPremium(v42++);
-	while ( v42 < 6 );
+
+	numpremium = WLoad();
+	premiumlevel = WLoad();
+
+	for(i = 0; i < 6; i++)
+		LoadPremium(i);
+
 	automapflag = OLoad();
-	AutoMapScale = ILoad();
-	mem_free_dbg(ptr);
+	AutoMapScale = WLoad();
+	mem_free_dbg(LoadBuff);
 	AutomapZoomReset();
 	ResyncQuests();
-	if ( leveltype )
+
+	if(leveltype)
 		ProcessLightList();
+
 	RedoPlayerVision();
 	ProcessVisionList();
 	missiles_process_charge();
 	ResetPal();
-	SetCursor(CURSOR_HAND);
+	SetCursor(1);
 	gbProcessPlayers = 1;
 }
 // 5256A0: using guessed type int gbProcessPlayers;
@@ -391,487 +184,242 @@ void __fastcall LoadGame(BOOL firstflag)
 
 char __cdecl BLoad()
 {
-	char result; // al
-
-	result = *(_BYTE *)tbuff;
-	tbuff = (char *)tbuff + 1;
-	return result;
+	return *tbuff++;
 }
 
-int __cdecl ILoad()
+int __cdecl WLoad()
 {
-	int v0; // eax
-	int v1; // eax
-	unsigned short v2; // dx
-	int result; // eax
-
-	v0 = *(unsigned char *)tbuff << 24;
-	tbuff = (char *)tbuff + 1;
-	v1 = (*(unsigned char *)tbuff << 16) | v0;
-	_LOBYTE(v2) = 0;
-	tbuff = (char *)tbuff + 1;
-	_HIBYTE(v2) = *(_BYTE *)tbuff;
-	tbuff = (char *)tbuff + 1;
-	result = *(unsigned char *)tbuff | v2 | v1;
-	tbuff = (char *)tbuff + 1;
-	return result;
+	int rv = *tbuff++ << 24;
+	rv |= *tbuff++ << 16;
+	rv |= *tbuff++ << 8;
+	rv |= *tbuff++;
+
+	return rv;
 }
 
-int __cdecl ILoad_2()
+int __cdecl ILoad()
 {
-	int v0; // eax
-	int v1; // eax
-	unsigned short v2; // dx
-	int result; // eax
-
-	v0 = *(unsigned char *)tbuff << 24;
-	tbuff = (char *)tbuff + 1;
-	v1 = (*(unsigned char *)tbuff << 16) | v0;
-	_LOBYTE(v2) = 0;
-	tbuff = (char *)tbuff + 1;
-	_HIBYTE(v2) = *(_BYTE *)tbuff;
-	tbuff = (char *)tbuff + 1;
-	result = *(unsigned char *)tbuff | v2 | v1;
-	tbuff = (char *)tbuff + 1;
-	return result;
+	int rv = *tbuff++ << 24;
+	rv |= *tbuff++ << 16;
+	rv |= *tbuff++ << 8;
+	rv |= *tbuff++;
+
+	return rv;
 }
 
-bool __cdecl OLoad()
+BOOL __cdecl OLoad()
 {
-	char v0; // cl
-	bool result; // al
-
-	v0 = *(_BYTE *)tbuff;
-	tbuff = (char *)tbuff + 1;
-	result = 1;
-	if ( v0 != 1 )
-		result = 0;
-	return result;
+	if(*tbuff++ == TRUE)
+		return TRUE;
+	else
+		return FALSE;
 }
 
 void __fastcall LoadPlayer(int i)
 {
-	memcpy(&plr[i], tbuff, 0x54B0u);
-	tbuff = (char *)tbuff + 21680;
+	memcpy(&plr[i], tbuff, sizeof(*plr) - (10 * sizeof(void *)));
+	tbuff += sizeof(*plr) - (10 * sizeof(void *)); // omit last 10 pointers
 }
 
 void __fastcall LoadMonster(int i)
 {
-	int v1; // edi
-
-	v1 = i;
-	memcpy(&monster[i], tbuff, 0xD8u);
-	tbuff = (char *)tbuff + 216;
-	SyncMonsterAnim(v1);
+	memcpy(&monster[i], tbuff, sizeof(*monster) - (3 * sizeof(void *)));
+	tbuff += sizeof(*monster) - (3 * sizeof(void *)); // omit last 3 pointers
+	SyncMonsterAnim(i);
 }
 
 void __fastcall LoadMissile(int i)
 {
-	memcpy(&missile[i], tbuff, 0xB0u);
-	tbuff = (char *)tbuff + 176;
+	memcpy(&missile[i], tbuff, sizeof(*missile));
+	tbuff += sizeof(*missile);
 }
 
 void __fastcall LoadObject(int i)
 {
-	memcpy(&object[i], tbuff, 0x78u);
-	tbuff = (char *)tbuff + 120;
+	memcpy(&object[i], tbuff, sizeof(*object));
+	tbuff += sizeof(*object);
 }
 
 void __fastcall LoadItem(int i)
 {
-	int v1; // edi
-
-	v1 = i;
-	memcpy(&item[i], tbuff, 0x170u);
-	tbuff = (char *)tbuff + 368;
-	GetItemFrm(v1);
+	memcpy(&item[i], tbuff, sizeof(*item));
+	tbuff += sizeof(*item);
+	GetItemFrm(i);
 }
 
 void __fastcall LoadPremium(int i)
 {
-	memcpy(&premiumitem[i], tbuff, 0x170u);
-	tbuff = (char *)tbuff + 368;
+	memcpy(&premiumitem[i], tbuff, sizeof(*premiumitem));
+	tbuff += sizeof(*premiumitem);
 }
 
 void __fastcall LoadQuest(int i)
 {
-	memcpy(&quests[i], tbuff, 0x18u);
-	tbuff = (char *)tbuff + 24;
-	ReturnLvlX = ILoad();
-	ReturnLvlY = ILoad();
-	ReturnLvl = ILoad();
-	ReturnLvlT = ILoad();
-	DoomQuestState = ILoad();
+	memcpy(&quests[i], tbuff, sizeof(*quests));
+	tbuff += sizeof(*quests);
+	ReturnLvlX = WLoad();
+	ReturnLvlY = WLoad();
+	ReturnLvl = WLoad();
+	ReturnLvlT = WLoad();
+	DoomQuestState = WLoad();
 }
 
 void __fastcall LoadLighting(int i)
 {
-	memcpy(&LightList[i], tbuff, 0x34u);
-	tbuff = (char *)tbuff + 52;
+	memcpy(&LightList[i], tbuff, sizeof(*LightList));
+	tbuff += sizeof(*LightList);
 }
 
 void __fastcall LoadVision(int i)
 {
-	memcpy(&VisionList[i], tbuff, 0x34u);
-	tbuff = (char *)tbuff + 52;
+	memcpy(&VisionList[i], tbuff, sizeof(*VisionList));
+	tbuff += sizeof(*VisionList);
 }
 
 void __fastcall LoadPortal(int i)
 {
-	memcpy(&portal[i], tbuff, 0x18u);
-	tbuff = (char *)tbuff + 24;
+	memcpy(&portal[i], tbuff, sizeof(*portal));
+	tbuff += sizeof(*portal);
 }
 
 void __cdecl SaveGame()
 {
-	int v0; // eax
-	signed int v1; // ebx
-	signed int v2; // esi
-	int v3; // esi
-	int v4; // esi
-	int *v5; // esi
-	int *v6; // esi
-	int i; // esi
-	int *v8; // esi
-	int *v9; // esi
-	int j; // esi
-	int *v11; // esi
-	int *v12; // esi
-	int k; // esi
-	signed int v14; // esi
-	int l; // esi
-	int m; // esi
-	int *v17; // esi
-	int *v18; // esi
-	int n; // esi
-	int *v20; // esi
-	char *v21; // edi
-	signed int v22; // ebx
-	_BYTE *v23; // edi
-	signed int v24; // ebx
-	char *v25; // edi
-	signed int v26; // ebx
-	char *v27; // edi
-	int (*v28)[112]; // ebx
-	int *v29; // edi
-	signed int v30; // ebx
-	char *v31; // edi
-	signed int v32; // ebx
-	char *v33; // edi
-	signed int v34; // ebx
-	char *v35; // edi
-	signed int v36; // ebx
-	char *v37; // edi
-	signed int v38; // ebx
-	unsigned char *v39; // edi
-	signed int v40; // ebx
-	char *v41; // edi
-	int v42; // esi
-	void *v43; // esi
-	int v44; // eax
-	char v45[260]; // [esp+Ch] [ebp-10Ch]
-	void *ptr; // [esp+110h] [ebp-8h]
-	int v47; // [esp+114h] [ebp-4h]
-
-	v0 = codec_get_encoded_len(262147); /* FILEBUFF */
-	ptr = DiabloAllocPtr(v0);
-	tbuff = ptr;
-	ISave_2('RETL');
-	OSave(setlevel);
-	ISave((unsigned char)setlvlnum);
-	ISave(currlevel);
-	ISave((unsigned char)leveltype);
-	ISave(ViewX);
-	ISave(ViewY);
+	int i, j;
+	char szName[MAX_PATH];
+
+	int dwLen = codec_get_encoded_len(FILEBUFF);
+	unsigned char *SaveBuff = DiabloAllocPtr(dwLen);
+	tbuff = SaveBuff;
+
+	ISave('RETL');
+	OSave((unsigned char)setlevel);
+	WSave((unsigned char)setlvlnum);
+	WSave(currlevel);
+	WSave((unsigned char)leveltype);
+	WSave(ViewX);
+	WSave(ViewY);
 	OSave(invflag);
 	OSave(chrflag);
-	ISave(nummonsters);
-	ISave(numitems);
-	ISave(nummissiles);
-	ISave(nobjects);
-	v1 = 0;
-	v2 = 0;
-	do
-	{
-		ISave_2(glSeedTbl[v2]);
-		ISave(gnLevelTypeTbl[v2]);
-		++v2;
+	WSave(nummonsters);
+	WSave(numitems);
+	WSave(nummissiles);
+	WSave(nobjects);
+
+	for(i = 0; i < NUMLEVELS; i++) {
+		ISave(glSeedTbl[i]);
+		WSave(gnLevelTypeTbl[i]);
 	}
-	while ( v2 < NUMLEVELS );
+
 	SavePlayer(myplr);
-	v3 = 0;
-	do
-		SaveQuest(v3++);
-	while ( v3 < MAXQUESTS );
-	v4 = 0;
-	do
-		SavePortal(v4++);
-	while ( v4 < MAXPORTAL );
-	v5 = monstkills;
-	do
-	{
-		ISave_2(*v5);
-		++v5;
-	}
-	while ( (signed int)v5 < (signed int)&monstkills[MAXMONSTERS] );
-	if ( leveltype )
-	{
-		v6 = monstactive;
-		do
-		{
-			ISave(*v6);
-			++v6;
-		}
-		while ( (signed int)v6 < (signed int)&monstactive[MAXMONSTERS] );
-		for ( i = 0; i < nummonsters; ++i )
+
+	for(i = 0; i < MAXQUESTS; i++)
+		SaveQuest(i);
+	for(i = 0; i < MAXPORTAL; i++)
+		SavePortal(i);
+	for(i = 0; i < MAXMONSTERS; i++)
+		ISave(monstkills[i]);
+
+	if(leveltype) {
+		for(i = 0; i < MAXMONSTERS; i++)
+			WSave(monstactive[i]);
+		for(i = 0; i < nummonsters; i++)
 			SaveMonster(monstactive[i]);
-		v8 = missileactive;
-		do
-		{
-			BSave(*(_BYTE *)v8);
-			++v8;
-		}
-		while ( (signed int)v8 < (signed int)&missileactive[MAXMISSILES] );
-		v9 = missileavail;
-		do
-		{
-			BSave(*(_BYTE *)v9);
-			++v9;
-		}
-		while ( (signed int)v9 < (signed int)&missileavail[MAXMISSILES] );
-		for ( j = 0; j < nummissiles; ++j )
-			SaveMissile(missileactive[j]);
-		v11 = objectactive;
-		do
-		{
-			BSave(*(_BYTE *)v11);
-			++v11;
-		}
-		while ( (signed int)v11 < (signed int)&objectactive[MAXOBJECTS] );
-		v12 = objectavail;
-		do
-		{
-			BSave(*(_BYTE *)v12);
-			++v12;
-		}
-		while ( (signed int)v12 < (signed int)&objectavail[MAXOBJECTS] );
-		for ( k = 0; k < nobjects; ++k )
-			SaveObject(objectactive[k]);
-		ISave(numlights);
-		v14 = 0;
-		do
-			BSave(lightactive[v14++]);
-		while ( v14 < 32 );
-		for ( l = 0; l < numlights; ++l )
-			SaveLighting((unsigned char)lightactive[l]);
-		ISave(visionid);
-		ISave(numvision);
-		for ( m = 0; m < numvision; ++m )
-			SaveVision(m);
-	}
-	v17 = itemactive;
-	do
-	{
-		BSave(*(_BYTE *)v17);
-		++v17;
-	}
-	while ( (signed int)v17 < (signed int)&itemactive[MAXITEMS] );
-	v18 = itemavail;
-	do
-	{
-		BSave(*(_BYTE *)v18);
-		++v18;
-	}
-	while ( (signed int)v18 < (signed int)&itemavail[MAXITEMS] );
-	for ( n = 0; n < numitems; ++n )
-		SaveItem(itemactive[n]);
-	v20 = UniqueItemFlag;
-	do
-	{
-		OSave(*v20);
-		++v20;
+		for(i = 0; i < MAXMISSILES; i++)
+			BSave(missileactive[i]);
+		for(i = 0; i < MAXMISSILES; i++)
+			BSave(missileavail[i]);
+		for(i = 0; i < nummissiles; i++)
+			SaveMissile(missileactive[i]);
+		for(i = 0; i < MAXOBJECTS; i++)
+			BSave(objectactive[i]);
+		for(i = 0; i < MAXOBJECTS; i++)
+			BSave(objectavail[i]);
+		for(i = 0; i < nobjects; i++)
+			SaveObject(objectactive[i]);
+
+		WSave(numlights);
+
+		for(i = 0; i < 32; i++)
+			BSave(lightactive[i]);
+		for(i = 0; i < numlights; i++)
+			SaveLighting((unsigned char)lightactive[i]);
+
+		WSave(visionid);
+		WSave(numvision);
+
+		for(i = 0; i < numvision; i++)
+			SaveVision(i);
 	}
-	while ( (signed int)v20 < (signed int)&UniqueItemFlag[128] );
-	do
-	{
-		v21 = (char *)dTransVal + v1;
-		v47 = 112;
-		do
-		{
-			BSave(*v21);
-			v21 += 112;
-			--v47;
-		}
-		while ( v47 );
-		++v1;
+
+	for(i = 0; i < MAXITEMS; i++)
+		BSave(itemactive[i]);
+	for(i = 0; i < MAXITEMS; i++)
+		BSave(itemavail[i]);
+	for(i = 0; i < numitems; i++)
+		SaveItem(itemactive[i]);
+	for(i = 0; i < 128; i++)
+		OSave(UniqueItemFlag[i]);
+
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dTransVal[i][j]);
 	}
-	while ( v1 < 112 );
-	v22 = 0;
-	do
-	{
-		v23 = (unsigned char *)dFlags + v22;
-		v47 = 112;
-		do
-		{
-			BSave(*v23 & (DFLAG_POPULATED | DFLAG_MONSTER | DFLAG_PLAYER | DFLAG_LIT | DFLAG_EXPLORED));
-			v23 += 112;
-			--v47;
-		}
-		while ( v47 );
-		++v22;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dFlags[i][j] & 0xF8);
 	}
-	while ( v22 < 112 );
-	v24 = 0;
-	do
-	{
-		v25 = (char *)dPlayer + v24;
-		v47 = 112;
-		do
-		{
-			BSave(*v25);
-			v25 += 112;
-			--v47;
-		}
-		while ( v47 );
-		++v24;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dPlayer[i][j]);
 	}
-	while ( v24 < 112 );
-	v26 = 0;
-	do
-	{
-		v27 = (char *)dItem + v26;
-		v47 = 112;
-		do
-		{
-			BSave(*v27);
-			v27 += 112;
-			--v47;
-		}
-		while ( v47 );
-		++v26;
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dItem[i][j]);
 	}
-	while ( v26 < 112 );
-	if ( leveltype )
-	{
-		v28 = dMonster;
-		do
-		{
-			v29 = (int *)v28;
-			v47 = 112;
-			do
-			{
-				ISave(*v29);
-				v29 += 112;
-				--v47;
-			}
-			while ( v47 );
-			v28 = (int (*)[112])((char *)v28 + 4);
+
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				WSave(dMonster[i][j]);
 		}
-		while ( (signed int)v28 < (signed int)dMonster[1] );
-		v30 = 0;
-		do
-		{
-			v31 = (char *)dDead + v30;
-			v47 = 112;
-			do
-			{
-				BSave(*v31);
-				v31 += 112;
-				--v47;
-			}
-			while ( v47 );
-			++v30;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dDead[i][j]);
 		}
-		while ( v30 < 112 );
-		v32 = 0;
-		do
-		{
-			v33 = (char *)dObject + v32;
-			v47 = 112;
-			do
-			{
-				BSave(*v33);
-				v33 += 112;
-				--v47;
-			}
-			while ( v47 );
-			++v32;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dObject[i][j]);
 		}
-		while ( v32 < 112 );
-		v34 = 0;
-		do
-		{
-			v35 = (char *)dTransVal + v34;
-			v47 = 112;
-			do
-			{
-				BSave(*v35);
-				v35 += 112;
-				--v47;
-			}
-			while ( v47 );
-			++v34;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dTransVal[i][j]);
 		}
-		while ( v34 < 112 );
-		v36 = 0;
-		do
-		{
-			v37 = (char *)dTransVal2 + v36;
-			v47 = 112;
-			do
-			{
-				BSave(*v37);
-				v37 += 112;
-				--v47;
-			}
-			while ( v47 );
-			++v36;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dTransVal2[i][j]);
 		}
-		while ( v36 < 112 );
-		v38 = 0;
-		do
-		{
-			v39 = (unsigned char *)automapview + v38;
-			v47 = 40;
-			do
-			{
-				OSave(*v39);
-				v39 += 40;
-				--v47;
-			}
-			while ( v47 );
-			++v38;
+		for(j = 0; j < DMAXY; j++) {
+			for(i = 0; i < DMAXX; i++)
+				OSave(automapview[i][j]);
 		}
-		while ( v38 < 40 );
-		v40 = 0;
-		do
-		{
-			v41 = (char *)dMissile + v40;
-			v47 = 112;
-			do
-			{
-				BSave(*v41);
-				v41 += 112;
-				--v47;
-			}
-			while ( v47 );
-			++v40;
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dMissile[i][j]);
 		}
-		while ( v40 < 112 );
 	}
-	ISave(numpremium);
-	ISave(premiumlevel);
-	v42 = 0;
-	do
-		SavePremium(v42++);
-	while ( v42 < 6 );
+
+	WSave(numpremium);
+	WSave(premiumlevel);
+
+	for(i = 0; i < 6; i++)
+		SavePremium(i);
+
 	OSave(automapflag);
-	ISave(AutoMapScale);
-	pfile_get_game_name(v45);
-	v43 = ptr;
-	v44 = codec_get_encoded_len((_BYTE *)tbuff - (_BYTE *)ptr);
-	pfile_write_save_file(v45, v43, (_BYTE *)tbuff - (_BYTE *)v43, v44);
-	mem_free_dbg(v43);
+	WSave(AutoMapScale);
+	pfile_get_game_name(szName);
+	dwLen = codec_get_encoded_len(tbuff - SaveBuff);
+	pfile_write_save_file(szName, SaveBuff, tbuff - SaveBuff, dwLen);
+	mem_free_dbg(SaveBuff);
 	gbValidSaveFile = TRUE;
 	pfile_rename_temp_to_perm();
 	pfile_write_hero();
@@ -882,241 +430,186 @@ void __cdecl SaveGame()
 
 void __fastcall BSave(char v)
 {
-	*(_BYTE *)tbuff = v;
-	tbuff = (char *)tbuff + 1;
+	*tbuff++ = v;
 }
 
-void __fastcall ISave(int v)
+void __fastcall WSave(int v)
 {
-	*(_BYTE *)tbuff = _HIBYTE(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = BYTE2(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = BYTE1(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = v;
-	tbuff = (char *)tbuff + 1;
+	*tbuff++ = v >> 24;
+	*tbuff++ = v >> 16;
+	*tbuff++ = v >> 8;
+	*tbuff++ = v;
 }
 
-void __fastcall ISave_2(int v)
+void __fastcall ISave(int v)
 {
-	*(_BYTE *)tbuff = _HIBYTE(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = BYTE2(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = BYTE1(v);
-	tbuff = (char *)tbuff + 1;
-	*(_BYTE *)tbuff = v;
-	tbuff = (char *)tbuff + 1;
+	*tbuff++ = v >> 24;
+	*tbuff++ = v >> 16;
+	*tbuff++ = v >> 8;
+	*tbuff++ = v;
 }
 
-void __fastcall OSave(unsigned char v)
+void __fastcall OSave(BOOL v)
 {
-	if ( v )
-		*(_BYTE *)tbuff = 1;
+	if(v != FALSE)
+		*tbuff++ = TRUE;
 	else
-		*(_BYTE *)tbuff = 0;
-	tbuff = (char *)tbuff + 1;
+		*tbuff++ = FALSE;
 }
 
 void __fastcall SavePlayer(int i)
 {
-	memcpy(tbuff, &plr[i], 0x54B0u);
-	tbuff = (char *)tbuff + 21680;
+	memcpy(tbuff, &plr[i], sizeof(*plr) - (10 * sizeof(void *)));
+	tbuff += sizeof(*plr) - (10 * sizeof(void *)); // omit last 10 pointers
 }
 
 void __fastcall SaveMonster(int i)
 {
-	memcpy(tbuff, &monster[i], 0xD8u);
-	tbuff = (char *)tbuff + 216;
+	memcpy(tbuff, &monster[i], sizeof(*monster) - (3 * sizeof(void *)));
+	tbuff += sizeof(*monster) - (3 * sizeof(void *)); // omit last 3 pointers
 }
 
 void __fastcall SaveMissile(int i)
 {
-	memcpy(tbuff, &missile[i], 0xB0u);
-	tbuff = (char *)tbuff + 176;
+	memcpy(tbuff, &missile[i], sizeof(*missile));
+	tbuff += sizeof(*missile);
 }
 
 void __fastcall SaveObject(int i)
 {
-	memcpy(tbuff, &object[i], 0x78u);
-	tbuff = (char *)tbuff + 120;
+	memcpy(tbuff, &object[i], sizeof(*object));
+	tbuff += sizeof(*object);
 }
 
 void __fastcall SaveItem(int i)
 {
-	memcpy(tbuff, &item[i], 0x170u);
-	tbuff = (char *)tbuff + 368;
+	memcpy(tbuff, &item[i], sizeof(*item));
+	tbuff += sizeof(*item);
 }
 
 void __fastcall SavePremium(int i)
 {
-	memcpy(tbuff, &premiumitem[i], 0x170u);
-	tbuff = (char *)tbuff + 368;
+	memcpy(tbuff, &premiumitem[i], sizeof(*premiumitem));
+	tbuff += sizeof(*premiumitem);
 }
 
 void __fastcall SaveQuest(int i)
 {
-	memcpy(tbuff, &quests[i], 0x18u);
-	tbuff = (char *)tbuff + 24;
-	ISave(ReturnLvlX);
-	ISave(ReturnLvlY);
-	ISave(ReturnLvl);
-	ISave(ReturnLvlT);
-	ISave(DoomQuestState);
+	memcpy(tbuff, &quests[i], sizeof(*quests));
+	tbuff += sizeof(*quests);
+	WSave(ReturnLvlX);
+	WSave(ReturnLvlY);
+	WSave(ReturnLvl);
+	WSave(ReturnLvlT);
+	WSave(DoomQuestState);
 }
 
 void __fastcall SaveLighting(int i)
 {
-	memcpy(tbuff, &LightList[i], 0x34u);
-	tbuff = (char *)tbuff + 52;
+	memcpy(tbuff, &LightList[i], sizeof(*LightList));
+	tbuff += sizeof(*LightList);
 }
 
 void __fastcall SaveVision(int i)
 {
-	memcpy(tbuff, &VisionList[i], 0x34u);
-	tbuff = (char *)tbuff + 52;
+	memcpy(tbuff, &VisionList[i], sizeof(*VisionList));
+	tbuff += sizeof(*VisionList);
 }
 
 void __fastcall SavePortal(int i)
 {
-	memcpy(tbuff, &portal[i], 0x18u);
-	tbuff = (char *)tbuff + 24;
+	memcpy(tbuff, &portal[i], sizeof(*portal));
+	tbuff += sizeof(*portal);
 }
 
 void __cdecl SaveLevel()
 {
-	int v0; // eax
-	int i; // esi
-	int j; // esi
-	void *v47; // esi
-	int v48; // eax
-	int v49; // eax
-	char v50[260]; // [esp+0h] [ebp-10Ch]
-	void *SaveBuff; // [esp+104h] [ebp-8h]
-
-	if ( !currlevel )
+	int i, j;
+	char szName[MAX_PATH];
+
+	if(!currlevel)
 		glSeedTbl[0] = GetRndSeed();
-	v0 = codec_get_encoded_len(262147); /* FILEBUFF */
-	SaveBuff = DiabloAllocPtr(v0);
+
+	int dwLen = codec_get_encoded_len(FILEBUFF);
+	unsigned char *SaveBuff = DiabloAllocPtr(dwLen);
 	tbuff = SaveBuff;
-	if ( leveltype )
-	{
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				BSave(dDead[j][i]); /* check */
-			}
+
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dDead[i][j]);
 		}
 	}
-	ISave(nummonsters);
-	ISave(numitems);
-	ISave(nobjects);
 
-	if ( leveltype )
-	{
-		for(i = 0; i < MAXMONSTERS; i++)
-			ISave(monstactive[i]);
+	WSave(nummonsters);
+	WSave(numitems);
+	WSave(nobjects);
 
+	if(leveltype) {
+		for(i = 0; i < MAXMONSTERS; i++)
+			WSave(monstactive[i]);
 		for(i = 0; i < nummonsters; i++)
 			SaveMonster(monstactive[i]);
-
 		for(i = 0; i < MAXOBJECTS; i++)
 			BSave(objectactive[i]);
-
 		for(i = 0; i < MAXOBJECTS; i++)
 			BSave(objectavail[i]);
-
 		for(i = 0; i < nobjects; i++)
 			SaveObject(objectactive[i]);
 	}
 
 	for(i = 0; i < MAXITEMS; i++)
 		BSave(itemactive[i]);
-
 	for(i = 0; i < MAXITEMS; i++)
 		BSave(itemavail[i]);
-
 	for(i = 0; i < numitems; i++)
 		SaveItem(itemactive[i]);
 
-	for(i = 0; i < 112; i++)
-	{
-		for(j = 0; j < 112; j++)
-		{
-			BSave(dFlags[j][i] & (DFLAG_POPULATED | DFLAG_MONSTER | DFLAG_PLAYER | DFLAG_LIT | DFLAG_EXPLORED));
-		}
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dFlags[i][j] & 0xF8);
 	}
-
-	for(i = 0; i < 112; i++)
-	{
-		for(j = 0; j < 112; j++)
-		{
-			BSave(dItem[j][i]);
-		}
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			BSave(dItem[i][j]);
 	}
 
-	if ( leveltype )
-	{
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				ISave(dMonster[j][i]);
-			}
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				WSave(dMonster[i][j]);
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				BSave(dObject[j][i]);
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dObject[i][j]);
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				BSave(dTransVal[j][i]);
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dTransVal[i][j]);
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				BSave(dTransVal2[j][i]);
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dTransVal2[i][j]);
 		}
-
-		for(i = 0; i < 40; i++)
-		{
-			for(j = 0; j < 40; j++)
-			{
-				OSave(automapview[j][i]);
-			}
+		for(j = 0; j < DMAXY; j++) {
+			for(i = 0; i < DMAXX; i++)
+				OSave(automapview[i][j]);
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				BSave(dMissile[j][i]);
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				BSave(dMissile[i][j]);
 		}
 	}
-	GetTempLevelNames(v50);
-	v47 = SaveBuff;
-	v48 = codec_get_encoded_len((_BYTE *)tbuff - (_BYTE *)SaveBuff);
-	pfile_write_save_file(v50, v47, (_BYTE *)tbuff - (_BYTE *)v47, v48);
-	mem_free_dbg(v47);
-	v49 = myplr;
-	if ( setlevel )
-		plr[v49]._pSLvlVisited[(unsigned char)setlvlnum] = 1;
+
+	GetTempLevelNames(szName);
+	dwLen = codec_get_encoded_len(tbuff - SaveBuff);
+	pfile_write_save_file(szName, SaveBuff, tbuff - SaveBuff, dwLen);
+	mem_free_dbg(SaveBuff);
+
+	if(setlevel == 0)
+		plr[myplr]._pLvlVisited[currlevel] = 1;
 	else
-		plr[v49]._pLvlVisited[currlevel] = 1;
+		plr[myplr]._pSLvlVisited[(unsigned char)setlvlnum] = 1;
 }
 // 5BB1ED: using guessed type char leveltype;
 // 5CCB10: using guessed type char setlvlnum;
@@ -1124,127 +617,81 @@ void __cdecl SaveLevel()
 
 void __cdecl LoadLevel()
 {
-	int i; // esi
-	int j; // esi
-	char dst[260]; // [esp+Ch] [ebp-10Ch]
-	int len; // [esp+110h] [ebp-8h]
-	void *LoadBuff; // [esp+114h] [ebp-4h]
-
-	GetPermLevelNames(dst);
-	LoadBuff = pfile_read(dst, &len);
+	int i, j;
+	int dwLen;
+	char szName[MAX_PATH];
+
+	GetPermLevelNames(szName);
+	unsigned char *LoadBuff = (unsigned char *)pfile_read(szName, &dwLen);
 	tbuff = LoadBuff;
 
-	if ( leveltype )
-	{
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dDead[j][i] = BLoad(); /* check */
-			}
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dDead[i][j] = BLoad();
 		}
-
 		SetDead();
 	}
 
-	nummonsters = ILoad();
-	numitems = ILoad();
-	nobjects = ILoad();
+	nummonsters = WLoad();
+	numitems = WLoad();
+	nobjects = WLoad();
 
-	if ( leveltype )
-	{
+	if(leveltype) {
 		for(i = 0; i < MAXMONSTERS; i++)
-			monstactive[i] = ILoad();
-
+			monstactive[i] = WLoad();
 		for(i = 0; i < nummonsters; i++)
 			LoadMonster(monstactive[i]);
-
 		for(i = 0; i < MAXOBJECTS; i++)
 			objectactive[i] = BLoad();
-
 		for(i = 0; i < MAXOBJECTS; i++)
 			objectavail[i] = BLoad();
-
 		for(i = 0; i < nobjects; i++)
 			LoadObject(objectactive[i]);
-
 		for(i = 0; i < nobjects; i++)
 			SyncObjectAnim(objectactive[i]);
 	}
 
 	for(i = 0; i < MAXITEMS; i++)
 		itemactive[i] = BLoad();
-
 	for(i = 0; i < MAXITEMS; i++)
 		itemavail[i] = BLoad();
-
 	for(i = 0; i < numitems; i++)
 		LoadItem(itemactive[i]);
 
-	for(i = 0; i < 112; i++)
-	{
-		for(j = 0; j < 112; j++)
-		{
-			dFlags[j][i] = BLoad();
-		}
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dFlags[i][j] = BLoad();
 	}
-
-	for(i = 0; i < 112; i++)
-	{
-		for(j = 0; j < 112; j++)
-		{
-			dItem[j][i] = BLoad();
-		}
+	for(j = 0; j < MAXDUNY; j++) {
+		for(i = 0; i < MAXDUNX; i++)
+			dItem[i][j] = BLoad();
 	}
 
-	if ( leveltype )
-	{
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dMonster[j][i] = ILoad();
-			}
+	if(leveltype) {
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dMonster[i][j] = WLoad();
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dObject[j][i] = BLoad();
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dObject[i][j] = BLoad();
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dTransVal[j][i] = BLoad();
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dTransVal[i][j] = BLoad();
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dTransVal2[j][i] = BLoad();
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dTransVal2[i][j] = BLoad();
 		}
-
-		for(i = 0; i < 40; i++)
-		{
-			for(j = 0; j < 40; j++)
-			{
-				automapview[j][i] = OLoad();
-			}
+		for(j = 0; j < DMAXY; j++) {
+			for(i = 0; i < DMAXX; i++)
+				automapview[i][j] = OLoad();
 		}
-
-		for(i = 0; i < 112; i++)
-		{
-			for(j = 0; j < 112; j++)
-			{
-				dMissile[j][i] = 0;
-			}
+		for(j = 0; j < MAXDUNY; j++) {
+			for(i = 0; i < MAXDUNX; i++)
+				dMissile[i][j] = 0; /// BUGFIX: supposed to load saved missiles with "BLoad()"?
 		}
 	}
 
@@ -1253,9 +700,8 @@ void __cdecl LoadLevel()
 	SyncPortals();
 	dolighting = 1;
 
-	for(i = 0; i < 4; i++)
-	{
-		if ( plr[i].plractive && currlevel == plr[i].plrlevel )
+	for(i = 0; i < MAX_PLRS; i++) {
+		if(plr[i].plractive && currlevel == plr[i].plrlevel)
 			LightList[plr[i]._plid]._lunflag = 1;
 	}
 
diff --git a/Source/loadsave.h b/Source/loadsave.h
index 8782c1dff..d7b6b300d 100644
--- a/Source/loadsave.h
+++ b/Source/loadsave.h
@@ -2,13 +2,13 @@
 #ifndef __LOADSAVE_H__
 #define __LOADSAVE_H__
 
-extern void *tbuff;
+extern unsigned char *tbuff;
 
 void __fastcall LoadGame(BOOL firstflag);
 char __cdecl BLoad();
+int __cdecl WLoad();
 int __cdecl ILoad();
-int __cdecl ILoad_2();
-bool __cdecl OLoad();
+BOOL __cdecl OLoad();
 void __fastcall LoadPlayer(int i);
 void __fastcall LoadMonster(int i);
 void __fastcall LoadMissile(int i);
@@ -21,9 +21,9 @@ void __fastcall LoadVision(int i);
 void __fastcall LoadPortal(int i);
 void __cdecl SaveGame();
 void __fastcall BSave(char v);
+void __fastcall WSave(int v);
 void __fastcall ISave(int v);
-void __fastcall ISave_2(int v);
-void __fastcall OSave(unsigned char v);
+void __fastcall OSave(BOOL v);
 void __fastcall SavePlayer(int i);
 void __fastcall SaveMonster(int i);
 void __fastcall SaveMissile(int i);
diff --git a/defs.h b/defs.h
index 3489bd732..243bc5d7b 100644
--- a/defs.h
+++ b/defs.h
@@ -32,7 +32,7 @@
 #define MDMAXY					40
 
 // number of inventory grid cells
-#define NUM_INV_GRID_ELEM			40
+#define NUM_INV_GRID_ELEM		40
 #define INV_SLOT_SIZE_PX		28
 
 // Item indestructible durability
@@ -50,6 +50,10 @@
 
 #define PLR_NAME_LEN			32
 
+// 256 kilobytes + 3 bytes (demo leftover) for file magic (262147)
+// final game uses 4-byte magic instead of 3
+#define FILEBUFF				((256*1024)+3)
+
 // Diablo uses a 256 color palette
 // Entry 0-127 (0x00-0x7F) are level specific
 // Entry 128-255 (0x80-0xFF) are global