diff --git a/graphics/hgr/vgi/Makefile b/graphics/hgr/vgi/Makefile index 8c6727ea..52ad1182 100644 --- a/graphics/hgr/vgi/Makefile +++ b/graphics/hgr/vgi/Makefile @@ -24,7 +24,7 @@ HELLO: hello.bas VGI: vgi.o ld65 -o VGI vgi.o -C $(LINKERSCRIPTS)/apple2_c00.inc -vgi.o: clock.data \ +vgi.o: clock.data rocket.data \ vgi.s vgi_clearscreen.s vgi_rectangle.s vgi_circles.s vgi_lines.s ca65 -o vgi.o vgi.s -l vgi.lst @@ -37,6 +37,13 @@ clock.data: make_boxes_asm clock.vgi ### +rocket.data: make_boxes_asm rocket.vgi + echo "rocket_data:" > rocket.data + ./make_boxes_asm < rocket.vgi >> rocket.data + + +### + make_boxes_asm: make_boxes_asm.o $(CC) -o make_boxes_asm make_boxes_asm.o $(LFLAGS) diff --git a/graphics/hgr/vgi/rocket.vgi b/graphics/hgr/vgi/rocket.vgi index 8400117c..9d76b453 100644 --- a/graphics/hgr/vgi/rocket.vgi +++ b/graphics/hgr/vgi/rocket.vgi @@ -2,4 +2,21 @@ 0 255 ; white background 1 1 6 0 122 140 191 ; ocean left 1 1 6 140 122 279 191 ; ocean right +; base +6 0x8 0x22 86 124 193 191 ; green brick dock +3 7 99 121 4 ; left platform +3 7 180 121 4 ; right platform +1 7 7 99 119 175 125 ; platform +1 0 0 102 128 116 191 ; left shade +1 0 0 179 126 194 191 ; right shade +1 7 7 89 137 93 146 ; left light +1 7 7 186 139 190 147 ; right light +; wire +1 6 6 174 88 179 126 ; pole +1 6 6 174 73 179 80 ; insulator +4 6 177 90 ; thinner pole +5 177 74 ; to top +5 237 64 ; to top +;5 279 53 ; to top +5 255 60 ; to top 15 diff --git a/graphics/hgr/vgi/vgi.s b/graphics/hgr/vgi/vgi.s index 883b2fb7..661edaa5 100644 --- a/graphics/hgr/vgi/vgi.s +++ b/graphics/hgr/vgi/vgi.s @@ -14,11 +14,16 @@ vgi_test: ; get pointer to image data - lda #clock_data + lda #>rocket_data sta VGIH +; lda #clock_data +; sta VGIH + jsr play_vgi jsr wait_until_keypress @@ -37,11 +42,22 @@ loopy: jsr fake_input jsr fake_input - - bit FULLGR - jmp loopy + + lda #rocket_data + sta VGIH + + jsr play_vgi + + jsr wait_until_keypress + + bit TEXTGR + + +; jmp loopy done: jmp done @@ -114,6 +130,7 @@ all_done: .include "vgi_lines.s" .include "clock.data" +.include "rocket.data"