diff --git a/loader/samples/minexample/conv_liltalk.py b/loader/samples/minexample/conv_liltalk.py index ff21186..f35b116 100644 --- a/loader/samples/minexample/conv_liltalk.py +++ b/loader/samples/minexample/conv_liltalk.py @@ -5,7 +5,6 @@ line_addrs = [] char_cnt = 0 for line in f: if line == '': - if char_cnt >= 40: char_cnt = 0 line_addrs.append(char_cnt) char_cnt = 0 else: @@ -16,7 +15,9 @@ for line in f: i += 1 str = line[i+1:] str = str.upper() - str = str.replace("\\N","") + if "\\N" in str: str = str.split("\\N")[0] + print(str) + #str = str.replace("\\N","") char_cnt += len(str) line_addrs.append(char_cnt) diff --git a/loader/samples/minexample/lilia_talk.bin b/loader/samples/minexample/lilia_talk.bin index 5b4ad81..f26c5fb 100644 Binary files a/loader/samples/minexample/lilia_talk.bin and b/loader/samples/minexample/lilia_talk.bin differ diff --git a/loader/samples/minexample/liltalk.bin b/loader/samples/minexample/liltalk.bin index ea0f503..209ea34 100644 Binary files a/loader/samples/minexample/liltalk.bin and b/loader/samples/minexample/liltalk.bin differ diff --git a/loader/samples/minexample/liltalk_speak.txt b/loader/samples/minexample/liltalk_speak.txt index dafdaf3..8a10bd4 100644 --- a/loader/samples/minexample/liltalk_speak.txt +++ b/loader/samples/minexample/liltalk_speak.txt @@ -363,6 +363,7 @@ 4 4 w 4 e\n + 4 4 G 4 o diff --git a/loader/samples/minexample/main.asm b/loader/samples/minexample/main.asm index 25158ee..acf76e4 100644 --- a/loader/samples/minexample/main.asm +++ b/loader/samples/minexample/main.asm @@ -1532,6 +1532,14 @@ part_11: jsr load_8000_zx02 jsr $a000 jsr init_bmp + ldx #0 + lda #$80 +: + sta $400+(40*(25-5)), x + inx + cpx #40*5 + bne :- + jsr set_irq_badguy inc enable_music lda #0 @@ -1542,19 +1550,11 @@ part_11: sta text_ptr+1 cli + .repeat 5 lda #<256 jsr wait_frame_until - lda #<256 - jsr wait_frame_until - lda #<256 - jsr wait_frame_until - lda #<256 - jsr wait_frame_until - lda #<256 - jsr wait_frame_until - lda #<256 - jsr wait_frame_until - lda #301-256 + .endrepeat + lda #144 jsr wait_frame_until sei @@ -1862,12 +1862,12 @@ update_dialog: ldy #0 lda (text_ptr),y - cmp #$fe - bne @skip_reset_col cmp #$ff bne :+ rts : + cmp #$fe + bne @skip_reset_col ldx dialog_col cpx #40*2 beq @skip_reset