From 51e2fcd00e71134c2cb73108a4d8491f5705bc8d Mon Sep 17 00:00:00 2001
From: M&M <goldtextwitch@outlook.com>
Date: Wed, 2 Jun 2021 07:52:42 -0700
Subject: [PATCH] [Fast Racing NEO] update to v5 packs

---
 .../Graphics}/patch_AspectRatio.asm           |   0
 .../FastRacingNeo/Graphics}/rules.txt         | 330 +++++++++++++-----
 .../Mods/StaticFPS}/patch_staticFPS.asm       |   0
 .../FastRacingNeo/Mods/StaticFPS}/rules.txt   |  97 ++---
 4 files changed, 307 insertions(+), 120 deletions(-)
 rename {Resolutions/FASTRacingNEO_Resolution => src/FastRacingNeo/Graphics}/patch_AspectRatio.asm (100%)
 rename {Resolutions/FASTRacingNEO_Resolution => src/FastRacingNeo/Graphics}/rules.txt (60%)
 rename {Mods/FastRacingNeo_StaticFPS => src/FastRacingNeo/Mods/StaticFPS}/patch_staticFPS.asm (100%)
 rename {Mods/FastRacingNeo_StaticFPS => src/FastRacingNeo/Mods/StaticFPS}/rules.txt (57%)

diff --git a/Resolutions/FASTRacingNEO_Resolution/patch_AspectRatio.asm b/src/FastRacingNeo/Graphics/patch_AspectRatio.asm
similarity index 100%
rename from Resolutions/FASTRacingNEO_Resolution/patch_AspectRatio.asm
rename to src/FastRacingNeo/Graphics/patch_AspectRatio.asm
diff --git a/Resolutions/FASTRacingNEO_Resolution/rules.txt b/src/FastRacingNeo/Graphics/rules.txt
similarity index 60%
rename from Resolutions/FASTRacingNEO_Resolution/rules.txt
rename to src/FastRacingNeo/Graphics/rules.txt
index 3a1b7171..51604642 100644
--- a/Resolutions/FASTRacingNEO_Resolution/rules.txt
+++ b/src/FastRacingNeo/Graphics/rules.txt
@@ -1,174 +1,336 @@
 [Definition]
 titleIds = 000500001012f000,00050000101d6000,00050000101e4100,00050000101FED00
 name = Resolution
-path = "FAST Racing NEO/Graphics/Resolution"
-description = Changes the resolution of the game. Made by M&&M and getdls.
-version = 4
+path = "FAST Racing NEO/Graphics"
+description = Changes the resolution of the game.||Made by M&&M and getdls.
+version = 5
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
+$padWidth = 854
+$padHeight = 480
 $gameWidth = 1280
 $gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+$anisotropy = 1
 
-# Performance
+
+# TV Resolution
 
 [Preset]
+category = TV Resolution
 name = 320x180
 $width = 320
 $height = 180
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 640x360
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
+name = 854x480
+$width = 854
+$height = 480
+
+[Preset]
+category = TV Resolution
 name = 960x540
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common HD Resolutions
 
 [Preset]
+category = TV Resolution
+name = 1280x720
+default = 1
+
+[Preset]
+category = TV Resolution
 name = 1600x900
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 1920x1080
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 2560x1440
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 3200x1800
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 3840x2160
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 5120x2880
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 7680x4320
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common Ultrawide Resolutions
 
 [Preset]
-name = 2560x1080 ("21:9")
-$width = 2560
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3440x1440 ("21:9")
-$width = 3440
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common 16:10 Resolutions
+category = TV Resolution
+name = 1680x1050 (16:10)
+$width = 1680
+$height = 1050
 
 [Preset]
+category = TV Resolution
 name = 1680x1080 (16:10)
 $width = 1680
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
+name = 1920x1200 (16:10)
+$width = 1920
+$height = 1200
+
+[Preset]
+category = TV Resolution
 name = 1920x1224 (16:10)
 $width = 1920
 $height = 1224
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1656 (16:10)
-$width = 2560
-$height = 1656
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 2880x1800 (16:10)
 $width = 2880
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-
-# Common HD Resolutions (2 Monitors)
 
 [Preset]
+category = TV Resolution
+name = 2560x1656 (16:10)
+$width = 2560
+$height = 1656
+
+[Preset]
+category = TV Resolution
+name = 2560x1080 (21:9)
+$width = 2560
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 3440x1440 (21:9)
+$width = 3440
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 5120x2160 (21:9)
+$width = 5120
+$height = 2160
+
+[Preset]
+category = TV Resolution
 name = 3840x1080 (32:9)
 $width = 3840
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = TV Resolution
 name = 5120x1440 (32:9)
 $width = 5120
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
+
+
+# Gamepad Resolution
 
 [Preset]
-name = 6400x1800 (32:9)
-$width = 6400
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
+category = Gamepad Resolution
+name = 320x180
+$padWidth = 320
+$padHeight = 180
 
 [Preset]
-name = 7680x2160 (32:9)
-$width = 7680
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
 
 [Preset]
-name = 10240x2880 (32:9)
-$width = 10240
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
+category = Gamepad Resolution
+name = 854x480
+default = 1
+
+[Preset]
+category = Gamepad Resolution
+name = 960x540
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+category = Gamepad Resolution
+name = 1280x720
+$padWidth = 1280
+$padHeight = 720
+
+[Preset]
+category = Gamepad Resolution
+name = 1600x900
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1080
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1440
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 3200x1800
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x2160
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2880
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+category = Gamepad Resolution
+name = 7680x4320
+$padWidth = 7680
+$padHeight = 4320
+
+[Preset]
+category = Gamepad Resolution
+name = 1680x1050 (16:10)
+$padWidth = 1680
+$padHeight = 1050
+
+[Preset]
+category = Gamepad Resolution
+name = 1680x1080 (16:10)
+$padWidth = 1680
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1200 (16:10)
+$padWidth = 1920
+$padHeight = 1200
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1224 (16:10)
+$padWidth = 1920
+$padHeight = 1224
+
+[Preset]
+category = Gamepad Resolution
+name = 2880x1800 (16:10)
+$padWidth = 2880
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1656 (16:10)
+$padWidth = 2560
+$padHeight = 1656
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1080 (21:9)
+$padWidth = 2560
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 3440x1440 (21:9)
+$padWidth = 3440
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2160 (21:9)
+$padWidth = 5120
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x1080 (32:9)
+$padWidth = 3840
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 5120×1440 (32:9)
+$padWidth = 5120
+$padHeight = 1440
+
+# 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 = 0x1 # ignore cpu processed textures
+formatsExcluded = 0x1,0x11,0x19,0x1a,0x1f,0x21f,0x122,0x806,0x80e,0x810,0x816,0x81e,0x820,0x823 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
 
 [TextureRedefine] # Game Resolution
 width = 1280
@@ -204,11 +366,17 @@ formats = 0x1
 overwriteWidth = ($width / $gameWidth) * 1024
 overwriteHeight = ($height / $gameHeight) * 512
 
+[TextureRedefine] # Gamepad Resolution
+width = 864
+height = 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 864
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
+
 [TextureRedefine] # Gamepad Resolution
 width = 854
 height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 854
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
 
 [TextureRedefine] # 0.5.x main
 width = 640
diff --git a/Mods/FastRacingNeo_StaticFPS/patch_staticFPS.asm b/src/FastRacingNeo/Mods/StaticFPS/patch_staticFPS.asm
similarity index 100%
rename from Mods/FastRacingNeo_StaticFPS/patch_staticFPS.asm
rename to src/FastRacingNeo/Mods/StaticFPS/patch_staticFPS.asm
diff --git a/Mods/FastRacingNeo_StaticFPS/rules.txt b/src/FastRacingNeo/Mods/StaticFPS/rules.txt
similarity index 57%
rename from Mods/FastRacingNeo_StaticFPS/rules.txt
rename to src/FastRacingNeo/Mods/StaticFPS/rules.txt
index 3a9bc854..87c0c240 100644
--- a/Mods/FastRacingNeo_StaticFPS/rules.txt
+++ b/src/FastRacingNeo/Mods/StaticFPS/rules.txt
@@ -3,55 +3,74 @@ titleIds = 000500001012F000,00050000101D6000,00050000101E4100,00050000101FED00
 name = Static FPS
 path = "FAST Racing NEO/Mods/Static FPS"
 description = Changes the framerate the game runs at. If you are below the chosen framerate you'll notice some slowdown. Only works with the latest game update!
-version = 4
+version = 5
 
-[Preset]
-name = Static 60FPS (Default)
+[Default]
 $targetFPS:int = 60
 
+
+# FPS Limit
+
 [Preset]
-name = Static 30FPS
+name = 20 FPS
+category = FPS Limit
+$targetFPS:int = 20
+
+[Preset]
+name = 30 FPS
+category = FPS Limit
 $targetFPS:int = 30
 
 [Preset]
-name= Static 244FPS
-$targetFPS:int = 244
-
-[Preset]
-name= Static 165FPS
-$targetFPS:int = 165
-
-[Preset]
-name = Static 144FPS
-$targetFPS:int = 144
-
-[Preset]
-name = Static 120FPS
-$targetFPS:int = 120
-
-[Preset]
-name = Static 100FPS
-$targetFPS:int = 100
-
-[Preset]
-name = Static 85FPS
-$targetFPS:int = 85
-
-[Preset]
-name = Static 75FPS
-$targetFPS:int = 75
-
-[Preset]
-name = Static 72FPS
-$targetFPS:int = 72
-
-[Preset]
-name = Static 40FPS
+name = 40 FPS
+category = FPS Limit
 $targetFPS:int = 40
 
 [Preset]
-name = 20FPS
-$targetFPS:int = 20
+name = 60 FPS
+category = FPS Limit
+default = 1
+
+[Preset]
+name = 72 FPS
+category = FPS Limit
+$targetFPS:int = 72
+
+[Preset]
+name = 75 FPS
+category = FPS Limit
+$targetFPS:int = 75
+
+[Preset]
+name = 85 FPS
+category = FPS Limit
+$targetFPS:int = 85
+
+[Preset]
+name = 100 FPS
+category = FPS Limit
+$targetFPS:int = 100
+
+[Preset]
+name = 120 FPS
+category = FPS Limit
+$targetFPS:int = 120
+
+[Preset]
+name = 144 FPS
+category = FPS Limit
+$targetFPS:int = 144
+
+[Preset]
+name= 165 FPS
+category = FPS Limit
+$targetFPS:int = 165
+
+[Preset]
+name= 244 FPS
+category = FPS Limit
+$targetFPS:int = 244
+
 
 [Control]
 vsyncFrequency = $targetFPS
\ No newline at end of file