From 30332115e6e990ade1c3b4637567e0a9a9c7aa59 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Tue, 11 Mar 2025 09:23:36 +0100
Subject: [PATCH] Faster

---
 art/animations.asm | 128 +++++----------------------------------------
 lumber.xex         | Bin 23042 -> 22408 bytes
 2 files changed, 12 insertions(+), 116 deletions(-)

diff --git a/art/animations.asm b/art/animations.asm
index a488ac7..a6839a2 100644
--- a/art/animations.asm
+++ b/art/animations.asm
@@ -99,19 +99,10 @@
     mwa #gamescreen_r_ph2p1 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p2 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p2 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p3 animation_addr
     WaitForSync
@@ -140,19 +131,10 @@ AnimationR2 = AnimationR1
     mwa #gamescreen_l_ph2p1 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p2 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p2 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p3 animation_addr
     WaitForSync
@@ -181,19 +163,10 @@ AnimationL2 = AnimationL1
     mwa #gamescreen_r_ph2p5 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p2 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p3 animation_addr
     WaitForSync
@@ -221,19 +194,10 @@ AnimationL2 = AnimationL1
     mwa #gamescreen_l_ph2p5 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p2 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p3 animation_addr
     WaitForSync
@@ -261,19 +225,10 @@ AnimationL2 = AnimationL1
     mwa #gamescreen_r_ph2p1 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p2 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p11 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p12 animation_addr
     WaitForSync
@@ -299,19 +254,10 @@ AnimationR5 = AnimationR4
     mwa #gamescreen_l_ph2p1 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p2 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p11 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p12 animation_addr
     WaitForSync
@@ -337,19 +283,10 @@ AnimationL5 = AnimationL4
     mwa #gamescreen_r_ph2p5 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p11 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p12 animation_addr
     WaitForSync
@@ -374,19 +311,10 @@ AnimationL5 = AnimationL4
     mwa #gamescreen_l_ph2p5 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p11 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p12 animation_addr
     WaitForSync
@@ -411,17 +339,10 @@ AnimationL5 = AnimationL4
     mwa #gamescreen_r_ph2p2 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p7 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p8 animation_addr
     WaitForSync
@@ -450,17 +371,10 @@ AnimationR8 = AnimationR7
     mwa #gamescreen_l_ph2p2 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p3 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p4 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p1 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p7 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p8 animation_addr
     WaitForSync
@@ -489,19 +403,10 @@ AnimationL8 = AnimationL7
     mwa #gamescreen_r_ph2p5 animation_addr
     jsr SetPMr2
     WaitForSync
-    mwa #gamescreen_r_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_r_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_r_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p7 animation_addr
     WaitForSync
+    jsr SetPMr3
     jsr branches_go_down
     mwa #gamescreen_r_ph3p8 animation_addr
     WaitForSync
@@ -529,19 +434,10 @@ AnimationL8 = AnimationL7
     mwa #gamescreen_l_ph2p5 animation_addr
     jsr SetPMl2
     WaitForSync
-    mwa #gamescreen_l_ph2p6 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p7 animation_addr
-    WaitForSync
-    mwa #gamescreen_l_ph2p8 animation_addr
-    jsr RestoreRedBar
-    WaitForSync
-    mwa #gamescreen_l_ph3p6 animation_addr
-    WaitForSync
-    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p7 animation_addr
     WaitForSync
+    jsr SetPMl3
     jsr branches_go_down
     mwa #gamescreen_l_ph3p8 animation_addr
     WaitForSync
diff --git a/lumber.xex b/lumber.xex
index 43a1f40fb75be2ca9aae9c3a8982c2ea900772a0..5c8bbf83233d9f0c1034b479078fc046bc14776c 100644
GIT binary patch
delta 2617
zcmcguYfKzf6lP~xKxoK{HfdR_cPU0tv!SxJfF`X8)l%_M9u{J?V-*WV0<_vPcbIIY
z43EW0TE`guu}!ndCSG)?q?+33nwn_ipf!^&@7E8Ft;UK=V!%gCJ$H7N-5IgzkK$&t
zcfN1F`R1N;?!9L_KeY9pvVHJT4l^vAK9h6v{aGD+=$LvnnuT%%IkMyUUCjd8(u#W9
zNea4%(UlgGPRI2;WfxjdZ7aQaxn1tBa5JTxJXmoX<HGVc6%Y9)@R$9Xz4D$m-H_34
z1xqz8`jVO+y+zH|9O5ywix2halFHgvfIncgpGPjNjN_<BwP|aW2^`H-87&PRdZn_y
z4Rsxa-vo&dQL^z>6M5hOCD}F~49lL2T+EY+d)mPBSKagPgeN8Khw0-B2~SG?rF;I=
zMsK}-m@r~DvJ0wP`vVdI(}6f0Bt@FQD7_t(^JJaagL-{DNfEmtFw`utq(GENpOo(<
zCDNT<(B^u{1Cq;&8ZbH`pietuR5_&ppTf)3c7uvb9=6~|ELe91iv}N#d6pUi7bZ5b
zpC$LgOo(|V)l{<0G?P8XQ~tzEp0T{?Sqt84#xA1U!c?{yGudSb7CE`3>UQ7ig??R;
z%WJALeK$JjYs3tz2C{En2fqJW2#*=5N?Hhyo6}34u;3>x_<HKDm&}}l2E!()@Gn}N
z_giqI1)J;qw7JeVG&1>jSVyZk|CMT{m+V0rax5@kd}me|X-KNsPD^GUwctt%-fG|m
zV+EHP_!@h+#z!^g96V<{mQ=%i1{I&|^A`Mq1@AU+eD78nc#*T_MBY)AZQ0BJdnQ)c
z%d4LQdQc~Q?;u5Rva0cu6?wQ&{{`q@Wzfi6&?MxatJgCyq}3GfJRyYoRa?}9Af2Z3
z7<3@dik;jv=WOhfZYdTzqxt-xu19MQ-sj;+zSP1%zmdf^$yM<!Xvolq&>I3eqjw`X
z`Fl|>Pa6O#<-kWSsNJ4D$OZOo41dN2zS|i7mXrBfR5Hf}_T~*cm*A}#8o66K#{@IN
zbM6h_bAdVcu=BTIYWT8y!xb)YnIaH;&H%N*osQI&+kCTFnZ;_ZR!E%EES{gi$_$0M
z0B0~X`}t|COj9NUm}xveg<0YZ+5=N~*!d?Lw1=l~V95)wXG8vVO-^ag=Aa`yhXYS-
zrd-h0?GFzLVjn8v*-QSAU(M7~$xWhvz+m%umTZ;IGnaZoJ?bX7S48_T&z|pbrb2G$
zwfyn!O}<GSEgm3_l3ylqCjGqY*N3J)@dznyN)cZhjNtHlg4h`z6vU%LoyU)Sb?&6L
zq!{w1LeP1s?)?#bmg>$@-N}@HE7fJ?XhOL*S&H&`2nVcXp)NOfETM{vzUb25EDzP?
zH;k`*o1LG;;GjA*JG#&TC8vu9sBtV!U}X$T<5(HR(im1our!L52$n{$l6kSv7R}Iy
yfgk-+1heo*h5qX+tIu2WiJ%oIT};%C>IAv5-orEt^4s+uM@V=lg5|I4xBLSq>^IB+

delta 3081
zcmcguZ%i9y7^eqi43?!EE-A3#%U}`QLO{yEshd-_fl}xn+JbIUr<<Z5D9*odFLy%@
zM!QS4oS68b2AeeDB^EVk%uH%9(ZxeeF55?wP5l6VP*M{k(U{EVy}P#8Q<pHAP1E;&
zzxVe(_uTJ&``mNxJ<HgKmiIr}&b09hA8+5bzvMR@zaZa8m7w#SbhZ8BT`L@F2_a^L
z<e^TCei|g3=qO>z{xXPsA$qYqEJZr1n1vB(zGEjd%}QT)9OgXui-?lnxpznn$S8L}
zNVzceoV+PjDsNS+!Ugmdj!&wRPG1OMKStkUG|eX5I8`rOlpP5VP8G|HQiv8`>g*dr
z!585-OHRB>N%Tq%`P~bua)^T=6Emd8WYRG$5Hs{LRoZA|EhZ(8zDCKb*_f1^IYUXL
zMlKvCj4**PCs!%IgAuS4p3_S5L=Q%1hta2)*o8^Nl#G%*VFDfut#DF<YlqbBv~t&3
zWamLz?jZMz6^;yezz7af@aJ%5@?mWf)nT-s(-ybsR2m;K;iD#eOvBZg0Qc#F>#P>=
zULC{Uz0+03c`5uPn{1CZt!aHm;HSWl?Bm)bD##{#T&L2>o-pAjOt@dHRjtV+t7c>8
zAt5aRx4t06O8Z=uMpGZuW;EGhBY21cL!Rw=jQ`ElO3vVCuQ9bgBY4b|XHd`cKl!QJ
znce)G`dPN22i2*kpWgc}6Ye%)mxfC-dw)9*<|)(7Pn+;FCj6{u&pnv8=^$>bX&ZO&
z*6){US9UXV{3_$r5@;xi>#c$vru})ugda8G&RkqU4(UX?3Len0UIo>vXZY8yx9~lg
zdp~m0gr73ur*m-y3Ft(+@OgB+!G-S@ease=oBFtM=kFH%^k<66zxxUA^hglixW+GO
z5JV!2H4f4$?s1^mk$B`AXh;q~XHo%geQC&D#=vmi-L%ur$0M>ORgXd}*$1mgdKJ}u
z>#iuBW=SpZQ$~KX=gd8`Bcw(gWS~`$gg3|y;Z5kJpoKtNc+@yb8wp|&&LL(Lh6q|1
zf#yh>_Z-<;%SKODCtKO*57o(bR<d|eYcCt^-@Rm8gLhw%Lhcq9nOITsTGg%-Z1h^y
zlI_=6L2{*P*J(DoLJ<f)V}N>|UFh?+S-1dB1h8DL)DfE)z^i_o@Kab0(2t={TlL|D
zk1|ET`0#2E4iZ}|KiY$rY<~n}`N<v}U30+ggYmF^z$PAVj#-nvIO=bvT+A{NPVVJ}
zDKv+J%i(xfE>;T2W+6PMv%4YOA@MS^JQ<&q8)2@2wos$N%agVO@P=MX2Yrp47pI!$
zh_&@+FD|B^*|0hcObI+`8pspQ&O32(4=;=*YkA@I55_L?UoOrlYYAOGPzO2()xFz=
zFHzkks+-CCyHd_5yR*s;qZGZ3;c*~zY(_3nm>54Xt|c=7OPkf3xUx&rD?cAs(~(;I
zHK*MFJRMy1(y+2s$w$XHI0r%4Q=r@!TFitCi*B6g#-a-+y0F-d6HY94;Y9J3I!mfZ
y9p-)vi%uMb#*=pOi~ikPnt7!*G0vo_&=pQv_181dlU4@mt#|ToIkDspwEP8^15-Ev