From 6f5802a396840db70bdc84532da3a9fd59f1808a Mon Sep 17 00:00:00 2001
From: Michael <goldtextwitch@outlook.com>
Date: Mon, 9 Jan 2017 20:44:21 -0800
Subject: [PATCH] Combine CTTT with SM3D

they pretty much use the same engine, so
---
 CaptainToadTreasureTracker_1080p/rules.txt | 16 ----------------
 CaptainToadTreasureTracker_1440p/rules.txt | 16 ----------------
 CaptainToadTreasureTracker_2160p/rules.txt | 16 ----------------
 SuperMario3DWorld_1080p/rules.txt          |  5 +++--
 SuperMario3DWorld_1440p/rules.txt          |  5 +++--
 SuperMario3DWorld_2160p/rules.txt          |  5 +++--
 6 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 CaptainToadTreasureTracker_1080p/rules.txt
 delete mode 100644 CaptainToadTreasureTracker_1440p/rules.txt
 delete mode 100644 CaptainToadTreasureTracker_2160p/rules.txt

diff --git a/CaptainToadTreasureTracker_1080p/rules.txt b/CaptainToadTreasureTracker_1080p/rules.txt
deleted file mode 100644
index dd8e5e77..00000000
--- a/CaptainToadTreasureTracker_1080p/rules.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-[Definition]
-titleIds = 0005000010180600,0005000010180700,0005000010180500
-name = "Captain Toad: Treasure Tracker - 1080p"
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x034 # exclude the intro background texture
-overwriteWidth = 1920
-overwriteHeight = 1080
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 1920
-overwriteHeight = 1080
\ No newline at end of file
diff --git a/CaptainToadTreasureTracker_1440p/rules.txt b/CaptainToadTreasureTracker_1440p/rules.txt
deleted file mode 100644
index d90ba79b..00000000
--- a/CaptainToadTreasureTracker_1440p/rules.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-[Definition]
-titleIds = 0005000010180600,0005000010180700,0005000010180500
-name = "Captain Toad: Treasure Tracker - 1440p (2K)"
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x034 # exclude the intro background texture
-overwriteWidth = 2560
-overwriteHeight = 1440
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 2560
-overwriteHeight = 1440
\ No newline at end of file
diff --git a/CaptainToadTreasureTracker_2160p/rules.txt b/CaptainToadTreasureTracker_2160p/rules.txt
deleted file mode 100644
index a8c701e8..00000000
--- a/CaptainToadTreasureTracker_2160p/rules.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-[Definition]
-titleIds = 0005000010180600,0005000010180700,0005000010180500
-name = "Captain Toad: Treasure Tracker - 2160p (4K)"
-
-[TextureRedefine] # tv
-width = 1280
-height = 720
-formatsExcluded = 0x41A,0x034 # exclude the intro background texture
-overwriteWidth = 3840
-overwriteHeight = 2160
-
-[TextureRedefine] # gamepad
-width = 854
-height = 480
-overwriteWidth = 3840
-overwriteHeight = 2160
\ No newline at end of file
diff --git a/SuperMario3DWorld_1080p/rules.txt b/SuperMario3DWorld_1080p/rules.txt
index e12c1e8f..b5a7e587 100644
--- a/SuperMario3DWorld_1080p/rules.txt
+++ b/SuperMario3DWorld_1080p/rules.txt
@@ -1,10 +1,11 @@
 [Definition]
-titleIds = 0005000010145d00,0005000010145c00,0005000010106100
-name = "Super Mario 3D World - 1080p"
+titleIds = 0005000010145d00,0005000010145c00,0005000010106100,0005000010180600,0005000010180700,0005000010180500
+name = "Super Mario 3D World + Captain Toad: Treasure Tracker - 1080p"
 
 [TextureRedefine] # tv
 width = 1280
 height = 720
+formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 1920
 overwriteHeight = 1080
 
diff --git a/SuperMario3DWorld_1440p/rules.txt b/SuperMario3DWorld_1440p/rules.txt
index b7bd23ba..2ea9a74f 100644
--- a/SuperMario3DWorld_1440p/rules.txt
+++ b/SuperMario3DWorld_1440p/rules.txt
@@ -1,10 +1,11 @@
 [Definition]
-titleIds = 0005000010145d00,0005000010145c00,0005000010106100
-name = "Super Mario 3D World - 1440p (2K)"
+titleIds = 0005000010145d00,0005000010145c00,0005000010106100,0005000010180600,0005000010180700,0005000010180500
+name = "Super Mario 3D World + Captain Toad: Treasure Tracker - 1440p (2K)"
 
 [TextureRedefine] # tv
 width = 1280
 height = 720
+formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 2560
 overwriteHeight = 1440
 
diff --git a/SuperMario3DWorld_2160p/rules.txt b/SuperMario3DWorld_2160p/rules.txt
index 5e54a8a8..1383e1de 100644
--- a/SuperMario3DWorld_2160p/rules.txt
+++ b/SuperMario3DWorld_2160p/rules.txt
@@ -1,10 +1,11 @@
 [Definition]
-titleIds = 0005000010145d00,0005000010145c00,0005000010106100
-name = "Super Mario 3D World - 2160p (4K)"
+titleIds = 0005000010145d00,0005000010145c00,0005000010106100,0005000010180600,0005000010180700,0005000010180500
+name = "Super Mario 3D World + Captain Toad: Treasure Tracker - 2160p (4K)"
 
 [TextureRedefine] # tv
 width = 1280
 height = 720
+formatsExcluded = 0x41A,0x034 # exclude the intro background texture
 overwriteWidth = 3840
 overwriteHeight = 2160