From 5fe012edbca6bc2fd4ff0d41524b02b4b2a12e7e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 23 May 2024 14:58:10 -0400 Subject: [PATCH] riven_hgr: start hooking up movie --- games/riven_hgr/movie2.s | 10 ++++++++- games/riven_hgr/movie2/Makefile | 30 +++++++++++++++++++++++++++ games/riven_hgr/movie2/img096_bg.png | Bin 0 -> 885 bytes games/riven_hgr/movie2/img114_bg.png | Bin 0 -> 4603 bytes games/riven_hgr/movie2/img115_bg.png | Bin 0 -> 899 bytes games/riven_hgr/movie2/img116_bg.png | Bin 0 -> 894 bytes games/riven_hgr/movie2/img117_bg.png | Bin 0 -> 894 bytes 7 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 games/riven_hgr/movie2/Makefile create mode 100644 games/riven_hgr/movie2/img096_bg.png create mode 100644 games/riven_hgr/movie2/img114_bg.png create mode 100644 games/riven_hgr/movie2/img115_bg.png create mode 100644 games/riven_hgr/movie2/img116_bg.png create mode 100644 games/riven_hgr/movie2/img117_bg.png diff --git a/games/riven_hgr/movie2.s b/games/riven_hgr/movie2.s index 659cb91f..e7a044b7 100644 --- a/games/riven_hgr/movie2.s +++ b/games/riven_hgr/movie2.s @@ -157,7 +157,7 @@ movie2_loop: inc SCENE_COUNT lda SCENE_COUNT - cmp #1 + cmp #5 beq done_play_movie2 ldx #2 @@ -315,9 +315,17 @@ done_pageflip: frames_l: .byte img096_bg_zx02 + .byte >img114_bg_zx02 + .byte >img115_bg_zx02 + .byte >img116_bg_zx02 + .byte >img117_bg_zx02 overlay_mask_zx02: .incbin "movie2/overlays/maglev_overlay_mask.gr.zx02" diff --git a/games/riven_hgr/movie2/Makefile b/games/riven_hgr/movie2/Makefile new file mode 100644 index 00000000..f3257807 --- /dev/null +++ b/games/riven_hgr/movie2/Makefile @@ -0,0 +1,30 @@ +include ../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG2GR = ../../../utils/gr-utils/png2gr + +all: movie2.inc + +movie2.inc: \ + img096_bg.gr.zx02 \ + img114_bg.gr.zx02 img115_bg.gr.zx02 img116_bg.gr.zx02 \ + img117_bg.gr.zx02 + echo "img096_bg_zx02: .incbin \"img096_bg.gr.zx02\"" > movie2.inc + echo "img114_bg_zx02: .incbin \"img114_bg.gr.zx02\"" >> movie2.inc + echo "img115_bg_zx02: .incbin \"img115_bg.gr.zx02\"" >> movie2.inc + echo "img116_bg_zx02: .incbin \"img116_bg.gr.zx02\"" >> movie2.inc + echo "img117_bg_zx02: .incbin \"img117_bg.gr.zx02\"" >> movie2.inc + +#### + +%.gr: %.png + $(PNG2GR) $< $@ + +%.gr.zx02: %.gr + $(ZX02) -f $< $@ + +#### + +clean: + rm -f *~ *.o *.lst *.zx02 *.gr movie2.inc + diff --git a/games/riven_hgr/movie2/img096_bg.png b/games/riven_hgr/movie2/img096_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..2821a5cb173fa91919629f0f56120d90667f972a GIT binary patch literal 885 zcmV-*1B(2KP)EX>4Tx04R}tkv&MmKp2MKrWQq79qb_DkfA!+MMWHI6^c+H)C#RSm|Xe?O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgc5qU3krKa43N2#1Ql81o(az=UM)Be~yS+uow^!i4)8)ZQ>2$nN8c^ zyiXiuWmzRYC!R3rg2azpS3G{>Tyk09nNc&FnJ11Ci={4Bx|o$sjd+?krfNFn3ptNf z&Rd+dYMr(3$zK>Q=qt-yr!|Tc7O?~gA{5k7K@~RQwCki;$k2Jx$3NowC2}d`s(_JW z0X1llT|f9A{O+w)oSO8K!bu?X;y52;K<_TlYB4lw*=$foQ{L0Uqw2)v)sH|2q$TcCf<>s$LArw>4udX>Hb4i16w z5@oOZyt}WvZ~xY``}YF|p>lh!i!(j|001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmYE+YT{E+YYW zr9XB6000McNliru=mi%93KlxwCLRC)02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{00ALML_t(Y$L-eJ4uUWY2H?hI_Hyt4wo+#4VJ9YwK(to~`0>*f1>#cA zk1Cqtz2J9D1INiOIEKd90dcDkV68SrXQcD(F$hZ`YL3A=N=JxH-{3IsW9W)OPN8!N zs1pjgemCa?w4`*3!JI^Ni$b^0w=86WG{{u|eL@d%7Q31r6tV&8?s+l?nFQa#+So`= zzJR`nj2`%W%dTx?g?u`J zk7_kRz33?+VfO?5r}IH7O@vSaizBrMq=A{5a5^}&%K2a)1oKDl4xnFzuYt`uyg)+4 z4#+PhR|fU#$b=s50ek;>XM^CXGl%2g^n{(CuZaouEBhZD2Y;_#4RKCQs;Vf300000 LNkvXXu0mjf<{63J literal 0 HcmV?d00001 diff --git a/games/riven_hgr/movie2/img114_bg.png b/games/riven_hgr/movie2/img114_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..30b99f69f47b3f6a5fc095c30416fdd3517839a4 GIT binary patch literal 4603 zcmeHKdr%YS77rJdM?q~BX?@@tM3K75?&d)f69fVXLNG#9ta{C6AFx6mZWaBMXR<~Zxyj~uZ{vbqIIqU_uGI7)6R69x&4pKWWU|> zo%1{A{J!&@`M$OKcnxy%?t0WOM4g=kg+j!zR%n%yJogDRNWeb$I7;C@Y?A; z%|$#c+Fdj#^kBrEi8n&r#CPJA%6&7NNpwKD_zcJlDaA6wE+k2x*by5;-aa>co@ zjnT`K)p+CJwd1QrHP7p-?^l+m#}zNk`BX7;>gHu>t@vEj(9AR+-?3zK+l88awj0g+ zu8!VkpVfKNHhaPRf2+QmU2$kl$eQ8MXDh>&RBqTdC)gFU?hNM&~?txAo2;5s_JzMxUmXu0;}*F)xGvkJbI*mh=jJRXHSOUOI& zg=>Am8M$rg&sToYG_hW9=3WZXvK0bd{@y_+$}ffo6x>>1G=A5z|H%3uyr3D2C`-Y+ zTH}eNf8GmfYi(<3xhW~@{F^{?m;Jz4A9n*(sFMMen5Iio5mvJZC#@z*}p z#o>_CoMo}AoEo7UR|VdAu~-PXRk%!zFioe2v{sgaq#~&Zfn%La4knE7h14ubt5Ra( zdLY1;Mwr2IHkDZHa5zK`iO9;Pi&3RgDMm0chQUAsw&z+n+zDIk!8}AaMhs;qSjNUN zRtv;q;wEc0rx6OlJoF+yvrVV#g}2yySO9#8ow!YmiV(5cEbePz=VEgJNKZh&YhgEl z4J}Tg?AC0Spki|<3m4oMf+TwFZP{#=I~|e`Q(2T5sM>*7w4civ2|9hR1y4abW45`i z0NMRCIfi~oR=?Qz8FxB;0|Dl}xc#(WddIKqXl09Bv^f9twbq7=R*KCh379300hxHRE7888ey3P4zQGsLtu{d9+0KhE= zxu~=(g>zQcV6|pxgnUR4Z`nJo1KWwjIXnjEC;*CJQWYXoVG;u>RY@=vhQbJt^wGDH z44wN&+Wh8$)ZI%S&)9+gT(_uuN2O9ryT7_Wvl#bQf*|*%P~k*(3U)k)BHeKUtnMiy z1Gl78pnLR`>kB#aJEfqM;d(5316 zT1{2S)si`#fAM~RR~{N>)#JCHst!eWtnTn?sJnUowZGp_cGYcq-wzNgNQh02IS_3u F{2%)9r|JLz literal 0 HcmV?d00001 diff --git a/games/riven_hgr/movie2/img115_bg.png b/games/riven_hgr/movie2/img115_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..7bb6fce9aae55366a2d0f7aa014a5b2132ec5d62 GIT binary patch literal 899 zcmV-}1AP36P)EX>4Tx04R}tkv&MmKpe$iTT4YMMeHEOAwzYti;6hbDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0sdBvsb*giP&LcQ zrc*+`uquRJ5yTK8h`}c@Q=b#X3_QozJ$!t)J&;^Mfxh}i>#<}dUpJzsmTy~x~N-UInSngp~F;wDd;<%z}l<&{G ztZ?4qtkxQ=b5H)la8X-X<~q$$q_K!4h!7y7fhuaSkf2o~#YC3&Qy%`9;}^*#ldB3w zjs?`ALUR1zfAG6ovotm7CWTW#@Wr-2#(>Z+&~DoH_pxoaPk_KPaHVzq^%gMuNqV!Z z#gBl)#N?kat9cB(j`N3qySBSsRX>A(Ki)<;agx}&F!tTkJASrM_pxZfP+I| zyiD2a9`Ek&?d{()o&J6RJ?V0h-Z89`0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L04^f{04^f| zc%?sf00007bV*G`2j~SC5*|6H3lq=)000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003lNkl<#une3hhu|EV^8^U5^f73x4RV!~U`vbSv+11>#4Rn*EDNYU0KLY5^bd%Z z6Ob;kq}>ue$D|a))dIQ*$aM?d14|NW&Vqt!S9J#!R1y(Q;7z_u057_GR;R?SCmV<4ddM7KCo7b`>ThMp) zGO#-~^C05l3aAE>g3(iX5(M~ra4^_sDr}6+63~{rtU~+B{(Ip6 ZEX>4Tx04R}tkv&MmKpe$iTT4YMMeHEOAwzYti;6hbDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0sdBvsb*giP&LcQ zrc*+`uquRJ5yTK8h`}c@Q=b#X3_QozJ$!t)J&;^Mfxh}i>#<}dUpJzsmTy~x~N-UInSngp~F;wDd;<%z}l<&{G ztZ?4qtkxQ=b5H)la8X-X<~q$$q_K!4h!7y7fhuaSkf2o~#YC3&Qy%`9;}^*#ldB3w zjs?`ALUR1zfAG6ovotm7CWTW#@Wr-2#(>Z+&~DoH_pxoaPk_KPaHVzq^%gMuNqV!Z z#gBl)#N?kat9cB(j`N3qySBSsRX>A(Ki)<;agx}&F!tTkJASrM_pxZfP+I| zyiD2a9`Ek&?d{()o&J6RJ?V0h-Z89`0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L04^f{04^f| zc%?sf00007bV*G`2j~SC5-TJ4SSTC-000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003gNklkfk;427E|jGw&!+fHPa(^^2Z*_ODIn4rYZ(+eP_ zMbA@8Lj08U12^D2atNG*rZfShRecyWV(S2V&@y`fm=%Hzgs@f^QG5&E-hgov1M@40 z#0bh<1Z}{u2q*G=4TwiJuprq?SS7x)2Qsu)Rpyx8L3BEQ71%3*1R|35{`SCHh!enC z6wI2;Cy%i#j3n(3t1SDIp%tg=JOPA06B+`!5A%g(;*mxgA8Z33P1z3396A7H7xG$m zaF|nCvSb1E-CT UJ6IvFlK=n!07*qoM6N<$f^8U!p8x;= literal 0 HcmV?d00001 diff --git a/games/riven_hgr/movie2/img117_bg.png b/games/riven_hgr/movie2/img117_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a2d155c6059c13478528e85e6014d0cb124d7a GIT binary patch literal 894 zcmV-^1A+XBP)EX>4Tx04R}tkv&MmKpe$iTT4YMMeHEOAwzYti;6hbDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0sdBvsb*giP&LcQ zrc*+`uquRJ5yTK8h`}c@Q=b#X3_QozJ$!t)J&;^Mfxh}i>#<}dUpJzsmTy~x~N-UInSngp~F;wDd;<%z}l<&{G ztZ?4qtkxQ=b5H)la8X-X<~q$$q_K!4h!7y7fhuaSkf2o~#YC3&Qy%`9;}^*#ldB3w zjs?`ALUR1zfAG6ovotm7CWTW#@Wr-2#(>Z+&~DoH_pxoaPk_KPaHVzq^%gMuNqV!Z z#gBl)#N?kat9cB(j`N3qySBSsRX>A(Ki)<;agx}&F!tTkJASrM_pxZfP+I| zyiD2a9`Ek&?d{()o&J6RJ?V0h-Z89`0000pP)t-s0002v9$;Wjz5hi00Ha`>oSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L04^f{04^f| zc%?sf00007bV*G`2j~SC5;hgcj?tL_000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003gNkljg@Hp;^=>CMxz=pksqg z#d9F)nee^fwhe%AL>mLBm(c)QXd3MRF+xZ`wxF0+9*;R>_6gEp2n1SE&LE93$tWPe zUxy$;N=r}+#Da2eRKXyxP^wd|7l@D~=7U{723uR;fiXf^UkUO?_#lx5c$5u1P1$+0 zp7eeYwEan_ zpFHlYkgi3q!by;(UV+)FXLrT UZ