aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.nasm/segments.txt2
-rw-r--r--src/items.s13
2 files changed, 9 insertions, 6 deletions
diff --git a/.nasm/segments.txt b/.nasm/segments.txt
index e98dba4..7f0b6d9 100644
--- a/.nasm/segments.txt
+++ b/.nasm/segments.txt
@@ -1,4 +1,4 @@
- HEADER: 16/16 (100%)
-- ROM0: 9195/32762 (28.07%)
+- ROM0: 9201/32762 (28.08%)
- ROMV: 6/6 (100%)
- ROM2: 8192/8192 (100%)
diff --git a/src/items.s b/src/items.s
index fb6514d..d8d1391 100644
--- a/src/items.s
+++ b/src/items.s
@@ -251,7 +251,6 @@
rts
@invalidate_third:
- ;; Always invalidate the third item.
lda #$FF
sta Items::zp_pool_base + 6, x
@@ -1019,7 +1018,6 @@
and #$03
beq @end
- @rest_of_the_rocket:
jsr draw_high_part_shuttle
jsr draw_middle_part_shuttle
@@ -1129,8 +1127,16 @@
sta PPU::m_data
@just_middle:
+ lda Items::zp_collected
+ cmp #2
+ bcc @skip_draw_middle
jsr draw_middle_part_shuttle
+ @skip_draw_middle:
+ ;; NOTE: just in case we move into the next level and we need to
+ ;; reconstruct the low part of the shuttle after the "take off"
+ ;; animation cleared it away.
+
;; Set the attributes to the default one just in case we are switching
;; from a previous level.
bit PPU::m_status
@@ -1141,9 +1147,6 @@
lda #0
sta PPU::m_data
- ;; NOTE: just in case we move into the next level and we need to
- ;; reconstruct the low part of the shuttle after the "take off"
- ;; animation cleared it away.
jsr draw_low_part_shuttle
;; Set the attributes to the default one just in case we are switching