From 098ed36a3abfe9cf6dcb56d2623ff4141b2de024 Mon Sep 17 00:00:00 2001
From: OleSTEEP <krinkinoleg@gmail.com>
Date: Tue, 23 Jan 2024 17:16:49 +0300
Subject: [PATCH] Fix controls

---
 www.eng/js/porting/assets/omori_l_button.png | Bin 598 -> 666 bytes
 www.eng/js/porting/assets/omori_r_button.png | Bin 644 -> 684 bytes
 www.eng/js/porting/css/controls.css          |   2 +-
 www.eng/js/porting/jscontrols.js             |   8 ++++----
 www.rus/js/plugins/RUS_patches.js            |   1 -
 www.rus/js/porting/assets/omori_l_button.png | Bin 598 -> 666 bytes
 www.rus/js/porting/assets/omori_r_button.png | Bin 644 -> 684 bytes
 www.rus/js/porting/css/controls.css          |   2 +-
 www.rus/js/porting/jscontrols.js             |   8 ++++----
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/www.eng/js/porting/assets/omori_l_button.png b/www.eng/js/porting/assets/omori_l_button.png
index fb7542c3dd497ea223cc22e3afc4be731c212d94..ad5429baa5a5a29439fd135a06098f9ca13d17f7 100644
GIT binary patch
delta 625
zcmV-%0*?LG1eyhqG=EV^L_t(|ob8;^ZG$irMX#goWOm2~tvX76l2NK=19k{2RP8ME
zqcSzdHa6H8;(H|Y(lpTI`t*ea%L4QC0goY5#L{0f@HAL6w%y6V^B|l*z!7@ib1Y&I
z!r4f~<OVFEGw^jd20#G7$+Z(hUym<CH6)`)m^(C0gY)@}wtsC|1M1~+8HYSIU%dE6
z>2|vne-THl0MNEA9*@V6sTuysv|VQpFXG76Lq9TJx82rWx~>BNR!6m&uiB2y`d)21
z*Xy;HQVtaWYd|$~)6uhb2G7vbgdZI|jZYIkji>Q-R2om?>#8)K#@AJ8JdGdMukW8>
zOMSe#ty<$#hkp?hy1rFseCiOE2ERr4G=9UjQ?>Ci{~0uXgX3+{ZfN`lgHGcEj>jI)
zvzq5MzQox~jPXLHkH6&AO$Z?%r9{_tkWwNgAD{QheeZ9tNskx8n!h=R%1ur20LJrc
zoHNOCg}x`24%i$jH#Pgf#$-a1ZRaC~Z?id9&?X_dRexptR)Y~@yfgTaor#?gX`QWR
zYvV)BEAb{AONg|)Ijf1m41dk>a-G@mtfm0$@iXMIJw#e(t7)1htMREn^u!!5=LaWX
zEUnqThubL7<7<FDz5wj;h2SUGLeTg^(D*{o_(IV5LeTg^Br~4j$Fa(IfZ;D8=E~jZ
z>bH4SJZk6F_-C)4sU81c)7XOF!;?R9_06f7wf+d^tF83&u$k_%-MK=O{!JxWj%}?P
z!1LznSyzh$;>(bW!DS$JF*pTN&VzUPLmdu48iE)6G~oa&!<+3d11mD(PJq8O00000
LNkvXXu0mjftlm9u

delta 557
zcmV+|0@D4O1=a+RG=B|AL_t(|ob8<JZG$irg^#1|<m`|QT6L8CNk*yK4cH;9P_?tT
zKPsmNu8n#1+TnZ>x_N*^jz3*Quxv1n%h-nuF>}9U;Oih}EPcqpx4}f;AQHNB9E&L!
z6Ky1B@B%{U415`p0Wbh?h#kbxmy^oS4@qZ_{sG715vS7$O@Gs{X4Lcf+zokXzIjTG
z()D^({}DA-0BD*9x7+QWX+Qi!-}aCaenibRf$JC_+Ag)1wrv4`HBu$>ecO?&cYX`G
zTrSR9d#?akGipD#kTC0L@C<#O@FxdP<JSqF#?$zHR2om?_f=^;jo(+L@icyZ{rvjA
zZ`z^m#`rMwT7SZS2;-&TO9+?77g%Y00pZhl8c*YCJdLOEH2$BAH$Hv*ChuRu7z1l9
z+O~zY7FxW$e+)i*eR)<mlWF+e{1gwMJHIA6ldOc$YsKg0XCFvJgU>mb$mB>%<2QiD
zE0H7ZVD99UgSC(@xDr|y;oTdbJ3wp09<Rjijo0EKjDKI!r%Uef#oxKs3h!JMV2@Yg
zA$oj`(0C<iyb?5C2^y~ijaOnd;~D-m78wsP{5gbqjkW2{)9?OM@e-ce*IE-(JO2Kr
zk%BMb<ZG^}IW?o!*I>Tiw9i8_J!X4!g(lZqvxdw=TB`;~TwD|DYLQG*8FDeW4VbzZ
voQElILnd<h!w?R@I%F^S*@pu#k7Tw#e6;u&h(6)600000NkvXXu0mjfJLVHR

diff --git a/www.eng/js/porting/assets/omori_r_button.png b/www.eng/js/porting/assets/omori_r_button.png
index 47b325a53ac65c9ad95dadb75ccae672d6fc0a7c..4952c07abde01b34d269806cd88e027ba6640628 100644
GIT binary patch
delta 643
zcmV-}0(||11*`>-G=F1BL_t(|ob8<5ZNnfGg%4GCvUkV^tvX6xl2NL51MiTmP_?tT
z4;3lKfU)^A=6n*mZfjp9hof7-2!Ulrk9)`*vGtD>JPt;UO~0hzX%N;QU=e*B*%xaN
z!dghg>;eYSDR>x`4iEtFWP6CBhvU*vcFE)p{eiykaXOta41WWoM?9a;Q<3M+7tgL<
zx?ZovzeJ4@0ES_}?RI-;s*C@myIo}uU!vydV4OH!b-Ss&-0yb)V6;S&^JUpFxqg&Q
z<#M@<UDrJ#07j3f>!zY=Z55uP#}R+E@N|3}@#%OvzKux7)A4OZI-ZViE7I|F{4{=j
z|9H0&`3~v$HGd+hEmyw7I)1BAHnC#o%i(zI8z_BMvg^8NF@zlXLZj!>@ID;xd!MOB
z$IjPOjSuOh*!g0KUPX-$>7>~Cns<Du`<ilmYonUoIDV<+%$LLQLaL8H<>e)W5YdKg
zI`1E!o1S}neaVt922wY<#RHh`ud$BfQ;8nJR)KTnlYgk=dK<G1O{Rx)h;MRVh%mA9
zt-(jPT|2(k&hT-(Rd}C=iJ9shADdjIrm7kr8()!AjBM!mLa@d!kZK(7V_NG3s_*-x
zj#o>;k^nyUuBqQCCr-fBwECp<ag72q*A_U`%(WI+;|sx2O(E#`LeTMrpyLZc#}|T*
zFGMuQQ+)h&1UVj{_*+=Bsyli6t-lpd`8NLO(XqATf0@Q4{2o4h&C#`|X3_OEIA6BX
zpTp#Io7=4?G^s0<WILv_Y5>PSSI4<p#1of>JPa-YYY&5yP~|i@k3Upl2gJeqz)u}^
dz&4!P{sJJBStdoI>lFY1002ovPDHLkV1iayMhyS}

delta 603
zcmV-h0;K({1%w5VG=DouL_t(|ob8;^O~Wu0MXxJ%a(CzkAV%p=I|_mgvO}{1f?2``
za_cy@W2cGy?A#+oF3?Er@gcO-vcfz=!hOgTwe*J+z7Af;zHd_aHmKki2uL3W&P5JN
z1urCOaswXe6#g862~YrV2%SXf&l7WKret&v_k`o|h|}qWu7B$|CXDCvc`SKazIutx
z()D^R{v>J~0if$T+-|qKQ&;}Mt=&e#lc;%&FpP?~YxiAV`o0GMj)BovzPar9svpc@
zbGcjwt@V8bz%gNTz1i5VgW@TD9r@YfS^PTkSv-s1$H?MY{JusO&*JwrvUnE1eEk0T
zO+HFXZ>IPh>3{YiL3-82FBLCE{_ct|dD&^U_?+L2((;=s{@F=l@hcXeJ4q~lrQ#(@
zZ?1U0swq@_Ez)DfD`Ox3=FLqgrJ%J&-}lg3qZA*XU)krpzrAkoNb)e=%n}b^yuN0#
zuEroidM*-#0}ttD^?{Gz626p^rLp9<V+&HE4T_gse1EKL3G$mRUb6gVi#JG>-*oW?
ziSnB--XP`GjA0kW8zjkZqIg$mOmNP9w<IN6@$Xz~W$vA;_~L71SJ!w+G;xiu5f)zv
z7GDS!UkDao2o_(6)rzP5Jf12Zp!_A+zUD5|qffuxPsK~GGN^fsEbVywo5m+z!h^4Q
zjIF7etyI2-^375DarjCP)gIiTX>j(eA<OXXRRcu+xJLHXB8kKtax=IM$lVOiK+D?@
p-Tu&q6R-}+8-BWQ0+tbV`v*0dv^q|x4l4iv002ovPDHLkV1gErFpB^H

diff --git a/www.eng/js/porting/css/controls.css b/www.eng/js/porting/css/controls.css
index d70bf03..d92eaaf 100644
--- a/www.eng/js/porting/css/controls.css
+++ b/www.eng/js/porting/css/controls.css
@@ -52,7 +52,7 @@
     z-index: 1488;
     position: absolute;
     bottom: 16px;
-    right: 16px;
+    right: 32px;
 
     justify-content: center;
     align-items: center;
diff --git a/www.eng/js/porting/jscontrols.js b/www.eng/js/porting/jscontrols.js
index 0516beb..54ce530 100644
--- a/www.eng/js/porting/jscontrols.js
+++ b/www.eng/js/porting/jscontrols.js
@@ -29,10 +29,10 @@ function create_control_buttons() {
     // LB-RB Buttons
     const DivB_LB = document.createElement("div");
     DivB_LB.className = "gamepad-bumper LB";
-    DivB_LB.id = "buttonW";
+    DivB_LB.id = "buttonQ";
     const DivB_RB = document.createElement("div");
     DivB_RB.className = "gamepad-bumper RB";
-    DivB_RB.id = "buttonQ";
+    DivB_RB.id = "buttonW";
 
     // Adding
     document.body.appendChild(DivB_LB);
@@ -211,10 +211,10 @@ const keys = [
     { key: 'Z', keyCode: 90 },
     { key: 'X', keyCode: 88 },
     { key: 'Shift', keyCode: 16 },
-    { key: 'A', keyCode: 87 },
+    { key: 'A', keyCode: 65 },
 
     { key: 'Q', keyCode: 81 },
-    { key: 'W', keyCode: 68 }
+    { key: 'W', keyCode: 87 }
 ];
 
 const dpadkeys = [
diff --git a/www.rus/js/plugins/RUS_patches.js b/www.rus/js/plugins/RUS_patches.js
index a34bfa8..36d8d09 100644
--- a/www.rus/js/plugins/RUS_patches.js
+++ b/www.rus/js/plugins/RUS_patches.js
@@ -31,7 +31,6 @@ Scene_OmoriTitleScreen.prototype.createTitleCommands = function() {
     // Add window to title Commands
     this._titleCommands[i] = win;
     this.addChild(win)
-    console.log(win.width)
   };
   // Set Continue text
   this._titleCommands[1].setText(textList[1], this._canContinue);
diff --git a/www.rus/js/porting/assets/omori_l_button.png b/www.rus/js/porting/assets/omori_l_button.png
index fb7542c3dd497ea223cc22e3afc4be731c212d94..ad5429baa5a5a29439fd135a06098f9ca13d17f7 100644
GIT binary patch
delta 625
zcmV-%0*?LG1eyhqG=EV^L_t(|ob8;^ZG$irMX#goWOm2~tvX76l2NK=19k{2RP8ME
zqcSzdHa6H8;(H|Y(lpTI`t*ea%L4QC0goY5#L{0f@HAL6w%y6V^B|l*z!7@ib1Y&I
z!r4f~<OVFEGw^jd20#G7$+Z(hUym<CH6)`)m^(C0gY)@}wtsC|1M1~+8HYSIU%dE6
z>2|vne-THl0MNEA9*@V6sTuysv|VQpFXG76Lq9TJx82rWx~>BNR!6m&uiB2y`d)21
z*Xy;HQVtaWYd|$~)6uhb2G7vbgdZI|jZYIkji>Q-R2om?>#8)K#@AJ8JdGdMukW8>
zOMSe#ty<$#hkp?hy1rFseCiOE2ERr4G=9UjQ?>Ci{~0uXgX3+{ZfN`lgHGcEj>jI)
zvzq5MzQox~jPXLHkH6&AO$Z?%r9{_tkWwNgAD{QheeZ9tNskx8n!h=R%1ur20LJrc
zoHNOCg}x`24%i$jH#Pgf#$-a1ZRaC~Z?id9&?X_dRexptR)Y~@yfgTaor#?gX`QWR
zYvV)BEAb{AONg|)Ijf1m41dk>a-G@mtfm0$@iXMIJw#e(t7)1htMREn^u!!5=LaWX
zEUnqThubL7<7<FDz5wj;h2SUGLeTg^(D*{o_(IV5LeTg^Br~4j$Fa(IfZ;D8=E~jZ
z>bH4SJZk6F_-C)4sU81c)7XOF!;?R9_06f7wf+d^tF83&u$k_%-MK=O{!JxWj%}?P
z!1LznSyzh$;>(bW!DS$JF*pTN&VzUPLmdu48iE)6G~oa&!<+3d11mD(PJq8O00000
LNkvXXu0mjftlm9u

delta 557
zcmV+|0@D4O1=a+RG=B|AL_t(|ob8<JZG$irg^#1|<m`|QT6L8CNk*yK4cH;9P_?tT
zKPsmNu8n#1+TnZ>x_N*^jz3*Quxv1n%h-nuF>}9U;Oih}EPcqpx4}f;AQHNB9E&L!
z6Ky1B@B%{U415`p0Wbh?h#kbxmy^oS4@qZ_{sG715vS7$O@Gs{X4Lcf+zokXzIjTG
z()D^({}DA-0BD*9x7+QWX+Qi!-}aCaenibRf$JC_+Ag)1wrv4`HBu$>ecO?&cYX`G
zTrSR9d#?akGipD#kTC0L@C<#O@FxdP<JSqF#?$zHR2om?_f=^;jo(+L@icyZ{rvjA
zZ`z^m#`rMwT7SZS2;-&TO9+?77g%Y00pZhl8c*YCJdLOEH2$BAH$Hv*ChuRu7z1l9
z+O~zY7FxW$e+)i*eR)<mlWF+e{1gwMJHIA6ldOc$YsKg0XCFvJgU>mb$mB>%<2QiD
zE0H7ZVD99UgSC(@xDr|y;oTdbJ3wp09<Rjijo0EKjDKI!r%Uef#oxKs3h!JMV2@Yg
zA$oj`(0C<iyb?5C2^y~ijaOnd;~D-m78wsP{5gbqjkW2{)9?OM@e-ce*IE-(JO2Kr
zk%BMb<ZG^}IW?o!*I>Tiw9i8_J!X4!g(lZqvxdw=TB`;~TwD|DYLQG*8FDeW4VbzZ
voQElILnd<h!w?R@I%F^S*@pu#k7Tw#e6;u&h(6)600000NkvXXu0mjfJLVHR

diff --git a/www.rus/js/porting/assets/omori_r_button.png b/www.rus/js/porting/assets/omori_r_button.png
index 47b325a53ac65c9ad95dadb75ccae672d6fc0a7c..4952c07abde01b34d269806cd88e027ba6640628 100644
GIT binary patch
delta 643
zcmV-}0(||11*`>-G=F1BL_t(|ob8<5ZNnfGg%4GCvUkV^tvX6xl2NL51MiTmP_?tT
z4;3lKfU)^A=6n*mZfjp9hof7-2!Ulrk9)`*vGtD>JPt;UO~0hzX%N;QU=e*B*%xaN
z!dghg>;eYSDR>x`4iEtFWP6CBhvU*vcFE)p{eiykaXOta41WWoM?9a;Q<3M+7tgL<
zx?ZovzeJ4@0ES_}?RI-;s*C@myIo}uU!vydV4OH!b-Ss&-0yb)V6;S&^JUpFxqg&Q
z<#M@<UDrJ#07j3f>!zY=Z55uP#}R+E@N|3}@#%OvzKux7)A4OZI-ZViE7I|F{4{=j
z|9H0&`3~v$HGd+hEmyw7I)1BAHnC#o%i(zI8z_BMvg^8NF@zlXLZj!>@ID;xd!MOB
z$IjPOjSuOh*!g0KUPX-$>7>~Cns<Du`<ilmYonUoIDV<+%$LLQLaL8H<>e)W5YdKg
zI`1E!o1S}neaVt922wY<#RHh`ud$BfQ;8nJR)KTnlYgk=dK<G1O{Rx)h;MRVh%mA9
zt-(jPT|2(k&hT-(Rd}C=iJ9shADdjIrm7kr8()!AjBM!mLa@d!kZK(7V_NG3s_*-x
zj#o>;k^nyUuBqQCCr-fBwECp<ag72q*A_U`%(WI+;|sx2O(E#`LeTMrpyLZc#}|T*
zFGMuQQ+)h&1UVj{_*+=Bsyli6t-lpd`8NLO(XqATf0@Q4{2o4h&C#`|X3_OEIA6BX
zpTp#Io7=4?G^s0<WILv_Y5>PSSI4<p#1of>JPa-YYY&5yP~|i@k3Upl2gJeqz)u}^
dz&4!P{sJJBStdoI>lFY1002ovPDHLkV1iayMhyS}

delta 603
zcmV-h0;K({1%w5VG=DouL_t(|ob8;^O~Wu0MXxJ%a(CzkAV%p=I|_mgvO}{1f?2``
za_cy@W2cGy?A#+oF3?Er@gcO-vcfz=!hOgTwe*J+z7Af;zHd_aHmKki2uL3W&P5JN
z1urCOaswXe6#g862~YrV2%SXf&l7WKret&v_k`o|h|}qWu7B$|CXDCvc`SKazIutx
z()D^R{v>J~0if$T+-|qKQ&;}Mt=&e#lc;%&FpP?~YxiAV`o0GMj)BovzPar9svpc@
zbGcjwt@V8bz%gNTz1i5VgW@TD9r@YfS^PTkSv-s1$H?MY{JusO&*JwrvUnE1eEk0T
zO+HFXZ>IPh>3{YiL3-82FBLCE{_ct|dD&^U_?+L2((;=s{@F=l@hcXeJ4q~lrQ#(@
zZ?1U0swq@_Ez)DfD`Ox3=FLqgrJ%J&-}lg3qZA*XU)krpzrAkoNb)e=%n}b^yuN0#
zuEroidM*-#0}ttD^?{Gz626p^rLp9<V+&HE4T_gse1EKL3G$mRUb6gVi#JG>-*oW?
ziSnB--XP`GjA0kW8zjkZqIg$mOmNP9w<IN6@$Xz~W$vA;_~L71SJ!w+G;xiu5f)zv
z7GDS!UkDao2o_(6)rzP5Jf12Zp!_A+zUD5|qffuxPsK~GGN^fsEbVywo5m+z!h^4Q
zjIF7etyI2-^375DarjCP)gIiTX>j(eA<OXXRRcu+xJLHXB8kKtax=IM$lVOiK+D?@
p-Tu&q6R-}+8-BWQ0+tbV`v*0dv^q|x4l4iv002ovPDHLkV1gErFpB^H

diff --git a/www.rus/js/porting/css/controls.css b/www.rus/js/porting/css/controls.css
index d70bf03..d92eaaf 100644
--- a/www.rus/js/porting/css/controls.css
+++ b/www.rus/js/porting/css/controls.css
@@ -52,7 +52,7 @@
     z-index: 1488;
     position: absolute;
     bottom: 16px;
-    right: 16px;
+    right: 32px;
 
     justify-content: center;
     align-items: center;
diff --git a/www.rus/js/porting/jscontrols.js b/www.rus/js/porting/jscontrols.js
index 0516beb..54ce530 100644
--- a/www.rus/js/porting/jscontrols.js
+++ b/www.rus/js/porting/jscontrols.js
@@ -29,10 +29,10 @@ function create_control_buttons() {
     // LB-RB Buttons
     const DivB_LB = document.createElement("div");
     DivB_LB.className = "gamepad-bumper LB";
-    DivB_LB.id = "buttonW";
+    DivB_LB.id = "buttonQ";
     const DivB_RB = document.createElement("div");
     DivB_RB.className = "gamepad-bumper RB";
-    DivB_RB.id = "buttonQ";
+    DivB_RB.id = "buttonW";
 
     // Adding
     document.body.appendChild(DivB_LB);
@@ -211,10 +211,10 @@ const keys = [
     { key: 'Z', keyCode: 90 },
     { key: 'X', keyCode: 88 },
     { key: 'Shift', keyCode: 16 },
-    { key: 'A', keyCode: 87 },
+    { key: 'A', keyCode: 65 },
 
     { key: 'Q', keyCode: 81 },
-    { key: 'W', keyCode: 68 }
+    { key: 'W', keyCode: 87 }
 ];
 
 const dpadkeys = [