diff --git a/assets/ys2/11_lilia_final/koala/png/01.png b/assets/ys2/11_lilia_final/koala/png/01.png index dab148d..885dce5 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/01.png and b/assets/ys2/11_lilia_final/koala/png/01.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/02.png b/assets/ys2/11_lilia_final/koala/png/02.png index ebc9bb2..d865bde 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/02.png and b/assets/ys2/11_lilia_final/koala/png/02.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/03.png b/assets/ys2/11_lilia_final/koala/png/03.png index 77f2902..25d2206 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/03.png and b/assets/ys2/11_lilia_final/koala/png/03.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/04.png b/assets/ys2/11_lilia_final/koala/png/04.png index 9f0abbd..291e819 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/04.png and b/assets/ys2/11_lilia_final/koala/png/04.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/05.png b/assets/ys2/11_lilia_final/koala/png/05.png index 873521d..12e0bf1 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/05.png and b/assets/ys2/11_lilia_final/koala/png/05.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/06.png b/assets/ys2/11_lilia_final/koala/png/06.png index 7a44e5b..0904981 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/06.png and b/assets/ys2/11_lilia_final/koala/png/06.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/07.png b/assets/ys2/11_lilia_final/koala/png/07.png index 201bed5..340a4b3 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/07.png and b/assets/ys2/11_lilia_final/koala/png/07.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/08.png b/assets/ys2/11_lilia_final/koala/png/08.png index 472e788..19ee819 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/08.png and b/assets/ys2/11_lilia_final/koala/png/08.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/09.png b/assets/ys2/11_lilia_final/koala/png/09.png index 780e829..fd11b6b 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/09.png and b/assets/ys2/11_lilia_final/koala/png/09.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/10.png b/assets/ys2/11_lilia_final/koala/png/10.png index f1d7864..41f94c2 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/10.png and b/assets/ys2/11_lilia_final/koala/png/10.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/11.png b/assets/ys2/11_lilia_final/koala/png/11.png index 9cad596..4986e8b 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/11.png and b/assets/ys2/11_lilia_final/koala/png/11.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/12.png b/assets/ys2/11_lilia_final/koala/png/12.png index c8d0407..5b8ba17 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/12.png and b/assets/ys2/11_lilia_final/koala/png/12.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/13.png b/assets/ys2/11_lilia_final/koala/png/13.png index d1f9469..63f7a7f 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/13.png and b/assets/ys2/11_lilia_final/koala/png/13.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/14.png b/assets/ys2/11_lilia_final/koala/png/14.png index 2995748..4a820d7 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/14.png and b/assets/ys2/11_lilia_final/koala/png/14.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/15.png b/assets/ys2/11_lilia_final/koala/png/15.png index 802e95c..17fd190 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/15.png and b/assets/ys2/11_lilia_final/koala/png/15.png differ diff --git a/assets/ys2/11_lilia_final/koala/png/16.png b/assets/ys2/11_lilia_final/koala/png/16.png index 6379e9f..decdf71 100644 Binary files a/assets/ys2/11_lilia_final/koala/png/16.png and b/assets/ys2/11_lilia_final/koala/png/16.png differ diff --git a/loader/samples/minexample/Makefile b/loader/samples/minexample/Makefile index bedc2a7..d3d2422 100644 --- a/loader/samples/minexample/Makefile +++ b/loader/samples/minexample/Makefile @@ -142,7 +142,8 @@ ZX0PRGS = \ lilia.zx0.prg \ lilia_hero.zx0.prg \ island.zx0.prg \ - clouds.zx0.prg + clouds.zx0.prg \ + lilia_talk.zx0.prg LZPRGS = \ island_map.lz.prg @@ -158,7 +159,7 @@ tellarch: loader: $(LOADER) $(LOADER): $(LOADERCFG) - make -C $(LOADER_SRC) EXTCONFIGPATH=../samples/$(NAME) PLATFORM=$(_PLATFORM_) INSTALL=0b00 RESIDENT=0900 ZP=02 prg + make -C $(LOADER_SRC) EXTCONFIGPATH=../samples/$(NAME) PLATFORM=$(_PLATFORM_) INSTALL=0a00 RESIDENT=0900 ZP=02 prg assemble: $(ASSEMBLE) @@ -195,6 +196,7 @@ $(DISKIMAGE): $(ASSEMBLE) $(CC1541) $(ZX0PRGS) $(LZPRGS) font.bin -f "island" -w island.zx0.prg \ -f "islandmap" -w island_map.lz.prg \ -f "clouds" -w clouds.zx0.prg \ + -f "liltalk" -w lilia_talk.zx0.prg \ $@ diff --git a/loader/samples/minexample/font.bin b/loader/samples/minexample/font.bin index 05d4f39..60320e7 100644 Binary files a/loader/samples/minexample/font.bin and b/loader/samples/minexample/font.bin differ diff --git a/loader/samples/minexample/lilia_talk.bin b/loader/samples/minexample/lilia_talk.bin new file mode 100644 index 0000000..61f22f2 Binary files /dev/null and b/loader/samples/minexample/lilia_talk.bin differ diff --git a/loader/samples/minexample/loaderconfig.inc b/loader/samples/minexample/loaderconfig.inc index dab7083..7901632 100644 --- a/loader/samples/minexample/loaderconfig.inc +++ b/loader/samples/minexample/loaderconfig.inc @@ -40,7 +40,7 @@ DECOMPRESSOR = DECOMPRESSORS::NONE; available are NONE, BITNA ; extended features, different settings can be run with the same installed drive code, increase host-side code size -.define FILE_EXISTS_API 1 ; include the fileexists call for simple multi-disk handling +.define FILE_EXISTS_API 0 ; include the fileexists call for simple multi-disk handling .define LOAD_UNDER_D000_DFFF 0 ; C-64/128: enable loading (and decompression) to the RAM at $D000..$DFFF, ; note that this does not slow down loading when not loading to RAM at $D000..$DFFF, diff --git a/loader/samples/minexample/minexample.s b/loader/samples/minexample/minexample.s index 0bae604..690342b 100644 --- a/loader/samples/minexample/minexample.s +++ b/loader/samples/minexample/minexample.s @@ -45,18 +45,18 @@ copy_start: lda #$35 sta $01 - lda #CODE_START_ADDR + lda #>code_start sta $fd - lda #code_start + lda #>code_load sta $fb ldy #0 - ldx #>(code_end-CODE_START_ADDR) + ldx #>(code_end-code_start) beq :+++ : lda ($fa), y @@ -73,17 +73,30 @@ copy_start: sta ($fc), y iny : - cpy #<(code_end-CODE_START_ADDR) + cpy #<(code_end-code_start) bne :-- - lda #$36 - sta $01 + inc $01 cli jsr install sei - lda #$35 + dec $01 + jmp code_start + +check_return: + ; for some reason GETIN enable interrupts back + lda #0 + sta $d01a + asl $d019 + lda #$36 sta $01 - jmp CODE_START_ADDR +: + jsr $ff9f ; SCNKEY + jsr $ffe4 ; GETIN + cmp #$0d + bne :- + dec $01 + jmp code_start .res loadraw - * .incbin "../../build/loader-c64.prg", 2 @@ -91,17 +104,18 @@ copy_start: .res install - * .incbin "../../build/install-c64.prg", 2 -code_start: +code_load: .org CODE_START_ADDR - - sei - lda #$0b - sta $d011 +code_start: lda #0 sta $d020 sta ZX0_dst+0 - sta enable_music + lda #$0b + sta $d011 jsr load_font + .assert * = CODE_START_ADDR + 15, error + lda #0 + sta enable_music jsr init_2x jsr clr_txt ldx #irq_badguy sta $ffff - lda #$1b - sta $d011 lda #$d2 sta $d012 + lda #1 + sta $d01a + asl $d019 rts badguy: .byte "badguy",0 @@ -1247,6 +1257,7 @@ liliaheroname: .byte "lilhero", 0 islandname: .byte "island", 0 islandmapname: .byte "islandmap", 0 cloudsname: .byte "clouds", 0 +liliatalkname: .byte "liltalk", 0 darmtower_txt: @@ -1307,7 +1318,6 @@ run_nufli_bmp: sta $d01a asl $d019 jsr $a000 - cli jsr $3000 @loop: bit $d011 @@ -1376,16 +1386,14 @@ load_8000_zx02: jmp zx02 load_font: - beq :+ + bcc :+ pha : ldx #fontname - jsr fileexists + jsr loadraw bcs :- - ldx #fontname - jmp loadraw + rts part_10: ; the sprite data is embedded into first few bitmap pixels @@ -1550,9 +1558,9 @@ part_11: lda #1 sta timer_mode - ; ldx #liliatalkname - ; jsr load_8000_zx02_2000 + ldx #liliatalkname + jsr load_8000_zx02_2000 : lda timer_reached beq :- @@ -1572,27 +1580,37 @@ part_11: lda timer_reached beq :- - jmp * ; TEMP - ; load new music - lda #0 - sta enable_music + sei ldx #song1name lda #$a0 jsr load_8000_zx02 - - sei + jsr $a000 + jsr init_bmp jsr set_irq_badguy inc enable_music cli + lda #61 + sta frame_until + jsr wait_frame_until_2x + + sei + lda #$0b + sta $d011 + ldx #64 +: + jsr wait_frame + dex + bpl :- jsr clr_txt ldx #turn_disk - jsr write_txt1 - - jmp end + jsr write_txt2 + lda #1 + sta $d021 + jmp check_return clear_2bufs: ldy #$44 @@ -1746,7 +1764,8 @@ presented: .byte " presented by falcom " turn_disk: -.byte " insert datadisk in drive 8 " +.byte " insert datadisk in " +.byte " drive 8 then return " clr_txt: lda #$80 @@ -1874,12 +1893,4 @@ txt_fade_out_offset: beq :- rts - .res ((*+$ff)&$ff00|2)-* -end: - ldx #fontname - jsr fileexists - bcc end - jmp code_start - code_end: