--- a/mm7_data.h	Sun Jun 09 16:06:12 2013 +0200
+++ b/mm7_data.h	Sun Jun 09 16:27:57 2013 +0200
@@ -543,12 +543,10 @@
 extern char byte_4FAA2E; // weak
 extern int amuint_4FAA34; // weak
 extern int amuint_4FAA38; // weak
-extern int amuint_4FAA3C_blt_xy[2];
-extern int am_uint_4FAA44_blt_xy[2];
+
 extern int amuint_4FAA4C; // weak
-extern unsigned int uCardID; // idb
-extern std::array<int, 2> amuint_4FAA54_blt_xy;
-extern std::array<int, 2> amuint_4FAA5C_blt_xy;
+
+
 extern int dword_4FAA64; // weak
 extern int dword_4FAA68; // weak
 
@@ -557,14 +555,13 @@
 extern char am_byte_4FAA75; // weak
 extern char am_byte_4FAA76; // weak
 
-extern std::array<int, 777> amuint_4FAA78; // weak
+
 extern char am_byte_4FAA7C[777]; // weak
-extern std::array<int, 777> amuint_4FAA80; // weak
-extern std::array<int, 777> amuint_4FAA84; // weak
+
 extern int amuint_4FAA88[777]; // weak
 extern int amuint_4FAA8C[777]; // weak
 extern int amuint_4FAA90[777][2];
-extern int dword_4FABB8; // weak
+
 
 
 extern int amuint_4FABC4; // weak
@@ -758,8 +755,8 @@
 extern int dword_591178_teleporty; // weak
 extern int dword_59117C_teleportx; // weak
 extern std::array<std::array<char, 100>, 6> byte_591180; // idb
-extern std::array<struct NPCData *, 60> HouseNPCData; //this array size temporarily increased to 60 from 6 to work aroud house overflow
-
+extern std::array<struct NPCData *, 7> HouseNPCData; //0this array size temporarily increased to 60 from 6 to work aroud house overflow
+extern GUIButton* dword_5913F4[6];
 extern struct Texture *pTexture_591428;
 extern struct Texture *pTexture_outside; // idb
 extern struct Texture *pTexture_Dialogue_Background;