From 7ce483dad111945f9131f1ddd4607a4c2da94e8a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 19 Aug 2019 16:47:15 -0400 Subject: [PATCH] ootw: c1: can run-jump over the slugs if you're careful --- ootw/ootw_c1_sluggy.s | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ootw/ootw_c1_sluggy.s b/ootw/ootw_c1_sluggy.s index 1ff5904c..58adf36f 100644 --- a/ootw/ootw_c1_sluggy.s +++ b/ootw/ootw_c1_sluggy.s @@ -106,8 +106,7 @@ init_slug_loop: ; Mark slug as out and alive -; lda #1 - lda #0 + lda #1 sta slugg0_out,X @@ -220,9 +219,15 @@ check_attack: cmp #30 bne no_attack - lda PHYSICIST_Y ; only attack if physicist on ground - cmp #22 - bne no_attack +; lda PHYSICIST_Y ; only attack if physicist on ground +; cmp #22 +; bne no_attack + + lda PHYSICIST_STATE ; don't attack if jumping + cmp #P_JUMPING + beq no_attack + cmp #P_JUMPING|STATE_RUNNING + beq no_attack lda PHYSICIST_X sec