diff --git a/music/zero_wing/graphics/Makefile b/music/zero_wing/graphics/Makefile index cfb9485f..e012331e 100644 --- a/music/zero_wing/graphics/Makefile +++ b/music/zero_wing/graphics/Makefile @@ -3,7 +3,7 @@ include ../../../Makefile.inc ZX02 = ~/research/6502_compression/zx02.git/build/zx02 PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr -all: cats.hgr.zx02 captain.hgr.zx02 operator.hgr.zx02 +all: cats.hgr.zx02 captain.hgr.zx02 operator.hgr.zx02 ship.hgr.zx02 #### @@ -29,6 +29,14 @@ operator.hgr.zx02: operator.hgr operator.hgr: operator.png $(PNG_TO_HGR) operator.png > operator.hgr +#### + +ship.hgr.zx02: ship.hgr + $(ZX02) ship.hgr ship.hgr.zx02 + +ship.hgr: ship.png + $(PNG_TO_HGR) ship.png > ship.hgr + #### diff --git a/music/zero_wing/graphics/ship.png b/music/zero_wing/graphics/ship.png new file mode 100644 index 00000000..a5f76a69 Binary files /dev/null and b/music/zero_wing/graphics/ship.png differ diff --git a/music/zero_wing/zw.s b/music/zero_wing/zw.s index 58d43754..68789bf6 100644 --- a/music/zero_wing/zw.s +++ b/music/zero_wing/zw.s @@ -12,13 +12,51 @@ hires_start: ;=================== jsr HOME - jsr HGR + ;=================== ; Load graphics ;=================== load_loop: + jsr HGR + + ;============================= + ; In AD... + ;============================= + + jsr HOME + + lda #inad_text + sta OUTH + + jsr move_and_print + + jsr wait_until_keypress + + ;============================= + ; War was beginning + ;============================= + + + jsr HOME + + lda #ship_data + sta zx_src_h+1 + + lda #$20 + + jsr zx02_full_decomp + + jsr move_and_print + + jsr wait_until_keypress + ;============================= ; OPERATOR ;============================= @@ -111,21 +149,59 @@ load_loop: .include "text_print.s" .include "gr_offsets.s" -cats_data: - .incbin "graphics/cats.hgr.zx02" +inad_text: + .byte 14,21,"IN A.D. 2101",0 +war_text: + .byte 11,21,"WAR WAS BEGINNING.",0 +what_text: + .byte 0,21,"CAPTAIN: WHAT HAPPEN ?",0 ; scroll +bomb_text: + .byte 0,21,"MECHANIC: SOMEBODY SET UP US",0 + .byte 10,21, "THE BOMB.",0 +operator_text: + .byte 0,20,"OPERATOR: WE GET SIGNAL.",0 + .byte 1,22, "CAPTAIN: WHAT !",0 +main_text: + .byte 0,20,"OPERATOR: MAIN SCREEN TURN ON.",0 +you_text: + .byte 0,20,"CAPTAIN: IT'S YOU !!",0 cats_text: .byte 0,21,"CATS: HOW ARE YOU GENTLEMEN !!",0 +base_text: + .byte 0,21,"CATS: ALL YOUR BASE ARE BELONG",0 + .byte 6,22, "TO US.",0 +destruction_text: + .byte 0,21,"CATS: YOU ARE ON THE WAY TO",0 + .byte 6,22, "DESTRUCTION.",0 +captain_text: + .byte 0,21,"CAPTAIN: WHAT YOU SAY !!",0 +survive_text: + .byte 0,21,"CATS: YOU HAVE NO CHANCE TO",0 + .byte 6,22, "SURVIVE MAKE YOUR TIME.",0 +ha_text: + .byte 0,21,"CATS: HA HA HA HA ....",0 +op_cap_text: + .byte 0,21,"OPERATOR: CAPTAIN !!",0 +zig_text: + .byte 0,21,"CAPTAIN: TAKE OFF EVERY 'ZIG'!!",0 +doing_text: + .byte 0,21,"CAPTAIN: YOU KNOW WHAT YOU DOING.",0 +move_zig_text: + .byte 0,21,"CAPTAIN: MOVE 'ZIG'.",0 +justice_text: + .byte 0,21,"CAPTAIN: FOR GREAT JUSTICE.",0 + +cats_data: + .incbin "graphics/cats.hgr.zx02" captain_data: .incbin "graphics/captain.hgr.zx02" -captain_text: - .byte 0,21,"CAPTAIN: WHAT YOU SAY !!",0 - operator_data: .incbin "graphics/operator.hgr.zx02" -operator_text: - .byte 0,20,"OPERATOR: WE GET SIGNAL.",0 - .byte 1,22,"CAPTAIN: WHAT !",0 +ship_data: + .incbin "graphics/ship.hgr.zx02" + +