Merge pull request #2 from DerpPrincess/richterdatafixes

Richterdatafixes

config/symbols.us.ric.txt

@@ -1,11 +1,2 @@
-g_PlOvlSpritesheet = 0x8013C020;
 g_RicFactoryBlueprints = 0x80154A6C;
-D_80154CF4 = 0x80154CF4;
-D_80154E5C = 0x80154E5C;
-D_8015519C = 0x8015519C;
-D_80155368 = 0x80155368;
-D_80155964 = 0x80155964;
-D_80155D9C = 0x80155D9C; // type:s32 size:0x40
-D_80155DDC = 0x80155DDC; // type:u16 size:0x60
-UpdateEntityRichter = 0x80157BFC;
-D_80155EFC = 0xD_80155EFC; // type:s16 size:0x180
+UpdateEntityRichter = 0x80157BFC;

src/ric/2A060.c

@@ -707,7 +707,7 @@ void func_80167964(Entity* entity) {
                             FLAG_UNK_04000000 | FLAG_UNK_10000;
         }
         if (!(entity->params & 0xFF00)) {
-            g_Entities[D_80155D30[entity->animFrameDuration]].palette = 0x8140;
+            g_Entities[D_80155D30[entity->animFrameDuration]].palette = PAL_OVL(0x140);
         }
         g_Entities[D_80155D30[entity->animFrameDuration]].ext.player.unkA4 = 4;
         entity->animFrameDuration++;

src/ric/319C4.c

@@ -2106,8 +2106,8 @@ void EntitySubwpnBible(Entity* self) {
     }
 }
 
-const SVECTOR D_80156C50 = {0x0000, 0x0000, 0x0000, 0x0000};
-const SVECTOR D_80156C58 = {0xFFA0, 0x0000, 0x0000, 0x0000};
+static const SVECTOR D_80156C50 = {0x0000, 0x0000, 0x0000, 0x0000};
+static const SVECTOR D_80156C58 = {0xFFA0, 0x0000, 0x0000, 0x0000};
 
 void EntityGiantSpinningCross(Entity* self) {
     MATRIX m;

src/ric/d_19C70.c

@@ -35,36 +35,36 @@ s16 D_80155D30[] = {
 
 s16 D_80155D64[4][6] = {
     {
-        0x0002,
-        0xFFFE,
-        0x0000,
-        0xFFFC,
-        0x0000,
-        0x0000,
+        2,
+        -2,
+        0,
+        -4,
+        0,
+        0
     },
     {
-        0xFFFD,
-        0xFFFD,
-        0xFFFF,
-        0x0001,
-        0x0002,
-        0x0000,
+        -3,
+        -3,
+        -1,
+        1,
+        2,
+        0,
     },
     {
-        0xFFFC,
-        0xFFFD,
-        0x0002,
-        0xFFFE,
-        0xFFFE,
-        0x0002,
+        -4,
+        -3,
+        2,
+        -2,
+        -2,
+        2,
     },
     {
-        0xFFFF,
-        0x0000,
-        0x0000,
-        0xFFFC,
-        0x0003,
-        0x0003,
+        -1,
+        0,
+        0,
+        -4,
+        3,
+        3,
     },
 };