diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 4f44ea9a1..43e4ace96 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Map138.rxdata b/Data/Map138.rxdata
index 1b358cb4f..4721f7387 100644
Binary files a/Data/Map138.rxdata and b/Data/Map138.rxdata differ
diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata
index db065371e..6be41fd8e 100644
Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ
diff --git a/Data/Map296.rxdata b/Data/Map296.rxdata
index d0117bf98..21f44aa36 100644
Binary files a/Data/Map296.rxdata and b/Data/Map296.rxdata differ
diff --git a/Data/Map298.rxdata b/Data/Map298.rxdata
index 023c28dd0..c9fc93beb 100644
Binary files a/Data/Map298.rxdata and b/Data/Map298.rxdata differ
diff --git a/Data/Map299.rxdata b/Data/Map299.rxdata
index 3c4e7ea37..d81dbf8ba 100644
Binary files a/Data/Map299.rxdata and b/Data/Map299.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 3c850c656..1d428d0d0 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb
index 57f5b3892..3ebcec190 100644
--- a/Data/Scripts/DownloadedSettings.rb
+++ b/Data/Scripts/DownloadedSettings.rb
@@ -4,6 +4,7 @@ module Settings
   CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Sprite Credits.csv"
   SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
   VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
+  CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"
 
   AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
   CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/CustomBattlers/"
diff --git a/Data/System.rxdata b/Data/System.rxdata
index c20d9e41b..1255efe0e 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index f139fe264..608795d09 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index b79140d1d..b1f6f6fca 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/trainers.dat b/Data/trainers.dat
index fe1e66c99..23cd5e389 100644
Binary files a/Data/trainers.dat and b/Data/trainers.dat differ
diff --git a/Graphics/Tilesets/Indoor.PNG b/Graphics/Tilesets/Indoor.PNG
index cc663422c..d8ea55af8 100644
Binary files a/Graphics/Tilesets/Indoor.PNG and b/Graphics/Tilesets/Indoor.PNG differ