summaryrefslogtreecommitdiff
path: root/src/code/z_camera.c
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2024-11-18 11:37:11 +1100
committerGitHub <noreply@github.com>2024-11-17 16:37:11 -0800
commit00bafced8e2bcdec514c80dc4506da56f0bd434f (patch)
treee2bb0288bbdca03a512f6a6b1f664c51b0fef6cb /src/code/z_camera.c
parenta957342583ade3867679b93e126bcd39b80f5e43 (diff)
Player Docs: Zora Boomerang (#1739)
* zora boomerang * missed some * more docs * cleanup docs * more cleanup * Player_IsUsingZoraBoomerang
Diffstat (limited to 'src/code/z_camera.c')
-rw-r--r--src/code/z_camera.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index b3f3f5fdd..d010162a7 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -425,7 +425,6 @@ s32 func_800CB950(Camera* camera) {
player = (Player*)camera->focalActor;
if (!ret) {
- // Using zora fins
ret = player->stateFlags1 & PLAYER_STATE1_200000;
ret = !!ret;
}
@@ -527,7 +526,7 @@ s32 func_800CBB88(Camera* camera) {
return 0;
}
-s32 Camera_IsUsingZoraFins(Camera* camera) {
+s32 func_800CBC00(Camera* camera) {
Actor* focalActor = camera->focalActor;
if (camera->focalActor == &GET_PLAYER(camera->play)->actor) {
@@ -3898,7 +3897,7 @@ s32 Camera_Battle0(Camera* camera) {
}
/**
- * Used for following a secondary target such as zora fins or a z-target
+ * Used for following a secondary target such as zora boomerangs or a z-target
*/
s32 Camera_KeepOn1(Camera* camera) {
Vec3f* eye = &camera->eye;
@@ -7450,7 +7449,7 @@ Vec3s Camera_Update(Camera* camera) {
bgCamIndex = Camera_GetBgCamIndex(camera, &bgId, sp90);
if ((bgCamIndex != -1) && (camera->bgId == BGCHECK_SCENE)) {
- if (!Camera_IsUsingZoraFins(camera)) {
+ if (!func_800CBC00(camera)) {
camera->nextCamSceneDataId = bgCamIndex | CAM_DATA_IS_BG;
}
}