From 0868bfbeb7be012fc09e0f4a5691012e0e1fb816 Mon Sep 17 00:00:00 2001
From: Jacoder23 <Jacoder23@users.noreply.github.com>
Date: Mon, 15 Apr 2024 05:34:38 +0800
Subject: [PATCH] fixes

---
 game/images/chills.png | Bin 5684 -> 4525 bytes
 game/script.rpy        | 177 +++++++++++++++++++++++++----------------
 2 files changed, 107 insertions(+), 70 deletions(-)

diff --git a/game/images/chills.png b/game/images/chills.png
index fa9cc78d79e76c6ff8b5ac52c590ddfc72fe5c8f..fbcb2248b6b00e25e950755540344deb875f1513 100644
GIT binary patch
literal 4525
zcmeHLeNYr-7=MAB(njGp#pHCAyTcnxF<S@4))3g^LlG2Q5;cV;_pHd%u-Mc<9gw|%
zJFjeF1&^^BnO4D%GyFIT$4)4{JQ+;qtdrbpf`$NB5bzMTMZ}<co$1eJ;+?s<d7j@s
z&-=c=-}5{(ySfz#G2_PtjspOUkBh~V0Pw-YU+yzLq9^%;)hhlyrHNP`0l*3U&fb-u
zh#*)Ize+9o1#z|6+AOSq<Me<@uq-ZT<$we%D~JvoVaozp0&8hwEhI_ytJR`c=jBBJ
zz!12F00ILDTB10j@X~lmXc5e^5EdHHBp_^ZIV(N}0Ex<3QqB+qUZ)Kg1b|ymIVq=U
zf?*h&#b&VxtWy9C3$kc{vJweNqBMasBw=A0r_(9eP?iQHF2`*&!{7vs$}I%yWU_<-
zjAa;d!UTzUozXSQz`tSOZs?`Fyu33F`<4RW1-2z6Bo8#g|9FAq?x%yr`4Jz7N35bs
zTN@(uM^YxL>ut^5F9}R=QuBU%iDCRkA8keD<@^ihdXMGo`t6uj@VT>!+Z~Jf>7JJJ
zOOyz0^)XU2{C)9J=O`hg#qeKmg!yk`Il`S*A+OxuK+#qOBIoJ+Sd0rAG=oN(|3F8W
zhYK_Zi>OT=DUi=~oa0h7HlLID8Yyd(65;)HF&HkI^$J(m_Rd}hoge*p$HzIhuf|%N
zZ#23)rt@3&j*J^f(^*Vi_bQy)mlDd|#zvg^VTNWeK4YT-`F5FS;&bm|Ys<smeYkH2
z<hUiZ<{WpED>cXc!)ezv$OE&u`(`<EMe0e|=E?T#&>D$d)u>+}@r028ySu@7unP1-
zvdS)+%ZjKoGRR%#@lzLX=kNRsiCSwlm;LxPfAq#H9r|hmgr;4To;2UW%H&5Mkv?35
z(*;dzRCwT*xeJ$i@+1oIPA0Z&?7Rd|Oysc1elECE*8Y7jJt*ezyqwW*ggK~u=W!}~
z?x7>5ix})8b(ue<YUdPUE#0>cltZ{h{OsA0E>%cSW$@n>G_;E|#AH_~kw6G}hxtEM
zr=}<E;QITuf;To4F^r9E1ysPR!PiW|h#t}en<v^|f8kKyKK)GPlQicxMRK>{rPR@&
zRi3I*Akh$(d}+;A0#m%qrRPF~E2aWsq>E~1AXSji<T`VICH0)jlZnN%P3i)TvfB6{
zEeMJl!4<2yzeM}ZtZrENOw+woLmhf|4!>nT<W#$;T637xkO3{2H!y`G<6>r~<+vJJ
zGA_qDnLVrVK)Ii1Z>;yXr-Zgl<F`zLXgH5A)MU;#^|fCJfS`H&RHwwZ2y$AMx~Yea
zq$f_bT+b0Gj+2a9MNrqUf*BfN$3D`u{1Wqim(<_?ZOC-n#+N3>#?FQmdtDv+@zr{&
zHp+c{?swB5`Wkc^p*cq18z1RPOh+KOmvK|V+A0zadzC=}5V*pXy6)4fD`U#;wl?Y#
zVcj&vzF6w+YPXg{?j;sxy?%$X98HwiZLs58%{?iRT>5fPmBpb^PyuSAZW=T#v$)$T
zh+IZ~c9%48Y#de!E6|0evTTLv-btz_4w5|%3olZg%5jTL!!VwLD@{UJ-@QH5YRHY(
zPqO#aPcLd}_D135SD#UpAUyEyfT1!mwq3TNr%QVtM%dg!O?U}U=|gt*F8H+p!q^|2
zW04!Z|6#ZDKBR(Uv3!?fO<E{K$ZLG*20u}R%(o&iRBHcf3~!6a$^)z@%9pMg25fxR
z7L9#2=S3O6uIhY-HPhj3me_}!C6jB-lg_)fm9L3=oXyznpqoyPAr+>}0mVgB$l6EF
z>QIy9MhHB^U|O+9xd-)^_ip9RQoBE(o47H*2bl^c7w1zU>(h{j&g$op9_8qJz@v8{
Z!8^T%Z#%?(A$|h^AWoftS4O7o`3pwH_GthB

literal 5684
zcmeHLdsq`!79W<{mbz^Ss7S4eBw!yPShLD11E_>XMX@c7NKuel6D`kzn!yBO>mw6+
zm2SbNU|8)}-A05;l!qaS+XS!@jLJ3=2_O>@TSCHsCYWHd6Vw&3+imyXI^UNsGw1%!
z@1Facd(ORg_-{wkUVP!@7XScwarG+dy8z${V!!>*yJD7@(@G`w_Y8Bzx)lI$x{zag
z=Wkde@b=pGA~CxIyNoKMMC71SVdo=VB%+c;B!B^kL=McLqN`W{%OR2&MG^*sVULW&
ztb7+2IsgdhR0$n$2mm^aC!Zv{FkSF4*2t33B`^Rp0J@4q5@9d^U{FXR21!77TDw$K
zhXbHWC?p06hUo%<KqXO0Bo0xR0}zM+77S2Ccszqaf$3BMgDw#Xy1Kd?DvAgO7*rBf
z1q%dJI!qx+=#(x2%i(Mj2?UInUczI;d3rrn;I}9+yyW760|)BcKU)I;F2K%rqhp+j
z@CUwt7|U~h0Dx~_O<nOGR6f|XB2$0yY~(xY3!!Q*!$I4aHZ<*pf2fY^eg3oL#jTo|
zE6PtD46$ExxcngRzVCA5Tcv9;G|vM^MLt;ty7QkSq04;<@GlzE@M>;CqfLDNwMm$|
zJlaa|z^`%KZbMVVcwCE7?1>I7v}pMd^rg)}1wmELZW4iTD=Y+$!(~+*X<Q(brWl95
z$zWRI@|>8;NGC=!j!7QJoP~M32KD>VFw^{I;RDWDPR{>|4`^y9Y_-KW?A0Nhxw@Vl
z`;9|99=-^Im1F`5g?Xz$#Ago&9CR_);Bk6$?KL~6n&W{{B6wUeq>S(-pzeGcNW~R0
z`@YWO?doq9*91S=T$ImDw~~p-U+16;jnF4#8y=Uq2BY?P+|%tO^p*A8P@$M`Fg+s@
zOx=a_CQS&!iIgo9a?@en$NnL@gpFDu1kHXJ;X|5ZEy}F&wwY)?cc-kq0j(UnHw%X&
zKaB8Uz;}Gme8<JR(}yA^cRxPR<zR~z=Jl`|e<*<%L1XT?BA+L`RfP#)rL7Hm%LwyY
z+#kpPh=7RdAO^84eYfV2QgQ7`DaG<F=F@&k4LV<ah-of_AYjTMXw6xg%SFUoTg4hU
zR%}~3a2=hC4gpgHC(c&K;eve3XZk92GjPO}lSgwq0*R}*J2UZ_iqzed!5V0EIdV_2
z4PCer<kkle-h%sahnp17qhq}_&}<)J_@-_f$yZsVO~C}W(?AK<_$F#dn1yRmirI1C
zE1qiOHZ;Sa&^H7g73X@X{e*JPcJw<M$h~(NNh*Tu!$+GG1azz~B99k}+-v2{!m-2N
z5Q-U6R<Ex5V8693MX8|S)k>Ndu3AY!uQVzA(Y2hN=+GL_leigdw01y+o-cFrr4=Ra
zvDL_^eRLg~5%T-)+T=>H<w|wbDzL}!bEv92TsEJOcJue$Et#S2uJ(5O$wK7!p9>VC
z^rFOBxZp*S{Ursbg4Th$3kHu3OKN3*K{LqWsEyhV>s6(qKoyv@ZR<dk=YN2MI8<e?
z@h7YWdv2v^^L1Xhx{RiJOJK#WL{RtrOntY6qsc)trpM;9O~Y}PCdGnHZyKeo%&x~k
zZm>|F*k~E(<b9d*U2%0jv*81s9(yhO+S0ag+^!97z=#abHXqLDO2gb$zhX28p@#d`
zEMlhl)&=IRI7Uk-dt@|I5=2N_F=ftd)i1R#A8^}@HlYEg0w(8VwNkMF#*%x&)XRwk
z^~B_xu4h}4D+D2uWkM8tvx=#pcfd|u@aLDU(@>5mOTR<%)#k%c{j|yRoP-86QHD$S
z{W13$;D8oOwz_#!l5H275`KHsl^C92y9iYcAPq+K=_h!ORp&8%_m)7H_N+3dFA?fP
z&#b%T@g!FynnK(<wy$vP3rJQlp>RDa3s}`)iam-_WNjCZ6;@*<jTk*eo+!O{_5~@#
z;FhjGD?2GoM(}E$=j8mi4nfUClMdQIC}QqFQ&=Pd%9%TL*kgU%wKH(+T;|r6@Q`Rw
z2TzXXO01G%UuD{}P`EukT+IEji7c$1Qp0?)^b0^UDw{^mm5OWktOa$2lR1i^=utV>
zT^&4U^>$w&T5+VS461(}UE71lg)1pJG;qvaeFrNl5nww@slYvGc<WCc@m&eC`;FK<
z{{lL0f_X$lAR`lUVWzbZ8ubzW6oT~fpy+z?(e&DybHz|IOX5dJTL(t5lp}3Q@lG1p
zvv%r(@0~VH?5mgzucHB7cy+L+`s!SiLz(y>4k}>wB^7#lTn+A!p?4uOR#=NL<;K^Q
zM^jHYx=`=t_ESt-VeYo{)F`C)ID;mysjKxvGh)PFCu-w6KZokS)n2JKoJw5{>i%W8
z9c$Lq`V!JU+I`2LogBYxsj!&#a`u<Au8xW`nEL77J$oVL$jm7VOc*HC(yr%LqRIa9
z157RZ1bNPE`RiEpf0we}AfQ8DY}0!n(i>#%{uWXy5)INA?B&Wk*e4Qas4vu8?Cr&^
z9#$~bjhxQ8$%rq6>JQZJFAfgN6fdBGx|Q+YUzkH|(3X-3X-5|%-7F~5rL^L4b(c#Q
z4mZ=%YWrYb{Pw8X*?MwtXXbpw+wmG%FI;SkXH?|%u<p(w%AKCww|))|%XRWKw*8pS
z8FTgmm7VMv9c`<91sz%vD@W0?)TKyoYE`aYj}b+~Cqh4>*vDCRYT~=udhy}TOr>H@
z`Q1`W_o$)I>GmvB+9wSTV>dW?{~4E_Z7NVFq+!9OXZ)f|`A^Vwo@6BUeER!wmwqf0
zY{upX-M_VA4@HbQ$v@h*G&Y^F8;c_LR6zgFZK^<Q#)(S$Hc16qY?O&-YsyasQzYfH
z)mE?5!@J;q{szs}-HT+U&RC-U-}~}!pu+Gw7h@^I@yd}IsdHK+=McLgi_dF4ve+oK
zur>F!{T{f(A;~(n$x>+(tNjRpEKR+o+Z1PERz!iDjFlgoq&;GzIt;5;x;T9|Th8pN
z$f@!~mgep?FC<%<MrI6%yV>G_sCaBcRj;#R&Iaq%4cHDWurACf4VK8xlwe!1)>B1n
zQ(IL~>b3<)Z{`3-^rTDX`(U+(xZ`FGB>W(>OkWnOBl-{mUlqC`y(Q3mm=}u(<`EM3
z%ugZ6Pq=*yWyk|iu*uL#%q}vu-Qq#@<q!#-CtL->uX^ARzH%RQ3`-qCJh=V};@x1b
zO3B6I;6G}62xVR$z0K4Mr03aEf8jvQz40D*IJ5dV-<j?6oyq={GuPe3TEjZ-{XelT
zci%9FRvCH^(Vct`!kHT5_tpqw_O)xuL*iSxb)nAj2PBy;%{9-%WU1LN4PkZc!_>Oy
zVK(ZLaF`<gQ5}*j-UMJqHrSG=fk6MnWu~(-o;Ji;Tiw;qjPDPW&b@-WbKkH6Z1hm?
zzsuWn?_4!R+K|#y1MTKdR%$|ML)nR*{tUfVrX4&IQn?b`6b*V#;d;=)^@yrOcl8l$
z8EP3=mIsacA>JfHt&&0oQ}|36>hMszqu==neN2b?4>5ZKI>WP&d#>XaBq<7vP%28H
zgD`Ia`e!^Y9`Rl@yg1bn(w}f6?Ma5m_!RkZJcbe0rl*dn5p+Gj|IBn<yZIEqpQt$@
z&;5jbUA7n<Q&{g@3(8pESvOzE-B@9_PBZSXX_O<lf%ZiC`Ows!uOR!DoI3+v^<^mQ
zT#mex>s18FE{ukB$$AFmc{DKb!?7c2JtlJxwul5RvPajMST+-;t(Q0VM5je^pM}Ex
zdHM48L0gyI*3#_CzFyHJbzJ&*3DWyDJmIW!<Hcr$CvI%t#8XUZV{jP}=`Egk78=^}
wzmG{1@xOkcdW!rl$IhoJJyq!snMYRc-U3&VYXs*d=ZCS?k<rwum0LdjH?6t@a{vGU

diff --git a/game/script.rpy b/game/script.rpy
index 9ba0648..9e22dc3 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -748,7 +748,7 @@ init python:
     marisa_progress = 0
     time_traveling = False
     asked_office_location = False
-    did_not_submit_passcode = False
+    did_not_submit_passcode = True
     has_correct_passcode = False
     chose_reimu_question = False
     first_time_traveling_through_time = True
@@ -757,6 +757,7 @@ init python:
     reimuClue = False
     marisaClue = False
     binaryClue = False
+    asked_office_location = False
 
     # not included in run save
     did_not_visit_faculty = True
@@ -770,57 +771,55 @@ init python:
     tt_Goal_Lecture_Mention = False
     tt_Goal_Consultation_Mention = False
     tt_Goal_Exam_Mention = False
-
-    class RunSave:
-        def __init__(self, attacked_student, garden_of_the_sun_lecture, janitor_talks, revolution, exam_cancelled, investigation_progress, reimu_progress, alice_progress, marisa_progress, time_traveling, asked_office_location, did_not_submit_passcode, has_correct_passcode, chose_reimu_question, first_time_traveling_through_time, time_travel_without_choice, aliceClue, reimuClue, marisaClue, binaryClue, inventory_items):
-            self.attacked_student = attacked_student
-            self.garden_of_the_sun_lecture = garden_of_the_sun_lecture
-            self.janitor_talks = janitor_talks
-            self.revolution = revolution
-            self.exam_cancelled = exam_cancelled
-            self.investigation_progress = investigation_progress
-            self.reimu_progress = reimu_progress
-            self.alice_progress = alice_progress
-            self.marisa_progress = marisa_progress
-            self.time_traveling = time_traveling
-            self.asked_office_location = asked_office_location
-            self.did_not_submit_passcode = did_not_submit_passcode
-            self.has_correct_passcode = has_correct_passcode
-            self.chose_reimu_question = chose_reimu_question
-            self.first_time_traveling_through_time = first_time_traveling_through_time
-            self.time_travel_without_choice = time_travel_without_choice
-            self.aliceClue = aliceClue
-            self.reimuClue = reimuClue
-            self.marisaClue = marisaClue
-            self.binaryClue = binaryClue
-            self.inventory_items = inventory_items
+    asked_field_faculty = True # TODO: Probably make this a choice variable
             
     def SaveChoices(): # for a future run
-        save = RunSave(attacked_student, garden_of_the_sun_lecture, janitor_talks, revolution, exam_cancelled, investigation_progress, reimu_progress, alice_progress, marisa_progress, time_traveling, asked_office_location, did_not_submit_passcode, has_correct_passcode, chose_reimu_question, first_time_traveling_through_time, time_travel_without_choice, aliceClue, reimuClue, marisaClue, binaryClue, inventory_items)
-        return save
+        persistent.attacked_student = attacked_student
+        persistent.garden_of_the_sun_lecture = garden_of_the_sun_lecture
+        persistent.janitor_talks = janitor_talks
+        persistent.revolution = revolution
+        persistent.exam_cancelled = exam_cancelled
+        persistent.investigation_progress = investigation_progress
+        persistent.reimu_progress = reimu_progress
+        persistent.alice_progress = alice_progress
+        persistent.marisa_progress = marisa_progress
+        persistent.time_traveling = time_traveling
+        persistent.asked_office_location = asked_office_location
+        persistent.did_not_submit_passcode = did_not_submit_passcode
+        persistent.has_correct_passcode = has_correct_passcode
+        persistent.chose_reimu_question = chose_reimu_question
+        persistent.first_time_traveling_through_time = first_time_traveling_through_time
+        persistent.time_travel_without_choice = time_travel_without_choice
+        persistent.aliceClue = aliceClue
+        persistent.reimuClue = reimuClue
+        persistent.marisaClue = marisaClue
+        persistent.binaryClue = binaryClue
+        persistent.inventory_items = inventory_items
+        renpy.save_persistent()
+
+    def RestoreChoices(): # from a past run
+        attacked_student = persistent.attacked_student
+        garden_of_the_sun_lecture = persistent.garden_of_the_sun_lecture
+        janitor_talks = persistent.janitor_talks
+        revolution = persistent.revolution
+        exam_cancelled = persistent.exam_cancelled
+        investigation_progress = persistent.investigation_progress
+        reimu_progress = persistent.reimu_progress
+        alice_progress = persistent.alice_progress
+        marisa_progress = persistent.marisa_progress
+        time_traveling = persistent.time_traveling
+        asked_office_location = persistent.asked_office_location
+        did_not_submit_passcode = persistent.did_not_submit_passcode
+        has_correct_passcode = persistent.has_correct_passcode
+        chose_reimu_question = persistent.chose_reimu_question
+        first_time_traveling_through_time = persistent.first_time_traveling_through_time
+        time_travel_without_choice = persistent.time_travel_without_choice
+        aliceClue = persistent.aliceClue
+        reimuClue = persistent.reimuClue
+        marisaClue = persistent.marisaClue
+        binaryClue = persistent.binaryClue
+        inventory_items = persistent.inventory_items
 
-    def RestoreChoices(save): # from a past run
-        attacked_student = save.attacked_student
-        garden_of_the_sun_lecture = save.garden_of_the_sun_lecture
-        janitor_talks = save.janitor_talks
-        revolution = save.revolution
-        exam_cancelled = save.exam_cancelled
-        investigation_progress = save.investigation_progress
-        reimu_progress = save.reimu_progress
-        alice_progress = save.alice_progress
-        marisa_progress = save.marisa_progress
-        time_traveling = save.time_traveling
-        asked_office_location = save.asked_office_location
-        did_not_submit_passcode = save.did_not_submit_passcode
-        has_correct_passcode = save.has_correct_passcode
-        chose_reimu_question = save.chose_reimu_question
-        first_time_traveling_through_time = save.first_time_traveling_through_time
-        time_travel_without_choice = save.time_travel_without_choice
-        aliceClue = save.aliceClue
-        reimuClue = save.reimuClue
-        marisaClue = save.marisaClue
-        binaryClue = save.binaryClue
-        inventory_items = save.inventory_items
 label start:
 
     if hedgehog_dilemma_solved.has() or they_have_your_back.has() or she_has_your_back.has():
@@ -1988,7 +1987,7 @@ label start:
                         play music conversation loop
 
                     show yuuka amused:
-                        xalign -0.2
+                        xalign -0.35
                     with dissolve
 
                     yuuka "Good morning, class."
@@ -2119,7 +2118,7 @@ label start:
                         yuuka "{i}The students seemed to be getting the picture by then, the situation dawning on their gaping faces.{/i}" (cb_name="")
 
                         show reimu angry:
-                            xalign 0.3
+                            xalign 0.4
                             yalign 0.5
                         with ease
 
@@ -2183,6 +2182,12 @@ label start:
 
                         show yuuka irritated unmarked
 
+                        show marisa concerned
+
+                        show reimu concerned
+
+                        show alice worried
+
                         yuuka "{i}They took to my \"sense of humor\" well enough, earning me one or two very polite chuckles.{/i}" (cb_name="")
 
                         show yuuka neutral
@@ -2227,6 +2232,8 @@ label start:
 
                         yuuka "Do not harm any of the flowers. You {sc}WILL{/sc} pay your debt if you do."
 
+                        show marisa defiant
+
                         show chills at idle_horizontal:
                             xalign 1.1
                             yalign -0.5
@@ -2249,12 +2256,16 @@ label start:
 
                         $ renpy.pause(1.5)
 
+                        stop music fadeout 2.0
+
                         marisa "Hey, teach! I think my flower's broken!"
 
                         alice "I'm not getting anywhere with this."
 
                         narrator "Reimu was the only one out of the three still taking the assignment seriously at this point."
 
+                        play sound "wind1.mp3"
+
                         reimu "Listen to their voice..."
 
                         yuuka "{i}She was staring at her group's potted plant so hard you'd think she'd burn a hole.{/i}" (cb_name="")
@@ -2263,6 +2274,8 @@ label start:
 
                         alice "Marisa, shut up. Let her focus."
 
+                        play sound "wind2.mp3"
+
                         reimu "{cps=1}...{/cps}{nw}"
 
                         scene bg classroom
@@ -2275,7 +2288,7 @@ label start:
                             xalign 0.4
                             yalign -0.5
 
-                        show marisa surprise:
+                        show marisa neutral:
                             xalign 0.75
                             yalign -0.5
 
@@ -2284,8 +2297,12 @@ label start:
                             yalign -0.5
                         with fade
 
+                        $ renpy.pause(1.0)
+
                         reimu "...{fast}I've got nothing."
 
+                        play music conversation loop
+
                         yuuka "Let's wrap this up class! Return to your seats."
 
                         show yuuka neutral
@@ -4793,6 +4810,8 @@ label faculty:
 
                 marisa "I am deeply uncomfortable with you saying you're holding the students' beating heart."
 
+                show reimu concerned
+
                 show chills:
                     xalign 1.1
 
@@ -4923,9 +4942,9 @@ label exam:
         # VAR   Y
 
         # This leads to the 7th ending
-        if exam_cancelled:
-            $ day += 1
-            jump finale
+        # if exam_cancelled:
+        #     $ day += 1
+        #     RRR
 
         label exam_proper:
 
@@ -5076,7 +5095,9 @@ label exam:
             reimu "{i}Assuming this isn't just a plot of hers.{/i}"
             reimu "{i}...I hope it isn't. Besides, she's more of the brute force type anyway.{/i}"
 
-            jump hallway
+            $ day = 4
+
+            jump penultimate_presentation
     else:
         "Day is currently set to [day]. This should be impossible. You've likely encountered a bug."
         $ raise Exception("Impossible day " + day + " for location") 
@@ -5384,7 +5405,7 @@ label penultimate_presentation:
 
             if they_have_your_back.has():
                 "They Have Your Back already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -5402,16 +5423,16 @@ label penultimate_presentation:
         elif reimu_progress >= 2 or alice_progress >= 2 or marisa_progress >= 2:
 
             transform leftbottompresent:
-                xalign 0.10
-                yalign -0.5
+                xalign -0.05
+                ypos 250
 
             transform midleftbottompresent:
-                xalign 0.4
-                yalign -0.5
+                xalign 0.3
+                ypos 250
 
             transform midbottompresent:
-                xalign 0.7
-                yalign -0.5
+                xalign 0.65
+                ypos 250
 
             if reimu_progress >= 2:
                 if alice_progress >= 2:
@@ -5445,7 +5466,7 @@ label penultimate_presentation:
 
                         reimu "Your school is a madhouse wearing a thin mask. Whether from the Outside World or Gensokyo, I can't overlook all these humans here."
 
-                        show alice angry # at somwhere
+                        show alice angry zorder 400 at midleftbottompresent, flip
 
                         alice "This has gone on long enough. You're teaching a mockery of magic to earnest young students."
 
@@ -5569,7 +5590,7 @@ label penultimate_presentation:
 
             if she_has_your_back.has():
                 "She Has Your Back already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -5632,7 +5653,7 @@ label penultimate_presentation:
 
             if hedgehog_dilemma_solved.has():
                 "Hedgehog's Dilemma Solved already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -6104,7 +6125,11 @@ label day_transition:
 
         yuuka "I have my plans. I do hope you eagerly await the fruits of my labor."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 2:
         # TODO
         # TEXT  N
@@ -6130,7 +6155,11 @@ label day_transition:
 
         yuuka "I will take great pleasure in seeing her downfall, as well."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 3:
         # TODO
         # TEXT  N
@@ -6156,7 +6185,11 @@ label day_transition:
 
         yuuka "...I really hope you'll understand."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 4:
         # TODO
         # TEXT  N
@@ -6183,7 +6216,11 @@ label day_transition:
         else:
             "{cps=1}Are{/cps}... {cps=1}headed{/cps}... {cps=1}with{/cps}...{nw}"
 
-        stop music
+        stop music fadeout 2.5
+
+        scene black with fade
+
+        $ renpy.pause(2.5)
 
         # TODO: Test if this works in this context and still lets us time travel out