Decompile Camera Helper Functions (#1023)

* helper functions

* more pr suggestions

include/functions.h

@@ -959,39 +959,7 @@ s32 DynaPolyActor_IsInRidingRotatingState(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_IsInSwitchPressedState(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_IsInHeavySwitchPressedState(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_ValidateMove(PlayState* play, DynaPolyActor* dynaActor, s16 startRadius, s16 endRadius, s16 startHeight);
-f32 Camera_fabsf(f32 f);
-f32 Camera_LengthVec3f(Vec3f* v);
-// void func_800CB270(void);
-f32 Camera_Lerpf(f32 b, f32 a, f32 t, f32 minDist);
-s16 Camera_Lerps(s16 b, s16 a, f32 t, s16 minDist);
-// void func_800CB42C(void);
-void Camera_LerpVec3f(Vec3f* b, Vec3f* a, f32 tXZ, f32 tY, f32 minDist);
-void func_800CB544(Camera* camera);
-// void func_800CB584(void);
-// void func_800CB5DC(void);
-// void func_800CB60C(void);
-// void func_800CB674(void);
-// void func_800CB6C8(void);
-f32 func_800CB700(Camera* camera);
-// void func_800CB780(void);
-// void func_800CB7CC(void);
-// void func_800CB7F8(void);
-// void func_800CB828(void);
-// void func_800CB854(void);
-// void Camera_IsSwimming(void);
-// void func_800CB8C8(void);
-// void func_800CB8F4(void);
-// void func_800CB924(void);
-// void func_800CB950(void);
-// void func_800CBA08(void);
-// void func_800CBA34(void);
-// void func_800CBA7C(void);
-// void func_800CBAAC(void);
-// void func_800CBAD4(void);
-// void func_800CBB58(void);
-// void func_800CBB88(void);
-// void func_800CBC00(void);
-// void func_800CBC30(void);
+
 // void func_800CBC84(void);
 // void func_800CBFA4(void);
 // void func_800CC000(void);

src/code/z_camera.c

@@ -1,42 +1,243 @@
 #include "global.h"
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_fabsf.s")
+/**
+ * Returns the absolute value for floats
+ */
+f32 Camera_fabsf(f32 f) {
+    return ABS(f);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_LengthVec3f.s")
+/**
+ * Returns the magnitude for 3D float vectors
+ */
+f32 Camera_Vec3fMagnitude(Vec3f* vec) {
+    return sqrtf(SQ(vec->x) + SQ(vec->y) + SQ(vec->z));
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB270.s")
+/**
+ * Interpolates along the curve shown below
+ * returns value y ranging from 0.0f to 1.0f for -xMax <= x <= xMax
+ * returns 1.0f otherwise
+ *
+ * y = 1.0f    ________                   _________
+ *                     __               __
+ *                       _             _
+ * y axis                 _           _
+ *                         ___     ___
+ *                            _____
+ * y = 0.0f           |         |         |
+ *                 -xMax        0       xMax
+ *
+ *                           x axis
+ */
+f32 Camera_QuadraticAttenuation(f32 xRange, f32 x) {
+    f32 y;
+    f32 absX;
+    f32 percent40 = 0.4f;
+    f32 percent60;
+    f32 xQuadratic;
+    f32 xMaxQuadratic; // Normalizing constant
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Lerpf.s")
+    absX = Camera_fabsf(x);
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Lerps.s")
+    if (absX > xRange) {
+        // fixed value outside xMax range
+        y = 1.0f;
+    } else {
+        // inside xMax range
+        percent60 = 1.0f - percent40;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB42C.s")
+        if (absX < (xRange * percent60)) {
+            // quadratic curve in the inner 60% of xMax range: +concavity (upward curve)
+            xQuadratic = SQ(x) * (1.0f - percent40);
+            xMaxQuadratic = SQ(xRange * percent60);
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_LerpVec3f.s")
+            y = xQuadratic / xMaxQuadratic;
+        } else {
+            // quadratic curve in the outer 40% of xMax range: -concavity (flattening curve)
+            xQuadratic = SQ(xRange - absX) * percent40;
+            xMaxQuadratic = SQ(0.4f * xRange);
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB544.s")
+            y = 1.0f - (xQuadratic / xMaxQuadratic);
+        }
+    }
+    return y;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB584.s")
+/*
+ * Performs linear interpoloation between `cur` and `target`.  If `cur` is within
+ * `minDiff` units, the result is rounded up to `target`
+ */
+f32 Camera_LerpCeilF(f32 target, f32 cur, f32 stepScale, f32 minDiff) {
+    f32 diff = target - cur;
+    f32 step = diff * stepScale;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB5DC.s")
+    return (Camera_fabsf(diff) >= minDiff) ? cur + step : target;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB60C.s")
+/*
+ * Performs linear interpoloation between `cur` and `target`.  If `cur` is within
+ * `minDiff` units, the result is rounded up to `target`
+ */
+s16 Camera_LerpCeilS(s16 target, s16 cur, f32 stepScale, s16 minDiff) {
+    s16 diff = target - cur;
+    s16 step = diff * stepScale + 0.5f;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB674.s")
+    return (ABS(diff) >= minDiff) ? cur + step : target;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB6C8.s")
+/*
+ * Performs linear interpoloation between `cur` and `target`.  If `cur` is within
+ * `minDiff` units, the result is rounded down to `cur`
+ */
+s16 Camera_LerpFloorS(s16 target, s16 cur, f32 stepScale, s16 minDiff) {
+    s16 diff = target - cur;
+    s16 step = diff * stepScale + 0.5f;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB700.s")
+    return (ABS(diff) >= minDiff) ? cur + step : cur;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB780.s")
+/*
+ * Performs linear interpoloation between `cur` and `target`.  If `cur` is within
+ * `minDiff` units, the result is rounded up to `target`. Output is written to `cur`
+ */
+void Camera_LerpCeilVec3f(Vec3f* target, Vec3f* cur, f32 xzStepScale, f32 yStepScale, f32 minDiff) {
+    cur->x = Camera_LerpCeilF(target->x, cur->x, xzStepScale, minDiff);
+    cur->y = Camera_LerpCeilF(target->y, cur->y, yStepScale, minDiff);
+    cur->z = Camera_LerpCeilF(target->z, cur->z, xzStepScale, minDiff);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB7CC.s")
+void Camera_SetUpdateRatesFastPitch(Camera* camera) {
+    camera->yawUpdateRateInv = 100.0f;
+    camera->pitchUpdateRateInv = 16.0f;
+    camera->rUpdateRateInv = 20.0f;
+    camera->yOffsetUpdateRate = 0.05f;
+    camera->xzOffsetUpdateRate = 0.05f;
+    camera->fovUpdateRate = 0.05f;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB7F8.s")
+void Camera_SetUpdateRatesFastYaw(Camera* camera) {
+    camera->rUpdateRateInv = 50.0f;
+    camera->pitchUpdateRateInv = 100.0f;
+    camera->yawUpdateRateInv = 50.0f;
+    camera->yOffsetUpdateRate = 0.01f;
+    camera->xzOffsetUpdateRate = 0.1f;
+    camera->fovUpdateRate = 0.01f;
+    if (camera->speedRatio > 1.0f) {
+        camera->speedRatio = 1.0f;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB828.s")
+void Camera_SetUpdateRatesSlow(Camera* camera) {
+    camera->rUpdateRateInv = 1800.0f;
+    camera->yawUpdateRateInv = 1800.0f;
+    camera->pitchUpdateRateInv = 1800.0f;
+    camera->yOffsetUpdateRate = 0.01;
+    camera->xzOffsetUpdateRate = 0.01;
+    camera->fovUpdateRate = 0.01;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB854.s")
+/**
+ * Converts a 3D s16 vector into a 3D f32 vector
+ */
+Vec3f* Camera_Vec3sToVec3f(Vec3f* dest, Vec3s* src) {
+    Vec3f copy;
+
+    copy.x = src->x;
+    copy.y = src->y;
+    copy.z = src->z;
+
+    *dest = copy;
+    return dest;
+}
+
+/**
+ * Returns the difference between two angles and scales the difference up
+ */
+s16 Camera_AngleDiffAndScale(s16 angle1, s16 angle2, f32 scale) {
+    return BINANG_SUB(angle1, angle2) * scale;
+}
+
+/**
+ * Calculates the current offset between the camera's at-coordinates and the centered actor's coordinates
+ */
+void Camera_UpdateAtActorOffset(Camera* camera, Vec3f* actorOffset) {
+    camera->atActorOffset.x = camera->at.x - actorOffset->x;
+    camera->atActorOffset.y = camera->at.y - actorOffset->y;
+    camera->atActorOffset.z = camera->at.z - actorOffset->z;
+}
+
+f32 Camera_GetFocalActorHeight(Camera* camera) {
+    PosRot actorFocus;
+    Actor* focalActor = camera->focalActor;
+    f32 focalHeight;
+
+    if (focalActor == &GET_PLAYER(camera->play)->actor) {
+        focalHeight = Player_GetHeight((Player*)focalActor);
+    } else {
+        Actor_GetFocus(&actorFocus, focalActor);
+        focalHeight = actorFocus.pos.y - camera->focalActorPosRot.pos.y;
+        if (focalHeight == 0.0f) {
+            focalHeight = 10.0f;
+        }
+    }
+    return focalHeight;
+}
+
+f32 Camera_GetRunSpeedLimit(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+    f32 runSpeedLimit;
+
+    if (focalActor == &GET_PLAYER(camera->play)->actor) {
+        runSpeedLimit = Player_GetRunSpeedLimit((Player*)focalActor);
+    } else {
+        runSpeedLimit = 10.0f;
+    }
+
+    return runSpeedLimit;
+}
+
+s32 func_800CB7CC(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags3 & PLAYER_STATE3_10;
+    } else {
+        return 0;
+    }
+}
+s32 Camera_IsMountedOnHorse(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags1 & PLAYER_STATE1_800000;
+    } else {
+        return 0;
+    }
+}
+
+s32 Camera_IsDekuHovering(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags3 & PLAYER_STATE3_2000;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * When walking in a cutscene? Used during Postman's minigame.
+ */
+s32 func_800CB854(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags1 & PLAYER_STATE1_20;
+    } else {
+        return 0;
+    }
+}
 
 s32 Camera_IsSwimming(Camera* camera) {
     Actor* focalActor = camera->focalActor;
@@ -55,31 +256,184 @@ s32 Camera_IsSwimming(Camera* camera) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB8C8.s")
+s32 Camera_IsDiving(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB8F4.s")
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags2 & PLAYER_STATE2_800;
+    } else {
+        return 0;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB924.s")
+s32 Camera_IsPlayerFormZora(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB950.s")
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->transformation == PLAYER_FORM_ZORA;
+    } else {
+        return false;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA08.s")
+s32 func_800CB924(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA34.s")
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags3 & PLAYER_STATE3_1000;
+    } else {
+        return 0;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA7C.s")
+s32 func_800CB950(Camera* camera) {
+    Player* player;
+    s32 phi_v0;
+    s32 ret;
+    f32 yDiff;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBAAC.s")
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        yDiff = Camera_fabsf(camera->focalActorPosRot.pos.y - camera->playerFloorHeight);
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBAD4.s")
+        phi_v0 = false;
+        if (yDiff < 11.0f) {
+            phi_v0 = true;
+        }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBB58.s")
+        ret = phi_v0;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBB88.s")
+        if (!ret) {
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC00.s")
+            ret = false;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC30.s")
+            if (camera->focalActor->gravity > -0.1f) {
+                ret = true;
+            }
+
+            player = (Player*)camera->focalActor;
+            if (!ret) {
+                // Using zora fins
+                ret = player->stateFlags1 & PLAYER_STATE1_200000;
+                ret = !!ret;
+            }
+        }
+        return ret;
+    } else {
+        return true;
+    }
+}
+
+s32 Camera_IsClimbingLedge(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags1 & PLAYER_STATE1_4;
+    } else {
+        return 0;
+    }
+}
+
+s32 Camera_IsChargingSwordOrDekuFlowerDive(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+    s32 ret;
+
+    if (focalActor == &GET_PLAYER(camera->play)->actor) {
+        // Charging Sword
+        ret = !!(((Player*)focalActor)->stateFlags1 & PLAYER_STATE1_1000);
+        if (!ret) {
+            // Deku Flower Dive
+            ret = !!(((Player*)focalActor)->stateFlags3 & PLAYER_STATE3_100);
+        }
+        return ret;
+    } else {
+        return false;
+    }
+}
+
+s32 func_800CBA7C(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags2 & PLAYER_STATE2_800000;
+    } else {
+        return 0;
+    }
+}
+
+s32 func_800CBAAC(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->meleeWeaponState;
+    } else {
+        return 0;
+    }
+}
+
+s32 Camera_GetFocalActorPos(Vec3f* dst, Camera* camera) {
+    PosRot focalPosRot;
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        *dst = ((Player*)focalActor)->bodyPartsPos[0];
+        return dst;
+    } else {
+        Actor_GetWorldPosShapeRot(&focalPosRot, camera->focalActor);
+        *dst = focalPosRot.pos;
+        return dst;
+    }
+}
+
+s32 Camera_IsUnderwaterAsZora(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->currentBoots == PLAYER_BOOTS_ZORA_UNDERWATER;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * Evaluate if player is in one of two sword animations
+ */
+s32 func_800CBB88(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        if ((((Player*)focalActor)->meleeWeaponState != 0) &&
+            (((Player*)focalActor)->meleeWeaponAnimation == PLAYER_MWA_GORON_PUNCH_BUTT)) {
+            return 3;
+        }
+
+        if ((((Player*)focalActor)->stateFlags2 & PLAYER_STATE2_20000) ||
+            ((((Player*)focalActor)->meleeWeaponState != 0) &&
+             (((Player*)focalActor)->meleeWeaponAnimation == PLAYER_MWA_ZORA_PUNCH_KICK))) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+s32 Camera_IsUsingZoraFins(Camera* camera) {
+    Actor* focalActor = camera->focalActor;
+
+    if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
+        return ((Player*)focalActor)->stateFlags1 & PLAYER_STATE1_200000;
+    } else {
+        return 0;
+    }
+}
+
+s32 func_800CBC30(Camera* camera, f32 waterYMax, f32 waterYMin) {
+    if ((camera->playerFloorHeight != camera->waterYPos) && (camera->waterYPos < waterYMax) &&
+        (camera->waterYPos > waterYMin)) {
+        return true;
+    } else {
+        return false;
+    }
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC84.s")
 

tools/disasm/functions.txt

@@ -1113,37 +1113,37 @@
     0x800CAFDC:("DynaPolyActor_IsInHeavySwitchPressedState",),
     0x800CB000:("DynaPolyActor_ValidateMove",),
     0x800CB210:("Camera_fabsf",),
-    0x800CB240:("Camera_LengthVec3f",),
-    0x800CB270:("func_800CB270",),
-    0x800CB330:("Camera_Lerpf",),
-    0x800CB398:("Camera_Lerps",),
-    0x800CB42C:("func_800CB42C",),
-    0x800CB4C0:("Camera_LerpVec3f",),
-    0x800CB544:("func_800CB544",),
-    0x800CB584:("func_800CB584",),
-    0x800CB5DC:("func_800CB5DC",),
-    0x800CB60C:("func_800CB60C",),
-    0x800CB674:("func_800CB674",),
-    0x800CB6C8:("func_800CB6C8",),
-    0x800CB700:("func_800CB700",),
-    0x800CB780:("func_800CB780",),
+    0x800CB240:("Camera_Vec3fMagnitude",),
+    0x800CB270:("Camera_QuadraticAttenuation",),
+    0x800CB330:("Camera_LerpCeilF",),
+    0x800CB398:("Camera_LerpCeilS",),
+    0x800CB42C:("Camera_LerpFloorS",),
+    0x800CB4C0:("Camera_LerpCeilVec3f",),
+    0x800CB544:("Camera_SetUpdateRatesFastPitch",),
+    0x800CB584:("Camera_SetUpdateRatesFastYaw",),
+    0x800CB5DC:("Camera_SetUpdateRatesSlow",),
+    0x800CB60C:("Camera_Vec3sToVec3f",),
+    0x800CB674:("Camera_AngleDiffAndScale",),
+    0x800CB6C8:("Camera_UpdateAtActorOffset",),
+    0x800CB700:("Camera_GetFocalActorHeight",),
+    0x800CB780:("Camera_GetRunSpeedLimit",),
     0x800CB7CC:("func_800CB7CC",),
-    0x800CB7F8:("func_800CB7F8",),
-    0x800CB828:("func_800CB828",),
+    0x800CB7F8:("Camera_IsMountedOnHorse",),
+    0x800CB828:("Camera_IsDekuHovering",),
     0x800CB854:("func_800CB854",),
     0x800CB880:("Camera_IsSwimming",),
-    0x800CB8C8:("func_800CB8C8",),
-    0x800CB8F4:("func_800CB8F4",),
+    0x800CB8C8:("Camera_IsDiving",),
+    0x800CB8F4:("Camera_IsPlayerFormZora",),
     0x800CB924:("func_800CB924",),
     0x800CB950:("func_800CB950",),
-    0x800CBA08:("func_800CBA08",),
-    0x800CBA34:("func_800CBA34",),
+    0x800CBA08:("Camera_IsClimbingLedge",),
+    0x800CBA34:("Camera_IsChargingSwordOrDekuFlowerDive",),
     0x800CBA7C:("func_800CBA7C",),
     0x800CBAAC:("func_800CBAAC",),
-    0x800CBAD4:("func_800CBAD4",),
-    0x800CBB58:("func_800CBB58",),
+    0x800CBAD4:("Camera_GetFocalActorPos",),
+    0x800CBB58:("Camera_IsUnderwaterAsZora",),
     0x800CBB88:("func_800CBB88",),
-    0x800CBC00:("func_800CBC00",),
+    0x800CBC00:("Camera_IsUsingZoraFins",),
     0x800CBC30:("func_800CBC30",),
     0x800CBC84:("func_800CBC84",),
     0x800CBFA4:("func_800CBFA4",),

tools/sizes/code_functions.csv

@@ -627,37 +627,37 @@ asm/non_matchings/code/z_bg_item/DynaPoly_IsInSwitchPressedState.s,DynaPoly_IsIn
 asm/non_matchings/code/z_bg_item/DynaPoly_IsInHeavySwitchPressedState.s,DynaPoly_IsInHeavySwitchPressedState,0x800CAFDC,0x9
 asm/non_matchings/code/z_bg_item/DynaPoly_ValidateMove.s,DynaPoly_ValidateMove,0x800CB000,0x84
 asm/non_matchings/code/z_camera/Camera_fabsf.s,Camera_fabsf,0x800CB210,0xC
-asm/non_matchings/code/z_camera/Camera_LengthVec3f.s,Camera_LengthVec3f,0x800CB240,0xC
-asm/non_matchings/code/z_camera/func_800CB270.s,func_800CB270,0x800CB270,0x30
-asm/non_matchings/code/z_camera/Camera_Lerpf.s,Camera_Lerpf,0x800CB330,0x1A
-asm/non_matchings/code/z_camera/Camera_Lerps.s,Camera_Lerps,0x800CB398,0x25
-asm/non_matchings/code/z_camera/func_800CB42C.s,func_800CB42C,0x800CB42C,0x25
-asm/non_matchings/code/z_camera/Camera_LerpVec3f.s,Camera_LerpVec3f,0x800CB4C0,0x21
-asm/non_matchings/code/z_camera/func_800CB544.s,func_800CB544,0x800CB544,0x10
-asm/non_matchings/code/z_camera/func_800CB584.s,func_800CB584,0x800CB584,0x16
-asm/non_matchings/code/z_camera/func_800CB5DC.s,func_800CB5DC,0x800CB5DC,0xC
-asm/non_matchings/code/z_camera/func_800CB60C.s,func_800CB60C,0x800CB60C,0x1A
-asm/non_matchings/code/z_camera/func_800CB674.s,func_800CB674,0x800CB674,0x15
-asm/non_matchings/code/z_camera/func_800CB6C8.s,func_800CB6C8,0x800CB6C8,0xE
-asm/non_matchings/code/z_camera/func_800CB700.s,func_800CB700,0x800CB700,0x20
-asm/non_matchings/code/z_camera/func_800CB780.s,func_800CB780,0x800CB780,0x13
+asm/non_matchings/code/z_camera/Camera_Vec3fMagnitude.s,Camera_Vec3fMagnitude,0x800CB240,0xC
+asm/non_matchings/code/z_camera/Camera_QuadraticAttenuation.s,Camera_QuadraticAttenuation,0x800CB270,0x30
+asm/non_matchings/code/z_camera/Camera_LerpCeilF.s,Camera_LerpCeilF,0x800CB330,0x1A
+asm/non_matchings/code/z_camera/Camera_LerpCeilS.s,Camera_LerpCeilS,0x800CB398,0x25
+asm/non_matchings/code/z_camera/Camera_LerpFloorS.s,Camera_LerpFloorS,0x800CB42C,0x25
+asm/non_matchings/code/z_camera/Camera_LerpCeilVec3f.s,Camera_LerpCeilVec3f,0x800CB4C0,0x21
+asm/non_matchings/code/z_camera/Camera_SetUpdateRatesFastPitch.s,Camera_SetUpdateRatesFastPitch,0x800CB544,0x10
+asm/non_matchings/code/z_camera/Camera_SetUpdateRatesFastYaw.s,Camera_SetUpdateRatesFastYaw,0x800CB584,0x16
+asm/non_matchings/code/z_camera/Camera_SetUpdateRatesSlow.s,Camera_SetUpdateRatesSlow,0x800CB5DC,0xC
+asm/non_matchings/code/z_camera/Camera_Vec3sToVec3f.s,Camera_Vec3sToVec3f,0x800CB60C,0x1A
+asm/non_matchings/code/z_camera/Camera_AngleDiffAndScale.s,Camera_AngleDiffAndScale,0x800CB674,0x15
+asm/non_matchings/code/z_camera/Camera_UpdateAtActorOffset.s,Camera_UpdateAtActorOffset,0x800CB6C8,0xE
+asm/non_matchings/code/z_camera/Camera_GetFocalActorHeight.s,Camera_GetFocalActorHeight,0x800CB700,0x20
+asm/non_matchings/code/z_camera/Camera_GetRunSpeedLimit.s,Camera_GetRunSpeedLimit,0x800CB780,0x13
 asm/non_matchings/code/z_camera/func_800CB7CC.s,func_800CB7CC,0x800CB7CC,0xB
-asm/non_matchings/code/z_camera/func_800CB7F8.s,func_800CB7F8,0x800CB7F8,0xC
-asm/non_matchings/code/z_camera/func_800CB828.s,func_800CB828,0x800CB828,0xB
+asm/non_matchings/code/z_camera/Camera_IsMountedOnHorse.s,Camera_IsMountedOnHorse,0x800CB7F8,0xC
+asm/non_matchings/code/z_camera/Camera_IsDekuHovering.s,Camera_IsDekuHovering,0x800CB828,0xB
 asm/non_matchings/code/z_camera/func_800CB854.s,func_800CB854,0x800CB854,0xB
 asm/non_matchings/code/z_camera/Camera_IsSwimming.s,Camera_IsSwimming,0x800CB880,0x12
-asm/non_matchings/code/z_camera/func_800CB8C8.s,func_800CB8C8,0x800CB8C8,0xB
-asm/non_matchings/code/z_camera/func_800CB8F4.s,func_800CB8F4,0x800CB8F4,0xC
+asm/non_matchings/code/z_camera/Camera_IsDiving.s,Camera_IsDiving,0x800CB8C8,0xB
+asm/non_matchings/code/z_camera/Camera_IsPlayerFormZora.s,Camera_IsPlayerFormZora,0x800CB8F4,0xC
 asm/non_matchings/code/z_camera/func_800CB924.s,func_800CB924,0x800CB924,0xB
 asm/non_matchings/code/z_camera/func_800CB950.s,func_800CB950,0x800CB950,0x2E
-asm/non_matchings/code/z_camera/func_800CBA08.s,func_800CBA08,0x800CBA08,0xB
-asm/non_matchings/code/z_camera/func_800CBA34.s,func_800CBA34,0x800CBA34,0x12
+asm/non_matchings/code/z_camera/Camera_IsClimbingLedge.s,Camera_IsClimbingLedge,0x800CBA08,0xB
+asm/non_matchings/code/z_camera/Camera_IsChargingSwordOrDekuFlowerDive.s,Camera_IsChargingSwordOrDekuFlowerDive,0x800CBA34,0x12
 asm/non_matchings/code/z_camera/func_800CBA7C.s,func_800CBA7C,0x800CBA7C,0xC
 asm/non_matchings/code/z_camera/func_800CBAAC.s,func_800CBAAC,0x800CBAAC,0xA
-asm/non_matchings/code/z_camera/func_800CBAD4.s,func_800CBAD4,0x800CBAD4,0x21
-asm/non_matchings/code/z_camera/func_800CBB58.s,func_800CBB58,0x800CBB58,0xC
+asm/non_matchings/code/z_camera/Camera_GetFocalActorPos.s,Camera_GetFocalActorPos,0x800CBAD4,0x21
+asm/non_matchings/code/z_camera/Camera_IsUnderwaterAsZora.s,Camera_IsUnderwaterAsZora,0x800CBB58,0xC
 asm/non_matchings/code/z_camera/func_800CBB88.s,func_800CBB88,0x800CBB88,0x1E
-asm/non_matchings/code/z_camera/func_800CBC00.s,func_800CBC00,0x800CBC00,0xC
+asm/non_matchings/code/z_camera/Camera_IsUsingZoraFins.s,Camera_IsUsingZoraFins,0x800CBC00,0xC
 asm/non_matchings/code/z_camera/func_800CBC30.s,func_800CBC30,0x800CBC30,0x15
 asm/non_matchings/code/z_camera/func_800CBC84.s,func_800CBC84,0x800CBC84,0xC8
 asm/non_matchings/code/z_camera/func_800CBFA4.s,func_800CBFA4,0x800CBFA4,0x17