diff --git a/src/love/data/characters/GFDarkCharacter.lua b/src/love/data/characters/GFDarkCharacter.lua index d991678..68de53d 100644 --- a/src/love/data/characters/GFDarkCharacter.lua +++ b/src/love/data/characters/GFDarkCharacter.lua @@ -45,9 +45,11 @@ function GFDark:beat(beat) self.spr:beat(beat) end -function GFDark:animate(...) - self.child:animate(...) - self.spr:animate(...) +function GFDark:animate(name, ...) + if name == "sad" then return end + + self.child:animate(name, ...) + self.spr:animate(name,...) end function GFDark:isAnimated() diff --git a/src/love/songs/blammed/Voices-pico-erect.ogg b/src/love/songs/blammed/Voices-pico-enemy-erect.ogg similarity index 100% rename from src/love/songs/blammed/Voices-pico-erect.ogg rename to src/love/songs/blammed/Voices-pico-enemy-erect.ogg diff --git a/src/love/songs/eggnog/Voices-bf-christmas-erect.ogg b/src/love/songs/eggnog/Voices-bf-erect.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-bf-christmas-erect.ogg rename to src/love/songs/eggnog/Voices-bf-erect.ogg diff --git a/src/love/songs/eggnog/Voices-parents-christmas.ogg b/src/love/songs/eggnog/Voices-parents.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-parents-christmas.ogg rename to src/love/songs/eggnog/Voices-parents.ogg diff --git a/src/love/songs/eggnog/Voices-pico-christmas-pico.ogg b/src/love/songs/eggnog/Voices-pico-pico.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-pico-christmas-pico.ogg rename to src/love/songs/eggnog/Voices-pico-pico.ogg