From ba4ad874f42ea01267c4e854f842781132742ff2 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Tue, 5 Dec 2023 23:06:57 -0500
Subject: [PATCH] Add first person mario head Y constants

---
 autogen/lua_definitions/constants.lua |  6 ++++++
 docs/lua/constants.md                 |  2 ++
 src/game/first_person_cam.c           | 13 +++++--------
 src/game/first_person_cam.h           |  3 +++
 src/pc/lua/smlua_constants_autogen.c  |  2 ++
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua
index 489f19ab..76d51fea 100644
--- a/autogen/lua_definitions/constants.lua
+++ b/autogen/lua_definitions/constants.lua
@@ -3432,6 +3432,12 @@ DS_NONE = 0xff
 --- @type integer
 FIRST_PERSON_DEFAULT_FOV = 70
 
+--- @type integer
+FIRST_PERSON_MARIO_HEAD_POS = 120
+
+--- @type integer
+FIRST_PERSON_MARIO_HEAD_POS_SHORT = 60
+
 --- @type integer
 BACKGROUND_ABOVE_CLOUDS = 8
 
diff --git a/docs/lua/constants.md b/docs/lua/constants.md
index 353b9698..66a36c59 100644
--- a/docs/lua/constants.md
+++ b/docs/lua/constants.md
@@ -1183,6 +1183,8 @@
 
 ## [first_person_cam.h](#first_person_cam.h)
 - FIRST_PERSON_DEFAULT_FOV
+- FIRST_PERSON_MARIO_HEAD_POS
+- FIRST_PERSON_MARIO_HEAD_POS_SHORT
 
 [:arrow_up_small:](#)
 
diff --git a/src/game/first_person_cam.c b/src/game/first_person_cam.c
index 3db03546..9afe47d1 100644
--- a/src/game/first_person_cam.c
+++ b/src/game/first_person_cam.c
@@ -16,9 +16,6 @@
 #include "pc/lua/utils/smlua_misc_utils.h"
 #include "pc/lua/smlua_hooks.h"
 
-#define MARIO_HEAD_POS 120
-#define MARIO_HEAD_POS_SHORT MARIO_HEAD_POS / 2
-
 #define CLAMP(_val, _min, _max) MAX(MIN((_val), _max), _min)
 
 struct FirstPersonCamera gFirstPersonCamera = {
@@ -107,18 +104,18 @@ void first_person_camera_update(void) {
     // update crouch
     if (mario_is_crouching(m) || m->action == ACT_LEDGE_GRAB) {
         f32 inc = 10 * (m->controller->buttonDown & Z_TRIG) != 0 || m->action == ACT_CROUCH_SLIDE || m->action == ACT_LEDGE_GRAB ? 1 : -1;
-        gFirstPersonCamera.crouch = CLAMP(gFirstPersonCamera.crouch + inc, 0, MARIO_HEAD_POS - MARIO_HEAD_POS_SHORT);
+        gFirstPersonCamera.crouch = CLAMP(gFirstPersonCamera.crouch + inc, 0, FIRST_PERSON_MARIO_HEAD_POS - FIRST_PERSON_MARIO_HEAD_POS_SHORT);
     } else {
-        gFirstPersonCamera.crouch = CLAMP(gFirstPersonCamera.crouch - 10, 0, MARIO_HEAD_POS - MARIO_HEAD_POS_SHORT);
+        gFirstPersonCamera.crouch = CLAMP(gFirstPersonCamera.crouch - 10, 0, FIRST_PERSON_MARIO_HEAD_POS - FIRST_PERSON_MARIO_HEAD_POS_SHORT);
     }
 
     if (m->action == ACT_LEDGE_GRAB) {
-        gFirstPersonCamera.crouch = MARIO_HEAD_POS - MARIO_HEAD_POS_SHORT;
+        gFirstPersonCamera.crouch = FIRST_PERSON_MARIO_HEAD_POS - FIRST_PERSON_MARIO_HEAD_POS_SHORT;
     }
 
     // update pos
     gLakituState.pos[0] = m->pos[0] + coss(gFirstPersonCamera.pitch) * sins(gFirstPersonCamera.yaw);
-    gLakituState.pos[1] = m->pos[1] + sins(gFirstPersonCamera.pitch) + (MARIO_HEAD_POS - gFirstPersonCamera.crouch);
+    gLakituState.pos[1] = m->pos[1] + sins(gFirstPersonCamera.pitch) + (FIRST_PERSON_MARIO_HEAD_POS - gFirstPersonCamera.crouch);
     gLakituState.pos[2] = m->pos[2] + coss(gFirstPersonCamera.pitch) * coss(gFirstPersonCamera.yaw);
     vec3f_copy(m->area->camera->pos, gLakituState.pos);
     vec3f_copy(gLakituState.curPos, gLakituState.pos);
@@ -126,7 +123,7 @@ void first_person_camera_update(void) {
 
     // update focus
     gLakituState.focus[0] = m->pos[0] - 100 * coss(gFirstPersonCamera.pitch) * sins(gFirstPersonCamera.yaw);
-    gLakituState.focus[1] = m->pos[1] - 100 * sins(gFirstPersonCamera.pitch) + (MARIO_HEAD_POS - gFirstPersonCamera.crouch);
+    gLakituState.focus[1] = m->pos[1] - 100 * sins(gFirstPersonCamera.pitch) + (FIRST_PERSON_MARIO_HEAD_POS - gFirstPersonCamera.crouch);
     gLakituState.focus[2] = m->pos[2] - 100 * coss(gFirstPersonCamera.pitch) * coss(gFirstPersonCamera.yaw);
     vec3f_copy(m->area->camera->focus, gLakituState.focus);
     vec3f_copy(gLakituState.curFocus, gLakituState.focus);
diff --git a/src/game/first_person_cam.h b/src/game/first_person_cam.h
index ff159bf1..5c659ba3 100644
--- a/src/game/first_person_cam.h
+++ b/src/game/first_person_cam.h
@@ -5,6 +5,9 @@
 
 #define FIRST_PERSON_DEFAULT_FOV 70
 
+#define FIRST_PERSON_MARIO_HEAD_POS 120
+#define FIRST_PERSON_MARIO_HEAD_POS_SHORT 60
+
 struct FirstPersonCamera {
     bool enabled;
     bool forceRoll;
diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c
index 81da2b11..6e24563f 100644
--- a/src/pc/lua/smlua_constants_autogen.c
+++ b/src/pc/lua/smlua_constants_autogen.c
@@ -1354,6 +1354,8 @@ char gSmluaConstants[] = ""
 "DS_NONE = 0xff\n"
 "DS_DIFF = DS_TUXIE\n"
 "FIRST_PERSON_DEFAULT_FOV = 70\n"
+"FIRST_PERSON_MARIO_HEAD_POS = 120\n"
+"FIRST_PERSON_MARIO_HEAD_POS_SHORT = 60\n"
 "BACKGROUND_OCEAN_SKY = 0\n"
 "BACKGROUND_FLAMING_SKY = 1\n"
 "BACKGROUND_UNDERWATER_CITY = 2\n"