diff --git a/games/peasant_mini/cliff/TODO b/games/peasant_mini/cliff/TODO index ef2c0507..1e4ab760 100644 --- a/games/peasant_mini/cliff/TODO +++ b/games/peasant_mini/cliff/TODO @@ -1,7 +1,8 @@ -Change priority code to work on three-wide sprites -Change draw transparency code to work on three-wide sprites Erase flame even when not moving? That is tricky as would need to redraw head as well :( maybe just erase part above the head? + or just draw peasant always, even when not moving, + you don't have to erase + add collision detection for boulders adjust boulder fall frequency to match original diff --git a/games/peasant_mini/cliff/climb.s b/games/peasant_mini/cliff/climb.s index e86a7083..d8c28c41 100644 --- a/games/peasant_mini/cliff/climb.s +++ b/games/peasant_mini/cliff/climb.s @@ -262,7 +262,7 @@ skip_rock: maybe_new_bird: jsr random16 - and #7 ; 1/8 of time start new bird? + and #$1f ; 1/32 of time start new bird? bne move_bird_done ; bird on base level, 12 .. 76 (MAP_LOCATION==0) @@ -329,7 +329,7 @@ move_rock_waiting: ; see if start new rock jsr random16 - and #7 ; 1/8 of time start new rock + and #$1f ; 1/32 of time start new rock bne rock_good start_new_rock: diff --git a/games/peasant_mini/cliff/draw_peasant_climb.s b/games/peasant_mini/cliff/draw_peasant_climb.s index 4b637070..f314df30 100644 --- a/games/peasant_mini/cliff/draw_peasant_climb.s +++ b/games/peasant_mini/cliff/draw_peasant_climb.s @@ -68,11 +68,11 @@ draw_peasant_falling: ; 2 = crashing ; 3 = crashed - cmp #2 - bcc yep_really_falling ; blt + cmp #1 ; if falling then handle that + beq yep_really_falling ; - lda #(32-1) ; base splat sprite - clc ; -1 as we are 1/2 here + lda #(32-2) ; base splat sprite + clc ; -1 as we are 2/3 here adc PEASANT_FALLING bne yep_falling_common ; bra diff --git a/games/peasant_mini/cliff/keyboard_climb.s b/games/peasant_mini/cliff/keyboard_climb.s index 941f7546..4c1dbf31 100644 --- a/games/peasant_mini/cliff/keyboard_climb.s +++ b/games/peasant_mini/cliff/keyboard_climb.s @@ -20,7 +20,7 @@ check_keyboard: ; if on ground then exit if keypressed - cmp #2 ; on ground + cmp #3 ; on ground beq keyboard_on_ground ; still falling, clear strobe and exit diff --git a/games/peasant_mini/cliff/move_peasant_climb.s b/games/peasant_mini/cliff/move_peasant_climb.s index e6c46b7b..751b8d3b 100644 --- a/games/peasant_mini/cliff/move_peasant_climb.s +++ b/games/peasant_mini/cliff/move_peasant_climb.s @@ -19,10 +19,9 @@ peasant_falling: lda PEASANT_FALLING - cmp #2 + cmp #3 bcs done_falling_peasant ; bge - ; restore bg behind peasant jsr erase_peasant