`z_camera` with Partial Docs (3 Non-Equivalent) (#601)

* more boot files

* Add VT macros and script

* finish already existing boot files

* most of  libultra

* fix 64bits libultra files

* Use C files for libultra, wrap some functions in NON_MATCHING

* Remove duplicate of OS_CLOCK_RATE from fault.c

* C files for fbdemos

* delete dumb files

* bootstrap C files, still need to add them to the spec

* update fixbaserom

* boot OK?

* I forgot to commit the spec

* C for gamestates

* C for kaleido

* Change all includes to ""

* copy actor sizes script from oot

* I forgot to delete those files

* Basic C files for effects

* Add effects initvars names

* Remove mislabelled boot functions from header/txt

* Begin porting bootstrap_fx, some sizes

* Fix <>

* Fix enum

* Fix diff.py

* fix libultra stuff

* update regconvert

* update setup warnings

* add some missing ;

* Fix some makefile stuff and other fixes on some non_matching functions

* add executable flag in extract_baserom and fixbaserom

* fix relative path

* copy assist from oot

* fix map path

* another assist path fix

* Delete C files for handwritten files

* add code_801A51F0 to spec

* add gfxbuffers to spec

* Move rodata to top of each file when possible

* UNK_TYPEs for func_801A51F0

* Remove kaleido rodata from spec

* Update spec and undefined_syms for recent merge

* GCC warnings and fix errors in nonmatchings,

* round percentage numbers

* progress script: format changes

* progress: error on non-existing files

* fix warning in z_scene_table

* Match 2 nonmatchings in z_actor

* Warnings in lightswitch and invadepoh

* Fix warning in z_actor_dlftbls

* I though I fixed this one

* whoops

* Comment out CC_CHECK

* Removed redundant ultra64.h includes

* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms

* Completed gamestates bootstrap

* Split kaleido_scope

* Remove section.h and segment.h, move keep object externs to a common location in variables.h

* Completed effects bootstrap

* Segmented address externs for effects, fbdemos, gamestates and kaleido

* Move actor data externs out of the if 0

* Segmented address externs for actors

* Prepare actionfunc detection

* fix script, how did it even work before

* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler

* Automated actionFunc detection in actors

* Segmented addresses from player .text

* rm old segment addrs script and fix build

* Move sizes folder to tools

* Make build.py executable

* New Jenkinsfile Prayge

* Remove numpy dependencies

* Add warnings_disasm_current.txt

* my bad

* Update spec and undefined_syms

* Add z_eff_ss_hahen to pametfrog

* git subrepo pull (merge) --force tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "163ca2af"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "163ca2af"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Make z64compress print to stdout

* sneeky commit to update warnings tooling

* test

* Another test

* Mark fixing overlay reloc generating as a TODO

* Update warnings stuff

* Communicate the return code from running z64compress back to the Makefile through the wrapper

* Run formatter, remove extra commented copy of function

* Re-fix some includes

* Convert atan to hex to conform to decided style

* Clean up most matching with rodata and most warnings

* Match Parallel1, minor improvement in Jump and KeepOn

* Begin Documentation

* More docs, fixed warnings

* cleanup

* Continuing with docs

* Small progress

* Fix BSS, All but 1 matching functions freed, continue docs

* Fix merge

* Many function names

* More Names

* Change name

* Docs

* Begin camera_data docs

* small progress

* Minor change

* Improve docs on functions

* Player to TrackActor, progress on camera_data

* Add Cam_Data Macro and fix warnings

* Progress on Camera_Data docs

* Document CsCamData

* Cleanup

* Minor clean up in Battle NON_MATCHING

* Small fixes

* Fix bss, OK

* typo

* revert some z64 macros and format

* OK

* minor settings docs

* Many flags, names, and other documentation

* Name many camera_data variables

* A few more small changes

* Refactoring Camera Action Function Structs WIP

* Finish Struct reworking

* Some door docs

* Add my findings of Camera Settings as comments

* More camera data names and comments cleanup

* A few names

* Slow progress on camera_data

* More camera_data progress, slow and steady

* Many renaming

* wip

* camera_data WIP

* The grind continues

* More data wip

* All the macros are in!

* Format and cleanup

* more docs

* format

* Breakup camera into pieces

* format

* PR Feedback round 1

* revert macro

* Fix header

* Document Play Camera and Screen pos

* cleanup

* revert camera split

* Start copying docs from OoT

* remaining CAM_INTERFACE_FLAGS

* roData and rwData

* Change paramData

* Flags

* More docs

* More Cleanup

* cleanup

* more

* More docs

* Standardize subcams

* macro

* Player_UpdateCamAndSeqModes

* cleanup from PR

* format

* sync with bgCam and actorsCsCam PR

* sync to z_play cam PR

* docs progress

* revert player changes

* helper function cleanup

* match Jump3, thanks petrie & synray

* camera bg docs

* brackets

* cam math docs

* more cam bg docs

* rename flags

* misc docs

* more cleanup

* some cam docs

* some PR

* hud visibility

* fix macros, sync with PR

* sync with PR

* sync with PR

* helper cleanup

* cleanup

* PR Suggestions

* more PR

* fix merge master

* PR review

* add comment

* more quake cleanup

* pr suggestions

---------

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

include/functions.h

@@ -133,7 +133,7 @@ void SystemArena_FreeNullCheck(void* ptr);
 void SystemArena_RunInits(void);
 void SystemArena_Init(void* start, size_t size);
 s32 func_80086620(OSMesgQueue* param_1, PadMgr* param_2, OSContStatus* param_3);
-// void func_80086760(void);
+f32 func_80086760(f32 x);
 // void func_80086794(void);
 // void func_800867B4(void);
 // void func_800867D4(void);
@@ -797,47 +797,45 @@ s32 DynaPolyActor_IsSwitchPressed(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_IsHeavySwitchPressed(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_ValidateMove(PlayState* play, DynaPolyActor* dynaActor, s16 startRadius, s16 endRadius, s16 startHeight);
 
-Camera* Camera_Alloc(View* view, CollisionContext* bg, PlayState* play);
-void Camera_Free(Camera* camera);
-void Camera_Init(Camera* camera, View* view, CollisionContext* bg, PlayState* play);
-// void func_800DDFE0(void);
-void Camera_InitPlayerSettings(Camera* camera, Player* player);
+Camera* Camera_Create(View* view, CollisionContext* colCtx, PlayState* play);
+void Camera_Destroy(Camera* camera);
+void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState* play);
+void func_800DDFE0(Camera* camera);
+void Camera_InitFocalActorSettings(Camera* camera, Actor* focalActor);
 s32 Camera_ChangeStatus(Camera* camera, s16 status);
-// void func_800DE324(void);
-// void func_800DE62C(void);
-// void func_800DE840(void);
-// void func_800DE890(void);
-// UNK_TYPE4 func_800DE954(Camera* camera);
-Vec3s* Camera_Update(Vec3s* param_1, Camera* camera);
-// void func_800DF498(void);
-u32 Camera_SetMode(Camera* camera, s16 mode, s8 param_3);
+s32 Camera_UpdateWater(Camera* camera);
+void Camera_EarthquakeDay3(Camera* camera);
+s32 Camera_UpdateHotRoom(Camera* camera);
+s32 Camera_SetSwordDistortion(Camera* camera);
+s32 Camera_RequestGiantsMaskSetting(Camera* camera);
+Vec3s* Camera_Update(Vec3s* inputDir, Camera* camera);
+s32 func_800DF498(Camera* camera);
+s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 forceChange);
 s32 Camera_ChangeMode(Camera* camera, s16 mode);
-s32 func_800DF86C(Camera* camera, s16 arg1);
-// void func_800DF8EC(void);
+s32 Camera_CheckValidMode(Camera* camera, s16 mode);
+s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags);
 s32 Camera_ChangeSetting(Camera* camera, s16 setting);
-s32 Camera_ChangeDataIdx(Camera* camera, s32 camDataIdx);
-// void func_800DFC1C(void);
-// void func_800DFC40(void);
-s32 Camera_GetInputDirYaw(Camera* camera);
-void Camera_GetCamDir(Vec3s* dst, Camera* camera);
+s32 Camera_ChangeActorCsCamIndex(Camera* camera, s32 bgCamIndex);
+Vec3s* Camera_GetInputDir(Vec3s* dst, Camera* camera);
+s16 Camera_GetInputDirPitch(Camera* camera);
+s16 Camera_GetInputDirYaw(Camera* camera);
+Vec3s* Camera_GetCamDir(Vec3s* dst, Camera* camera);
 s16 Camera_GetCamDirPitch(Camera* camera);
 s16 Camera_GetCamDirYaw(Camera* camera);
-void Camera_AddQuake(Camera* camera, s32 arg1, s16 y, s32 countdown);
+s32 Camera_AddQuake(Camera* camera, s32 arg1, s16 y, s32 countdown);
 s32 Camera_SetViewParam(Camera* camera, s32 viewFlag, void* param);
-// UNK_TYPE4 func_800DFEF0(s32 param_1, u16 param_2);
-void func_800DFF18(Camera* camera, s32 arg1);
-// UNK_TYPE4 func_800DFF34(s32 param_1);
-// UNK_TYPE4 func_800DFF44(void);
-s16 Camera_SetFlags(Camera* iParm1, s16 flags);
-s16 Camera_ClearFlags(Camera* camera, s16 flags);
+s32 Camera_UnsetViewFlag(Camera* camera, s16 viewFlag);
+s32 Camera_OverwriteStateFlags(Camera* camera, s16 stateFlags);
+s16 Camera_SetStateFlag(Camera* camera, s16 flags);
+s16 Camera_UnsetStateFlag(Camera* camera, s16 flags);
 s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 arg3, s16 timer1, s16 timer2, s16 timer3);
-s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera);
-// UNK_TYPE4 func_800E01AC(void);
+s32 Camera_Copy(Camera* dstCam, Camera* srcCam);
+s32 Camera_IsDbgCamEnabled(void);
 Vec3f* Camera_GetQuakeOffset(Vec3f* quakeOffset, Camera* camera);
-// void func_800E01DC(s32 param_1, u32 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
-// UNK_TYPE4 func_800E0228(void);
-void func_800E0238(Camera* camera);
-void Camera_SetToTrackActor(Camera* camera, Actor* actor);
+void Camera_SetCameraData(Camera* camera, s16 setDataFlags, void* data0, void* data1, s16 data2, s16 data3);
+s32 Camera_GetNegOne(void);
+s16 func_800E0238(Camera* camera);
+void Camera_SetFocalActor(Camera* camera, Actor* actor);
 void Camera_SetTargetActor(Camera* camera, Actor* actor);
 f32 Camera_GetWaterYPos(Camera* camera);
 void func_800E0348(Camera* camera);
@@ -2191,8 +2189,8 @@ f32 randPlusMinusPoint5Scaled(f32 scale);
 f32 Math3D_Normalize(Vec3f* vec);
 s32 Math3D_PlaneVsLineSegClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, Vec3f* linePointA, Vec3f* linePointB, Vec3f* closestPoint);
 s32 func_80179798(Vec3f* param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, Vec3f* param_5, Vec3f* param_6);
-// void func_80179A44(void);
-void func_80179B34(float fParm1, f32 fParm2, f32 fParm5, f32 fParm6, f32 param_5, f32 param_6, f32 param_7, float* param_8, float* param_9);
+void func_80179A44(Vec3f* arg0, PosRot* arg1, Vec3f* arg2);
+void func_80179B34(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32* arg7, f32* arg8);
 // UNK_TYPE4 func_80179B94(f32 fParm1, f32 fParm2, f32 fParm5, f32 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, Vec3f* param_9);
 // void func_80179D74(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
 void Math3D_ScaleAndAdd(Vec3f* a, Vec3f* b, f32 scale, Vec3f* dst);

include/variables.h

@@ -384,23 +384,6 @@ extern BgCheckSceneSubdivisionEntry sSceneSubdivisionList[];
 extern BgSpecialSceneMaxObjects sCustomDynapolyMem[];
 // extern UNK_TYPE1 D_801B4708;
 
-// extern UNK_TYPE4 D_801B9E0C;
-// extern UNK_TYPE4 D_801B9E10;
-// extern UNK_TYPE4 D_801B9E14;
-// extern UNK_TYPE2 D_801B9E18;
-// extern UNK_TYPE2 D_801B9E34;
-// extern UNK_TYPE4 D_801B9E50;
-// extern UNK_TYPE4 D_801B9E54;
-// extern UNK_TYPE4 D_801B9E58;
-// extern UNK_TYPE4 D_801B9E5C;
-// extern UNK_TYPE4 D_801B9E60;
-// extern UNK_TYPE1 D_801B9E64;
-// extern UNK_TYPE1 D_801B9E84;
-// extern UNK_TYPE4 D_801B9EB4;
-// extern UNK_TYPE4 D_801B9ED4;
-// extern UNK_TYPE4 sEarthquakeFreq;
-// extern UNK_TYPE2 sEarthquakeTimer;
-extern UNK_TYPE4 D_801B9F10;
 extern DamageTable sDamageTablePresets[23];
 extern f32 damageMultipliers[16];
 extern Collider defaultCollider;
@@ -2240,7 +2223,7 @@ extern f32 D_801ED8D0;
 // extern UNK_TYPE1 D_801ED8D8;
 // extern UNK_TYPE1 D_801ED8DC;
 extern Mtx D_801ED8E0;
-// extern UNK_TYPE1 D_801ED920;
+extern Actor* D_801ED920;
 extern FaultClient sActorOverlayTableFaultClient;
 extern FaultAddrConvClient sActorOverlayTableFaultAddrConvClient;
 extern char D_801ED950[80];
@@ -2256,20 +2239,6 @@ extern Vec3f D_801EDB70[3];
 extern Plane D_801EDB98;
 extern Sphere16 D_801EDBA8;
 extern TriNorm D_801EDBB0;
-// extern UNK_TYPE1 D_801EDBD4;
-// extern UNK_TYPE1 D_801EDBD8;
-// extern UNK_TYPE1 D_801EDBDC;
-// extern UNK_TYPE1 D_801EDBE0;
-
-// extern s16 D_801EDBF0;
-// extern f32 D_801EDBF4;
-// extern f32 D_801EDBF8;
-// extern CameraCollision D_801EDC00;
-// extern PlayState* sCamPlayState;
-// extern SwingAnimation D_801EDC30[4];
-// extern Vec3f D_801EDDD0;
-// extern Vec3f D_801EDDE0;
-// extern Vec3f D_801EDDF0;
 
 extern Vec3f D_801EDE00;
 extern Vec3f D_801EDE10;

include/z64bgcheck.h

@@ -255,7 +255,7 @@ typedef struct {
     /* 0x14 */ u16 numPolygons;
     /* 0x18 */ CollisionPoly* polyList;
     /* 0x1C */ SurfaceType* surfaceTypeList;
-    /* 0x20 */ CamData* bgCamList;
+    /* 0x20 */ BgCamInfo* bgCamList;
     /* 0x24 */ u16 numWaterBoxes;
     /* 0x28 */ WaterBox* waterBoxes;
 } CollisionHeader; // size = 0x2C

include/z64camera.h

@@ -90,18 +90,18 @@
 #define CAM_BEHAVIOR_SETTING_2 (1 << 4)
 // Mode (0x2, 0x20)
 #define CAM_BEHAVIOR_MODE_1 (1 << 1)
-#define CAM_BEHAVIOR_MODE_2 (1 << 5)
+#define CAM_BEHAVIOR_MODE_VALID (1 << 5)
 // bgCam (0x4, 0x40)
 #define CAM_BEHAVIOR_BGCAM_1 (1 << 2)
 #define CAM_BEHAVIOR_BGCAM_2 (1 << 6)
 
 // Camera stateFlags. Variety of generic flags
 #define CAM_STATE_0 (1 << 0) // Must be set for the camera from changing settings based on the bg surface
-#define CAM_STATE_1 (1 << 1)
+#define CAM_STATE_CHECK_WATER (1 << 1)
 #define CAM_STATE_2 (1 << 2)
 #define CAM_STATE_3 (1 << 3)
 #define CAM_STATE_4 (1 << 4)
-#define CAM_STATE_5 (1 << 5)
+#define CAM_STATE_DISABLE_MODE_CHANGE (1 << 5)
 #define CAM_STATE_6 (1 << 6)
 #define CAM_STATE_7 (1 << 7)
 #define CAM_STATE_UNDERWATER (1 << 8)
@@ -110,7 +110,7 @@
 #define CAM_STATE_11 (1 << 11)
 #define CAM_STATE_12 (1 << 12)
 #define CAM_STATE_13 (1 << 13)
-#define CAM_STATE_14 (1 << 14)
+#define CAM_STATE_INITIALIZED (1 << 14)
 #define CAM_STATE_15 ((s16)(1 << 15))
 
 // Camera viewFlags. Set params related to view
@@ -340,13 +340,13 @@ typedef enum {
 } CameraFuncType;
 
 typedef enum {
-    /* 0x00 */ CAM_DATA_00,
+    /* 0x00 */ CAM_DATA_Y_OFFSET,
     /* 0x01 */ CAM_DATA_01,
     /* 0x02 */ CAM_DATA_02,
-    /* 0x03 */ CAM_DATA_03,
+    /* 0x03 */ CAM_DATA_PITCH_TARGET,
     /* 0x04 */ CAM_DATA_04,
     /* 0x05 */ CAM_DATA_05,
-    /* 0x06 */ CAM_DATA_06,
+    /* 0x06 */ CAM_DATA_YAW_DIFF_RANGE,
     /* 0x07 */ CAM_DATA_FOV,
     /* 0x08 */ CAM_DATA_08,
     /* 0x09 */ CAM_DATA_INTERFACE_FLAGS,
@@ -405,13 +405,13 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_NORM1(yOffset, data01, data02, pitchTarget, eyeStepScale, posStepScale, yawDiffRange, fov, data08, interfaceFlags) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
-    { pitchTarget,  CAM_DATA_03 }, \
+    { pitchTarget,  CAM_DATA_PITCH_TARGET }, \
     { eyeStepScale, CAM_DATA_04 }, \
     { posStepScale, CAM_DATA_05 }, \
-    { yawDiffRange, CAM_DATA_06 }, \
+    { yawDiffRange, CAM_DATA_YAW_DIFF_RANGE }, \
     { fov,          CAM_DATA_FOV }, \
     { data08,       CAM_DATA_08 }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
@@ -462,10 +462,10 @@ typedef struct {
 // Unused Camera RemoteBomb Setting
 
 #define CAM_FUNCDATA_NORM2(yOffset, data01, data02, pitchTarget, data04, fov, data08, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data01,      CAM_DATA_01 }, \
     { data02,      CAM_DATA_02 }, \
-    { pitchTarget, CAM_DATA_03 }, \
+    { pitchTarget, CAM_DATA_PITCH_TARGET }, \
     { data04,      CAM_DATA_04 }, \
     { fov,         CAM_DATA_FOV }, \
     { data08,      CAM_DATA_08 }, \
@@ -480,10 +480,10 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_NORM3(yOffset, data01, data02, pitchTarget, eyeStepScale, posStepScale, fov, data08, interfaceFlags) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
-    { pitchTarget,  CAM_DATA_03 }, \
+    { pitchTarget,  CAM_DATA_PITCH_TARGET }, \
     { eyeStepScale, CAM_DATA_04 }, \
     { posStepScale, CAM_DATA_05 }, \
     { fov,          CAM_DATA_FOV }, \
@@ -530,12 +530,12 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_NORM0(yOffset, data01, data02, data21, data04, yawDiffRange, fov, data08, interfaceFlags) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
     { data21,       CAM_DATA_21 }, \
     { data04,       CAM_DATA_04 }, \
-    { yawDiffRange, CAM_DATA_06 }, \
+    { yawDiffRange, CAM_DATA_YAW_DIFF_RANGE }, \
     { fov,          CAM_DATA_FOV }, \
     { data08,       CAM_DATA_08 }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
@@ -581,10 +581,10 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_PARA1(yOffset, data01, data02, pitchTarget, data10, data04, data05, fov, data08, interfaceFlags, data11, data12) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
-    { pitchTarget,  CAM_DATA_03 }, \
+    { pitchTarget,  CAM_DATA_PITCH_TARGET }, \
     { data10,       CAM_DATA_10 }, \
     { data04,       CAM_DATA_04 }, \
     { data05,       CAM_DATA_05 }, \
@@ -596,10 +596,10 @@ typedef struct {
 
 // Same as above but with extra unused entry
 #define CAM_FUNCDATA_PARA1_ALT(yOffset, data01, data02, pitchTarget, data10, data04, data05, fov, data08, interfaceFlags, data11, data12, data18) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
-    { pitchTarget,  CAM_DATA_03 }, \
+    { pitchTarget,  CAM_DATA_PITCH_TARGET }, \
     { data10,       CAM_DATA_10 }, \
     { data04,       CAM_DATA_04 }, \
     { data05,       CAM_DATA_05 }, \
@@ -662,10 +662,10 @@ typedef struct {
 // Unused Camera Maze Setting
 
 #define CAM_FUNCDATA_PARA2(yOffset, data02, data01, pitchTarget, data04, fov, data08, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data02,      CAM_DATA_02 }, \
     { data01,      CAM_DATA_01 }, \
-    { pitchTarget, CAM_DATA_03 }, \
+    { pitchTarget, CAM_DATA_PITCH_TARGET }, \
     { data04,      CAM_DATA_04 }, \
     { fov,         CAM_DATA_FOV }, \
     { data08,      CAM_DATA_08 }, \
@@ -680,7 +680,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_JUMP2(yOffset, data01, data02, data20, data04, data05, fov, data08, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data01,      CAM_DATA_01 }, \
     { data02,      CAM_DATA_02 }, \
     { data20,      CAM_DATA_20 }, \
@@ -729,13 +729,13 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_JUMP3(yOffset, data01, data02, pitchTarget, data04, data05, yawDiffRange, fov, data08, interfaceFlags) \
-    { yOffset,      CAM_DATA_00 }, \
+    { yOffset,      CAM_DATA_Y_OFFSET }, \
     { data01,       CAM_DATA_01 }, \
     { data02,       CAM_DATA_02 }, \
-    { pitchTarget,  CAM_DATA_03 }, \
+    { pitchTarget,  CAM_DATA_PITCH_TARGET }, \
     { data04,       CAM_DATA_04 }, \
     { data05,       CAM_DATA_05 }, \
-    { yawDiffRange, CAM_DATA_06 }, \
+    { yawDiffRange, CAM_DATA_YAW_DIFF_RANGE }, \
     { fov,          CAM_DATA_FOV }, \
     { data08,       CAM_DATA_08 }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
@@ -785,7 +785,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_BATT1(yOffset, data01, data02, data13, data14, data15, data16, data17, fov, data08, interfaceFlags, data11, data18) \
-    { yOffset, CAM_DATA_00 }, \
+    { yOffset, CAM_DATA_Y_OFFSET }, \
     { data01,  CAM_DATA_01 }, \
     { data02,  CAM_DATA_02 }, \
     { data13,  CAM_DATA_13 }, \
@@ -845,7 +845,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_KEEP1(yOffset, data01, data02, data13, data14, data15, data16, data17, fov, data08, interfaceFlags, data11) \
-    { yOffset, CAM_DATA_00 }, \
+    { yOffset, CAM_DATA_Y_OFFSET }, \
     { data01,  CAM_DATA_01 }, \
     { data02,  CAM_DATA_02 }, \
     { data13,  CAM_DATA_13 }, \
@@ -902,7 +902,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_KEEP3(yOffset, data01, data02, data13, data14, data15, data16, data17, fov, data08, timer, interfaceFlags, data18) \
-    { yOffset, CAM_DATA_00 }, \
+    { yOffset, CAM_DATA_Y_OFFSET }, \
     { data01,  CAM_DATA_01 }, \
     { data02,  CAM_DATA_02 }, \
     { data13,  CAM_DATA_13 }, \
@@ -957,9 +957,9 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_KEEP4(yOffset, data01, pitchTarget, data10, data18, fov, interfaceFlags, data04, timer) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data01,      CAM_DATA_01 }, \
-    { pitchTarget, CAM_DATA_03 }, \
+    { pitchTarget, CAM_DATA_PITCH_TARGET }, \
     { data10,      CAM_DATA_10 }, \
     { data18,      CAM_DATA_18 }, \
     { fov,         CAM_DATA_FOV }, \
@@ -1008,7 +1008,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_FIXD1(yOffset, data04, fov, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data04,      CAM_DATA_04 }, \
     { fov,         CAM_DATA_FOV }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
@@ -1040,7 +1040,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_FIXD2(yOffset, data01, data02, data04, data05, fov, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data01,      CAM_DATA_01 }, \
     { data02,      CAM_DATA_02 }, \
     { data04,      CAM_DATA_04 }, \
@@ -1097,7 +1097,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_SUBJ1(yOffset, data01, data02, data04, data19, data17, data18, fov, interfaceFlags) \
-    { yOffset, CAM_DATA_00 }, \
+    { yOffset, CAM_DATA_Y_OFFSET }, \
     { data01,  CAM_DATA_01 }, \
     { data02,  CAM_DATA_02 }, \
     { data04,  CAM_DATA_04 }, \
@@ -1140,7 +1140,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_UNIQ2(yOffset, data01, fov, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data01,      CAM_DATA_01 }, \
     { fov,         CAM_DATA_FOV }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
@@ -1175,7 +1175,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_UNIQ0(yOffset, data04, interfaceFlags) \
-    { yOffset,     CAM_DATA_00 }, \
+    { yOffset,     CAM_DATA_Y_OFFSET }, \
     { data04,      CAM_DATA_04 }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
 
@@ -1387,10 +1387,10 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_SPEC5(yOffset, eyeDist, minDistForRot, fov, atMaxLERPScale, timerInit, pitch, interfaceFlags) \
-    { yOffset,        CAM_DATA_00 }, \
+    { yOffset,        CAM_DATA_Y_OFFSET }, \
     { eyeDist,        CAM_DATA_01 }, \
     { minDistForRot,  CAM_DATA_02 }, \
-    { fov,            CAM_DATA_03 }, \
+    { fov,            CAM_DATA_PITCH_TARGET }, \
     { atMaxLERPScale, CAM_DATA_FOV }, \
     { timerInit,      CAM_DATA_08 }, \
     { pitch,          CAM_DATA_12 }, \
@@ -1446,7 +1446,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_SPEC8(yOffset, eyeStepScale, posStepScale, fov, spiralDoorCsLength, interfaceFlags) \
-    { yOffset,            CAM_DATA_00 }, \
+    { yOffset,            CAM_DATA_Y_OFFSET }, \
     { eyeStepScale,       CAM_DATA_04 }, \
     { posStepScale,       CAM_DATA_05 }, \
     { fov,                CAM_DATA_FOV }, \
@@ -1483,7 +1483,7 @@ typedef struct {
  */
 
 #define CAM_FUNCDATA_SPEC9(yOffset, fov, interfaceFlags) \
-    { yOffset, CAM_DATA_00 }, \
+    { yOffset, CAM_DATA_Y_OFFSET }, \
     { fov,     CAM_DATA_FOV }, \
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
 
@@ -1565,11 +1565,11 @@ typedef struct Camera {
     /* 0x0D8 */ f32 xzSpeed;
     /* 0x0DC */ f32 dist;
     /* 0x0E0 */ f32 speedRatio;
-    /* 0x0E4 */ Vec3f atActorOffset;
-    /* 0x0F0 */ Vec3f focalActorOffset;
+    /* 0x0E4 */ Vec3f focalActorAtOffset; // Offset between the camera's at Pos and the focalActor's Pos
+    /* 0x0F0 */ Vec3f unk_0F0; // Offset between the focalActor's Pos and the camera's focalActor's Pos from the previous frame
     /* 0x0FC */ f32 fov;
     /* 0x100 */ f32 atLerpStepScale;
-    /* 0x104 */ f32 playerFloorHeight;
+    /* 0x104 */ f32 focalActorFloorHeight;
     /* 0x108 */ Vec3f floorNorm;
     /* 0x114 */ f32 waterYPos;
     /* 0x118 */ s32 waterPrevBgCamDataId;
@@ -1588,11 +1588,11 @@ typedef struct Camera {
     /* 0x142 */ s16 setting;
     /* 0x144 */ s16 mode;
     /* 0x146 */ s16 bgId;
-    /* 0x148 */ s16 bgCamDataId;
+    /* 0x148 */ s16 bgCamIndex;
     /* 0x14A */ s16 behaviorFlags;
     /* 0x14C */ s16 stateFlags;
     /* 0x14E */ s16 childCamId;
-    /* 0x150 */ s16 doorTimer1; // a door timer used when door cam is indexed from bgCamDataId
+    /* 0x150 */ s16 doorTimer1; // a door timer used when door cam is indexed from bgCamIndex
     /* 0x152 */ s16 unk152;
     /* 0x154 */ s16 prevSetting;
     /* 0x156 */ s16 nextCamSceneDataId;
@@ -1600,8 +1600,8 @@ typedef struct Camera {
     /* 0x15A */ s16 roll;
     /* 0x15C */ s16 viewFlags;
     /* 0x15E */ s16 animState; // Determines the current state of the current camera behavior function
-    /* 0x160 */ s16 unk160;
-    /* 0x162 */ s16 doorTimer2; // a door timer used when door cam is indexed from bgCamDataId
+    /* 0x160 */ s16 timer; // Unused remnant of OoT: originally destoryed subCamera when timer ran out
+    /* 0x162 */ s16 doorTimer2; // a door timer used when door cam is indexed from bgCamIndex
     /* 0x164 */ s16 camId;
     /* 0x166 */ s16 prevBgCamDataId;
     /* 0x168 */ s16 unk168;

include/z64player.h

@@ -677,7 +677,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE1_1          (1 << 0)
 // 
 #define PLAYER_STATE1_2          (1 << 1)
-// 
+// Climbing ledge
 #define PLAYER_STATE1_4          (1 << 2)
 // 
 #define PLAYER_STATE1_8          (1 << 3)
@@ -697,7 +697,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE1_400        (1 << 10)
 // 
 #define PLAYER_STATE1_800        (1 << 11)
-// 
+// charging spin attack
 #define PLAYER_STATE1_1000       (1 << 12)
 // 
 #define PLAYER_STATE1_2000       (1 << 13)
@@ -731,7 +731,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE1_8000000    (1 << 27)
 // 
 #define PLAYER_STATE1_10000000   (1 << 28)
-// 
+// Time is stopped but Link & NPC animations continue
 #define PLAYER_STATE1_20000000   (1 << 29)
 // 
 #define PLAYER_STATE1_40000000   (1 << 30)
@@ -761,7 +761,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE2_200        (1 << 9)
 // 
 #define PLAYER_STATE2_400        (1 << 10)
-// 
+// Diving
 #define PLAYER_STATE2_800        (1 << 11)
 // 
 #define PLAYER_STATE2_1000       (1 << 12)
@@ -773,7 +773,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE2_8000       (1 << 15)
 // 
 #define PLAYER_STATE2_10000      (1 << 16)
-// 
+// A non-magic spin attack
 #define PLAYER_STATE2_20000      (1 << 17)
 // 
 #define PLAYER_STATE2_40000      (1 << 18)
@@ -821,7 +821,7 @@ typedef enum PlayerCsMode {
 #define PLAYER_STATE3_40         (1 << 6)
 // 
 #define PLAYER_STATE3_80         (1 << 7)
-// Related to form Deku
+// Deku flower dive
 #define PLAYER_STATE3_100        (1 << 8)
 // 
 #define PLAYER_STATE3_200        (1 << 9)

src/code/z_eventmgr.c

@@ -402,13 +402,13 @@ s16 CutsceneManager_Start(s16 csId, Actor* actor) {
             if (CutsceneManager_FindEntranceCsId() != csId) {
                 func_800E0348(retCam);
             } else {
-                Camera_ClearFlags(retCam, CAM_STATE_2);
+                Camera_UnsetStateFlag(retCam, CAM_STATE_2);
             }
         }
 
         memcpy(subCam, retCam, sizeof(Camera));
         subCam->camId = sCutsceneMgr.subCamId;
-        Camera_ClearFlags(subCam, CAM_STATE_6 | CAM_STATE_0);
+        Camera_UnsetStateFlag(subCam, CAM_STATE_6 | CAM_STATE_0);
 
         Play_ChangeCameraStatus(sCutsceneMgr.play, sCutsceneMgr.retCamId, CAM_STATUS_WAIT);
         Play_ChangeCameraStatus(sCutsceneMgr.play, sCutsceneMgr.subCamId, CAM_STATUS_ACTIVE);
@@ -422,7 +422,7 @@ s16 CutsceneManager_Start(s16 csId, Actor* actor) {
             sCutsceneMgr.length = csEntry->length;
         } else {
             if (csEntry->csCamId != CS_CAM_ID_NONE) {
-                Camera_ChangeDataIdx(subCam, csEntry->csCamId);
+                Camera_ChangeActorCsCamIndex(subCam, csEntry->csCamId);
             } else {
                 Camera_ChangeSetting(subCam, CAM_SET_FREE0);
             }

src/code/z_play.c

@@ -505,7 +505,7 @@ void Play_UpdateWaterCamera(PlayState* this, Camera* camera) {
     sIsCameraUnderwater = camera->stateFlags & CAM_STATE_UNDERWATER;
     if (Play_GetWaterSurface(this, &camera->eye, &lightIndex) != BGCHECK_Y_MIN) {
         if (!sIsCameraUnderwater) {
-            Camera_SetFlags(camera, CAM_STATE_UNDERWATER);
+            Camera_SetStateFlag(camera, CAM_STATE_UNDERWATER);
             sQuakeIndex = -1;
             Distortion_Request(DISTORTION_TYPE_UNDERWATER_ENTRY);
             Distortion_SetDuration(80);
@@ -533,7 +533,7 @@ void Play_UpdateWaterCamera(PlayState* this, Camera* camera) {
         }
     } else {
         if (sIsCameraUnderwater) {
-            Camera_ClearFlags(camera, CAM_STATE_UNDERWATER);
+            Camera_UnsetStateFlag(camera, CAM_STATE_UNDERWATER);
         }
         Distortion_RemoveRequest(DISTORTION_TYPE_NON_ZORA_SWIMMING);
         Distortion_RemoveRequest(DISTORTION_TYPE_UNDERWATER_ENTRY);
@@ -1681,11 +1681,11 @@ s32 Play_SetCameraAtEye(PlayState* this, s16 camId, Vec3f* at, Vec3f* eye) {
     camera->dist = Math3D_Distance(at, eye);
 
     if (camera->focalActor != NULL) {
-        camera->atActorOffset.x = at->x - camera->focalActor->world.pos.x;
-        camera->atActorOffset.y = at->y - camera->focalActor->world.pos.y;
-        camera->atActorOffset.z = at->z - camera->focalActor->world.pos.z;
+        camera->focalActorAtOffset.x = at->x - camera->focalActor->world.pos.x;
+        camera->focalActorAtOffset.y = at->y - camera->focalActor->world.pos.y;
+        camera->focalActorAtOffset.z = at->z - camera->focalActor->world.pos.z;
     } else {
-        camera->atActorOffset.x = camera->atActorOffset.y = camera->atActorOffset.z = 0.0f;
+        camera->focalActorAtOffset.x = camera->focalActorAtOffset.y = camera->focalActorAtOffset.z = 0.0f;
     }
 
     camera->atLerpStepScale = 0.01f;
@@ -1710,11 +1710,11 @@ s32 Play_SetCameraAtEyeUp(PlayState* this, s16 camId, Vec3f* at, Vec3f* eye, Vec
     camera->dist = Math3D_Distance(at, eye);
 
     if (camera->focalActor != NULL) {
-        camera->atActorOffset.x = at->x - camera->focalActor->world.pos.x;
-        camera->atActorOffset.y = at->y - camera->focalActor->world.pos.y;
-        camera->atActorOffset.z = at->z - camera->focalActor->world.pos.z;
+        camera->focalActorAtOffset.x = at->x - camera->focalActor->world.pos.x;
+        camera->focalActorAtOffset.y = at->y - camera->focalActor->world.pos.y;
+        camera->focalActorAtOffset.z = at->z - camera->focalActor->world.pos.z;
     } else {
-        camera->atActorOffset.x = camera->atActorOffset.y = camera->atActorOffset.z = 0.0f;
+        camera->focalActorAtOffset.x = camera->focalActorAtOffset.y = camera->focalActorAtOffset.z = 0.0f;
     }
 
     camera->atLerpStepScale = 0.01f;
@@ -1748,13 +1748,13 @@ void Play_CopyCamera(PlayState* this, s16 destCamId, s16 srcCamId) {
     Camera_Copy(this->cameraPtrs[destCamId1], this->cameraPtrs[srcCamId2]);
 }
 
-// Same as Play_ChangeCameraSetting but also calls Camera_InitPlayerSettings
+// Same as Play_ChangeCameraSetting but also calls Camera_InitFocalActorSettings
 s32 func_80169A50(PlayState* this, s16 camId, Player* player, s16 setting) {
     Camera* camera;
     s16 camIdx = (camId == CAM_ID_NONE) ? this->activeCamId : camId;
 
     camera = this->cameraPtrs[camIdx];
-    Camera_InitPlayerSettings(camera, player);
+    Camera_InitFocalActorSettings(camera, &player->actor);
     return Camera_ChangeSetting(camera, setting);
 }
 
@@ -2179,7 +2179,8 @@ void Play_Init(GameState* thisx) {
     this->cameraPtrs[CAM_ID_MAIN]->uid = CAM_ID_MAIN;
     this->activeCamId = CAM_ID_MAIN;
 
-    func_800DFF18(&this->mainCamera, 0x7F);
+    Camera_OverwriteStateFlags(&this->mainCamera, CAM_STATE_0 | CAM_STATE_CHECK_WATER | CAM_STATE_2 | CAM_STATE_3 |
+                                                      CAM_STATE_4 | CAM_STATE_DISABLE_MODE_CHANGE | CAM_STATE_6);
     Sram_Alloc(&this->state, &this->sramCtx);
     Regs_InitData(this);
     Message_Init(this);
@@ -2323,11 +2324,11 @@ void Play_Init(GameState* thisx) {
 
     player = GET_PLAYER(this);
 
-    Camera_InitPlayerSettings(&this->mainCamera, player);
+    Camera_InitFocalActorSettings(&this->mainCamera, &player->actor);
     gDbgCamEnabled = false;
 
     if ((player->actor.params & 0xFF) != 0xFF) {
-        Camera_ChangeDataIdx(&this->mainCamera, player->actor.params & 0xFF);
+        Camera_ChangeActorCsCamIndex(&this->mainCamera, player->actor.params & 0xFF);
     }
 
     CutsceneManager_StoreCamera(&this->mainCamera);

src/code/z_room.c

@@ -357,7 +357,7 @@ void Room_DrawImageSingle(PlayState* play, Room* room, u32 flags) {
 
 RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomShapeImageMulti, PlayState* play) {
     Camera* activeCam = GET_ACTIVE_CAM(play);
-    s32 bgCamIndex = activeCam->bgCamDataId;
+    s32 bgCamIndex = activeCam->bgCamIndex;
     s16 overrideBgCamIndex;
     Player* player;
     RoomShapeImageMultiBgEntry* bgEntry;

src/overlays/actors/ovl_En_Ani/z_en_ani.c

@@ -310,8 +310,8 @@ void EnAni_Update(Actor* thisx, PlayState* play) {
         } else if (CutsceneManager_IsNext(this->actor.csId)) {
             CutsceneManager_StartWithPlayerCs(this->actor.csId, &this->actor);
             this->actor.csId = CutsceneManager_GetAdditionalCsId(this->actor.csId);
-            Camera_SetToTrackActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->actor.csId)),
-                                   &this->actor);
+            Camera_SetFocalActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->actor.csId)),
+                                 &this->actor);
         } else {
             CutsceneManager_Queue(this->actor.csId);
         }

src/overlays/actors/ovl_En_Fu/z_en_fu.c

@@ -728,8 +728,8 @@ void func_80962D60(EnFu* this, PlayState* play) {
 void func_80962EBC(EnFu* this, PlayState* play) {
     if (this->unk_542 != 0) {
         if (this->actor.csId != CS_ID_NONE) {
-            Camera_ChangeDataIdx(play->cameraPtrs[CAM_ID_MAIN],
-                                 CutsceneManager_GetCutsceneEntry(this->actor.csId)->csCamId);
+            Camera_ChangeActorCsCamIndex(play->cameraPtrs[CAM_ID_MAIN],
+                                         CutsceneManager_GetCutsceneEntry(this->actor.csId)->csCamId);
         }
     }
 }

src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

@@ -1122,7 +1122,7 @@ void EnKakasi_Update(Actor* thisx, PlayState* play) {
         if (this->unk1BC.x != 0.0f || this->unk1BC.z != 0.0f) {
             Math_Vec3f_Copy(&this->picto.actor.focus.pos, &this->unk1BC);
             this->picto.actor.focus.pos.y += 10.0f;
-            if (this->subCamId == CAM_ID_MAIN) {
+            if (this->subCamId == SUB_CAM_ID_DONE) {
                 Math_Vec3s_Copy(&this->picto.actor.focus.rot, &this->picto.actor.world.rot);
             } else {
                 Math_Vec3s_Copy(&this->picto.actor.focus.rot, &this->picto.actor.home.rot);

src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c

@@ -681,8 +681,8 @@ void func_80B27774(EnKendoJs* this, PlayState* play) {
 
 void func_80B2783C(EnKendoJs* this, PlayState* play) {
     if (this->actor.csId != CS_ID_NONE) {
-        Camera_ChangeDataIdx(play->cameraPtrs[CAM_ID_MAIN],
-                             CutsceneManager_GetCutsceneEntry(this->actor.csId)->csCamId);
+        Camera_ChangeActorCsCamIndex(play->cameraPtrs[CAM_ID_MAIN],
+                                     CutsceneManager_GetCutsceneEntry(this->actor.csId)->csCamId);
     }
 }
 

src/overlays/actors/ovl_En_Pamera/z_en_pamera.c

@@ -244,8 +244,8 @@ void func_80BD8758(EnPamera* this, PlayState* play) {
     if (this->hideInisdeTimer++ > 1800) {
         if (CutsceneManager_IsNext(this->csIdList[0]) && (this->csIdList[0] != -1)) {
             CutsceneManager_StartWithPlayerCs(this->csIdList[0], &this->actor);
-            Camera_SetToTrackActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[0])),
-                                   &this->actor);
+            Camera_SetFocalActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[0])),
+                                 &this->actor);
             this->actor.speed = 1.5f;
             Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 1);
             this->actor.shape.rot.y = this->actor.home.rot.y;
@@ -431,8 +431,8 @@ void func_80BD90AC(EnPamera* this, PlayState* play) {
           (Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) < 200.0f)))) {
         if ((CutsceneManager_IsNext(this->csIdList[1])) && ((this->csIdList[1] != -1))) {
             CutsceneManager_StartWithPlayerCs(this->csIdList[1], &this->actor);
-            Camera_SetToTrackActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[1])),
-                                   &this->actor);
+            Camera_SetFocalActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[1])),
+                                 &this->actor);
             EnPamera_LookDownWell(this);
         } else if (this->csIdList[1] != -1) {
             CutsceneManager_Queue(this->csIdList[1]);

src/overlays/actors/ovl_En_Test3/z_en_test3.c

@@ -478,8 +478,8 @@ void EnTest3_Init(Actor* thisx, PlayState* play2) {
     if (play->sceneId == SCENE_SECOM) {
         this->subCamId = Play_CreateSubCamera(play);
         subCam = Play_GetCamera(play, this->subCamId);
-        Camera_InitPlayerSettings(subCam, &this->player);
-        Camera_SetFlags(subCam, CAM_STATE_0 | CAM_STATE_6);
+        Camera_InitFocalActorSettings(subCam, &this->player.actor);
+        Camera_SetStateFlag(subCam, CAM_STATE_0 | CAM_STATE_6);
         Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_WAIT);
     }
 

tools/disasm/functions.txt

@@ -1115,16 +1115,16 @@
     0x800CB210:("Camera_fabsf",),
     0x800CB240:("Camera_Vec3fMagnitude",),
     0x800CB270:("Camera_QuadraticAttenuation",),
-    0x800CB330:("Camera_LerpCeilF",),
-    0x800CB398:("Camera_LerpCeilS",),
-    0x800CB42C:("Camera_LerpFloorS",),
-    0x800CB4C0:("Camera_LerpCeilVec3f",),
+    0x800CB330:("Camera_ScaledStepToCeilF",),
+    0x800CB398:("Camera_ScaledStepToCeilS",),
+    0x800CB42C:("Camera_ScaledStepToFloorS",),
+    0x800CB4C0:("Camera_ScaledStepToCeilVec3f",),
     0x800CB544:("Camera_SetUpdateRatesFastPitch",),
     0x800CB584:("Camera_SetUpdateRatesFastYaw",),
     0x800CB5DC:("Camera_SetUpdateRatesSlow",),
     0x800CB60C:("Camera_Vec3sToVec3f",),
     0x800CB674:("Camera_AngleDiffAndScale",),
-    0x800CB6C8:("Camera_UpdateAtActorOffset",),
+    0x800CB6C8:("Camera_SetFocalActorAtOffset",),
     0x800CB700:("Camera_GetFocalActorHeight",),
     0x800CB780:("Camera_GetRunSpeedLimit",),
     0x800CB7CC:("func_800CB7CC",),
@@ -1147,41 +1147,41 @@
     0x800CBC30:("func_800CBC30",),
     0x800CBC84:("func_800CBC84",),
     0x800CBFA4:("func_800CBFA4",),
-    0x800CC000:("func_800CC000",),
-    0x800CC128:("func_800CC128",),
-    0x800CC1C4:("func_800CC1C4",),
+    0x800CC000:("Camera_BgCheckInfo",),
+    0x800CC128:("Camera_BgCheck",),
+    0x800CC1C4:("Camera_CheckOOB",),
     0x800CC260:("func_800CC260",),
-    0x800CC488:("func_800CC488",),
-    0x800CC56C:("func_800CC56C",),
-    0x800CC5C8:("func_800CC5C8",),
+    0x800CC488:("Camera_GetFloorYNorm",),
+    0x800CC56C:("Camera_GetFloorY",),
+    0x800CC5C8:("Camera_GetFloorYLayer",),
     0x800CC740:("Camera_GetBgCamOrActorCsCamSetting",),
     0x800CC7A8:("Camera_GetBgCamOrActorCsCamFuncData",),
     0x800CC804:("Camera_GetBgCamIndex",),
     0x800CC874:("Camera_GetWaterBoxBgCamSetting",),
     0x800CC938:("func_800CC938",),
-    0x800CC958:("func_800CC958",),
-    0x800CC9C0:("func_800CC9C0",),
+    0x800CC958:("Camera_CalcXZAngle",),
+    0x800CC9C0:("Camera_GetPitchAdjFromFloorHeightDiffs",),
     0x800CCCEC:("func_800CCCEC",),
-    0x800CD04C:("func_800CD04C",),
-    0x800CD288:("func_800CD288",),
-    0x800CD2E0:("func_800CD2E0",),
-    0x800CD2F0:("func_800CD2F0",),
-    0x800CD3E4:("func_800CD3E4",),
+    0x800CD04C:("Camera_CalcUpVec",),
+    0x800CD288:("Camera_ClampLerpScale",),
+    0x800CD2E0:("Camera_ResetActionFuncState",),
+    0x800CD2F0:("Camera_UpdateInterface",),
+    0x800CD3E4:("Camera_BgCheckCorner",),
     0x800CD44C:("func_800CD44C",),
-    0x800CD634:("func_800CD634",),
+    0x800CD634:("Camera_CalcSlopeYAdj",),
     0x800CD6CC:("func_800CD6CC",),
-    0x800CD6F8:("func_800CD6F8",),
-    0x800CD834:("func_800CD834",),
-    0x800CDA14:("func_800CDA14",),
-    0x800CDB6C:("func_800CDB6C",),
-    0x800CDE6C:("func_800CDE6C",),
-    0x800CE2B8:("func_800CE2B8",),
-    0x800CE5E0:("func_800CE5E0",),
-    0x800CE79C:("func_800CE79C",),
-    0x800CE930:("func_800CE930",),
-    0x800CEAD8:("func_800CEAD8",),
-    0x800CEC38:("func_800CEC38",),
-    0x800CED90:("func_800CED90",),
+    0x800CD6F8:("Camera_CalcAtDefault",),
+    0x800CD834:("Camera_CalcAtForScreen",),
+    0x800CDA14:("Camera_CalcAtForNormal1",),
+    0x800CDB6C:("Camera_CalcAtForParallel",),
+    0x800CDE6C:("Camera_CalcAtForFriendlyLockOn",),
+    0x800CE2B8:("Camera_CalcAtForEnemyLockOn",),
+    0x800CE5E0:("Camera_CalcAtForHorse",),
+    0x800CE79C:("Camera_ClampDist1",),
+    0x800CE930:("Camera_ClampDist2",),
+    0x800CEAD8:("Camera_CalcDefaultPitch",),
+    0x800CEC38:("Camera_CalcDefaultYaw",),
+    0x800CED90:("Camera_CalcDefaultSwing",),
     0x800CF3A4:("Camera_Noop",),
     0x800CF3B4:("Camera_Normal1",),
     0x800D0874:("Camera_Normal2",),
@@ -1253,48 +1253,48 @@
     0x800DD11C:("Camera_Special7",),
     0x800DD13C:("Camera_Special8",),
     0x800DD5B8:("Camera_Special9",),
-    0x800DDD58:("Camera_Alloc",),
-    0x800DDDA8:("Camera_Free",),
+    0x800DDD58:("Camera_Create",),
+    0x800DDDA8:("Camera_Destroy",),
     0x800DDDD0:("Camera_Init",),
     0x800DDFE0:("func_800DDFE0",),
-    0x800DE0E0:("func_800DE0E0",),
-    0x800DE0EC:("Camera_InitPlayerSettings",),
+    0x800DE0E0:("Camera_Stub800DE0E0",),
+    0x800DE0EC:("Camera_InitFocalActorSettings",),
     0x800DE308:("Camera_ChangeStatus",),
-    0x800DE324:("func_800DE324",),
-    0x800DE62C:("func_800DE62C",),
-    0x800DE840:("func_800DE840",),
-    0x800DE890:("func_800DE890",),
-    0x800DE954:("func_800DE954",),
+    0x800DE324:("Camera_UpdateWater",),
+    0x800DE62C:("Camera_EarthquakeDay3",),
+    0x800DE840:("Camera_UpdateHotRoom",),
+    0x800DE890:("Camera_SetSwordDistortion",),
+    0x800DE954:("Camera_RequestGiantsMaskSetting",),
     0x800DE9B0:("Camera_Update",),
     0x800DF498:("func_800DF498",),
-    0x800DF4D0:("Camera_SetMode",),
+    0x800DF4D0:("Camera_ChangeModeFlags",),
     0x800DF840:("Camera_ChangeMode",),
-    0x800DF86C:("func_800DF86C",),
-    0x800DF8EC:("func_800DF8EC",),
+    0x800DF86C:("Camera_CheckValidMode",),
+    0x800DF8EC:("Camera_ChangeSettingFlags",),
     0x800DFAC8:("Camera_ChangeSetting",),
-    0x800DFB14:("Camera_ChangeDataIdx",),
-    0x800DFC1C:("func_800DFC1C",),
-    0x800DFC40:("func_800DFC40",),
+    0x800DFB14:("Camera_ChangeActorCsCamIndex",),
+    0x800DFC1C:("Camera_GetInputDir",),
+    0x800DFC40:("Camera_GetInputDirPitch",),
     0x800DFC68:("Camera_GetInputDirYaw",),
     0x800DFC90:("Camera_GetCamDir",),
     0x800DFCB4:("Camera_GetCamDirPitch",),
     0x800DFCDC:("Camera_GetCamDirYaw",),
     0x800DFD04:("Camera_AddQuake",),
     0x800DFD78:("Camera_SetViewParam",),
-    0x800DFEF0:("func_800DFEF0",),
-    0x800DFF18:("func_800DFF18",),
-    0x800DFF34:("func_800DFF34",),
-    0x800DFF44:("func_800DFF44",),
-    0x800DFF60:("Camera_SetFlags",),
-    0x800DFF84:("Camera_ClearFlags",),
+    0x800DFEF0:("Camera_UnsetViewFlag",),
+    0x800DFF18:("Camera_OverwriteStateFlags",),
+    0x800DFF34:("Camera_ResetActionFuncStateUnused",),
+    0x800DFF44:("Camera_SetCsParams",),
+    0x800DFF60:("Camera_SetStateFlag",),
+    0x800DFF84:("Camera_UnsetStateFlag",),
     0x800DFFAC:("Camera_ChangeDoorCam",),
     0x800E007C:("Camera_Copy",),
-    0x800E01AC:("func_800E01AC",),
+    0x800E01AC:("Camera_IsDbgCamEnabled",),
     0x800E01B8:("Camera_GetQuakeOffset",),
-    0x800E01DC:("func_800E01DC",),
-    0x800E0228:("func_800E0228",),
+    0x800E01DC:("Camera_SetCameraData",),
+    0x800E0228:("Camera_GetNegOne",),
     0x800E0238:("func_800E0238",),
-    0x800E02AC:("Camera_SetToTrackActor",),
+    0x800E02AC:("Camera_SetFocalActor",),
     0x800E0308:("Camera_SetTargetActor",),
     0x800E031C:("Camera_GetWaterYPos",),
     0x800E0348:("func_800E0348",),

tools/disasm/variables.txt

@@ -472,19 +472,6 @@
     0x801B48B0:("sSetNormal0ModeBoomerangData","UNK_TYPE1","",0x1),
     0x801B48D4:("sSetNormal0ModeSlingshotData","UNK_TYPE1","",0x1),
     0x801B48F8:("sSetNormal0ModeClimbZData","UNK_TYPE1","",0x1),
-    0x801B4710:("sSetNormal0ModeNormalData","UNK_TYPE1","",0x1),
-    0x801B4738:("sSetNormal0ModeTargetData","UNK_TYPE1","",0x1),
-    0x801B4768:("sSetNormal0ModeFollowTargetData","UNK_TYPE1","",0x1),
-    0x801B4798:("sSetNormal0ModeBattleData","UNK_TYPE1","",0x1),
-    0x801B47CC:("sSetNormal0ModeFirstPersonData","UNK_TYPE1","",0x1),
-    0x801B47F0:("sSetNormal0ModeTalkData","UNK_TYPE1","",0x1),
-    0x801B4824:("sSetNormal0ModeClimbData","UNK_TYPE1","",0x1),
-    0x801B4848:("sSetNormal0ModeBowArrowData","UNK_TYPE1","",0x1),
-    0x801B486C:("sSetNormal0ModeBowArrowZData","UNK_TYPE1","",0x1),
-    0x801B4890:("sSetNormal0ModeHookshotData","UNK_TYPE1","",0x1),
-    0x801B48B0:("sSetNormal0ModeBoomerangData","UNK_TYPE1","",0x1),
-    0x801B48D4:("sSetNormal0ModeSlingshotData","UNK_TYPE1","",0x1),
-    0x801B48F8:("sSetNormal0ModeClimbZData","UNK_TYPE1","",0x1),
     0x801B491C:("sSetNormal0ModeJumpData","UNK_TYPE1","",0x1),
     0x801B4944:("sSetNormal0ModeHangData","UNK_TYPE1","",0x1),
     0x801B4974:("sSetNormal0ModeHangZData","UNK_TYPE1","",0x1),
@@ -3850,7 +3837,7 @@
     0x801ED8D8:("D_801ED8D8","UNK_TYPE1","",0x1),
     0x801ED8DC:("D_801ED8DC","UNK_TYPE1","",0x1),
     0x801ED8E0:("D_801ED8E0","Mtx","",0x40),
-    0x801ED920:("D_801ED920","UNK_TYPE1","",0x1),
+    0x801ED920:("D_801ED920","Actor*","",0x1),
     0x801ED930:("D_801ED930","FaultClient","",0x10),
     0x801ED940:("sActorOverlayTableFaultAddrConvClient","FaultAddrConvClient","",0xC),
     0x801ED950:("D_801ED950","char","[80]",0x50),
@@ -3867,9 +3854,9 @@
     0x801EDBA8:("D_801EDBA8","Sphere16","",0x8),
     0x801EDBB0:("D_801EDBB0","TriNorm","",0x34),
     0x801EDBF0:("D_801EDBF0","s16","",0x2),
-    0x801EDBF4:("D_801EDBF4","f32","",0x4),
-    0x801EDBF8:("D_801EDBF8","f32","",0x4),
-    0x801EDC00:("D_801EDC00","CameraCollision","",0x28),
+    0x801EDBF4:("sFloorYNear","f32","",0x4),
+    0x801EDBF8:("sFloorYFar","f32","",0x4),
+    0x801EDC00:("sFarColChk","CameraCollision","",0x28),
     0x801EDC28:("sCamPlayState","PlayState*","",0x4),
     0x801EDC30:("D_801EDC30","SwingAnimation","[4]",0x1A0),
     0x801EDDD0:("D_801EDDD0","Vec3f","",0xc),
@@ -7667,11 +7654,11 @@
     0x80911E30:("sSinkingLurePos","Vec3f","[20]",0xF0),
     0x80911F20:("D_80911F20","UNK_TYPE1","",0x1),
     0x80911F24:("sProjectedW","f32","",0x4),
-    0x80911F28:("sCameraEye","Vec3f","",0xC),
-    0x80911F38:("sCameraAt","Vec3f","",0xC),
-    0x80911F44:("sCameraId","s32","",0x4),
+    0x80911F28:("sSubCamEye","Vec3f","",0xC),
+    0x80911F38:("sSubCamAt","Vec3f","",0xC),
+    0x80911F44:("sSubCamId","s32","",0x4),
     0x80911F48:("D_80911F48","f32","",0x4),
-    0x80911F4C:("D_80911F4C","f32","",0x4),
+    0x80911F4C:("sSubCamVelFactor","f32","",0x4),
     0x80911F50:("D_80911F50","UNK_TYPE1","",0x1),
     0x80911F58:("sSinkingLureBasePos","Vec3f","",0xC),
     0x80911F64:("D_80911F64","f32","",0x4),

tools/namefixer.py

@@ -326,6 +326,7 @@ wordReplace = {
     "Actor_AddQuakeWithSpeed": "Actor_RequestQuakeWithSpeed",
     "func_800BC848": "Actor_RequestQuakeAndRumble",
     "func_800DF840": "Camera_ChangeMode",
+    "Camera_SetToTrackActor": "Camera_SetFocalActor",
     "zelda_malloc": "ZeldaArena_Malloc",
     "zelda_mallocR": "ZeldaArena_MallocR",
     "zelda_realloc": "ZeldaArena_Realloc",
@@ -517,13 +518,13 @@ wordReplace = {
     "func_8017F9C0": "Math3D_XZInSphere",
     "func_8017FA34": "Math3D_XYInSphere",
     "func_8017FAA8": "Math3D_YZInSphere",
-    "func_800DFB14": "Camera_ChangeDataIdx",
+    "func_800DFB14": "Camera_ChangeActorCsCamIndex",
     "func_800DFC68": "Camera_GetInputDirYaw",
     "func_800DFCB4": "Camera_GetCamDirPitch",
     "func_800DFCDC": "Camera_GetCamDirYaw",
     "func_800E0308": "Camera_SetTargetActor",
     "func_800E031C": "Camera_GetWaterYPos",
-    "func_800E02AC": "Camera_SetToTrackActor",
+    "func_800E02AC": "Camera_SetFocalActor",
     "func_800DFAC8": "Camera_ChangeSetting",
     "func_800DFC90": "Camera_GetCamDir",
     "func_800DFD04": "Camera_AddQuake",

tools/sizes/code_functions.csv

@@ -629,16 +629,16 @@ asm/non_matchings/code/z_bg_item/DynaPoly_ValidateMove.s,DynaPoly_ValidateMove,0
 asm/non_matchings/code/z_camera/Camera_fabsf.s,Camera_fabsf,0x800CB210,0xC
 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_ScaledStepToCeilF.s,Camera_ScaledStepToCeilF,0x800CB330,0x1A
+asm/non_matchings/code/z_camera/Camera_ScaledStepToCeilS.s,Camera_ScaledStepToCeilS,0x800CB398,0x25
+asm/non_matchings/code/z_camera/Camera_ScaledStepToFloorS.s,Camera_ScaledStepToFloorS,0x800CB42C,0x25
+asm/non_matchings/code/z_camera/Camera_ScaledStepToCeilVec3f.s,Camera_ScaledStepToCeilVec3f,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_SetFocalActorAtOffset.s,Camera_SetFocalActorAtOffset,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
@@ -661,41 +661,41 @@ asm/non_matchings/code/z_camera/Camera_IsUsingZoraFins.s,Camera_IsUsingZoraFins,
 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
-asm/non_matchings/code/z_camera/func_800CC000.s,func_800CC000,0x800CC000,0x4A
-asm/non_matchings/code/z_camera/func_800CC128.s,func_800CC128,0x800CC128,0x27
-asm/non_matchings/code/z_camera/func_800CC1C4.s,func_800CC1C4,0x800CC1C4,0x27
+asm/non_matchings/code/z_camera/Camera_BgCheckInfo.s,Camera_BgCheckInfo,0x800CC000,0x4A
+asm/non_matchings/code/z_camera/Camera_BgCheck.s,Camera_BgCheck,0x800CC128,0x27
+asm/non_matchings/code/z_camera/Camera_CheckOOB.s,Camera_CheckOOB,0x800CC1C4,0x27
 asm/non_matchings/code/z_camera/func_800CC260.s,func_800CC260,0x800CC260,0x8A
-asm/non_matchings/code/z_camera/func_800CC488.s,func_800CC488,0x800CC488,0x39
-asm/non_matchings/code/z_camera/func_800CC56C.s,func_800CC56C,0x800CC56C,0x17
-asm/non_matchings/code/z_camera/func_800CC5C8.s,func_800CC5C8,0x800CC5C8,0x5E
+asm/non_matchings/code/z_camera/Camera_GetFloorYNorm.s,Camera_GetFloorYNorm,0x800CC488,0x39
+asm/non_matchings/code/z_camera/Camera_GetFloorY.s,Camera_GetFloorY,0x800CC56C,0x17
+asm/non_matchings/code/z_camera/Camera_GetFloorYLayer.s,Camera_GetFloorYLayer,0x800CC5C8,0x5E
 asm/non_matchings/code/z_camera/Camera_GetBgCamOrActorCsCamSetting.s,Camera_GetBgCamOrActorCsCamSetting,0x800CC740,0x1A
 asm/non_matchings/code/z_camera/Camera_GetBgCamOrActorCsCamFuncData.s,Camera_GetBgCamOrActorCsCamFuncData,0x800CC7A8,0x17
 asm/non_matchings/code/z_camera/Camera_GetBgCamIndex.s,Camera_GetBgCamIndex,0x800CC804,0x1C
 asm/non_matchings/code/z_camera/Camera_GetWaterBoxBgCamSetting.s,Camera_GetWaterBoxBgCamSetting,0x800CC874,0x31
 asm/non_matchings/code/z_camera/func_800CC938.s,func_800CC938,0x800CC938,0x8
-asm/non_matchings/code/z_camera/func_800CC958.s,func_800CC958,0x800CC958,0x1A
-asm/non_matchings/code/z_camera/func_800CC9C0.s,func_800CC9C0,0x800CC9C0,0xCB
+asm/non_matchings/code/z_camera/Camera_CalcXZAngle.s,Camera_CalcXZAngle,0x800CC958,0x1A
+asm/non_matchings/code/z_camera/Camera_GetPitchAdjFromFloorHeightDiffs.s,Camera_GetPitchAdjFromFloorHeightDiffs,0x800CC9C0,0xCB
 asm/non_matchings/code/z_camera/func_800CCCEC.s,func_800CCCEC,0x800CCCEC,0xD8
-asm/non_matchings/code/z_camera/func_800CD04C.s,func_800CD04C,0x800CD04C,0x8F
-asm/non_matchings/code/z_camera/func_800CD288.s,func_800CD288,0x800CD288,0x16
-asm/non_matchings/code/z_camera/func_800CD2E0.s,func_800CD2E0,0x800CD2E0,0x4
-asm/non_matchings/code/z_camera/func_800CD2F0.s,func_800CD2F0,0x800CD2F0,0x3D
-asm/non_matchings/code/z_camera/func_800CD3E4.s,func_800CD3E4,0x800CD3E4,0x1A
+asm/non_matchings/code/z_camera/Camera_CalcUpVec.s,Camera_CalcUpVec,0x800CD04C,0x8F
+asm/non_matchings/code/z_camera/Camera_ClampLerpScale.s,Camera_ClampLerpScale,0x800CD288,0x16
+asm/non_matchings/code/z_camera/Camera_ResetActionFuncState.s,Camera_ResetActionFuncState,0x800CD2E0,0x4
+asm/non_matchings/code/z_camera/Camera_UpdateInterface.s,Camera_UpdateInterface,0x800CD2F0,0x3D
+asm/non_matchings/code/z_camera/Camera_BgCheckCorner.s,Camera_BgCheckCorner,0x800CD3E4,0x1A
 asm/non_matchings/code/z_camera/func_800CD44C.s,func_800CD44C,0x800CD44C,0x7A
-asm/non_matchings/code/z_camera/func_800CD634.s,func_800CD634,0x800CD634,0x26
+asm/non_matchings/code/z_camera/Camera_CalcSlopeYAdj.s,Camera_CalcSlopeYAdj,0x800CD634,0x26
 asm/non_matchings/code/z_camera/func_800CD6CC.s,func_800CD6CC,0x800CD6CC,0xB
-asm/non_matchings/code/z_camera/func_800CD6F8.s,func_800CD6F8,0x800CD6F8,0x4F
-asm/non_matchings/code/z_camera/func_800CD834.s,func_800CD834,0x800CD834,0x78
-asm/non_matchings/code/z_camera/func_800CDA14.s,func_800CDA14,0x800CDA14,0x56
-asm/non_matchings/code/z_camera/func_800CDB6C.s,func_800CDB6C,0x800CDB6C,0xC0
-asm/non_matchings/code/z_camera/func_800CDE6C.s,func_800CDE6C,0x800CDE6C,0x113
-asm/non_matchings/code/z_camera/func_800CE2B8.s,func_800CE2B8,0x800CE2B8,0xCA
-asm/non_matchings/code/z_camera/func_800CE5E0.s,func_800CE5E0,0x800CE5E0,0x6F
-asm/non_matchings/code/z_camera/func_800CE79C.s,func_800CE79C,0x800CE79C,0x65
-asm/non_matchings/code/z_camera/func_800CE930.s,func_800CE930,0x800CE930,0x6A
-asm/non_matchings/code/z_camera/func_800CEAD8.s,func_800CEAD8,0x800CEAD8,0x58
-asm/non_matchings/code/z_camera/func_800CEC38.s,func_800CEC38,0x800CEC38,0x56
-asm/non_matchings/code/z_camera/func_800CED90.s,func_800CED90,0x800CED90,0x185
+asm/non_matchings/code/z_camera/Camera_CalcAtDefault.s,Camera_CalcAtDefault,0x800CD6F8,0x4F
+asm/non_matchings/code/z_camera/Camera_CalcAtForScreen.s,Camera_CalcAtForScreen,0x800CD834,0x78
+asm/non_matchings/code/z_camera/Camera_CalcAtForNormal1.s,Camera_CalcAtForNormal1,0x800CDA14,0x56
+asm/non_matchings/code/z_camera/Camera_CalcAtForParallel.s,Camera_CalcAtForParallel,0x800CDB6C,0xC0
+asm/non_matchings/code/z_camera/Camera_CalcAtForFriendlyLockOn.s,Camera_CalcAtForFriendlyLockOn,0x800CDE6C,0x113
+asm/non_matchings/code/z_camera/Camera_CalcAtForEnemyLockOn.s,Camera_CalcAtForEnemyLockOn,0x800CE2B8,0xCA
+asm/non_matchings/code/z_camera/Camera_CalcAtForHorse.s,Camera_CalcAtForHorse,0x800CE5E0,0x6F
+asm/non_matchings/code/z_camera/Camera_ClampDist1.s,Camera_ClampDist1,0x800CE79C,0x65
+asm/non_matchings/code/z_camera/Camera_ClampDist2.s,Camera_ClampDist2,0x800CE930,0x6A
+asm/non_matchings/code/z_camera/Camera_CalcDefaultPitch.s,Camera_CalcDefaultPitch,0x800CEAD8,0x58
+asm/non_matchings/code/z_camera/Camera_CalcDefaultYaw.s,Camera_CalcDefaultYaw,0x800CEC38,0x56
+asm/non_matchings/code/z_camera/Camera_CalcDefaultSwing.s,Camera_CalcDefaultSwing,0x800CED90,0x185
 asm/non_matchings/code/z_camera/Camera_Noop.s,Camera_Noop,0x800CF3A4,0x4
 asm/non_matchings/code/z_camera/Camera_Normal1.s,Camera_Normal1,0x800CF3B4,0x530
 asm/non_matchings/code/z_camera/Camera_Normal2.s,Camera_Normal2,0x800D0874,0x8
@@ -767,48 +767,48 @@ asm/non_matchings/code/z_camera/Camera_Special6.s,Camera_Special6,0x800DD0FC,0x8
 asm/non_matchings/code/z_camera/Camera_Special7.s,Camera_Special7,0x800DD11C,0x8
 asm/non_matchings/code/z_camera/Camera_Special8.s,Camera_Special8,0x800DD13C,0x11F
 asm/non_matchings/code/z_camera/Camera_Special9.s,Camera_Special9,0x800DD5B8,0x1E8
-asm/non_matchings/code/z_camera/Camera_Alloc.s,Camera_Alloc,0x800DDD58,0x14
-asm/non_matchings/code/z_camera/Camera_Free.s,Camera_Free,0x800DDDA8,0xA
+asm/non_matchings/code/z_camera/Camera_Create.s,Camera_Create,0x800DDD58,0x14
+asm/non_matchings/code/z_camera/Camera_Destroy.s,Camera_Destroy,0x800DDDA8,0xA
 asm/non_matchings/code/z_camera/Camera_Init.s,Camera_Init,0x800DDDD0,0x84
 asm/non_matchings/code/z_camera/func_800DDFE0.s,func_800DDFE0,0x800DDFE0,0x40
-asm/non_matchings/code/z_camera/func_800DE0E0.s,func_800DE0E0,0x800DE0E0,0x3
-asm/non_matchings/code/z_camera/Camera_InitPlayerSettings.s,Camera_InitPlayerSettings,0x800DE0EC,0x87
+asm/non_matchings/code/z_camera/Camera_Stub800DE0E0.s,Camera_Stub800DE0E0,0x800DE0E0,0x3
+asm/non_matchings/code/z_camera/Camera_InitFocalActorSettings.s,Camera_InitFocalActorSettings,0x800DE0EC,0x87
 asm/non_matchings/code/z_camera/Camera_ChangeStatus.s,Camera_ChangeStatus,0x800DE308,0x7
-asm/non_matchings/code/z_camera/func_800DE324.s,func_800DE324,0x800DE324,0xC2
-asm/non_matchings/code/z_camera/func_800DE62C.s,func_800DE62C,0x800DE62C,0x85
-asm/non_matchings/code/z_camera/func_800DE840.s,func_800DE840,0x800DE840,0x14
-asm/non_matchings/code/z_camera/func_800DE890.s,func_800DE890,0x800DE890,0x31
-asm/non_matchings/code/z_camera/func_800DE954.s,func_800DE954,0x800DE954,0x17
+asm/non_matchings/code/z_camera/Camera_UpdateWater.s,Camera_UpdateWater,0x800DE324,0xC2
+asm/non_matchings/code/z_camera/Camera_EarthquakeDay3.s,Camera_EarthquakeDay3,0x800DE62C,0x85
+asm/non_matchings/code/z_camera/Camera_UpdateHotRoom.s,Camera_UpdateHotRoom,0x800DE840,0x14
+asm/non_matchings/code/z_camera/Camera_SetSwordDistortion.s,Camera_SetSwordDistortion,0x800DE890,0x31
+asm/non_matchings/code/z_camera/Camera_RequestGiantsMaskSetting.s,Camera_RequestGiantsMaskSetting,0x800DE954,0x17
 asm/non_matchings/code/z_camera/Camera_Update.s,Camera_Update,0x800DE9B0,0x2BA
 asm/non_matchings/code/z_camera/func_800DF498.s,func_800DF498,0x800DF498,0xE
-asm/non_matchings/code/z_camera/Camera_SetMode.s,Camera_SetMode,0x800DF4D0,0xDC
+asm/non_matchings/code/z_camera/Camera_ChangeModeFlags.s,Camera_ChangeModeFlags,0x800DF4D0,0xDC
 asm/non_matchings/code/z_camera/Camera_ChangeMode.s,Camera_ChangeMode,0x800DF840,0xB
-asm/non_matchings/code/z_camera/func_800DF86C.s,func_800DF86C,0x800DF86C,0x20
-asm/non_matchings/code/z_camera/func_800DF8EC.s,func_800DF8EC,0x800DF8EC,0x77
+asm/non_matchings/code/z_camera/Camera_CheckValidMode.s,Camera_CheckValidMode,0x800DF86C,0x20
+asm/non_matchings/code/z_camera/Camera_ChangeSettingFlags.s,Camera_ChangeSettingFlags,0x800DF8EC,0x77
 asm/non_matchings/code/z_camera/Camera_ChangeSetting.s,Camera_ChangeSetting,0x800DFAC8,0x13
-asm/non_matchings/code/z_camera/Camera_ChangeDataIdx.s,Camera_ChangeDataIdx,0x800DFB14,0x42
-asm/non_matchings/code/z_camera/func_800DFC1C.s,func_800DFC1C,0x800DFC1C,0x9
-asm/non_matchings/code/z_camera/func_800DFC40.s,func_800DFC40,0x800DFC40,0xA
+asm/non_matchings/code/z_camera/Camera_ChangeActorCsCamIndex.s,Camera_ChangeActorCsCamIndex,0x800DFB14,0x42
+asm/non_matchings/code/z_camera/Camera_GetInputDir.s,Camera_GetInputDir,0x800DFC1C,0x9
+asm/non_matchings/code/z_camera/Camera_GetInputDirPitch.s,Camera_GetInputDirPitch,0x800DFC40,0xA
 asm/non_matchings/code/z_camera/Camera_GetInputDirYaw.s,Camera_GetInputDirYaw,0x800DFC68,0xA
 asm/non_matchings/code/z_camera/Camera_GetCamDir.s,Camera_GetCamDir,0x800DFC90,0x9
 asm/non_matchings/code/z_camera/Camera_GetCamDirPitch.s,Camera_GetCamDirPitch,0x800DFCB4,0xA
 asm/non_matchings/code/z_camera/Camera_GetCamDirYaw.s,Camera_GetCamDirYaw,0x800DFCDC,0xA
 asm/non_matchings/code/z_camera/Camera_AddQuake.s,Camera_AddQuake,0x800DFD04,0x1D
 asm/non_matchings/code/z_camera/Camera_SetViewParam.s,Camera_SetViewParam,0x800DFD78,0x5E
-asm/non_matchings/code/z_camera/func_800DFEF0.s,func_800DFEF0,0x800DFEF0,0xA
-asm/non_matchings/code/z_camera/func_800DFF18.s,func_800DFF18,0x800DFF18,0x7
-asm/non_matchings/code/z_camera/func_800DFF34.s,func_800DFF34,0x800DFF34,0x4
-asm/non_matchings/code/z_camera/func_800DFF44.s,func_800DFF44,0x800DFF44,0x7
-asm/non_matchings/code/z_camera/Camera_SetFlags.s,Camera_SetFlags,0x800DFF60,0x9
-asm/non_matchings/code/z_camera/Camera_ClearFlags.s,Camera_ClearFlags,0x800DFF84,0xA
+asm/non_matchings/code/z_camera/Camera_UnsetViewFlag.s,Camera_UnsetViewFlag,0x800DFEF0,0xA
+asm/non_matchings/code/z_camera/Camera_OverwriteStateFlags.s,Camera_OverwriteStateFlags,0x800DFF18,0x7
+asm/non_matchings/code/z_camera/Camera_ResetActionFuncStateUnused.s,Camera_ResetActionFuncStateUnused,0x800DFF34,0x4
+asm/non_matchings/code/z_camera/Camera_SetCsParams.s,Camera_SetCsParams,0x800DFF44,0x7
+asm/non_matchings/code/z_camera/Camera_SetStateFlag.s,Camera_SetStateFlag,0x800DFF60,0x9
+asm/non_matchings/code/z_camera/Camera_UnsetStateFlag.s,Camera_UnsetStateFlag,0x800DFF84,0xA
 asm/non_matchings/code/z_camera/Camera_ChangeDoorCam.s,Camera_ChangeDoorCam,0x800DFFAC,0x34
 asm/non_matchings/code/z_camera/Camera_Copy.s,Camera_Copy,0x800E007C,0x4C
-asm/non_matchings/code/z_camera/func_800E01AC.s,func_800E01AC,0x800E01AC,0x3
+asm/non_matchings/code/z_camera/Camera_IsDbgCamEnabled.s,Camera_IsDbgCamEnabled,0x800E01AC,0x3
 asm/non_matchings/code/z_camera/Camera_GetQuakeOffset.s,Camera_GetQuakeOffset,0x800E01B8,0x9
-asm/non_matchings/code/z_camera/func_800E01DC.s,func_800E01DC,0x800E01DC,0x13
-asm/non_matchings/code/z_camera/func_800E0228.s,func_800E0228,0x800E0228,0x4
+asm/non_matchings/code/z_camera/Camera_SetCameraData.s,Camera_SetCameraData,0x800E01DC,0x13
+asm/non_matchings/code/z_camera/Camera_GetNegOne.s,Camera_GetNegOne,0x800E0228,0x4
 asm/non_matchings/code/z_camera/func_800E0238.s,func_800E0238,0x800E0238,0x1D
-asm/non_matchings/code/z_camera/Camera_SetToTrackActor.s,Camera_SetToTrackActor,0x800E02AC,0x17
+asm/non_matchings/code/z_camera/Camera_SetFocalActor.s,Camera_SetFocalActor,0x800E02AC,0x17
 asm/non_matchings/code/z_camera/Camera_SetTargetActor.s,Camera_SetTargetActor,0x800E0308,0x5
 asm/non_matchings/code/z_camera/Camera_GetWaterYPos.s,Camera_GetWaterYPos,0x800E031C,0xB
 asm/non_matchings/code/z_camera/func_800E0348.s,func_800E0348,0x800E0348,0x16