diff --git a/Audio/ME/lullaby.mp3 b/Audio/ME/lullaby.mp3 new file mode 100644 index 000000000..a5f0f4fe4 Binary files /dev/null and b/Audio/ME/lullaby.mp3 differ diff --git a/Data/.DS_Store b/Data/.DS_Store index b15400491..b4554fb3a 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ diff --git a/Data/Map017.rxdata b/Data/Map017.rxdata index d5e3749bb..0af08c37c 100644 Binary files a/Data/Map017.rxdata and b/Data/Map017.rxdata differ diff --git a/Data/Map100.rxdata b/Data/Map100.rxdata deleted file mode 100644 index 1be4bd801..000000000 Binary files a/Data/Map100.rxdata and /dev/null differ diff --git a/Data/Map151.rxdata b/Data/Map151.rxdata index 8c9f0e1e3..95378bb9d 100644 Binary files a/Data/Map151.rxdata and b/Data/Map151.rxdata differ diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata index 2f43930bc..4cd68e9af 100644 Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ diff --git a/Data/Map247.rxdata b/Data/Map247.rxdata index 9cb4be858..0f85abc86 100644 Binary files a/Data/Map247.rxdata and b/Data/Map247.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 140335a22..45587f874 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 165dbc81e..6936d9d82 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -144,4 +144,5 @@ HAIR_CRESSELIA = "lunarbob" HAIR_LYCANROC="lycanrocshorthair" HAIR_HAPPINY="happinysuit" HAIR_LATIAS="SpecialLatias" -HAIR_GARDEVOIR="gardevoir" \ No newline at end of file +HAIR_GARDEVOIR="gardevoir" +HAIR_EEVEE="eeveetail" \ No newline at end of file diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb index 3ec519fc4..ecb1047e0 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb @@ -10,7 +10,7 @@ class OutfitsMartAdapter < PokemonMartAdapter REGIONAL_SET_BASE_COLOR = Color.new(76,72,104) REGIONAL_SET_SHADOW_COLOR = Color.new(173,165,189) - CITY_EXCLUSIVE_BASE_COLOR = Color.new(72 , 104, 83) + CITY_EXCLUSIVE_BASE_COLOR = Color.new(61 , 125, 70) #Color.new(72 , 104, 83) CITY_EXCLUSIVE_SHADOW_COLOR = Color.new(165, 189, 178) def initialize(stock = [], isShop = true, isSecondaryHat = false) diff --git a/Data/System.rxdata b/Data/System.rxdata index abea57664..4beda8754 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 7c9691efa..0b708e8c4 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Graphics/Characters/cello.png b/Graphics/Characters/cello.png new file mode 100644 index 000000000..363572583 Binary files /dev/null and b/Graphics/Characters/cello.png differ diff --git a/Graphics/Characters/flute.png b/Graphics/Characters/flute.png new file mode 100644 index 000000000..177e6b76b Binary files /dev/null and b/Graphics/Characters/flute.png differ diff --git a/Graphics/Characters/harp.png b/Graphics/Characters/harp.png new file mode 100644 index 000000000..6173b576c Binary files /dev/null and b/Graphics/Characters/harp.png differ diff --git a/Graphics/Characters/piano.png b/Graphics/Characters/piano.png new file mode 100644 index 000000000..2a7cfff2c Binary files /dev/null and b/Graphics/Characters/piano.png differ diff --git a/Graphics/Characters/player/hat/eeveeears/hat_eeveeears.png b/Graphics/Characters/player/hat/eeveeears/hat_eeveeears.png new file mode 100644 index 000000000..9783654f4 Binary files /dev/null and b/Graphics/Characters/player/hat/eeveeears/hat_eeveeears.png differ diff --git a/Graphics/Characters/player/hat/eeveeears/hat_trainer_eeveeears.png b/Graphics/Characters/player/hat/eeveeears/hat_trainer_eeveeears.png new file mode 100644 index 000000000..97aab9aff Binary files /dev/null and b/Graphics/Characters/player/hat/eeveeears/hat_trainer_eeveeears.png differ diff --git a/Graphics/Characters/player/hat/scribbles1/hat_scribbles1.png b/Graphics/Characters/player/hat/scribbles1/hat_scribbles1.png new file mode 100644 index 000000000..dab863c6b Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles1/hat_scribbles1.png differ diff --git a/Graphics/Characters/player/hat/scribbles1/hat_trainer_scribbles1.png b/Graphics/Characters/player/hat/scribbles1/hat_trainer_scribbles1.png new file mode 100644 index 000000000..0ec218b33 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles1/hat_trainer_scribbles1.png differ diff --git a/Graphics/Characters/player/hat/scribbles2/hat_scribbles2.png b/Graphics/Characters/player/hat/scribbles2/hat_scribbles2.png new file mode 100644 index 000000000..bd81593d6 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles2/hat_scribbles2.png differ diff --git a/Graphics/Characters/player/hat/scribbles2/hat_trainer_scribbles2.png b/Graphics/Characters/player/hat/scribbles2/hat_trainer_scribbles2.png new file mode 100644 index 000000000..f94703b27 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles2/hat_trainer_scribbles2.png differ diff --git a/Graphics/Characters/player/hat/scribbles3/hat_scribbles3.png b/Graphics/Characters/player/hat/scribbles3/hat_scribbles3.png new file mode 100644 index 000000000..73cfac8f0 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles3/hat_scribbles3.png differ diff --git a/Graphics/Characters/player/hat/scribbles3/hat_trainer_scribbles3.png b/Graphics/Characters/player/hat/scribbles3/hat_trainer_scribbles3.png new file mode 100644 index 000000000..6332b2205 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles3/hat_trainer_scribbles3.png differ diff --git a/Graphics/Characters/player/hat/scribbles4/hat_scribbles4.png b/Graphics/Characters/player/hat/scribbles4/hat_scribbles4.png new file mode 100644 index 000000000..1aa82fc8f Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles4/hat_scribbles4.png differ diff --git a/Graphics/Characters/player/hat/scribbles4/hat_trainer_scribbles4.png b/Graphics/Characters/player/hat/scribbles4/hat_trainer_scribbles4.png new file mode 100644 index 000000000..185b394d0 Binary files /dev/null and b/Graphics/Characters/player/hat/scribbles4/hat_trainer_scribbles4.png differ diff --git a/Graphics/Characters/violin_f.png b/Graphics/Characters/violin_f.png new file mode 100644 index 000000000..f1622f7a6 Binary files /dev/null and b/Graphics/Characters/violin_f.png differ diff --git a/Graphics/Characters/violin_m.png b/Graphics/Characters/violin_m.png new file mode 100644 index 000000000..8bd27535d Binary files /dev/null and b/Graphics/Characters/violin_m.png differ diff --git a/Graphics/CustomBattlers/spritesheets/.DS_Store b/Graphics/CustomBattlers/spritesheets/.DS_Store index 7afd5be0c..3aac24c3c 100644 Binary files a/Graphics/CustomBattlers/spritesheets/.DS_Store and b/Graphics/CustomBattlers/spritesheets/.DS_Store differ diff --git a/Graphics/CustomBattlers/spritesheets/spritesheets_custom/.DS_Store b/Graphics/CustomBattlers/spritesheets/spritesheets_custom/.DS_Store index 515543f3d..3ace3cffe 100644 Binary files a/Graphics/CustomBattlers/spritesheets/spritesheets_custom/.DS_Store and b/Graphics/CustomBattlers/spritesheets/spritesheets_custom/.DS_Store differ