summaryrefslogtreecommitdiff
path: root/libs/JSystem/J3DGraphLoader
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-04-21 05:27:47 -0700
committerGitHub <noreply@github.com>2024-04-21 15:27:47 +0300
commitb24b477fc4b641e58069455cdabfe80d5d0995b4 (patch)
tree9fa859e8d7bd9be5129191d349cad1da2f61f1a5 /libs/JSystem/J3DGraphLoader
parent151c5099abdddb91c8c4cf3565c0c5075a0e0146 (diff)
d_a_tag_firewall done (#2137)
* mostly fix TVec3 ctors * d_a_tag_firewall done * remove asm
Diffstat (limited to 'libs/JSystem/J3DGraphLoader')
-rw-r--r--libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index 4044cdf604..2a70e00f52 100644
--- a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -13,6 +13,8 @@
//
extern "C" u16* func_8033677C(const void*, const void*); // JSUConvertOffsetToPtr<u16>
+extern "C" void* __nw__FUl();
+extern "C" void __ct__8J3DJointFv();
/* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
@@ -24,7 +26,16 @@ J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
}
/* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text create__15J3DJointFactoryFi */
-J3DJoint* J3DJointFactory::create(int no) {
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm J3DJoint* J3DJointFactory::create(int param_0) {
+ nofralloc
+#include "asm/JSystem/J3DGraphLoader/J3DJointFactory/create__15J3DJointFactoryFi.s"
+}
+#pragma pop
+
+/* J3DJoint* J3DJointFactory::create(int no) {
J3DJoint* joint = new J3DJoint();
joint->mJntNo = no;
joint->mKind = getKind(no);
@@ -39,4 +50,4 @@ J3DJoint* J3DJointFactory::create(int no) {
joint->mScaleCompensate = 0;
return joint;
-} \ No newline at end of file
+} */ \ No newline at end of file