Match and link CScriptMailbox and strtold

PrimeDecomp · Nov 2, 2024 · 0b74ded · 0b74ded
1 parent 9dafdad
commit 0b74ded
Show file tree

Hide file tree

Showing 11 changed files with 574 additions and 9 deletions.
diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt
@@ -15235,8 +15235,8 @@ GetTransformMinusOffset__17CPoseAsTransformsCFRC6CSegId = .text:0x80368F7C; // t
 GetRotation__17CPoseAsTransformsCFRC6CSegId = .text:0x80368F9C; // type:function size:0x20 scope:global
 Insert__17CPoseAsTransformsFRC6CSegIdRC9CMatrix3fRC9CVector3f = .text:0x80368FBC; // type:function size:0x74 scope:global
 __ct__17CPoseAsTransformsFUc = .text:0x80369030; // type:function size:0x130 scope:global
-Insert__58TSegIdMapVariableSize<Q217CPoseAsTransforms12CElementType>FRC6CSegIdRCQ217CPoseAsTransforms12CElementType = .text:0x80369160; // type:function size:0xAC scope:global
-Clear__58TSegIdMapVariableSize<Q217CPoseAsTransforms12CElementType>Fv = .text:0x8036920C; // type:function size:0x44 scope:global
+Insert__58TSegIdMapVariableSize<Q217CPoseAsTransforms12CElementType>FRC6CSegIdRCQ217CPoseAsTransforms12CElementType = .text:0x80369160; // type:function size:0xAC scope:weak
+Clear__58TSegIdMapVariableSize<Q217CPoseAsTransforms12CElementType>Fv = .text:0x8036920C; // type:function size:0x44 scope:weak
 CreateRumbleHandle__12CRumbleVoiceFUs = .text:0x80369250; // type:function size:0x4C scope:global
 OwnsSustained__12CRumbleVoiceCFs = .text:0x8036929C; // type:function size:0x38 scope:global
 GetIntensity__12CRumbleVoiceCFv = .text:0x803692D4; // type:function size:0x4C scope:global

diff --git a/configure.py b/configure.py
@@ -466,7 +466,7 @@ def MatchingFor(*versions):
             Object(Matching, "MetroidPrime/Weapons/CPowerBeam.cpp"),
             Object(NonMatching, "MetroidPrime/Weapons/CWaveBeam.cpp"),
             Object(NonMatching, "MetroidPrime/Weapons/CIceBeam.cpp"),
-            Object(NonMatching, "MetroidPrime/CScriptMailbox.cpp"),
+            Object(Matching, "MetroidPrime/CScriptMailbox.cpp"),
             Object(Matching, "MetroidPrime/ScriptObjects/CScriptRelay.cpp"),
             Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp"),
             Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp"),
@@ -1228,7 +1228,7 @@ def MatchingFor(*versions):
             Object(Matching, "Runtime/sscanf.c"),
             Object(Matching, "Runtime/string.c"),
             Object(Matching, "Runtime/float.c"),
-            Object(NonMatching, "Runtime/strtold.c"),
+            Object(Matching, "Runtime/strtold.c"),
             Object(Matching, "Runtime/uart_console_io.c"),
             Object(Matching, "Runtime/wchar_io.c"),
             Object(Matching, "Runtime/e_acos.c"),

diff --git a/include/Kyoto/Animation/CPoseAsTransforms.hpp b/include/Kyoto/Animation/CPoseAsTransforms.hpp
@@ -3,15 +3,18 @@
 
 #include "types.h"
 
-#include "MetroidPrime/TGameTypes.hpp"
-
+#include "Kyoto/Animation/CSegId.hpp"
 #include "Kyoto/Math/CTransform4f.hpp"
 
 #include "rstl/reserved_vector.hpp"
 #include "rstl/single_ptr.hpp"
 
 class CPoseAsTransforms {
 public:
+  class CElementType {
+
+  };
+
   const CMatrix3f& GetRotation(const CSegId& id) const;
 private:
   CSegId x0_nextId;

diff --git a/include/MetroidPrime/CWorld.hpp b/include/MetroidPrime/CWorld.hpp
@@ -46,7 +46,7 @@ class CRelay /* name? */ {
   explicit CRelay(CInputStream& in);
   const TEditorId& GetRelayId() const { return x0_relay; }
   const TEditorId& GetTargetId() const { return x4_target; }
-  ushort GetMessage() const { return x8_msg; }
+  const ushort& GetMessage() const { return x8_msg; }
   bool GetActive() const { return xa_active; }
 
   static rstl::vector< CRelay > ReadMemoryRelays(CInputStream& in); // name?

diff --git a/libc/float.h b/libc/float.h
@@ -11,12 +11,16 @@ extern "C" {
 #define FLT_MIN 1.175494351e-38f
 
 #define DBL_DIG 6
-#define DBL_MIN 5.8774717e-39
-#define DBL_MAX						(* (double *) __double_max)
+#define DBL_MIN (*(double*)__double_min)
+#define DBL_MAX (*(double*)__double_max)
 #define DBL_EPSILON 1.1920929e-07
 
 #define DBL_MANT_DIG 53
 
+#define LDBL_MAX (*(long double*)__extended_max)
+#define LDBL_EPSILON (*(long double*)__extended_epsilon)
+#define LDBL_MIN (*(long double*)__extended_min)
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/libc/limits.h b/libc/limits.h
@@ -13,6 +13,8 @@
 #endif
 
 #define SHRT_MAX 0x7fff
+#define SHRT_MIN (~SHRT_MAX)
+
 #define USHRT_MAX 0xffffU
 
 #define INT_MAX 0x7fffffff

diff --git a/libc/locale.h b/libc/locale.h
@@ -32,6 +32,7 @@ struct lconv {
   char int_n_sign_posn;
 };
 
+extern struct lconv __lconv;
 #ifdef __cplusplus
 }
 #endif

diff --git a/libc/math.h b/libc/math.h
@@ -56,6 +56,10 @@ extern _INT32 __float_huge[];
 extern _INT32 __float_nan[];
 extern _INT32 __double_huge[];
 extern _INT32 __extended_huge[];
+extern _INT32 __extended_min[];
+extern _INT32 __extended_max[];
+extern _INT32 __extended_epsilon[];
+extern _INT32 __double_min[];
 extern _INT32 __double_max[];
 
 #define HUGE_VAL (*(double*)__double_huge)
@@ -217,6 +221,7 @@ static inline double scalbn(double x, int n) { return ldexp(x, n); }
 static inline float scalbnf(float x, int n) { return (float)ldexpf(x, n); }
 double nextafter(double, double);
 
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/libc/stdio.h b/libc/stdio.h
@@ -128,6 +128,8 @@ size_t fwrite(const void*, size_t memb_size, size_t num_memb, FILE*);
 int fseek(FILE* file, long offset, int mode);
 size_t __fwrite(const void*, size_t, size_t, FILE*);
 
+int __StringRead(void* isc, int ch, int Action);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/MetroidPrime/Player/CPlayerStuckTracker.cpp b/src/MetroidPrime/Player/CPlayerStuckTracker.cpp
@@ -56,6 +56,7 @@ bool CPlayer::CPlayerStuckTracker::IsPlayerStuck() {
   max1 = *_getElementBoundsCheck(x148_, 0);
   CAABox box1(min1, max1);
   CAABox box(*_getElementBoundsCheck(x148_, 0), *_getElementBoundsCheck(x148_, 0));
+  return true;
 }
 
 void CPlayer::CPlayerStuckTracker::ResetStats() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ struct lconv { @@
       char int_n_sign_posn;
     };
+    extern struct lconv __lconv;
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@