Merge 950304dbef into e815a23f5f

Co-authored-by: Alex Larbe <alex.larbe@outlook.com>

.github/workflows/compile-check.yml

@@ -67,7 +67,7 @@ jobs:
           exit 1
         fi
     - name: Upload build artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: odyssey
         path: build/odyssey

.github/workflows/pr-status-label-new.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.event_name == 'pull_request_target' && github.event.action == 'opened'
     steps:
       - name: Label new PR as "status:waiting for review"
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             github.rest.issues.addLabels({

.github/workflows/pr-status-label-review.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Download artifact'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -44,7 +44,7 @@ jobs:
         run: unzip "${{ runner.temp }}/artifacts/review-event.zip" -d "${{ runner.temp }}/artifacts"
 
       - name: Update status labels based on review
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const fs = require('fs');

.github/workflows/pr-status-label-schedule.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Promote approved PRs to "ready to merge"
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const owner = context.repo.owner

data/file_list.yml

@@ -25212,15 +25212,15 @@ Enemy/Bros.o:
   - offset: 0x0da214
     size: 184
     label: _ZN14BrosWeaponBaseC2EPKcPKN2al9LiveActorE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x0da2cc
     size: 172
     label: _ZN14BrosWeaponBase6attachEPKN4sead8Matrix34IfEERKNS0_7Vector3IfEES8_PKc
-    status: NotDecompiled
+    status: Matching
   - offset: 0x0da378
     size: 676
     label: _ZN14BrosWeaponBase13calcAttachMtxEPN4sead8Matrix34IfEEPKS2_RKNS0_7Vector3IfEES9_
-    status: NotDecompiled
+    status: Matching
   - offset: 0x0da61c
     size: 200
     label: _ZN12BrosHackBaseC2EiPKcbS1_
@@ -25328,12 +25328,12 @@ Enemy/Bros.o:
   - offset: 0x0db5dc
     size: 8
     label: _ZNK14BrosWeaponBase12getBreakStepEv
-    status: NotDecompiled
+    status: Matching
     lazy: true
   - offset: 0x0db5e4
     size: 8
     label: _ZNK14BrosWeaponBase7isBreakEv
-    status: NotDecompiled
+    status: Matching
     lazy: true
   - offset: 0x0db5ec
     size: 4
@@ -66674,64 +66674,64 @@ MapObj/DoorCity.o:
   - offset: 0x25fe38
     size: 120
     label: _ZN8DoorCityC2EPKc
-    status: NotDecompiled
+    status: Matching
   - offset: 0x25feb0
     size: 132
     label: _ZN8DoorCityC1EPKc
-    status: NotDecompiled
+    status: Matching
   - offset: 0x25ff34
     size: 304
     label: _ZN8DoorCity4initERKN2al13ActorInitInfoE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x260064
     size: 12
     label: _ZN8DoorCity13onStageSwitchEv
-    status: NotDecompiled
+    status: Matching
   - offset: 0x260070
     size: 4
     label: _ZN8DoorCity15listenSwitchOffEv
-    status: NotDecompiled
+    status: Matching
   - offset: 0x260074
     size: 60
     label: _ZN8DoorCity11exeWaitOpenEv
-    status: NotDecompiled
+    status: Matching
   - offset: 0x2600b0
     size: 96
     label: _ZN8DoorCity7exeOpenEv
-    status: NotDecompiled
+    status: Matching
   - offset: 0x260110
     size: 88
     label: _ZN8DoorCity12exeWaitCloseEv
-    status: NotDecompiled
+    status: Matching
   - offset: 0x260168
     size: 64
     label: _ZNK12_GLOBAL__N_119DoorCityNrvWaitOpen7executeEPN2al11NerveKeeperE
-    status: NotDecompiled
+    status: Matching
     guess: true
   - offset: 0x2601a8
     size: 92
     label: _ZNK12_GLOBAL__N_120DoorCityNrvWaitClose7executeEPN2al11NerveKeeperE
-    status: NotDecompiled
+    status: Matching
     guess: true
   - offset: 0x260204
     size: 100
     label: _ZNK12_GLOBAL__N_115DoorCityNrvOpen7executeEPN2al11NerveKeeperE
-    status: NotDecompiled
+    status: Matching
     guess: true
   - offset: 0x260268
     size: 28
     label: _ZNK2al10FunctorV0MIP8DoorCityMS1_FvvEEclEv
-    status: NotDecompiled
+    status: Matching
     lazy: true
   - offset: 0x260284
     size: 76
     label: _ZNK2al10FunctorV0MIP8DoorCityMS1_FvvEE5cloneEv
-    status: NotDecompiled
+    status: Matching
     lazy: true
   - offset: 0x2602d0
     size: 4
     label: _ZN2al10FunctorV0MIP8DoorCityMS1_FvvEED0Ev
-    status: NotDecompiled
+    status: Matching
     lazy: true
 MapObj/DoorSnow.o:
   '.text':
@@ -134196,7 +134196,7 @@ Scene/ProjectActorFactory.o:
   - offset: 0x4b7dbc
     size: 52
     label: _ZN2al19createActorFunctionI8DoorCityEEPNS_9LiveActorEPKc
-    status: NotDecompiled
+    status: Matching
     lazy: true
   - offset: 0x4b7df0
     size: 52
@@ -230859,91 +230859,91 @@ Library/Clipping/FrustumRadar.o:
     label:
     - _ZN2al12FrustumRadarC1Ev
     - _ZN2al12FrustumRadarC2Ev
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843600
     size: 296
     label: _ZN2al12FrustumRadar15calcFrustumAreaERKN4sead8Matrix34IfEEffff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843728
     size: 156
     label: _ZN2al12FrustumRadar12setLocalAxisERKN4sead8Matrix34IfEE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8437c4
     size: 148
     label: _ZN2al12FrustumRadar9setFactorEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843858
     size: 276
     label: _ZN2al12FrustumRadar15calcFrustumAreaERKN4sead8Matrix34IfEERKNS1_8Matrix44IfEEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x84396c
     size: 132
     label: _ZN2al12FrustumRadar9setFactorERKN4sead8Matrix44IfEE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8439f0
     size: 472
     label: _ZN2al12FrustumRadar21calcFrustumAreaStereoERKN4sead8Matrix34IfEES5_RKNS1_8Matrix44IfEEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843bc8
     size: 244
     label: _ZN2al12FrustumRadar18setLocalAxisStereoERKN4sead8Matrix34IfEES5_
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843cbc
     size: 228
     label: _ZN2al12FrustumRadar15setFactorStereoERKN4sead8Matrix44IfEE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843da0
     size: 112
     label: _ZNK2al12FrustumRadar11judgeInLeftERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843e10
     size: 108
     label: _ZNK2al12FrustumRadar12judgeInRightERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843e7c
     size: 108
     label: _ZNK2al12FrustumRadar10judgeInTopERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843ee8
     size: 112
     label: _ZNK2al12FrustumRadar13judgeInBottomERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x843f58
     size: 376
     label: _ZNK2al12FrustumRadar11judgeInAreaERKN4sead7Vector3IfEEfff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8440d0
     size: 8
     label: _ZNK2al12FrustumRadar11judgeInAreaERKN4sead7Vector3IfEEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8440d8
     size: 8
     label: _ZNK2al12FrustumRadar11judgeInAreaERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8440e0
     size: 12
     label: _ZNK2al12FrustumRadar16judgeInAreaNoFarERKN4sead7Vector3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8440ec
     size: 324
     label: _ZNK2al12FrustumRadar14judgePointFlagERKN4sead7Vector3IfEEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x844230
     size: 396
     label: _ZNK2al12FrustumRadar14judgeInAreaObbEPKN4sead8Matrix34IfEERKNS1_9BoundBox3IfEEff
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8443bc
     size: 8
     label: _ZNK2al12FrustumRadar14judgeInAreaObbEPKN4sead8Matrix34IfEERKNS1_9BoundBox3IfEEf
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8443c4
     size: 8
     label: _ZNK2al12FrustumRadar14judgeInAreaObbEPKN4sead8Matrix34IfEERKNS1_9BoundBox3IfEE
-    status: NotDecompiled
+    status: Matching
   - offset: 0x8443cc
     size: 12
     label: _ZNK2al12FrustumRadar19judgeInAreaObbNoFarEPKN4sead8Matrix34IfEERKNS1_9BoundBox3IfEE
-    status: NotDecompiled
+    status: Matching
 Library/Collision/Collider.o:
   '.text':
   - offset: 0x8443d8

lib/al/Library/Audio/System/AudioKeeper.h

@@ -16,7 +16,7 @@ class AudioMic;
 class SeKeeper;
 class BgmKeeper;
 
-class AudioKeeper : public IUseHioNode {
+class AudioKeeper : public HioNode {
 public:
     AudioKeeper(const AudioDirector*);
     virtual ~AudioKeeper();

lib/al/Library/Camera/CameraOffsetCtrlPreset.h

@@ -4,6 +4,7 @@
 
 namespace al {
 class ByamlIter;
+class CameraOffsetPreset;
 
 class CameraOffsetCtrlPreset : public CameraOffsetCtrl {
 public:
@@ -11,5 +12,10 @@ public:
 
     void load(const ByamlIter& iter) override;
     f32 getOffset() const override;
+
+private:
+    CameraOffsetPreset* mPreset;
 };
+
+static_assert(sizeof(CameraOffsetCtrlPreset) == 0x10);
 }  // namespace al

lib/al/Library/Camera/CameraPoser.h

@@ -231,7 +231,7 @@ protected:
     sead::Vector3f mTargetTrans = {0.0f, 0.0f, 500.0f};
     sead::Vector3f mCameraUp = sead::Vector3f::ey;
     f32 mFovyDegree = 35.0f;
-    f32 _64 = -1.0f;
+    f32 mNearClipDistance = -1.0f;
     sead::Matrix34f mViewMtx = sead::Matrix34f::ident;
     bool _98 = false;
     CameraPoserSceneInfo* mSceneInfo = nullptr;

lib/al/Library/Camera/CameraPoserFixPoint.h

@@ -17,7 +17,11 @@ public:
     void makeLookAtCamera(sead::LookAtCamera* lookAtCam) const override;
 
 private:
-    char _140[24];
+    f32 mOffsetY;
+    sead::Vector3f mCameraPos;
+    bool mIsUsePrePoserPos;
+    bool mIsKeepDistanceFromLookAt;
+    f32 mKeepDistance;
 };
 
 static_assert(sizeof(CameraPoserFixPoint) == 0x158);

lib/al/Library/Clipping/FrustumRadar.cpp

@@ -0,0 +1,245 @@
+#include "Library/Clipping/FrustumRadar.h"
+
+#include <math/seadMathCalcCommon.h>
+
+#include "Library/Math/MathUtil.h"
+#include "Library/Matrix/MatrixUtil.h"
+
+namespace al {
+
+FrustumRadar::FrustumRadar() = default;
+
+void FrustumRadar::calcFrustumArea(const sead::Matrix34f& orthoMtx, f32 fovyAngle, f32 aspectRatio,
+                                   f32 near, f32 far) {
+    setLocalAxis(orthoMtx);
+
+    setFactor(fovyAngle, aspectRatio);
+
+    mNear = near;
+    mFar = far;
+}
+
+void FrustumRadar::setLocalAxis(const sead::Matrix34f& orthoMtx) {
+    sead::Matrix34f mtxInvertOrtho;
+    calcMxtInvertOrtho(&mtxInvertOrtho, orthoMtx);
+
+    mtxInvertOrtho.getBase(mOrthoSide, 0);
+    mtxInvertOrtho.getBase(mOrthoUp, 1);
+    mtxInvertOrtho.getBase(mOrthoFront, 2);
+    mOrthoFront.negate();
+    mtxInvertOrtho.getTranslation(mOrthoTrans);
+
+    mStereoEyeOffset = 0.0f;
+}
+
+void FrustumRadar::setFactor(f32 fovyAngle, f32 aspectRatio) {
+    mVerticalSlope = sead::Mathf::tan(sead::Mathf::deg2rad(fovyAngle * 0.5f));
+    mVerticalNormFactor = sead::Mathf::sqrt(mVerticalSlope * mVerticalSlope + 1.0f);
+
+    mHorizontalSlope = mVerticalSlope * aspectRatio;
+    mHorizontalNormFactor = sead::Mathf::sqrt(mHorizontalSlope * mHorizontalSlope + 1.0f);
+}
+
+void FrustumRadar::calcFrustumArea(const sead::Matrix34f& orthoMtx,
+                                   const sead::Matrix44f& projectionMtx, f32 near, f32 far) {
+    setLocalAxis(orthoMtx);
+    setFactor(projectionMtx);
+    mNear = near;
+    mFar = far;
+}
+
+void FrustumRadar::setFactor(const sead::Matrix44f& projectionMtx) {
+    mVerticalSlope = 1.0f / projectionMtx(1, 1);
+    mVerticalNormFactor = sead::Mathf::sqrt(mVerticalSlope * mVerticalSlope + 1.0f);
+
+    mHorizontalSlope = 1.0f / projectionMtx(0, 0);
+    mHorizontalNormFactor = sead::Mathf::sqrt(mHorizontalSlope * mHorizontalSlope + 1.0f);
+}
+
+void FrustumRadar::calcFrustumAreaStereo(const sead::Matrix34f& orthoMtxLeft,
+                                         const sead::Matrix34f& orthoMtxRight,
+                                         const sead::Matrix44f& projectionMtx, f32 near, f32 far) {
+    setLocalAxisStereo(orthoMtxLeft, orthoMtxRight);
+    setFactorStereo(projectionMtx);
+    mNear = near;
+    mFar = far;
+}
+
+void FrustumRadar::setLocalAxisStereo(const sead::Matrix34f& orthoMtxLeft,
+                                      const sead::Matrix34f& orthoMtxRight) {
+    sead::Matrix34f mtxInvertOrthoLeft;
+    sead::Matrix34f mtxInvertRight;
+    calcMxtInvertOrtho(&mtxInvertOrthoLeft, orthoMtxLeft);
+
+    mtxInvertOrthoLeft.getBase(mOrthoSide, 0);
+    mtxInvertOrthoLeft.getBase(mOrthoUp, 1);
+    mtxInvertOrthoLeft.getBase(mOrthoFront, 2);
+    mOrthoFront.negate();
+
+    calcMxtInvertOrtho(&mtxInvertRight, orthoMtxRight);
+    mOrthoTrans = (mtxInvertOrthoLeft.getTranslation() + mtxInvertRight.getTranslation()) * 0.5f;
+
+    mStereoEyeOffset = mOrthoSide.dot(mOrthoTrans - mtxInvertOrthoLeft.getTranslation());
+}
+
+void FrustumRadar::setFactorStereo(const sead::Matrix44f& projectionMtx) {
+    setFactor(projectionMtx);
+    f32 centerOffset = projectionMtx(0, 2);
+
+    mStereoSlopeLeft = mHorizontalSlope * (1.0f - centerOffset);
+    mStereoNormFactorLeft = sead::Mathf::sqrt(mStereoSlopeLeft * mStereoSlopeLeft + 1.0f);
+
+    mStereoSlopeRight = mHorizontalSlope * (1.0f + centerOffset);
+    mStereoNormFactorRight = sead::Mathf::sqrt(mStereoSlopeRight * mStereoSlopeRight + 1.0f);
+}
+
+bool FrustumRadar::judgeInLeft(const sead::Vector3f& pos, f32 radius) const {
+    f32 dotFront = mOrthoFront.dot(pos - mOrthoTrans);
+    f32 dotSide = mOrthoSide.dot(pos - mOrthoTrans);
+
+    return !(dotSide < -(dotFront * mHorizontalSlope + mHorizontalNormFactor * radius));
+}
+
+bool FrustumRadar::judgeInRight(const sead::Vector3f& pos, f32 radius) const {
+    f32 dotFront = mOrthoFront.dot(pos - mOrthoTrans);
+    f32 dotSide = mOrthoSide.dot(pos - mOrthoTrans);
+
+    return !(dotFront * mHorizontalSlope + mHorizontalNormFactor * radius < dotSide);
+}
+
+bool FrustumRadar::judgeInTop(const sead::Vector3f& pos, f32 radius) const {
+    f32 dotFront = mOrthoFront.dot(pos - mOrthoTrans);
+    f32 dotUp = mOrthoUp.dot(pos - mOrthoTrans);
+
+    return !(dotFront * mVerticalSlope + mVerticalNormFactor * radius < dotUp);
+}
+
+bool FrustumRadar::judgeInBottom(const sead::Vector3f& pos, f32 radius) const {
+    f32 dotFront = mOrthoFront.dot(pos - mOrthoTrans);
+    f32 dotUp = mOrthoUp.dot(pos - mOrthoTrans);
+
+    return !(dotUp < -(dotFront * mVerticalSlope + mVerticalNormFactor * radius));
+}
+
+bool FrustumRadar::judgeInArea(const sead::Vector3f& pos, f32 radius, f32 near, f32 far) const {
+    f32 dotFront = mOrthoFront.dot(pos - mOrthoTrans);
+
+    if (dotFront < near - radius)
+        return false;
+
+    if (far > 0.0f && radius + far < dotFront)
+        return false;
+
+    f32 dotUpAbs = sead::Mathf::abs(mOrthoUp.dot(pos - mOrthoTrans));
+    if (dotFront * mVerticalSlope + mVerticalNormFactor * radius < dotUpAbs)
+        return false;
+
+    f32 dotSide = mOrthoSide.dot(pos - mOrthoTrans);
+    if (isNearZero(mStereoEyeOffset)) {
+        if (dotFront * mHorizontalSlope + mHorizontalNormFactor * radius <
+            sead::Mathf::abs(dotSide))
+            return false;
+    } else {
+        f32 limitRight = dotFront * mStereoSlopeRight + mStereoNormFactorRight * radius;
+        f32 limitLeft = dotFront * mStereoSlopeLeft + mStereoNormFactorLeft * radius;
+
+        f32 relSideLeft = dotSide - mStereoEyeOffset;
+        f32 relSideRight = dotSide + mStereoEyeOffset;
+
+        if (relSideLeft > limitLeft && relSideRight > limitRight)
+            return false;
+
+        if (relSideLeft < -limitRight && relSideRight < -limitLeft)
+            return false;
+    }
+    return true;
+}
+
+bool FrustumRadar::judgeInArea(const sead::Vector3f& pos, f32 radius, f32 near) const {
+    return judgeInArea(pos, radius, near, mFar);
+}
+
+bool FrustumRadar::judgeInArea(const sead::Vector3f& pos, f32 radius) const {
+    return judgeInArea(pos, radius, mNear, mFar);
+}
+
+bool FrustumRadar::judgeInAreaNoFar(const sead::Vector3f& pos, f32 radius) const {
+    return judgeInArea(pos, radius, mNear, -1.0f);
+}
+
+FrustumRadar::PointFlag FrustumRadar::judgePointFlag(const sead::Vector3f& pos, f32 near,
+                                                     f32 far) const {
+    u32 flag = PointFlag::None;
+
+    sead::Vector3f relPos = pos - mOrthoTrans;
+    f32 dotFront = mOrthoFront.dot(relPos);
+
+    if (dotFront < near)
+        flag |= PointFlag::Near;
+
+    if (far > 0.0f && dotFront > far)
+        flag |= PointFlag::Far;
+
+    f32 dotUp = mOrthoUp.dot(relPos);
+    if (dotUp < -(dotFront * mVerticalSlope))
+        flag |= PointFlag::Bottom;
+
+    if (dotFront * mVerticalSlope < dotUp)
+        flag |= PointFlag::Top;
+
+    f32 dotSide = mOrthoSide.dot(relPos);
+    if (isNearZero(mStereoEyeOffset)) {
+        if (dotSide < -(dotFront * mHorizontalSlope))
+            flag |= PointFlag::Left;
+        if (dotFront * mHorizontalSlope < dotSide)
+            flag |= PointFlag::Right;
+        return (PointFlag)flag;
+    }
+
+    f32 limitRight = dotFront * mStereoSlopeRight;
+    f32 limitLeft = dotFront * mStereoSlopeLeft;
+    f32 distSideLeftEye = dotSide - mStereoEyeOffset;
+    f32 distSideRightEye = dotSide + mStereoEyeOffset;
+
+    if (distSideLeftEye > limitLeft && distSideRightEye > limitRight)
+        flag |= PointFlag::Right;
+
+    if (distSideLeftEye < -limitRight && distSideRightEye < -limitLeft)
+        flag |= PointFlag::Left;
+
+    return (PointFlag)flag;
+}
+
+bool FrustumRadar::judgeInAreaObb(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox,
+                                  f32 near, f32 far) const {
+    sead::Vector3f corners[8];
+    calcObbCorners(corners, *mtx, boundBox);
+
+    s32 mask = ~PointFlag::None;
+    for (s32 i = 0; i < 8; ++i) {
+        s32 pointFlags = judgePointFlag(corners[i], near, far);
+        if (pointFlags == PointFlag::None)
+            return true;
+
+        mask &= pointFlags;
+    }
+
+    return mask == PointFlag::None;
+}
+
+bool FrustumRadar::judgeInAreaObb(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox,
+                                  f32 near) const {
+    return judgeInAreaObb(mtx, boundBox, near, mFar);
+}
+
+bool FrustumRadar::judgeInAreaObb(const sead::Matrix34f* mtx,
+                                  const sead::BoundBox3f& boundBox) const {
+    return judgeInAreaObb(mtx, boundBox, mNear, mFar);
+}
+
+bool FrustumRadar::judgeInAreaObbNoFar(const sead::Matrix34f* mtx,
+                                       const sead::BoundBox3f& boundBox) const {
+    return judgeInAreaObb(mtx, boundBox, mNear, -1.0f);
+}
+
+}  // namespace al

lib/al/Library/Clipping/FrustumRadar.h

@@ -3,34 +3,68 @@
 #include <math/seadBoundBox.h>
 #include <math/seadMatrix.h>
 
+#include "Library/Matrix/MatrixUtil.h"
+
 namespace al {
 
 class FrustumRadar {
 public:
+    enum PointFlag : u32 {
+        None = 0,
+        Near = 1,
+        Far = 2,
+        Bottom = 4,
+        Top = 8,
+        Left = 16,
+        Right = 32,
+    };
+
     FrustumRadar();
-    void calcFrustumArea(const sead::Matrix34f&, f32, f32, f32, f32);
-    void setLocalAxis(const sead::Matrix34f&);
-    void setFactor(f32, f32);
-    void calcFrustumArea(const sead::Matrix34f&, const sead::Matrix44f&, f32, f32);
-    void setFactor(sead::Matrix44f);
-    void calcFrustumAreaStereo(const sead::Matrix34f&, const sead::Matrix34f&,
-                               const sead::Matrix44f&, f32, f32);
-    void setLocalAxisStereo(const sead::Matrix34f&, const sead::Matrix34f&);
-    void setFactorStereo(const sead::Matrix44f&);
-    bool judgeInLeft(const sead::Vector3f&, f32) const;
-    bool judgeInRight(const sead::Vector3f&, f32) const;
-    bool judgeInTop(const sead::Vector3f&, f32) const;
-    bool judgeInBottom(const sead::Vector3f&, f32) const;
-    bool judgeInArea(const sead::Vector3f&, f32, f32, f32) const;
-    bool judgeInArea(const sead::Vector3f&, f32, f32) const;
-    bool judgeInAreaNoFar(const sead::Vector3f&, f32) const;
-    bool judgePointFlag(const sead::Vector3f&, f32, f32) const;
-    bool judgeInAreaObb(const sead::Matrix34f*, const sead::BoundBox3f&, f32, f32) const;
-    bool judgeInAreaObb(const sead::Matrix34f*, const sead::BoundBox3f&, f32) const;
-    bool judgeInAreaObbNoFar(const sead::Matrix34f*, const sead::BoundBox3f&) const;
+    void calcFrustumArea(const sead::Matrix34f& orthoMtx, f32 fovyAngle, f32 aspectRatio, f32 near,
+                         f32 far);
+    void setLocalAxis(const sead::Matrix34f& orthoMtx);
+    void setFactor(f32 fovyAngle, f32 aspectRatio);
+    void calcFrustumArea(const sead::Matrix34f& orthoMtx, const sead::Matrix44f& projectionMtx,
+                         f32 near, f32 far);
+    void setFactor(const sead::Matrix44f& projectionMtx);
+    void calcFrustumAreaStereo(const sead::Matrix34f& orthoMtxLeft,
+                               const sead::Matrix34f& orthoMtxRight,
+                               const sead::Matrix44f& projectionMtx, f32 near, f32 far);
+    void setLocalAxisStereo(const sead::Matrix34f& orthoMtxLeft,
+                            const sead::Matrix34f& orthoMtxRight);
+    void setFactorStereo(const sead::Matrix44f& projectionMtx);
+    bool judgeInLeft(const sead::Vector3f& pos, f32 radius) const;
+    bool judgeInRight(const sead::Vector3f& pos, f32 radius) const;
+    bool judgeInTop(const sead::Vector3f& pos, f32 radius) const;
+    bool judgeInBottom(const sead::Vector3f& pos, f32 radius) const;
+    bool judgeInArea(const sead::Vector3f& pos, f32 radius, f32 near, f32 far) const;
+    bool judgeInArea(const sead::Vector3f& pos, f32 radius, f32 near) const;
+    bool judgeInArea(const sead::Vector3f& pos, f32 radius) const;
+    bool judgeInAreaNoFar(const sead::Vector3f& pos, f32 radius) const;
+    PointFlag judgePointFlag(const sead::Vector3f& pos, f32 near, f32 far) const;
+    bool judgeInAreaObb(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox, f32 near,
+                        f32 far) const;
+    bool judgeInAreaObb(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox,
+                        f32 near) const;
+    bool judgeInAreaObb(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox) const;
+    bool judgeInAreaObbNoFar(const sead::Matrix34f* mtx, const sead::BoundBox3f& boundBox) const;
 
 private:
-    unsigned char filler[0x5c];
+    sead::Vector3f mOrthoSide = sead::Vector3f::ex;
+    sead::Vector3f mOrthoUp = sead::Vector3f::ey;
+    sead::Vector3f mOrthoFront = sead::Vector3f::ez;
+    sead::Vector3f mOrthoTrans = sead::Vector3f::zero;
+    f32 mHorizontalSlope = 0.3f;
+    f32 mHorizontalNormFactor = 1.04403f;
+    f32 mVerticalSlope = 0.2f;
+    f32 mVerticalNormFactor = 1.0098f;
+    f32 mStereoEyeOffset = 0.0f;
+    f32 mStereoSlopeLeft = 0.3f;
+    f32 mStereoNormFactorLeft = 1.04403f;
+    f32 mStereoSlopeRight = 0.3f;
+    f32 mStereoNormFactorRight = 1.04403f;
+    f32 mNear = 100.0f;
+    f32 mFar = 10000.0f;
 };
 
 }  // namespace al

lib/al/Library/Collision/Collider.h

@@ -45,7 +45,7 @@ public:
 
     CollisionDirector* getCollisionDirector() const override;
 
-    sead::Vector3f* get_30() const { return _30; }
+    const sead::Vector3f* getActorGravityPtr() const { return mActorGravityPtr; }
 
     f32 getRadius() { return mRadius; };
 
@@ -55,9 +55,9 @@ public:
 
     void setOffsetY(f32 offsetY) { mOffsetY = offsetY; };
 
-    s32 get_48() const { return _48; }
+    s32 getPlaneNum() const { return mPlaneNum; }
 
-    u32 getPlaneCount() const { return mPlaneCount; }
+    u32 getStoredPlaneNum() const { return mStoredPlaneNum; }
 
     const sead::Vector3f& getFixReaction() const { return mFixReaction; }
 
@@ -73,7 +73,7 @@ public:
 
     f32 get_260() const { return _260; }
 
-    u32 get_264() const { return _264; }
+    u32 getNoGroundCounter() const { return mNoGroundCounter; }
 
     void setReactMovePower(bool isEnabled) {
         mFlag &= ~1;
@@ -87,18 +87,18 @@ public:
     bool isCollidedWallFace() { return mFlag >> 5 & 1; }
 
 private:
-    CollisionDirector* _8;
-    TriangleFilterBase* _10;
-    CollisionPartsFilterBase* _18;
-    sead::Matrix34f* _20;
-    sead::Vector3f* _28;
-    sead::Vector3f* _30;
+    CollisionDirector* mCollisionDirector;
+    const TriangleFilterBase* mTriangleFilter;
+    const CollisionPartsFilterBase* mCollisionPartsFilter;
+    const sead::Matrix34f* mActorBaseMtxPtr;
+    const sead::Vector3f* mActorTransPtr;
+    const sead::Vector3f* mActorGravityPtr;
     f32 mRadius;
     f32 mOffsetY;
-    void* filler1;
-    u32 _48;
-    u32 mPlaneCount;
-    HitInfo* _50;
+    sead::Vector3f* _40;
+    u32 mPlaneNum;
+    u32 mStoredPlaneNum;
+    HitInfo* mPlanes;
     sead::Vector3f mFixReaction;
     sead::Vector3f _64;
     HitInfo mFloorHit;
@@ -109,12 +109,12 @@ private:
     char filler4[0x4];
     HitInfo mCeilingHit;
     f32 _260;
-    u32 _264;
-    sead::Vector3f _268;
+    u32 mNoGroundCounter;
+    sead::Vector3f mRecentOnGroundNormal;
     char _274;
     char mFlag;
-    sead::Vector3f _278;
-    f32 _284;
+    sead::Vector3f mCurrentTrans;
+    f32 mCurrentRadius;
 };
 
 static_assert(sizeof(Collider) == 0x288);

lib/al/Library/Event/EventFlowDataHolder.h

@@ -9,6 +9,9 @@ class CameraTicket;
 class LiveActor;
 class EventFlowEventData;
 class IUseCamera;
+class EventFlowRequestInfo;
+class EventFlowScareCtrlBase;
+class BalloonOrderGroup;
 
 class EventFlowDataHolder {
 public:
@@ -37,6 +40,24 @@ public:
     void endAllEventCamera(IUseCamera*);
     bool isEndInterpoleCamera(const IUseCamera*, const char*) const;
     bool isPlayingEventAnimCamera(const char*) const;
+
+private:
+    EventFlowRequestInfo* mRequestInfo;
+    void* filler_8[10];
+    void* _58;
+    void* filler_60[1];
+    EventFlowScareCtrlBase* mScareCtrl;
+    void* _70;
+    void* filler_78[2];
+    BalloonOrderGroup* mBalloonOrderGroup;
+    sead::WFixedSafeString<32> _90;
+    void* filler_e8[1];
+    const char* mTalkSubActorName;
+    s32 mItemTypeCapacity;
+    s32 mItemTypeCount;
+    const char** mItemTypes;
 };
 
+static_assert(sizeof(EventFlowDataHolder) == 0x108);
+
 }  // namespace al

lib/al/Library/Joint/JointControllerBase.h

@@ -6,6 +6,7 @@
 
 #include "Library/HostIO/HioNode.h"
 
+// BUG: outside of `al` namespace
 class IJointController {
 public:
     virtual void calcJointCallback(s32, sead::Matrix34f*) = 0;

lib/al/Library/Layout/LayoutKeeper.h

@@ -29,5 +29,15 @@ public:
     s32 getGroupNum() const;
     void calcAnim(bool);
     void draw();
+
+private:
+    CustomTagProcessor* mTagProcessor;
+    nn::ui2d::DrawInfo* mDrawInfo;
+    nn::ui2d::Layout* mLayout;
+    void* filler_18[2];
+    eui::Screen* mScreen;
+    void* filler_30;
 };
+
+static_assert(sizeof(LayoutKeeper) == 0x38);
 }  // namespace al

lib/al/Library/LiveActor/ActorCollisionFunction.cpp

@@ -117,7 +117,7 @@ void setSyncCollisionMtxPtr(LiveActor* actor, const sead::Matrix34f* mtx) {
 
 bool isOnGround(const LiveActor* actor, u32 coyoteTime) {
     Collider* collider = actor->getCollider();
-    if (!isCollidedGround(actor) && collider->get_264() > coyoteTime)
+    if (!isCollidedGround(actor) && collider->getNoGroundCounter() > coyoteTime)
         return false;
     return !(getVelocity(actor).dot(collider->getRecentOnGroundNormal(coyoteTime)) > 0.0f);
 }
@@ -137,15 +137,16 @@ bool isOnGroundNoVelocity(const LiveActor* actor, u32 coyoteTime) {
     if (isCollidedGround(actor))
         return true;
 
-    return actor->getCollider()->get_264() <= coyoteTime;
+    return actor->getCollider()->getNoGroundCounter() <= coyoteTime;
 }
 
 bool isOnGroundDegree(const LiveActor* actor, f32 angle, u32 coyoteTime) {
     Collider* collider = actor->getCollider();
-    if (!(isCollidedGround(actor) || collider->get_264() <= coyoteTime))
+    if (!(isCollidedGround(actor) || collider->getNoGroundCounter() <= coyoteTime))
         return false;
 
-    if (sead::Mathf::abs((*collider->get_30()).dot(collider->getRecentOnGroundNormal(coyoteTime))) <
+    if (sead::Mathf::abs(
+            (*collider->getActorGravityPtr()).dot(collider->getRecentOnGroundNormal(coyoteTime))) <
         sead::Mathf::cos(sead::Mathf::deg2rad(angle)))
         return false;
 
@@ -161,10 +162,11 @@ bool isOnGroundNoVelocityDegree(const LiveActor* actor, f32 angle, u32 coyoteTim
     if (!collider)
         return getTrans(actor).y <= 0.0;
 
-    if (!(isCollidedGround(actor) || collider->get_264() <= coyoteTime))
+    if (!(isCollidedGround(actor) || collider->getNoGroundCounter() <= coyoteTime))
         return false;
 
-    if (sead::Mathf::abs((*collider->get_30()).dot(collider->getRecentOnGroundNormal(coyoteTime))) <
+    if (sead::Mathf::abs(
+            (*collider->getActorGravityPtr()).dot(collider->getRecentOnGroundNormal(coyoteTime))) <
         sead::Mathf::cos(sead::Mathf::deg2rad(angle)))
         return false;
 
@@ -451,7 +453,7 @@ bool isCollidedFloorCode(const LiveActor* actor, const char* name) {
 
 bool isCollidedCollisionCode(const LiveActor* actor, const char* sensorName, const char* name) {
     Collider* collider = actor->getCollider();
-    if (collider->get_48() == 0) {
+    if (collider->getPlaneNum() == 0) {
         if (collider->get_110() >= 0.0f) {
             if (isEqualString(name,
                               getCollisionCodeName(collider->getFloorHit().triangle, sensorName))) {
@@ -473,7 +475,7 @@ bool isCollidedCollisionCode(const LiveActor* actor, const char* sensorName, con
         return false;
     }
 
-    u32 size = collider->getPlaneCount();
+    u32 size = collider->getStoredPlaneNum();
     for (u32 i = 0; i < size; i++)
         if (isEqualString(name, getCollisionCodeName(*collider->getPlane(i), sensorName)))
             return true;

lib/al/Library/LiveActor/ActorMovementFunction.cpp

@@ -773,8 +773,8 @@ bool reboundVelocityFromCollision(LiveActor* actor, f32 reboundStrength, f32 reb
 
 bool reboundVelocityFromTriangles(LiveActor* actor, f32 reboundStrength, f32 reboundMin) {
     Collider* collider = getActorCollider(actor);
-    s32 planeCount = collider->getPlaneCount();
-    if (collider->get_48() == 0)
+    s32 planeCount = collider->getStoredPlaneNum();
+    if (collider->getPlaneNum() == 0)
         return false;
 
     bool isRebound = false;

lib/al/Library/Play/Area/CameraStartParamArea.h

@@ -14,6 +14,7 @@ public:
 
 private:
     bool mIsAlive = true;
+    bool mIsKillIfEnter = false;
     f32* mAngleH = nullptr;
     f32* mAngleV = nullptr;
 };

lib/al/Library/Se/SeKeeper.h

@@ -54,5 +54,10 @@ public:
     void setEmitterPoseMtxPtr(const sead::Matrix34f*, const char*);
     void setEmitterPosePosPtr(const sead::Vector3f*, const char*);
     void loadSe(IAudioResourceLoader*);
+
+private:
+    void* _0[0x78 / 8];
 };
+
+static_assert(sizeof(SeKeeper) == 0x78);
 }  // namespace al

lib/al/Project/Camera/CameraAngleCtrlInfo.h

@@ -23,5 +23,32 @@ public:
 
     bool receiveRequestFromObject(const CameraObjectRequestInfo& info);
     void setAngleV(f32 angleV);
+
+private:
+    void* _0;  // object of size 0x14
+    void* _8;  // object of size 0x10
+    bool mIsValidRotateH;
+    s32 _14;
+    f32 _18;
+    f32 _1c;
+    f32 mMinAngleH;
+    f32 mMaxAngleH;
+    f32 _28;
+    f32 mAngleV;
+    f32 _30;
+    f32 mMinAngleV;
+    f32 mMaxAngleV;
+    f32 _3c;
+    f32 _40;
+    f32 _44;
+    f32 _48;
+    f32 _4c;
+    bool mIsKeepPreAngleV;
+    bool mIsSetResetAngleV;
+    f32 mResetAngleV;
+    bool mIsInvalidReceiveRequest;
 };
+
+static_assert(sizeof(CameraAngleCtrlInfo) == 0x60);
+
 }  // namespace al

src/Enemy/Bros.cpp

@@ -0,0 +1,41 @@
+#include "Enemy/Bros.h"
+
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/ActorPoseUtil.h"
+#include "Library/Math/MathUtil.h"
+
+BrosWeaponBase::BrosWeaponBase(const char* name, const al::LiveActor* bros)
+    : al::LiveActor(name), mBros(bros) {}
+
+void BrosWeaponBase::attach(const sead::Matrix34f* poseMtx, const sead::Vector3f& trans,
+                            const sead::Vector3f& rotation, const char* actionName) {
+    mPoseMtx = poseMtx;
+    mTrans.set(trans);
+    mRotation.set(rotation);
+
+    sead::Matrix34f attachMtx;
+    calcAttachMtx(&attachMtx, poseMtx, trans, rotation);
+    al::updatePoseMtx(this, &attachMtx);
+    al::invalidateClipping(this);
+    al::offCollide(this);
+    if (actionName)
+        al::startAction(this, actionName);
+    appear();
+}
+
+void BrosWeaponBase::calcAttachMtx(sead::Matrix34f* attachMtx, const sead::Matrix34f* poseMtx,
+                                   const sead::Vector3f& trans, const sead::Vector3f& rotation) {
+    sead::Matrix34f translationMatrix;
+    translationMatrix.makeRT(sead::Vector3f::zero, trans);
+
+    sead::Matrix34f rotationMatrix;
+    rotationMatrix.makeRT(rotation, sead::Vector3f::zero);
+
+    sead::Matrix34f mtxRT = rotationMatrix * translationMatrix;
+    sead::Matrix34f poseMtxNorm = *poseMtx;
+    al::normalize(&poseMtxNorm);
+
+    attachMtx->setMul(poseMtxNorm, mtxRT);
+}

src/Enemy/Bros.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+#include <math/seadMatrix.h>
+#include <math/seadVector.h>
+
+#include "Library/LiveActor/LiveActor.h"
+
+class BrosWeaponBase : public al::LiveActor {
+public:
+    BrosWeaponBase(const char* name, const al::LiveActor* bros);
+
+    // TODO: Find what unknown does
+    virtual void shoot(const sead::Vector3f& trans, const sead::Quatf& quat,
+                       const sead::Vector3f& force, bool isHack, s32 unknown, bool isFast) = 0;
+    virtual void killCollide(al::HitSensor* sensor, const sead::Vector3f& trans, bool isHack) = 0;
+    virtual void killEnemy() = 0;
+
+    virtual void attach(const sead::Matrix34f* poseMtx, const sead::Vector3f& trans,
+                        const sead::Vector3f& rotation, const char* actionName);
+    void calcAttachMtx(sead::Matrix34f* attachMtx, const sead::Matrix34f* poseMtx,
+                       const sead::Vector3f& trans, const sead::Vector3f& rotation);
+
+    virtual u32 getBreakStep() const { return 0; }
+
+    virtual bool isBreak() const { return false; }
+
+    const sead::Matrix34f* getPoseMtx() const { return mPoseMtx; }
+
+    const sead::Vector3f& getTrans() const { return mTrans; }
+
+    const sead::Vector3f& getRotation() const { return mRotation; }
+
+    const LiveActor* getBrosActor() const { return mBros; }
+
+private:
+    const sead::Matrix34f* mPoseMtx = nullptr;
+    sead::Vector3f mTrans = sead::Vector3f::zero;
+    sead::Vector3f mRotation = sead::Vector3f::zero;
+    const al::LiveActor* mBros;
+};
+
+static_assert(sizeof(BrosWeaponBase) == 0x130);

src/Enemy/KuriboMini.h

@@ -2,6 +2,17 @@
 
 #include "Library/LiveActor/LiveActor.h"
 
+namespace al {
+class EnemyStateBlowDown;
+class CollisionPartsFilterBase;
+}  // namespace al
+class ActorStateSandGeyser;
+class EnemyStateReset;
+class EnemyStateWander;
+class PlayerPushReceiver;
+class CollisionMultiShape;
+class CollisionShapeKeeper;
+
 class KuriboMini : public al::LiveActor {
 public:
     KuriboMini(const char* name);
@@ -59,5 +70,27 @@ public:
     void forceStartClipped();
 
 private:
-    void* filler[22];
+    EnemyStateReset* mStateReset;
+    EnemyStateWander* mStateWander;
+    ActorStateSandGeyser* mStateSandGeyser;
+    al::EnemyStateBlowDown* mStateBlowDown;
+    s32 mCounterChase;
+    s32 _12c;
+    al::CollisionPartsFilterBase* mCollisionFilter;
+    void* _138;
+    s32 _140;
+    f32 mClippingRadius;
+    PlayerPushReceiver* mPlayerPushReceiver;
+    CollisionMultiShape* mCollisionMultiShape;
+    CollisionShapeKeeper* mCollisionShapeKeeper;
+    f32 mJumpSink;
+    s32 mFramesSpecialPush;
+    s32 mShiftTypeOnGround;
+    al::LiveActor* _170;
+    sead::Vector3f _178;
+    bool mIsPopBack;
+    bool mIsInvalidateClipping;
+    sead::Matrix34f mColliderMtx;
 };
+
+static_assert(sizeof(KuriboMini) == 0x1b8);

src/Layout/BootLayout.h

@@ -29,3 +29,5 @@ public:
 private:
     al::LayoutActor* mParBg = nullptr;
 };
+
+static_assert(sizeof(BootLayout) == 0x138);

src/MapObj/CapHanger.h

@@ -9,6 +9,9 @@ struct ActorInitInfo;
 class HitSensor;
 class SensorMsg;
 }  // namespace al
+class CapTargetInfo;
+class ItemGenerator;
+class SaveObjInfo;
 
 class CapHanger : public al::LiveActor {
 public:
@@ -31,15 +34,15 @@ public:
     void setPeachCastleCap(const sead::Vector3f&);
 
 private:
-    void* _108;
+    CapTargetInfo* mCapTargetInfo;
     void* _110;
     s32 _118;
-    s32 _11c;
+    s32 mAppearItemNum;
     s32 _120;
-    void* _128;
-    bool _130;
+    ItemGenerator* mItemGenerator;
+    bool mIsEmitEffect;
     void* _138;
-    void* _140;
+    SaveObjInfo* _140;
     sead::Matrix34f _148;
     sead::Matrix34f _178;
     bool _1a8;

src/MapObj/DoorCity.cpp

@@ -0,0 +1,77 @@
+#include "MapObj/DoorCity.h"
+
+#include "Library/Base/StringUtil.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorCollisionFunction.h"
+#include "Library/LiveActor/ActorInitUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
+#include "Library/Placement/PlacementFunction.h"
+#include "Library/Stage/StageSwitchUtil.h"
+#include "Library/Thread/FunctorV0M.h"
+
+#include "System/GameDataFunction.h"
+
+namespace {
+NERVE_IMPL(DoorCity, Open);
+NERVE_IMPL(DoorCity, WaitOpen);
+NERVE_IMPL(DoorCity, WaitClose);
+
+NERVES_MAKE_NOSTRUCT(DoorCity, Open, WaitOpen, WaitClose);
+}  // namespace
+
+DoorCity::DoorCity(const char* name) : al::LiveActor(name) {}
+
+void DoorCity::init(const al::ActorInitInfo& info) {
+    using DoorCityFunctor = al::FunctorV0M<DoorCity*, void (DoorCity::*)()>;
+
+    al::initActor(this, info);
+    const char* initState = nullptr;
+    al::getStringArg(&initState, info, "InitState");
+
+    if (al::isEqualString(initState, "Open")) {
+        al::initNerve(this, &WaitOpen, 0);
+        al::invalidateCollisionParts(this);
+    } else if (al::isEqualString(initState, "Close")) {
+        al::initNerve(this, &WaitClose, 0);
+        al::listenStageSwitchOnStart(this, DoorCityFunctor(this, &DoorCity::onStageSwitch));
+    } else {
+        kill();
+        return;
+    }
+
+    makeActorAlive();
+
+    al::listenStageSwitchOn(this, "SwitchLightOff",
+                            DoorCityFunctor(this, &DoorCity::listenSwitchOff));
+}
+
+void DoorCity::onStageSwitch() {
+    al::setNerve(this, &Open);
+}
+
+void DoorCity::listenSwitchOff() {}
+
+void DoorCity::exeWaitOpen() {
+    if (al::isFirstStep(this))
+        al::startAction(this, "OpenWait");
+}
+
+void DoorCity::exeOpen() {
+    if (al::isFirstStep(this))
+        al::startAction(this, "Open");
+
+    if (al::isActionEnd(this)) {
+        al::invalidateCollisionParts(this);
+        al::setNerve(this, &WaitOpen);
+    }
+}
+
+void DoorCity::exeWaitClose() {
+    if (al::isFirstStep(this)) {
+        if (GameDataFunction::getScenarioNo(this) == 1)
+            al::tryStartAction(this, "Blink");
+        else
+            al::tryStartAction(this, "CloseWait");
+    }
+}

src/MapObj/DoorCity.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Library/LiveActor/LiveActor.h"
+
+class DoorCity : public al::LiveActor {
+public:
+    DoorCity(const char* name);
+
+    void init(const al::ActorInitInfo& info) override;
+
+    void onStageSwitch();
+    void listenSwitchOff();
+    void exeWaitOpen();
+    void exeOpen();
+    void exeWaitClose();
+};
+
+static_assert(sizeof(DoorCity) == 0x108);

src/MapObj/PlayerStartInfoHolder.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
+#include <container/seadPtrArray.h>
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
 
@@ -39,7 +40,8 @@ public:
     al::CameraDirector* getCameraDirector() const override;
 
 private:
-    char _10[0x18];
+    sead::PtrArray<PlayerStartInfo> mPlayerStartInfoList;
+    al::CameraDirector* mCameraDirector;
 };
 
 static_assert(sizeof(PlayerStartInfoHolder) == 0x28);

src/MapObj/TreasureBoxKeyOpener.h

@@ -8,6 +8,7 @@ namespace al {
 struct ActorInitInfo;
 class HitSensor;
 class SensorMsg;
+class MtxConnector;
 }  // namespace al
 
 class TreasureBoxKeyOpener : public al::LiveActor {
@@ -27,7 +28,12 @@ public:
     virtual void setHostForClipping(al::LiveActor*);
 
 private:
-    void* filler[4];
+    al::LiveActor* mHostForClipping;
+    al::MtxConnector* mMtxConnector;
+    f32 _118;
+    f32 _11c;
+    s32 _120;
+    s32 _124;
 };
 
 static_assert(sizeof(TreasureBoxKeyOpener) == 0x128);

src/Player/HackCap.h

@@ -1,7 +1,14 @@
 #pragma once
 
+#include <prim/seadSafeString.h>
+
 #include "Library/LiveActor/LiveActor.h"
 
+namespace al {
+class ActorDitherAnimator;
+class WaterSurfaceFinder;
+class PadRumbleKeeper;
+}  // namespace al
 class PlayerInput;
 class PlayerAreaChecker;
 class PlayerWallActionHistory;
@@ -15,6 +22,15 @@ class PlayerJointControlKeeper;
 class HackCapJudgePreInputSeparateThrow;
 class HackCapJudgePreInputSeparateJump;
 class CapTargetInfo;
+class PlayerColliderHackCap;
+class HackCapTrigger;
+class HackCapAboveGroundChecker;
+class HackCapThrowParam;
+class HackCapJointControlKeeper;
+class PlayerExternalVelocity;
+class PlayerPushReceiver;
+class HackCapStateThrowStay;
+class HackCapStateHide;
 
 class HackCap : public al::LiveActor {
 public:
@@ -184,16 +200,103 @@ public:
     bool stayWallHit();
     void endHackThrow();
 
-    CapTargetInfo* getCapTargetInfo() const { return mCapTargetInfo; }
+    CapTargetInfo* getCapTargetInfo() const { return mCapTargetInfo1; }
 
 private:
-    unsigned char _108[0x10];
-    al::LiveActor* mActorA;
-    unsigned char _120[0x08];
-    al::LiveActor* mPlayerActor;
-    void* _130[0x1f];
-    CapTargetInfo* mCapTargetInfo;
-    void* _230[0x7c];
+    al::LiveActor* mEquipmentHat;
+    al::LiveActor* mEquipmentHatDepthShadow;
+    al::LiveActor* mLockOnCapEyes;
+    al::LiveActor* mThrowingHatEyes;
+    const al::LiveActor* mPlayerActor;
+    const IUsePlayerCollision* mPlayerCollision;
+    const char* mTypeName;
+    const PlayerAreaChecker* mPlayerAreaChecker;
+    const PlayerSeparateCapFlag* mPlayerSeparateCapFlag;
+    const IUsePlayerHeightCheck* mPlayerHeightCheck;
+    const PlayerWetControl* mPlayerWetControl;
+    const PlayerJointControlKeeper* mPlayerJointControlKeeper;
+    PlayerColliderHackCap* mPlayerColliderHackCap;
+    al::WaterSurfaceFinder* mWaterSurfaceFinder;
+    al::PadRumbleKeeper* mPadRumbleKeeper;
+    PlayerWetControl* mSelfPlayerWetControl;
+    HackCapTrigger* mHackCapTrigger;
+    al::ActorDitherAnimator* mActorDitherAnimator;
+    HackCapAboveGroundChecker* mHackCapAboveGroundChecker;
+    void* _1a0_arr;
+    u64 _1a0_capacity;
+    s32 _1a0_current;
+    void* _1b8_arr;
+    u64 _1b8_capacity;
+    s32 _1b8_current;
+    const al::HitSensor* _1d0;
+    al::HitSensor* mAttackSensor;
+    sead::Vector3f mSpiralTailPositions[5];
+    HackCapThrowParam* mHackCapThrowParam;
+    CapTargetInfo* mCapTargetInfo1;
+    CapTargetInfo* mCapTargetInfo2;
+    void* _238;
+    sead::Vector3f _240;
+    sead::Vector3f _24c;
+    sead::Vector3f _258;
+    f32 _264;
+    sead::Vector2f _268;
+    f32 _270;
+    s32 _274;
+    s32 _278;
+    s32 _27c;
+    f32 _280;
+    f32 _284;
+    f32 _288;
+    f32 _28c;
+    s32 _290;
+    s32 _298;
+    bool _2a0[17];
+    const PlayerWallActionHistory* mPlayerWallActionHistory;
+    const PlayerCapActionHistory* mPlayerCapActionHistory;
+    const PlayerInput* mInput;
+    PlayerEyeSensorHitHolder* mPlayerEyeSensorHitHolder;
+    PlayerEyeSensorHitHolder* mCapEyeSensorHitHolder;
+    f32 _2d8;
+    s32 _2dc;
+    HackCapJointControlKeeper* mHackCapJointControlKeeper;
+    void* _2e8[5];
+    sead::FixedSafeString<128> _310;
+    sead::FixedSafeString<128> _3a8;
+    sead::Matrix34f _440;
+    sead::Matrix34f _470;
+    sead::Matrix34f _4a0;
+    bool _4d0;
+    sead::Vector3f _4d4;
+    sead::Vector3f _4e0;
+    bool _4ec;
+    void* _4f0;
+    PlayerExternalVelocity* mCapExternalVelocity;
+    PlayerPushReceiver* mCapPushReceiver;
+    al::HitSensor* mPlayerBodySensor;
+    bool _510;
+    sead::Vector3f _514;
+    HackCapJudgePreInputSeparateThrow* mCapJudgePreInputSeparateThrow;
+    HackCapJudgePreInputSeparateJump* mCapJudgePreInputSeparateJump;
+    bool _530;
+    s32 _534;
+    sead::Vector3f mWallPos;
+    sead::Vector3f mWallNormal;
+    sead::Vector3f mWallVelocity;
+    void* _560[4];
+    s32 _580;
+    s32 mLockOnCounter;
+    sead::Matrix34f _588;
+    bool _5b8;
+    bool mIsHackDamageVisible;
+    bool _5ba;
+    bool _5bb;
+    s32 _5bc;
+    void* _5c0[7];
+    bool mIsPuppet;
+    bool _5f9;
+    bool mIsHidePuppetCapSilhouette;
+    HackCapStateThrowStay* mStateThrowStay;
+    HackCapStateHide* mStateHide;
 };
 
 static_assert(sizeof(HackCap) == 0x610);

src/Player/PlayerAnimator.h

@@ -84,14 +84,25 @@ public:
 private:
     PlayerModelHolder* mModelHolder;
     al::LiveActor* mPlayerDeco;
-    void* _10;
+    al::LiveActor* mPlayer;
     PlayerAnimFrameCtrl* mAnimFrameCtrl;
     sead::FixedSafeString<64> mCurAnim;
     sead::FixedSafeString<64> mCurSubAnim;
     sead::FixedSafeString<64> mCurUpperBodyAnim;
     sead::FixedSafeString<64> _128;
-    char padding_180[0x1A2 - 0x180];
+    al::ActorDitherAnimator* mDitherAnim;
+    f32* mSklAnimBlendWeights;
+    void* _190;
+    f32 mRunStartAnimRate;
+    s32 _19c;
+    bool mIsNeedFullFaceAnim;
+    bool _1a1;
     bool mIsSubAnimPlaying;
+    bool _1a3;
+    bool mIsUpperBodyAnimHeadVisKeep;
+    bool _1a5;
+    bool _1a6;
+    bool mIsSubAnimOnlyAir;
 };
 
 static_assert(sizeof(PlayerAnimator) == 0x1a8);

src/Player/PlayerBindKeeper.h

@@ -1,14 +1,44 @@
 #pragma once
 
+#include <basis/seadTypes.h>
+
 namespace al {
 class HitSensor;
-}
+class SensorMsg;
+}  // namespace al
+class PlayerBindableSensorList;
+class IUsePlayerPuppet;
 
 class PlayerBindKeeper {
 public:
+    PlayerBindKeeper(al::HitSensor*, IUsePlayerPuppet*);
+    bool sendStartMsg();
+    void clearBindableSensor();
+    void cancelBind();
+    bool receiveEndMsg(const al::SensorMsg*);
+    void clearBindImpl();
+    void cancelBindByDemo();
+    bool sendMsgBindDamage();
+    bool receiveRequestDamage();
+    bool sendMsgCollidedGround();
+    bool sendMsgEnableMapCheckPointWarp();
+    bool sendMsgBindKeepDemoStart();
+    bool sendMsgBindKeepDemoExecute();
+    bool sendMsgBindKeepDemoEnd();
+    bool sendMsgBindRecoveryLife() const;
+    bool collectBindableSensor(al::HitSensor*, al::HitSensor*);
+    void appendBindRequest(al::HitSensor*);
+    void resetInvalidTimer();
+
     al::HitSensor* getBindSensor() const { return mBindSensor; }
 
 private:
-    char padding[8];
+    al::HitSensor* mBodyHitSensor;
     al::HitSensor* mBindSensor;
+    PlayerBindableSensorList* mBindableSensorList;
+    IUsePlayerPuppet* mPuppet;
+    s32 _20;
+    bool _24;
 };
+
+static_assert(sizeof(PlayerBindKeeper) == 0x28);

src/Player/PlayerCollider.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <container/seadPtrArray.h>
 #include <math/seadMatrix.h>
 #include <prim/seadBitFlag.h>
 
@@ -13,6 +14,7 @@ class SpherePoseInterpolator;
 }  // namespace al
 class CollidedShapeResult;
 class CollisionShapeKeeper;
+class CollisionMultiShape;
 
 class PlayerCollider : public al::HioNode, public al::IUseCollision {
 public:
@@ -58,12 +60,48 @@ public:
     void set1b0(f32 value) { _1b0 = value; }
 
 private:
-    void* filler[13];
+    al::CollisionDirector* mCollisionDirector;
+    const sead::Matrix34f* mMtxPtr;
+    const sead::Vector3f* mTransPtr;
+    const sead::Vector3f* mGravityPtr;
+    sead::Vector3f mTrans;
+    f32 mSize;
+    sead::Matrix34f mMtx;
+    al::HitInfo* _68;
     f32 _70;
-    void* filler2[37];
-    s32 _1a0;
+    al::HitInfo* _78;
+    f32 _7c;
+    al::HitInfo* _88;
+    f32 _8c;
+    sead::Vector3f mCollidedFixReaction;
+    bool _a0;
+    bool _a1;
+    sead::Vector3f mCollisionHitNormal;
+    sead::Vector3f mCollisionHitPos;
+    s32 mTimeInAir;
+    sead::Matrix34f mCollidePosMtx;
+    CollisionShapeKeeper* mCollisionShapeKeeper;
+    f32 mCollisionShapeScale;
+    CollisionMultiShape* mCollisionMultiShape;
+    s32 _108;
+    bool mIsInFastMoveCollisionArea;
+    bool mIsValidGroundSupport;
+    bool mIsDuringRecovery;
+    sead::Vector3f mCutCollideAffectDir;
+    s32 mWallBorderCheckType;
+    const al::CollisionPartsFilterBase* mCollisionPartsFilter;
+    sead::PtrArray<al::HitInfo> _128[3];
+    al::HitInfo* _158;
+    u32 _160;
+    s32 _164;
+    sead::PtrArray<al::HitInfo> _168;
+    s32 _178;
+    f32* _180;
+    s32 _188;
+    f32* _190;
+    sead::Vector3f _198;
     sead::Vector3f mCollidedGroundNormal;
     f32 _1b0;
 };
 
-static_assert(sizeof(PlayerCollider) == 0x1B8);
+static_assert(sizeof(PlayerCollider) == 0x1b8);

src/Player/PlayerExternalVelocity.h

@@ -1,7 +1,33 @@
 #pragma once
 
+#include <math/seadVector.h>
+
+namespace al {
+class LiveActor;
+}
+class ExternalForceKeeper;
+class IUsePlayerCollision;
+
 class PlayerExternalVelocity {
 public:
     bool isExistForce() const;
     bool isExistSnapForce() const;
+
+private:
+    ExternalForceKeeper* mExternalForceKeeper;
+    sead::Vector3f _8;
+    sead::Vector3f _14;
+    sead::Vector3f _20;
+    const al::LiveActor* mActor;
+    const IUsePlayerCollision* mCollision;
+    const sead::Vector3f* _38;
+    bool _40;
+    sead::Vector3f _44;
+    f32 _50[6];
+    sead::Vector3f mSnapForce;
+    s32 mApplyLastGroundInertia;
+    sead::Vector3f _80;
+    sead::Vector3f _8c;
 };
+
+static_assert(sizeof(PlayerExternalVelocity) == 0x98);

src/Scene/ProjectActorFactory.cpp

@@ -76,6 +76,7 @@
 #include "MapObj/ChurchDoor.h"
 #include "MapObj/CitySignal.h"
 #include "MapObj/CoinCollectHintObj.h"
+#include "MapObj/DoorCity.h"
 #include "MapObj/Doshi.h"
 #include "MapObj/ElectricWire/ElectricWire.h"
 #include "MapObj/FireDrum2D.h"
@@ -275,7 +276,7 @@ const al::NameToCreator<al::ActorCreatorFunction> sProjectActorFactoryEntries[]
     {"Doshi", al::createActorFunction<Doshi>},
     {"DoorAreaChange", nullptr},
     {"DoorAreaChangeCap", nullptr},
-    {"DoorCity", nullptr},
+    {"DoorCity", al::createActorFunction<DoorCity>},
     {"DoorSnow", nullptr},
     {"DoorWarp", nullptr},
     {"DoorWarpStageChange", nullptr},

src/Sequence/HakoniwaSequence.h

@@ -106,6 +106,7 @@ private:
     sead::FixedSafeString<128> mCostumeName;
     al::SimpleAudioUser* mPlayerAudioUser;
     bool mIsHackEnd;
+    bool mIsWarpCheckpoint;
     TimeBalloonSequenceInfo* mBalloonSeqInfo;
     CollectBgmPlayer* mCollectBgmPlayer;
     sead::FixedSafeString<128> mLanguage;

src/System/GameDataFunction.cpp

@@ -217,7 +217,7 @@ bool isMissEndPrevStageForSceneDead(GameDataHolderAccessor accessor) {
 }
 
 void reenterStage(GameDataHolderWriter writer) {
-    writer->set_4a();
+    writer->setStageEnding();
 }
 
 s32 getNextWorldId(GameDataHolderAccessor accessor) {

src/System/GameDataHolder.h

@@ -211,9 +211,9 @@ public:
 
     GameDataFile* getGameDataFile() const { return mPlayingFile; }
 
-    void set_49() { _49 = true; }
+    void setStageChanging() { mIsStageChanging = true; }
 
-    void set_4a() { _4a = true; }
+    void setStageEnding() { mIsStageEnding = true; }
 
     s64 getPlayTimeAcrossFile() const { return mPlayTimeAcrossFile; }
 
@@ -293,8 +293,8 @@ private:
     bool mIsRequireSave;
     u32 mRequireSaveFrame;
     bool mIsInvalidSaveForMoonGet;
-    bool _49;  // related to changeNextStage(WithWorldDemoWarp)
-    bool _4a;  // related to endStage
+    bool mIsStageChanging;
+    bool mIsStageEnding;
     sead::FixedSafeString<32> mLanguage;
     u64 mPlayTimeAcrossFile;
     sead::Heap* mSaveDataWriteThread;

src/System/MoonRockData.h

@@ -23,7 +23,12 @@ public:
     void read(const al::ByamlIter& save) override;
 
 private:
-    void* _padding[0x6];
+    bool mIsShowDemoOpenMoonRockFirst;
+    bool* mIsShowDemoOpenMoonRockWorld;
+    bool* mIsAppearedMoonRockTalkMessage;
+    bool mIsShowDemoAfterOpenMoonRockFirst;
+    bool* mIsShowDemoMoonRockMapWorld;
+    s32 mWorldNum;
 };
 
 static_assert(sizeof(MoonRockData) == 0x38);