diff --git a/Data/Map357.rxdata b/Data/Map357.rxdata
index 762820445..8f296ee39 100644
Binary files a/Data/Map357.rxdata and b/Data/Map357.rxdata differ
diff --git a/Data/Scripts b/Data/Scripts
index a3d9fc0c5..48d6e7cbe 160000
--- a/Data/Scripts
+++ b/Data/Scripts
@@ -1 +1 @@
-Subproject commit a3d9fc0c5799dddaede7178e7f0c796642e3143e
+Subproject commit 48d6e7cbe0a45963a8af280eadb6ae87914d8712
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 00360feb3..574ee9474 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/MALAMAR_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/MALAMAR_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/MALAMAR_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/MALAMAR_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/MUNNA_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/MUNNA_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/MUNNA_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/MUNNA_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/MUSHARNA_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/MUSHARNA_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/MUSHARNA_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/MUSHARNA_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/NUMEL_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/NUMEL_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/NUMEL_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/NUMEL_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/SEALEO_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/SEALEO_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/SEALEO_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/SEALEO_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/SHIINOTIC_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/SHIINOTIC_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/SHIINOTIC_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/SHIINOTIC_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/SKITTY_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/SKITTY_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/SKITTY_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/SKITTY_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/SPHEAL_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/SPHEAL_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/SPHEAL_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/SPHEAL_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/SPINDA_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/SPINDA_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/SPINDA_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/SPINDA_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/TROPIUS_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/TROPIUS_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/TROPIUS_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/TROPIUS_FLAG.png
diff --git a/Graphics/Pictures/Trainer Card/backgrounds/flags/WINGULL_FLAG.png b/Graphics/Pictures/Trainer Card/backgrounds/WINGULL_FLAG.png
similarity index 100%
rename from Graphics/Pictures/Trainer Card/backgrounds/flags/WINGULL_FLAG.png
rename to Graphics/Pictures/Trainer Card/backgrounds/WINGULL_FLAG.png