From b217500a0dab7b9bcd3f4653cd477b3985368948 Mon Sep 17 00:00:00 2001 From: DodoBirb Date: Tue, 8 Nov 2022 12:40:10 +1100 Subject: [PATCH] Fixed typo, Removed orb cutscenes --- Export_Code/gml_Object_oClawOrbFirst_Other_11.gml | 15 +++++++++------ Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml | 15 +++++++++------ Export_Code/gml_Script_display_itemmsg.gml | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Export_Code/gml_Object_oClawOrbFirst_Other_11.gml b/Export_Code/gml_Object_oClawOrbFirst_Other_11.gml index cfc564d..db60039 100644 --- a/Export_Code/gml_Object_oClawOrbFirst_Other_11.gml +++ b/Export_Code/gml_Object_oClawOrbFirst_Other_11.gml @@ -1,9 +1,12 @@ -ecam = instance_create(x, (y - 16), oEventCamera) -ecam.targetx = 800 -ecam.targety = y -ecam.ratio = 8 -ecam.alarm[0] = 280 -view_object[0] = oEventCamera +if (!global.saxmode) +{ + ecam = instance_create(x, (y - 16), oEventCamera) + ecam.targetx = 800 + ecam.targety = y + ecam.ratio = 8 + ecam.alarm[0] = 280 + view_object[0] = oEventCamera +} with (oA1MovingPlatform2) alarm[0] = 60 global.event[58] = 1 diff --git a/Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml b/Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml index 77099fb..4bbe6d9 100644 --- a/Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml +++ b/Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml @@ -1,11 +1,14 @@ with (oClawOrb) event_user(0) -ecam = instance_create(x, (y - 16), oEventCamera) -ecam.targetx = oA1MovingPlatform.x -ecam.targety = y -ecam.ratio = 8 -ecam.alarm[0] = 450 -view_object[0] = oEventCamera +if (!global.saxmode) +{ + ecam = instance_create(x, (y - 16), oEventCamera) + ecam.targetx = oA1MovingPlatform.x + ecam.targety = y + ecam.ratio = 8 + ecam.alarm[0] = 450 + view_object[0] = oEventCamera +} with (oA1MovingPlatform) alarm[0] = 60 global.event[54] = 1 diff --git a/Export_Code/gml_Script_display_itemmsg.gml b/Export_Code/gml_Script_display_itemmsg.gml index 121c33d..39f81b6 100644 --- a/Export_Code/gml_Script_display_itemmsg.gml +++ b/Export_Code/gml_Script_display_itemmsg.gml @@ -1,4 +1,4 @@ -if global.saxmode +if (!global.saxmode) { global.itmtext1 = argument0 global.itmtext2 = argument1