some rough MoveObj s3dModel stuff

Author: ThePlayerRolo

config/GLME01/splits.txt

@@ -61,6 +61,9 @@ Unsorted/TitleScreenPane.cpp:
 	.text       start:0x8003A430 end:0x8003AF2C
 	.ctors      start:0x8020BAEC end:0x8020BAF0
 
+Unsorted/s3dmodel.cpp:
+	.text       start:0x80058368 end:0x80058850
+
 Unsorted/800627D8.cpp:
 	.text       start:0x800627D0 end:0x800627E8
 	.sbss       start:0x804D872C end:0x804D8730
@@ -71,6 +74,9 @@ Unsorted/8006385C.cpp:
 Unsorted/InGameFlagsUtil.cpp:
 	.text       start:0x80065FA4 end:0x80066D74
 
+Unsorted/MoveObj.cpp:
+	.text       start:0x800677D0 end:0x800685DC
+
 Unsorted/RailInfoUtil.cpp:
 	.text       start:0x80092568 end:0x8009359C
 

config/GLME01/symbols.txt

@@ -1565,8 +1565,8 @@ fn_8005833C = .text:0x8005833C; // type:function size:0x18
 fn_80058354 = .text:0x80058354; // type:function size:0x8
 fn_8005835C = .text:0x8005835C; // type:function size:0x8
 fn_80058364 = .text:0x80058364; // type:function size:0x4
-fn_80058368 = .text:0x80058368; // type:function size:0x30
-fn_80058398 = .text:0x80058398; // type:function size:0x464
+__ct__8S3DModelFll = .text:0x80058368; // type:function size:0x30
+init__8S3DModelFll = .text:0x80058398; // type:function size:0x464
 fn_800587FC = .text:0x800587FC; // type:function size:0x54
 fn_80058850 = .text:0x80058850; // type:function size:0xC8
 fn_80058918 = .text:0x80058918; // type:function size:0x98
@@ -1760,7 +1760,7 @@ fn_8006722C = .text:0x8006722C; // type:function size:0x1B4
 fn_800673E0 = .text:0x800673E0; // type:function size:0x40
 fn_80067420 = .text:0x80067420; // type:function size:0x33C
 fn_8006775C = .text:0x8006775C; // type:function size:0x74
-fn_800677D0 = .text:0x800677D0; // type:function size:0x1C4
+__ct__7MoveObjFv = .text:0x800677D0; // type:function size:0x1C4
 fn_80067994 = .text:0x80067994; // type:function size:0x64
 fn_800679F8 = .text:0x800679F8; // type:function size:0x50
 fn_80067A48 = .text:0x80067A48; // type:function size:0x4C
@@ -12852,7 +12852,7 @@ jumptable_8033B0BC = .data:0x8033B0BC; // type:object size:0x2C scope:local
 lbl_8033B0E8 = .data:0x8033B0E8; // type:object size:0x68
 lbl_8033B150 = .data:0x8033B150; // type:object size:0xA data:string
 lbl_8033B15C = .data:0x8033B15C; // type:object size:0xC
-lbl_8033B168 = .data:0x8033B168; // type:object size:0x48
+__vt__7MoveObj = .data:0x8033B168; // type:object size:0x48
 lbl_8033B1B0 = .data:0x8033B1B0; // type:object size:0xE data:string
 lbl_8033B1C0 = .data:0x8033B1C0; // type:object size:0x17 data:string
 lbl_8033B1D8 = .data:0x8033B1D8; // type:object size:0xA data:string

configure.py

@@ -767,9 +767,11 @@ def MatchingFor(*versions):
         Object(NonMatching, "Unsorted/80007018.cpp"),
         Object(NonMatching, "Unsorted/LMDvdFileBlock.cpp"),
         Object(NonMatching, "Unsorted/80005EB8.cpp"),
+        Object(NonMatching, "Unsorted/MoveObj.cpp"),
         Object(NonMatching, "Unsorted/RailInfoUtil.cpp"),
         Object(NonMatching, "Unsorted/800627D8.cpp"),
         Object(NonMatching, "Unsorted/LMDisplayUtil.cpp"),
+        Object(NonMatching, "Unsorted/s3dmodel.cpp"),
     ]),
 ]
 

include/Unsorted/MoveObj.hpp

@@ -20,7 +20,8 @@ class MoveObj {
 
     inline s32 get_3C() const { return _3C; }
 public:
-    /* 0x004 */ u8 _0[0x38];
+    /* 0x004 */ u8 _0[0x34];
+    /* 0x038 */ s32 _38;
     /* 0x03C */ s32 _3C;
     /* 0x040 */ u8 _40[0x788 - 0x40];
 };

include/Unsorted/s3dmodel.hpp

@@ -0,0 +1,28 @@
+#ifndef S3DMODEL_H_
+#define S3DMODEL_H_
+
+#include <types.h>
+#include <dolphin/mtx.h>
+
+
+class S3DModel {
+public:
+    struct  unkS3DModel_1 {
+        /* 0x00 */ s32 _0;
+        /* 0x04 */ s32 _4;
+        /* 0x08 */ u16 _8;
+        /* 0x0A */ u16 _A;
+        /* 0x0C */ u16 _C;
+    };
+
+    S3DModel(unkS3DModel_1*, s32);
+
+    void init(unkS3DModel_1*, s32);
+
+public:
+    /* 0x00 */ s32 _0;
+    /* 0x04 */ unkS3DModel_1* _4;
+    // size: 0x118
+};
+
+#endif

src/Unsorted/MoveObj.cpp

@@ -0,0 +1,6 @@
+#include "Unsorted/MoveObj.hpp"
+
+
+MoveObj::MoveObj() {
+
+}

src/Unsorted/s3dmodel.cpp

@@ -0,0 +1,33 @@
+#include "Unsorted/s3dmodel.hpp"
+#include "JSystem/JKernel/JKRHeap.hpp"
+#include <dolphin/os.h>
+
+S3DModel::S3DModel(unkS3DModel_1* param_1, s32 param_2) {
+    init(param_1, param_2);
+}
+
+void S3DModel::init(unkS3DModel_1* param_1, s32 param_2) {
+    _0 = 0;
+    _4 = param_1;
+
+    s32 iVar1;
+    if (_4 != nullptr) {
+        iVar1 =  _4->_8 + _4->_C;
+    } else {
+        iVar1 = param_2;
+    }
+
+    if (param_2 != 0 && param_2 > iVar1) {
+        OSErrorLine(119, "");
+    }
+
+    s32 sizeBase1 = (param_2 * 4);
+    sizeBase1 *= 48;
+
+    void* ppVar2 = JKRAllocFromHeap(nullptr, sizeBase1 + (sizeBase1 * 12), 4);
+
+    if (ppVar2 == nullptr) {
+        OSErrorLine(130, "");
+    }
+
+}