diff --git a/ootw/ootw_c3_vent.s b/ootw/ootw_c3_vent.s index 47aa23c5..7e18b140 100644 --- a/ootw/ootw_c3_vent.s +++ b/ootw/ootw_c3_vent.s @@ -286,6 +286,7 @@ vent_falling: lda #1 sta FALLING sty FALLING_Y + sta GAIT done_vent_checky: @@ -329,12 +330,42 @@ done_falling: ; draw physicist ;================ + lda FALLING + bne draw_falling + lda VENT_DEATH beq draw_rolling cmp #1 beq draw_fell bne draw_poisoned + ; falling +draw_falling: + + lda GAIT + cmp #31 + bcs no_inc_falling + + inc GAIT +no_inc_falling: + + lda PHYSICIST_X + sta XPOS + lda PHYSICIST_Y + and #$fe + sta YPOS + + lda GAIT + lsr + lsr + and #$fe + tay + + lda rolling_fall_progression,Y + sta INL + lda rolling_fall_progression+1,Y + jmp actually_draw + ; dead/fell draw_fell: lda GAIT diff --git a/ootw/ootw_graphics/sprites/physicist_rolling.inc b/ootw/ootw_graphics/sprites/physicist_rolling.inc index d5403e59..72fd5378 100644 --- a/ootw/ootw_graphics/sprites/physicist_rolling.inc +++ b/ootw/ootw_graphics/sprites/physicist_rolling.inc @@ -67,37 +67,44 @@ poisoned3: .byte $DA,$DA,$DA,$88,$88,$D4,$DA,$DA +rolling_fall_progression: +.word rolling_falling1 +.word rolling_falling2 +.word rolling_falling3 +.word rolling_falling4 + + rolling_falling1: -.byte 2,5 -.byte $9B,$9B -.byte $99,$99 -.byte $AA,$AA -.byte $AA,$AA -.byte $AA,$AA +.byte 4,5 +.byte $AA,$AA,$9B,$9B +.byte $AA,$AA,$99,$99 +.byte $AA,$AA,$AA,$AA +.byte $AA,$AA,$AA,$AA +.byte $AA,$AA,$AA,$AA rolling_falling2: -.byte 2,5 -.byte $B4,$b4 -.byte $99,$99 -.byte $A9,$A9 -.byte $AA,$AA -.byte $AA,$AA +.byte 4,5 +.byte $AA,$AA,$B4,$b4 +.byte $AA,$AA,$99,$99 +.byte $AA,$AA,$A9,$A9 +.byte $AA,$AA,$AA,$AA +.byte $AA,$AA,$AA,$AA rolling_falling3: -.byte 2,5 -.byte $44,$44 -.byte $b4,$0B -.byte $99,$99 -.byte $A9,$A9 -.byte $AA,$AA +.byte 4,5 +.byte $AA,$AA,$44,$44 +.byte $AA,$AA,$b4,$0B +.byte $AA,$AA,$99,$99 +.byte $AA,$AA,$A9,$A9 +.byte $AA,$AA,$AA,$AA rolling_falling4: -.byte 2,5 -.byte $45,$45 -.byte $44,$44 -.byte $bb,$00 -.byte $9b,$90 -.byte $99,$99 +.byte 4,5 +.byte $AA,$AA,$45,$45 +.byte $AA,$AA,$44,$44 +.byte $AA,$AA,$bb,$00 +.byte $AA,$AA,$9b,$90 +.byte $AA,$AA,$99,$99 rolling_splat_progression: .word rolling_splat1