diff --git a/.DS_Store b/.DS_Store index fb54f8adf..5d41b6f2f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Data/.DS_Store b/Data/.DS_Store index 5d25773d6..93f824475 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 a505dc4f9..2c3a12d33 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/Map267.rxdata b/Data/Map267.rxdata index 1d4930540..69d977fd4 100644 Binary files a/Data/Map267.rxdata and b/Data/Map267.rxdata differ diff --git a/Data/Map349.rxdata b/Data/Map349.rxdata index 1893b11b9..6bb1eb5d5 100644 Binary files a/Data/Map349.rxdata and b/Data/Map349.rxdata differ diff --git a/Data/Map351.rxdata b/Data/Map351.rxdata index 8588fbe64..7a528a49d 100644 Binary files a/Data/Map351.rxdata and b/Data/Map351.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index db09e1ba5..7464fa1ae 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb index 611839bc9..8ccfe743a 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -51,6 +51,7 @@ HAT_ZOROARK = "banefulfoxmask" HAT_FROG = "froghat" HAT_SANTA = "santa" HAT_QMARKS = "glitzerset" +HAT_SUDOWOODO = "sudowoodohorns" HAT_CLOWN = "clownnose" 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 265e0475a..4ef36c767 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 6fd4dee80..81118b37b 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/outfits/clothes_data.json b/Data/outfits/clothes_data.json index 9e722de02..67f9c1053 100644 --- a/Data/outfits/clothes_data.json +++ b/Data/outfits/clothes_data.json @@ -235,6 +235,12 @@ "tags": "pokemon-fused,special,", "howToGet": "cinnabar lab after fusing 100 times" }, + { + "id": "ghostoutfit", + "name": "Ghost Outfit", + "tags": "type-ghost,special", + "howToGet": "type trainer" + }, { "id": "glitzerset", "name": "Glitzer", @@ -316,6 +322,14 @@ "tags": "mahogany", "howToGet": "city-exclusive outfit" }, + { + "id": "kris", + "name": "Crystal Classic", + "description": "An outfit worn by young female trainers that is popular in the Johto region.", + "price": 4000, + "tags": "johto", + "howToGet": "regional" + }, { "id": "lady", "name": "Elegant Dress", diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json index 4027731f9..679cff9d3 100644 --- a/Data/outfits/hats_data.json +++ b/Data/outfits/hats_data.json @@ -118,6 +118,12 @@ "tags": "hat,", "howToGet": "gym reward" }, + { + "id": "bruxishcrown", + "name": "Bruxish Crown", + "price": 5000, + "tags": "hairclip,headband,pokemon-bruxish," + }, { "id": "bugantenna", "name": "Bug Antennas", @@ -179,8 +185,8 @@ { "id": "clownnose", "name": "Clown Nose", - "price": 1500, - "tags": "mask,pokemon-mimejr,pokemon-mrmime," + "price": 15000, + "tags": "mask,special," }, { "id": "cloak", @@ -529,6 +535,22 @@ "price": 1000, "tags": "hat,celadon," }, + { + "id": "hilda", + "name": "Pink & White Cap", + "description": "A sleek pink and white cap with a refined design, popular with fledgling trainers in Unova.", + "done": "yes", + "price": 2000, + "tags": "hat,trainer,unova," + }, + { + "id": "hilda2", + "name": "Pink & White Cap (hair)", + "description": "A sleek pink and white cap with a refined design, popular with fledgling trainers in Unova.", + "done": "yes", + "price": 2000, + "tags": "hat,trainer,unova," + }, { "id": "hilbert", "name": "Dark Red & Black Cap", @@ -1158,6 +1180,12 @@ "tags": "nest,", "howToGet": "stay idle on mt. moon summit" }, + { + "id": "sudowoodohorns", + "name": "Sudowoodo Horns", + "price": 5000, + "tags": "pokemon-bonsly,pokemon-sudowoodo,hairclip,headband," + }, { "id": "sylveonbow", "name": "Sylveon Hair Bow", diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index 72e4165b2..f41fc1858 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,4 +1,2 @@ -1740242842 -1740242848 -1740242896 -1740242901 \ No newline at end of file +1740285896 +1740285902 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index 0a87af20a..b6744f6d4 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -589,3 +589,14 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/118/118.png Graphics/CustomBattlers/spritesheets/spritesheets_base/283.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/39/39.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/43/43d.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/307.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/184.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/184/184.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/170/170.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/379.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/379/379.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/301.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/301/301.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/109.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/109/109.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/302/302.png diff --git a/Graphics/.DS_Store b/Graphics/.DS_Store index fcbe8bdb3..d46affb50 100644 Binary files a/Graphics/.DS_Store and b/Graphics/.DS_Store differ diff --git a/Graphics/Characters/.DS_Store b/Graphics/Characters/.DS_Store index dd5a97110..bfd369de9 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 c6c904113..a156f9b8d 100644 Binary files a/Graphics/Characters/player/.DS_Store and b/Graphics/Characters/player/.DS_Store differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_bike_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_bike_ghostoutfit.png new file mode 100644 index 000000000..66632d081 Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_bike_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_dive_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_dive_ghostoutfit.png new file mode 100644 index 000000000..0d91ab710 Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_dive_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_fish_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_fish_ghostoutfit.png new file mode 100644 index 000000000..1748814e5 Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_fish_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_run_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_run_ghostoutfit.png new file mode 100644 index 000000000..36e1d245f Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_run_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_surf_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_surf_ghostoutfit.png new file mode 100644 index 000000000..b96e06b8a Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_surf_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_trainer_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_trainer_ghostoutfit.png new file mode 100644 index 000000000..3043f9f37 Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_trainer_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/ghostoutfit/clothes_walk_ghostoutfit.png b/Graphics/Characters/player/clothes/ghostoutfit/clothes_walk_ghostoutfit.png new file mode 100644 index 000000000..83bb69214 Binary files /dev/null and b/Graphics/Characters/player/clothes/ghostoutfit/clothes_walk_ghostoutfit.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_bike_kris.png b/Graphics/Characters/player/clothes/kris/clothes_bike_kris.png new file mode 100644 index 000000000..474769f0f Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_bike_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_dive_kris.png b/Graphics/Characters/player/clothes/kris/clothes_dive_kris.png new file mode 100644 index 000000000..eee4e0dd0 Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_dive_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_fish_kris.png b/Graphics/Characters/player/clothes/kris/clothes_fish_kris.png new file mode 100644 index 000000000..56dea1af8 Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_fish_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_run_kris.png b/Graphics/Characters/player/clothes/kris/clothes_run_kris.png new file mode 100644 index 000000000..a552afce2 Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_run_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_surf_kris.png b/Graphics/Characters/player/clothes/kris/clothes_surf_kris.png new file mode 100644 index 000000000..72413a134 Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_surf_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_trainer_kris.png b/Graphics/Characters/player/clothes/kris/clothes_trainer_kris.png new file mode 100644 index 000000000..b6429640f Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_trainer_kris.png differ diff --git a/Graphics/Characters/player/clothes/kris/clothes_walk_kris.png b/Graphics/Characters/player/clothes/kris/clothes_walk_kris.png new file mode 100644 index 000000000..197e94a55 Binary files /dev/null and b/Graphics/Characters/player/clothes/kris/clothes_walk_kris.png differ diff --git a/Graphics/Characters/player/hat/.DS_Store b/Graphics/Characters/player/hat/.DS_Store index 75f5053c6..cffbc898c 100644 Binary files a/Graphics/Characters/player/hat/.DS_Store and b/Graphics/Characters/player/hat/.DS_Store differ diff --git a/Graphics/Characters/player/hat/bruxishcrown/hat_bruxishcrown.png b/Graphics/Characters/player/hat/bruxishcrown/hat_bruxishcrown.png new file mode 100644 index 000000000..ba996b48b Binary files /dev/null and b/Graphics/Characters/player/hat/bruxishcrown/hat_bruxishcrown.png differ diff --git a/Graphics/Characters/player/hat/bruxishcrown/hat_trainer_bruxishcrown.png b/Graphics/Characters/player/hat/bruxishcrown/hat_trainer_bruxishcrown.png new file mode 100644 index 000000000..d39f164eb Binary files /dev/null and b/Graphics/Characters/player/hat/bruxishcrown/hat_trainer_bruxishcrown.png differ diff --git a/Graphics/Characters/player/hat/ghastlygibus/hat_ghastlygibus.png b/Graphics/Characters/player/hat/ghastlygibus/hat_ghastlygibus.png deleted file mode 100644 index 4a9f64b38..000000000 Binary files a/Graphics/Characters/player/hat/ghastlygibus/hat_ghastlygibus.png and /dev/null differ diff --git a/Graphics/Characters/player/hat/ghastlygibus/hat_trainer_ghastlygibus.png b/Graphics/Characters/player/hat/ghastlygibus/hat_trainer_ghastlygibus.png deleted file mode 100644 index 7a28c4b06..000000000 Binary files a/Graphics/Characters/player/hat/ghastlygibus/hat_trainer_ghastlygibus.png and /dev/null differ diff --git a/Graphics/Characters/player/hat/hilda/hat_hilda.png b/Graphics/Characters/player/hat/hilda/hat_hilda.png new file mode 100644 index 000000000..460a47eb4 Binary files /dev/null and b/Graphics/Characters/player/hat/hilda/hat_hilda.png differ diff --git a/Graphics/Characters/player/hat/hilda/hat_trainer_hilda.png b/Graphics/Characters/player/hat/hilda/hat_trainer_hilda.png new file mode 100644 index 000000000..09d6be750 Binary files /dev/null and b/Graphics/Characters/player/hat/hilda/hat_trainer_hilda.png differ diff --git a/Graphics/Characters/player/hat/hilda2/hat_hilda2.png b/Graphics/Characters/player/hat/hilda2/hat_hilda2.png new file mode 100644 index 000000000..2a3f223fd Binary files /dev/null and b/Graphics/Characters/player/hat/hilda2/hat_hilda2.png differ diff --git a/Graphics/Characters/player/hat/hilda2/hat_trainer_hilda2.png b/Graphics/Characters/player/hat/hilda2/hat_trainer_hilda2.png new file mode 100644 index 000000000..09d6be750 Binary files /dev/null and b/Graphics/Characters/player/hat/hilda2/hat_trainer_hilda2.png differ diff --git a/Graphics/Characters/player/hat/kris/hat_kris.png b/Graphics/Characters/player/hat/kris/hat_kris.png index 72855df34..62d8cd10f 100644 Binary files a/Graphics/Characters/player/hat/kris/hat_kris.png and b/Graphics/Characters/player/hat/kris/hat_kris.png differ diff --git a/Graphics/Characters/player/hat/kris/hat_trainer_kris.png b/Graphics/Characters/player/hat/kris/hat_trainer_kris.png index 9fadfd8da..59f9a6152 100644 Binary files a/Graphics/Characters/player/hat/kris/hat_trainer_kris.png and b/Graphics/Characters/player/hat/kris/hat_trainer_kris.png differ diff --git a/Graphics/Characters/player/hat/sudowoodohorns/hat_sudowoodohorns.png b/Graphics/Characters/player/hat/sudowoodohorns/hat_sudowoodohorns.png new file mode 100644 index 000000000..a454bad21 Binary files /dev/null and b/Graphics/Characters/player/hat/sudowoodohorns/hat_sudowoodohorns.png differ diff --git a/Graphics/Characters/player/hat/sudowoodohorns/hat_trainer_sudowoodohorns.png b/Graphics/Characters/player/hat/sudowoodohorns/hat_trainer_sudowoodohorns.png new file mode 100644 index 000000000..86906bb1d Binary files /dev/null and b/Graphics/Characters/player/hat/sudowoodohorns/hat_trainer_sudowoodohorns.png differ