diff --git a/ootw/ootw_graphics/sprites/sprites_physicist.inc b/ootw/ootw_graphics/sprites/sprites_physicist.inc index ad246198..36000244 100644 --- a/ootw/ootw_graphics/sprites/sprites_physicist.inc +++ b/ootw/ootw_graphics/sprites/sprites_physicist.inc @@ -475,7 +475,7 @@ collapse5: ;===================== -jump_progression: +phys_jump_progression: .word jump1 .word jump2 .word jump3 diff --git a/ootw/physicist.s b/ootw/physicist.s index 0c309965..aad8ffb0 100644 --- a/ootw/physicist.s +++ b/ootw/physicist.s @@ -60,11 +60,12 @@ physicist_kicking: ; If kicking long enough, return to standing dec GAIT - bne finally_draw_him + bne short_draw lda #P_STANDING sta PHYSICIST_STATE +short_draw: jmp finally_draw_him ;=================================== @@ -89,14 +90,37 @@ physicist_crouching: physicist_jumping: - ; FIXME: we have an animation? + lda GAIT + cmp #16 + bcc still_jumping ; blt - lda #crouch2 + lda phys_jump_progression+1,X sta INH + inc GAIT + + lda GAIT + and #$3 + bne jump_no_move + + inc PHYSICIST_X +jump_no_move: jmp finally_draw_him