Menuing improvements

VampireFlower · Jul 23, 2022 · bb7835d · bb7835d
1 parent 37acb06
commit bb7835d
Show file tree

Hide file tree

Showing 27 changed files with 202 additions and 305 deletions.
diff --git a/0 - 100%.tas b/0 - 100%.tas
@@ -1,10 +1,14 @@
 #Start from Begin
 
+#Ensures variants postcard
+#does not appear after 8C
+Set,Settings.Instance.VariantsUnlocked,True
+
 Read,StartFullGameFile
 
 Read,0 - Prologue,Start
 
-Read,Load1A
+Read,LoadANoCollects,Prologue
 
 Read,1SH0,Start
 
@@ -37,7 +41,6 @@ Add 1
 Read,1SHC,Start
 
 #Old Site
-Add 58
 Read,LoadAFromB,SkipExit
 
 Read,2SHC,Start
@@ -58,14 +61,8 @@ Read,LoadA
 
 Read,6HC,Start
 
-Add 197
- 165
-   1,J
-Add 7
- 230
-   1,J
-  43
-   1,J
+Read,LoadANoCollects,0,Summit
+#Summit
   45
 Add 29
    1,J
@@ -108,7 +105,7 @@ Read,LoadB
 
 Read,7B,Start
 
-Read,LoadB,Start,Core
+Read,LoadB,0,Core
    1,R
    9
 Read,LoadB,Core
@@ -143,36 +140,27 @@ Read,LoadC
 
 Read,7C,Start
 
-Read,LoadC,Start,Core
+Read,LoadC,0,Core
    1,R
    9
 Read,LoadC,Core
 
 Read,8C,Start
 
-Read,Load9From8C,Start,Postcard
-
-#Uncomment if variants aren't unlocked
-#Read,Load9From8C,Postcard,Resume
-
-Read,Load9From8C,Resume
+Read,LoadB,0,Farewell
+   1,J
+  46
+Add 1
 
 Read,9S,Start
 
 #Epilogue
-  51
 Add 58
+  51
    1,S
    1,X
   42
    1,L
    9
    1,L
-   9
-   1,J
-  43
-   1,J
-Add 1
-  46
-
-Read,0 - Epilogue,Start
+Read,LoadJournal
diff --git a/0 - All A Sides.tas b/0 - All A Sides.tas
@@ -4,7 +4,7 @@ Read,StartFullGameFile
 
 Read,0 - Prologue,Start
 
-Read,Load1A
+Read,LoadANoCollects,Prologue
 
 Read,1A,Start
 
@@ -74,14 +74,7 @@ Read,LoadA
 
 Read,6A,Start
 
-Add 197
- 165
-   1,J
-Add 7
- 230
-   1,J
-  43
-   1,J
+Read,LoadANoCollects,0,Summit
 #Summit
   45
 Add 29
@@ -94,21 +87,15 @@ Read,7A,Start
 Read,LoadCoreFromSummit
 
 Read,8A,Start
+  59
+   1,J
+ 196
 
-Read,LoadAFromB,Start,SkipExit
+Read,LoadA,0,control
 
 #Epilogue
-  51
-   1,S
- 394
+ 200
    1,L
    9
    1,L
-   9
-   1,J
-  43
-   1,J
-Add 1
-  46
-
-Read,0 - Epilogue,Start
+Read,LoadJournal
diff --git a/0 - All B Sides.tas b/0 - All B Sides.tas
@@ -2,7 +2,7 @@
 
 Read,StartFullGameFile
 
-Read,LoadEnableCheatMode
+Read,LoadEnableCheatMode,Start
 
 Read,LoadBCheatMode,SelectB
 
@@ -39,6 +39,16 @@ Read,LoadBCheatMode,Core
 
 Read,8B,Start
 
-#Move to ending screen
   59
-   1,J
+   1,J
+ 196
+Read,LoadANoCollects,0,Prologue
+  48
+Add 7
+
+#Epilogue
+   1,S
+   1,X
+  42
+   1,L
+Read,LoadJournal
diff --git a/0 - All C Sides.tas b/0 - All C Sides.tas
@@ -32,15 +32,23 @@ Read,LoadCCheatMode
 
 Read,7C,Start
 
-Read,LoadCCheatMode,0,GoldBerry
-  50
-Read,LoadCCheatMode,GoldBerry,Core
+Read,LoadCCheatMode,0,Core
    1,R
    9
 Read,LoadCCheatMode,Core
 
 Read,8C,Start
 
-#Move to ending screen
   59
-   1,J
+   1,J
+ 196
+Read,LoadANoCollects,0,Prologue
+  48
+Add 7
+
+#Epilogue
+   1,S
+   1,X
+  42
+   1,L
+Read,LoadJournal
diff --git a/0 - All Cassettes.tas b/0 - All Cassettes.tas
@@ -4,7 +4,7 @@ Read,StartFullGameFile
 
 Read,0 - Prologue,Start
 
-Read,Load1A
+Read,LoadANoCollects,Prologue
 
 Read,1A,Start
 
@@ -27,7 +27,6 @@ Read,1SH2,Start,lvl_10 (0)
 
 Read,1HC,lvl_10
 
-Add 58
 Read,LoadAFromB,SkipExit
 
 Read,2HC,lvl_start (2),Return
@@ -130,8 +129,7 @@ Read,LoadBFromA
 
 Read,6B,Start
 
-Read,LoadAFromB,Start,Summit
-
+Read,LoadAFromB,0,Summit
 #Summit
   45
 Add 29
@@ -148,21 +146,15 @@ Read,7A,lvl_d-05
 Read,LoadCoreFromSummit
 
 Read,8AC,Start
+  59
+   1,J
+ 196
 
-Read,LoadAFromB,Start,SkipExit
+Read,LoadA,0,control
 
 #Epilogue
-  51
-   1,S
- 394
+ 200
    1,L
    9
    1,L
-   9
-   1,J
-  43
-   1,J
-Add 1
-  46
-
-Read,0 - Epilogue,Start
+Read,LoadJournal
diff --git a/0 - All Chapters.tas b/0 - All Chapters.tas
@@ -1,10 +1,14 @@
 #Start from Begin
 
+#Ensures variants postcard
+#does not appear after 8C
+Set,Settings.Instance.VariantsUnlocked,True
+
 Read,StartFullGameFile
 
 Read,0 - Prologue,Start
 
-Read,Load1A
+Read,LoadANoCollects,Prologue
 
 Read,1HC,Start,lvl_6c
 
@@ -29,7 +33,6 @@ Read,1SH2,Start,lvl_10 (0)
 
 Read,1HC,lvl_10
 
-Add 58
 Read,LoadAFromB,SkipExit
 
 Read,2HC,Start
@@ -50,14 +53,8 @@ Read,LoadA
 
 Read,6HC,Start
 
-Add 197
- 165
-   1,J
-Add 7
- 230
-   1,J
-  43
-   1,J
+Read,LoadANoCollects,0,Summit
+#Summit
   45
 Add 29
    1,J
@@ -98,7 +95,7 @@ Read,LoadB
 
 Read,7B,Start
 
-Read,LoadB,Start,Core
+Read,LoadB,0,Core
    1,R
    9
 Read,LoadB,Core
@@ -133,36 +130,26 @@ Read,LoadC
 
 Read,7C,Start
 
-Read,LoadC,Start,Core
+Read,LoadC,0,Core
    1,R
    9
 Read,LoadC,Core
 
 Read,8C,Start
 
-Read,Load9From8C,Start,Postcard
-
-#Uncomment if variants aren't unlocked
-#Read,Load9From8C,Postcard,Resume
-
-Read,Load9From8C,Resume
+Read,LoadB,0,Farewell
+   1,J
+  46
+Add 1
 
 Read,9,Start
 
 #Epilogue
-  51
 Add 58
-   1,S
+  51
    1,X
   42
    1,L
    9
    1,L
-   9
-   1,J
-  43
-   1,J
-Add 1
-  46
-
-Read,0 - Epilogue,Start
+Read,LoadJournal