From e95a0321ed3a42dbcdf59c2af7e5d338bb07b6e4 Mon Sep 17 00:00:00 2001 From: Natt Akuma Date: Sat, 29 Nov 2025 21:51:09 +0700 Subject: [PATCH] Finish lilia talk --- assets/11_lilia_final.csv | 49 --------------------- loader/samples/minexample/liltalk_speak.txt | 2 +- loader/samples/minexample/main.asm | 24 ++-------- 3 files changed, 5 insertions(+), 70 deletions(-) diff --git a/assets/11_lilia_final.csv b/assets/11_lilia_final.csv index e0727d1..604de9c 100644 --- a/assets/11_lilia_final.csv +++ b/assets/11_lilia_final.csv @@ -420,52 +420,3 @@ 10,../../../assets/ys2/11_lilia_final/koala/png/16.png 10,../../../assets/ys2/11_lilia_final/koala/png/16.png 10,../../../assets/ys2/11_lilia_final/koala/png/16.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/loader/samples/minexample/liltalk_speak.txt b/loader/samples/minexample/liltalk_speak.txt index 8a10bd4..56f441b 100644 --- a/loader/samples/minexample/liltalk_speak.txt +++ b/loader/samples/minexample/liltalk_speak.txt @@ -374,7 +374,7 @@ 4 o 4 r 4 e -4 +4 4 t 4 h 4 e diff --git a/loader/samples/minexample/main.asm b/loader/samples/minexample/main.asm index acf76e4..699ee2b 100644 --- a/loader/samples/minexample/main.asm +++ b/loader/samples/minexample/main.asm @@ -84,7 +84,7 @@ code_start: sta vbl cli - ;jsr intro + jsr intro lda #$0b sta $d011 @@ -1549,12 +1549,10 @@ part_11: lda #>dialog sta text_ptr+1 cli - - .repeat 5 + lda #<256 jsr wait_frame_until - .endrepeat - lda #144 + lda #404-256 jsr wait_frame_until sei @@ -1948,18 +1946,4 @@ write_char_dialog: inc dialog_col rts -dialog: -/* - .byte 0, "are you ok?", 0 - .byte 1, "... who are you?", 0 - .byte 2, "thank goodness.\ni'm lilia from lance village.", 0 - .byte 3, "having some kind of premonition,\ni came here to have a look.", 0 - .byte 4, "suddenly,the area was enveloped\nby a light and you collapsed.", 0 - .byte 5, "where am i?", 0 - .byte 6, "this is the restaurant called y's.", 0 - .byte 7, "there're monsters near.\nwe should go.", 0 - .byte 8, "how about it,\ncan you stand up?", 0 - .byte 9, "yeah,i'm alright.should we\ngo before the monsters come?", 0 - .byte 10, "sure.", 0 -*/ -.incbin "liltalk.bin" +dialog: .incbin "liltalk.bin"