From 2f6468eba198190d08371990240fe009e525f348 Mon Sep 17 00:00:00 2001 From: getdls Date: Fri, 2 Nov 2018 21:17:56 +0100 Subject: [PATCH] Revert "[TP] Ultrawide in scale with res [Contrasty] less default sharpness mix" This reverts commit 80d6255e60baa8299b5e46095ab540f429ee5062. --- .../HyruleWarriors_Contrasty/rules.txt | 6 +- Enhancements/NinjaGaiden3_Contrasty/rules.txt | 6 +- .../SuperMario3DWorld_Contrasty/rules.txt | 8 +- .../SuperSmashBros_Contrasty/rules.txt | 6 +- .../TwilightPrincessHD_Contrasty/rules.txt | 166 +++++++++--------- Enhancements/WindWakerHD_Contrasty/rules.txt | 6 +- Source/TwilightPrincessHD/patches.txt | 13 -- Source/TwilightPrincessHD/rules.txt | 68 +------ 8 files changed, 100 insertions(+), 179 deletions(-) delete mode 100644 Source/TwilightPrincessHD/patches.txt diff --git a/Enhancements/HyruleWarriors_Contrasty/rules.txt b/Enhancements/HyruleWarriors_Contrasty/rules.txt index 9d5f52af..96960b53 100644 --- a/Enhancements/HyruleWarriors_Contrasty/rules.txt +++ b/Enhancements/HyruleWarriors_Contrasty/rules.txt @@ -47,7 +47,7 @@ $exposure = 1.5 $vibrance = 0.35 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.35 [Preset] name = Colourful @@ -69,7 +69,7 @@ $exposure = 1.1 $vibrance = 0.5 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.3 [Preset] name = Neutral Contrasty @@ -91,4 +91,4 @@ $exposure = 1.25 $vibrance = 0.15 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 \ No newline at end of file +$sharp_mix = 0.25 \ No newline at end of file diff --git a/Enhancements/NinjaGaiden3_Contrasty/rules.txt b/Enhancements/NinjaGaiden3_Contrasty/rules.txt index ca4a4e1d..23ab30de 100644 --- a/Enhancements/NinjaGaiden3_Contrasty/rules.txt +++ b/Enhancements/NinjaGaiden3_Contrasty/rules.txt @@ -47,7 +47,7 @@ $exposure = 1.05 $vibrance = 0.25 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = Colourful @@ -69,7 +69,7 @@ $exposure = 1.01 $vibrance = 0.4 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = Neutral Contrasty @@ -91,4 +91,4 @@ $exposure = 1.01 $vibrance = 0.15 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 \ No newline at end of file +$sharp_mix = 0.25 \ No newline at end of file diff --git a/Enhancements/SuperMario3DWorld_Contrasty/rules.txt b/Enhancements/SuperMario3DWorld_Contrasty/rules.txt index 8c8c907f..621d8e2e 100644 --- a/Enhancements/SuperMario3DWorld_Contrasty/rules.txt +++ b/Enhancements/SuperMario3DWorld_Contrasty/rules.txt @@ -47,7 +47,7 @@ $exposure = 1.0 $vibrance = 0.0 $crushContrast = 0.0 $bleach = 1.0 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = High Contrasty @@ -69,7 +69,7 @@ $exposure = 1.05 $vibrance = 0.25 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.45 [Preset] name = Colourful @@ -91,7 +91,7 @@ $exposure = 1.01 $vibrance = 0.4 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.15 [Preset] name = Neutral Contrasty @@ -113,4 +113,4 @@ $exposure = 1.01 $vibrance = 0.15 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 \ No newline at end of file +$sharp_mix = 0.15 \ No newline at end of file diff --git a/Enhancements/SuperSmashBros_Contrasty/rules.txt b/Enhancements/SuperSmashBros_Contrasty/rules.txt index c0f676d4..96513ba4 100644 --- a/Enhancements/SuperSmashBros_Contrasty/rules.txt +++ b/Enhancements/SuperSmashBros_Contrasty/rules.txt @@ -47,7 +47,7 @@ $exposure = 1.0 $vibrance = 0.0 $crushContrast = 0.0 $bleach = 1.0 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = High Contrasty @@ -69,7 +69,7 @@ $exposure = 1.05 $vibrance = 0.25 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.35 [Preset] name = Colourful @@ -91,7 +91,7 @@ $exposure = 1.01 $vibrance = 0.4 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.15 [Preset] name = Neutral Contrasty diff --git a/Enhancements/TwilightPrincessHD_Contrasty/rules.txt b/Enhancements/TwilightPrincessHD_Contrasty/rules.txt index 3a37546f..f2476464 100644 --- a/Enhancements/TwilightPrincessHD_Contrasty/rules.txt +++ b/Enhancements/TwilightPrincessHD_Contrasty/rules.txt @@ -1,12 +1,12 @@ [Definition] -titleIds = 0005000010143400,0005000010143600,0005000010143500 +titleIds = 000500001019C800,000500001019E600,000500001019E500 name = Contrasty -path = "The Legend of Zelda: The Wind Waker HD/Enhancements/Contrasty" -description = This pack tweaks the colors and contrast to whatever preset you set it as. You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs. Enabling will ignore your other AA settings. +path = "The Legend of Zelda: Twilight Princess HD/Enhancements/Contrasty" +description = This pack tweaks the colors and contrast to whatever preset you set it as. You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs. version = 3 [Preset] -name = Default +name = default $redShadows = 1.0 $greenShadows = 1.0 $blueSadows = 1.0 @@ -28,92 +28,48 @@ $bleach = 1.0 $sharp_mix = 0.0 [Preset] -name = Some Contrast -$redShadows = 1.0 -$greenShadows = 0.99 -$blueSadows = 1.0 -$redMid = 1.0 -$greenMid = 0.99 -$blueMid = 1.0 -$redHilight = 0.97 -$greenHilight =0.97 -$blueHilight = 0.97 +name = Neutral default exposure +$redShadows = 0.97 +$greenShadows = 0.97 +$blueSadows = 1.02 +$redMid = 0.95 +$greenMid = 0.96 +$blueMid = 1.02 +$redHilight = 0.98 +$greenHilight = 0.99 +$blueHilight = 1.01 -$contrastCurve = 0.4 -$hazeFactor = 0.25 -$bloom = 0.85 -$gamma = 1.1 -$exposure = 0.975 -$vibrance = 0.05 -$crushContrast = 0.00 -$bleach = 0.85 -$sharp_mix = 0.1 - -[Preset] -name = High Contrasty -$redShadows = 1.0 -$greenShadows = 1.0 -$blueSadows = 1.0 -$redMid = 0.99 -$greenMid = 0.99 -$blueMid = 0.99 -$redHilight = 1.0 -$greenHilight =1.0 -$blueHilight = 1.0 - -$contrastCurve = 0.4 -$hazeFactor = 0.25 -$bloom = 0.85 -$gamma = 1.12 -$exposure = 1.01 +$contrastCurve = 0.2 +$hazeFactor = 0.1 +$bloom = 1.0 +$gamma = 1.0 +$exposure = 0.99 $vibrance = 0.15 -$crushContrast = 0.00 +$crushContrast = 0.0 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.15 [Preset] -name = Colourful -$redShadows = 1.0 -$greenShadows = 1.0 -$blueSadows = 1.0 -$redMid = 0.99 -$greenMid = 0.98 -$blueMid = 0.99 -$redHilight = 1.0 -$greenHilight =0.99 -$blueHilight = 1.0 - -$contrastCurve = 0.333 -$hazeFactor = 0.25 -$bloom = 0.85 -$gamma = 1.1 -$exposure = 1.01 -$vibrance = 0.35 -$crushContrast = 0.00 -$bleach = 0.85 -$sharp_mix = 0.1 - -[Preset] -name = Neutral Contrasty -$redShadows = 1.01 -$greenShadows = 1.01 +name = Colorful +$redShadows = 0.96 +$greenShadows = 0.97 $blueSadows = 1.01 -$redMid = 1.0 -$greenMid = 1.0 -$blueMid = 1.0 -$redHilight = 0.99 -$greenHilight =0.99 -$blueHilight = 0.99 +$redMid = 0.94 +$greenMid = 0.96 +$blueMid = 1.01 +$redHilight = 0.97 +$greenHilight = 0.99 +$blueHilight = 1.01 $contrastCurve = 0.25 -$hazeFactor = 1.0 -$bloom = 0.85 -$gamma = 1.05 -$exposure = 1.0 -$vibrance = 0.0 -$crushContrast = 0.00 +$hazeFactor = 0.1 +$bloom = 1.0 +$gamma = 1.075 +$exposure = 1.01 +$vibrance = 0.5 +$crushContrast = 0.0 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.05 [Preset] name = Warm @@ -135,7 +91,7 @@ $exposure = 1.07 $vibrance = 0.15 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = Cold @@ -157,4 +113,48 @@ $exposure = 0.99 $vibrance = 0.45 $crushContrast = 0.0 $bleach = 0.85 -$sharp_mix = 0.1 \ No newline at end of file +$sharp_mix = 0.35 + +[Preset] +name = Neutral Contrasty +$redShadows = 0.97 +$greenShadows = 0.97 +$blueSadows = 0.99 +$redMid = 0.92 +$greenMid = 0.94 +$blueMid = 1.03 +$redHilight = 0.99 +$greenHilight =1.0 +$blueHilight = 1.0 + +$contrastCurve = 0.5 +$hazeFactor = 0.71 +$bloom = 0.85 +$gamma = 1.19 +$exposure = 1.09 +$vibrance = 0.35 +$crushContrast = 0.00 +$bleach = 0.85 +$sharp_mix = 0.3 + +[Preset] +name = Compensate exposure patch +$redShadows = 0.99 +$greenShadows = 0.99 +$blueSadows = 1.02 +$redMid = 0.95 +$greenMid = 0.97 +$blueMid = 1.04 +$redHilight = 0.99 +$greenHilight =1.0 +$blueHilight = 1.01 + +$contrastCurve = 0.25 +$hazeFactor = 0.71 +$bloom = 0.85 +$gamma = 1.35 +$exposure = 1.1 +$vibrance = 1.25 +$crushContrast = 0.00 +$bleach = 0.85 +$sharp_mix = 0.3 \ No newline at end of file diff --git a/Enhancements/WindWakerHD_Contrasty/rules.txt b/Enhancements/WindWakerHD_Contrasty/rules.txt index 3a37546f..4a4bd575 100644 --- a/Enhancements/WindWakerHD_Contrasty/rules.txt +++ b/Enhancements/WindWakerHD_Contrasty/rules.txt @@ -47,7 +47,7 @@ $exposure = 0.975 $vibrance = 0.05 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.3 [Preset] name = High Contrasty @@ -135,7 +135,7 @@ $exposure = 1.07 $vibrance = 0.15 $crushContrast = 0.00 $bleach = 0.85 -$sharp_mix = 0.1 +$sharp_mix = 0.25 [Preset] name = Cold @@ -157,4 +157,4 @@ $exposure = 0.99 $vibrance = 0.45 $crushContrast = 0.0 $bleach = 0.85 -$sharp_mix = 0.1 \ No newline at end of file +$sharp_mix = 0.35 \ No newline at end of file diff --git a/Source/TwilightPrincessHD/patches.txt b/Source/TwilightPrincessHD/patches.txt deleted file mode 100644 index 1a7a10be..00000000 --- a/Source/TwilightPrincessHD/patches.txt +++ /dev/null @@ -1,13 +0,0 @@ -[TPHDv81] -moduleMatches = 0x1A03E108 - -#rodata constants -0x1005AAD8 = .float $width/$height -_aspectAddr = 0x1006AAD8 - - -#code changes -0x028D75B8 = lis r11, _aspectAddr@h -0x028D75C0 = lfs f0, _aspectAddr@l(r11) ; Main 3d Aspect -0x029BB184 = lis r12, _aspectAddr@h -0x029BB188 = lfs f2, _aspectAddr@l(r12) ; may just be the intro zelda graphic diff --git a/Source/TwilightPrincessHD/rules.txt b/Source/TwilightPrincessHD/rules.txt index 95a408fa..cef9585e 100644 --- a/Source/TwilightPrincessHD/rules.txt +++ b/Source/TwilightPrincessHD/rules.txt @@ -75,28 +75,6 @@ $scaleShader = 1.0 $scaleBlur = 0.05 $internalRes = 1 -[Preset] -name = 2560x1080 (21:9 HD) -$width = 2560 -$height = 1080 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.1 -$scaleShader = 1.0 -$scaleBlur = 0.25 -$internalRes = 1 - -[Preset] -name = 5760x1080 (48:9 HD) -$width = 2560 -$height = 1080 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.1 -$scaleShader = 1.0 -$scaleBlur = 0.25 -$internalRes = 1 - [Preset] name = 2560x1440 $width = 2560 @@ -108,28 +86,6 @@ $scaleShader = 1.0 $scaleBlur = 0.25 $internalRes = 1 -[Preset] -name = 3440x1440 (21:9) -$width = 3440 -$height = 1440 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.1 -$scaleShader = 1.0 -$scaleBlur = 0.25 -$internalRes = 1 - -[Preset] -name = 7680x1440 (48:9) -$width = 7680 -$height = 1440 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.1 -$scaleShader = 1.0 -$scaleBlur = 0.25 -$internalRes = 1 - [Preset] name = 2732x1536 $width = 2732 @@ -153,7 +109,7 @@ $scaleBlur = 0.5 $internalRes = 1 [Preset] -name = 3840x2160 (4k - Native x2) +name = 3840x2160 $width = 3840 $height = 2160 $gameWidth = 1920 @@ -163,28 +119,6 @@ $scaleShader = 1.0 $scaleBlur = 0.5 $internalRes = 1 -[Preset] -name = 5120x2160 (4k 21:9) -$width = 5120 -$height = 2160 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.2 -$scaleShader = 1.0 -$scaleBlur = 0.5 -$internalRes = 1 - -[Preset] -name = 5120x2160 (4k 48:9) -$width = 11520 -$height = 2160 -$gameWidth = 1920 -$gameHeight = 1080 -$dither = 0.2 -$scaleShader = 1.0 -$scaleBlur = 0.5 -$internalRes = 1 - [Preset] name = 3840x2160 (4k - Native x2) x2 sub scaling $width = 3840