From d846df8bcb32590fed38168546b1d89c56759e31 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 15 Apr 2025 22:50:27 +0200 Subject: [PATCH] Correct RIP direction --- art/anim_exported.asm | 24 +++++++++++++----------- art/lumberjack_export.py | 9 +++++++-- lumber.asm | 9 ++++++++- lumber.xex | Bin 25716 -> 25767 bytes 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/art/anim_exported.asm b/art/anim_exported.asm index 1189a8c..18acec8 100644 --- a/art/anim_exported.asm +++ b/art/anim_exported.asm @@ -55,7 +55,7 @@ phase1lp1c7 = $1A phase1lp1c8 = $B4 phase1lp1c9 = $BA dta $01,$01,$01,$7F,$7E,$01,$01,$7D,$7C,$01,$27,$D0,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$D1,$29,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -last_line_RIP +last_line_RIP_l ripp1c0 = $CE ripp1c1 = $C8 ripp1c2 = $00 @@ -67,6 +67,18 @@ ripp1c7 = $1A ripp1c8 = $B4 ripp1c9 = $BA dta $01,$01,$01,$60,$61,$62,$62,$63,$64,$01,$27,$D0,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$D1,$29,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +last_line_RIP_r +ripp2c0 = $CE +ripp2c1 = $C8 +ripp2c2 = $00 +ripp2c3 = $F4 +ripp2c4 = $0C +ripp2c5 = $F6 +ripp2c6 = $16 +ripp2c7 = $1A +ripp2c8 = $B4 +ripp2c9 = $BA + dta $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$27,$D0,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$D1,$29,$01,$60,$61,$62,$62,$63,$64,$01,$01,$01 .align $100 ; Right animation @@ -1128,16 +1140,6 @@ RIPscreen_l_nobranch ; page 1 dta $01,$01,$01,$5F,$5A,$5B,$5B,$5D,$01,$01,$01,$9D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$A6,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01 dta $01,$01,$01,$5F,$5A,$66,$5C,$5E,$01,$01,$01,$9D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$A6,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01 RIPscreen_r_nobranch ; page 2 -ripp2c0 = $CE -ripp2c1 = $C8 -ripp2c2 = $00 -ripp2c3 = $F4 -ripp2c4 = $0C -ripp2c5 = $F6 -ripp2c6 = $16 -ripp2c7 = $1A -ripp2c8 = $B4 -ripp2c9 = $BA dta $03,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$9D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$A6,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01 dta $01,$01,$01,$02,$01,$01,$01,$01,$03,$01,$01,$9D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$A6,$02,$01,$01,$01,$01,$01,$01,$01,$02,$01,$01 dta $01,$83,$01,$01,$01,$01,$83,$01,$01,$01,$01,$9D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$A6,$01,$01,$01,$01,$83,$01,$01,$01,$01,$01,$01 diff --git a/art/lumberjack_export.py b/art/lumberjack_export.py index cbd6e80..12744a1 100644 --- a/art/lumberjack_export.py +++ b/art/lumberjack_export.py @@ -47,8 +47,13 @@ dta = load_atrview('phase1l.atrview') d = dta[-1] print(f' dta ' + ','.join([f'${d[i:i + 2]}' for i in range(0, len(d), 2)])) -print('last_line_RIP') -dta = load_atrview('rip.atrview') +print('last_line_RIP_l') +dta = load_atrview('rip.atrview', page=1) +d = dta[-1] +print(f' dta ' + ','.join([f'${d[i:i + 2]}' for i in range(0, len(d), 2)])) + +print('last_line_RIP_r') +dta = load_atrview('rip.atrview', page=2) d = dta[-1] print(f' dta ' + ','.join([f'${d[i:i + 2]}' for i in range(0, len(d), 2)])) diff --git a/lumber.asm b/lumber.asm index 910f4f8..4b88716 100644 --- a/lumber.asm +++ b/lumber.asm @@ -699,7 +699,14 @@ LevelOver ;-------------------------------------------------- :5 WaitForSync mva #>font_game_rip LowCharsetBase - mwa #last_line_RIP lastline_addr + lda LumberjackDir ; RIP direction + cmp #1 + bne leftRIP + mwa #last_line_RIP_r lastline_addr + jmp afterLastLine +leftRIP + mwa #last_line_RIP_l lastline_addr +afterLastLine jsr HidePM lda LumberjackDir ; branch and Lumberjack ? cmp branches_list+5 diff --git a/lumber.xex b/lumber.xex index 3fd23cf4b2aeae2a79f0fd0d8b75cfa435ada60f..13c316c93d068a30eefb5ea48f94a8066fedb3dc 100644 GIT binary patch delta 3116 zcmbVOeQXnD7;n3deYsKR2)Hr#&W*r~^0l(CDTp6@>85OK9oxF~wjoj+!h!}FO83!g z-}Y9>I5Z3_j$+Xxo{>zAh=;~V!!42=gnwOvCg3zIRZ&Dt@OkdGZnudpG)?b)e!u7Y z>D_bJ&l%s7jUO$t80Ymbwse^CjIqyL<;XjIM?=Tn4PPiQGL215%^QI;l*s*`rY~4- z?B%blTaY#6F5UDRQQYB-f&`^3+^eLC$rlU$R5HmbeqnijVGAn^vWFsv!iPthB(fi| z!;!;bkCGChNm#0Oy$O+N= zZV%7+Db|AO~9YeHh>$6-({Bo{x6Y2y@ zs32Z21nMYxyOUg?!YtNHvVDSq^+3iXkz<5;>|Q|#W*4!JQ(HdS)8m>a&20$^5icp`Pgmw_{Q(YRA!{_nSPGj^ z&enx|5g`aU&Z-t6y`wtKkrvU0f`AbnwoKOwl=PK8p=rm$mZGe$v6~D~9JI;vEw*%*z6Gl$gs(tZ--7j% z!>>k2?`VzYXu_;@El~e>{Q1h%3Da-VOk-ns8D)J7wjrb+Lo-79UT)MJO>z2bHSJi~ zN|g1bS0SVidv~SZY5Ffr$YDFm`qEn`=P>2c|8M$FP6+=T%K8>OKRNtU2FCu--4GA(vQJ`kbe4%=19w-8ioJ5_g8A#v9Rk<)|Xz6kUs3) zm42t`H%`c*1!aBdTPNo*<y?uI3kDkR}9D2827y1Y{u8eI(J zQdhY9JZz#8P|CuUl%n-?C*;Ct#~pZt9h6#U%_`>5U35OQd*oR+vSEO?*Ue6kc=d}1 zV1L~k#h1E-{J=I7?5F+0ZT0{xXE+{&#YG zuqjV!bO*oBlUm_7cfj&9==HN73l8=Zaa$29iQ9|VGa<9o;SM?;9I)H~_b0{HBKCAB zQ5ww6_PB$CV09fduI6U%a|f@YgbH5(bbueSGv=?|MB&To7n)2g@2a0^N@n?k^*ITv zSkl6h{rs8wK9|qaYsiy^JiYCC(pqnCdoCTY{KP=#W=e0W)bA=)HAb0$I;v7e0HKI6 zDh?=7rBYRD>lkGQ>Xb^|uTr}-YBdIn2kxxO%~3ga%xoG^7gTDIO7+Aj={pr(rozGg ze8-T{#ZZxy3T~TSx!s9z9bYcHPWDM31T6mha2$trF|UhBNAn}fyuRiAQ098q@`fSwigKB%UrQ12A#^%*8> z$}!CiW14HmtCEuxDgf7^KH038LhT;6mW&fjm#9H%#!N>ozj0$a{AW#bT($qsGQ)QC z3d4>gO@6pT@Kywiv?ySK}@4wXI2M*n8S45c6~dQT`vYUP5?B6YMml7qk1yz3v~-`A!9 delta 3021 zcmbVOeM}Q)7;j7YDgzpZk$}nz_=VZfNhQiQrhI=C6hw>ydV+JSn_nZ*iOv?dYhQX) z=gznl(}gstdS;i+HCbY|Gc%jSW0|@5hsm;pEdDWdo9t$EOtXx=&z%;I>P94_chB$l zywC6XXz#f*lJVXZ<7Y2fjS1o9)*e%gq4i6i7ySmQc;TzdqejjTMVzlH<^yF8hH)Xw*qQg$Q`^Fn~u6kWn5ZQ;XE|A~lp{YNb&`{$f>_?*tH!9m7hS}B2IE1Ne%`>i zNyg~Dm*N*QM|s{i-^Q=>EwB;SOdJ1-FUyARc+f%?m3TGiRe+}0wO}v8Q=vM5%zel< z#jPYd(ra2IEo?CuVWPzS*qpsf)=6&C93v_00NbLId;=gNIYn_ZK>9$fS|Cla1&ouR z=xoV!t_DkA=^D*DB5Ma*Uuiu+df6El%JN2LfZ|^uU6*{^t>$EB8${D*+&(RbH^J7I z?ugD|#-+2o33AXT&keMsIrS~5oF?A{w!Q`Hqvfjr(g&*60!^E>t_A8BkGs>HJZ<_N z+R?}uc7v^N!5)D0W9S4(-^=Y8DR=fwUYpg7II!{R+)HBD)T3ed&z=>1Cg-^ruaK+q4|s23ueHuIL>Q-CULN+uY8I=Ok z+eZ(!N9%;}$6Dv4g+2N$LtwG>y;Ya``1!s)CbEn^;3t?9WD}FykI0rnnJik>54(yy zEHUgW^2|h!H#7=!U2WCLC3K)8Pi&wAH}b?S+?BR@MZ4+1*4z>6IEivz*jL1S8B7pI zbLMu@fzg~1>%E{^yqPoiFdeuF7C3xGpdM~cJ7xZqMk42GUzYVd?YHFmUAg`fxp>5? zP{H`nhZ&B9v*I|-eb=5HU&x?M403XRv=2G=yZwed@w(gZ$`gw`epe1T@e4&-He2jf zsT(R)I!T!bbyTIsRH|W;iXqgXN=EkA6!-I^3@v3!GI?W~s3n z2utP|gVuVjup}pB^6$ijY@)gId{wJ zE5j6dp@VnS3FX0%fv%^7)NA=>IbKM-CUM6)Q