diff --git a/demos/second/part00_boot/hgr_clear_screen.s b/demos/second/hgr_clear_screen.s similarity index 100% rename from demos/second/part00_boot/hgr_clear_screen.s rename to demos/second/hgr_clear_screen.s diff --git a/demos/second/part00_boot/hgr_table.s b/demos/second/hgr_table.s similarity index 100% rename from demos/second/part00_boot/hgr_table.s rename to demos/second/hgr_table.s diff --git a/demos/second/part00_boot/Makefile b/demos/second/part00_boot/Makefile index 92779a95..1095e2b8 100644 --- a/demos/second/part00_boot/Makefile +++ b/demos/second/part00_boot/Makefile @@ -14,7 +14,7 @@ FAKE_BIOS: fake_bios.o ld65 -o FAKE_BIOS fake_bios.o -C $(LINKER_SCRIPTS)/apple2_6000.inc fake_bios.o: fake_bios.s \ - hgr_clear_screen.s \ + ../hgr_clear_screen.s ../hgr_table.s \ font_console_1x8.s fonts/a2_cga_thin.inc \ pt3_lib_detect_model.s ../lc_detect.s aux_detect.s \ 65c02_detect.s ../pt3_lib_mockingboard_detect.s \ diff --git a/demos/second/part00_boot/fake_bios.s b/demos/second/part00_boot/fake_bios.s index cf717243..e9f3132c 100644 --- a/demos/second/part00_boot/fake_bios.s +++ b/demos/second/part00_boot/fake_bios.s @@ -516,7 +516,7 @@ graphics_data: hposn_low = $1713 ; 0xC0 bytes (lifetime, used by DrawLargeCharacter) hposn_high = $1800 ; 0xC0 bytes (lifetime, used by DrawLargeCharacter) - .include "hgr_table.s" + .include "../hgr_table.s" wait_until_keypress: @@ -750,7 +750,7 @@ early_out: -.include "hgr_clear_screen.s" +.include "../hgr_clear_screen.s" .include "pt3_lib_detect_model.s" .include "../lc_detect.s" diff --git a/demos/second/part01_intropan/intro.s b/demos/second/part01_intropan/intro.s index 608f7aca..56bc9b14 100644 --- a/demos/second/part01_intropan/intro.s +++ b/demos/second/part01_intropan/intro.s @@ -7,6 +7,9 @@ .include "../hardware.inc" .include "../qload.inc" +hposn_low = $1713 ; 0xC0 bytes (lifetime, used by DrawLargeCharacter) +hposn_high = $1800 ; 0xC0 bytes (lifetime, used by DrawLargeCharacter) + intro_start: ;===================== ; initializations @@ -22,6 +25,20 @@ load_loop: bit FULLGR bit PAGE1 + lda #0 + jsr hgr_page1_clearscreen + + jsr build_tables + + +; for pan +; code at $6000 +; left page for $2000 at top, we can overwrite +; right page at $a000 +; uncompress to $2000 at first +; then algorithm alternating pages + + ; left logo lda #