[Bayonetta 2] Update to version 6 packs

Enhancements/Bayonetta2_AnisotropicFiltering/rules.txt

@@ -1,36 +0,0 @@
-[Definition]
-titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = Anisotropic Filtering
-path = "Bayonetta 2/Enhancements/Anisotropic Filtering"
-description = Requires Cemu 1.21.3 or above|Enables x16 anisotropic filtering on ground, walls and environment textures.|Has a minimal performance impact.
-version = 6
-
-[TextureRedefine] # Large Environment Tiles
-width = 1024
-height = 1024
-formats = 0x031,0x033
-overwriteAnisotropy = 16
-
-[TextureRedefine] # Floor Tiles
-width = 512
-height = 512
-formats = 0x031,0x033
-overwriteAnisotropy = 16
-
-[TextureRedefine] # Floor Tiles
-width = 256
-height = 512
-formats = 0x033
-overwriteAnisotropy = 16
-
-[TextureRedefine] # Environment Tiles
-width = 512
-height = 256
-formats = 0x033
-overwriteAnisotropy = 16
-
-[TextureRedefine] # Environment Tiles
-width = 256
-height = 256
-formats = 0x033
-overwriteAnisotropy = 16

Enhancements/Bayonetta2_Shadows/rules.txt

@@ -1,33 +0,0 @@
-[Definition]
-titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = Shadow Resolution
-path = "Bayonetta 2/Graphics/Shadow Resolution"
-description = Note: Increasing shadow resolution is known to increase VRAM usage directly. Lowering this might give you a good boost in performance if you're limited on VRAM but makes shadows blockier. Medium is the original resolution. Made by Slashiee.
-version = 4
-
-[Preset]
-name = Medium (100%, Default)
-$shadowRes = 1
-
-[Preset]
-name = Low (50%)
-$shadowRes = 0.5
-
-[Preset]
-name = High (200%)
-$shadowRes = 2
-
-[Preset]
-name = Ultra (300%)
-$shadowRes = 3
-
-[Preset]
-name = Extreme (400%, Unstable)
-$shadowRes = 4
-
-[TextureRedefine] # Shadows and Dynamic Shadows
-width = 1024
-height = 2048
-formats = 0x5,0x11
-overwriteWidth = $shadowRes * 1024
-overwriteHeight = $shadowRes * 2048

Mods/Bayonetta2_60FPS_Cutscenes/rules.txt

@@ -1,14 +0,0 @@
-[Definition]
-titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = 60 FPS Cutscenes
-path = "Bayonetta 2/Mods/60 FPS Cutscenes"
-description = Changes the framerate of the cutscenes to 60 FPS. 30 FPS is the Wii U's default cutscene framerate.
-version = 4
-
-[Preset]
-name = 60 FPS (Default)
-$enable60:int = 1
-
-[Preset]
-name = 30 FPS
-$enable60:int = 0

Mods/Bayonetta2_DisableVsync/rules.txt

@@ -1,6 +0,0 @@
-[Definition]
-titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = No Vsync 
-path = "Bayonetta 2/Mods/No Vsync"
-description = Disables Vsync, cutscene timing
-version = 4

Mods/Bayonetta2_HighLOD/rules.txt

@@ -1,6 +0,0 @@
-[Definition]
-titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = Force max LOD 
-path = "Bayonetta 2/Mods/Force max object LOD"
-description = LOD - Forces high poly detail level in gameplay
-version = 4

src/Bayonetta2/Enhancements/Contrasty/rules.txt

@@ -2,11 +2,10 @@
 titleIds = 0005000010172600,0005000010172700,000500001011B900
 name = Contrasty
 path = "Bayonetta 2/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. Made by getdls.
-version = 4
+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.|Made by getdls.
+version = 6
 
-[Preset]
-name = Default
+[Default]
 $redShadows = 1.0
 $greenShadows = 1.0
 $blueSadows = 1.0
@@ -14,9 +13,8 @@ $redMid = 1.0
 $greenMid = 1.0
 $blueMid = 1.0
 $redHilight = 1.0
-$greenHilight =1.0
+$greenHilight = 1.0
 $blueHilight = 1.0
-
 $contrastCurve = 0.0
 $hazeFactor = 1.0
 $bloom = 1.0
@@ -27,6 +25,11 @@ $crushContrast = 0.0
 $bleach = 1.0
 $sharp_mix = 0.0
 
+
+[Preset]
+name = Default
+default = 1
+
 [Preset]
 name = High Contrasty
 $redShadows = 1.0
@@ -36,9 +39,8 @@ $redMid = 0.98
 $greenMid = 0.98
 $blueMid = 0.9
 $redHilight = 1.0
-$greenHilight =1.0
+$greenHilight = 1.0
 $blueHilight = 1.0
-
 $contrastCurve = 0.6
 $hazeFactor = 0.25
 $bloom = 0.85
@@ -60,7 +62,6 @@ $blueMid = 0.99
 $redHilight = 1.0
 $greenHilight =0.99
 $blueHilight = 0.99
-
 $contrastCurve = 0.15
 $hazeFactor = 1.0
 $bloom = 0.85
@@ -80,9 +81,8 @@ $redMid = 1.0
 $greenMid = 1.0
 $blueMid = 1.0
 $redHilight = 0.99
-$greenHilight =0.99
+$greenHilight = 0.99
 $blueHilight = 0.99
-
 $contrastCurve = 0.30
 $hazeFactor = 1.0
 $bloom = 0.85

src/Bayonetta2/Graphics/patch_aspectRatio.asm

@@ -23,6 +23,5 @@ lfs f1, _heightScaleRatio@l(r7)
 fdivs f10, f13, f1
 blr
 
-
 0x032F2E6C = bla _calculateARForRendering
 0x032F2044 = bla _calculateARForCulling

src/Bayonetta2/Graphics/rules.txt

@@ -1,142 +1,171 @@
 [Definition]
 titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = Resolution
-path = "Bayonetta 2/Graphics/Resolution"
-description = Changes the resolution of the game. Made by Slashiee and getdls.
-version = 4
+name = Graphic Options
+path = "Bayonetta 2/Graphics"
+description = Allows you to change the game's resolution, shadow quality, and anisotropic filtering quality.|Made by Slashiee and getdls.
+version = 6
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
 $gameWidth = 1280
 $gameHeight = 720
+$shadowQuality = 1
+$anisotropy = 1
 
-# Performance
+# Resolutions
+
+[Preset]
+name = 320x180
+category = Resolution
+$width = 320
+$height = 180
 
 [Preset]
 name = 640x360
+category = Resolution
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
+
+[Preset]
+name = 854x480
+category = Resolution
+$width = 854
+$height = 480
 
 [Preset]
 name = 960x540
+category = Resolution
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
 
-# Common HD Resolutions
+[Preset]
+name = 1280x720
+category = Resolution
+default = 1
 
 [Preset]
 name = 1600x900
+category = Resolution
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 1920x1080
+category = Resolution
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 2560x1440
+category = Resolution
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3200x1800
+category = Resolution
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3840x2160
+category = Resolution
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 5120x2880
+category = Resolution
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 7680x4320
+category = Resolution
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
-name = -- 21:9 -- resolutions 
+name = 2560x1080 (21:9)
+category = Resolution
 $width = 2560
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-
-[Preset]
-name = 2560x720 (21:9)
-$width = 2560
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
+$height = 1080
 
 [Preset]
 name = 3440x1440 (21:9)
+category = Resolution
 $width = 3440
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 5120x2160 (21:9)
+category = Resolution
 $width = 5120
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
-[Preset] # Should work fine on a 1070 and fixes most of horizontal shimmering
-name = --- SSAA res Tweaks - Set scaling to Stretch
-$width = 1920
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
+# Shadow Quality
 
 [Preset]
-name = 1920x1080 (Vertical 200%, 2160)
-$width = 1920
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
+name = Low
+category = Shadow Quality
+$shadowQuality = 0.5
 
 [Preset]
-name = 2560x1440 (Vertical 200%, 1440)
-$width = 2560
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
+name = Medium
+category = Shadow Quality
+default = 1
 
 [Preset]
-name = 3840x2160 (Vertical 200%, 4320)
-$width = 3840
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
+name = High
+category = Shadow Quality
+$shadowQuality = 2
 
-#Colour depth 
+[Preset]
+name = Ultra
+category = Shadow Quality
+$shadowQuality = 3
+
+[Preset]
+name = Extreme
+category = Shadow Quality
+$shadowQuality = 4
+
+# Anisotropic Filtering Quality
+
+[Preset]
+name = 1x
+category = Anisotropic Filtering Quality
+default = 1
+
+[Preset]
+name = 2x
+category = Anisotropic Filtering Quality
+$anisotropy = 2
+
+[Preset]
+name = 4x
+category = Anisotropic Filtering Quality
+$anisotropy = 4
+
+[Preset]
+name = 8x
+category = Anisotropic Filtering Quality
+$anisotropy = 8
+
+[Preset]
+name = 16x
+category = Anisotropic Filtering Quality
+$anisotropy = 16
+
+# Anisotropic Filtering
+
+[TextureRedefine]
+tileModesExcluded = 0x001 # ignore cpu processed textures
+formatsExcluded = 0x001,0x019,0x01a,0x01f,0x122,0x806,0x80e,0x816,0x81e,0x820,0x823 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
+
+# Color Depth 
 
 [TextureRedefine]
 width = 1280
@@ -174,7 +203,9 @@ height = 176
 formats = 0x01a
 overwriteFormat = 0x01f
 
-[TextureRedefine] # Game Resolution
+# Texture Scaling
+
+[TextureRedefine]
 width = 1280
 height = 720
 tileModesExcluded = 0x001
@@ -260,16 +291,25 @@ height = 32
 overwriteWidth = ($width / $gameWidth) * 48
 overwriteHeight = ($height / $gameHeight) * 32
 
-#[TextureRedefine] # particles
-#width = 8
-#height = 8
-#formats = 0x01a
-#overwriteWidth = ($width / $gameWidth) * 8
-#overwriteHeight = ($height / $gameHeight) * 8
-#
-#[TextureRedefine] # grading?
-#width = 4
-#height = 4
-#formats = 0x80e
-#overwriteWidth = ($width / $gameWidth) * 4
-#overwriteHeight = ($height / $gameHeight) * 4
+# Shadows and Dynamic Shadows
+
+[TextureRedefine]
+width = 1024
+height = 2048
+formats = 0x5,0x11
+overwriteWidth = $shadowQuality * 1024
+overwriteHeight = $shadowQuality * 2048
+
+# [TextureRedefine] # particles (check its depth and tilemode)
+# width = 8
+# height = 8
+# formats = 0x01a
+# overwriteWidth = ($width / $gameWidth) * 8
+# overwriteHeight = ($height / $gameHeight) * 8
+
+# [TextureRedefine] # grading? (check its depth and tilemode)
+# width = 4
+# height = 4
+# formats = 0x80e
+# overwriteWidth = ($width / $gameWidth) * 4
+# overwriteHeight = ($height / $gameHeight) * 4

src/Bayonetta2/Mods/60FPSCutscenes/patch_60FPSCutscene.asm

@@ -3,7 +3,7 @@ moduleMatches = 0xAF5D1A85
 .origin = codecave
 	
 _enable60:
-.int $enable60
+.int 1
 
 _cave60:
 lis r9, _enable60@ha
@@ -17,4 +17,3 @@ xori r0,r10,2
 blr
 
 0x03351098 = bla _cave60
-#0x034461C4 = nop #Kill Vsync

src/Bayonetta2/Mods/60FPSCutscenes/rules.txt

@@ -0,0 +1,6 @@
+[Definition]
+titleIds = 0005000010172600,0005000010172700,000500001011B900
+name = 60 FPS Cutscenes
+path = "Bayonetta 2/Mods/60 FPS Cutscenes"
+description = This patches cutscenes to run at 60FPS. Getting under 60FPS will slow down playback of the cutscene.|Made by getdls.
+version = 6

src/Bayonetta2/Mods/DisableVsync/patch_vsync.asm

@@ -1,4 +1,5 @@
-[Bayo2USv0]#No patches released
+[Bayo2USv0]
 moduleMatches = 0xAF5D1A85
 .origin = codecave
+
 0x034461C4 = nop #Kill Vsync

src/Bayonetta2/Mods/DisableVsync/rules.txt

@@ -0,0 +1,6 @@
+[Definition]
+titleIds = 0005000010172600,0005000010172700,000500001011B900
+name = Disable Vsync 
+path = "Bayonetta 2/Mods/Disable Vsync"
+description = Disables the game's Vsync. This affects cutscene timing.|Made by getdls.
+version = 6

src/Bayonetta2/Mods/HighLOD/patch_gameplayTweaks.asm

@@ -2,6 +2,6 @@
 moduleMatches = 0xAF5D1A85
 .origin = codecave
 
-#Value is scalable in v5  - 100 default, 200 twice the high LOD culling distance 
+#Value is scalable in v5  - 100 default, 200 twice the high LOD culling distance (need to do!)
 0x100AA3A8 = .float 200.0 	
 #0x1014F804 = .float 3.0

src/Bayonetta2/Mods/HighLOD/rules.txt

@@ -0,0 +1,6 @@
+[Definition]
+titleIds = 0005000010172600,0005000010172700,000500001011B900
+name = Force Max LOD
+path = "Bayonetta 2/Mods/Force Maximum LOD"
+description = Forces high level of detail for models during gameplay.|Made by getdls.
+version = 6

src/Bayonetta2/Workarounds/DynamicShadows/patch_DynamicShadows.asm

@@ -1,4 +1,4 @@
-[Bayonetta2_DynamicShadows_V0]
+[Bayonetta2_DynamicShadows_v0]
 moduleMatches = 0xAF5D1A85
 
 0x02ccbd18 = fmr f12, f31 ; Always return a large value for the approximated maximum depth of the depth buffer. This value is used to calculate the projection size of the shadow map.

src/Bayonetta2/Workarounds/DynamicShadows/rules.txt

@@ -2,5 +2,5 @@
 titleIds = 0005000010172600,0005000010172700,000500001011B900
 name = Dynamic Shadows Workaround
 path = "Bayonetta 2/Workarounds/Dynamic Shadows"
-description = Workaround for the dynamic shadows to prevent them from rendering partially or not at all.||Made by Exzap.
+description = Workaround for the dynamic shadows to prevent them from rendering partially or not at all.|Made by Exzap.
 version = 6

src/Bayonetta2/Workarounds/Portal/rules.txt

@@ -1,8 +1,8 @@
 [Definition]
 titleIds = 0005000010172600,0005000010172700,000500001011B900
-name = Hides weird blue texture by blue portals.
+name = Portal Workaround
 path = "Bayonetta 2/Workarounds/Portal"
-description = Hides a weird blue layer by the blue portals that's also not visible on the original console. Made by Crementif.
-version = 4
+description = Hides a weird blue layer by the blue portals that's not visible on the original console.|Made by Crementif.
+version = 6
 
 # For a visual comparison, see this album: https://imgur.com/a/4e3HMS2