From 22b03ee42007df162d8858da79b65f085d8ce46b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 28 Jan 2021 01:54:21 -0500
Subject: [PATCH] bullshit
---
CHANGELOG.md | 2 ++
README.md | 1 +
source/FreeplayState.hx | 1 +
source/PlayState.hx | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1f3b7224..8920cd610 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [UNRELEASED]
+### Added
+- Rebindable controls ([Thanks to PKPenguin321 for the menu backbone work](https://github.com/ninjamuffin99/Funkin/pull/288))
### Changed
- Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe
### Fixed
diff --git a/README.md b/README.md
index 772878f13..313b075d4 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ IF YOU WANT TO JUST DOWNLOAD AND INSTALL AND PLAY THE GAME NORMALLY, GO TO ITCH.
https://ninja-muffin24.itch.io/friday-night-funkin
+IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!!
### Installing shit
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index b44ef6d6f..32373c354 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -76,6 +76,7 @@ class FreeplayState extends MusicBeatState
if (StoryMenuState.weekUnlocked[6] || isDebug)
{
songs.push('Senpai');
+ songs.push('Roses');
songs.push('Thorns');
// songs.push('Winter-Horrorland');
}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index dd13b6b94..41732f1b8 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -331,7 +331,7 @@ class PlayState extends MusicBeatState
evilSnow.antialiasing = true;
add(evilSnow);
}
- else if (SONG.song.toLowerCase() == 'senpai')
+ else if (SONG.song.toLowerCase() == 'senpai' || SONG.song.toLowerCase() == 'roses')
{
curStage = 'school';