diff --git a/.gitignore b/.gitignore index 9d9959427..c89020829 100644 --- a/.gitignore +++ b/.gitignore @@ -3,13 +3,8 @@ Graphics/Battlers/Shiny/* Graphics/CustomBattlers/spritesheets/* Graphics/CustomBattlers/* -Data/sprites/* Data/VERSION infinitefusion.sh -Data/sprites/CUSTOM_SPRITES -Data/sprites -Data/sprites/updated_spritesheets_cache -Data/sprites/sprites_rate_limit.log .gitignore Game.rxproj .DS_Store diff --git a/Data/.DS_Store b/Data/.DS_Store index d01fb9728..cdeabbe39 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ diff --git a/Data/Scripts/005_Sprites/016_Sprite_Player.rb b/Data/Scripts/005_Sprites/016_Sprite_Player.rb index 747114220..c7c2e5cfd 100644 --- a/Data/Scripts/005_Sprites/016_Sprite_Player.rb +++ b/Data/Scripts/005_Sprites/016_Sprite_Player.rb @@ -60,7 +60,7 @@ class Sprite_Player < Sprite_Character @charbitmap.bitmap.clone #nekkid sprite baseBitmap = @charbitmap.bitmap.clone #nekkid sprite - if $game_player.hasGraphicsOverride? + if $game_player.hasGraphicsOverride? && @character_name != "fish" @hair.update(@character_name, "", 0) if @hair @hat.update(@character_name, "", 0) if @hat @hat2.update(@character_name, "", 0) if @hat2 @@ -84,6 +84,7 @@ class Sprite_Player < Sprite_Character hat2_color_shift = 0 if !hat2_color_shift clothes_color_shift = 0 if !clothes_color_shift + @hair.update(@character_name, hairFilename, hair_color_shift) if @hair @hat.update(@character_name, hatFilename, hat_color_shift) if @hat @hat2.update(@character_name, hat2Filename, hat2_color_shift) if @hat2