format

sonicdcer · Aug 7, 2024 · 696fc30 · 696fc30
1 parent 6aa9728
commit 696fc30
Showing 4 changed files with 91 additions and 333 deletions.
diff --git a/config/symbols.us.ric.txt b/config/symbols.us.ric.txt
@@ -1,2 +1,2 @@
 g_RicFactoryBlueprints = 0x80154A6C;
-UpdateEntityRichter = 0x80157BFC;
+UpdateEntityRichter = 0x80157BFC;
diff --git a/src/ric/2A060.c b/src/ric/2A060.c
@@ -707,7 +707,8 @@ void func_80167964(Entity* entity) {
                             FLAG_UNK_04000000 | FLAG_UNK_10000;
         }
         if (!(entity->params & 0xFF00)) {
-            g_Entities[D_80155D30[entity->animFrameDuration]].palette = PAL_OVL(0x140);
+            g_Entities[D_80155D30[entity->animFrameDuration]].palette =
+                PAL_OVL(0x140);
         }
         g_Entities[D_80155D30[entity->animFrameDuration]].ext.player.unkA4 = 4;
         entity->animFrameDuration++;

diff --git a/src/ric/d_19C70.c b/src/ric/d_19C70.c
@@ -34,14 +34,7 @@ s16 D_80155D30[] = {
     0x0002, 0x0002, 0x0002, 0x0003, 0x0002, 0x0004, 0x0000, 0x0000};
 
 s16 D_80155D64[4][6] = {
-    {
-        2,
-        -2,
-        0,
-        -4,
-        0,
-        0
-    },
+    {2, -2, 0, -4, 0, 0},
     {
         -3,
         -3,

diff --git a/src/ric/d_19EE0.c b/src/ric/d_19EE0.c
@@ -4,329 +4,93 @@ s32 D_80155EE0[] = {0x00000F80, 0x00000100, 0x00000700, 0x00000880};
 
 s16 D_80155EF0[] = {0x0400, 0x06AB, 0x0955, 0x0C00, 0x0EAB, 0x1155};
 
-SVECTOR D_80155EFC = {
-    -8,
-    -72,
-    -4,
-    0
-};
-
-SVECTOR D_80155F04 = {
-    8,
-    -72,
-    -4,
-    0
-};
-
-SVECTOR D_80155F0C = {
-    -48,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F14 = {
-    -8,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F1C = {
-    8,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F24 = {
-    48,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F2C = {
-    -48,
-    -16,
-    -4,
-    0
-};
-
-SVECTOR D_80155F34 = {
-    -8,
-    -16,
-    -4,
-    0
-};
-
-SVECTOR D_80155F3C = {
-    8,
-    -16,
-    -4,
-    0
-};
-
-SVECTOR D_80155F44 = {
-    48,
-    -16,
-    -4,
-    0
-};
-
-SVECTOR D_80155F4C = {
-    -8,
-    72,
-    -4,
-    0
-};
-
-SVECTOR D_80155F54[] = {
-    8,
-    72,
-    -4,
-    0,
-    -24,
-    -48,
-    -4,
-    0
-};
-
-SVECTOR D_80155F64 = {
-    -8,
-    -48,
-    -4,
-    0
-};
-
-SVECTOR D_80155F6C[] = {
-    8,
-    -48,
-    -4,
-    0,
-    24,
-    -48,
-    -4,
-    0
-};
-
-SVECTOR D_80155F7C = {
-    -24,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F84 = {
-    24,
-    -32,
-    -4,
-    0
-};
-
-SVECTOR D_80155F8C = {
-    -24,
-    -16,
-    -4,
-    0
-};
-
-SVECTOR D_80155F94[] = {
-    24,
-    -16,
-    -4,
-    0,
-    -24,
-    0,
-    -4,
-    0
-};
-
-SVECTOR D_80155FA4 = {
-    -8,
-    0,
-    -4,
-    0
-};
-
-SVECTOR D_80155FAC[] = {
-    8,
-    0,
-    -4,
-    0,
-    24,
-    0,
-    -4,
-    0
-};
-
-SVECTOR D_80155FBC = {
-    -8,
-    -72,
-    4,
-    0
-};
-
-SVECTOR D_80155FC4 = {
-    8,
-    -72,
-    4,
-    0
-};
-
-SVECTOR D_80155FCC = {
-    -48,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_80155FD4 = {
-    -8,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_80155FDC = {
-    8,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_80155FE4 = {
-    48,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_80155FEC = {
-    -48,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_80155FF4 = {
-    -8,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_80155FFC = {
-    8,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_80156004 = {
-    48,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_8015600C = {
-    -8,
-    72,
-    4,
-    0
-};
-
-SVECTOR D_80156014 = {
-    8,
-    72,
-    4,
-    0
-};
-
-SVECTOR D_8015601C = {
-    -24,
-    -48,
-    4,
-    0
-};
-
-SVECTOR D_80156024 = {
-    -8,
-    -48,
-    4,
-    0
-};
-
-SVECTOR D_8015602C = {
-    8,
-    -48,
-    4,
-    0
-};
-
-SVECTOR D_80156034 = {
-    24,
-    -48,
-    4,
-    0
-};
-
-SVECTOR D_8015603C = {
-    -24,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_80156044 = {
-    24,
-    -32,
-    4,
-    0
-};
-
-SVECTOR D_8015604C = {
-    -24,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_80156054 = {
-    24,
-    -16,
-    4,
-    0
-};
-
-SVECTOR D_8015605C = {
-    -24,
-    0,
-    4,
-    0
-};
-
-SVECTOR D_80156064 = {
-    -8,
-    0,
-    4,
-    0
-};
-
-SVECTOR D_8015606C = {
-    8,
-    0,
-    4,
-    0
-};
-
-SVECTOR D_80156074 = {
-    24,
-    0,
-    4,
-    0
-};
+SVECTOR D_80155EFC = {-8, -72, -4, 0};
+
+SVECTOR D_80155F04 = {8, -72, -4, 0};
+
+SVECTOR D_80155F0C = {-48, -32, -4, 0};
+
+SVECTOR D_80155F14 = {-8, -32, -4, 0};
+
+SVECTOR D_80155F1C = {8, -32, -4, 0};
+
+SVECTOR D_80155F24 = {48, -32, -4, 0};
+
+SVECTOR D_80155F2C = {-48, -16, -4, 0};
+
+SVECTOR D_80155F34 = {-8, -16, -4, 0};
+
+SVECTOR D_80155F3C = {8, -16, -4, 0};
+
+SVECTOR D_80155F44 = {48, -16, -4, 0};
+
+SVECTOR D_80155F4C = {-8, 72, -4, 0};
+
+SVECTOR D_80155F54[] = {8, 72, -4, 0, -24, -48, -4, 0};
+
+SVECTOR D_80155F64 = {-8, -48, -4, 0};
+
+SVECTOR D_80155F6C[] = {8, -48, -4, 0, 24, -48, -4, 0};
+
+SVECTOR D_80155F7C = {-24, -32, -4, 0};
+
+SVECTOR D_80155F84 = {24, -32, -4, 0};
+
+SVECTOR D_80155F8C = {-24, -16, -4, 0};
+
+SVECTOR D_80155F94[] = {24, -16, -4, 0, -24, 0, -4, 0};
+
+SVECTOR D_80155FA4 = {-8, 0, -4, 0};
+
+SVECTOR D_80155FAC[] = {8, 0, -4, 0, 24, 0, -4, 0};
+
+SVECTOR D_80155FBC = {-8, -72, 4, 0};
+
+SVECTOR D_80155FC4 = {8, -72, 4, 0};
+
+SVECTOR D_80155FCC = {-48, -32, 4, 0};
+
+SVECTOR D_80155FD4 = {-8, -32, 4, 0};
+
+SVECTOR D_80155FDC = {8, -32, 4, 0};
+
+SVECTOR D_80155FE4 = {48, -32, 4, 0};
+
+SVECTOR D_80155FEC = {-48, -16, 4, 0};
+
+SVECTOR D_80155FF4 = {-8, -16, 4, 0};
+
+SVECTOR D_80155FFC = {8, -16, 4, 0};
+
+SVECTOR D_80156004 = {48, -16, 4, 0};
+
+SVECTOR D_8015600C = {-8, 72, 4, 0};
+
+SVECTOR D_80156014 = {8, 72, 4, 0};
+
+SVECTOR D_8015601C = {-24, -48, 4, 0};
+
+SVECTOR D_80156024 = {-8, -48, 4, 0};
+
+SVECTOR D_8015602C = {8, -48, 4, 0};
+
+SVECTOR D_80156034 = {24, -48, 4, 0};
+
+SVECTOR D_8015603C = {-24, -32, 4, 0};
+
+SVECTOR D_80156044 = {24, -32, 4, 0};
+
+SVECTOR D_8015604C = {-24, -16, 4, 0};
+
+SVECTOR D_80156054 = {24, -16, 4, 0};
+
+SVECTOR D_8015605C = {-24, 0, 4, 0};
+
+SVECTOR D_80156064 = {-8, 0, 4, 0};
+
+SVECTOR D_8015606C = {8, 0, 4, 0};
+
+SVECTOR D_80156074 = {24, 0, 4, 0};
 
 SVECTOR* D_8015607C[][4] = {
     &D_80155F14, &D_80155F1C, &D_80155F3C, &D_80155F34, &D_8015601C,