changeset 410:6cb79ea315ba

small fix, please revise if you agree or not
author zipi
date Sat, 23 Feb 2013 12:56:29 +0000
parents 90099d811d4f
children bbd8888534dc
files mm7_2.cpp mm7_4.cpp mm7_data.cpp mm7_data.h
diffstat 4 files changed, 47 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_2.cpp	Sat Feb 23 18:44:57 2013 +0600
+++ b/mm7_2.cpp	Sat Feb 23 12:56:29 2013 +0000
@@ -992,8 +992,8 @@
     }
     v3 = 5 * v2;
     v2 = (signed int)v0->ptr_1C;
-    v4 = word_4F03FE[v3];
-    v5 = word_4F0400[5 * v2 + rand() % 4];
+    v4 = word_4F0404[v3 - 4];
+    v5 = word_4F0404[5 * v2 + rand() % 4 - 2];
     goto LABEL_13;
   }
 LABEL_15:
--- a/mm7_4.cpp	Sat Feb 23 18:44:57 2013 +0600
+++ b/mm7_4.cpp	Sat Feb 23 12:56:29 2013 +0000
@@ -10440,7 +10440,7 @@
         if ( v1 )
           v21 = word_4F063E[(signed int)v20];
         else
-          v21 = word_4F03FE[(signed int)v20];
+          v21 = word_4F0404[(signed int)v20 - 4];//word_4F03FE[(signed int)v20];
         v22 = v21 - 23;
         if ( v22 )
         {
--- a/mm7_data.cpp	Sat Feb 23 18:44:57 2013 +0600
+++ b/mm7_data.cpp	Sat Feb 23 12:56:29 2013 +0000
@@ -1594,12 +1594,48 @@
   "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF",
   "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF",
   "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF",
-  "MAGSHELF"
+  "MAGSHELF", "MAGSHELF", "MAGSHELF"
+};
+//__int16 word_4F03FE[777]; // weak
+//__int16 word_4F0400[777]; // weak
+__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,
+	4, 0x18, 0x1E, 0x19, 0x1B, 4, 0x18, 0x1E, 0x19, 0x1B, 3, 0x1E,
+	0x18, 0x14, 0x14, 2, 0x14, 0x14, 0x14, 0x14, 3, 0x1B, 0x1B, 0x1A, 0x1A,
+	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_4F03FE[777]; // weak
-__int16 word_4F0400[777]; // weak
-__int16 word_4F0498[777]; // weak
-__int16 word_4F0576[777]; // weak
+//__int16 word_4F0498[777]; // weak
+__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,
+0x26, 0x26, 2, 0x1F, 0x20, 0x20, 0x21, 2, 0x23, 0x23,
+0x26, 0x26, 2, 0x1F, 0x1F, 0x20, 0x20, 4, 0x23, 0x23,
+0x26, 0x26, 4, 0x1F, 0x20, 0x21, 0x22, 4, 0x23, 0x23, 0x26, 0x26,
+4, 0x1F, 0x20, 0x21, 0x22, 3, 0x23, 0x23, 0x26, 0x26, 3,
+0x1F, 0x1F, 0x1F, 0x1F, 2, 0x23, 0x23, 0x26, 0x26, 2, 0x1F, 0x20,
+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[] =
+{
+0x23, 0x23, 0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 3, 0x23, 0x23,
+0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 4, 0x23, 0x23, 0x26, 0x26,
+4, 0x21, 0x1F, 0x20, 0x22, 0x1, 0x1, 0x2, 0x2, 0x4, 0x4,
+3, 2, 2, 2, 2, 2, 2, 0, 0x1, 0x1, 0x2, 0x2, 0x3, 0x3, 0x4, 0x4,
+2, 2, 2, 2, 0x0, 0x0, 1, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0,
+2, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0, 2, 0, 0xA3, 0xA3,
+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[777]; // weak
--- a/mm7_data.h	Sat Feb 23 18:44:57 2013 +0600
+++ b/mm7_data.h	Sat Feb 23 12:56:29 2013 +0000
@@ -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