diff mm7_data.h @ 412:bbd8888534dc

Merge
author Nomad
date Sat, 23 Feb 2013 16:02:04 +0200
parents 6cb79ea315ba
children 55684f4eda73 88c30918eef7 d0355e4f9be8
line wrap: on
line diff
--- a/mm7_data.h	Sat Feb 23 16:00:21 2013 +0200
+++ b/mm7_data.h	Sat Feb 23 16:02:04 2013 +0200
@@ -1000,8 +1000,9 @@
 extern void *off_4EFDB0; // weak
 extern int dword_4F031C[]; // weak
 extern const char *off_4F03B8[]; // idb
-extern __int16 word_4F03FE[]; // weak
-extern __int16 word_4F0400[]; // weak
+//extern __int16 word_4F03FE[]; // weak
+//extern __int16 word_4F0400[]; // weak
+extern __int16 word_4F0404[];
 extern __int16 word_4F0498[]; // weak
 extern __int16 word_4F0576[]; // weak
 extern __int16 word_4F0578[]; // weak
@@ -2307,7 +2308,7 @@
 void __fastcall sub_4B2001(signed int a1);
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
 const char *__fastcall sub_4B29F2(int a1);
-char __cdecl sub_4B2A74();
+char __cdecl SimpleHouseDialog();
 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
 int __thiscall sub_4B3703(void *_this);
 int __thiscall sub_4B3A72(int a1); // idb
@@ -2320,22 +2321,22 @@
 struct GUIButton *__thiscall _4B4224_UpdateNPCTopics(int _this);
 char __fastcall sub_4B46A5(const char *Str, int a5);
 int __fastcall sub_4B46F8(int a1);
-int __cdecl ui_training();
+int __cdecl TrainingDialog();
 char *__cdecl sub_4B4F4F();
-int __cdecl ui_shop_teachers();
-int __cdecl sub_4B5D7C();
+int __cdecl MagicShopDialog();
+int __cdecl GuildDialog();
 int __cdecl sub_4B6478();
 bool __fastcall sub_4B68EA(int a1);
 void __cdecl TravelByTransport();
-int __cdecl sub_4B705E();
+int __cdecl TampleDialog();
 void __cdecl sub_4B7911();
 void __cdecl _4B7D7E_bank();
-void __cdecl sub_4B8285_prolly_draw_arcomage_result();
+void __cdecl TavernDialog();
 void *__cdecl GenerateShopItems();
 void *__cdecl sub_4B8F94();
-char *__cdecl _4B910F_shop_interaction();
-POINT *__cdecl sub_4B9CC6();
-void __cdecl sub_4BA928();
+char *__cdecl WeaponShopDialog();
+POINT *__cdecl AlchemistDialog();
+void __cdecl ArmorShopDialog();
 signed int __fastcall sub_4BB756(signed int a1);
 const char *sub_4BBA85_bounties();
 void __cdecl sub_4BBCDD();