diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index b41fa2ca..b3267e9f 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -18373,7 +18373,7 @@ lbl_803E2298 = .data:0x803E2298; // type:object size:0xC data:4byte lbl_803E22A4 = .data:0x803E22A4; // type:object size:0x2CC __vt__8CBSTaunt = .data:0x803E2570; // type:object size:0x38 __vt__26CScriptDebugCameraWaypoint = .data:0x803E25A8; // type:object size:0x6C -lbl_803E2618 = .data:0x803E2618; // type:object size:0x70 +__vt__34CScriptSpiderBallAttractionSurface = .data:0x803E2618; // type:object size:0x70 __vt__11CBSScripted = .data:0x803E2688; // type:object size:0x38 lbl_803E26C0 = .data:0x803E26C0; // type:object size:0x2D0 lbl_803E2990 = .data:0x803E2990; // type:object size:0x20 diff --git a/configure.py b/configure.py index 85e7cb5e..89573255 100755 --- a/configure.py +++ b/configure.py @@ -796,7 +796,7 @@ config.libs = [ "MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.cpp", ), Object( - NonMatching, + MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.cpp", ), Object( diff --git a/src/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.cpp b/src/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.cpp index 2c681437..59dc8aa6 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.cpp @@ -8,7 +8,7 @@ CScriptSpiderBallAttractionSurface::CScriptSpiderBallAttractionSurface( : CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic), CActorParameters::None(), kInvalidUniqueId) , xe8_scale(scale) -, xf4_aabb(CAABox(-CVector3f(scale.GetX() * 0.5f, scale.GetY() * 0.5f, scale.GetZ() * 0.5f), +, xf4_aabb(CAABox(CVector3f(-(scale.GetX() * 0.5f), -(scale.GetY() * 0.5f), -(scale.GetZ() * 0.5f)), CVector3f(scale.GetX() * 0.5f, scale.GetY() * 0.5f, scale.GetZ() * 0.5f)) .GetTransformedAABox(xf.GetRotation())) {}