Dialogue resync attempt #2

assets/11_lilia_final.csv

@@ -12,21 +12,21 @@
 6,../../../assets/ys2/11_lilia_final/koala/png/14.png
 
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
 3,../../../assets/ys2/11_lilia_final/koala/png/13.png
-3,../../../assets/ys2/11_lilia_final/koala/png/14.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
+3,../../../assets/ys2/11_lilia_final/koala/png/13.png
 
 10,../../../assets/ys2/11_lilia_final/koala/png/04.png
 3,../../../assets/ys2/11_lilia_final/koala/png/05.png

loader/samples/minexample/conv_liltalk.py

@@ -1,7 +1,25 @@
 f = open("liltalk_speak.txt","r").readlines()
 f = [x[:-1] for x in f]
 
-line_addrs = [11,16,16,29,33,27,32,29,11,32,24,13,14,17,27,4]
+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:
+        num = 0
+        i = 0
+        while i < len(line) and line[i] in "0123456789":
+            num = num*10+int(line[i])
+            i += 1
+        str = line[i+1:]
+        str = str.upper()
+        str = str.replace("\\N","")
+        char_cnt += len(str)
+line_addrs.append(char_cnt)
+
 out = [0xFE, (40-line_addrs[0])//2]
 cnt = 1
 for line in f:
@@ -18,7 +36,6 @@ for line in f:
         str = line[i+1:]
         str = str.upper()
         str = str.replace("\\N","\n")
-        if num == 3: num += 1 # botches yay
         out.append(num)
         out.append(len(str))
         for x in str: out.append(ord(x))

loader/samples/minexample/main.asm

@@ -1845,9 +1845,8 @@ txt_fade_out_offset:
     rts
 
 update_dialog:
-    lda dialog_tick
-    beq @skip_tick
     dec dialog_tick
+    bmi @skip_tick
     rts
 @skip_tick:
 
@@ -1891,8 +1890,6 @@ update_dialog:
 :
     jmp @skip_tick
 @skip_reset_col:
-    sec
-    sbc #1
     sta dialog_tick
     ldy #1
     lda (text_ptr), y