mushroom

Author: UmedMuzl

base-hack/assets/instance_scripts/fungi/0xeb.json

@@ -46,7 +46,7 @@
                 {"function":4,"inverted":false,"parameters":[0,0,0]}
             ],
             "executions": [
-                {"function":7,"parameters":[125,235,0]},
+                {"function":7,"parameters":[125,0,235]},
                 {"function":3,"parameters":[0,300,0]},
                 {"function":1,"parameters":[3,0,0]}
             ]

base-hack/src/instances/instances.c

@@ -388,7 +388,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					}
 				} else if ((param2 == AZTEC_LLAMACOCONUT) || (param2 == AZTEC_LLAMAGRAPE) || (param2 == AZTEC_LLAMAFEATHER)) {
 					if ((index == 0) && (param2 == AZTEC_LLAMACOCONUT)) {
-						if (!Rando.quality_of_life.remove_cutscenes) {
+						if (!Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 							PlayCutsceneFromModelTwoScript(behaviour_pointer,23,1,0);
 						}
 					} else if (index == 1) {
@@ -411,7 +411,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 						behaviour_pointer->timer = 70;
 					}
 				} else if (param2 == FUNGI_SWITCH_LANKY_MUSHROOM) {
-					if (!Rando.quality_of_life.remove_cutscenes) {
+					if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 						PlayCutsceneFromModelTwoScript(behaviour_pointer,12,1,0);
 					}
 				}
@@ -523,7 +523,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 				} else if (param2 == LLAMA_BONGOPAD) {
 					return Character == Rando.free_source_llama;
 				} else if (param2 == LLAMA_LAVAGATE) {
-					if (Rando.quality_of_life.remove_cutscenes) {
+					if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 						hideObject(behaviour_pointer);
 						behaviour_pointer->pause_state = 1;
 					}
@@ -789,7 +789,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					if (MovesBase[KONG_DIDDY].special_moves & MOVECHECK_CHARGE) {
 						return 1;
 					}
-					if (Rando.quality_of_life.remove_cutscenes) {
+					if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 						return 1;
 					}
 					return 0;
@@ -1174,7 +1174,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 						}
 
 						//play grape switch cutscene
-						if (!Rando.quality_of_life.remove_cutscenes) {
+						if (!Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 							PlayCutsceneFromModelTwoScript(behaviour_pointer, 0, 1, 0);
 							behaviour_pointer->timer = 110;
 						}