From 15db5b64bb34526cd299a8878ab35cdc362d5fbf Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 26 Nov 2020 21:35:16 -0500 Subject: [PATCH] duke: split out status bar --- duke/Makefile | 3 ++- duke/duke.s | 23 ++--------------------- duke/status_bar.s | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 duke/status_bar.s diff --git a/duke/Makefile b/duke/Makefile index 127cb64a..5dccec73 100644 --- a/duke/Makefile +++ b/duke/Makefile @@ -27,7 +27,8 @@ HELLO: hello.bas DUKE: duke.o ld65 -o DUKE duke.o -C ../linker_scripts/apple2_2000.inc -duke.o: duke.s zp.inc hardware.inc duke.s duke.inc +duke.o: duke.s zp.inc hardware.inc duke.s duke.inc \ + status_bar.s ca65 -o duke.o duke.s -l duke.lst #### diff --git a/duke/duke.s b/duke/duke.s index b6b12077..d004ae06 100644 --- a/duke/duke.s +++ b/duke/duke.s @@ -52,17 +52,7 @@ duke_loop: jsr gr_copy_to_current - jsr normal_text - lda #help_string - sta OUTH - jsr move_and_print - jsr move_and_print - jsr move_and_print - - jsr inverse_text - jsr move_and_print + jsr draw_status_bar jsr page_flip @@ -103,13 +93,4 @@ done_with_duke: .include "gr_pageflip.s" .include "decompress_fast_v2.s" - - -help_string: - .byte 11,20,"PRESS ^H FOR HELP",0 - -score_string: - ; 012456789012345678901234567890123456789 - .byte 0,22,"SCORE HEALTH FIREPOWER INVENTORY",0 - .byte 0,23,"00010 XXXXXXXX =-=- ",0 - .byte 7,23," ",0 + .include "status_bar.s" diff --git a/duke/status_bar.s b/duke/status_bar.s new file mode 100644 index 00000000..e72ff37f --- /dev/null +++ b/duke/status_bar.s @@ -0,0 +1,30 @@ +; Draw Status Bar + +update_status_bar: + rts + +draw_status_bar: + + jsr normal_text + lda #help_string + sta OUTH + jsr move_and_print + jsr move_and_print + jsr move_and_print + + jsr inverse_text + jsr move_and_print + + rts + + +help_string: + .byte 11,20,"PRESS ^H FOR HELP",0 + +score_string: + ; 012456789012345678901234567890123456789 + .byte 0,22,"SCORE HEALTH FIREPOWER INVENTORY",0 + .byte 0,23,"00010 XXXXXXXX =-=- ",0 + .byte 7,23," ",0