summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_02012CC8.s2
-rw-r--r--arm9/global.inc2
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s2
-rw-r--r--arm9/modules/77/asm/module_77.s2
-rw-r--r--arm9/modules/81/asm/module_81.s2
-rw-r--r--arm9/src/unk_0201E7D8.c32
-rw-r--r--include/unk_0201E7D8.h6
7 files changed, 24 insertions, 24 deletions
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index b9d7da8e..3a1b080f 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -947,7 +947,7 @@ FUN_02013300: ; 0x02013300
beq _0201331C
add r0, #0xdb
ldrb r0, [r0, #0x0]
- bl ApplyPerspectiveType
+ bl Camera_ApplyPerspectiveType
ldr r0, [r4, #0x20]
bl Camera_SetWorkPtr
bl Camera_PushLookAtToNNSGlb
diff --git a/arm9/global.inc b/arm9/global.inc
index 08f7a73d..db33a314 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1254,7 +1254,7 @@
.extern Camera_InitWithTargetAndAngle
.extern Camera_InitWithPosAndAngle
.extern Camera_InitWithPosAndTarget
-.extern ApplyPerspectiveType
+.extern Camera_ApplyPerspectiveType
.extern Camera_SetPerspectiveAngle
.extern Camera_AdjustPerspectiveAngle
.extern Camera_OffsetLookAtPosAndTarget
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index 8c95b86c..0dded682 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -993,7 +993,7 @@ _021D7C52:
add r1, #0xa0
ldr r1, [r1]
mov r0, #0
- bl ApplyPerspectiveType
+ bl Camera_ApplyPerspectiveType
add r0, r5, #0
add r0, #0xa0
ldr r0, [r0]
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index 325e8add..4b8e4702 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -2500,7 +2500,7 @@ MOD77_021D8970: ; 0x021D8970
ldr r1, _021D89E8 ; =0x0000C2CC
mov r0, #0
ldr r1, [r4, r1]
- bl ApplyPerspectiveType
+ bl Camera_ApplyPerspectiveType
ldr r0, _021D89E8 ; =0x0000C2CC
ldr r0, [r4, r0]
bl Camera_SetWorkPtr
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 241d9dd6..df849b5e 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -1928,7 +1928,7 @@ MOD81_02238C80: ; 0x02238C80
ldr r1, [r2]
bx r3
nop
-_02238C8C: .word ApplyPerspectiveType
+_02238C8C: .word Camera_ApplyPerspectiveType
thumb_func_end MOD81_02238C80
thumb_func_start MOD81_02238C90
diff --git a/arm9/src/unk_0201E7D8.c b/arm9/src/unk_0201E7D8.c
index 2bfd6485..3658f40b 100644
--- a/arm9/src/unk_0201E7D8.c
+++ b/arm9/src/unk_0201E7D8.c
@@ -11,7 +11,7 @@ GXBufferMode g3dDepthBufferingMode = GX_BUFFERMODE_W;
static struct CameraWork * sCameraWorkPtr;
void Camera_OffsetLookAtPosAndTarget(const VecFx32 *delta, struct CameraWork * camera);
-void ApplyPerspectiveType(u8 perspectiveType, struct CameraWork * camera);
+void Camera_ApplyPerspectiveType(u8 perspectiveType, struct CameraWork * camera);
THUMB_FUNC void Camera_CalcLookAtPosFromTargetAndAngle(struct CameraWork * camera)
{
@@ -37,8 +37,8 @@ THUMB_FUNC void Camera_InitInternal(u16 perspectiveAngle, struct CameraWork * ca
camera->perspective.fovySin = FX_SinIdx(perspectiveAngle);
camera->perspective.fovyCos = FX_CosIdx(perspectiveAngle);
camera->perspective.aspect = FX32_CONST(1.33333333); // 4x3
- camera->perspective.n = FX32_CONST(150);
- camera->perspective.f = FX32_CONST(900);
+ camera->perspective.near = FX32_CONST(150);
+ camera->perspective.far = FX32_CONST(900);
camera->lookAt.camUp.x = 0;
camera->lookAt.camUp.y = FX32_ONE;
camera->lookAt.camUp.z = 0;
@@ -71,11 +71,11 @@ THUMB_FUNC void Camera_GetVecFromSomeRingBufferMaybe(struct CameraWork * camera,
{
idx_p = &camera->history->readIdx;
idx2_p = &camera->history->writeIdx;
- if (camera->history->overrideEnabled == 0)
+ if (!camera->history->overrideEnabled)
{
*vecDst = *vecDefault;
if (*idx_p == camera->history->writeIdxInit)
- camera->history->overrideEnabled = 1;
+ camera->history->overrideEnabled = TRUE;
}
else
{
@@ -204,9 +204,9 @@ THUMB_FUNC void Camera_ClearFixedTarget(struct CameraWork * camera)
THUMB_FUNC void Camera_SetPerspectiveClippingPlane(s32 n, s32 f, struct CameraWork * camera)
{
- camera->perspective.n = n;
- camera->perspective.f = f,
- ApplyPerspectiveType(camera->perspectiveType, camera);
+ camera->perspective.near = n;
+ camera->perspective.far = f,
+ Camera_ApplyPerspectiveType(camera->perspectiveType, camera);
}
THUMB_FUNC void Camera_InitWithTargetAndAngle(VecFx32 * target, fx32 distance, struct CameraAngle * angle, u16 perspectiveAngle, u8 perspectiveType, BOOL fixReference, struct CameraWork * camera)
@@ -216,7 +216,7 @@ THUMB_FUNC void Camera_InitWithTargetAndAngle(VecFx32 * target, fx32 distance, s
camera->distance = distance;
camera->angle = *angle;
Camera_CalcLookAtPosFromTargetAndAngle(camera);
- ApplyPerspectiveType(perspectiveType, camera);
+ Camera_ApplyPerspectiveType(perspectiveType, camera);
if (fixReference)
{
camera->currTarget_p = target;
@@ -234,7 +234,7 @@ THUMB_FUNC void Camera_InitWithPosAndAngle(VecFx32 * pos, fx32 distance, struct
camera->distance = distance;
camera->angle = *angle;
Camera_CalcLookAtTargetFromPosAndAngle(camera);
- ApplyPerspectiveType(sp18, camera);
+ Camera_ApplyPerspectiveType(sp18, camera);
}
THUMB_FUNC void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32 *pos, u16 perspectiveAngle, u8 perspectiveType, BOOL setReference, struct CameraWork * camera)
@@ -270,7 +270,7 @@ THUMB_FUNC void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32
camera->angle.z = 0;
}
- ApplyPerspectiveType(perspectiveType, camera);
+ Camera_ApplyPerspectiveType(perspectiveType, camera);
if (setReference)
{
@@ -282,11 +282,11 @@ THUMB_FUNC void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32
}
}
-THUMB_FUNC void ApplyPerspectiveType(u8 perspectiveType, struct CameraWork * camera)
+THUMB_FUNC void Camera_ApplyPerspectiveType(u8 perspectiveType, struct CameraWork * camera)
{
if (perspectiveType == 0)
{
- NNS_G3dGlbPerspective(camera->perspective.fovySin, camera->perspective.fovyCos, camera->perspective.aspect, camera->perspective.n, camera->perspective.f);
+ NNS_G3dGlbPerspective(camera->perspective.fovySin, camera->perspective.fovyCos, camera->perspective.aspect, camera->perspective.near, camera->perspective.far);
camera->perspectiveType = 0;
g3dDepthBufferingMode = GX_BUFFERMODE_Z;
}
@@ -294,7 +294,7 @@ THUMB_FUNC void ApplyPerspectiveType(u8 perspectiveType, struct CameraWork * cam
{
fx32 y = FX_Mul(FX_Div(camera->perspective.fovySin, camera->perspective.fovyCos), camera->distance);
fx32 x = FX_Mul(y, camera->perspective.aspect);
- NNS_G3dGlbOrtho(y, -y, -x, x, camera->perspective.n, camera->perspective.f);
+ NNS_G3dGlbOrtho(y, -y, -x, x, camera->perspective.near, camera->perspective.far);
camera->perspectiveType = 1;
g3dDepthBufferingMode = GX_BUFFERMODE_Z;
}
@@ -305,7 +305,7 @@ THUMB_FUNC void Camera_SetPerspectiveAngle(u16 perspectiveAngle, struct CameraWo
camera->perspectiveAngle = perspectiveAngle;
camera->perspective.fovySin = FX_SinIdx(camera->perspectiveAngle);
camera->perspective.fovyCos = FX_CosIdx(camera->perspectiveAngle);
- ApplyPerspectiveType(camera->perspectiveType, camera);
+ Camera_ApplyPerspectiveType(camera->perspectiveType, camera);
}
THUMB_FUNC void Camera_AdjustPerspectiveAngle(u16 rotation, struct CameraWork * camera)
@@ -313,7 +313,7 @@ THUMB_FUNC void Camera_AdjustPerspectiveAngle(u16 rotation, struct CameraWork *
camera->perspectiveAngle += rotation;
camera->perspective.fovySin = FX_SinIdx(camera->perspectiveAngle);
camera->perspective.fovyCos = FX_CosIdx(camera->perspectiveAngle);
- ApplyPerspectiveType(camera->perspectiveType, camera);
+ Camera_ApplyPerspectiveType(camera->perspectiveType, camera);
}
THUMB_FUNC void Camera_OffsetLookAtPosAndTarget(const VecFx32 *delta, struct CameraWork * camera)
diff --git a/include/unk_0201E7D8.h b/include/unk_0201E7D8.h
index 78b2c723..6c3f922d 100644
--- a/include/unk_0201E7D8.h
+++ b/include/unk_0201E7D8.h
@@ -22,7 +22,7 @@ struct CameraAngle
u16 x;
u16 y;
u16 z;
- u16 unk_06;
+ u16 unused;
};
struct CameraPerspective
@@ -30,8 +30,8 @@ struct CameraPerspective
fx32 fovySin;
fx32 fovyCos;
fx32 aspect;
- fx32 n;
- fx32 f;
+ fx32 near;
+ fx32 far;
};
struct CameraLookAt
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 19:10:49 +0000