Proper fix to masks showing in first person, and apply it to hyrule w…

…arriors enhancement
HarbourMasters · Jan 8, 2025 · 08cabe0 · 08cabe0
1 parent 5d514ef
commit 08cabe0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp b/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
@@ -54,8 +54,14 @@ void UpdatePersistentMasksState() {
                 return;
             }
 
-            if (player->transformation == PLAYER_FORM_DEKU && player->stateFlags1 & PLAYER_STATE1_100000) {
-                return;
+            // This emulates the vanilla check for if the masks should be drawn, specifically around 
+            // z_player.c 12923 (Player_Draw)
+            if (player->stateFlags1 & PLAYER_STATE1_100000) {
+                Vec3f temp;
+                SkinMatrix_Vec3fMtxFMultXYZ(&gPlayState->viewProjectionMtxF, &player->actor.focus.pos, &temp);
+                if (temp.z < -4.0f) {
+                    return;
+                }
             }
 
             OPEN_DISPS(gPlayState->state.gfxCtx);

diff --git a/mm/2s2h/Enhancements/Modes/HyruleWarriorsStyledLink.cpp b/mm/2s2h/Enhancements/Modes/HyruleWarriorsStyledLink.cpp
@@ -14,6 +14,16 @@ extern const char* D_801C0B20[28];
 
 void RegisterHyruleWarriorsStyledLink() {
     COND_ID_HOOK(OnPlayerPostLimbDraw, PLAYER_LIMB_HEAD, CVAR, [](Player* player, s32 limbIndex) {
+        // This emulates the vanilla check for if the masks should be drawn, specifically around 
+        // z_player.c 12923 (Player_Draw)
+        if (player->stateFlags1 & PLAYER_STATE1_100000) {
+            Vec3f temp;
+            SkinMatrix_Vec3fMtxFMultXYZ(&gPlayState->viewProjectionMtxF, &player->actor.focus.pos, &temp);
+            if (temp.z < -4.0f) {
+                return;
+            }
+        }
+
         if (player->currentMask == PLAYER_MASK_NONE && player->transformation == PLAYER_FORM_HUMAN &&
             INV_CONTENT(ITEM_MASK_KEATON) == ITEM_MASK_KEATON) {
             OPEN_DISPS(gPlayState->state.gfxCtx);