2.4.2 - Chapter 1 logic change (#71)

Tenebrosful · Jun 20, 2024 · c8202a8 · c8202a8
2 parents 6a389a1 + 2b08635
commit c8202a8
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/Deltarune.asl b/Deltarune.asl
@@ -2,23 +2,20 @@
 
 state("DELTARUNE", "SURVEY_PROGRAM")
 {
-    // Global
-    double plot    : 0x48E5DC, 0x27C, 0x488, 0x500; // global.plot
-    double choicer : 0x48E5DC, 0x27C, 0x28,  0x40;  // global.choice
-
     // Self
-    double lancerCon         : 0x48BDEC, 0x10, 0x60, 0x10, 0x10,  0x0; // obj_darkcastle_event.con
-    double doorCloseCon      : 0x48BDEC, 0xC,  0x60, 0x10, 0x10,  0x0; // obj_darkdoorevent.con
-    double jevilDance        : 0x48BDEC, 0x78, 0x60, 0x10, 0x10,  0x0; // obj_joker_body.dancelv
-    double jevilDance2       : 0x48BDEC, 0x7C, 0x60, 0x10, 0x10,  0x0;
-    double finalTextboxHalt  : 0x48BDEC, 0x98, 0x60, 0x10, 0x274, 0x0; // obj_writer.halt
-    double finalTextboxHalt2 : 0x48BDEC, 0x9C, 0x60, 0x10, 0x274, 0x0;
+    double lancerCon    : 0x48BDEC, 0x4,  0x60, 0x10, 0x10, 0x6D0; // obj_darkcastle_event.con
+    double doorCloseCon : 0x48BDEC, 0xC,  0x60, 0x10, 0x10, 0x0;   // obj_darkdoorevent.con
+    double jevilDance   : 0x48BDEC, 0x78, 0x60, 0x10, 0x10, 0x0;   // obj_joker_body.dancelv
+    double jevilDance2  : 0x48BDEC, 0x7C, 0x60, 0x10, 0x10, 0x0;
 
     float kingPos : 0x6AEB80, 0x4, 0x178, 0x80, 0xC8, 0x8, 0xB4;
+
+    string128 text : 0x49D510, 0x188C, 0xD40, 0x4, 0x20, 0x60, 0x10, 0x208, 0x0, 0x0, 0x0;
 }
 
 state("DELTARUNE", "Demo v1.08 / v1.09")
 {
+    // Global
     double chapter : 0x6FCF38, 0x30, 0x24D8, 0x0; // global.chapter
     double fight   : 0x6FCF38, 0x30, 0x4F8,  0x0; // global.fighting
 
@@ -370,11 +367,7 @@ update
         switch(ch)
         {
             case 1:
-                if(version == "SURVEY_PROGRAM")
-                    endCondition = (((old.finalTextboxHalt == 2 && current.finalTextboxHalt != 2) || (old.finalTextboxHalt2 == 2 && current.finalTextboxHalt2 != 2)) && current.choicer == 0 && current.plot == 251);
-
-                else
-                    endCondition = ((old.text == @"＊ (ねむることにした)/%" || old.text == @"* (You decided to go to bed.)/%") && current.text == null);
+                endCondition = ((old.text == @"＊ (ねむることにした)/%" || old.text == @"* (You decided to go to bed.)/%") && current.text == null);
                 break;
 
             case 2: