diff --git a/data/file_list.yml b/data/file_list.yml index 08d8bd9a..1217d897 100644 --- a/data/file_list.yml +++ b/data/file_list.yml @@ -291011,35 +291011,35 @@ Project/Camera/CameraInterpole.o: label: - _ZN2al15CameraInterpoleC1Ev - _ZN2al15CameraInterpoleC2Ev - status: NotDecompiled + status: Matching - offset: 0xa49e24 size: 1088 label: _ZN2al15CameraInterpole5startEPKNS_12CameraTicketEfi - status: NotDecompiled + status: Matching - offset: 0xa4a264 size: 1876 label: _ZN2al15CameraInterpole6updateERKN4sead12LookAtCameraE - status: NotDecompiled + status: NonMatchingMajor - offset: 0xa4a9b8 size: 36 label: _ZNK2al15CameraInterpole8isActiveEv - status: NotDecompiled + status: Matching - offset: 0xa4a9dc size: 436 label: _ZNK2al15CameraInterpole16makeLookAtCameraEPN4sead12LookAtCameraE - status: NotDecompiled + status: Matching - offset: 0xa4ab90 size: 76 label: _ZN2al15CameraInterpole14lerpFovyDegreeEf - status: NotDecompiled + status: Matching - offset: 0xa4abdc size: 108 label: _ZN2al15CameraInterpole11exeDeactiveEv - status: NotDecompiled + status: Matching - offset: 0xa4ac48 size: 360 label: _ZN2al15CameraInterpole16exeActiveHermiteEv - status: NotDecompiled + status: Matching - offset: 0xa4adb0 size: 520 label: '' @@ -291047,24 +291047,24 @@ Project/Camera/CameraInterpole.o: - offset: 0xa4afb8 size: 996 label: _ZN2al15CameraInterpole26exeActiveHermiteDistanceHVEv - status: NotDecompiled + status: NonMatchingMajor - offset: 0xa4b39c size: 1164 label: _ZN2al15CameraInterpole20exeActiveRotateAxisYEv - status: NotDecompiled + status: NonMatchingMajor - offset: 0xa4b828 size: 416 label: _ZN2al15CameraInterpole16exeActiveBrigadeEv - status: NotDecompiled + status: Matching - offset: 0xa4b9c8 size: 84 label: _ZN2al15CameraInterpoleD2Ev - status: NotDecompiled + status: Matching lazy: true - offset: 0xa4ba1c size: 92 label: _ZN2al15CameraInterpoleD0Ev - status: NotDecompiled + status: Matching lazy: true - offset: 0xa4ba78 size: 112 diff --git a/lib/al/Library/Camera/CameraInterpole.cpp b/lib/al/Library/Camera/CameraInterpole.cpp index 32664673..06bc0102 100644 --- a/lib/al/Library/Camera/CameraInterpole.cpp +++ b/lib/al/Library/Camera/CameraInterpole.cpp @@ -176,7 +176,6 @@ void CameraInterpole::update(const sead::LookAtCamera& camera) { rotateVectorDegree(&v53, v53, a3, v54[i].x); rotateVectorDegree(&v53, v53, a1, v54[i].y); alCameraPoserFunction::CameraCollisionHitResult v52; - memset(&v52, 0, 24); v52.mCollisionLocation = 3; if (alCameraPoserFunction::checkFirstCameraCollisionArrow( diff --git a/lib/al/Library/Camera/CameraPoserFunction.h b/lib/al/Library/Camera/CameraPoserFunction.h index fd9e2d47..5247161c 100644 --- a/lib/al/Library/Camera/CameraPoserFunction.h +++ b/lib/al/Library/Camera/CameraPoserFunction.h @@ -15,9 +15,9 @@ class PlacementInfo; namespace alCameraPoserFunction { struct CameraCollisionHitResult { - sead::Vector3f mCollisionHitPos; - sead::Vector3f mTriangleNormal; - int mCollisionLocation; + sead::Vector3f mCollisionHitPos = {0.0f, 0.0f, 0.0f}; + sead::Vector3f mTriangleNormal = {0.0f, 0.0f, 0.0f}; + int mCollisionLocation = 0; }; void getViewIndex(const al::CameraPoser*);