diff --git a/.DS_Store b/.DS_Store index 229ce353e..678d8db72 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Data/.DS_Store b/Data/.DS_Store index fa0ccf2eb..a4e1a7e84 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index 4c44f779c..7ced20d50 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map830.rxdata b/Data/Map830.rxdata index abf83eb34..2cc22f142 100644 Binary files a/Data/Map830.rxdata and b/Data/Map830.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 717f07975..2ed55a12e 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/052_AddOns/MultiSaves.rb b/Data/Scripts/052_AddOns/MultiSaves.rb index 1299ec08f..662bde14d 100644 --- a/Data/Scripts/052_AddOns/MultiSaves.rb +++ b/Data/Scripts/052_AddOns/MultiSaves.rb @@ -46,7 +46,14 @@ def onLoadExistingGame() migrateOldSavesToCharacterCustomization() clear_all_images() + loadDateSpecificChanges() +end +def loadDateSpecificChanges() + current_date = Time.new + if (current_date.day == 1 && current_date.month == 4) + $Trainer.hat2=HAT_CLOWN if $Trainer.unlocked_hats.include?(HAT_CLOWN) + end end def onStartingNewGame() end diff --git a/Data/System.rxdata b/Data/System.rxdata index 419869cf6..f3a8a9748 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index 791b8cda2..0237a9355 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1 +1,2 @@ -1741964572 \ No newline at end of file +1741995246 +1741995284 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index b94b74c4a..397c42a36 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -677,3 +677,12 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/441.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/6/6b.png Graphics/CustomBattlers/spritesheets/spritesheets_base/443.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/443/443.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/380.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/306.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/306/306.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/106.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/132/132a.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/13.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/13/13.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/312.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/210/210a.png diff --git a/Graphics/.DS_Store b/Graphics/.DS_Store index c2553e627..b0f130041 100644 Binary files a/Graphics/.DS_Store and b/Graphics/.DS_Store differ diff --git a/Graphics/Battlers/.DS_Store b/Graphics/Battlers/.DS_Store index 239bd6382..91a60e77f 100644 Binary files a/Graphics/Battlers/.DS_Store and b/Graphics/Battlers/.DS_Store differ diff --git a/Graphics/Characters/.DS_Store b/Graphics/Characters/.DS_Store index 57223c4b1..773d3481f 100644 Binary files a/Graphics/Characters/.DS_Store and b/Graphics/Characters/.DS_Store differ diff --git a/Graphics/Characters/player/.DS_Store b/Graphics/Characters/player/.DS_Store index 6d3fd774b..70d894309 100644 Binary files a/Graphics/Characters/player/.DS_Store and b/Graphics/Characters/player/.DS_Store differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_bike_butler.png b/Graphics/Characters/player/clothes/butler/clothes_bike_butler.png new file mode 100644 index 000000000..755f1d405 Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_bike_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_dive_butler.png b/Graphics/Characters/player/clothes/butler/clothes_dive_butler.png new file mode 100644 index 000000000..1a513ced7 Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_dive_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_fish_butler.png b/Graphics/Characters/player/clothes/butler/clothes_fish_butler.png new file mode 100644 index 000000000..66510fc15 Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_fish_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_run_butler.png b/Graphics/Characters/player/clothes/butler/clothes_run_butler.png new file mode 100644 index 000000000..74ae0e4aa Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_run_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_surf_butler.png b/Graphics/Characters/player/clothes/butler/clothes_surf_butler.png new file mode 100644 index 000000000..c89616a7c Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_surf_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_trainer_butler.png b/Graphics/Characters/player/clothes/butler/clothes_trainer_butler.png new file mode 100644 index 000000000..f25bb9981 Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_trainer_butler.png differ diff --git a/Graphics/Characters/player/clothes/butler/clothes_walk_butler.png b/Graphics/Characters/player/clothes/butler/clothes_walk_butler.png new file mode 100644 index 000000000..0fe00bf14 Binary files /dev/null and b/Graphics/Characters/player/clothes/butler/clothes_walk_butler.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_bike_maid.png b/Graphics/Characters/player/clothes/maid/clothes_bike_maid.png new file mode 100644 index 000000000..f7b0df0db Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_bike_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_dive_maid.png b/Graphics/Characters/player/clothes/maid/clothes_dive_maid.png new file mode 100644 index 000000000..7eb2efbda Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_dive_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_fish_maid.png b/Graphics/Characters/player/clothes/maid/clothes_fish_maid.png new file mode 100644 index 000000000..8a5de1e87 Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_fish_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_run_maid.png b/Graphics/Characters/player/clothes/maid/clothes_run_maid.png new file mode 100644 index 000000000..a1d6765a5 Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_run_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_surf_maid.png b/Graphics/Characters/player/clothes/maid/clothes_surf_maid.png new file mode 100644 index 000000000..cf21277d7 Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_surf_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_trainer_maid.png b/Graphics/Characters/player/clothes/maid/clothes_trainer_maid.png new file mode 100644 index 000000000..43d220965 Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_trainer_maid.png differ diff --git a/Graphics/Characters/player/clothes/maid/clothes_walk_maid.png b/Graphics/Characters/player/clothes/maid/clothes_walk_maid.png new file mode 100644 index 000000000..13a9d41b1 Binary files /dev/null and b/Graphics/Characters/player/clothes/maid/clothes_walk_maid.png differ diff --git a/Graphics/Characters/player/hat/.DS_Store b/Graphics/Characters/player/hat/.DS_Store deleted file mode 100644 index 814c2f55c..000000000 Binary files a/Graphics/Characters/player/hat/.DS_Store and /dev/null differ diff --git a/Graphics/Characters/player/hat/haxorushelmet/hat_haxorushelmet.png b/Graphics/Characters/player/hat/haxorushelmet/hat_haxorushelmet.png new file mode 100644 index 000000000..65f267fc3 Binary files /dev/null and b/Graphics/Characters/player/hat/haxorushelmet/hat_haxorushelmet.png differ diff --git a/Graphics/Characters/player/hat/haxorushelmet/hat_trainer_haxorushelmet.png b/Graphics/Characters/player/hat/haxorushelmet/hat_trainer_haxorushelmet.png new file mode 100644 index 000000000..f58334183 Binary files /dev/null and b/Graphics/Characters/player/hat/haxorushelmet/hat_trainer_haxorushelmet.png differ diff --git a/Graphics/Characters/player/hat/maid/hat_maid.png b/Graphics/Characters/player/hat/maid/hat_maid.png new file mode 100644 index 000000000..3eae8d386 Binary files /dev/null and b/Graphics/Characters/player/hat/maid/hat_maid.png differ diff --git a/Graphics/Characters/player/hat/maid/hat_trainer_maid.png b/Graphics/Characters/player/hat/maid/hat_trainer_maid.png new file mode 100644 index 000000000..c123a6cd2 Binary files /dev/null and b/Graphics/Characters/player/hat/maid/hat_trainer_maid.png differ diff --git a/Graphics/Characters/player/hat/voltorbitembarrette/hat_trainer_voltorbitembarrette.png b/Graphics/Characters/player/hat/voltorbitembarrette/hat_trainer_voltorbitembarrette.png new file mode 100644 index 000000000..ec49dd7e1 Binary files /dev/null and b/Graphics/Characters/player/hat/voltorbitembarrette/hat_trainer_voltorbitembarrette.png differ diff --git a/Graphics/Characters/player/hat/voltorbitembarrette/hat_voltorbitembarrette.png b/Graphics/Characters/player/hat/voltorbitembarrette/hat_voltorbitembarrette.png new file mode 100644 index 000000000..a226e54df Binary files /dev/null and b/Graphics/Characters/player/hat/voltorbitembarrette/hat_voltorbitembarrette.png differ diff --git a/Graphics/Items/CLOTHESDYEKIT.png b/Graphics/Items/CLOTHESDYEKIT.png new file mode 100644 index 000000000..5a4abc147 Binary files /dev/null and b/Graphics/Items/CLOTHESDYEKIT.png differ diff --git a/Graphics/Items/HATSDYEKIT.png b/Graphics/Items/HATSDYEKIT.png new file mode 100644 index 000000000..98b8222dd Binary files /dev/null and b/Graphics/Items/HATSDYEKIT.png differ