diff --git a/art/animations.asm b/art/animations.asm index dbd6fb2..172333c 100644 --- a/art/animations.asm +++ b/art/animations.asm @@ -82,22 +82,22 @@ WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p1 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p2 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p3 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p4 animation_addr WaitForSync mwa #gamescreen_r_ph1p1 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side rts .endp @@ -115,22 +115,22 @@ AnimationR2 = AnimationR1 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p1 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p2 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p3 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p4 animation_addr WaitForSync mwa #gamescreen_l_ph1p1 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side rts .endp @@ -148,22 +148,22 @@ AnimationL2 = AnimationL1 WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p3 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p4 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p3 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p4 animation_addr WaitForSync mwa #gamescreen_r_ph1p1 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side rts .endp @@ -180,22 +180,22 @@ AnimationL2 = AnimationL1 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p3 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p4 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p3 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p4 animation_addr WaitForSync mwa #gamescreen_l_ph1p1 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side rts .endp @@ -212,22 +212,22 @@ AnimationL2 = AnimationL1 WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p9 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p10 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p12 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p13 animation_addr WaitForSync mwa #gamescreen_r_ph1p1 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side (kill) rts .endp @@ -245,22 +245,22 @@ AnimationR5 = AnimationR4 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p9 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p10 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p12 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p13 animation_addr WaitForSync mwa #gamescreen_l_ph1p1 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side (kill) rts .endp @@ -278,22 +278,22 @@ AnimationL5 = AnimationL4 WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p11 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p12 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p12 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p13 animation_addr WaitForSync mwa #gamescreen_r_ph1p1 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side (kill) rts .endp @@ -310,22 +310,22 @@ AnimationL5 = AnimationL4 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p11 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p12 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p12 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p13 animation_addr WaitForSync mwa #gamescreen_l_ph1p1 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side (kill) rts .endp @@ -342,22 +342,22 @@ AnimationL5 = AnimationL4 WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p5 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p6 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p8 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p9 animation_addr WaitForSync mwa #gamescreen_r_ph1p2 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side rts .endp @@ -375,22 +375,22 @@ AnimationR8 = AnimationR7 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p5 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p6 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p8 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p9 animation_addr WaitForSync mwa #gamescreen_l_ph1p2 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side rts .endp @@ -408,22 +408,22 @@ AnimationL8 = AnimationL7 WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p7 animation_addr - WaitForSync jsr SetPMr3 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph3p8 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p8 animation_addr - WaitForSync jsr SetPMr2 + WaitForSync jsr branches_go_down mwa #gamescreen_r_ph2p9 animation_addr WaitForSync mwa #gamescreen_r_ph1p2 animation_addr - WaitForSync jsr SetPMr1 + WaitForSync mva #1 LumberjackDir ; right side rts .endp @@ -440,22 +440,22 @@ AnimationL8 = AnimationL7 WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p7 animation_addr - WaitForSync jsr SetPMl3 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph3p8 animation_addr jsr RestoreRedBar WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p8 animation_addr - WaitForSync jsr SetPMl2 + WaitForSync jsr branches_go_down mwa #gamescreen_l_ph2p9 animation_addr WaitForSync mwa #gamescreen_l_ph1p2 animation_addr - WaitForSync jsr SetPMl1 + WaitForSync mva #2 LumberjackDir ; left side rts .endp diff --git a/lumber.asm b/lumber.asm index e47d651..37d6d9c 100644 --- a/lumber.asm +++ b/lumber.asm @@ -856,7 +856,7 @@ datalinesP1=5 ; bird 2, 1 and 3 jsr bird_a mva #0 SIZEP0_u - sta SIZEP1_d + sta SIZEP1_u mva #$04 PCOLR0 sta PCOLR1 lda #0 diff --git a/lumber.xex b/lumber.xex index 107be55..2a3388e 100644 Binary files a/lumber.xex and b/lumber.xex differ