Merge branch 'master' into license

Xeeynamo · Sep 6, 2024 · 68c0bb6 · 68c0bb6
2 parents 09598b4 + 4a471b4
commit 68c0bb6
Show file tree

Hide file tree

Showing 60 changed files with 4,521 additions and 1,700 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -224,19 +224,16 @@ set(SOURCE_FILES_RIC
     src/ric/24788.c
     src/ric/2A060.c
     src/ric/319C4.c
-    src/ric/d_188F4.c
-    src/ric/d_194B0.c
-    src/ric/d_19EE0.c
     src/ric/spriteparts.c
     src/ric/1CB04.c
     src/ric/202A8.c
     src/ric/21250.c
     src/ric/26C84.c
     src/ric/2C4C4.c
+    src/ric/e_giant_spinning_cross.c
     src/ric/bss.c
     src/ric/d_18568.c
-    src/ric/d_18C40.c
-    src/ric/d_19C70.c
+    src/ric/pl_anims.c
 )
 
 set(SOURCE_FILES_TT_000

diff --git a/config/splat.us.ric.yaml b/config/splat.us.ric.yaml
@@ -38,34 +38,37 @@ segments:
       - [0x170AC, .data, spriteparts]
       - [0x18568, .data, d_18568]
       - [0x18688, assets, subweapondefs, D_80154688]
-      - [0x188F4, .data, d_188F4]
-      - [0x1895C, .data, 21250]
+      - [0x188F4, .data, 21250]
+      - [0x1895C, .data, 21250] # g_RicEntityTbl
       - [0x18A6C, assets, factory_blueprint, g_RicFactoryBlueprints]
-      - [0x18C40, .data, d_18C40]
-      - [0x194B0, .data, d_194B0]
-      - [0x19C70, .data, d_19C70]
-      - [0x19EE0, .data, d_19EE0]
-      - [0x1A444, .rodata, 1AC60] #UpdateEntityRichter
+      - [0x18C40, .data, 24788]
+      - [0x18ED4, .data, 24788] # func_80162C84
+      - [0x18F7C, .data, 26C84]
+      - [0x1938C, .data, pl_anims]    
+      - [0x199AC, .data, 2A060]
+      - [0x19D94, .data, 2C4C4]
+      - [0x19EE0, .data, 319C4]
+      - [0x19EFC, .data, e_giant_spinning_cross]
+      - [0x1A444, .rodata, 1AC60] # UpdateEntityRichter
       - [0x1A5E0, .rodata, 1AC60]
       - [0x1A5F0, .rodata, 1CB04]
       - [0x1A7A8, .rodata, 1FCD0]
       - [0x1A7C0, .rodata, 202A8]
       - [0x1A800, .rodata, 20920]
       - [0x1A80C, .rodata, 21250]
       - [0x1A918, .rodata, 24788]
-      - [0x1A9D0, .rodata, 26C84]
-      - [0x1A9E8, .rodata, 26C84] #EntityPlayerBlinkWhite
+      - [0x1A9D0, .rodata, 24788] # func_80162C84
+      - [0x1A9E8, .rodata, 26C84] # EntityPlayerBlinkWhite
       - [0x1AA28, .rodata, 2A060]
       - [0x1AAA0, .rodata, 2A060]
       - [0x1AABC, .rodata, 2C4C4]
-      - [0x1AAD4, .rodata, 2C4C4] #EntitySubwpnCrashCross
-      - [0x1AAEC, .rodata, 2C4C4] #EntityRichterRevivalColumn
-      - [0x1AB04, .rodata, 2C4C4] #EntityCrossBoomerang
-      - [0x1AB24, .rodata, 2C4C4] #EntitySubwpnAgunea
+      - [0x1AAD4, .rodata, 2C4C4] # RicEntitySubwpnCrashCross
+      - [0x1AAEC, .rodata, 2C4C4] # RicEntityRevivalColumn
+      - [0x1AB04, .rodata, 2C4C4] # RicEntitySubwpnCross
+      - [0x1AB24, .rodata, 2C4C4] # RicEntitySubwpnAgunea
       - [0x1AB38, .rodata, 319C4]
-      - [0x1AB50, .rodata, 319C4]
-      - [0x1AB68, .rodata, 319C4]
-      - [0x1AC50, .rodata, 319C4]
+      - [0x1AB68, .rodata, e_giant_spinning_cross]
+      - [0x1AC50, .rodata, e_giant_spinning_cross]
       - [0x1AC60, c, 1AC60]
       - [0x1CB04, c, 1CB04]
       - [0x1FCD0, c, 1FCD0]
@@ -77,5 +80,12 @@ segments:
       - [0x2A060, c, 2A060]
       - [0x2C4C4, c, 2C4C4]
       - [0x319C4, c, 319C4]
-      - [0x37B64, .bss, bss]
+      - [0x359A4, c, 319C4]
+      - [0x3728C, c, e_giant_spinning_cross]
+      - [0x37B64, .bss, 1CB04]
+      - [0x37F80, .bss, 21250]
+      - [0x38000, .bss, 2A060]
+      - [0x38088, .bss, 2C4C4]
+      - [0x39894, .bss, 319C4]
+      - [0x398E0, .bss, bss]
   - [0x39A58]
diff --git a/config/symbols.hd.txt b/config/symbols.hd.txt
@@ -778,7 +778,7 @@ g_api_func_80133950 = 0x8003C884;
 g_api_func_800F27F4 = 0x8003C888;
 g_api_func_800FF110 = 0x8003C88C;
 g_api_func_800FD664 = 0x8003C890;
-g_api_func_800FD5BC = 0x8003C894;
+g_api_CalcPlayerDamage = 0x8003C894;
 g_api_LearnSpell = 0x8003C898;
 g_api_DebugInputWait = 0x8003C89C;
 g_api_unused12C = 0x8003C8A0;

diff --git a/config/symbols.us.txt b/config/symbols.us.txt
@@ -800,7 +800,7 @@ g_api_func_80133950 = 0x8003C884;
 g_api_func_800F27F4 = 0x8003C888;
 g_api_func_800FF110 = 0x8003C88C;
 g_api_func_800FD664 = 0x8003C890;
-g_api_func_800FD5BC = 0x8003C894;
+g_api_CalcPlayerDamage = 0x8003C894;
 g_api_LearnSpell = 0x8003C898;
 g_api_DebugInputWait = 0x8003C89C;
 g_api_unused12C = 0x8003C8A0;

diff --git a/include/common.h b/include/common.h
@@ -127,7 +127,7 @@ int sprintf(char* dst, const char* fmt, ...);
 #define PAD_FIELD(size) const CRITICAL_PAD_FIELD(size)
 #define STATIC_PAD_BSS(size) static CRITICAL_PAD_FIELD(size)
 #define STATIC_PAD_DATA(size) STATIC_PAD_BSS(size) = {0}
-#define STATIC_PAD_RODATA(size) static const STATIC_PAD_BSS(size) = {0}
+#define STATIC_PAD_RODATA(size) const STATIC_PAD_BSS(size) = {0}
 #else
 #define PAD_FIELD(size)
 #define STATIC_PAD_BSS(size)