more simple J2D/J3D funcs (#166)

* more simple J2D/J3D funcs

* JPABaseShape constructor

* fmt

Co-authored-by: lepelog <25211966+lepelog@users.noreply.github.com>

7 files changed, 2 insertions, 38 deletions

diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index 124c12632e..dc78fc43d9 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -3238,7 +3238,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
 extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
 extern "C" void JMAEulerToQuat__FsssP10Quaternion();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetChanAmbColor();
 extern "C" void GXLoadNrmMtxImm();
 extern "C" void __register_global_object();
 extern "C" void __destroy_arr();
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 65313866f8..441c99ea92 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -258,16 +258,13 @@ extern "C" void frameInit__13J3DDrawBufferFv();
 extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
 extern "C" void draw__13J3DDrawBufferCFv();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetArray();
 extern "C" void GXPixModeSync();
 extern "C" void GXPeekZ();
-extern "C" void GXSetPointSize();
 extern "C" void GXGetTexObjWidth();
 extern "C" void GXGetTexObjHeight();
 extern "C" void GXGetTexObjWrapS();
 extern "C" void GXGetTexObjWrapT();
 extern "C" void GXGetTexObjTlut();
-extern "C" void GXSetColorUpdate();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void _savefpr_26();
@@ -1985,7 +1982,7 @@ SECTION_DATA static _GXColor l_imageDrawColor[4] = {{0xFF, 0x00, 0x00, 0x00},
 /* 803A8D8C-803A8D9C 005EAC 0010+00 0/1 0/0 0/0 .data            l_tevColorChan$5438 */
 #pragma push
 #pragma force_active on
-SECTION_DATA static GXTevColor l_tevColorChan[4] = {GX_CH_RED, GX_CH_BLUE, GX_CH_GREEN,
+SECTION_DATA static GXTevColor l_tevColorChan[4] = {GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE,
                                                     GX_CH_ALPHA};
 #pragma pop
 
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index ade576a67a..b70262a10d 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -337,7 +337,6 @@ extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f();
 extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void GXInitLightAttn();
-extern "C" void GXSetChanAmbColor();
 extern "C" void __register_global_object();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index d968dc9a1d..0dc21219a2 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -33,11 +33,6 @@ struct daPy_py_c {
     /* 8015F424 */ void checkNowWolfEyeUp();
 };
 
-struct JPABaseParticle {
-    /* 80280548 */ void getWidth(JPABaseEmitter const*) const;
-    /* 80280568 */ void getHeight(JPABaseEmitter const*) const;
-};
-
 struct dPa_windPcallBack {
     /* 8004B4E0 */ void execute(JPABaseEmitter*, JPABaseParticle*);
     /* 8004FF2C */ ~dPa_windPcallBack();
@@ -48,26 +43,6 @@ struct dPa_wbPcallBack_c {
     /* 8004FECC */ ~dPa_wbPcallBack_c();
 };
 
-struct JPADrawInfo {};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct JPAEmitterManager {
-    /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
-    /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
-                                              JPAEmitterCallBack*, JPAParticleCallBack*);
-    /* 8027DFA0 */ void calc(u8);
-    /* 8027E028 */ void draw(JPADrawInfo const*, u8);
-    /* 8027E220 */ void forceDeleteAllEmitter();
-    /* 8027E344 */ void entryResourceManager(JPAResourceManager*, u8);
-    /* 8027E354 */ void clearResourceManager(u8);
-};
-
 struct dPa_simpleData_c {
     /* 8004B024 */ ~dPa_simpleData_c();
     /* 8004B060 */ dPa_simpleData_c();
@@ -466,12 +441,8 @@ extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
 extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
 extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
 extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
-extern "C" void GXClearVtxDesc();
 extern "C" void GXInvalidateVtxCache();
 extern "C" void GXFlush();
-extern "C" void GXEnableTexOffsets();
-extern "C" void GXSetChanAmbColor();
-extern "C" void GXSetColorUpdate();
 extern "C" void GXLoadNrmMtxImm();
 extern "C" void __register_global_object();
 extern "C" void __destroy_new_array();
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 866b1d5dd8..31214dd964 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -1053,7 +1053,7 @@ s32 fopAcM_checkCullingBox(Mtx pMtx, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32
     Vec tmp1 = {x1, y1, z1};
     Vec tmp2 = {x2, y2, z2};
     Mtx tmpMtx;
-    PSMTXConcat(j3dSys.mMtx, pMtx, tmpMtx);
+    PSMTXConcat(j3dSys.mViewMtx, pMtx, tmpMtx);
     return mDoLib_clipper::mClipper.clip(tmpMtx, &tmp2, &tmp1) != 0;
 }
 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index e850d25c3e..18c0856a13 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -527,7 +527,6 @@ extern "C" void JMAEulerToQuat__FsssP10Quaternion();
 extern "C" void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion();
 extern "C" void DCStoreRangeNoSync();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetArray();
 extern "C" void GXGetTexObjWidth();
 extern "C" void GXGetTexObjHeight();
 extern "C" void GXSetTexCoordScaleManually();
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
index 5d49d2f4a0..ee74a13928 100644
--- a/src/m_Do/m_Do_lib.cpp
+++ b/src/m_Do/m_Do_lib.cpp
@@ -31,7 +31,6 @@ extern "C" f32 mFovyRate__14mDoLib_clipper;
 extern "C" void init__11J3DUClipperFv();
 extern "C" void calcViewFrustum__11J3DUClipperFv();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXMultVec();
 extern "C" void __register_global_object();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();