From 337874ee737605488cd97d67f3977fbdfdd6386d Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 26 Oct 2024 08:59:18 +0200 Subject: [PATCH] bombf actorPostCreate matching --- config/SOUE01/symbols.txt | 2 +- src/REL/d/a/d_a_bombf.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index a9b6f235..fd12079c 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -17845,7 +17845,7 @@ YrotS__6mMtx_cFRC4mAng = .text:0x802F17C0; // type:function size:0xBC YrotM__6mMtx_cFRC4mAng = .text:0x802F1880; // type:function size:0x4C mMtx__ZrotS = .text:0x802F18D0; // type:function size:0xBC ZrotM__6mMtx_cFRC4mAng = .text:0x802F1990; // type:function size:0x4C -mMtx__ZXYrotS = .text:0x802F19E0; // type:function size:0x60 +ZXYrotS__6mMtx_cFRC4mAngRC4mAngRC4mAng = .text:0x802F19E0; // type:function size:0x60 mMtx__ZXYrotM = .text:0x802F1A40; // type:function size:0x60 mMtx__XYZrotS = .text:0x802F1AA0; // type:function size:0x60 mMtx__ZYXrotM = .text:0x802F1B00; // type:function size:0x60 diff --git a/src/REL/d/a/d_a_bombf.cpp b/src/REL/d/a/d_a_bombf.cpp index ebfe08f0..0714e4a5 100644 --- a/src/REL/d/a/d_a_bombf.cpp +++ b/src/REL/d/a/d_a_bombf.cpp @@ -57,11 +57,10 @@ int dAcBombf_c::actorPostCreate() { mVec3_c v4 = position - v * 10.0f; if (dBgS_ObjLinChk::LineCross(&v3, &v4, this)) { - dBgS_ObjLinChk &chk = dBgS_ObjLinChk::GetInstance(); - position = chk.GetLinEnd(); + position = dBgS_ObjLinChk::GetInstance().GetLinEnd(); if (rotation.x == 0 && rotation.z == 0 && dBgS_ObjLinChk::ChkGround()) { cM3dGPla pla; - dBgS::GetInstance()->GetTriPla(chk, &pla); + dBgS::GetInstance()->GetTriPla(dBgS_ObjLinChk::GetInstance(), &pla); rotation.x = pla.GetAngle(rotation.y); rotation.z = pla.GetAngle(rotation.y - 0x4000); }