Getting Ready For Release

codists-dump · Apr 1, 2021 · d97cfee · d97cfee
1 parent 801dd23
commit d97cfee
Show file tree

Hide file tree

Showing 479 changed files with 3,113 additions and 347 deletions.
diff --git a/Friday Night Funkin Gamemaker Remake.yyp b/Friday Night Funkin Gamemaker Remake.yyp
diff --git a/datafiles/Songs/Ballistic/Ballistic_Hard.ini b/datafiles/Songs/Ballistic/Ballistic_Hard.ini
diff --git a/datafiles/Songs/Bopeebo/Bopeebo_Easy.ini b/datafiles/Songs/Bopeebo/Bopeebo_Easy.ini
diff --git a/datafiles/Songs/Bopeebo/Bopeebo_Hard.ini b/datafiles/Songs/Bopeebo/Bopeebo_Hard.ini
diff --git a/datafiles/Songs/Bopeebo/Bopeebo_Normal.ini b/datafiles/Songs/Bopeebo/Bopeebo_Normal.ini
diff --git a/datafiles/Songs/Bopeebo_bside/Bopeebo_bside_Hard.ini b/datafiles/Songs/Bopeebo_bside/Bopeebo_bside_Hard.ini
diff --git a/datafiles/Songs/Cocoa/Cocoa_Hard.ini b/datafiles/Songs/Cocoa/Cocoa_Hard.ini
diff --git a/datafiles/Songs/Codist_says_things/Codist_says_things_Inst.ogg b/datafiles/Songs/Codist_says_things/Codist_says_things_Inst.ogg
diff --git a/datafiles/Songs/Cookies/Cookies_Hard.ini b/datafiles/Songs/Cookies/Cookies_Hard.ini
diff --git a/datafiles/Songs/Dadbattle_bside/Dadbattle_bside_Hard.ini b/datafiles/Songs/Dadbattle_bside/Dadbattle_bside_Hard.ini
diff --git a/datafiles/Songs/Eggnog/Eggnog_Hard.ini b/datafiles/Songs/Eggnog/Eggnog_Hard.ini
diff --git a/datafiles/Songs/Fresh/Fresh_Hard.ini b/datafiles/Songs/Fresh/Fresh_Hard.ini
diff --git a/datafiles/Songs/Fresh_bside/Fresh_bside_Hard.ini b/datafiles/Songs/Fresh_bside/Fresh_bside_Hard.ini
diff --git a/datafiles/Songs/LoFight/LoFight_Hard.ini b/datafiles/Songs/LoFight/LoFight_Hard.ini
diff --git a/datafiles/Songs/Overhead/Overhead_Hard.ini b/datafiles/Songs/Overhead/Overhead_Hard.ini
diff --git a/datafiles/Songs/Roses/Roses_Hard.ini b/datafiles/Songs/Roses/Roses_Hard.ini
diff --git a/datafiles/Songs/Senpai/Senpai_Hard.ini b/datafiles/Songs/Senpai/Senpai_Hard.ini
diff --git a/datafiles/Songs/Songs/Cookies/Cookies_Hard.ini b/datafiles/Songs/Songs/Cookies/Cookies_Hard.ini
diff --git a/datafiles/Songs/Songs/Milf/Milf_Hard.ini b/datafiles/Songs/Songs/Milf/Milf_Hard.ini
diff --git a/datafiles/Songs/South/South_Hard.ini b/datafiles/Songs/South/South_Hard.ini
diff --git a/datafiles/Songs/Spookeez/Spookeez_Hard.ini b/datafiles/Songs/Spookeez/Spookeez_Hard.ini
diff --git a/datafiles/Songs/Spookeez_bside/Spookeez_bside_Hard.ini b/datafiles/Songs/Spookeez_bside/Spookeez_bside_Hard.ini
diff --git a/datafiles/Songs/Thorns/Thorns_Hard.ini b/datafiles/Songs/Thorns/Thorns_Hard.ini
diff --git a/datafiles/Songs/Tutorial/Tutorial_Hard.ini b/datafiles/Songs/Tutorial/Tutorial_Hard.ini
diff --git a/datafiles/Songs/Winter_horrorland/Winter_horrorland_Hard.ini b/datafiles/Songs/Winter_horrorland/Winter_horrorland_Hard.ini
diff --git a/objects/oArrowButton/Step_0.gml b/objects/oArrowButton/Step_0.gml
@@ -23,6 +23,7 @@ if !(enemy) && !(global.auto) {
 		image_index = 0;
 
 		if !(global.kadeInput) oBoyfriend.missed = true;
+		else oBoyfriend.missed = false;
 
 		with (instance_place(x, y, oNote)) {
 
@@ -53,8 +54,9 @@ if !(enemy) && !(global.auto) {
 				if (distance > 65) scor = 2;
 				if (distance > 75) scor = 3;
 				var scoreX = 1259
-				if (instance_exists(oGirlfriend)) scoreX = oGirlfriend.x + 5;
-				var o = instance_create_depth(scoreX, 485, 400 - instance_number(oScoreText), oScoreText);
+				var scoreY = 485;
+				if (instance_exists(oGirlfriend)) {scoreX = oGirlfriend.x + 5; scoreY = oGirlfriend.y - 517};
+				var o = instance_create_depth(scoreX, scoreY, 400 - instance_number(oScoreText), oScoreText);
 				o.image_index = scor;
 
 				var scoreAdd = 350;

diff --git a/objects/oArrowButton/oArrowButton.yy b/objects/oArrowButton/oArrowButton.yy
diff --git a/objects/oBoyfriend/Other_7.gml b/objects/oBoyfriend/Other_7.gml
@@ -1,7 +1,7 @@
 if (sprite_index = sprDeath) {
 	audio_play_sound(gameoverMusic, 100, true);
 	sprite_index = sprDeath2;
-	image_speed = (180 / 60) / 2;
+	image_speed = (180 / 2) * global.deltaMultiplier; //all enemys
 }
 
 if (sprite_index = sprDeath3) && (deathAnimCooldown <= 0) {

diff --git a/objects/oBoyfriend/oBoyfriend.yy b/objects/oBoyfriend/oBoyfriend.yy
diff --git a/objects/oCamera/Create_0.gml b/objects/oCamera/Create_0.gml
@@ -49,6 +49,10 @@ bgChristTree = layer_get_id("Assets_Tree");
 bgChristUpBop = layer_get_id("Assets_UpBop");
 bgChristMain = layer_get_id("Background_Main");
 
+bgChristEvilSnow = layer_get_id("Backgrounds_EvilSnow");
+bgChristEvilTree = layer_get_id("Assets_EvilTree");
+bgChristEvilBG = layer_get_id("Backgrounds_EvilBG");
+
 bgSenpaiFreaks = layer_get_id("Assets_SenpaiFreaks");
 bgSenpaiStreet = layer_get_id("Backgrounds_SenpaiStreet");
 bgSenpaiTrees = layer_get_id("Assets_SenpaiTrees");

diff --git a/objects/oCamera/oCamera.yy b/objects/oCamera/oCamera.yy
diff --git a/objects/oCharSelect/oCharSelect.yy b/objects/oCharSelect/oCharSelect.yy
diff --git a/objects/oCreateNotes/oCreateNotes.yy b/objects/oCreateNotes/oCreateNotes.yy
diff --git a/objects/oCutscene/Create_0.gml b/objects/oCutscene/Create_0.gml
@@ -0,0 +1 @@
+cutsceneID = 1;
diff --git a/objects/oCutscene/oCutscene.yy b/objects/oCutscene/oCutscene.yy
diff --git a/objects/oDebugNoteEditor/oDebugNoteEditor.yy b/objects/oDebugNoteEditor/oDebugNoteEditor.yy
diff --git a/objects/oDebugRoom/oDebugRoom.yy b/objects/oDebugRoom/oDebugRoom.yy
diff --git a/objects/oDevMode/oDevMode.yy b/objects/oDevMode/oDevMode.yy
diff --git a/objects/oDialogBox/Create_0.gml b/objects/oDialogBox/Create_0.gml
@@ -7,9 +7,23 @@ get_dialog();
 
 spr = sDialogBox;
 font = fntDefault;
+
+color1 = c_black;
+color2 = c_white;
+shadow = false;
 if (global.enemy = 8) or (global.enemy = 9) or (global.enemy = 10) {
 	spr = sDialogBoxPixel;
 	font = fntDialogPixel;
+
+	if (global.enemy = 10) {
+		spr = sDialogBoxPixelSpooky;
+		color1 = c_white;
+		shadow = false;
+	} else {
+		color1 = make_color_rgb(57, 28, 30);
+		color2 = make_color_rgb(191, 122, 123);
+		shadow = true;
+	}
 }
 index = 0;