From 852e4800bcd20cabebd97c48a483d180fd2f2b63 Mon Sep 17 00:00:00 2001
From: Crementif <26669564+Crementif@users.noreply.github.com>
Date: Sun, 31 Jan 2021 15:17:10 +0100
Subject: [PATCH] [Child Of Light] Fix inventory screen using new Cemu 1.22.5d
 features

Fixes https://github.com/ActualMandM/cemu_graphic_packs/issues/501

Basically, the game uses the 512x512 for both inventory items and for the main character's rendering. So I told Exzap who added this inMEM1 variable which is perfect for cases like these. Anyway, this is basically just the implementation of that.
---
 src/BreathOfTheWild/Graphics/rules.txt        | 22 +++---
 .../ChildOfLight/Graphics}/rules.txt          | 77 +++++++++----------
 2 files changed, 46 insertions(+), 53 deletions(-)
 rename {Resolutions/ChildOfLight_Resolution => src/ChildOfLight/Graphics}/rules.txt (67%)

diff --git a/src/BreathOfTheWild/Graphics/rules.txt b/src/BreathOfTheWild/Graphics/rules.txt
index c7f8ab7b..0d4c4118 100644
--- a/src/BreathOfTheWild/Graphics/rules.txt
+++ b/src/BreathOfTheWild/Graphics/rules.txt
@@ -884,7 +884,7 @@ overwriteHeight = ($height/$gameHeight) * 256
 width = 256
 height = 128
 depth = 1
-formats = 0x1
+formats = 0x001
 tilemodes = 4
 overwriteWidth = ($width/$gameWidth) * 256
 overwriteHeight = ($height/$gameHeight) * 128
@@ -894,7 +894,7 @@ overwriteHeight = ($height/$gameHeight) * 128
 # width = 128
 # height = 64
 # depth = 1
-# formats = 0x1
+# formats = 0x001
 # tilemodes = 4
 # overwriteWidth = ($width/$gameWidth) * 128
 # overwriteHeight = ($height/$gameHeight) * 64
@@ -903,7 +903,7 @@ overwriteHeight = ($height/$gameHeight) * 128
 width = 293
 height = 185
 depth = 1
-formats = 0x1a
+formats = 0x01a
 tilemodes = 4
 overwriteWidth = ($width/$gameWidth) * 293
 overwriteHeight = ($height/$gameHeight) * 185
@@ -942,7 +942,7 @@ overwriteHeight = ($height/$gameHeight) * 96
 width = 500
 height = 94
 depth = 1
-formats = 0x1a
+formats = 0x01a
 tilemodes = 4
 overwriteWidth = ($width/$gameWidth) * 500
 overwriteHeight = ($height/$gameHeight) * 94
@@ -953,7 +953,7 @@ overwriteHeight = ($height/$gameHeight) * 94
 width = 480
 height = 32
 depth = 1
-formats = 0x1a
+formats = 0x01a
 tilemodes = 4
 overwriteWidth = ($width/$gameWidth) * 480
 overwriteHeight = ($height/$gameHeight) * 32
@@ -962,7 +962,7 @@ overwriteHeight = ($height/$gameHeight) * 32
 width = 464
 height = 28
 depth = 1
-formats = 0x1a
+formats = 0x01a
 tilemodes = 4
 overwriteWidth = ($width/$gameWidth) * 464
 overwriteHeight = ($height/$gameHeight) * 28
@@ -972,34 +972,34 @@ overwriteHeight = ($height/$gameHeight) * 28
 [TextureRedefine]
 width = 768
 height = 720
-formats = 0x5
+formats = 0x005
 overwriteWidth = $shadowRes * 768
 overwriteHeight = $shadowRes * 720
 
 [TextureRedefine]
 width = 720
 height = 720
-formats = 0x5
+formats = 0x005
 overwriteWidth = $shadowRes * 720
 overwriteHeight = $shadowRes * 720
 
 [TextureRedefine]
 width = 384
 height = 368
-formats = 0x5
+formats = 0x005
 overwriteWidth = $shadowRes * 384
 overwriteHeight = $shadowRes * 368
 
 [TextureRedefine]
 width = 384
 height = 360
-formats = 0x5
+formats = 0x005
 overwriteWidth = $shadowRes * 384
 overwriteHeight = $shadowRes * 360
 
 [TextureRedefine]
 width = 360
 height = 360
-formats = 0x5
+formats = 0x005
 overwriteWidth = $shadowRes * 360
 overwriteHeight = $shadowRes * 360
diff --git a/Resolutions/ChildOfLight_Resolution/rules.txt b/src/ChildOfLight/Graphics/rules.txt
similarity index 67%
rename from Resolutions/ChildOfLight_Resolution/rules.txt
rename to src/ChildOfLight/Graphics/rules.txt
index 588461c8..fc302ff5 100644
--- a/Resolutions/ChildOfLight_Resolution/rules.txt
+++ b/src/ChildOfLight/Graphics/rules.txt
@@ -1,96 +1,86 @@
 [Definition]
-titleIds = 000500001015B200,000500001016D800,000500001016EA00
-name = Resolution
-path = "Child of Light/Graphics/Resolution"
-description = Changes the resolution of the game. Made by Crementif and ICUP321.
-version = 4
+titleIds = 000500001015B200,000500001016EA00,000500001016D800
+name = Game Resolution
+path = "Child of Light/Graphics"
+description = Changes the resolution of the game.||Made by Crementif and ICUP321.
+version = 7
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
 $gameWidth = 1280
 $gameHeight = 720
 
-// Performance
+
+# Resolution
 
 [Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
+category = Resolution
+name = 1280x720 (Default)
 
 [Preset]
+category = Resolution
 name = 640x360
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 960x540
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-// Common HD Resolutions
 
 [Preset]
+category = Resolution
 name = 1600x900
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 1920x1080
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 2560x1440
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 3200x1800
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 3840x2160
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 5120x2880
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 7680x4320
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
+
+
+
+# Texture Redefines
 
 [TextureRedefine] # TV Resolution
 width = 1280
 height = 720
 formats = 0x011,0x01a,0x001
-tileModesExcluded = 0x001
+tileModesExcluded = 0x1
 overwriteWidth = ($width/$gameWidth) * 1280
 overwriteHeight = ($height/$gameHeight) * 720
 
@@ -105,23 +95,19 @@ overwriteHeight = ($height/$gameHeight) * 1024
 width = 512
 height = 512
 formats = 0x01a
+inMEM1 = 1
 overwriteWidth = ($width/$gameWidth) * 512
 overwriteHeight = ($height/$gameHeight) * 512
 
-[TextureRedefine]
+[TextureRedefine] # Half-res
 width = 640
 height = 360
 formats = 0x001
-tileModesExcluded = 0x001
+tileModesExcluded = 0x1
 overwriteWidth = ($width/$gameWidth) * 640
 overwriteHeight = ($height/$gameHeight) * 360
 
-[TextureRedefine] # Screen gradient
-width = 448
-height = 240
-formats = 0x01a
-overwriteWidth = ($width/$gameWidth) * 448
-overwriteHeight = ($height/$gameHeight) * 240
+# Screen gradient
 
 [TextureRedefine]
 width = 426
@@ -129,3 +115,10 @@ height = 240
 formats = 0x01a
 overwriteWidth = ($width/$gameWidth) * 426
 overwriteHeight = ($height/$gameHeight) * 240
+
+[TextureRedefine]
+width = 448
+height = 240
+formats = 0x01a
+overwriteWidth = ($width/$gameWidth) * 448
+overwriteHeight = ($height/$gameHeight) * 240