From 120562952ca7c4fcfe1bcb312fb999bae4ebe954 Mon Sep 17 00:00:00 2001 From: Archez Date: Sun, 23 Jun 2024 14:51:57 -0400 Subject: [PATCH] bump lus with color combiner fixes (#711) --- libultraship | 2 +- .../Enhancements/GfxPatcher/AuthenticGfxPatches.cpp | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libultraship b/libultraship index 5849d3a23..31e9b009f 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 5849d3a23a18d0664cb04cc084fa120833b69353 +Subproject commit 31e9b009f94e7074a847c7954926cba354cd7c72 diff --git a/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp b/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp index 78da2596a..3364ff86b 100644 --- a/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp +++ b/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp @@ -2,7 +2,6 @@ extern "C" { #include -#include "objects/object_uch/object_uch.h" #include "overlays/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.h" #include "overlays/ovl_Obj_Jgame_Light/ovl_Obj_Jgame_Light.h" @@ -11,15 +10,6 @@ void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName); Gfx* ResourceMgr_LoadGfxByName(const char* path); } -void PatchAlienEyeBeams() { - // A bug in the Alien's eye beam DL is incorrectly referring to TEXEL1 in the color combiner when - // the texture is loaded into TEXEL0, causing the CC rendering whatever was last loaded into TEXEL1. - // Patching the instruction to TEXEL0 restores the effect as seen on hardware. - ResourceMgr_PatchGfxByName(gAlienEyeBeamDL, "AlienEyeBeamFix", 4, - gsDPSetCombineLERP(NOISE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, COMBINED, 0, - PRIMITIVE_ALPHA, PRIMITIVE, COMBINED, 0, TEXEL0, 0)); -} - void PatchMiniGameCrossAndCircleSymbols() { // The X and O displayed in mini-games are incorrectly set to FMT_I instead of FMT_IA, // Fast3D throws an assert and does nothing as FMT_I with SIZ_16 is not a valid texture type. @@ -48,6 +38,5 @@ void PatchMiniGameCrossAndCircleSymbols() { // Applies required patches for authentic bugs to allow the game to play and render properly void GfxPatcher_ApplyNecessaryAuthenticPatches() { - PatchAlienEyeBeams(); PatchMiniGameCrossAndCircleSymbols(); }