diff --git a/Data/.DS_Store b/Data/.DS_Store
index 6cbc52a32..8e00246c9 100644
Binary files a/Data/.DS_Store and b/Data/.DS_Store differ
diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index a900929a9..71336e1f0 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 25d304ac5..bb341f53d 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 8208a6d77..69eab3382 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts b/Data/Scripts
index d682eed25..46e099399 160000
--- a/Data/Scripts
+++ b/Data/Scripts
@@ -1 +1 @@
-Subproject commit d682eed254da5a8fdba0f8b85c69d2c7690c86fa
+Subproject commit 46e099399e4375d665221c78ccc5bf70f366904b
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 63736264b..c946f7f5d 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 14110e1ea..d16d8dd06 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 9e62ea43a..e4b4b0a55 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/trainers.dat b/Data/trainers.dat
index 4be0a339a..8ced21d16 100644
Binary files a/Data/trainers.dat and b/Data/trainers.dat differ
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_bike_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_bike_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_bike_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_bike_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_dive_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_dive_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_dive_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_dive_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_fish_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_fish_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_fish_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_fish_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_run_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_run_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_run_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_run_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_surf_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_surf_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_surf_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_surf_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_trainer_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_trainer_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_trainer_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_trainer_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJames/template_walk_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJames/template_walk_RocketJames.png
rename to Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_bike_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_bike_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_bike_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_bike_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_dive_RocketJaessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_dive_RocketJaessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_dive_RocketJaessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_dive_RocketJaessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_fish_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_fish_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_fish_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_fish_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_run_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_run_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_run_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_run_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_surf_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_surf_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_surf_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_surf_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_trainer_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_trainer_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_trainer_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_trainer_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/RocketJessie/template_walk_RocketJessie.png b/Graphics/Characters/player/clothes/RocketJessie/clothes_walk_RocketJessie.png
similarity index 100%
rename from Graphics/Characters/player/clothes/RocketJessie/template_walk_RocketJessie.png
rename to Graphics/Characters/player/clothes/RocketJessie/clothes_walk_RocketJessie.png
diff --git a/Graphics/Characters/player/clothes/nursejoy/outfit_trainer_nursejoy.png b/Graphics/Characters/player/clothes/nursejoy/clothes_trainer_nursejoy.png
similarity index 100%
rename from Graphics/Characters/player/clothes/nursejoy/outfit_trainer_nursejoy.png
rename to Graphics/Characters/player/clothes/nursejoy/clothes_trainer_nursejoy.png
diff --git a/Graphics/CustomBattlers/spritesheets/.DS_Store b/Graphics/CustomBattlers/spritesheets/.DS_Store
index b0f35b3d9..a52e3f1ad 100644
Binary files a/Graphics/CustomBattlers/spritesheets/.DS_Store and b/Graphics/CustomBattlers/spritesheets/.DS_Store differ