diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 71336e1f0..a900929a9 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 410f937fa..1790db673 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map045.rxdata b/Data/Map045.rxdata
index de6dc780b..3c378eb08 100644
Binary files a/Data/Map045.rxdata and b/Data/Map045.rxdata differ
diff --git a/Data/Map049.rxdata b/Data/Map049.rxdata
index 111dbdf06..40319aa3e 100644
Binary files a/Data/Map049.rxdata and b/Data/Map049.rxdata differ
diff --git a/Data/Map292.rxdata b/Data/Map292.rxdata
index dc82ab2b0..63e5f3fc5 100644
Binary files a/Data/Map292.rxdata and b/Data/Map292.rxdata differ
diff --git a/Data/Map328.rxdata b/Data/Map328.rxdata
index cd606eb61..7a1060a81 100644
Binary files a/Data/Map328.rxdata and b/Data/Map328.rxdata differ
diff --git a/Data/Map349.rxdata b/Data/Map349.rxdata
index 1693dd232..29fa70f7c 100644
Binary files a/Data/Map349.rxdata and b/Data/Map349.rxdata differ
diff --git a/Data/Map357.rxdata b/Data/Map357.rxdata
index 695613dbd..84d7ae824 100644
Binary files a/Data/Map357.rxdata and b/Data/Map357.rxdata differ
diff --git a/Data/Map434.rxdata b/Data/Map434.rxdata
index 98ddb0140..2084245d6 100644
Binary files a/Data/Map434.rxdata and b/Data/Map434.rxdata differ
diff --git a/Data/Map506.rxdata b/Data/Map506.rxdata
index 87d277a75..414e16069 100644
Binary files a/Data/Map506.rxdata and b/Data/Map506.rxdata differ
diff --git a/Data/Map507.rxdata b/Data/Map507.rxdata
index 9c3663af6..0af5c6efe 100644
Binary files a/Data/Map507.rxdata and b/Data/Map507.rxdata differ
diff --git a/Data/Map510.rxdata b/Data/Map510.rxdata
index 0c9a20567..b4118d63b 100644
Binary files a/Data/Map510.rxdata and b/Data/Map510.rxdata differ
diff --git a/Data/Map532.rxdata b/Data/Map532.rxdata
index 5764c6209..24c003746 100644
Binary files a/Data/Map532.rxdata and b/Data/Map532.rxdata differ
diff --git a/Data/Map567.rxdata b/Data/Map567.rxdata
index c03c0fe8e..31dfe8634 100644
Binary files a/Data/Map567.rxdata and b/Data/Map567.rxdata differ
diff --git a/Data/Map568.rxdata b/Data/Map568.rxdata
index f97c44778..e046d180c 100644
Binary files a/Data/Map568.rxdata and b/Data/Map568.rxdata differ
diff --git a/Data/Map604.rxdata b/Data/Map604.rxdata
index 7fce7a0da..876ebdae3 100644
Binary files a/Data/Map604.rxdata and b/Data/Map604.rxdata differ
diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata
index 779a20991..9fd2b92e7 100644
Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 8c369a0b1..0ec00893e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts b/Data/Scripts
index f55239795..f1b070064 160000
--- a/Data/Scripts
+++ b/Data/Scripts
@@ -1 +1 @@
-Subproject commit f552397954dbbaed48ac7b81b8c2e7965cf76038
+Subproject commit f1b070064a4eba2a12d2a60a61a031b1f56c0a75
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 947b04843..2314c7d6f 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 07f2aae47..4ff6a8297 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Graphics/Characters/601.png b/Graphics/Characters/601.png
index 19a0abc29..cf634f696 100644
Binary files a/Graphics/Characters/601.png and b/Graphics/Characters/601.png differ
diff --git a/Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png b/Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png
index dc6f1b5f3..00fa90c3e 100644
Binary files a/Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png and b/Graphics/Characters/player/clothes/RocketJames/clothes_walk_RocketJames.png differ
diff --git a/Graphics/Characters/player/hat/BirthdayCake/hat_BirthdayCake.png b/Graphics/Characters/player/hat/BirthdayCake/hat_BirthdayCake.png
deleted file mode 100644
index bd2175b00..000000000
Binary files a/Graphics/Characters/player/hat/BirthdayCake/hat_BirthdayCake.png and /dev/null differ
diff --git a/Graphics/Characters/player/hat/BirthdayCake/hat_trainer_BirthdayCake.png b/Graphics/Characters/player/hat/BirthdayCake/hat_trainer_BirthdayCake.png
deleted file mode 100644
index 8629f6441..000000000
Binary files a/Graphics/Characters/player/hat/BirthdayCake/hat_trainer_BirthdayCake.png and /dev/null differ
diff --git a/Graphics/Characters/player/hat/idolf/hat_trainer_idolf.png b/Graphics/Characters/player/hat/idolf/hat_trainer_idolf.png
index 3194abdd8..0381c8f34 100644
Binary files a/Graphics/Characters/player/hat/idolf/hat_trainer_idolf.png and b/Graphics/Characters/player/hat/idolf/hat_trainer_idolf.png differ