From d2682d0a71c4c28561064c1b265d97823ee78a04 Mon Sep 17 00:00:00 2001
From: Juan <juanvicious@gmail.com>
Date: Thu, 16 Feb 2017 00:28:20 -0300
Subject: [PATCH 1/3] Add meta hacks dats to db builds

---
 libretro-build-database.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 7eca7b45..79a9c8d4 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -180,6 +180,11 @@ build_libretro_database() {
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat"'
 		fi
 
+		#Check if meta hacks is there
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat"'
+		fi
+
 		#Check if main DAT is there
 		if [ -f "${LIBRETRODATABASE_DAT_DIR}/${1}.dat" ]; then
 			COMMAND+=' "${LIBRETRODATABASE_DAT_DIR}/${1}.dat"'

From 410e16123604a98b35c235fa1166154681dd1d45 Mon Sep 17 00:00:00 2001
From: Juan <juanvicious@gmail.com>
Date: Thu, 16 Feb 2017 01:08:38 -0300
Subject: [PATCH 2/3] Requested changes

---
 libretro-build-database.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 79a9c8d4..93b14c2d 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -165,6 +165,11 @@ build_libretro_database() {
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/tgdb/${1}.dat"'
 		fi
 
+		#Check if meta hacks is there
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat"'
+		fi
+
 		#Check if meta libretro-dats folder is there
 		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat" ]; then
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat"'
@@ -180,11 +185,6 @@ build_libretro_database() {
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat"'
 		fi
 
-		#Check if meta hacks is there
-		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat" ]; then
-			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat"'
-		fi
-
 		#Check if main DAT is there
 		if [ -f "${LIBRETRODATABASE_DAT_DIR}/${1}.dat" ]; then
 			COMMAND+=' "${LIBRETRODATABASE_DAT_DIR}/${1}.dat"'

From 675ab4de2ddd030d9b5204feba8ad6035d728b70 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sat, 18 Feb 2017 21:12:05 -0500
Subject: [PATCH 3/3] Remove 'Decrypted' from the Nintendo DS name

---
 dist/info/desmume_libretro.info | 2 +-
 dist/info/melonds_libretro.info | 2 +-
 libretro-build-database.sh      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/info/desmume_libretro.info b/dist/info/desmume_libretro.info
index c940536b..88e3b4bc 100644
--- a/dist/info/desmume_libretro.info
+++ b/dist/info/desmume_libretro.info
@@ -5,7 +5,7 @@ corename = "DeSmuME"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
-database = "Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play) (BETA)"
+database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play) (BETA)"
 license = "GPLv2"
 permissions = ""
 display_version = "SVN"
diff --git a/dist/info/melonds_libretro.info b/dist/info/melonds_libretro.info
index cb002132..17591ff9 100644
--- a/dist/info/melonds_libretro.info
+++ b/dist/info/melonds_libretro.info
@@ -5,7 +5,7 @@ corename = "melonDS"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
-database = "Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play) (BETA)"
+database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play) (BETA)"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 7eca7b45..fa590b69 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -238,9 +238,9 @@ build_libretro_databases() {
 	build_libretro_database "Nintendo - GameCube" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo 3DS" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo 3DS (DLC)" "rom.crc"
-	build_libretro_database "Nintendo - Nintendo DS Decrypted" "rom.crc"
+	build_libretro_database "Nintendo - Nintendo DS" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo DS (Download Play) (BETA)" "rom.crc"
-	build_libretro_database "Nintendo - Nintendo DSi Decrypted" "rom.crc"
+	build_libretro_database "Nintendo - Nintendo DSi" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo DSi (DLC)" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo Entertainment System" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo Wii (DLC)" "rom.crc"