From c1af28339169108a2e2f217f74ef45386941f02b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 22 Aug 2019 10:51:37 -0400 Subject: [PATCH] ootw: collision: properly check to see if alien on same level --- ootw/collision.s | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ootw/collision.s b/ootw/collision.s index 075e17ac..3c5724fb 100644 --- a/ootw/collision.s +++ b/ootw/collision.s @@ -257,8 +257,12 @@ calc_gun_right_alien_loop: cmp WHICH_ROOM bne calc_gun_right_alien_continue - lda PHYSICIST_X + ; only if on same level + lda alien_y,X + cmp PHYSICIST_Y + bne calc_gun_right_alien_continue + lda PHYSICIST_X cmp alien_x,X bcs calc_gun_right_alien_continue ; bge @@ -466,8 +470,12 @@ calc_gun_left_alien_loop: cmp WHICH_ROOM bne calc_gun_left_alien_continue - lda PHYSICIST_X + ; only if on same level + lda alien_y,X + cmp PHYSICIST_Y + bne calc_gun_left_alien_continue + lda PHYSICIST_X cmp alien_x,X bcc calc_gun_left_alien_continue ; blt