From 35348cdc9802f81271024e604537fdd6bdf9b856 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 15 Aug 2019 14:24:46 -0400 Subject: [PATCH] ootw: c4: blast stopped by doors now --- ootw/TODO | 2 +- ootw/blast.s | 12 ++++++++---- ootw/ootw_c5.s | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ootw/TODO b/ootw/TODO index cebe095f..ab0b7190 100644 --- a/ootw/TODO +++ b/ootw/TODO @@ -135,8 +135,8 @@ Level/Checkpoint #3: + Actual game shakes the camera when you hit the ground after falling Level/Checkpoint #4: - + Implement doors + Implement guard (shooting, taunting) + + Disable keyboard while in the recharger Level/Checkpoint #5: + Falling as enter level diff --git a/ootw/blast.s b/ootw/blast.s index b88d516a..16f39298 100644 --- a/ootw/blast.s +++ b/ootw/blast.s @@ -50,6 +50,7 @@ fire_blast: ; set x blast_left: + jsr calc_gun_left_collision ldx PHYSICIST_X dex @@ -63,6 +64,7 @@ blast_left: jmp done_fire_blast blast_right: + jsr calc_gun_right_collision lda PHYSICIST_X clc @@ -169,12 +171,14 @@ still_starting_blast_left: blast_edge_detect_left: lda blast0_end + cmp LEFT_SHOOT_LIMIT bmi disable_blast lda blast0_start + cmp LEFT_SHOOT_LIMIT bpl no_move_blast - lda #0 + lda LEFT_SHOOT_LIMIT sta blast0_start jmp no_move_blast @@ -206,14 +210,14 @@ blast_edge_detect_right: ; detect if totally off screen lda blast0_start - cmp #40 + cmp RIGHT_SHOOT_LIMIT bcs disable_blast lda blast0_end - cmp #40 + cmp RIGHT_SHOOT_LIMIT bcc no_move_blast - lda #39 + lda RIGHT_SHOOT_LIMIT sta blast0_end no_move_blast: diff --git a/ootw/ootw_c5.s b/ootw/ootw_c5.s index ec45c7fb..255225b6 100644 --- a/ootw/ootw_c5.s +++ b/ootw/ootw_c5.s @@ -94,11 +94,13 @@ end_message: .include "physicist.s" .include "alien.s" -.include "gun.s" -.include "blast.s" -.include "shield.s" + +;.include "gun.s" +;.include "blast.s" +;.include "shield.s" ;.include "door.s" +;.include "collision.s" ; room backgrounds .include "ootw_graphics/l5cave/ootw_c5_cave.inc"