comparison mm7_data.h @ 412:bbd8888534dc

Merge
author Nomad
date Sat, 23 Feb 2013 16:02:04 +0200
parents 6cb79ea315ba
children 55684f4eda73 88c30918eef7 d0355e4f9be8
comparison
equal deleted inserted replaced
411:747933903b1c 412:bbd8888534dc
998 extern int dword_4EFA80; // weak 998 extern int dword_4EFA80; // weak
999 extern int dword_4EFA84; // weak 999 extern int dword_4EFA84; // weak
1000 extern void *off_4EFDB0; // weak 1000 extern void *off_4EFDB0; // weak
1001 extern int dword_4F031C[]; // weak 1001 extern int dword_4F031C[]; // weak
1002 extern const char *off_4F03B8[]; // idb 1002 extern const char *off_4F03B8[]; // idb
1003 extern __int16 word_4F03FE[]; // weak 1003 //extern __int16 word_4F03FE[]; // weak
1004 extern __int16 word_4F0400[]; // weak 1004 //extern __int16 word_4F0400[]; // weak
1005 extern __int16 word_4F0404[];
1005 extern __int16 word_4F0498[]; // weak 1006 extern __int16 word_4F0498[]; // weak
1006 extern __int16 word_4F0576[]; // weak 1007 extern __int16 word_4F0576[]; // weak
1007 extern __int16 word_4F0578[]; // weak 1008 extern __int16 word_4F0578[]; // weak
1008 extern __int16 word_4F05AE[]; // weak 1009 extern __int16 word_4F05AE[]; // weak
1009 extern char _4F063C_smthn_by_2da_uType[]; // weak 1010 extern char _4F063C_smthn_by_2da_uType[]; // weak
2305 void __fastcall HousePlaySomeSound(unsigned int uHouseID, int a2); // idb 2306 void __fastcall HousePlaySomeSound(unsigned int uHouseID, int a2); // idb
2306 void __cdecl sub_4B1ECE(); 2307 void __cdecl sub_4B1ECE();
2307 void __fastcall sub_4B2001(signed int a1); 2308 void __fastcall sub_4B2001(signed int a1);
2308 char *__thiscall _4B254D_SkillMasteryTeacher(int _this); 2309 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
2309 const char *__fastcall sub_4B29F2(int a1); 2310 const char *__fastcall sub_4B29F2(int a1);
2310 char __cdecl sub_4B2A74(); 2311 char __cdecl SimpleHouseDialog();
2311 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2); 2312 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
2312 int __thiscall sub_4B3703(void *_this); 2313 int __thiscall sub_4B3703(void *_this);
2313 int __thiscall sub_4B3A72(int a1); // idb 2314 int __thiscall sub_4B3A72(int a1); // idb
2314 int __fastcall sub_4B3AD4(signed int a1); 2315 int __fastcall sub_4B3AD4(signed int a1);
2315 int __fastcall sub_4B3B42(signed int a1); 2316 int __fastcall sub_4B3B42(signed int a1);
2318 void __fastcall sub_4B3FE5(int a4); 2319 void __fastcall sub_4B3FE5(int a4);
2319 void __cdecl sub_4B40E6(); 2320 void __cdecl sub_4B40E6();
2320 struct GUIButton *__thiscall _4B4224_UpdateNPCTopics(int _this); 2321 struct GUIButton *__thiscall _4B4224_UpdateNPCTopics(int _this);
2321 char __fastcall sub_4B46A5(const char *Str, int a5); 2322 char __fastcall sub_4B46A5(const char *Str, int a5);
2322 int __fastcall sub_4B46F8(int a1); 2323 int __fastcall sub_4B46F8(int a1);
2323 int __cdecl ui_training(); 2324 int __cdecl TrainingDialog();
2324 char *__cdecl sub_4B4F4F(); 2325 char *__cdecl sub_4B4F4F();
2325 int __cdecl ui_shop_teachers(); 2326 int __cdecl MagicShopDialog();
2326 int __cdecl sub_4B5D7C(); 2327 int __cdecl GuildDialog();
2327 int __cdecl sub_4B6478(); 2328 int __cdecl sub_4B6478();
2328 bool __fastcall sub_4B68EA(int a1); 2329 bool __fastcall sub_4B68EA(int a1);
2329 void __cdecl TravelByTransport(); 2330 void __cdecl TravelByTransport();
2330 int __cdecl sub_4B705E(); 2331 int __cdecl TampleDialog();
2331 void __cdecl sub_4B7911(); 2332 void __cdecl sub_4B7911();
2332 void __cdecl _4B7D7E_bank(); 2333 void __cdecl _4B7D7E_bank();
2333 void __cdecl sub_4B8285_prolly_draw_arcomage_result(); 2334 void __cdecl TavernDialog();
2334 void *__cdecl GenerateShopItems(); 2335 void *__cdecl GenerateShopItems();
2335 void *__cdecl sub_4B8F94(); 2336 void *__cdecl sub_4B8F94();
2336 char *__cdecl _4B910F_shop_interaction(); 2337 char *__cdecl WeaponShopDialog();
2337 POINT *__cdecl sub_4B9CC6(); 2338 POINT *__cdecl AlchemistDialog();
2338 void __cdecl sub_4BA928(); 2339 void __cdecl ArmorShopDialog();
2339 signed int __fastcall sub_4BB756(signed int a1); 2340 signed int __fastcall sub_4BB756(signed int a1);
2340 const char *sub_4BBA85_bounties(); 2341 const char *sub_4BBA85_bounties();
2341 void __cdecl sub_4BBCDD(); 2342 void __cdecl sub_4BBCDD();
2342 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb 2343 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb
2343 void __cdecl ArenaFight(); 2344 void __cdecl ArenaFight();