diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 069b904f5..aa34e5699 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 65a305717..b389ed0e3 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map244.rxdata b/Data/Map244.rxdata
index 3748d05f2..9448d6cde 100644
Binary files a/Data/Map244.rxdata and b/Data/Map244.rxdata differ
diff --git a/Data/Map565.rxdata b/Data/Map565.rxdata
index af78c1759..6129bac9f 100644
Binary files a/Data/Map565.rxdata and b/Data/Map565.rxdata differ
diff --git a/Data/Map576.rxdata b/Data/Map576.rxdata
index d584577c9..e05ee80de 100644
Binary files a/Data/Map576.rxdata and b/Data/Map576.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ebe94046e..bbeb30972 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index 9b7d79def..8907c9163 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -410,6 +410,38 @@ def generateSimpleTrainerParty(teamSpecies, level)
   return team
 end
 
+def isAlolaPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  list = [
+    370, 373, 430,431,432,433,450, 451,452,
+    453,454,455, 459,460, 463, 464, 465
+  ]
+  return list.include?(dexNum)
+end
+
+def isKalosPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  list =
+    [327,328,329,339,371,372,417,418,
+     425,426,438,439, 440,441,444,445,446,
+     456,461,462
+    ]
+  return list.include?(dexNum)
+end
+
+def isUnovaPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  list =
+    [
+      330,331,337,338,348,349,350,351,359,360,361,
+      362,363,364,365,366,367,368,369,374,375,376,377,
+      397,398,399,406,407,408,409,410,411,412,413,414,
+      415,416,419,420,
+      422,423,424,434,345
+    ]
+  return list.include?(dexNum)
+end
+
 def isSinnohPokemon(species)
   dexNum = getDexNumberForSpecies(species)
   list =
@@ -417,7 +449,9 @@ def isSinnohPokemon(species)
      266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 288, 294,
      295, 296, 297, 298, 299, 305, 306, 307, 308, 315, 316, 317,
      318, 319, 320, 321, 322, 323, 324, 326, 332, 343, 344, 345,
-     346, 347, 352, 353, 354, 358, 383, 384, 388, 389, 400, 402, 403]
+     346, 347, 352, 353, 354, 358, 383, 384, 388, 389, 400, 402, 403,
+     429
+    ]
   return list.include?(dexNum)
 end
 
@@ -427,7 +461,9 @@ def isHoennPokemon(species)
           285, 286, 287, 289, 290, 291, 292, 293, 300, 301, 302, 303,
           304, 309, 310, 311, 312, 313, 314, 333, 334, 335, 336, 340,
           341, 342, 355, 356, 357, 378, 379, 380, 381, 382, 385, 386, 387, 390,
-          391, 392, 393, 394, 395, 396, 401, 404, 405]
+          391, 392, 393, 394, 395, 396, 401, 404, 405,
+          421, 427,428, 436,437,442,443,447,448,449, 457,458
+  ]
   return list.include?(dexNum)
 end
 
diff --git a/Data/Scripts/050_AddOns/QuestLogScript.rb b/Data/Scripts/050_AddOns/QuestLogScript.rb
index 6f30b0087..8b4743ae5 100644
--- a/Data/Scripts/050_AddOns/QuestLogScript.rb
+++ b/Data/Scripts/050_AddOns/QuestLogScript.rb
@@ -138,12 +138,12 @@ QUESTS = [
   Quest.new(37, "The Largest Carp", "A fisherman wants you to fish up a Magikarp that's exceptionally high-level at Dragon's Den.", questBranchHotels, "BW (71)", "Blackthorn City", defaultQuestColor),
 
   #Ecruteak City
-  Quest.new(38, "Kalos Pokémon", "A woman wants you to show her a Pokémon native to the Kalos region.", questBranchHotels, "BW (37)", "Ecruteak City", defaultQuestColor),
+  Quest.new(38, "Kalos Pokémon", "A woman wants you to show her a Pokémon native to the Kalos region.", questBranchHotels, "BW (348)", "Ecruteak City", defaultQuestColor),
   Quest.new(39, "Ghost Evolution", "A girl in Ecruteak City wants you to show her a fully-evolved Ghost Pokémon.", questBranchHotels, "BW014", "Ecruteak City", defaultQuestColor),
 
   #Kin Island
-  Quest.new(40, "Banana Slamma!", "Collect 30 bananas", questBranchHotels, "BW029", "Kin Island", defaultQuestColor),
-  Quest.new(41, "Unova Pokémon", "A woman wants you to show her a Pokémon native to the Unova region.", questBranchHotels, "BW (37)", "Kin Island", defaultQuestColor),
+  Quest.new(40, "Banana Slamma!", "Collect 30 bananas", questBranchHotels, "BW059", "Kin Island", defaultQuestColor),
+  Quest.new(41, "Unova Pokémon", "A woman wants you to show her a Pokémon native to the Unova region.", questBranchHotels, "BW (48)", "Kin Island", defaultQuestColor),
   Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)", "Cinnabar Island", defaultQuestColor),
   Quest.new(43, "Fallen Meteor", "Investigate a crater near Bond Bridge.", questBranchHotels, "BW009", "Kin Island", defaultQuestColor),
   Quest.new(44, "First Contact", "Find the missing pieces of a fallen alien spaceship", questBranchHotels, "BW (92)", "Bond Bridge", questBranchField),
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 76ce5675e..20f864814 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 646a60fd7..05045e8ca 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ