Skip to content

Commit

Permalink
FreezeRing split timing change (not conventional timing but atleast i…
Browse files Browse the repository at this point in the history
…ts consistent) (#66)
  • Loading branch information
Tenebrosful authored Mar 21, 2024
2 parents 4fe315e + 77585ba commit c18c1ec
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Deltarune.asl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ state("DELTARUNE", "Demo v1.08 / v1.09")
double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0;
double namerEvent : 0x6EF220, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0x9C, 0x0; // DEVICE_NAMER.EVENT
double loadedDiskGreyBG : 0x6EF220, 0x84, 0x24, 0x10, 0x3D8, 0x0; // obj_shop_ch2_spamton.greybgtimer
double freezeRingTimer : 0x6EF220, 0x128, 0x24, 0xA0, 0x24, 0x10, 0xC0, 0x0; // obj_weirdEvent_addison_city_big_2.timer
double snowgrave : 0x6EF220, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0xC0, 0x0; // obj_spell_snowgrave.timer

float kingPos : 0x6F1394, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0;
Expand All @@ -45,7 +44,6 @@ state("DELTARUNE", "Demo v1.10")
double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0;
double namerEvent : 0x6EF220, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0x2F4, 0x0;
double loadedDiskGreyBG : 0x6EF220, 0x84, 0x24, 0x10, 0x87C, 0x0;
double freezeRingTimer : 0x6EF220, 0x128, 0x24, 0xA0, 0x24, 0x10, 0xC0, 0x0;
double snowgrave : 0x6EF220, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0xC0, 0x0;

float kingPos : 0x6F1394, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0;
Expand All @@ -64,7 +62,6 @@ state("DELTARUNE", "Demo Steam Beta")
double doorCloseCon : 0x6F0B48, 0x84, 0x24, 0x10, 0x18, 0x0;
double namerEvent : 0x6F0B48, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0xFC, 0x0;
double loadedDiskGreyBG : 0x6F0B48, 0x84, 0x24, 0x10, 0x0, 0x0;
double freezeRingTimer : 0x6F0B48, 0x128, 0x24, 0xA0, 0x24, 0x10, 0x120, 0x0;
double snowgrave : 0x6F0B48, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0x120, 0x0;

float kingPos : 0x6F2CBC, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0;
Expand Down Expand Up @@ -538,7 +535,7 @@ split
break;

case 8: // Ch2_FreezeRing
pass = (old.freezeRingTimer <= 85 && current.freezeRingTimer >= 85);
pass = ((old.text == @"* (凍てつく指輪を 手に入れた)/%" || old.text == @"* (You got the FreezeRing.)/%") && current.text == null);
break;

case 9: // Ch2_SGBerdly
Expand Down

0 comments on commit c18c1ec

Please sign in to comment.