From a856fbeca9b4416052e3adc714f355015a5846cb Mon Sep 17 00:00:00 2001 From: Richard Wheeler <2762690+zephyris@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:00:20 +0000 Subject: [PATCH] Fix: Incorrect mask files for NE river slopes (#11503) --- media/baseset/orig_extra.grf | Bin 420418 -> 420256 bytes media/baseset/orig_extra/rivers/rapids.nfo | 32 ++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf index 5f2298a354108040a842dd843933b6b0594c6de6..9adc6e04f8daf499c9a659472fde96a6cc9c0924 100644 GIT binary patch delta 12636 zcmX?fMRLJq$%Yoj7N#xCfdY&g(+^6qI8OgChncnh#{*WzZx6T_e?H)6{CoS~nDKm@t0bVRyswf-=)2kqKfqRBy!Hi0t6sP;;YvLt017g({{Q0v#q3W_7H* zak(Sr#$Co=8|Jb$G&KBYzQOu{i;;cDwGC@dyl3Q@aOTGEmHHi39W4`eH)b>bcu>#C zva#hsA0z9H&Ik1~7`Y}KW&AyH(ZyQEr8hQrx^)I@+_tf4Q=n?{wY1r`=fi}`d{~& zGj6z7-2W8}H}!q!*Xh~6t@ZxrTR;1z^k#2&?TK6edwNJuTu&U+w+;7i^tJX)>EG3R zpr5b5sPBK@_HFn3o@}4r_hkKq=jDv7&ueZi?=|l+-2RXG=LWvs#6F>p`l|iE8UOYx z^-J_i^nLEz-uJFwzwiDt3r6NH{l3LLAA4$;HVE_!Z{NDtqklrLN&mNgiGJ6f86chLOFuuWxO?b??9F*RB;lzj*&=e{%1({`viT zw|aNI-;%M~g=wis_r(6(zA1ex`le*{O}TOYe&p`ZZTI_E_C4ADvs-bA1EW}9ao^Iu z*uI_HSMUGb7u&y~ySQ)D_8rVWXGnDH?Vr@|)5qMu_5SZ&x&6!5DLyY@W}GC|FV$Du z*R$(Kf5-NcdydyXGj+>=!>nQZSEg3E{@2?-Y@Z{{oG!trOryjwLCJY7;bxKiJL4`rrT~=cJ~NG}L6y`13|ZR~;mw zPl6`&&0#m^JzUJl(V5d7*>$A57n0a_6yFkK{P9SEk$o~e$-`3oju-VePj~u(6Fex% zi>+#V^plZkXX?!a)P&FUZNu$iY$?CzN!P!ggT3Xw$z6$iz^R^T16%KrUbAhkljFPB z_cX74^yDNX+iq>tq~E)HO&sHfO(A{tYr5C>+w^qw-Rm>xx!k*`x1hhP?{)v;{_Xur zeS5ASW7@z4j>E70(3IcbybF@UB7=mBH8zE?Gx%h2Tt|%kYpbLO7^`idpK|P-G9&c3n}4muX+BPk$L*oKDC}@ zprqeh-*4Ujpl8{Ip8NCf9qc>Se|y?uMDpM3d;fQzcyC|-{C?~H&AkV@*Kb$4wfSb& z`nC;kd%e5fPeD)oX?;`n?YV!uXG8zWYd>~RySHg`O8@+`MvP*8+K}YmzZ#VId*u5z zO@}7_K4wtj?_=)I>fhDN#DqKDe}$*}+0*y;vq(?(*I`lJUZ>AIU4qdZH4CtP11CvP z1@J(G`DeG}4fYKRJG5>nF#dR;&&d41gpq592Dld35pu&0Tq%I+ff!IdaKn6q8*)vs z8B!BWn7d)kji)y@Zdk+k{h}ne4!Cwx?jpDrm~io?HzZ5ktYxhKeRIac<%~=>BW~6* zEoBE~i;0k2(GDyALAhe%zKbUw#ok!8ath<>TlS2sT}_YL8963dT#DTx$H=y8{SB^; zE1N1|Rlv>Hj7&GCO=w@uv|Alf5!}|<&1*O=e7ZGhjq)DfJK;B8^tf&0X5{Q~>k8TR?WPl?Vz^SaA+zUf zk6w>$*Q@T=j2pIU_w4K3wBf+UcgR%(D1+>gx+8H%Wz(5%-YqW?l|y&l>e=1v`}FI3 zyFqosG=`qup1SU&J6=6=`citIb{t-@{>}!*4R<=a-t^_Ic0*JTeG?JY!?cE;IHsQ) zwx8|)x_xc`OhhgL)eapR+c#|g-S4%fk&$s_#{@4tSD-umu4eV@B!dZza)^gr!ee9vjC9ISqr`o7<+Z*AYz zzWt|NCw$aK+GR533mZru0pj2CowqzGD>Yt-+NkU^N21OtJsOT`5pu zvRVvU9V}#GU|7n$J;<9`O>zJ$g^i2AZ6?+StjsLn^j{w^5v~0L$^f8h;ZpjJ-OOB| zw$F`=9cf*$ld!aWE;HS%hE)lK+CH#~0Mzt>*8)uSkOYos`P}?*>D%2C$Fu>X*|R

8qQSeb@Wz;ccI_<`@;gv%`$c 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 U28JwferV6$$+A6rC+qbM033rs3;+NC delta 12703 zcmZ2*S@O^o$%Yoj7N#xCfdY)~(+zo8-0B$~urhvoz{U9U0YBsS8(d7?k~^etDBMtG z{INsf1{dSk9U_b@JDiz+OcLp^?C{u;yTM}v{{`m>F*l}OsA8HS&@r`RNk>{o%#OQ^ zzjnM~``XaZ@c+jHR>q$XxNfrExOS6u0~hm;c|4u`opPPJJHr{-cgAeg-I#r&YQq=C zZx8wy>%ZUVyfI_KQO4gB7hSAnTzVt1b9v{s&ZC`IHY{K8eiujQs-53AuDWS|({tnX zO;VdwI?gkHU(MW=bgSp##ICZg)~+dC^E$t7x_;|U$AL|CjBJydZ(X<{(z(4;>NZoS z3e&d@-Dcgc-67q{-9_Cs8>ehK((Tdp=4R@K^Q&rh?_lKUtpCxeH|fwC<;`E1HZb+* z_SkgZ>WS(q>dNR$@2HyMck|fBcZ{rE7xx^#`L6Toox@umZehH0r(1^U+lD)zdgXid zw%TqveEVome^=y|>P^YrJ&f#=^SWmB9NfC0$7!p=?XHcsw*)(CnSO4#t=uQrU2*$T zk4op-j;gI0jDMzucV%p=m+U^#XVd+fjsQ+JPXS4KxbmqOR9u37!%U1^Npp4XQ%{+wRk z|F8ewiBF7teQMMEy1cf?_e6J}?GNdX>)zQlt5d!|NDD|*?Vs7U8ZiC{;vM6>0Djw#F$#; z`qyu>-d-!roG!s=MkrrA&}U@d0nQmWEN>v?j2js@fVBU}Wx`!nB(C z#_o;-h)gi)`pSn7jXTS3eeG)Q+`ehfMycCOo6Q(mZhJ9qSZ&tv7?ukrPGRKeoVPjr z#=S>kmyYb<>Z;j%sPoAk21eG-cN5;;kh`OM;}diJj}1(nr+aLAyg}Jvr{|5w9aWpA z-gtb)e#hI+cRlGnh26EC_ir+8ywAwivx#xT&DV(Bu;ulJ7n_T>RBu__-P3CZ&J7to zPQ417&TPHBqLy*PP3Atqo+le;Zc*7Leb2I^>R#?0DaJoHFYK`Ce78-qcV(Z==GXPN zd%8^e)@*&cO?w>&codrxhLXOFJr=f4?$O}o^c*%R2O z-KW;C1Ii%1i#pzJyLG<}oK6!#8Kl#**AA39Cc`sFUvO{V{*{{!_1pFT>kscw>n~+y zSS>VJvWL4nv^%~}yg#JpW554ekNs0u?&)~Z@7!M>)Sr02fN7~n|NhRx>2J0>^jr5^ zul0Dgr!T3ias8Lh?fw7y^_k|0^&jbbIPFqDOFv7mVBZwvj4=K3_N}07aR1HylI}IV zMQa;DncylY6Kt1fWSS1k2EAE*rM(v0q(QmBdz|243vZuik= zo-Q#xcn-5WsIp-D1}fsgwZ#Jw=AX#b1>=tg`ix&6nA{M#VafOnl<6RKhSmj-3H%qF zA53NZx}yMFy|K9??ZzQSmYu9OS{T1yc*+Q^E+!h?l-zLfrUpEN)JHM?zB%LJ@(Xis z)-o++2j!55*Fbf}&3`N2PkgaSsN)nP(=LIH>o;ECxbNbLU79OFxuj$6jWrz`J5Fsl z-*L0kU{c_%>zfvDSkqN^^Yv}cTlYJ+U%J1uVUq*2vgp{>@uEAqlMPW>bY5j-e*BS< zbMv81^&vaHZ~W1z*YS4s7sd^@_`1rw8hgAuxx0#Px2&k@ncHpN`EJLHE9nz%b{BWo zg6fJbnhT%YQG;ZS+uQEif~pEonZ9{ichB8?Mz*I189AoTxjTJ}%9(?EoTlb>Z`qpL z@tx`Ch8x+SJkp)gA+pVG<-EOb82?QD-Bq8lO|tvM#wXpcx2A153CSJTPCe&kV&1SZ zVw?AR=Kbbd*?S)_vTn`;RU2Iy{i0p7`i=YbK-r`J*z^)+mJM7}H2YR{E8p?CuXn5M zPS^%VNapCS?cW8;9Q_XK_UyUbp9{?zw;lTq_fNVc+HeYqfBipUHOKwCw|3l#-u|)AuX8P;_UP^0BHSO;{|{Do^y@&fMt=yT-slVN@9y8x zZ`beJkEl1gKlSQQF$U#~-tZpxet&R{@vpw$vfra0Qe*W0?%|$(Wc#ju>;9TvkG^AF zjs0IhIdHi?BREq`H|uBVcSX+>eUkf5fHK8)Cq$M&uNU^8=*{Zy>a}2IfYb{MnHU(B zGBYr+Fl^WGW>%79^dwY6z*msk`X}JVCTP%_Zz|409;j^05zB{zJ9R# z1}mh|^x#@oVOK*}f7iTDgH3_Au6I6!)fSiT-`G6~mIu%qOq)HrjzB7jjXyfyff7Hc ztyHfIs~x&B_GI4D@0iP+JL<^y?ut!#!P4Tj|b`dyY4bc8J_Oct7;UCNul*1fOue(y%qR#U&u z{u_5E-<<(!HKC>cfBpX;ssH8^rqx2-pSGXecjDfq`ycO}?vC#d=@04Z?(goc>fF=+ zuiv>ps6UaJVQIZc|L^D1d${kL-C1_8y3eoQ`u_3z8QZq^9lJK=whbgRK&y!9HyGJ= zoa*T8XSx4-TTbuAD^G5}=-Al5cl#Np84}YM-k;Maxo*||=KGKC{kkV~+lG|$hHf-C(eamH|OP9*V*SB(* zSXSS-ebHc|DWWyC>H4O{9S1h`u4sf%BQd6RCv~*=`SPsc7J?UF^-hRQz*DCged~CC*S6q} zds{bxx)h8XZr|)&(YLDGdqvf>ot+UqlR%B8jR)`Vx<4J%uK;C^?YaF+z`Y7k=2$2G z{OJA2oBIFtXZKfKe8MQu`xH?_Y}?NGw`&%thL~{g{*F~sVYvj_w*b`< zTWovY^oR79_k8Tt=(Js3+HNxaLX!I%u}I=lygqBgfQ3{oqE__RF2xJyX^!1~sAJ z^+nHzHUFXg2v`GZ{Wj~hOw0@nozp+=VwT#@*23&7!Kg_|u0X0QI?|XM8X8VyZ{UK| z7U*4y2QfETJC!?)Haxhfdt>s08Sr)!I4{&+gteJEk9KT>R27UrAG+MMNA6j``q!X} zqO-cQ3({bMRTL|?PnvUCX*bhmvrFd~k-FBaYi@S!UIyx1U-sCc+j({K^Ua4k4s5sw zsx59w-%ervv4N?+TM|)Wbf)*@fvStHi=dX$l!sdwuW0V9JBdF!flcY0OGtvDt~e|lO) z->NO5+b<(pObLv?r+)_Zr8llZ>PsW#fz3<|41VAylRAR~!^8hS{xdU7+s)iQef?Y( zzUjxknKh=%q_PNZ&so5%BhF|;Z2n+mCVC{QBaPVZHnbzrS%0+i3M5xt5(4G3j#De) z{q2jdA9!E<&$#-QX;%^`XI$!k(07CN0#|2FSKzMeD2X;QW`L3IPvm|Kzsh(*AQ)fRYi*)YU z5(VlcbX0+|$d0#N7dN$Sn$X>T>;0`S8}E0^Fn`+sZdFZM2WnOI^slIzQr%Itx@Xdk z3+H#u>N&W1Uysw}o(bllt^{f(fm9Qqfv3&uA#JI97jLd+j%E z@}yg%FJ%i-FZ)*C&4rAd&o41@_0H(s*k8Bx6yt^smc4d;t2VXuujoIxy&2TY?q&uJ zLfz_ww57Hq+ETqi_x^X>+^pQa^ZJdc&i60hd&kJS?|-jH*DOZXzTmF3`tHJgQ~Cw_ z|6R8Px2c}rz2?_>Vfx2DzirybTjv@qSzXPf#}+l4T$@#*TZ8 zY+DnbpSijC`qbyQ8UIc<1ZA7P{`))n-}kFRvKXk_-7}|Ge=@k+eLZCQEKsiLdT?=1 zeZPL!I#BL{RvbOt)8B00we4%?Ur@!-dAj2$c*siiya}UNN9X=?kXoasx%XlZxYoE1 zYD{%Y_TA}QwZ9oO`qcRW*6IG-U2v(nUw-<*uCU%4%naQ!U0r(~_IKUQ0*^iIyWMw@ zkzwcdx4W3%OE9_;&J2vq4=h0gv&h|x9l40%C#22=BO7dJb_1k?eeEXejR!X*nc0xW zWLbA~GIHHuotVAh-$ss`QH-1uW$IyrQLx+r&Kw)wZ=80COOAEV6AMB#ZPO?Q`k) z)NSAG3GZode|LYw{gAam+YCB$x_8!ZzcJN$d&sszQ2yA~-!rF^?b=nO?6KqVhI`1_ zW6GS~a8T9&cRH|UjkSr}BKBz`)g|vcUVtiz{(}4U;DK6DV+z#az8*5Qs;3@Ym0a9| zH&672lb9z!Be$Sj(F-1m!jUVkg2tjaTIKfL?)PS7*luv0xkZ9eo^Y;!Oje-g3CLsx zN)rl}AJ7|5p!tc3SjS@#S)d+TL4XFDz&&h~DG5-;0O?zU#+YDDCfGay$anwZb{^|l|R z24LF2HT_xND#$DZsGS7rFjxpe{9XSE0)bG?3J#3K~ed61c1TTJ_!+^>@E-xYwVtZ3Rf-_0nff{q@WY z8wC1~K+6Bgpytw4P`MAPQNW{0|N8%JxOwB=2Cn|n4S!IQIb_6j^Uh9NkYOG7I*+Zq z1@16R`P+X4Jgj7W|Kt6OjO>V^rOvcX;1Sp7zwagWn{9UhO+YX*?f-aVNq3=@P2hcdv{cpFv-8TcxLR@Ww_Z_y&Z(Q0V)cp@s6M!ZmkQz=$nHU(7Kz)bg z?M|PW-$^iLU?zN4lv%n5`i$Rqa4|AJuw!K3fifQfN&F9{GIHH00F~Gm&}QuRf<~Me zzwWrU;Sl532c?YPA5?ANVrGR^3=@qmginA@PSkIdVf^-xgYoxG-VJkaPGnqqvmUim zee=aFq0Ut|O+hun29aCxH(hS-yTH|P{+2uA>Ra}pI)Rbl5hG%{Zso(yvRzlZnm6%X zTDIfLEm`RJYsYR-{u;Sk1s$1n7;R8^*JvJRL zK(iCOK7uj_ByaSrXJok(yKDZ&s~7L@=G|z!MRUt9CdLgnJbLB3c5K?aPydv! zo7y%--q;B0SFhOp^a3N>Rp9xeOLBRbL*1ca_&C!P1|d*4#u`GJx{td_G@p5xp(hM z$=);I+@sKM+;?KTJEFIJy$sZNn!cys>300RDJvs3WlVV6U)iP5a|G1SxaZTi=l-{? z8lY*4dU%(6`y@ujy;XPIZ=YSgb5q7v=jkE6E!&g3Zg1=FT#VY=e*TT|*OZstnVZ(F z^V{MM%0{3bcc*+W|Fjk0@!0J3;Y=F@y4Qm;&sHtaz}57rjDPnx-skC#>hJDxy}zSh z8rtEmuL8B3AcL~^_uk%u+~w{E4ZC`*ckTzxbu$Z-`uy}cn~yk(Jcp=!P`Hnf9rO=zE#_mHcW=*90Snw z-R**V=6wturQ6}nsQ#{Pr}i%EwYUbFyx4c>y7&D%cdAY^F)-AFvQXLfPy8%%B^Z4$ zvk>-)ZkC@74GkBNX7nIAXhY0{aHLs_37Z+YV3o**J2^^*6XSU%btKk-JBE^G2o( zOq(LRl6%~GLVKdRJ15(8RCSwg+;j2W&V#EicAoC8-BY-UXTv8*SED$q5Ty@=A*?pqt;M0YSEK{G{UJuDJ%vgHl)56zvPk7vYq8`$I>V38K=~hTj{JGqX z?>D$QSM=@$Wfo9hqbp-uF=R%s??k`*HW%2i)O};nuv8~wzf=FgZTmpOQr*m;CRD#a zN)rlHz1*L4+vb)as0r2Wh?uSDO6#tNbjM#ohNABI?GwMF!pPZg*yo2l)!oZKMHtdi z0Cg;SpH956>C2Yscb9LE1NX(D6Wy??1=L&U&%WQnv|4DI`2F8oj({ffdgu0rGcrH_ z&B)&KvC|1sz4Y7l*ZcOzfa{knfBQM7@9MX{|BaD#$EjQIK_j+ZjgV<>$mGTJ8~tXW zq1qc8Z_mEF{PxmbAh|Mr$ zG`84&%;RZjXn?E-S&6&7wQ*a0$Hva{6YrtSXkcw`?V88P1?q;Qx40O8K9WYy8#mwG zUIyuggPL6z4s`zL=7)DHK+8WsgS4RKA05l7gux_?myK3uY>>kKc)?QlOpf`-saa? ze*x40yZ@V!Wp~qU(14X$@3!r2_g6A9Z@jRxt}6}HZ0avv-@=4wfbB2e{<}Zq{%=?> z1F9$nG_(sIvFbAGESzGz*&9)R+)dkZ7i^LTbY5>Ve-ESqmSGK>*z1l5sQ~4Td$nEG z(=Oey=;#EwYf>9%das8KdGW`z_1ot#vh{OL|J}W2P5+je@J81~Z8JvJ$6l~miwlo$yx8!zgTFf$)WDhqUJV7x2^+vUVYB4z`bCVK-Cr0t z+}^w5EodyNCu(;KsK{S4w_CaM-IR%47duZgetT5kc^@>x2U!TU3e>?yEQIO+cRubI z_vrO(UvuzrI^*xhIa{A>Rk&LYTL5x*I&9o_8%oCLDcM`^eEId05YXHOBxiu;E+9j; zkgNgfiS+I4n$>sxe%D6EZT65HasL(*>xTQ>pd8Wd-M^xv>U#6e{_fDu3tb9*etj-I zz0j!($bu+PJ<&gD#iu>C+w5WMJwWq%pfTHe#Gox`F;wS;y9#RppRa?A*n%2Ry^Aij z^={mcvK*>kXRpGhb$6HFacBI#ld(7Ph9qced%9s?dVe=~_z5(<7u28FUjS-G^~~A1 z=eo}GB^%Q(AHL6d*Yd92jz9O6?goM9FzPk7uS1#U6Y2lGYbt0kn2}}Q>syf8S+dV5me?6Wc$fuM&=s@53(6^S=JCqZZYE;aAEzj6C5KF|uP zTg&jw`PCoUJfYhIlzlcI+JJk`Z&DFx&hJ(nzRYv9|5f_ z1l1_W%`He@{`$Y?ulfrheR=G&fBjSY|8?B!cnhyc?wU-QbHCoT_kH(aP+ih{3Nrl% zswdzpM7D3;@wkV3`x{7ar0Y1MBM-_ld!KeYf`)KAltB}JJx{vj`uBo|aQAuN`_O%~ z=l=FNJ=~yWBHfE1E2p5-ep^=bo?9aXp7s;z@7msV$8n1rXzA4YZPt&O7#Nm=@=D-# zi$<2!5{!u?HKbUPm)PED>%hLm7Ioa}rWPolb&7zd{Z>4?K20_l2y=D|U;95y7g4D|mWe<*9$oW5bALB;E-ij| z5Hu0q)r@QQue)Xgc+mFd+FQvtw=X&}8)^1$^B3?^LRizPGXk`-cGuKy^IN`Kj&7OQ zfwEExTkEPTqt^_wOa$vN7IMpKU;WL>JJyUGeKwtc`!4panF?7vSij*$BB%=&fbiw+}X_vHj|e1B{$q3RBMA z)4WxG?_KW<&=lbPZ@1Upf8M_r+B08!X5atL;QKci87B&KW%M-nv-El}vOF)k!Fs1Y z@}@xV&F#4xEfAC8JJpd%p$Qcdu-&?Rit* z8-D%cu9a87L%N8%1u{FhA2Q8x-TIEt?z8=E_wL_&(syjz6i9cZAH3=ow8U__86(pk z?z{i`UGG2IAcwlpuByc?a3ifF<_368`h`OeUTr{XeRW*xc-rx0qS1}_ zj9(uH+{oUTjmRpXHRw!B**C^_R&=&^PMf&29@O+={0Uiwj+Rd}yDYlgyTZCsI}ILP zzY)*KvFrM!#W%Y;%XWPQ4QzF;K+KeP{q5%ImhRT-wuI#s$hhzALySzFKPF#<3~DiM zxZ&LWrH8qPxknL_QP$L>&5}d3(_IKer&%Ic=7r3Keuk*wS*1*u8f%8(UsACwrf_OUtep#L*Je?!uxBWiwJLg zzrXO>;rpv$JrJ}uSL`j&>Ok;3`L4$88@Bm%froy<^+bIfBkOMa`x79`&>;iAh=qjH zKi>ZaT1>S)j`hJ-5zr9Wq-)MzgziX zljZOgRU+WgD`DexEZg_*V12j&07`}` A+yDRo diff --git a/media/baseset/orig_extra/rivers/rapids.nfo b/media/baseset/orig_extra/rivers/rapids.nfo index 99f87c7392..b4ed88cd9e 100644 --- a/media/baseset/orig_extra/rivers/rapids.nfo +++ b/media/baseset/orig_extra/rivers/rapids.nfo @@ -13,7 +13,7 @@ | sprites/rapids.png mask 90 10 -1 sprites/rapids.png 8bpp 170 10 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 10 64 23 -31 0 normal - | sprites/rapids.png mask 10 10 + | sprites/rapids.png mask 170 10 -1 sprites/rapids.png 8bpp 250 10 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 10 64 39 -31 -8 normal | sprites/rapids.png mask 250 10 @@ -28,7 +28,7 @@ | sprites/rapids.png mask 90 60 -1 sprites/rapids.png 8bpp 170 60 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 60 64 23 -31 0 normal - | sprites/rapids.png mask 10 60 + | sprites/rapids.png mask 170 60 -1 sprites/rapids.png 8bpp 250 60 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 60 64 39 -31 -8 normal | sprites/rapids.png mask 250 60 @@ -43,7 +43,7 @@ | sprites/rapids.png mask 90 110 -1 sprites/rapids.png 8bpp 170 110 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 110 64 23 -31 0 normal - | sprites/rapids.png mask 10 110 + | sprites/rapids.png mask 170 110 -1 sprites/rapids.png 8bpp 250 110 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 110 64 39 -31 -8 normal | sprites/rapids.png mask 250 110 @@ -58,7 +58,7 @@ | sprites/rapids.png mask 90 160 -1 sprites/rapids.png 8bpp 170 160 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 160 64 23 -31 0 normal - | sprites/rapids.png mask 10 160 + | sprites/rapids.png mask 170 160 -1 sprites/rapids.png 8bpp 250 160 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 160 64 39 -31 -8 normal | sprites/rapids.png mask 250 160 @@ -73,7 +73,7 @@ | sprites/rapids.png mask 90 210 -1 sprites/rapids.png 8bpp 170 210 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 210 64 23 -31 0 normal - | sprites/rapids.png mask 10 210 + | sprites/rapids.png mask 170 210 -1 sprites/rapids.png 8bpp 250 210 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 210 64 39 -31 -8 normal | sprites/rapids.png mask 250 210 @@ -88,7 +88,7 @@ | sprites/rapids.png mask 90 260 -1 sprites/rapids.png 8bpp 170 260 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 260 64 23 -31 0 normal - | sprites/rapids.png mask 10 260 + | sprites/rapids.png mask 170 260 -1 sprites/rapids.png 8bpp 250 260 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 260 64 39 -31 -8 normal | sprites/rapids.png mask 250 260 @@ -103,7 +103,7 @@ | sprites/rapids.png mask 90 310 -1 sprites/rapids.png 8bpp 170 310 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 310 64 23 -31 0 normal - | sprites/rapids.png mask 10 310 + | sprites/rapids.png mask 170 310 -1 sprites/rapids.png 8bpp 250 310 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 310 64 39 -31 -8 normal | sprites/rapids.png mask 250 310 @@ -118,7 +118,7 @@ | sprites/rapids.png mask 90 360 -1 sprites/rapids.png 8bpp 170 360 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 360 64 23 -31 0 normal - | sprites/rapids.png mask 10 360 + | sprites/rapids.png mask 170 360 -1 sprites/rapids.png 8bpp 250 360 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 360 64 39 -31 -8 normal | sprites/rapids.png mask 250 360 @@ -133,7 +133,7 @@ | sprites/rapids.png mask 90 410 -1 sprites/rapids.png 8bpp 170 410 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 410 64 23 -31 0 normal - | sprites/rapids.png mask 10 410 + | sprites/rapids.png mask 170 410 -1 sprites/rapids.png 8bpp 250 410 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 410 64 39 -31 -8 normal | sprites/rapids.png mask 250 410 @@ -148,7 +148,7 @@ | sprites/rapids.png mask 90 460 -1 sprites/rapids.png 8bpp 170 460 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 460 64 23 -31 0 normal - | sprites/rapids.png mask 10 460 + | sprites/rapids.png mask 170 460 -1 sprites/rapids.png 8bpp 250 460 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 460 64 39 -31 -8 normal | sprites/rapids.png mask 250 460 @@ -163,7 +163,7 @@ | sprites/rapids.png mask 90 510 -1 sprites/rapids.png 8bpp 170 510 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 510 64 23 -31 0 normal - | sprites/rapids.png mask 10 510 + | sprites/rapids.png mask 170 510 -1 sprites/rapids.png 8bpp 250 510 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 510 64 39 -31 -8 normal | sprites/rapids.png mask 250 510 @@ -178,7 +178,7 @@ | sprites/rapids.png mask 90 560 -1 sprites/rapids.png 8bpp 170 560 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 560 64 23 -31 0 normal - | sprites/rapids.png mask 10 560 + | sprites/rapids.png mask 170 560 -1 sprites/rapids.png 8bpp 250 560 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 560 64 39 -31 -8 normal | sprites/rapids.png mask 250 560 @@ -193,7 +193,7 @@ | sprites/rapids.png mask 90 610 -1 sprites/rapids.png 8bpp 170 610 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 610 64 23 -31 0 normal - | sprites/rapids.png mask 10 610 + | sprites/rapids.png mask 170 610 -1 sprites/rapids.png 8bpp 250 610 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 610 64 39 -31 -8 normal | sprites/rapids.png mask 250 610 @@ -208,7 +208,7 @@ | sprites/rapids.png mask 90 660 -1 sprites/rapids.png 8bpp 170 660 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 660 64 23 -31 0 normal - | sprites/rapids.png mask 10 660 + | sprites/rapids.png mask 170 660 -1 sprites/rapids.png 8bpp 250 660 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 660 64 39 -31 -8 normal | sprites/rapids.png mask 250 660 @@ -223,7 +223,7 @@ | sprites/rapids.png mask 90 710 -1 sprites/rapids.png 8bpp 170 710 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 710 64 23 -31 0 normal - | sprites/rapids.png mask 10 710 + | sprites/rapids.png mask 170 710 -1 sprites/rapids.png 8bpp 250 710 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 710 64 39 -31 -8 normal | sprites/rapids.png mask 250 710 @@ -238,7 +238,7 @@ | sprites/rapids.png mask 90 760 -1 sprites/rapids.png 8bpp 170 760 64 23 -31 0 normal | sprites/rapids_shading.png 32bpp 170 760 64 23 -31 0 normal - | sprites/rapids.png mask 10 760 + | sprites/rapids.png mask 170 760 -1 sprites/rapids.png 8bpp 250 760 64 39 -31 -8 normal | sprites/rapids_shading.png 32bpp 250 760 64 39 -31 -8 normal | sprites/rapids.png mask 250 760