diff --git a/loader/samples/minexample/Makefile b/loader/samples/minexample/Makefile index d3fc9ef..3b400ce 100644 --- a/loader/samples/minexample/Makefile +++ b/loader/samples/minexample/Makefile @@ -172,6 +172,7 @@ $(DISKIMAGE): $(ASSEMBLE) $(CC1541) -f "field" -w field.zx0.prg \ -f "fallstar" -w falling_star.zx0.prg \ -f "lilia" -w lilia.zx0.prg \ + -f "lilhero" -w lilia_hero.zx0.prg \ $@ diff --git a/loader/samples/minexample/conv_zx0.sh b/loader/samples/minexample/conv_zx0.sh index b4b6bcf..2cb2dd1 100644 --- a/loader/samples/minexample/conv_zx0.sh +++ b/loader/samples/minexample/conv_zx0.sh @@ -19,4 +19,7 @@ printf "\x00\x80" > falling_star.zx0.prg cat falling_star.zx0 >> falling_star.zx0.prg zx02/zx02 lilia.bin lilia.zx0 printf "\x00\x80" > lilia.zx0.prg -cat lilia.zx0 >> lilia.zx0.prg \ No newline at end of file +cat lilia.zx0 >> lilia.zx0.prg +zx02/zx02 lilia_hero.bin lilia_hero.zx0 +printf "\x00\x80" > lilia_hero.zx0.prg +cat lilia_hero.zx0 >> lilia_hero.zx0.prg \ No newline at end of file diff --git a/loader/samples/minexample/lilia_hero.bin b/loader/samples/minexample/lilia_hero.bin new file mode 100644 index 0000000..122fe77 Binary files /dev/null and b/loader/samples/minexample/lilia_hero.bin differ diff --git a/loader/samples/minexample/lilia_hero.zx0 b/loader/samples/minexample/lilia_hero.zx0 new file mode 100644 index 0000000..3eacdb1 Binary files /dev/null and b/loader/samples/minexample/lilia_hero.zx0 differ diff --git a/loader/samples/minexample/lilia_hero.zx0.prg b/loader/samples/minexample/lilia_hero.zx0.prg new file mode 100644 index 0000000..3220173 Binary files /dev/null and b/loader/samples/minexample/lilia_hero.zx0.prg differ diff --git a/loader/samples/minexample/minexample.s b/loader/samples/minexample/minexample.s index a9cee81..75fa987 100644 --- a/loader/samples/minexample/minexample.s +++ b/loader/samples/minexample/minexample.s @@ -514,17 +514,61 @@ code_start: lda #2 sta timer_mode - : lda timer_reached beq :- + ldx #$c4 + ldy #$01 + jsr init_timer + jsr init_bmp lda #$08 sta frame_until jsr wait_frame_until_2x +: + lda timer_reached + beq :- + + jsr clr_txt + ldx #scene_writ + jsr write_txt3 + ldx #$80 + ldy #$01 + jsr init_timer + lda #1 + sta timer_mode + + ldx #liliaheroname + jsr loadraw + lda #0 + sta ZX0_src + lda #$80 + sta ZX0_src+1 + lda #0 + sta ZX0_dst + lda #$20 + jsr zx02 + +: + lda timer_reached + beq :- + + ldx #$20 + ldy #$01 + jsr init_timer + lda #2 + sta timer_mode + +: + lda timer_reached + beq :- + + jsr init_bmp jmp * @@ -1056,6 +1100,8 @@ towerbeamname: .byte "towerbm", 0 fieldname: .byte "field", 0 fallingstarname: .byte "fallstar", 0 lilianame: .byte "lilia", 0 +liliaheroname: .byte "lilhero", 0 + darmtower_txt: .res (40-26)/2, ' ' @@ -1131,6 +1177,8 @@ run_nufli_bmp: beq :+ jmp @loop : + lda #0 + sta $d015 rts @@ -1216,6 +1264,17 @@ music_writ: .byte " hideya nagata " .res (40-20)/2, ' ' +scene_writ: +.res (40-22)/2, ' ' +.byte "scene set by " +.res (40-22)/2, ' ' +.res (40-22)/2, ' ' +.byte " seigo oketani " +.res (40-22)/2, ' ' +.res (40-22)/2, ' ' +.byte " yoshihiko kurata" +.res (40-22)/2, ' ' + clr_txt: lda #$80 ldx #0