diff --git a/0 - 100%.tas b/0 - 100%.tas index c92db462..872e5f63 100644 --- 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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - All A Sides.tas b/0 - All A Sides.tas index 89c0e719..2ec0e03c 100644 --- 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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - All B Sides.tas b/0 - All B Sides.tas index 817a5f02..a9fadbbe 100644 --- 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 \ No newline at end of file + 1,J + 196 +Read,LoadANoCollects,0,Prologue + 48 +Add 7 + +#Epilogue + 1,S + 1,X + 42 + 1,L +Read,LoadJournal \ No newline at end of file diff --git a/0 - All C Sides.tas b/0 - All C Sides.tas index 617d1603..42c360fa 100644 --- 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 \ No newline at end of file + 1,J + 196 +Read,LoadANoCollects,0,Prologue + 48 +Add 7 + +#Epilogue + 1,S + 1,X + 42 + 1,L +Read,LoadJournal \ No newline at end of file diff --git a/0 - All Cassettes.tas b/0 - All Cassettes.tas index 8da44198..9cc9de46 100644 --- 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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - All Chapters.tas b/0 - All Chapters.tas index 18fcbe6b..065a22d9 100644 --- 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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - All Hearts.tas b/0 - All Hearts.tas index c3de5f98..d5a801d0 100644 --- a/0 - All Hearts.tas +++ b/0 - All Hearts.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,Return @@ -70,8 +74,7 @@ Read,LoadBFromA,Exit Read,6B,Start -Read,LoadAFromB,Start,Summit - +Read,LoadAFromB,0,Summit #Summit 45 Add 29 @@ -85,13 +88,23 @@ Read,LoadBFromA,Exit Read,7B,Start -Read,LoadAFromB,Start,Summit +Read,LoadAFromB,0,SkipExit +#Epilogue +Add 58 + 51 + 1,S + 1,X + 42 + 1,R + 9 + 1,J + 43 + 1,J 46 +Add 1 -Read,0 - Epilogue - -Read,LoadCoreFromSummit,8A +Read,LoadCoreFromSummit,Epilogue Read,8AC,Start @@ -127,29 +140,23 @@ Read,LoadC Read,7C,Start -Read,LoadC,Start,Core +Read,LoadC,0,Core 1,R 9 Read,LoadC,Core Read,8C,Start -#Overworld - 1,S - 1,U,J - 1,O - 31 -Add 58 - 51 + 59 + 1,J + 196 +Read,LoadANoCollects,0,Prologue + 48 +Add 7 + +#Epilogue 1,S 1,X 42 1,L - 9 - 1,J - 43 - 1,J -Add 1 - 46 - -Read,0 - Epilogue,Start \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - All Red Berries.tas b/0 - All Red Berries.tas index 32863b58..4b775331 100644 --- a/0 - All Red Berries.tas +++ b/0 - All Red Berries.tas @@ -4,7 +4,7 @@ Read,StartFullGameFile Read,0 - Prologue,Start -Read,Load1A +Read,LoadANoCollects,Prologue Read,1SH0,Start @@ -23,6 +23,7 @@ Add 1 Read,1SH1,Start +Add 58 51 1,S 1,J @@ -36,7 +37,6 @@ Add 1 Read,1SH2,Start #Old Site -Add 58 Read,LoadAFromB,SkipExit Read,2S,Start @@ -61,8 +61,8 @@ Read,LoadBFromA Read,6B,Start -Read,LoadAFromB,Start,Summit - +Read,LoadAFromB,0,Summit +#Summit 45 Add 29 1,J @@ -74,21 +74,15 @@ Read,7S,Start Read,LoadCoreFromSummit Read,8S,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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - Any% Pure.tas b/0 - Any% Pure.tas index d9bcb89e..756045e2 100644 --- a/0 - Any% Pure.tas +++ b/0 - Any% Pure.tas @@ -2,4 +2,13 @@ Read,StartFullGameFile -Read,LoadEnableCheatMode \ No newline at end of file +Read,LoadEnableCheatMode + +#Epilogue + 1,X + 42 +Repeat 8 + 1,R + 9 +Endrepeat +Read,LoadJournal \ No newline at end of file diff --git a/0 - Any%.tas b/0 - Any%.tas index a68a3045..241c8a96 100644 --- a/0 - Any%.tas +++ b/0 - Any%.tas @@ -4,7 +4,7 @@ Read,StartFullGameFile Read,0 - Prologue,Start -Read,Load1A +Read,LoadANoCollects,Prologue Read,1A,Start @@ -104,8 +104,7 @@ Read,LoadBFromA Read,6B,Start -Read,LoadAFromB,Start,Summit - +Read,LoadAFromB,0,Summit #Summit 45 Add 29 @@ -115,4 +114,10 @@ Add 1 Read,7A,Start -Read,LoadCoreFromSummit,Credits,8A \ No newline at end of file +Read,LoadCoreFromSummit,0,Core + 300 + 1,J +Add 58 + 427 + +Read,LoadJournal,0,Any% \ No newline at end of file diff --git a/0 - Bny%.tas b/0 - Bny%.tas index 4bbcdb3d..a9bfbf1d 100644 --- a/0 - Bny%.tas +++ b/0 - Bny%.tas @@ -4,7 +4,7 @@ Read,StartFullGameFile Read,0 - Prologue,Start -Read,Load1A +Read,LoadANoCollects,Prologue Read,1A,Start,lvl_9 @@ -124,8 +124,7 @@ Read,LoadBFromA Read,6B,Start -Read,LoadAFromB,Start,Summit - +Read,LoadAFromB,0,Summit #Summit 45 Add 29 @@ -141,19 +140,16 @@ Read,LoadBFromA Read,7B,Start -Read,LoadAFromB,Start,SkipExit + 59 + 1,J + 196 +Read,LoadANoCollects,0,Prologue + 48 +Add 7 #Epilogue - 51 1,S 1,X 42 1,R - 9 - 1,J - 43 - 1,J -Add 1 - 46 - -Read,0 - Epilogue,Start \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/0 - True Ending.tas b/0 - True Ending.tas index c96a252e..6fce3dfc 100644 --- a/0 - True Ending.tas +++ b/0 - True Ending.tas @@ -4,7 +4,7 @@ Read,StartFullGameFile Read,0 - Prologue,Start -Read,Load1A +Read,LoadANoCollects,Prologue Read,1A,Start @@ -108,8 +108,7 @@ Read,LoadBFromA Read,6B,Start -Read,LoadAFromB,Start,Summit - +Read,LoadAFromB,0,Summit #Summit 45 Add 29 @@ -117,39 +116,24 @@ Add 29 32 Add 1 -Read,7A,lvl_a-00-intro +Read,7A,Start Read,LoadCoreFromSummit Read,8A,Start -Read,LoadAFromB,Start,SkipExit - - 51 - 1,S - 394 - 1,J - 43 - 1,J +Read,LoadAFromB,0,Summit 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 \ No newline at end of file +Read,LoadJournal \ No newline at end of file diff --git a/Load1A.tas b/Load1A.tas deleted file mode 100644 index b729e3ec..00000000 --- a/Load1A.tas +++ /dev/null @@ -1,10 +0,0 @@ -unsafe -Add 58 - 195 - 1,J - 43 - 1,J - 230 - 1,J - 136 -Add 1 \ No newline at end of file diff --git a/Load1B.tas b/Load1B.tas index 15aa76ce..be77ee8e 100644 --- a/Load1B.tas +++ b/Load1B.tas @@ -1,28 +1,16 @@ -unsafe -Read,LoadAFromB,0,SkipExit - -#1C + 1,S + 1,U,J + 1,O + 31 +Add 58 51 1,S - 394 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 + 1,X + 42 +Repeat 8 1,L 9 +Endrepeat 1,J 43 1,R diff --git a/Load1C.tas b/Load1C.tas index 71fef904..6933a27a 100644 --- a/Load1C.tas +++ b/Load1C.tas @@ -1,33 +1,18 @@ -unsafe 1,S 1,U,J 1,O - 32 + 31 Add 58 306 1,J 188 - -#1C 1,S 1,X 42 +Repeat 8 1,L 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 - 1,L - 9 +Endrepeat 1,J 43 1,R diff --git a/Load9From8C.tas b/Load9From8C.tas deleted file mode 100644 index 6bd4ecce..00000000 --- a/Load9From8C.tas +++ /dev/null @@ -1,29 +0,0 @@ -unsafe -#Overworld -#Start - 1,S - 1,U,J - 1,O - 31 -Add 58 -#Postcard - 307 - 1,J -#For some reason the TAS keeps inputting stuff during the save -#Will desync if fastforward + variants not unlocked -#Not exactly a combo that's ever likely to happen, not fixing - 186 -Skip - 30 -#Resume - 51 - 1,S - 1,X - 42 - 1,R - 9 - 1,J - 43 - 1,J - 46 -Add 1 \ No newline at end of file diff --git a/LoadA.tas b/LoadA.tas index 1cbd1d04..4d56c3ce 100644 --- a/LoadA.tas +++ b/LoadA.tas @@ -1,4 +1,3 @@ -unsafe Add 197 165 1,J diff --git a/LoadAFromB.tas b/LoadAFromB.tas index f3d7259c..eb133495 100644 --- a/LoadAFromB.tas +++ b/LoadAFromB.tas @@ -1,14 +1,9 @@ -unsafe -#Start - 60 - 1,J - 196 -Add 197 - 165 - 1,J - 32 -Add 7 + 1,S + 1,U,J + 1,O + 31 #SkipExit +Add 58 51 1,S 1,X diff --git a/LoadANoCollects.tas b/LoadANoCollects.tas index c06dd366..45e8b6a3 100644 --- a/LoadANoCollects.tas +++ b/LoadANoCollects.tas @@ -1,12 +1,15 @@ -unsafe Add 197 165 1,J Add 7 - 230 + 35 +#Prologue + 195 +#control 1,J 43 1,J +#Summit 230 1,J 136 diff --git a/LoadB.tas b/LoadB.tas index c3242092..3d805753 100644 --- a/LoadB.tas +++ b/LoadB.tas @@ -1,5 +1,3 @@ -unsafe -#Start 1,S 1,U,J 1,O @@ -14,6 +12,7 @@ Add 58 #Core 1,J 43 +#Farewell 1,R 1,J 304 diff --git a/LoadBCheatMode.tas b/LoadBCheatMode.tas index fa0bfcae..5df622e0 100644 --- a/LoadBCheatMode.tas +++ b/LoadBCheatMode.tas @@ -1,13 +1,9 @@ -#Used in the All B Sides tas, which require -#2 level selections to begin the level - -unsafe 1,S 1,U,J 1,O - 107 + 82 + 1,S #SelectB - 86 1,X 42 1,R diff --git a/LoadBFromA.tas b/LoadBFromA.tas index 7361ed83..775b9ce9 100644 --- a/LoadBFromA.tas +++ b/LoadBFromA.tas @@ -1,14 +1,10 @@ -unsafe 62 #Exit 1,S 1,U,J 1,O 31 - Add 58 - -#Overworld 51 1,S 1,R diff --git a/LoadC.tas b/LoadC.tas index 617c6d27..27076314 100644 --- a/LoadC.tas +++ b/LoadC.tas @@ -1,5 +1,3 @@ -unsafe -#Start 1,S 1,U,J 1,O diff --git a/LoadCCheatMode.tas b/LoadCCheatMode.tas index d5fee00f..f1cbdfa7 100644 --- a/LoadCCheatMode.tas +++ b/LoadCCheatMode.tas @@ -1,14 +1,9 @@ -#Used in the All C Sides tas, and accounts -#for the gold berry collected in 7C - -unsafe 1,S 1,U,J 1,O - 107 + 82 + 1,S #SelectC - 86 -#GoldBerry 1,X 42 1,R @@ -17,7 +12,6 @@ unsafe 1,J 43 1,R - 1 - 1,R + 1,F,90 1,J 46 \ No newline at end of file diff --git a/LoadCoreFromSummit.tas b/LoadCoreFromSummit.tas index a5aeea1e..06253bbe 100644 --- a/LoadCoreFromSummit.tas +++ b/LoadCoreFromSummit.tas @@ -1,7 +1,5 @@ -unsafe -#Credits Add 197 - 165 + 164 1,J 32 Add 1 @@ -12,12 +10,13 @@ Add 1 Add 1 1 +#Epilogue Read,0 - Epilogue,Start -#8A +#Core 1,J Add 58 - 428 + 427 1,J 43 1,J diff --git a/LoadEnableCheatMode.tas b/LoadEnableCheatMode.tas index 31be63d0..3435476a 100644 --- a/LoadEnableCheatMode.tas +++ b/LoadEnableCheatMode.tas @@ -1,10 +1,13 @@ -#We use cheat mode to enable -#all levels for the All B -#and All C side tas runs +#used for All B-Sides and All C-Sides -unsafe -#lvl_0 +console load 0 +Set,CheatMode,false + 1 + +#Start 61 + +#lvl_0 5,L 1,L,J 3,L @@ -17,6 +20,4 @@ unsafe 1,F, 1,L,U,D,G 1,J - -#Overworld 123 \ No newline at end of file diff --git a/LoadJournal.tas b/LoadJournal.tas new file mode 100644 index 00000000..70366d7b --- /dev/null +++ b/LoadJournal.tas @@ -0,0 +1,16 @@ + 1,N + 52 + 1,R + 300 + 1,R +#Any% + 300 + 1,X + 59 + 1,J + 43 + 1,J + 46 +Add 1 + +Read,0 - Epilogue,Start \ No newline at end of file