From a406775cd5471c8750882f8894f513e0aeb5db8e Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom <thekoopakingdom@gmail.com>
Date: Sat, 3 Jun 2017 19:47:08 -0400
Subject: [PATCH] Finished adding game descriptions and release dates.

---
 Mario-Kart-7/game.dat        | 2 +-
 Pokemon-Sun-Moon/game.dat    | 6 +++---
 Pokemon-X-Y/game.dat         | 6 +++---
 Super-Mario-3D-Land/game.dat | 7 ++++++-
 Super-Smash-Bros/game.dat    | 4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Mario-Kart-7/game.dat b/Mario-Kart-7/game.dat
index 9f70db8..15bb58a 100644
--- a/Mario-Kart-7/game.dat
+++ b/Mario-Kart-7/game.dat
@@ -9,4 +9,4 @@ needs_shared_font = false
 [[ releases ]]
 title = "0004000000030800"
 region = "USA"
-release_date = "December 4, 2011-12-04"
+release_date = "2011-12-04"
diff --git a/Pokemon-Sun-Moon/game.dat b/Pokemon-Sun-Moon/game.dat
index 8cbc5bf..ab7d552 100644
--- a/Pokemon-Sun-Moon/game.dat
+++ b/Pokemon-Sun-Moon/game.dat
@@ -1,5 +1,5 @@
 title = "Pokémon Sun and Moon"
-description = ""
+description = "Pokémon Sun and Pokémon Moon are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the seventh generation of Pokémon games."
 compatibility = 4
 tested_date = "2017-05-31"
 tested_version = "HEAD-4857eb4"
@@ -9,9 +9,9 @@ needs_shared_font = false
 [[ releases ]]
 title = "0004000000164800"
 region = "USA"
-release_date = ""
+release_date = "2016-11-18"
 
 [[ releases ]]
 title = "0004000000175E00"
 region = "USA"
-release_date = ""
+release_date = "2016-11-18"
diff --git a/Pokemon-X-Y/game.dat b/Pokemon-X-Y/game.dat
index 8cd1584..f1dc374 100644
--- a/Pokemon-X-Y/game.dat
+++ b/Pokemon-X-Y/game.dat
@@ -1,5 +1,5 @@
 title = "Pokémon X and Y"
-description = ""
+description = "Pokémon X and Pokémon Y are role-playing video games developed by Game Freak and published by Nintendo for the Nintendo 3DS. They are the first installments in the sixth generation of the Pokémon series of role-playing games."
 compatibility = 2
 tested_date = "2017-05-31"
 tested_version = "HEAD-4857eb4"
@@ -9,9 +9,9 @@ needs_shared_font = true
 [[ releases ]]
 title = "0004000000055D00"
 region = "USA"
-release_date = ""
+release_date = "2013-10-12"
 
 [[ releases ]]
 title = "0004000000055E00"
 region = "USA"
-release_date = ""
+release_date = "2013-10-12"
diff --git a/Super-Mario-3D-Land/game.dat b/Super-Mario-3D-Land/game.dat
index 90ed78c..9eb21d0 100644
--- a/Super-Mario-3D-Land/game.dat
+++ b/Super-Mario-3D-Land/game.dat
@@ -1,6 +1,6 @@
 title = "Super Mario 3D Land"
-description = ""
 compatibility = 3
+description = "Super Mario 3D Land is a platform game in the Super Mario series developed by Nintendo EAD Tokyo, with development assistance from Brownie Brown, for the Nintendo 3DS. The game was the first in the Mario franchise to be released for the system and was released worldwide in November 2011."
 tested_date = "2017-05-31"
 tested_version = "HEAD-4857eb4"
 needs_system_files = true
@@ -8,5 +8,10 @@ needs_shared_font = false
 
 [[ releases ]]
 title = "0004000000054000"
+<<<<<<< HEAD
 region = "USA"
 release_date = ""
+=======
+region = "NTSC-U"
+release_date = "2011-11-13"
+>>>>>>> Finished adding game descriptions and release dates.
diff --git a/Super-Smash-Bros/game.dat b/Super-Smash-Bros/game.dat
index 3901864..4c31538 100644
--- a/Super-Smash-Bros/game.dat
+++ b/Super-Smash-Bros/game.dat
@@ -1,5 +1,5 @@
 title = "Super Smash Bros. for Nintendo 3DS"
-description = ""
+description = "Super Smash Bros. for Nintendo 3DS is a fighting video game developed by Sora Ltd. and Bandai Namco Games, with assistance from tri-Crescendo, and published by Nintendo for the Nintendo 3DS and video game consoles. Despite being similarly titled games, even with almost similar content, the two titles are officially considered the fourth and fifth versions, respectively, in the Super Smash Bros. series of games by creator and game director Masahiro Sakurai."
 compatibility = 4
 tested_date = "2017-05-31"
 tested_version = "HEAD-4857eb4"
@@ -9,4 +9,4 @@ needs_shared_font = true
 [[ releases ]]
 title = "00040000000EDF00"
 region = "USA"
-release_date = ""
+release_date = "2014-10-3"