wip

Data/Scripts/010_Data/001_GameData.rb

@@ -40,6 +40,7 @@ module GameData
          return GameData::FusedSpecies.new(pokemon_id)
        end
      end
+
       raise "Unknown ID #{other}." unless self::DATA.has_key?(other)
 
 #if other == :Species

Data/Scripts/048_Fusion/SplitNames.rb

@@ -1078,44 +1078,6 @@ module GameData
     418 => 662,
     419 => 636,
     420 => 618,
-
-    #New ones
-    302 => 421,
-    696 => 422,
-    697 => 423,
-    361 => 424,
-    362 => 425,
-    478 => 426,
-    714 => 427,
-    715 => 428,
-    333 => 429,
-    334 => 430,
-    708 => 431,
-    709 => 432,
-    318 => 433,
-    319 => 434,
-    704 => 435,
-    705 => 436,
-    706 => 437,
-    377 => 438,
-    378 => 439,
-    379 => 440,
-    568 => 441,
-    569 => 442,
-    582 => 443,
-    583 => 444,
-    584 => 445,
-    747 => 446,
-    748 => 447,
-    781 => 448,
-    270 => 449,
-    271 => 450,
-    272 => 451,
-    331 => 452,
-    332 => 453,
-    769 => 454,
-    780 => 455,
-
   }
 end
 

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -158,7 +158,7 @@ module GameData
     end
 
     def self.sprite_filename(dex_number)
-      dex_number = GameData::NAT_DEX_MAPPING[dex_number] ? GameData::NAT_DEX_MAPPING[dex_number] : dex_number
+      #dex_number = GameData::NAT_DEX_MAPPING[dex_number] ? GameData::NAT_DEX_MAPPING[dex_number] : dex_number
 
       return nil if dex_number == nil
       if dex_number <= Settings::NB_POKEMON