diff --git a/mode7_demo/README.mode7_demo b/mode7_demo/README.mode7_demo index ac3d48c2..82fa6413 100644 --- a/mode7_demo/README.mode7_demo +++ b/mode7_demo/README.mode7_demo @@ -35,3 +35,51 @@ Memory Map |zero pg | 0.25 ------- $0000 +============================================= +Getting the VMW logo to appear on page2 HGR +============================================== + +; Need to have lines at + ; $4000 AA,AD,D5,AC,95 + ; $4400 A8,D5,95,35,85 1k + ; $4800 A0,55,26,55,81 2k + ; $4C00 00,00,00,00,00 3k + + +MAIN: 0000 - 013A = 0x13A = 314 +.include "deater.scrolltext" 13DF - 1577 = 0x198 = 408 +.include "a2.scrolltext" 1577 - 1695 = 0x11E = 286 + ============= + 1008 + +.include "starfield_demo.s" 1695 - 19Ac = 0x317 = 791 +.include "rasterbars.s" 19AC - 1A9E = 0xF2 = 242 + ============= + 1033 + +.include "../asm_routines/gr_fast_clear.s" 01B6 - 02A0 = 0xEA = 234 +.include "credits.s" 1A9E - 1CEA = 0x257 = 599 +.include "interrupt_handler.s" 1CEA - 1DE3 = 0xD9 = 217 + =================== + 1050 +3D (61) too many, want 173 + + +.include "../asm_routines/gr_unrle.s" 013A - 01B6 + +.include "../asm_routines/gr_hlin.s" 02A0 - 02FD +.include "../asm_routines/gr_setpage.s" 02FD - 0311 +.include "../asm_routines/pageflip.s" 0311 - 032B +.include "../asm_routines/gr_fade.s" 032B - 0459 +.include "../asm_routines/gr_copy.s" 0459 - 0491 +.include "../asm_routines/gr_scroll.s" 0491 - 0565 = 0xC5 = 197 +.include "../asm_routines/gr_offsets.s" 0565 - 0595 +.include "../asm_routines/gr_plot.s" 0595 - 05C7 +.include "../asm_routines/text_print.s" 05C7 - 060F + +.include "../asm_routines/mockingboard_a.s" 060F - 06BC = 0xAD = 173 + +.include "mode7.s" 06BC - 1201 = 0xB43 = 2883 + +.include "mode7_demo_backgrounds.inc" 1201 - 13DF = 0x1DE = 478 + diff --git a/mode7_demo/TODO b/mode7_demo/TODO index 19941d14..444668f3 100644 --- a/mode7_demo/TODO +++ b/mode7_demo/TODO @@ -1,3 +1,6 @@ ++ Mockingboard compress: 25Hz? Re-edit? ++ For chiptune_demo, also compress 3 of them, fit more files? + + Fix mode7/starfield screen jump? + jmp/jsr tail calls diff --git a/mode7_demo/mode7_demo.s b/mode7_demo/mode7_demo.s index e4af8e46..a280ff68 100644 --- a/mode7_demo/mode7_demo.s +++ b/mode7_demo/mode7_demo.s @@ -20,6 +20,12 @@ start: ;================================ ; include VMW logo line 0 ;================================ + ; Need to have lines at + ; $4000 AA,AD,D5,AC,95 + ; $4400 A8,D5,95,35,85 + ; $4800 A0,55,26,55,81 + ; $4C00 00,00,00,00,00 + ;.byte $AA,$AD,$D5,$AC,$95 tax ; $aa @@ -304,15 +310,30 @@ title_routine: rts +;============================ +; These are placed so the VMW logo can be fit +;============================ +.include "deater.scrolltext" +.include "a2.scrolltext" +.byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +.byte $A8,$55,$95,$35,$85 + +.include "rasterbars.s" +.include "starfield_demo.s" +; next part of logo in end of starfield_demo + +.include "../asm_routines/mockingboard_a.s" +.include "credits.s" +.include "interrupt_handler.s" ;=============================================== ; External modules ;=============================================== .include "../asm_routines/gr_unrle.s" -.include "../asm_routines/gr_fast_clear.s" .include "../asm_routines/gr_hlin.s" .include "../asm_routines/gr_setpage.s" +.include "../asm_routines/gr_fast_clear.s" .include "../asm_routines/pageflip.s" .include "../asm_routines/gr_fade.s" .include "../asm_routines/gr_copy.s" @@ -320,7 +341,7 @@ title_routine: .include "../asm_routines/gr_offsets.s" .include "../asm_routines/gr_plot.s" .include "../asm_routines/text_print.s" -.include "../asm_routines/mockingboard_a.s" + .include "mode7.s" @@ -331,12 +352,9 @@ title_routine: ; More routines ;=============================================== -.include "deater.scrolltext" -.include "a2.scrolltext" -.include "starfield_demo.s" -.include "rasterbars.s" -.include "credits.s" -.include "interrupt_handler.s" + + + .align 256 diff --git a/mode7_demo/starfield_demo.s b/mode7_demo/starfield_demo.s index 0e798e86..85f39593 100644 --- a/mode7_demo/starfield_demo.s +++ b/mode7_demo/starfield_demo.s @@ -524,6 +524,16 @@ random_star: rts ; 6 +z_table: + ; 1/16.0 - 1/12.25 + .byte $10,$10,$10,$10,$11,$11,$11,$11,$12,$12,$12,$13,$13,$14,$14,$14 + ; 1/12.0 - 1/8.25 + .byte $15,$15,$16,$16,$17,$17,$18,$18,$19,$1A,$1A,$1B,$1C,$1D,$1E,$1F + ; 1/8.0 - 1/4.25 + .byte $20,$21,$22,$23,$24,$25,$27,$28,$2A,$2C,$2E,$30,$33,$35,$38,$3C + ; 1/4.0 - 1/0.25 + .byte $40,$44,$49,$4E,$55,$5D,$66,$71,$80,$92,$AA,$CC,$00,$55,$00,$00 + ;====================== ; some "random" numbers ;====================== @@ -543,15 +553,12 @@ random_table: .byte 11,225, 26, 28,127, 35,248, 41,248,164, 27, 19,181,202, 78,232 .byte 152, 50, 56,224,121, 77, 61, 52,188, 95, 78,119,250,203,108, 5 .byte 172,134, 33, 43,170, 26, 85,162,190,112,181,115, 59, 4, 92,211 - .byte 54,148,179,175,226,240,228,158, 79, 50, 21, 73,253,130, 78,169 + .byte 54,148 +; Line 3 of VMW logo at $4800 +.byte $A0,$55,$26,$55,$81 + .byte 179,175,226,240,228,158, 79 + .byte 50,21 +;73,253,130, 78,169 + -z_table: - ; 1/16.0 - 1/12.25 - .byte $10,$10,$10,$10,$11,$11,$11,$11,$12,$12,$12,$13,$13,$14,$14,$14 - ; 1/12.0 - 1/8.25 - .byte $15,$15,$16,$16,$17,$17,$18,$18,$19,$1A,$1A,$1B,$1C,$1D,$1E,$1F - ; 1/8.0 - 1/4.25 - .byte $20,$21,$22,$23,$24,$25,$27,$28,$2A,$2C,$2E,$30,$33,$35,$38,$3C - ; 1/4.0 - 1/0.25 - .byte $40,$44,$49,$4E,$55,$5D,$66,$71,$80,$92,$AA,$CC,$00,$55,$00,$00 diff --git a/mode7_demo/vmw_logo.inc b/mode7_demo/vmw_logo.inc index b94e5c6c..1003e00c 100644 --- a/mode7_demo/vmw_logo.inc +++ b/mode7_demo/vmw_logo.inc @@ -7,12 +7,12 @@ ; 5 KK KK KK K K KK KK KK KK KK KK K K KK KK KK KK KK KK K ; 1 01 01 01 0 1 1 01 10 10 1 10 10 10 1 1 0 01 10 10 1 10 10 10 0 -; 1 00 01 01 0 1 1 01 01 01 1 10 10 10 0 0 1 01 01 10 1 10 10 00 0 +; 1 00 01 01 0 0 1 01 01 01 1 10 10 10 0 0 1 01 01 10 1 10 10 00 0 ; 1 00 00 01 0 0 1 01 01 01 0 01 10 01 0 0 1 01 01 01 1 10 00 00 0 ; 0 00 00 00 0 0 0 00 00 00 0 00 00 00 0 0 0 00 00 00 0 00 00 00 0 .byte $AA,$AD,$D5,$AC,$95 -.byte $A8,$D5,$95,$35,$85 +.byte $A8,$55,$95,$35,$85 .byte $A0,$55,$26,$55,$81 ; 0 = black