From 0e82b07cf2ef257d80fc5549100fbadb88d6c0a6 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Mon, 16 Oct 2023 04:42:11 -0400
Subject: [PATCH]  d_throwstone match

---
 configure.py           | 2 +-
 src/d/d_throwstone.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.py b/configure.py
index e97303784..70ad8691f 100644
--- a/configure.py
+++ b/configure.py
@@ -486,7 +486,7 @@ config.libs = [
             Object(NonMatching, "d/d_s_room.cpp"),
             Object(Matching,    "d/d_s_title.cpp"),
             Object(NonMatching, "d/d_scope.cpp"),
-            Object(NonMatching, "d/d_throwstone.cpp"),
+            Object(Matching,    "d/d_throwstone.cpp"),
             Object(NonMatching, "d/d_timer.cpp"),
             Object(NonMatching, "d/d_water_mark.cpp"),
             Object(NonMatching, "d/d_wind_arrow.cpp"),
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 0a6c7c944..81e43fac8 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -29,7 +29,7 @@ public:
 const char daThrowstone_c::M_arcname[] = "Aisi";
 
 /* 8023B544-8023B564       .text CheckCreateHeap__FP10fopAc_ac_c */
-s32 CheckCreateHeap(fopAc_ac_c* i_actor) {
+static s32 CheckCreateHeap(fopAc_ac_c* i_actor) {
     daThrowstone_c* i_this = (daThrowstone_c*)i_actor;
     return i_this->CreateHeap();
 }
@@ -86,8 +86,10 @@ BOOL daThrowstone_c::_execute() {
     dDemo_setDemoData(this, 0x6a, NULL, NULL, 0, NULL, 0, 0);
 
     mpModel->setBaseScale(mScale);
-    mDoMtx_stack_c::transS(getPosition());
-    mDoMtx_stack_c::ZXYrotM(shape_angle);
+    f32 pos_x = current.pos.x;
+    mDoMtx_stack_c::transS(pos_x, current.pos.y, current.pos.z);
+    s16 rot_x = shape_angle.x;
+    mDoMtx_stack_c::ZXYrotM(rot_x, shape_angle.y, shape_angle.z);
 
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);