summaryrefslogtreecommitdiff
path: root/src/code/z_camera.c
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2022-08-15 09:39:06 -0400
committerGitHub <noreply@github.com>2022-08-15 09:39:06 -0400
commitfec5cd84aff63ef1872587385c8f49e8c81faa0c (patch)
treec2fe8d7788a49a0586c1adac97695d810f3f8cec /src/code/z_camera.c
parentdda78f9e2c05e0a982731fbc7254fcef68334142 (diff)
Doc shrink_window, rename system to Letterbox (#1341)
* docs * missed some hex * document Gfx_SetupFrame * review
Diffstat (limited to 'src/code/z_camera.c')
-rw-r--r--src/code/z_camera.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 950b67cde..ee0b45eb5 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -749,34 +749,34 @@ s32 Camera_CopyPREGToModeValues(Camera* camera) {
return true;
}
-#define SHRINKWIN_MASK (0xF000)
-#define SHRINKWINVAL_MASK (0x7000)
-#define SHRINKWIN_CURVAL (0x8000)
+#define LETTERBOX_MASK (0xF000)
+#define LETTERBOX_SIZE_MASK (0x7000)
+#define LETTERBOX_INSTANT (0x8000)
#define IFACE_ALPHA_MASK (0x0F00)
void Camera_UpdateInterface(s16 flags) {
s16 interfaceAlpha;
- if ((flags & SHRINKWIN_MASK) != SHRINKWIN_MASK) {
- switch (flags & SHRINKWINVAL_MASK) {
+ if ((flags & LETTERBOX_MASK) != LETTERBOX_MASK) {
+ switch (flags & LETTERBOX_SIZE_MASK) {
case 0x1000:
- sCameraShrinkWindowVal = 0x1A;
+ sCameraLetterboxSize = 26;
break;
case 0x2000:
- sCameraShrinkWindowVal = 0x1B;
+ sCameraLetterboxSize = 27;
break;
case 0x3000:
- sCameraShrinkWindowVal = 0x20;
+ sCameraLetterboxSize = 32;
break;
default:
- sCameraShrinkWindowVal = 0;
+ sCameraLetterboxSize = 0;
break;
}
- if (flags & SHRINKWIN_CURVAL) {
- ShrinkWindow_SetCurrentVal(sCameraShrinkWindowVal);
+ if (flags & LETTERBOX_INSTANT) {
+ Letterbox_SetSize(sCameraLetterboxSize);
} else {
- ShrinkWindow_SetVal(sCameraShrinkWindowVal);
+ Letterbox_SetSizeTarget(sCameraLetterboxSize);
}
}
@@ -6941,7 +6941,7 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState
camera->xzOffsetUpdateRate = CAM_DATA_SCALED(OREG(2));
camera->yOffsetUpdateRate = CAM_DATA_SCALED(OREG(3));
camera->fovUpdateRate = CAM_DATA_SCALED(OREG(4));
- sCameraShrinkWindowVal = 0x20;
+ sCameraLetterboxSize = 32;
sCameraInterfaceAlpha = 0;
camera->unk_14C = 0;
camera->setting = camera->prevSetting = CAM_SET_FREE0;