From e24c2b33087f9b36629e74b1b911adcc45faa2cc Mon Sep 17 00:00:00 2001 From: Laqueeshous <42100286+Jameriquiah@users.noreply.github.com> Date: Thu, 25 Dec 2025 05:46:04 -0500 Subject: [PATCH 1/4] Fierce Deity Flipbook Support --- mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp | 63 ++++++++++++++++++++++ mm/2s2h/Enhancements/PlayerFDFlipbooks.h | 13 +++++ mm/src/code/z_player_lib.c | 2 + 3 files changed, 78 insertions(+) create mode 100644 mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp create mode 100644 mm/2s2h/Enhancements/PlayerFDFlipbooks.h diff --git a/mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp b/mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp new file mode 100644 index 0000000000..4b2aeec77d --- /dev/null +++ b/mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp @@ -0,0 +1,63 @@ +#include "PlayerFDFlipbooks.h" +#include "z64player.h" +#include "2s2h/BenPort.h" + +extern "C" { +extern TexturePtr sPlayerEyesTextures[PLAYER_FORM_MAX][PLAYER_EYES_MAX]; +extern TexturePtr sPlayerMouthTextures[PLAYER_FORM_MAX][PLAYER_MOUTH_MAX]; +uint8_t ResourceMgr_FileExists(const char* resName); +} + +static const char* sFDEyesTextures[PLAYER_EYES_MAX] = { + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesOpenTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesHalfTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesClosedTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesRightTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesLeftTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesUpTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesDownTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesWincingTex", +}; + +static const char* sFDMouthTextures[PLAYER_MOUTH_MAX] = { + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthClosedTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthHalfTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthOpenTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthSmileTex", +}; + +static s32 sFDFacePatchState = 0; + +static void PlayerFDFlipbooks_PatchOnce(void) { + if (sFDFacePatchState != 0) { + return; + } + + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + if (!ResourceMgr_FileExists(sFDEyesTextures[i])) { + sFDFacePatchState = 1; + return; + } + } + + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + if (!ResourceMgr_FileExists(sFDMouthTextures[i])) { + sFDFacePatchState = 1; + return; + } + } + + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + sPlayerEyesTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDEyesTextures[i]; + } + + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + sPlayerMouthTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDMouthTextures[i]; + } + + sFDFacePatchState = 2; +} + +void PlayerFDFlipbooks_Patch(void) { + PlayerFDFlipbooks_PatchOnce(); +} diff --git a/mm/2s2h/Enhancements/PlayerFDFlipbooks.h b/mm/2s2h/Enhancements/PlayerFDFlipbooks.h new file mode 100644 index 0000000000..7f7b514e17 --- /dev/null +++ b/mm/2s2h/Enhancements/PlayerFDFlipbooks.h @@ -0,0 +1,13 @@ +#pragma once + +#include "global.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void PlayerFDFlipbooks_Patch(void); + +#ifdef __cplusplus +} +#endif diff --git a/mm/src/code/z_player_lib.c b/mm/src/code/z_player_lib.c index f51d17cfd4..dd894183f8 100644 --- a/mm/src/code/z_player_lib.c +++ b/mm/src/code/z_player_lib.c @@ -13,6 +13,7 @@ #include "objects/object_link_zora/object_link_zora.h" #include "objects/object_link_nuts/object_link_nuts.h" #include "objects/object_link_child/object_link_child.h" +#include "2s2h/Enhancements/PlayerFDFlipbooks.h" // Assets for each mask #include "objects/object_mask_truth/object_mask_truth.h" @@ -2057,6 +2058,7 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL // Only Human, Zora, and Goron will read the eye textures in the head limb display list. // Fierce Deity and Deku will point this segment to garbage data, but it will be unread from. + PlayerFDFlipbooks_Patch(); gSPSegment(&gfx[0], 0x08, Lib_SegmentedToVirtual(sPlayerEyesTextures[playerForm][eyeIndex])); // 2S2H [Port] Hess crash fix From ab67ab74e68a5164d63e5163e2ceede40cf89ce5 Mon Sep 17 00:00:00 2001 From: Laqueeshous <42100286+Jameriquiah@users.noreply.github.com> Date: Sat, 27 Dec 2025 13:17:16 -0500 Subject: [PATCH 2/4] implemented suggestions z_player_lib.c is no longer touched --- mm/2s2h/BenPort.cpp | 2 ++ .../{ => GfxPatcher}/PlayerFDFlipbooks.cpp | 2 +- mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h | 3 +++ mm/2s2h/Enhancements/PlayerFDFlipbooks.h | 13 ------------- mm/src/code/z_player_lib.c | 2 -- 5 files changed, 6 insertions(+), 16 deletions(-) rename mm/2s2h/Enhancements/{ => GfxPatcher}/PlayerFDFlipbooks.cpp (98%) create mode 100644 mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h delete mode 100644 mm/2s2h/Enhancements/PlayerFDFlipbooks.h diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index d913c05920..1cae3daea1 100644 --- a/mm/2s2h/BenPort.cpp +++ b/mm/2s2h/BenPort.cpp @@ -53,6 +53,7 @@ CrowdControl* CrowdControl::Instance; #include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/Enhancements/Enhancements.h" #include "2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.h" +#include "2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h" #include "2s2h/DeveloperTools/DebugConsole.h" #include "2s2h/Rando/Rando.h" #include "2s2h/Rando/Spoiler/Spoiler.h" @@ -719,6 +720,7 @@ extern "C" void InitOTR() { OTRMessage_Init(); OTRAudio_Init(); OTRExtScanner(); + PlayerFDFlipbooks_Patch(); // Just came up with arbitrary numbers that seemed to work, this is // usually set once(?) in currently stubbed out areas of code. diff --git a/mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp similarity index 98% rename from mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp rename to mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp index 4b2aeec77d..bd8e9f7084 100644 --- a/mm/2s2h/Enhancements/PlayerFDFlipbooks.cpp +++ b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp @@ -55,7 +55,7 @@ static void PlayerFDFlipbooks_PatchOnce(void) { sPlayerMouthTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDMouthTextures[i]; } - sFDFacePatchState = 2; + sFDFacePatchState = 1; } void PlayerFDFlipbooks_Patch(void) { diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h new file mode 100644 index 0000000000..ba226cc934 --- /dev/null +++ b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h @@ -0,0 +1,3 @@ +#pragma once + +void PlayerFDFlipbooks_Patch(void); \ No newline at end of file diff --git a/mm/2s2h/Enhancements/PlayerFDFlipbooks.h b/mm/2s2h/Enhancements/PlayerFDFlipbooks.h deleted file mode 100644 index 7f7b514e17..0000000000 --- a/mm/2s2h/Enhancements/PlayerFDFlipbooks.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "global.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void PlayerFDFlipbooks_Patch(void); - -#ifdef __cplusplus -} -#endif diff --git a/mm/src/code/z_player_lib.c b/mm/src/code/z_player_lib.c index dd894183f8..f51d17cfd4 100644 --- a/mm/src/code/z_player_lib.c +++ b/mm/src/code/z_player_lib.c @@ -13,7 +13,6 @@ #include "objects/object_link_zora/object_link_zora.h" #include "objects/object_link_nuts/object_link_nuts.h" #include "objects/object_link_child/object_link_child.h" -#include "2s2h/Enhancements/PlayerFDFlipbooks.h" // Assets for each mask #include "objects/object_mask_truth/object_mask_truth.h" @@ -2058,7 +2057,6 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL // Only Human, Zora, and Goron will read the eye textures in the head limb display list. // Fierce Deity and Deku will point this segment to garbage data, but it will be unread from. - PlayerFDFlipbooks_Patch(); gSPSegment(&gfx[0], 0x08, Lib_SegmentedToVirtual(sPlayerEyesTextures[playerForm][eyeIndex])); // 2S2H [Port] Hess crash fix From 4ae48ce5950d89b0d852ecc7b9e7033bd649bf32 Mon Sep 17 00:00:00 2001 From: Laqueeshous <42100286+Jameriquiah@users.noreply.github.com> Date: Mon, 29 Dec 2025 09:09:15 -0500 Subject: [PATCH 3/4] Crash fix + Deku and Goron --- mm/2s2h/BenPort.cpp | 5 +- .../GfxPatcher/PlayerCustomFlipbooks.cpp | 138 ++++++++++++++++++ .../GfxPatcher/PlayerCustomFlipbooks.h | 3 + .../GfxPatcher/PlayerFDFlipbooks.cpp | 63 -------- .../GfxPatcher/PlayerFDFlipbooks.h | 3 - 5 files changed, 144 insertions(+), 68 deletions(-) create mode 100644 mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp create mode 100644 mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.h delete mode 100644 mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp delete mode 100644 mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index 1cae3daea1..14186f7c9a 100644 --- a/mm/2s2h/BenPort.cpp +++ b/mm/2s2h/BenPort.cpp @@ -53,7 +53,7 @@ CrowdControl* CrowdControl::Instance; #include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/Enhancements/Enhancements.h" #include "2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.h" -#include "2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h" +#include "2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.h" #include "2s2h/DeveloperTools/DebugConsole.h" #include "2s2h/Rando/Rando.h" #include "2s2h/Rando/Spoiler/Spoiler.h" @@ -720,7 +720,7 @@ extern "C" void InitOTR() { OTRMessage_Init(); OTRAudio_Init(); OTRExtScanner(); - PlayerFDFlipbooks_Patch(); + PlayerCustomFlipbooks_Patch(); // Just came up with arbitrary numbers that seemed to work, this is // usually set once(?) in currently stubbed out areas of code. @@ -1967,3 +1967,4 @@ extern "C" bool Ship_HandleConsoleCrashAsReset() { return true; } + diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp new file mode 100644 index 0000000000..65b2548b8d --- /dev/null +++ b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp @@ -0,0 +1,138 @@ +#include "PlayerCustomFlipbooks.h" +#include "2s2h/BenPort.h" + +extern "C" { +#include "z64player.h" +extern TexturePtr sPlayerEyesTextures[PLAYER_FORM_MAX][PLAYER_EYES_MAX]; +extern TexturePtr sPlayerMouthTextures[PLAYER_FORM_MAX][PLAYER_MOUTH_MAX]; +uint8_t ResourceMgr_FileExists(const char* resName); +} + +static const char* sFDEyesTextures[PLAYER_EYES_MAX] = { + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesOpenTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesHalfTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesClosedTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesRightTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesLeftTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesUpTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesDownTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityEyesWincingTex", +}; + +static const char* sFDMouthTextures[PLAYER_MOUTH_MAX] = { + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthClosedTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthHalfTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthOpenTex", + "__OTR__objects/object_link_boy/gLinkFierceDeityMouthSmileTex", +}; + +static const char* sDekuEyesTextures[PLAYER_EYES_MAX] = { + "__OTR__objects/object_link_nuts/gLinkDekuEyesOpenTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesHalfTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesClosedTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesRightTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesLeftTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesUpTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesDownTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesWincingTex", +}; + +static const char* sDekuMouthTextures[PLAYER_MOUTH_MAX] = { + "__OTR__objects/object_link_nuts/gLinkDekuMouthClosedTex", + "__OTR__objects/object_link_nuts/gLinkDekuMouthHalfTex", + "__OTR__objects/object_link_nuts/gLinkDekuMouthOpenTex", + "__OTR__objects/object_link_nuts/gLinkDekuMouthSmileTex", +}; + +static const char* sGoronMouthTextures[PLAYER_MOUTH_MAX] = { + "__OTR__objects/object_link_goron/gLinkGoronMouthClosedTex", + "__OTR__objects/object_link_goron/gLinkGoronMouthHalfTex", + "__OTR__objects/object_link_goron/gLinkGoronMouthOpenTex", + "__OTR__objects/object_link_goron/gLinkGoronMouthSmileTex", +}; + +static s32 sFacePatchState = 0; + +static void PlayerCustomFlipbooks_PatchOnce(void) { + if (sFacePatchState != 0) { + return; + } + + bool EyesPatch = true; + bool MouthPatch = true; + bool DekuEyesPatch = true; + bool DekuMouthPatch = true; + bool GoronMouthPatch = true; + + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + if (!ResourceMgr_FileExists(sFDEyesTextures[i])) { + EyesPatch = false; + break; + } + } + + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + if (!ResourceMgr_FileExists(sFDMouthTextures[i])) { + MouthPatch = false; + break; + } + } + + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + if (!ResourceMgr_FileExists(sDekuEyesTextures[i])) { + DekuEyesPatch = false; + break; + } + } + + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + if (!ResourceMgr_FileExists(sDekuMouthTextures[i])) { + DekuMouthPatch = false; + break; + } + } + + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + if (!ResourceMgr_FileExists(sGoronMouthTextures[i])) { + GoronMouthPatch = false; + break; + } + } + + if (EyesPatch) { + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + sPlayerEyesTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDEyesTextures[i]; + } + } + + if (MouthPatch) { + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + sPlayerMouthTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDMouthTextures[i]; + } + } + + if (DekuEyesPatch) { + for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { + sPlayerEyesTextures[PLAYER_FORM_DEKU][i] = (TexturePtr)sDekuEyesTextures[i]; + } + } + + if (DekuMouthPatch) { + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + sPlayerMouthTextures[PLAYER_FORM_DEKU][i] = (TexturePtr)sDekuMouthTextures[i]; + } + } + + if (GoronMouthPatch) { + for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { + sPlayerMouthTextures[PLAYER_FORM_GORON][i] = (TexturePtr)sGoronMouthTextures[i]; + } + } + + sFacePatchState = 1; +} + +void PlayerCustomFlipbooks_Patch(void) { + PlayerCustomFlipbooks_PatchOnce(); +} + diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.h b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.h new file mode 100644 index 0000000000..dc0fc549da --- /dev/null +++ b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.h @@ -0,0 +1,3 @@ +#pragma once + +void PlayerCustomFlipbooks_Patch(void); diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp deleted file mode 100644 index bd8e9f7084..0000000000 --- a/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include "PlayerFDFlipbooks.h" -#include "z64player.h" -#include "2s2h/BenPort.h" - -extern "C" { -extern TexturePtr sPlayerEyesTextures[PLAYER_FORM_MAX][PLAYER_EYES_MAX]; -extern TexturePtr sPlayerMouthTextures[PLAYER_FORM_MAX][PLAYER_MOUTH_MAX]; -uint8_t ResourceMgr_FileExists(const char* resName); -} - -static const char* sFDEyesTextures[PLAYER_EYES_MAX] = { - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesOpenTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesHalfTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesClosedTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesRightTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesLeftTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesUpTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesDownTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityEyesWincingTex", -}; - -static const char* sFDMouthTextures[PLAYER_MOUTH_MAX] = { - "__OTR__objects/object_link_boy/gLinkFierceDeityMouthClosedTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityMouthHalfTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityMouthOpenTex", - "__OTR__objects/object_link_boy/gLinkFierceDeityMouthSmileTex", -}; - -static s32 sFDFacePatchState = 0; - -static void PlayerFDFlipbooks_PatchOnce(void) { - if (sFDFacePatchState != 0) { - return; - } - - for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { - if (!ResourceMgr_FileExists(sFDEyesTextures[i])) { - sFDFacePatchState = 1; - return; - } - } - - for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { - if (!ResourceMgr_FileExists(sFDMouthTextures[i])) { - sFDFacePatchState = 1; - return; - } - } - - for (s32 i = 0; i < PLAYER_EYES_MAX; i++) { - sPlayerEyesTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDEyesTextures[i]; - } - - for (s32 i = 0; i < PLAYER_MOUTH_MAX; i++) { - sPlayerMouthTextures[PLAYER_FORM_FIERCE_DEITY][i] = (TexturePtr)sFDMouthTextures[i]; - } - - sFDFacePatchState = 1; -} - -void PlayerFDFlipbooks_Patch(void) { - PlayerFDFlipbooks_PatchOnce(); -} diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h b/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h deleted file mode 100644 index ba226cc934..0000000000 --- a/mm/2s2h/Enhancements/GfxPatcher/PlayerFDFlipbooks.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -void PlayerFDFlipbooks_Patch(void); \ No newline at end of file From ea4fa21f42b964e98cb41f409c5e2a5c3d304171 Mon Sep 17 00:00:00 2001 From: Laqueeshous <42100286+Jameriquiah@users.noreply.github.com> Date: Mon, 29 Dec 2025 09:41:18 -0500 Subject: [PATCH 4/4] clang-format failed fix --- mm/2s2h/BenPort.cpp | 1 - .../GfxPatcher/PlayerCustomFlipbooks.cpp | 13 ++++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index 14186f7c9a..89ee51a4df 100644 --- a/mm/2s2h/BenPort.cpp +++ b/mm/2s2h/BenPort.cpp @@ -1967,4 +1967,3 @@ extern "C" bool Ship_HandleConsoleCrashAsReset() { return true; } - diff --git a/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp index 65b2548b8d..71717d07d4 100644 --- a/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp +++ b/mm/2s2h/Enhancements/GfxPatcher/PlayerCustomFlipbooks.cpp @@ -27,14 +27,10 @@ static const char* sFDMouthTextures[PLAYER_MOUTH_MAX] = { }; static const char* sDekuEyesTextures[PLAYER_EYES_MAX] = { - "__OTR__objects/object_link_nuts/gLinkDekuEyesOpenTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesHalfTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesClosedTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesRightTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesLeftTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesUpTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesDownTex", - "__OTR__objects/object_link_nuts/gLinkDekuEyesWincingTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesOpenTex", "__OTR__objects/object_link_nuts/gLinkDekuEyesHalfTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesClosedTex", "__OTR__objects/object_link_nuts/gLinkDekuEyesRightTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesLeftTex", "__OTR__objects/object_link_nuts/gLinkDekuEyesUpTex", + "__OTR__objects/object_link_nuts/gLinkDekuEyesDownTex", "__OTR__objects/object_link_nuts/gLinkDekuEyesWincingTex", }; static const char* sDekuMouthTextures[PLAYER_MOUTH_MAX] = { @@ -135,4 +131,3 @@ static void PlayerCustomFlipbooks_PatchOnce(void) { void PlayerCustomFlipbooks_Patch(void) { PlayerCustomFlipbooks_PatchOnce(); } -