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 3fd23cf..13c316c 100644 Binary files a/lumber.xex and b/lumber.xex differ