From cd2ad3bea07c90ba33dce9aae529aee1d44f14a2 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 13 Jul 2024 15:30:30 -0400 Subject: [PATCH] riven: fix up some mistakes --- games/riven_hgr/disk00_files/cho.s | 30 +++++++++++++++--- .../disk00_files/graphics_cho/Makefile | 4 +-- .../graphics_cho/cho_overlay163.png | Bin 4382 -> 4610 bytes .../graphics_cho/cho_overlay207.png | Bin 748 -> 4430 bytes .../graphics_cho/cho_overlay220.png | Bin 696 -> 4412 bytes .../graphics_cho/cho_overlay232.png | Bin 751 -> 4445 bytes .../graphics_cho/cho_overlay236.png | Bin 743 -> 4453 bytes 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/games/riven_hgr/disk00_files/cho.s b/games/riven_hgr/disk00_files/cho.s index 9f79ec91..d2056eb3 100644 --- a/games/riven_hgr/disk00_files/cho.s +++ b/games/riven_hgr/disk00_files/cho.s @@ -14,9 +14,10 @@ ; 20 empty ; 1 off by one ; 15 of moiety (switch background) +; 25 final part -BACKGROUND_SWITCH = 199 -NUM_OVERLAYS = 200 +BACKGROUND_SWITCH = 200 +NUM_OVERLAYS = 225 cho_start: @@ -225,6 +226,16 @@ frames_l: .byte empty ; 0 @@ -302,6 +313,15 @@ frames_h: .byte >cho_overlay217,>cho_overlay218,>cho_overlay219 ; 217,218,219 .byte >cho_overlay220 ; 220 + .byte >cho_overlay221,>cho_overlay222,>cho_overlay223 ; 221,222,223 + .byte >cho_overlay224,>cho_overlay225,>cho_overlay226 ; 224,225,226 + .byte >cho_overlay227,>cho_overlay228,>cho_overlay229 ; 227,228,229 + .byte >cho_overlay230,>cho_overlay231,>cho_overlay232 ; 230,231,232 + .byte >cho_overlay233,>cho_overlay234,>cho_overlay235 ; 233,234,235 + .byte >cho_overlay236,>cho_overlay237,>cho_overlay238 ; 236,237,238 + .byte >cho_overlay239,>cho_overlay240,>cho_overlay241 ; 239,240,241 + .byte >cho_overlay242,>cho_overlay243,>cho_overlay244 ; 242,243,244 + .byte >empty text_l: @@ -439,15 +459,15 @@ tahg2_text: .byte 7,21,"TAHG-EM-AH B'SOO RE-KO-AH",0,$FF me_text: -.byte 0,20," _ _ _ _ _ _ _",0 +.byte 0,20," _ _ _ _ _ _ _ _",0 .byte 0,21,"ME SELAP. ME SELAP. MU TEKA BOKU ANA.",0,$FF me2_text: -.byte 0,20," _ _ _ _ _ _ _",0 +.byte 0,20," _ _ _ _ _ _ _ _",0 .byte 0,21,"ME SELAP. MU TEKA BOKU ANA. BOKU ANA.",0,$FF me3_text: -.byte 0,20," _ _ _ _ _",0 +.byte 0,20," _ _ _ _ _ _",0 .byte 0,21,"ME SELAP. IM BOKU ANA. BOKU ANA.",0,$FF boku_text: diff --git a/games/riven_hgr/disk00_files/graphics_cho/Makefile b/games/riven_hgr/disk00_files/graphics_cho/Makefile index cf7fb00a..9463e99e 100644 --- a/games/riven_hgr/disk00_files/graphics_cho/Makefile +++ b/games/riven_hgr/disk00_files/graphics_cho/Makefile @@ -103,8 +103,8 @@ cho_graphics.inc: \ cho_overlay234.gr.zx02 cho_overlay235.gr.zx02 \ cho_overlay236.gr.zx02 cho_overlay237.gr.zx02 \ cho_overlay238.gr.zx02 cho_overlay239.gr.zx02 \ - cho_overlay240.gr.zx02 cho_overlay2141.gr.zx02 \ - cho_overlay242.gr.zx02 cho_overlay43.gr.zx02 \ + cho_overlay240.gr.zx02 cho_overlay241.gr.zx02 \ + cho_overlay242.gr.zx02 cho_overlay243.gr.zx02 \ cho_overlay244.gr.zx02 echo "captured_bg: .incbin \"captured_bg.gr.zx02\"" > cho_graphics.inc echo "captured_cage_bg: .incbin \"captured_cage_bg.gr.zx02\"" >> cho_graphics.inc diff --git a/games/riven_hgr/disk00_files/graphics_cho/cho_overlay163.png b/games/riven_hgr/disk00_files/graphics_cho/cho_overlay163.png index 6747e48f0cfc4f9bf120c35d2ef1f8c34bf19c3a..78296b4503222e3c9074e9005d336e9f4100c083 100644 GIT binary patch delta 513 zcmbQI)TA;&h4KAFRr&hcz08U{f0lPmc_6;N=!W}}*AGtZXY?_X*1Xi)a$Tc7TPp#(9`V#f*ciuYL+Jp7$ME@~p$d>I94K0(~EX_EHk%=#Q^LnN(CKXE) z0~13di$vXIOA{kqlSE5n-6YF216>1yBvW&XG(&?V=Ge7@Arcnp+v0P3~b+LE>)S#U{u&`2}07vaw~FiK(%XZd#Hl(C8GCR9y=bb7S4K z6r)6wG~<+{#3akf8SLH&z2=+uvgdK|RIL3Z!@$5`9N-h;I@wCVfE~!0+uznOIZr@= zgI8EkwZP==pUKk%ECRGu&;I?ty>o_qhQd+32rGpZrgIn=;h>)7ZQzBxCPB-{KwpD} pn=7Q5AFK7wi>Z))vhjYCw6*!vhfXHS-ax|{JYD@<);T3K0RW7OzmEU_ delta 484 zcmZotnWr>Ch4I})Rr&hJyrTvjf4*y0v6$)09FLrLMf%H+xi@|+T^X`cdFBC!gr3Vk zzy9=+7hmGJDJJ@35Ql;JbiU;mkC^F9=Cz)n-1_67dMqbnDXZfSmingl^Mchp4@37$ z>9$+%sZp=uudDtPZ8GKC?m&%zd6Qpu$S<1crLjr!{lXO$tNT~WTH9WH7m*yb^vR*C z3BD_?J^CUJw`-N9Eu54RZ^B#fCGK`ZLnRqKUZ(!-OSRB7F}F0;O-xEl)3r27GE6g0H8e_1N}3$Ux{}+_%)rFJ%+$ir++ea0 zTOpTGh@qL4k-3$T!Q@^x6(sKF-E4x4o7ZzBaPTvU7g{hdFc=5;gt+Erx=)rCG|;&r zwD1N{jI+QavY3HEPZ@+6E0)@q0R`DhJbhi+U$FCtNQb6GRFO3)%8qU-G6|63iu zuuFMt+5}X9Dt!=zFbFH6V4bP_=`3Jc*pDuaG TcUwOmXf}hVtDnm{r-UW|R;|4M diff --git a/games/riven_hgr/disk00_files/graphics_cho/cho_overlay207.png b/games/riven_hgr/disk00_files/graphics_cho/cho_overlay207.png index 4431ac968b80c5bc004b921ecdc60d38c1aae29b..8d6902a162e5e543c510fc9c9501715e90650999 100644 GIT binary patch literal 4430 zcmeHKdr(tX8jnH&Q+ZTqtt)OX5o$qiZf@R56GRd;nG#4L3RtV$XShmovs=wrZKW1Mb4q9j%WdTKl%5-K||)S{A#D>*9lj4!f?HJvY3ko#`;M{g2Gt zoO`~gQ2~Y)i2~Q^o-J};fac%tOE7NJoK5`oirkyg758(_o>uNlD@#s%q5q2- zYv0wr<&_)a_LFZ{FwJqr7aMqOPW+c`+3Nm`T?xIBukk72e|j|ha`M094ZqlR;zHcU z?^-T%C(eKDKQ!EPd|5}9Y2cf>%<6wNX0N#)SLevwb1@K`)m&b=;no-bnAcIy?0fm) zf*RGq_0QDY$z0cd>H30u*P82AmrI9it$}@F<%hp(4R5)b-@NhtW7nUuW+V=s$Db7~or$!;~7##09gH&*U3 zTF%=Ow&&(IuTP8d*|&aRZ|XlJ*|mPV#1Zw!%$ArZk&&7wqpdIf_HfU7&s}Hx&7R)Y zmYNnQ>OqzEX>ICB%ZtM)+aE(W22R%x-qxM=KLIJzvfnyM&#@i9$jg&xZwr3o(WD_s zRZ=ZQFY>;;cN<&ToxkkQ&o?^%GdxmMx%q26BP00$wS$Rg<8s++5q*`tPc8p2Z9q40 z!n!c|m*1Z39a!9V=;OJUb~d~^WZ1g5aD}h!N@pv%`Q7|?(Y2qYZu+32mHWE4b?xTX zvfKyfEE_i!{at_bk>vK@q*&q(zP>}A*7nGo&o8@>+3;z6`UC7Lvgetkf<-$MA3l;< z(|@ls*fU&u^xU_#`xC69Ze-UWDz5ca)7@L&sbBJD`P}f=s+XU+^#^s;tGQSH>4JUX zLu}Z>t1jDL!leGH&SfSwRUp2yK>Se8$j*0CBjKq(g5vh@V(l42x_Q__G7D8SFKGT_08 zEff#ol#_8AC3jABNFatZN(xjqnayLON*GH8N99-KIEacZgpQP~OcxshdH~>}cnk`- zO5I+4z$gjf>cP7pMkG+kgx_M66x!^NiRCCrDOE~ka8`iv$tCGx$iR`bKF_>*3Da$z#RHxG+GC3lb!@vUemb-Z@0K2_Q1&C1$Gvy^X#=|qL8xk-v zoGs&x5(&^lfz3oW@+dD` z#t~GOk8<-%r$Ug#gukbZD-ESX5(rgFxqzt`tcp%sa*fqypYRYUa564W$P17?&5~#6 zNwTKJCTK$GObrCMPvB0o9?v~w46JN6y_qG-gz&6pqeNI=PqG9<>O-$IPGUM-tAlBo zS_>)v#PisbHmCsfM+LMh>Ppu2qmq z6+vSmD3Z{xW;quIwv%yTP73k3ogsxlxPF!0YLv*OvPp@(6ys^&V3cGt?y|t7!oj$x zd>#|nL^X1mR;N|SH5wTzSD}+e>nP3(Dp9~hWm1JUq!G4750U}IVnUq)fRG&IqBn6A z#(miKRcZWC8!L{&ZOOgT32;P}yl z*WNhxct?gM_U_}q>e>?>!?blqEWW>_B%+2hmwDzV4v}KzV4d~zuB+{xb9=m=;9j_SBw$$Q}SW|v%_%QZKO6QGixW@NT)VakkEX>4Tx04R}tkv&MmKpe$iQ>7{u1v`j1 zWT-CM#fmuADionYs1;guFuC*#nlvOWE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JW zDYS_3;J6>}?mh0_0Yan9G^;BHXnNI5CE{WxyDA1=5kM~nF@J%m%q(M0l9KQoU-$6w z^)AA*ywCkP`qiAp0G~)4V}@BJ-XNaYtQws6i9@U?tHkHTlO|n|_>t?1%Ws?u4huXp zWTsQ|#35p_(7{Rvv!baHPZNh#O{aVzhA~GHFD2vRM1-h z001*kOjJcc005IX5HKFk?Zi_60004WQchCM|Fl}fjR`KA5duyQ@Mu0HwVfO$ zP@q78zXJg>xSi1*9D@!&pM%tMu2ld4002ovPDHLk FV1jT@6&wHn diff --git a/games/riven_hgr/disk00_files/graphics_cho/cho_overlay220.png b/games/riven_hgr/disk00_files/graphics_cho/cho_overlay220.png index c3ae8d344901f6ddd26f227f07fce165427cd47c..729979a290c62a1cafa3925e0086c2145c598020 100644 GIT binary patch literal 4412 zcmeHKeNYo;8V?^uObcqY$02fEBFaa*+06&}*d`z*2)PoQdcHiCS+i0}DBhoZ zHaaGfYW-&5WmnyT-!DGPxlcWv^6n?k5v|Lj&M|wg|0RvvH+$gQeX5l9?MUqI!N9Fs zddH3w!&k1oUwAj~K5V|(iv`wi+0>t%)D-!dV$a*(rp*6Sqb%w6{O0EFx}z7~?oS>j z4y^dK{JFS~8Y|KG6En+BWp|sd`5wzj`mC!jL2;!lvoH1NpC9e0Ov?OPcOZE{dhYd^ zO&y8#74=!kFQge3r7k&gy1no)IDYf<3;#&?{_3hPW-a=czdL>S;SPx;qLDF~Y!;Jg zEOnT0>$(?>1t)Funu<#HugZ+~+p5pl+OEGM+rFwvW{-Vq>B0EL*hs_TI7{;jdk0r} zZ@Id@931L6*l-Yuy}v>ClrE#EV9UKlO}|jA3BI%A&JF!LfyWVb=JGdtoDtUUzw^oz zr|+QS+G8nqWgAi&fiuy!bJs?8-Nll$f39wI{rBET*}BS0jwMS{Ujmz$x$NvB_Cn0n zbwlY-oXxzgzx`KBLhAZYdxmZ&U47+T}*?(-`q|EG`^XlrfQ%hUU&&|G1evG~N zbjr%atqUH0ZE3^x?|MUn_o@!P_i5wqc^1hjM3?$|JJI&^t-C9ad%W|@% zh9Cg}+<+&Mpu5WBBZ5Ymh)ckCL5#@|(S%=Xl$Ba-h>7I@qL!=WIGPt^{7PB26ftnL zlPESX8-;*hMp*^VdkG8+1OoDaO3rdFOrh87FSy_xMIxfP7#<(u*nNIOcX^6Fq!)<{J_I6oCrZvKuuF>pvt1C2~ZY~k0(785TGEqoPjtvPHGe+PNBF$ z2Oae~8g&3%jnb4uN9mN57U)zHAc{B!b|qOgF)9IyhEN(>=};>46siO8q1FR6>cA;A z3MidQqsAR1Q0YY|nj)65oSTH@WZa|+U|x?)R0xC z5aloz!o&fRXE{5|RvBdi1R{8jtF3T3(IiirNghB@T&X5-Eum1^65I5&niY-N(dq@3WB7LR#-(< zkRBI+yT@p|j>(xHX$7ZVrPS#t6-uhL3RLaHHL#LO3I!TcOXF&lJ}WCs(m1-0b@Bm{ z1Gz59BjgIUr^pqOE*2_dax8%gAXEVohT>ZEhlF9H31h;ZF_y6b`vE5g(O|+R1O37> zxOu_75F6hNM>&J>{+!onEq=}^5M+9iDe*f^*EC&IVqi+f)7>>q*OVBTlJRtR{om-4 zKKPvi9(W20z@McPJJ}xiqouMfx97p}%CE}H3y+1&Ba*%4t*x!|J{ajc87k+ZLY0QL zwzg1v-@LC4eHXWJp}tTk1nt{)Y}x>ancjjjpF|>GDBKaj{W*RpoWWbHc{8rfh?_e< zeYiT<3`L22UMX*4-NF%GBAzS(jRY9J0ufG@E9>JEpizazoNF&QJ^WFZ^j+kU#>?ky zPpePe!1^Z*tw{l?Sz%k<01Lu;>`*w$NgBtlxVlj)u%fk8_omb^mq J8%xVK{tw=kKVAR; delta 174 zcmV;f08#(EBDe*RBNYLJX+uL$Nkc;*aB^>EX>4Tx04R~OGXZr01PRD+J(DmHU3%Ecw&;S4c07*qoM6N<$f_Mr>n*aa+ diff --git a/games/riven_hgr/disk00_files/graphics_cho/cho_overlay232.png b/games/riven_hgr/disk00_files/graphics_cho/cho_overlay232.png index 3d7daeb5633a097aa6ba7b1f0273d65572d483fa..bf035d9b3547b65f75a1f8963db0bdcaf7e41e7e 100644 GIT binary patch literal 4445 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 Cu~#Yp delta 223 zcmV<503iS6BIgB=BNYLJX+uL$Nkc;*aB^>EX>4Tx04R~OGXZr01PRD+J(DmHUI<}~h=Uvm zFu(u<43Gr^R1hG8=?W?+l5ZYT8;n!