From 09365b4c004ea72807dc80c92b9ce13bcf1e759e Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 13 Oct 2023 17:45:23 -0700
Subject: [PATCH] d_s_open match

---
 configure.py           |  2 +-
 src/d/d_s_open.cpp     | 12 +++++++-----
 src/d/d_throwstone.cpp |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/configure.py b/configure.py
index 380210db5..60d5d91e5 100644
--- a/configure.py
+++ b/configure.py
@@ -480,7 +480,7 @@ config.libs = [
             Object(NonMatching, "d/d_s_logo.cpp"),
             Object(NonMatching, "d/d_s_menu.cpp"),
             Object(NonMatching, "d/d_s_name.cpp"),
-            Object(NonMatching, "d/d_s_open.cpp"),
+            Object(Matching,    "d/d_s_open.cpp"),
             Object(NonMatching, "d/d_s_open_sub.cpp"),
             Object(NonMatching, "d/d_s_play.cpp"),
             Object(NonMatching, "d/d_s_room.cpp"),
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index d9596ee8f..76f97a8d1 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -12,6 +12,7 @@
 #include "d/d_procname.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
+#include "m_Do/m_Do_graphic.h"
 
 class dScnOpen_message_c;
 class J2DScreen;
@@ -57,11 +58,12 @@ s32 dScnOpen_c::create() {
         field_0x1d4 = NULL;
         mDoExt_restoreCurrentHeap();
         mDoExt_adjustSolidHeap(solid_heap);
-        // mDoGph_gInf_c::setTickRate();
+        mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30);
+        return cPhs_COMPLEATE_e;
     } else if (rt == cPhs_ERROR_e) {
         JUT_ASSERT(0x48, rt == cPhs_COMPLEATE_e);
+        return rt;
     }
-    return rt;
 }
 
 /* 80232BC4-80232CAC       .text execute__10dScnOpen_cFv */
@@ -145,7 +147,7 @@ s32 dScnOpen_Create(scene_class* i_scn) {
     return i_this->create();
 }
 
-static scene_method_class l_dScnOpen_Method = {
+scene_method_class l_dScnOpen_Method = {
     (process_method_func)dScnOpen_Create,
     (process_method_func)dScnOpen_Delete,
     (process_method_func)dScnOpen_Execute,
@@ -158,7 +160,7 @@ extern scene_process_profile_definition g_profile_OPEN_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPEN_SCENE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcNd_Method.mBase,
     sizeof(dScnOpen_c),
     0,
     0,
@@ -172,7 +174,7 @@ extern scene_process_profile_definition g_profile_OPEN2_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPEN2_SCENE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcNd_Method.mBase,
     sizeof(dScnOpen_c),
     0,
     0,
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 9d1cf0076..0a6c7c944 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -87,7 +87,7 @@ BOOL daThrowstone_c::_execute() {
 
     mpModel->setBaseScale(mScale);
     mDoMtx_stack_c::transS(getPosition());
-    mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
+    mDoMtx_stack_c::ZXYrotM(shape_angle);
 
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
@@ -121,7 +121,7 @@ BOOL daThrowstoneIsDelete(void*) {
     return TRUE;
 }
 
-static actor_method_class l_daThrowstone_Method = {
+actor_method_class daThrowstoneMethodTable = {
     (process_method_func)daThrowstoneCreate,
     (process_method_func)daThrowstoneDelete,
     (process_method_func)daThrowstoneExecute,
@@ -140,7 +140,7 @@ actor_process_profile_definition g_profile_THROWSTONE = {
     0,
     &g_fopAc_Method.base,
     0x01CE,
-    &l_daThrowstone_Method,
+    &daThrowstoneMethodTable,
     fopAcStts_CULL_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,