From aa50489569a9484fc23d54dc100d5e9bf7a3077d Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 20 Jul 2019 20:49:08 +0200
Subject: [PATCH] Clean up generated comments

---
 Source/appfat.h    |  4 +-
 Source/control.cpp | 46 +++++++++-------------
 Source/control.h   | 36 ++++++++---------
 Source/dead.h      |  2 +-
 Source/diablo.cpp  | 98 +++++++++-------------------------------------
 Source/diablo.h    | 38 +++++++++---------
 Source/drlg_l2.cpp |  2 +-
 Source/drlg_l4.cpp |  2 +-
 Source/drlg_l4.h   |  2 +-
 Source/effects.cpp |  2 +-
 Source/help.cpp    | 14 ++-----
 Source/help.h      |  6 +--
 Source/init.h      |  4 +-
 Source/mainmenu.h  |  2 +-
 Source/monster.cpp |  4 +-
 Source/monster.h   |  4 +-
 Source/objects.cpp | 18 ++++-----
 Source/objects.h   | 14 +++----
 Source/pfile.h     |  2 +-
 Source/scrollrt.h  |  2 +-
 Source/towners.cpp | 17 ++------
 Source/trigs.cpp   |  5 +--
 Source/trigs.h     |  2 +-
 23 files changed, 118 insertions(+), 208 deletions(-)

diff --git a/Source/appfat.h b/Source/appfat.h
index 77d9c620a..144870f07 100644
--- a/Source/appfat.h
+++ b/Source/appfat.h
@@ -3,8 +3,8 @@
 #define __APPFAT_H__
 
 extern char sz_error_buf[256];
-extern int terminating;       // weak
-extern int cleanup_thread_id; // weak
+extern int terminating;
+extern int cleanup_thread_id;
 
 void TriggerBreak();
 #ifdef _DEBUG
diff --git a/Source/control.cpp b/Source/control.cpp
index 52916690a..55d1a1c26 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -4,17 +4,17 @@ BYTE sgbNextTalkSave;
 BYTE sgbTalkSavePos;
 BYTE *pDurIcons;
 BYTE *pChrButtons;
-BOOL drawhpflag; // idb
+BOOL drawhpflag;
 BOOL dropGoldFlag;
 int panbtn[8];
 int chrbtn[4];
 BYTE *pMultiBtns;
 BYTE *pPanelButtons;
 BYTE *pChrPanel;
-int lvlbtndown; // weak
+int lvlbtndown;
 char sgszTalkSave[8][80];
-int dropGoldValue; // idb
-BOOL drawmanaflag; // idb
+int dropGoldValue;
+BOOL drawmanaflag;
 BOOL chrbtnactive;
 char sgszTalkMsg[MAX_SEND_STR_LEN];
 BYTE *pPanelText;
@@ -23,38 +23,38 @@ BYTE *pLifeBuff;
 BYTE *pBtmBuff;
 BYTE *pTalkBtns;
 int pstrjust[4];
-int pnumlines; // idb
+int pnumlines;
 BOOL pinfoflag;
 BOOL talkbtndown[3];
-int pSpell; // weak
+int pSpell;
 BYTE *pManaBuff;
-char infoclr;      // weak
-int sgbPlrTalkTbl; // weak // should be char [4]
+char infoclr;
+int sgbPlrTalkTbl; // should be char [4]
 BYTE *pGBoxBuff;
 BYTE *pSBkBtnCel;
 char tempstr[256];
 BOOLEAN whisper[MAX_PLRS];
-int sbooktab;             // weak
-int pSplType;             // weak
-int frame;                // idb
-int initialDropGoldIndex; // idb
-int talkflag;             // weak
+int sbooktab;
+int pSplType;
+int frame;
+int initialDropGoldIndex;
+int talkflag;
 BYTE *pSBkIconCels;
-int sbookflag; // weak
+int sbookflag;
 int chrflag;
 BOOL drawbtnflag;
 BYTE *pSpellBkCel;
 char infostr[MAX_PATH];
-int numpanbtns; // weak
+int numpanbtns;
 BYTE *pStatusPanel;
 char panelstr[256];
-int panelflag; // weak
-unsigned char SplTransTbl[256];
-int initialDropGoldValue; // idb
+int panelflag;
+BYTE SplTransTbl[256];
+int initialDropGoldValue;
 BYTE *pSpellCels;
 BOOL panbtndown;
 BYTE *pTalkPanel;
-int spselflag; // weak
+int spselflag;
 
 const unsigned char fontframe[128] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -498,8 +498,6 @@ void DrawSpellList()
 		}
 	}
 }
-// 4B8834: using guessed type int pSpell;
-// 4B8954: using guessed type int pSplType;
 
 void SetSpell()
 {
@@ -1414,12 +1412,6 @@ void CheckPanelInfo()
 	if (MouseX > 190 && MouseX < 437 && MouseY > 356 && MouseY < 385)
 		pcursinvitem = CheckInvHLight();
 }
-// 484368: using guessed type int FriendlyMode;
-// 4B883C: using guessed type int infoclr;
-// 4B8A7C: using guessed type int numpanbtns;
-// 4B8B84: using guessed type int panelflag;
-// 4B8C98: using guessed type int spselflag;
-// 4B8CB8: using guessed type char pcursinvitem;
 
 void CheckBtnUp()
 {
diff --git a/Source/control.h b/Source/control.h
index f1f963611..04fdb03c9 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -4,16 +4,16 @@
 
 extern BYTE *pDurIcons;
 extern BYTE *pChrButtons;
-extern BOOL drawhpflag; // idb
+extern BOOL drawhpflag;
 extern BOOL dropGoldFlag;
 extern int panbtn[8];
 extern int chrbtn[4];
 extern BYTE *pMultiBtns;
 extern BYTE *pPanelButtons;
 extern BYTE *pChrPanel;
-extern int lvlbtndown;    // weak
-extern int dropGoldValue; // idb
-extern BOOL drawmanaflag; // idb
+extern int lvlbtndown;
+extern int dropGoldValue;
+extern BOOL drawmanaflag;
 extern BOOL chrbtnactive;
 extern BYTE *pPanelText;
 extern int nGoldFrame;
@@ -21,37 +21,37 @@ extern BYTE *pLifeBuff;
 extern BYTE *pBtmBuff;
 extern BYTE *pTalkBtns;
 extern int pstrjust[4];
-extern int pnumlines; // idb
+extern int pnumlines;
 extern BOOL pinfoflag;
 extern BOOL talkbtndown[3];
-extern int pSpell; // weak
+extern int pSpell;
 extern BYTE *pManaBuff;
-extern char infoclr; // weak
+extern char infoclr;
 extern BYTE *pGBoxBuff;
 extern BYTE *pSBkBtnCel;
 extern char tempstr[256];
 extern BOOLEAN whisper[MAX_PLRS];
-extern int sbooktab;             // weak
-extern int pSplType;             // weak
-extern int frame;                // idb
-extern int initialDropGoldIndex; // idb
-extern int talkflag;             // weak
+extern int sbooktab;
+extern int pSplType;
+extern int frame;
+extern int initialDropGoldIndex;
+extern int talkflag;
 extern BYTE *pSBkIconCels;
-extern int sbookflag; // weak
+extern int sbookflag;
 extern int chrflag;
 extern BOOL drawbtnflag;
 extern BYTE *pSpellBkCel;
 extern char infostr[MAX_PATH];
-extern int numpanbtns; // weak
+extern int numpanbtns;
 extern BYTE *pStatusPanel;
 extern char panelstr[256];
-extern int panelflag; // weak
-extern unsigned char SplTransTbl[256];
-extern int initialDropGoldValue; // idb
+extern int panelflag;
+extern BYTE SplTransTbl[256];
+extern int initialDropGoldValue;
 extern BYTE *pSpellCels;
 extern BOOL panbtndown;
 extern BYTE *pTalkPanel;
-extern int spselflag; // weak
+extern int spselflag;
 
 void DrawSpellCel(int xp, int yp, BYTE *Trans, int nCel, int w);
 void SetSpellTrans(char t);
diff --git a/Source/dead.h b/Source/dead.h
index df8caacab..bc16374d3 100644
--- a/Source/dead.h
+++ b/Source/dead.h
@@ -2,7 +2,7 @@
 #ifndef __DEAD_H__
 #define __DEAD_H__
 
-extern int spurtndx; // weak
+extern int spurtndx;
 extern DeadStruct dead[MAXDEAD];
 extern int stonendx;
 
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index df13d3a0c..6fd9239e7 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -6,33 +6,33 @@ HWND ghMainWnd;
 int glMid1Seed[NUMLEVELS];
 int glMid2Seed[NUMLEVELS];
 int gnLevelTypeTbl[NUMLEVELS];
-int MouseY;             // idb
-int MouseX;             // idb
-BOOL gbGameLoopStartup; // idb
+int MouseY;
+int MouseX;
+BOOL gbGameLoopStartup;
 DWORD glSeedTbl[NUMLEVELS];
 BOOL gbRunGame;
 int glMid3Seed[NUMLEVELS];
 BOOL gbRunGameResult;
-int zoomflag; // weak
+int zoomflag;
 BOOL gbProcessPlayers;
 int glEndSeed[NUMLEVELS];
 BOOL gbLoadGame;
-HINSTANCE ghInst; // idb
+HINSTANCE ghInst;
 int DebugMonsters[10];
-char cineflag;   // weak
-int drawpanflag; // weak
-int visiondebug; // weak
-int scrollflag;  /* unused */
+char cineflag;
+int drawpanflag;
+int visiondebug;
+int scrollflag; /* unused */
 BOOL light4flag;
-int leveldebug;      // weak
-int monstdebug;      // weak
-int trigdebug;       /* unused */
-int setseed;         // weak
-int debugmonsttypes; // weak
-int PauseMode;       // weak
+int leveldebug;
+int monstdebug;
+int trigdebug; /* unused */
+int setseed;
+int debugmonsttypes;
+int PauseMode;
 int sgnTimeoutCurs;
-char sgbMouseDown;     // weak
-int color_cycle_timer; // weak
+char sgbMouseDown;
+int color_cycle_timer;
 
 /* rdata */
 
@@ -61,8 +61,8 @@ char *spszMsgTbl[4] = {
 	"Follow me.",
 	"Here's something for you.",
 	"Now you DIE!"
-};                                                      // weak
-char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" }; // weak
+};
+char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" };
 
 void FreeGameMem()
 {
@@ -118,7 +118,6 @@ BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer)
 	SNetDestroy();
 	return gbRunGameResult;
 }
-// 678640: using guessed type char byte_678640;
 
 void run_game_loop(unsigned int uMsg)
 {
@@ -192,9 +191,6 @@ void run_game_loop(unsigned int uMsg)
 		DoEnding();
 	}
 }
-// 525718: using guessed type char cineflag;
-// 52571C: using guessed type int drawpanflag;
-// 679660: using guessed type char gbMaxPlayers;
 
 void start_game(unsigned int uMsg)
 {
@@ -212,9 +208,6 @@ void start_game(unsigned int uMsg)
 	sgbMouseDown = 0;
 	track_repeat_walk(0);
 }
-// 52569C: using guessed type int zoomflag;
-// 525718: using guessed type char cineflag;
-// 525748: using guessed type char sgbMouseDown;
 
 void free_game()
 {
@@ -465,8 +458,6 @@ void diablo_parse_flags(char *args)
 		}
 	}
 }
-// 52A548: using guessed type char gbBackBuf;
-// 52A549: using guessed type char gbEmulate;
 
 void diablo_init_screen()
 {
@@ -634,13 +625,6 @@ BOOL PressEscKey()
 
 	return rv;
 }
-// 4B8960: using guessed type int talkflag;
-// 4B8C98: using guessed type int spselflag;
-// 52575C: using guessed type int doomflag;
-// 52B9F0: using guessed type char msgdelay;
-// 52B9F1: using guessed type char msgflag;
-// 646D00: using guessed type char qtextflag;
-// 6AA705: using guessed type char stextflag;
 
 LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -684,7 +668,6 @@ LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 
 	return MainWndProc(hWnd, uMsg, wParam, lParam);
 }
-// 525748: using guessed type char sgbMouseDown;
 
 LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -785,9 +768,6 @@ LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 	return MainWndProc(hWnd, uMsg, wParam, lParam);
 }
-// 52571C: using guessed type int drawpanflag;
-// 525748: using guessed type char sgbMouseDown;
-// 679660: using guessed type char gbMaxPlayers;
 
 BOOL LeftMouseDown(int wParam)
 {
@@ -944,9 +924,6 @@ BOOL TryIconCurs()
 
 	return FALSE;
 }
-// 4B8CB8: using guessed type char pcursinvitem;
-// 4B8CC1: using guessed type char pcursobj;
-// 4B8CC2: using guessed type char pcursplr;
 
 void LeftMouseUp()
 {
@@ -961,8 +938,6 @@ void LeftMouseUp()
 	if (stextflag)
 		ReleaseStoreBtn();
 }
-// 4B851C: using guessed type int lvlbtndown;
-// 6AA705: using guessed type char stextflag;
 
 void RightMouseDown()
 {
@@ -986,12 +961,6 @@ void RightMouseDown()
 		}
 	}
 }
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 4B8CB8: using guessed type char pcursinvitem;
-// 525740: using guessed type int PauseMode;
-// 52575C: using guessed type int doomflag;
-// 6AA705: using guessed type char stextflag;
 
 BOOL PressSysKey(int wParam)
 {
@@ -1024,9 +993,6 @@ void diablo_hotkey_msg(DWORD dwMsg)
 	GetPrivateProfileString("NetMsg", spszMsgKeyTbl[dwMsg], spszMsgTbl[dwMsg], szMsg, sizeof(szMsg), szFileName);
 	NetSendCmdString(-1, szMsg);
 }
-// 48436C: using guessed type char *spszMsgTbl[4];
-// 48437C: using guessed type char *spszMsgKeyTbl[4];
-// 679660: using guessed type char gbMaxPlayers;
 
 void ReleaseKey(int vkey)
 {
@@ -1232,13 +1198,6 @@ void PressKey(int vkey)
 		doom_close();
 	}
 }
-// 4B8960: using guessed type int talkflag;
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 525740: using guessed type int PauseMode;
-// 52B9F0: using guessed type char msgdelay;
-// 646D00: using guessed type char qtextflag;
-// 6AA705: using guessed type char stextflag;
 
 void diablo_pause_game()
 {
@@ -1253,9 +1212,6 @@ void diablo_pause_game()
 		drawpanflag = 255;
 	}
 }
-// 52571C: using guessed type int drawpanflag;
-// 525740: using guessed type int PauseMode;
-// 679660: using guessed type char gbMaxPlayers;
 
 /* NOTE: `return` must be used instead of `break` to be bin exact as C++ */
 void PressChar(int vkey)
@@ -1522,12 +1478,6 @@ void PressChar(int vkey)
 #endif
 	}
 }
-// 4B8968: using guessed type int sbookflag;
-// 4B8C98: using guessed type int spselflag;
-// 52569C: using guessed type int zoomflag;
-// 525740: using guessed type int PauseMode;
-// 52575C: using guessed type int doomflag;
-// 6AA705: using guessed type char stextflag;
 
 void LoadLvlGFX()
 {
@@ -1833,8 +1783,6 @@ void LoadGameLevel(BOOL firstflag, int lvldir)
 	if (setlevel && setlvlnum == SL_SKELKING && quests[QTYPE_KING]._qactive == 2)
 		PlaySFX(USFX_SKING1);
 }
-// 525738: using guessed type int setseed;
-// 679660: using guessed type char gbMaxPlayers;
 
 void game_loop(BOOL bStartup)
 {
@@ -1854,7 +1802,6 @@ void game_loop(BOOL bStartup)
 			break;
 	}
 }
-// 679660: using guessed type char gbMaxPlayers;
 
 void game_logic()
 {
@@ -1902,10 +1849,6 @@ void game_logic()
 	drawpanflag |= 1;
 	pfile_update(FALSE);
 }
-// 525718: using guessed type char cineflag;
-// 52571C: using guessed type int drawpanflag;
-// 525740: using guessed type int PauseMode;
-// 679660: using guessed type char gbMaxPlayers;
 
 void timeout_cursor(BOOL bTimeout)
 {
@@ -1927,8 +1870,6 @@ void timeout_cursor(BOOL bTimeout)
 		drawpanflag = 255;
 	}
 }
-// 52571C: using guessed type int drawpanflag;
-// 525748: using guessed type char sgbMouseDown;
 
 void diablo_color_cyc_logic()
 {
@@ -1947,4 +1888,3 @@ void diablo_color_cyc_logic()
 		}
 	}
 }
-// 52574C: using guessed type int color_cycle_timer;
diff --git a/Source/diablo.h b/Source/diablo.h
index aefb2cc4e..d39131414 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -87,32 +87,32 @@ extern HWND ghMainWnd;
 extern int glMid1Seed[NUMLEVELS];
 extern int glMid2Seed[NUMLEVELS];
 extern int gnLevelTypeTbl[NUMLEVELS];
-extern int MouseY;             // idb
-extern int MouseX;             // idb
-extern BOOL gbGameLoopStartup; // idb
+extern int MouseY;
+extern int MouseX;
+extern BOOL gbGameLoopStartup;
 extern DWORD glSeedTbl[NUMLEVELS];
 extern BOOL gbRunGame;
 extern int glMid3Seed[NUMLEVELS];
 extern BOOL gbRunGameResult;
-extern int zoomflag; // weak
+extern int zoomflag;
 extern BOOL gbProcessPlayers;
 extern int glEndSeed[NUMLEVELS];
 extern BOOL gbLoadGame;
-extern HINSTANCE ghInst; // idb
+extern HINSTANCE ghInst;
 extern int DebugMonsters[10];
-extern char cineflag;   // weak
-extern int drawpanflag; // weak
-extern int visiondebug; // weak
-extern int scrollflag;  /* unused */
+extern char cineflag;
+extern int drawpanflag;
+extern int visiondebug;
+extern int scrollflag; /* unused */
 extern BOOL light4flag;
-extern int leveldebug;        // weak
-extern int monstdebug;        // weak
-extern int trigdebug;         /* unused */
-extern int setseed;           // weak
-extern int debugmonsttypes;   // weak
-extern int PauseMode;         // weak
-extern char sgbMouseDown;     // weak
-extern int color_cycle_timer; // weak
+extern int leveldebug;
+extern int monstdebug;
+extern int trigdebug; /* unused */
+extern int setseed;
+extern int debugmonsttypes;
+extern int PauseMode;
+extern char sgbMouseDown;
+extern int color_cycle_timer;
 
 void FreeGameMem();
 BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer);
@@ -173,7 +173,7 @@ extern int framerate;
 extern int framestart;
 #endif
 extern BOOL FriendlyMode;
-extern char *spszMsgTbl[4];    // weak
-extern char *spszMsgKeyTbl[4]; // weak
+extern char *spszMsgTbl[4];
+extern char *spszMsgKeyTbl[4];
 
 #endif /* __DIABLO_H__ */
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 93d07a599..d4bdcf22e 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -15,7 +15,7 @@ int Room_Min = 4;
 int Dir_Xadd[5] = { 0, 0, 1, 0, -1 };
 int Dir_Yadd[5] = { 0, -1, 0, 1, 0 };
 ShadowStruct SPATSL2[2] = { { 6u, 3u, 0u, 3u, 48u, 0u, 50u }, { 9u, 3u, 0u, 3u, 48u, 0u, 50u } };
-//short word_48489A = 0; // weak
+//short word_48489A = 0;
 BYTE BTYPESL2[161] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 17, 18, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 2, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 BYTE BSTYPESL2[161] = { 0, 1, 2, 3, 0, 0, 6, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 6, 6, 6, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 6, 2, 2, 2, 0, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 2, 2, 3, 3, 3, 3, 1, 1, 2, 2, 3, 3, 3, 3, 1, 1, 3, 3, 2, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 BYTE VARCH1[] = { 2, 4, 3, 0, 3, 1, 3, 4, 0, 7, 48, 0, 51, 39, 47, 44, 0, 0 };
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index bb0b919f8..cfab0fe66 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -17,7 +17,7 @@ int SP4y1;
 int SP4y2;
 BYTE L4dungeon[80][80];
 BYTE dung[20][20];
-//int dword_52A4DC; // weak
+//int dword_52A4DC;
 
 const BYTE L4ConvTbl[16] = { 30u, 6u, 1u, 6u, 2u, 6u, 6u, 6u, 9u, 6u, 1u, 6u, 2u, 6u, 3u, 6u };
 const BYTE L4USTAIRS[42] = {
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index 635870b73..330c4f0a8 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -19,7 +19,7 @@ extern int SP4y1;
 extern int SP4y2;
 extern unsigned char L4dungeon[80][80];
 extern unsigned char dung[20][20];
-//int dword_52A4DC; // weak
+//int dword_52A4DC;
 
 void DRLG_LoadL4SP();
 void DRLG_FreeL4SP();
diff --git a/Source/effects.cpp b/Source/effects.cpp
index 6ab717623..527b6a111 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -6,7 +6,7 @@ int sfxdnum;
 HANDLE sfx_stream;
 TSFX *sfx_data_cur;
 
-const char monster_action_sounds[] = { 'a', 'h', 'd', 's' }; // idb
+const char monster_action_sounds[] = { 'a', 'h', 'd', 's' };
 
 /* data */
 
diff --git a/Source/help.cpp b/Source/help.cpp
index b3179e7b1..f83ca699e 100644
--- a/Source/help.cpp
+++ b/Source/help.cpp
@@ -1,10 +1,10 @@
 #include "diablo.h"
 
-int help_select_line; // weak
-int dword_634494;     // weak
+int help_select_line;
+int dword_634494;
 int helpflag;
 int displayinghelp[22]; /* check, does nothing? */
-int HelpTop;            // weak
+int HelpTop;
 
 const char gszHelpText[] = {
 	"$Keyboard Shortcuts:|"
@@ -81,7 +81,6 @@ void InitHelp()
 	dword_634494 = 0;
 	displayinghelp[0] = 0;
 }
-// 634494: using guessed type int dword_634494;
 
 void DrawHelp()
 {
@@ -171,8 +170,6 @@ void DrawHelp()
 
 	PrintSString(0, 23, 1, "Press ESC to end or the arrow keys to scroll.", COL_GOLD, 0);
 }
-// 634490: using guessed type int help_select_line;
-// 634960: using guessed type int HelpTop;
 
 void DrawHelpLine(int always_0, int help_line_nr, char *text, char color)
 {
@@ -200,20 +197,15 @@ void DisplayHelp()
 	helpflag = 1;
 	HelpTop = 5000;
 }
-// 634490: using guessed type int help_select_line;
-// 634960: using guessed type int HelpTop;
 
 void HelpScrollUp()
 {
 	if (help_select_line > 0)
 		help_select_line--;
 }
-// 634490: using guessed type int help_select_line;
 
 void HelpScrollDown()
 {
 	if (help_select_line < HelpTop)
 		help_select_line++;
 }
-// 634490: using guessed type int help_select_line;
-// 634960: using guessed type int HelpTop;
diff --git a/Source/help.h b/Source/help.h
index 91a9188bd..a96c5fb56 100644
--- a/Source/help.h
+++ b/Source/help.h
@@ -2,11 +2,11 @@
 #ifndef __HELP_H__
 #define __HELP_H__
 
-extern int help_select_line; // weak
-extern int dword_634494;     // weak
+extern int help_select_line;
+extern int dword_634494;
 extern int helpflag;
 extern int displayinghelp[22];
-extern int HelpTop; // weak
+extern int HelpTop;
 
 void InitHelp();
 void DrawHelp();
diff --git a/Source/init.h b/Source/init.h
index 547888897..864b1fa78 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -3,7 +3,7 @@
 #define __INIT_H__
 
 extern _SNETVERSIONDATA fileinfo;
-extern int gbActive; // weak
+extern int gbActive;
 extern char diablo_exe_path[MAX_PATH];
 extern HANDLE unused_mpq;
 extern char patch_rt_mpq_path[MAX_PATH];
@@ -11,7 +11,7 @@ extern WNDPROC CurrentProc;
 extern HANDLE diabdat_mpq;
 extern char diabdat_mpq_path[MAX_PATH];
 extern HANDLE patch_rt_mpq;
-extern BOOL killed_mom_parent; // weak
+extern BOOL killed_mom_parent;
 extern BOOLEAN screensaver_enabled_prev;
 
 void init_cleanup(BOOL show_cursor);
diff --git a/Source/mainmenu.h b/Source/mainmenu.h
index 897856a84..4561cede2 100644
--- a/Source/mainmenu.h
+++ b/Source/mainmenu.h
@@ -25,6 +25,6 @@ void mainmenu_play_intro();
 
 /* data */
 
-extern int menu_music_track_id; // idb
+extern int menu_music_track_id;
 
 #endif /* __MAINMENU_H__ */
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 4364fe124..0d79f6054 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -11,7 +11,7 @@ BOOLEAN sgbSaveSoundOn;
 MonsterStruct monster[MAXMONSTERS];
 int totalmonsters;
 CMonster Monsters[16];
-// int END_Monsters_17; // weak
+// int END_Monsters_17;
 int monstimgtot;
 int uniquetrans;
 int nummtypes;
@@ -1025,7 +1025,7 @@ void PlaceUniques()
 	}
 }
 
-void SetMapMonsters(unsigned char *pMap, int startx, int starty)
+void SetMapMonsters(BYTE *pMap, int startx, int starty)
 {
 	WORD rw, rh;
 	WORD *lm;
diff --git a/Source/monster.h b/Source/monster.h
index c59d5e690..bb36d761e 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -9,7 +9,7 @@ extern int nummonsters;
 extern MonsterStruct monster[MAXMONSTERS];
 extern int totalmonsters;
 extern CMonster Monsters[16];
-// int END_Monsters_17; // weak
+// int END_Monsters_17;
 extern int monstimgtot;
 extern int uniquetrans;
 extern int nummtypes;
@@ -30,7 +30,7 @@ void PlaceGroup(int mtype, int num, int leaderf, int leader);
 void LoadDiabMonsts();
 void InitMonsters();
 void PlaceUniques();
-void SetMapMonsters(unsigned char *pMap, int startx, int starty);
+void SetMapMonsters(BYTE *pMap, int startx, int starty);
 void DeleteMonster(int i);
 int AddMonster(int x, int y, int dir, int mtype, BOOL InMap);
 void NewMonsterAnim(int i, AnimStruct *anim, int md);
diff --git a/Source/objects.cpp b/Source/objects.cpp
index a8b73b283..b640aaa96 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1,16 +1,16 @@
 #include "diablo.h"
 
-int trapid;  // weak
-int trapdir; // weak
-unsigned char *pObjCels[40];
+int trapid;
+int trapdir;
+BYTE *pObjCels[40];
 char ObjFileList[40];
 int objectactive[MAXOBJECTS];
-int nobjects; // idb
-int leverid;  // idb
+int nobjects;
+int leverid;
 int objectavail[MAXOBJECTS];
 ObjectStruct object[MAXOBJECTS];
 BOOL InitObjFlag;
-int numobjfiles; // weak
+int numobjfiles;
 
 int bxadd[8] = { -1, 0, 1, -1, 1, -1, 0, 1 };
 int byadd[8] = { -1, -1, -1, 0, 0, 1, 1, 1 };
@@ -837,11 +837,11 @@ void InitObjects()
 	}
 }
 
-void SetMapObjects(unsigned char *pMap, int startx, int starty)
+void SetMapObjects(BYTE *pMap, int startx, int starty)
 {
 	int rw, rh;
 	int i, j;
-	unsigned char *lm, *h;
+	BYTE *lm, *h;
 	long mapoff;
 	int fileload[56];
 	char filestr[32];
@@ -3446,8 +3446,6 @@ void OperateShrine(int pnum, int i, int sType)
 	if (pnum == myplr)
 		NetSendCmdParam2(FALSE, CMD_PLROPOBJ, pnum, i);
 }
-// 52571C: using guessed type int drawpanflag;
-// 676190: using guessed type int deltaload;
 
 void OperateSkelBook(int pnum, int i, BOOL sendmsg)
 {
diff --git a/Source/objects.h b/Source/objects.h
index 50a7ea51e..31807a27d 100644
--- a/Source/objects.h
+++ b/Source/objects.h
@@ -2,17 +2,17 @@
 #ifndef __OBJECTS_H__
 #define __OBJECTS_H__
 
-extern int trapid;  // weak
-extern int trapdir; // weak
-extern unsigned char *pObjCels[40];
+extern int trapid;
+extern int trapdir;
+extern BYTE *pObjCels[40];
 extern char ObjFileList[40];
 extern int objectactive[MAXOBJECTS];
-extern int nobjects; // idb
-extern int leverid;  // idb
+extern int nobjects;
+extern int leverid;
 extern int objectavail[MAXOBJECTS];
 extern ObjectStruct object[MAXOBJECTS];
 extern BOOL InitObjFlag;
-extern int numobjfiles; // weak
+extern int numobjfiles;
 
 void InitObjectGFX();
 void FreeObjectGFX();
@@ -41,7 +41,7 @@ void AddHookedBodies(int freq);
 void AddL4Goodies();
 void AddLazStand();
 void InitObjects();
-void SetMapObjects(unsigned char *pMap, int startx, int starty);
+void SetMapObjects(BYTE *pMap, int startx, int starty);
 void DeleteObject_(int oi, int i);
 void SetupObject(int i, int x, int y, int ot);
 void SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v);
diff --git a/Source/pfile.h b/Source/pfile.h
index 045a80671..58985a6fb 100644
--- a/Source/pfile.h
+++ b/Source/pfile.h
@@ -2,7 +2,7 @@
 #ifndef __PFILE_H__
 #define __PFILE_H__
 
-extern BOOL gbValidSaveFile; // idb
+extern BOOL gbValidSaveFile;
 
 void pfile_init_save_directory();
 void pfile_check_available_space(char *pszDir);
diff --git a/Source/scrollrt.h b/Source/scrollrt.h
index 3510660c3..982e7e486 100644
--- a/Source/scrollrt.h
+++ b/Source/scrollrt.h
@@ -8,7 +8,7 @@ extern BYTE *gpBufEnd;
 extern DWORD level_cel_block;
 extern char arch_draw_type;
 extern DDSURFACEDESC DDS_desc;
-extern int cel_transparency_active; // weak
+extern int cel_transparency_active;
 extern int level_piece_id;
 extern void (*DrawPlrProc)(int, int, int, int, int, BYTE *, int, int, int, int);
 extern int draw_monster_num;
diff --git a/Source/towners.cpp b/Source/towners.cpp
index dc25d63a0..7b073fdf0 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -1,11 +1,11 @@
 #include "diablo.h"
 
-int storeflag; // weak
+int storeflag;
 int sgnCowMsg;
-int numtowners; // idb
+int numtowners;
 DWORD sgdwCowClicks;
-int bannerflag;  // weak // unused 0x6AAC28
-int boyloadflag; // weak
+int bannerflag; // unused 0x6AAC28
+int boyloadflag;
 BYTE *pCowCels;
 TownerStruct towner[16];
 
@@ -222,7 +222,6 @@ void InitBarOwner()
 	strcpy(towner[numtowners]._tName, "Ogden the Tavern owner");
 	numtowners++;
 }
-// 6AAC28: using guessed type int bannerflag;
 
 void InitTownDead()
 {
@@ -288,7 +287,6 @@ void InitBoy()
 	strcpy(towner[numtowners]._tName, "Wirt the Peg-legged boy");
 	numtowners++;
 }
-// 6AAC2C: using guessed type int boyloadflag;
 
 void InitHealer()
 {
@@ -371,7 +369,6 @@ void InitCows()
 		numtowners++;
 	}
 }
-// 6AAC2C: using guessed type int boyloadflag;
 
 void InitTowners()
 {
@@ -389,7 +386,6 @@ void InitTowners()
 	InitBoy();
 	InitCows();
 }
-// 6AAC2C: using guessed type int boyloadflag;
 
 void FreeTownerGFX()
 {
@@ -423,7 +419,6 @@ void TownCtrlMsg(int i)
 		}
 	}
 }
-// 646D00: using guessed type char qtextflag;
 
 void TownBlackSmith()
 {
@@ -593,7 +588,6 @@ void TownerTalk(int first, int t)
 	storeflag = 1;
 	InitQTextMsg(first);
 }
-// 6AAC18: using guessed type int storeflag;
 
 void TalkToTowner(int p, int t)
 {
@@ -938,9 +932,6 @@ void TalkToTowner(int p, int t)
 		CowSFX(p);
 	}
 }
-// 646D00: using guessed type char qtextflag;
-// 679660: using guessed type char gbMaxPlayers;
-// 6AAC18: using guessed type int storeflag;
 
 void CowSFX(int pnum)
 {
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index 974dfcdac..43dee7734 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -4,7 +4,7 @@ BOOL townwarps[3];
 BOOL trigflag;
 int numtrigs;
 TriggerStruct trigs[MAXTRIGGERS];
-int TWarpFrom; // weak
+int TWarpFrom;
 
 int TownDownList[11] = { 716, 715, 719, 720, 721, 723, 724, 725, 726, 727, -1 };
 int TownWarp1List[13] = {
@@ -150,7 +150,6 @@ void InitTownTriggers()
 
 	trigflag = FALSE;
 }
-// 679660: using guessed type char gbMaxPlayers;
 
 void InitL1Triggers()
 {
@@ -776,5 +775,3 @@ void CheckTriggers()
 		}
 	}
 }
-// 679660: using guessed type char gbMaxPlayers;
-// 6ABB30: using guessed type int TWarpFrom;
diff --git a/Source/trigs.h b/Source/trigs.h
index 7fe07eac5..fe7243bbd 100644
--- a/Source/trigs.h
+++ b/Source/trigs.h
@@ -6,7 +6,7 @@ extern BOOL townwarps[3];
 extern BOOL trigflag;
 extern int numtrigs;
 extern TriggerStruct trigs[MAXTRIGGERS];
-extern int TWarpFrom; // weak
+extern int TWarpFrom;
 
 void InitNoTriggers();
 void InitTownTriggers();