From b3337cbf2424e52887f2d9d77efc0ebbd247ba1d Mon Sep 17 00:00:00 2001
From: Kaphotics <kaphotics@gmail.com>
Date: Fri, 18 Mar 2016 22:48:53 -0700
Subject: [PATCH] Add missing static encounters

Resolves #84
---
 Legality/Core.cs             | 16 +++++++++++++++-
 Resources/text/changelog.txt |  3 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Legality/Core.cs b/Legality/Core.cs
index a02600ed3..f9add3531 100644
--- a/Legality/Core.cs
+++ b/Legality/Core.cs
@@ -437,6 +437,11 @@ private static IEnumerable<int> getMachineMoves(int species, int formnum)
             new EncounterStatic { Species = 131, Level = 32, Location = 62, Nature = Nature.Docile, IVs = new[] {31, 20, 20, 20, 20, 20}, Gift = true }, // Lapras
             
             new EncounterStatic { Species = 143, Level = 15, Location = 38 }, // Snorlax
+            new EncounterStatic { Species = 568, Level = 35, Location = 142 }, // Trubbish
+            new EncounterStatic { Species = 569, Level = 36, Location = 142 }, // Garbodor
+            new EncounterStatic { Species = 569, Level = 37, Location = 142 }, // Garbodor
+            new EncounterStatic { Species = 569, Level = 38, Location = 142 }, // Garbodor
+            new EncounterStatic { Species = 479, Level = 38, Location = 142 }, // Rotom
             
             new EncounterStatic { Species = 716, Level = 50, Location = 138, Version = GameVersion.X, Shiny = false }, // Xerneas
             new EncounterStatic { Species = 717, Level = 50, Location = 138, Version = GameVersion.Y, Shiny = false }, // Yveltal
@@ -532,6 +537,15 @@ private static IEnumerable<int> getMachineMoves(int species, int formnum)
             
             new EncounterStatic { Species = 100, Level = 20, Location = 302 }, // Voltorb @ Route 119
             new EncounterStatic { Species = 442, Level = 50, Location = 304 }, // Spiritomb @ Route 120
+
+            // Soaring in the Sky
+            new EncounterStatic { Species = 198, Level = 45, Location = 348 }, // Murkrow
+            new EncounterStatic { Species = 276, Level = 40, Location = 348 }, // Taillow
+            new EncounterStatic { Species = 278, Level = 40, Location = 348 }, // Wingull
+            new EncounterStatic { Species = 279, Level = 40, Location = 348 }, // Pelipper
+            new EncounterStatic { Species = 333, Level = 40, Location = 348 }, // Swablu
+            new EncounterStatic { Species = 425, Level = 45, Location = 348 }, // Drifloon
+            new EncounterStatic { Species = 628, Level = 45, Location = 348 }, // Braviary
         };
         #endregion
         private static readonly EncounterStatic[] StaticX = getSpecial(GameVersion.X);
@@ -570,7 +584,7 @@ private static EncounterStatic[] getSpecial(GameVersion Game)
             Util.getStringList("tradeao", "ko"), // 8
         };
 
-        #region Static Encounter/Gift Tables
+        #region Trade Tables
         private static readonly EncounterTrade[] TradeGift_XY =
         {
             new EncounterTrade { Species = 129, Level = 5, Ability = 1, Gender = 0, TID = 44285, Nature = Nature.Adamant, }, // Magikarp
diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt
index 7b9ebe1d1..0ad49da10 100644
--- a/Resources/text/changelog.txt
+++ b/Resources/text/changelog.txt
@@ -674,4 +674,5 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Fixed: Pokédex Editor for X/Y now saves form bools. Thanks chenzw95!
  - Changed: PID generator for Gen3/4/Unown legal PIDs. Thanks chenzw95!
  - Changed: Chinese Translation updated. Thanks easyworld!
- - Changed: Startup times of the program may be quicker.
\ No newline at end of file
+ - Changed: Startup times of the program may be quicker.
+ - Hotfix: Added missing Lost Hotel & Soaring static encounters. Thanks froslumugu & \!
\ No newline at end of file