From 19139b69367add4f2e723cbd906de5eec5ade4cd Mon Sep 17 00:00:00 2001 From: AArt1256 Date: Sat, 29 Nov 2025 14:55:26 +0300 Subject: [PATCH] Dialogue resync attempt #2 --- assets/11_lilia_final.csv | 16 +++++++-------- loader/samples/minexample/conv_liltalk.py | 21 ++++++++++++++++++-- loader/samples/minexample/lilia_talk.bin | Bin 25800 -> 22630 bytes loader/samples/minexample/liltalk.bin | Bin 1017 -> 1031 bytes loader/samples/minexample/liltalk_speak.txt | 14 ++++++------- loader/samples/minexample/main.asm | 5 +---- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/assets/11_lilia_final.csv b/assets/11_lilia_final.csv index 9f0fa7e..c007f7e 100644 --- a/assets/11_lilia_final.csv +++ b/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 diff --git a/loader/samples/minexample/conv_liltalk.py b/loader/samples/minexample/conv_liltalk.py index 516c9a0..ff21186 100644 --- a/loader/samples/minexample/conv_liltalk.py +++ b/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)) diff --git a/loader/samples/minexample/lilia_talk.bin b/loader/samples/minexample/lilia_talk.bin index c387dd3ff85519b37a3b818e7f9cae26d46d2585..db61f988382f69f15aa8fa0b64d98a3dea9c0af6 100644 GIT binary patch delta 131 zcmX?clJVIF#tkeQjLef4hROrUgJ2TEW()&~;1>s~nJk=qd9t|H7dZxId~ot@r;f=N WtXWu@W^e^FPQGWYyV=vCUIzf!$seBp delta 152 zcmaF1f$_vi#tkeQn;U$!7$+wfNKEF?N!`3!Gl6mPrm!oMuj@%o)>Y@39ILgCPW(%o JpKI6a008i3K}`Sv diff --git a/loader/samples/minexample/liltalk.bin b/loader/samples/minexample/liltalk.bin index 330020d1c15b3757d8e1828586d79386014d227a..b0aedc543262999dd0b93b880de911694a2dbeb4 100644 GIT binary patch literal 1031 zcmZvaU2eiK5QO7wiz;Z5D)j(<;|1jiP5Ch-Dj_HdMO>^0>w(gK_F{{Nwieo~XLn|2 zJT4VF*>=kD)QO z`_KfQZAc=a=j3@YHQD$mrWUgh(*!k#@TtG_pn4Z{Q=I_XdlQHGiX~KW1se>-BpV;1 z5=EegJ37Ly?bHmWM*+9U4h)Dtf#&rDp&pcmx{gaRYjvm;-YFC^iNRCrS z5is(=P^2(ok|^hvgO;0eM6w?wae%@Oh`lYN!>L|5v=J*Kpq8durA$h|L?pMlxf#C> z9f2kl%!Ws3M6c$PFZXX|6U5S#LoI!wbdqnq`1!}|Qn}9ARb%VYZ$X~~y;WEWG_QlC zEx^ync%l1-3I?U};=L}pIzpOxx~JHmlv=Tf0TZO%frd^oDuc=Rq&ZcEdh!w;Jy|LN z;R8BY1N4CybMn@c0@O z>qTQ%hpygNLuvb}Js-CA;-)tI?OVHcyB4d5%Gstp_JiwsyJ;I&j;~<^#H%UAPxku< DbE0`n literal 1017 zcmZvaO>V+K425xUQ3aGmPcS<+C`V|@&p=QKK@f_#SP#|%rTu2ijJhZqA;+^;4BH9Z)xwIs%FRt*-j%c%afn9Ef9V1$r0D=)8$Z zNH3hCD91ABpH%iLbCo9YAL6I|(}U`5R7!OQSnqX`|Cvgt;tDnx%F&=7CMAYI4|jBg z-P+ms%!>kUk;g4pP!gPyMG%t&0F3GQ51&P`2>M4c0USNBgSD=BMUXwFjv`>>fuYD? z#3WJ9Ee9<@xkiy}1W6pAumfUKi{x;wHx6sWk_Z@(rdDN4M!-ZQH-$WmU&W3vzX>QBn7n5TdV^6o%GXBd;gWPBo@s?t1piO-xYm4NU89jpQR zNQ^l}8%P1#C5D?%cxhO3jv2eh3z?+10U_AGKAI>bWS6g6oGJ)LUvGE6tQY%v yeph#uyVULVuyHp(cJa4s-O6uUtnO;>n)Z0<{Q2V6ZR4x{HI9IIGo}0<{QLqJ(0Mli diff --git a/loader/samples/minexample/liltalk_speak.txt b/loader/samples/minexample/liltalk_speak.txt index 5f5875f..750d4ca 100644 --- a/loader/samples/minexample/liltalk_speak.txt +++ b/loader/samples/minexample/liltalk_speak.txt @@ -28,13 +28,13 @@ 3 u 3 ? -10 -3 -3 -3 -3 -3 -3 +10 +3 +3 +3 +3 +3 +3 3 T 3 h diff --git a/loader/samples/minexample/main.asm b/loader/samples/minexample/main.asm index 69d9b54..f5f43ab 100644 --- a/loader/samples/minexample/main.asm +++ b/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