Mercurial > mm7
diff mm7_data.cpp @ 468:8822405efad2
Слияние
author | Ritor1 |
---|---|
date | Mon, 25 Feb 2013 11:10:57 +0600 |
parents | 91e1ba340f39 f7b91ef98ab2 |
children | 0dbf780e247f |
line wrap: on
line diff
--- a/mm7_data.cpp Mon Feb 25 11:09:55 2013 +0600 +++ b/mm7_data.cpp Mon Feb 25 11:10:57 2013 +0600 @@ -1620,7 +1620,7 @@ }; //__int16 word_4F03FE[777]; // weak //__int16 word_4F0400[777]; // weak -__int16 word_4F0404[] = +/*__int16 word_4F0404[] = { 0, 0, 1, 0x17, 0x1B, 0x14, 0x14, 1, 0x17, 0x18, 0x1C, 0x14, 2, 0x17, 0x18, 0x19, 0x14, 2, 0x1B, 0x1B, 0x1A, 0x1A, @@ -1629,9 +1629,9 @@ 3, 0x1C, 0x1C, 0x19, 0x19, 2, 0x17, 0x17, 0x18, 0x18, 3, 0x17, 0x17, 0x1A, 0x1A, 2, 0x1E, 0x1A, 0x1A, 0x1A, 2, 0x1C, 0x19, 0x1C, 0x1D, 0, 0 -}; +};*/ //__int16 word_4F0498[777]; // weak -__int16 word_4F0498[] = +/*__int16 word_4F0498[] = { 1, 0x23, 0x23, 0x26, 0x26, 1, 0x1F, 0x1F, 0x1F, 0x22, 1, 0x23, 0x23, 0x26, 0x26, 1, 0x1F, 0x1F, 0x20, 0x22, 2, 0x23, 0x23, @@ -1643,9 +1643,9 @@ 0x22, 0x22, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x1F, 0x1F, 0x20, 0x20, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x20, 0x20, 0x20, 0x21, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x1F, 0x1F, 0x1F, 0x20 -}; +};*/ //__int16 word_4F0576[777]; // weak -__int16 word_4F0576[] = +/*__int16 word_4F0576[] = { 0x23, 0x23, 0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 4, 0x23, 0x23, 0x26, 0x26, @@ -1656,18 +1656,16 @@ 0xA2, 0xA1, 0xA0, 2, 0, 0x0A3, 0x0A3, 0xA2, 0xA1, 0xA0, 3, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0, 3, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0 -}; +};*/ -__int16 word_4F0578[777]; // weak -__int16 word_4F05AE[777]; // weak -char _4F063C_smthn_by_2da_uType[31]={ // weak -0, 6, 8, 12, 12, 0, 0, 0, 0, 0, 0, 0, 2, 0, 25, 0, 30, -0, 20, 0, 20, 0, 2, 0, 23, 0, 24, 0, 28, 0, 20}; -__int16 word_4F063E[290]; -__int16 word_4F06D8[22]; +//__int16 word_4F0578[777]; // weak +//__int16 word_4F05AE[777]; // weak + +//__int16 word_4F063E[290]; +//__int16 word_4F06D8[22]; __int16 word_4F0704[40]; __int16 word_4F0754[49]; -__int16 word_4F07B6[88]; +//__int16 word_4F07B6[88]; __int16 word_4F0866[14]; __int16 _4F0882_evt_VAR_PlayerItemInHands_vals[54]= {