From a43906c96b1b0272a1000d403371a93fea2c77c8 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 2 Dec 2023 22:59:55 -0500 Subject: [PATCH] d_a_obj_zouK OK --- configure.py | 2 +- src/d/actor/d_a_obj_zouK.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.py b/configure.py index 933d5ea01..82279f461 100644 --- a/configure.py +++ b/configure.py @@ -1583,7 +1583,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_vtil"), ActorRel(NonMatching, "d_a_obj_vyasi"), ActorRel(NonMatching, "d_a_obj_xfuta"), - ActorRel(NonMatching, "d_a_obj_zouK", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_zouK", extra_cflags=['-pragma "nosyminline on"']), ActorRel(NonMatching, "d_a_oship"), ActorRel(NonMatching, "d_a_ph"), ActorRel(NonMatching, "d_a_pt"), diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index ba66021cf..d47450629 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -216,7 +216,7 @@ BOOL daObjZouk::Act_c::jokai_demo() { /* 000012F0-00001510 .text _execute__Q29daObjZouk5Act_cFv */ bool daObjZouk::Act_c::_execute() { - /* Nonmatching */ + fopAc_ac_c* actor = this; set_mtx(); texture_scroll(); fopAcM_rollPlayerCrash(this, 288.0f, 0x0D); @@ -229,7 +229,7 @@ bool daObjZouk::Act_c::_execute() { if (mBgAfter->ChkUsed()) bgsp->Release(mBgAfter); if (!mBgBefore->ChkUsed()) { - bgsp->Regist(mBgBefore, this); + bgsp->Regist(mBgBefore, actor); mBgBefore->SetCrrFunc(NULL); mBgMode = 0; } @@ -241,7 +241,7 @@ bool daObjZouk::Act_c::_execute() { if (mBgMode == 0 && dComIfGs_isCollect(0, 1) && mBgBefore != NULL && mBgAfter != NULL) { if (mBgBefore->ChkUsed()) bgsp->Release(mBgBefore); - bgsp->Regist(mBgAfter, this); + bgsp->Regist(mBgAfter, actor); mBgAfter->SetCrrFunc(NULL); mBgMode = 1; }