diff --git a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
index 5de29d2fa..ff44d5e50 100644
--- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
+++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
@@ -1038,7 +1038,12 @@ class PokemonPokedex_Scene
                     _INTL("U"),_INTL("V"),_INTL("W"),_INTL("X"),_INTL("Y"),
                     _INTL("Z")]
     @typeCommands = []
-    GameData::Type.each { |t| @typeCommands.push(t) if !t.pseudo_type }
+
+    count = 0
+    GameData::Type.each do |t|
+      @typeCommands.push(t) if !t.pseudo_type && count <= 18
+      count +=1
+    end
     @typeCommands.sort! { |a, b| a.id_number <=> b.id_number }
     @heightCommands = [1,2,3,4,5,6,7,8,9,10,
                        11,12,13,14,15,16,17,18,19,20,
diff --git a/Data/System.rxdata b/Data/System.rxdata
index b09874081..868cfba48 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ