From 37c30c4ec1329d5c4f20d5ac38c6862f77a3064f Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Fri, 26 Aug 2022 02:37:36 -0400 Subject: [PATCH 01/23] update asm and c codeset - Make MxDt reference our CSS methods --- Data/Sys/GameFiles/GALE01/GameSetup.dat | Bin 26855 -> 27379 bytes Data/Sys/GameFiles/GALE01/MxDt.dat | Bin 159296 -> 159316 bytes Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 0 -> 8643 bytes Data/Sys/GameSettings/GALE01r2.ini | 629 ++++++++++++------------ Data/Sys/GameSettings/GALJ01r2.ini | 629 ++++++++++++------------ 5 files changed, 628 insertions(+), 630 deletions(-) create mode 100644 Data/Sys/GameFiles/GALE01/SlippiCSS.dat diff --git a/Data/Sys/GameFiles/GALE01/GameSetup.dat b/Data/Sys/GameFiles/GALE01/GameSetup.dat index c00eda4f523e336227f2fbb531ddca47501f5b41..7a280dd6153f039a7f41315c24b879498d49ca18 100644 GIT binary patch literal 27379 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 literal 26855 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 diff --git a/Data/Sys/GameFiles/GALE01/MxDt.dat b/Data/Sys/GameFiles/GALE01/MxDt.dat index 85807d66d4074836ba00fb5aabc4d2ea0ff1ee5b..f51ae87682ed7c02380f0eff16861bca81776d77 100644 GIT binary patch delta 67 zcmX?bhx5uEP96rPybuN^p9Tg7j?6}$tvrme7R*dO1?@Q&jN5Z8m{deWf^#wp3NoF8 VgY{ApOBjHF(ZXZ<1RtgiiU5he5|97@ delta 46 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 h Date: Fri, 26 Aug 2022 02:41:59 -0400 Subject: [PATCH 02/23] chore: update asm codeset --- Data/Sys/GameSettings/GALE01r2.ini | 19 ++++++++++--------- Data/Sys/GameSettings/GALJ01r2.ini | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 4711e54b5c..398823ed8c 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -4202,18 +4202,19 @@ C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm 7D8903A6 4E800420 38600000 986DAFA2 60000000 00000000 -C22299F0 00000018 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm -2C030008 408200B0 +C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm +2C030008 408200B8 886DAFA1 2C030000 41820014 2C030001 41820040 2C030002 -4182004C 2C040000 -41820078 2C040001 -41820070 2C040002 -41820068 2C040003 -41820060 2C040005 -41820058 2C040006 -41820050 48000060 +41820054 2C040000 +41820080 2C040001 +41820078 2C040002 +41820070 2C040003 +41820068 2C040005 +41820060 2C040006 +41820058 48000068 +2C040000 4182004C 2C040004 41820044 2C040006 4182003C 4800004C 2C040000 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 41e1d7d841..c90092e081 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -4202,18 +4202,19 @@ C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm 7D8903A6 4E800420 38600000 986DAFA2 60000000 00000000 -C22299F0 00000018 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm -2C030008 408200B0 +C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm +2C030008 408200B8 886DAFA1 2C030000 41820014 2C030001 41820040 2C030002 -4182004C 2C040000 -41820078 2C040001 -41820070 2C040002 -41820068 2C040003 -41820060 2C040005 -41820058 2C040006 -41820050 48000060 +41820054 2C040000 +41820080 2C040001 +41820078 2C040002 +41820070 2C040003 +41820068 2C040005 +41820060 2C040006 +41820058 48000068 +2C040000 4182004C 2C040004 41820044 2C040006 4182003C 4800004C 2C040000 From c4bc77b65c6089768e7838e7f71ff80c260ded00 Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Fri, 26 Aug 2022 15:59:33 -0400 Subject: [PATCH 03/23] update codeset and fix default debug command --- Data/Sys/GameSettings/GALE01r2.ini | 3 +++ Data/Sys/GameSettings/GALJ01r2.ini | 3 +++ Source/Core/DolphinWX/Dolphin.vcxproj.user | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 398823ed8c..c5e1ee6a03 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -5859,6 +5859,9 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm 8001001C 38210018 7C0803A6 4E800020 BB010028 00000000 +C200569C 00000002 #Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm +38600021 4E800020 +60000000 00000000 C2068B40 00000030 #m-ex codeset 7C0802A6 90010004 9421FF00 BE810008 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index c90092e081..8183b00774 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -5859,6 +5859,9 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm 8001001C 38210018 7C0803A6 4E800020 BB010028 00000000 +C200569C 00000002 #Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm +38600021 4E800020 +60000000 00000000 C2068B40 00000030 #m-ex codeset 7C0802A6 90010004 9421FF00 BE810008 diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.user b/Source/Core/DolphinWX/Dolphin.vcxproj.user index 197efdde2e..a03ae3ad17 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj.user +++ b/Source/Core/DolphinWX/Dolphin.vcxproj.user @@ -14,7 +14,7 @@ -d - -i "C:/test.json" + -d -d From 1e19df11d1cc31fbc1d80a184b1e4564a53c60d5 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Fri, 26 Aug 2022 18:14:12 -0400 Subject: [PATCH 04/23] chore: update codeset chat refactor --- Data/Sys/GameFiles/GALE01/GameSetup.dat | Bin 27379 -> 26855 bytes Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 8643 -> 8455 bytes Data/Sys/GameSettings/GALE01r2.ini | 2 +- Data/Sys/GameSettings/GALJ01r2.ini | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/GameSetup.dat b/Data/Sys/GameFiles/GALE01/GameSetup.dat index 7a280dd6153f039a7f41315c24b879498d49ca18..c00eda4f523e336227f2fbb531ddca47501f5b41 100644 GIT binary patch literal 26855 zcmcJX4|tT-o$r5>3}F%jjyTu=0R|a0L4<%QPX3VzL=6GGQA3wnib+8ithU)o`=m7? z?!ZDPpRS7-D)oZv_Tryw5h_EZ0Z$^r|8z4FiO$g|K`e|#vaabXKh z@%x7sQ0}GQGJl@XilE=>px>8*dV5e`7u0+G`9oX1iqJ9O-$(n?!2O|0;630a-)*M- zN7T2{{`V?r|A`m+;xO&Is6RyePgT;s$4lleqyBU1!skW7rG6l&AMxgWU+a0tt0-v8 zvz#2W(X1l}5{!lpIZ>}-^m5wI@y>m;nD!|uX-^0b>N9*eIm>;xIbR6sZQdoXBzKHQ_PxQlpL-S2dd9t=lJ;SZqyAg<2d~$` z^Bu}Rc%h#U(f)?&ly9kCV7bNKgxuv}%RSeJpW6`BucnS1XkvcfD(A&D^<_4F!Gnb zmhxK4cG_2{P6#T!~Zi6Q9f!GJQDJowNpMBwEsM4 zf7^#QigitRBy6LAH{p>28`bN}^Qag6exnYkEU>(YFTZ)?{Pw(W`|YEvy_{58fsMYy zo40-$<&bwtV=v|N-n_3Jr-V;q_fsDC=6y4gXOXe~_{cdy>DCpt$Tx%f-74w#tWVF# zFa0v#&6{WW=LU7?Df;KbC*haBRr4Kj_Ot{?C0m$bV6MFR+4$H}CjP z%BXiqehFofH}5UhUvS8~WbUB?J0s?u(}%pD!F;9FVLOBQN~>v4`Qy%5;*UF{*&laC zyZZBfz{lf^`{%_7{Tkw}Maob-ky2E9iH^=gZifpq%HwAA6bK ze{5q=|4dK@c#I9`Hg+5E2f{X1c&Pj-CF>c>d~*h={~>_$hEJEVZeH4<-yH10SmvKI zm}h4O?PpTgI-}*@Id@`*qWvoK?5uJA{AW#6NuBwUu>w15ug|};p7rJCtQXWCwzGcY z%g-H}B*N4J3Zi7nN@A4|nSe<9%?l!9^r2PjfY2V@7 z%W)41F7JOsS;Twjm@F!=v%|jpo$aa2v$Nrs=zF%KQ`lnj{CezbemTCt$A5fdP`@&$ zf59wOl4s*@q%5QS3UpzeOiJL(UXBM}%{Tr&wNw6(vW)Ua!TU!A zhx$)xFQ-!B6-wmB)xlT%ocN%xClkSY!ExU2^6{Ve zWKjQu`W4uuBH6Dzn=~(|S9?Wop|_J3`14MJK7u#tS;oCX$vTDiB;?VRudBVlikrR4 zHsrJTTD4Pe^D5UKqy9C&K6#m6pRD!qe)3N=Z`dY-m*7u+!*8DwX8yGWHYMicF=e9K z!#0I=YuuDqe0w`J8kB2;@hF@$R7BAJn0v;KpC`Y|fiu zi?bfpr#U#3)jt2Gt@8Od?S%jST;T_v=O%nS&kg1~H^B4U?ZP8$=l(G0eRe*c8SJI@m6k;W(BugdeT49Wv43+()azmD@AKGc)` zI?tc)_q$-6$~?Q^KKO>*TmU@D(*-|8uCX^4ARlwEmlr%s`!MwvR8oK2m#2~(#_!Fu z65uR=za{7T{Yscm`cpDj?TIUR{6Syff80glJMd4^;LHxz zJ^O_J9u;x(mz^J!KM2aFf>QJW?wkPMIl+8$=Iecd&3R4nVxG-`e+v%L?+umIS*PNX zIpAARpJ#I!zu-vN<}!Z4kpi2W^!@Q%;7ESvvi=3fXm64qrvJ6nk&n4wP)YkuL4VdK zJ2v-gDrxUkf6DE$E0k~gerqo4Tf91K7w4$Vvy1b5KX&mszW=(o%#TAZZsh$<^t)1J zfnB`a_d6Fq@58y6^)C^e->59G^04ps%A0+^R1V#jFuokTmN34&-;ayRcPK8(v+_rM zI+p*`FFy?(#P3f#`sUfEp_{8iHqu$xc6xyM%F9tfKu{m9)R+<9o>wKaRWPO+SuHCjIp%7tpUQ zY{|=1=2^1Qr(^O)pN`2kpB~AF{5YUuxo;0ER?8k1Sj9uW9jh4j%Svar^Q;nj%I{bH z*7y6B&_VG<*#+K_Ph>0Tm@cr z;43=Uz2%n+z)x@%1mhOm=+_sH_1`ZXr?S8n2KIj8lfiq&U-f+07M@U9VD*7~)!$%t zbuw)AUs9Q8^*{9C)IaEtyL7$}@6vkTPF@}w#!!pHuQ+B5DYbxotRd8tkY0!?my7nVJ{Ke>* z_9=^p{dpGu*4OvN@NqGEy7-ts&*J0$JWI^)za;7RUjp4^AC_F^_g~VW{&}|KN9;$S z_mW3d7TA)VKAa_c0ys|xaNZ2yylu9W{#WFvEU+uWe*Y`_eR^JTH|@lQS3vir?3=FG zf#82m6m^xBsvY`FGc}%&|?oEmAvVw&|c1_M9;5 ztF;NU`%IeKo36Fuj!4cA`a>40D7DaqeYxv5(pGnmb?|OgU#X3{u+PHOZ}Pfquz?&} znw9tSJH5yT`({`ufEDF;j((@MnSL9;!^~0a0lNnrdYHc>lKX??G>Zbq)UJB=o!YPT zES_w!kmjj~XCB==9qtWUh@j223ID~JOgro9uZf!pch=X^v2Id(at(NeZ0)ABE!%Xj zEoZ%}mOMG9Td;unQ0*`g7QZ(=VXHbiC$+N%yM3FDn!QyxhohV75Rw+?)N0KyAGFnd zD=Z|st!cE-oEe!+XX#Z@(P(3h52xok=IgXU#^eZY5AgcGVcV(ax%%VOZ?zrSI_vQ0 z{{U+-+QRBnt>1$@>wTEjE&N^?{MNgm-Hk;;7@M1&Pkhii(xn#mSi9iyKGbpjr1q}w z{k}a5U%v%M^PHw_l-klO%xdD^70F?nnr^gka>%T;^ox7?-?apFH@5#*@W!*8jf<$a z*jP92Jsb*0;1E6)2jF?9;-NJGFAS{Qk+6UhQC)ML3g;vY;APh%I@F}hYFXbCubWjp zW`=B91u));AMfwF|M%_Q25=q*<`DFwA9FfdXx-|gcDGLT;e9YBEEw6o4Ho{fcnn@A z$M-z$c-&MIHyg^=oS{&<#+oWp7V_4a?a#LaPszji*06bzH8$9&qfSmbZKm*5AK^>; zFVHv1OIb2)sq|!91|4RmKX1!{*RnBWGkH=Q>#U5Ye&aMN=V@rLyu%t7jA^HT2jj{Z zi?j1Rm3ev_#yA*4L17I>FdC+(~>nNSz)~} zX{Zz!H(HYS_v*dcp_ywFPNGRoYA6LP6E6EhRutgU@Z3R*@f0^$WDd_2JU45;>OmgQ ztmoIP>-#)T2MT}YWte}RtrlF(QIpyo_5RXUXJKdIHrUupwVsMpCbOl_3XxZIZEPp@ zX6-+r*FEUDvpeW{54NHQTY(K~!9K0R2DLR#wcNo(_$zxtKyZdrN#m#)8#)>b!=|FC(7uyxVeA!o~Dfh~^*Hn(5)+1bOi zMX-N`{UIyv`K~44WlZ|yZ1xItV+M8`zR5mgtCQI3BEi5`FNc<)%`nvuC5!UBy zHtUN*pBVHhl8yeT_YHRTl9BxzEH=zr3Z0B#p z+XkC_Rf84Qd^FrKFUr?ueW`qI&l6T6pWD%eJ$~ZfoIMWKcv_z*x*}s4*&oT4KevT6 zmiAE4?(ph*_0R3}87;no*J=H$@eiE#20pS(a)V4%d)u7+l&2Gv_u5Qo8|rz@2I2p9 z(VOxJI=5A_AX!hgVn?P~yuqf{5If{fF118grZIN=<2gHT&*VJr`5tSWJ>5#wrdS3Xqn*Q($VD`DK}5GF-}gp{Fnnf;bITj&CRt|C|QE$ z#nAg?jE0?zW_2Ag(z$64k7<2+hK8^g|MlXF)s`CZn`$0Um?xKKG>^ueu5HxN=FN8x zrFiTAQ@>)K2#>~2O^tZZI>X*;tdWB&tubA1k^aM$+?a3G*!L9cbM{g6mi&p%&^RVq z%4T+Ko8IoN1jcv$*rF!2P<}Kb{`0<2er#_DK0~{A;*k;$S)?p-JfcnY_t6meg2h|} zHWm)z*poIgz{lAG*@A%ovdOVid9S&JC%i8bPaKbj;d8+EtQ}Ch_$^+GXYe~FUN3Eg z&-{kZ5%~B4TaeWoY=JkF@5js)EzTCKKQhhcZfvy%VB;^%jx4ab!XbIk+LHLRcP!Gh zAKmAPB=5DRcfDxSeqxaQ#3S;FiD?Gf6VdDld}4ZT_hUsi9NX4uQ(jr3cO9D1U!)**QrDGR5{L3XX^s_Bt! z!=6Q@?@PAH_7v~ICLM4>s7q*#7j;tyxJj0r>*bAkM+a1 z^*twuc@{aIH=)P!HpDKTw&s1vN9M@!lFab&BA%u{W{y?D*B3X1Y;~=f-AUY41s$ponMa<7ov*25ub*-9>Fw!C=I?p6 zy({y2tY;s#V~r)mn~obNwNE`@$B_cm5do26g^OPls zZIZn!E!}mXk$B-#e+Pd{I##(ow)RT#20Q;!we>!3-Lfye-?cPl5W9TpVQ_TzSM!3; zh4w7oY0Euc2d?XKu1@?JvLad&Pv5WgO9ptiC|!fR5RYQNTnsV$yEdWcfJG$Rsco5|mk~AIDx_bQWH+xq?sslR1u_KRMs${7^;Q*{yij!sjHb5%GveaaSCB zkU&REfb;p96l-D~Lj}GLZ@$(%#Rr>+4R})Qy{k1Jd}$Ue^r{^BNd|gVjb5dYpL*n{ z0e&q(ewqS(I+P}g>6>mIKE~}w(g|Y9TwBXtuzlln>u~ZlE!YpeYT=Eef%|Gz`^L+O zNiHCcwzo!E*(VvN_y@`FYaOQvo(~Go@#F-{c|#cJa@hPdJOqUU_Z)d zZ}8>0BE?>mdfy^q1z;2ZXdil(-q&plMUc^CgO%(sM*WUzD6p$B{WEVrTrJFRssA-O#16svn7Q`eHSNT4 z^z#+zXZo`|Gpxj?YmSTUYG}W6n(dsgvd)I)rzl%(&-@n3wC$bmQSP?=^M~Mj$X=AM zBE~o_Kh+-!6;{3g4-eWSm2>EKuRSfFb>~5QzVd4Nx7ur!w>Wt@Qh68UZaW4q-+cLC z$e!3ozmWZ8KJc&`!&NEDv>mGQ@UgFJfA(w)e;gq;je#$Fx}5gsc3V9;lRJjaLRaFf zCFFc~+Y`sZA!Kd)L#CXJ_B(4gy7+6xs5E$D-(p>T!&bL7rv#YgmBaYe7MDK=rFK~% z^&INCny>2D7RBaU<>NLtkiQ0R9XURaIfrG7$8`#Zk5lL;>v`At+O6&6z<3uwOke9- zB|B7lzuS9d_|h&%Jg89Xy6jcoVz%N^)8#BK?9dVPc?n6ep+ z+R?i*gcpnSM?5Uk1IJ9GybIax#0tRm{7jw@Z1kz%B(JBl zi!i=>4t5}l?^d68>ECfOe!}hqzBwO#iZWNs`D59lY}|C<;`V-c-;t?;ADmOzkDbrj zveI(4^tk+TXv_DU%;#@;)kZ(eZg%rRi~RQ|Y?PO^UBGs>4fxRbWb7h;;pYgiZ(p;v zz`$!r{vZiWD=d=%pYmGdnEC7R1txzi-GUZL#aY;gYWaYH!}!TXwtVsmw?_{1F41-1 zYGRrT?hVGod|z?yJtKU@%&K8vzUL>je+c}{C2 z|NGGop6D}am)AKN3jpJ2u&(i}3!gvjXVAJH87@cvbD^>C^PvxZBo+AOz=nHQKtJ{Z z*AGC~SnUvT-5NiBf)=v*%duCJ@lV>fx^pt}D#{s0#6#e@b1T-Gg#Lw!t0i~Dil4sa z@L5*Z?e7!hyEy|;ZZ(EZ$-ljS{D-t71N$Wd)kD3#)q{@LCBhM0%Uho8?GuiQuaJ#I zx`2H44=vVNQuduqt>koWv;=Y-2d|l(Q%|%h#^@|v5bG?R)y7`3xogYo#O4i6_{T!< zZ_@9s!^e+zmY!(qI^2-#*jIK=^OG;FEB-Ap>+c$xvgc{Y3^Jd|U>6Isds+1GWKIj3 zE%RQtL41D*S}k+&!|%xT_9kWj>WLAQhb^DnNUl$Kf}?0z(P)prvqWcUQxy7?bgZ19 zoXX6Om9`%`mo=}^wE`6Hl>5 zWTQN@aT@*<8i{Vwd%+eRv<9sOKe^1|&w3pGT9fc+J;Gn>5&mvHzTA{)E$GW!e~!5s z;*zb%tBak*SL!q2|BIcToi7=v;fxNx&y=j<_oMJQ2H%UdZ$*aVl8cRL7b_=jKkUcY z!d3eP#oHZQraPM@yuo)hdsYwni6>=g#<7l>J;3es((xW(2R2H%!8mv)-~n;>^g9$w zOU`{?osdl_0iIxLFNB>r@2{{2CA5c|Z_S&JT)OiHr%w@l$P98u5zdKAZA@>kjb;9} zTMp$|s@v*sITVu4v@<3;yVvD!%4X$*LhKqB4&Z&xBK+iC!5nMd z9Nj0@kC@}rA2G)j**U;>FgZw0!pBSJjvt2Cg!jgrDApLp4j@;Dg1v@2Q$nta#UE@% z4Bd?>j+}e}rW~81d_R7_ko|FWMQJ$M)!UH59=-w}w_^u(3npvL!M>UHU-%!#AITZ- zi$=)K{5!?~bKD`*ZlZ?6iX<$>`ITN-klH7nV9kiTem(68Nj$&N$)@A(8 zrR3}|fLRJm>`frgZHiO)t@DhvKHZ^}+sEdn7iZqM+06-j&FkcxbtB(J$Wo9u_~0Fc z)8Wbdrn$)ZMKmA#;Jc{%`>)3`z369Q)ewEIWB;{}JkSB~_+i5=_!a2Nxj*i!v55iR zMVztB?VLWbJ-$+Vs72APtqn=R>*_nESa>J)q!9jTe{Y}z8$HnVGkqxtjDdztjCYyGRxYwE+d>;rbU z?bTcr2JVY2vN_+MN9WBN>*iwr{qb|fe>HM0)`GnncV2c)A5VwL?}%@T56K5Ont(%u zJ;%XMFm~vceem&d=i2?5FYar&>P$K_! zL^RIQsA>p*v;jG}2Okya7&To&?nc2Z@~d;}jnt9V9njhN zP2|=0nc#|^zRz#U*Sj3)uFOrqexJX*ut)i`(ALT45&J|qTkYj+buVYDd;TrRy^Z}B zfA1I?+`_(P%dc&Y;}`4HnzQS~_7o!v53tUmq-^GQZSH1#Z}LWDl6^cp2w`8!D03+1 zQ2KXopgsL%!)2!*$l3(>^|a_#70|2hG3O`mkX}GL<^50Ew9W`RRFb`0mKlatfqk3& zi_Y5L#0J*bT$P1gPV zi21HRbw1!dLf&VL5`5?(l8uqk9^o2Icx zOrcBUHfxQN+-CDm{LT}ZcWQx$pI_d!?Kj#hF436@I#}<{OSWg;ac3qdrq?e0opN;j zHa};}*=d};@}lPsT100U?8gRoZ}#{0=@5Au<#N-U6Nda8?K5fiXLZ>;ZTu?t-V@AN zx@+5TYG{(#-@I#Kb@Wzr?BQMf?gJ?PH_ z;*lcJOXo}Ir**6;nx%f&CR2%hpWM|K*9}zG60fH|Ms?zkD8I*cA-usmP7lmJ>*;^) zm3cgrY0jYG<1uVYG<`jFE-ZQ1qgUk6z3=-u>hw3s1FyDZKYQ5z9psjOOTT>H^8sUe z6?9!?Veh|D{twFawEvEAud_$rK>q^zAB1k~-}~9a_V-x|7|H&<{66IJ$!?!{(tgIB ztsjEZd zFlS8U3uw=~{qy*hxP@-tV!7Ve*;|l5;fZV^PV7IydEXT9U7<={dhzgg=A zza>F?Ux3>(aLCm-;Uqi+pZV5;=S7qAEy4V4;KBKrm3K~B5L;UF(z?EqoSn1}Qa%o@ z9sItR+i;5ESe z=fP{gkJlN81K2yk%kd`Zx%-Se!RzT@{`>&1Jw1oPtIKus`=kfmowIkpv%bl9bM4(L!#v=IQ#b#*O_o0NlS+__J0X_v$r$YN7H8%dQ)CI z?CjsnWJ{>X-Q^6CuflfSxtka|gw9}tH?_JPigLPTcOG=HNt`>8B|X0i?nA>Lr$e3C zJM`!FZTRkWIgj5yC1+TE;P&}BuWFy%HR_4>4F`xv&i^N3$jM(7{Vq~I_}j!ai)w%@Vc|{a8$6G0 zT49A=2XW1vIa{%T1GLYCXYAPv#s@TwvG#F+tm%&G2%RkcbimVMr~jq4Rj?S}a_0ey z13$@J)xeZ|HEfw;tGCRzHOyI08~T_3a4?7T@9YusJVNItJrm5)%=uTs>&)t0@p!ef z&JgnK){WdwVGTDymr>k1T?QTl$glLR1KvxI*7CFqN9O)CIM}O&-*w;9u8pdR9$o9BJKgNA#xY*Fg9QG0k5!V1MNrX)5L!W#_kF53iN5>yJ|m$ zE(M}VfZty583vyt8>fV1i(lh8v~fOXfsQVb$pPFqnRiq`k2g2%3Wa@romdyVe<%Ac zXuqw09s7cB+Y$7+I*m?rqZ9JY-RMAPIvvMf7op?D_-5sb66kjcG4D+F(`ERvlXv!5 zcLDkrfiDqscQtr#eNQe&caD(DkuozvE+;7N@_hw*AUuIFp!G>MS??#1&Cyx;mu!xd zez~awyOf96BAhCG z`k(9mcJtk3l^2&8|FBQ{T|Ndo8Qj$i)|@PbKX%CH+R>a^N0q{uoJp_xp5^qBk}|L8LRtAoL@AK zytkw_cm7X&r+Z79OZN^1OR=urE4KT<7~A4_zn8_G48$i74n_XM)xTb(4+`@xI2E>baIdEF+L9+py?Bbe0q?x zovC#SchN@oD$$`(a@g6M_k9yEdz*{(+&w$puOmJztV#Lb7Cd(tx+&K6WOItfqZ|I6 z6mUZB{X7LYfOipiySpfg8$a&uB7F+qi%mbZleHcTa&w>b?qC^mtz5)u*94xi^g?*O zhWky(xz?~zduj9;yxqM|@OAO!C&3r|4%NgLmI+7kQ1Z}^t_(rjy&-p}uUPje#ShV4 zcQ3Q|DZ!=K>%s==ou3CUf@hNdEPrD`P9PyZ62nG1?&eNRtA949{8q=#3zZ*UMaX`( z@@DYpdF|ti~9;?4`O)JJ(V_Dk*jPAK=&x#;+VouzNbIO|Gw zZ5TFkA1|Ua;ja4U+LiNBUO_npokRETk@S@HD36)w0pA|s zD%yf8Hc@#+CkuK{-;l3IL>@Q7p7UN?BE9Llc0r8wuYxzt(6XUw3uAU$ljv4;f_$sT zeYK3ArxabVdE~>+Db*bc*^I8kv~{_*eQMKO+5J3gXkcwktgX54T8lE)<&lUp?~o4F z#Lb2ZoSX*ddj7W|>>bP4FP85|PI-!-NwfbA(KgMJi!;xU(z=8f@Sy!USIxeMd1kC`&t(GQVe2BU35Z`;ZSa)Y>?hkaHdZibhHgKzTL%$rsQQyDVNAA5ew?;W; zavMeDH?^-Bzq!iNqL2FWyF1&z>Sgk0%uPL_@m)Q~@!M~=EB{{QkrP25h`)4pR>)qy zo8OB4!;3S2IC>j<`oDNBZ+_QpueQSj&cXiR-@`%I`4(&%=cyBP4}d(4@|=qEoK17O z71*&J=$f^0ZGAd3%cT6ZW^|?*V?DoQJzaI(p_!~_JT!i~CZ4#nwRF*Wozol6>0DIQ zw6yW~I(N6U^w=)WnMQY((pH)`-?#6f9mJ)1(227f40Vftz9hMnT^Y(JFNUpS&hVB$ zo5#Jsq|TuzQ_uAIcK~_UD|?>wT)e>4{_$hy(fRFw z)>*O8LT;@ySZjV$)6$66O1>aiYuAPb`LKtQD>HBVYdld5&6Y#6f8_k7ncq|R{U`GD z1RB9rq*CNw@E%1Xa3_)9|1GM+V(nJTc?tydHPx<~Vyj4BecEw?{?{+rkY2N7^Rr&rQ?s3g!oj+5X?oQAi>S&!9+roV+ z-VgHrV%~pWbLqY2bMJF?chH^P-SNIXTChJ2V#l!ZcFHAoHZ#K%Y$LIXJv)TJl@J4z6Sm!jxm0F~%j|-*i7e$-b>)VD=iU+cHYWIr9_#0!+K};jx zJEn9VH4_=A<{S46=MFlvGi(oce_hO2f}FYiGj|$_IWKkJXJUW%OIA6vDco4#pY!oe z@;<@QSO){%2DU61|L?CXEsa!nmNdo&*Vvg27Wz8+8WOEUC%&&|ubYYO-VeRczu|`6 zcTnDParw|7adRA;N9Oq1P<(4E>KbmX$oinB4`8ox#|~E9dl|6)Y<3Gw2wPtWhJ^3o=#Zgh$Uz2r@jAG;+loz(x8X-s?cG? zes1hfuxlrw&xAcQiGH)QKrn!TUB{p+1ypyS02MQ zMTD!H8+x(^wJ|(_j+xf2D$@8d>n-BgKYcG(MY58B-cF8j5HIMXf zuwv1uCe9iUgU1D|^Ky7oO8nNyoudNeRen`x%@=T2JU{mb-cwf6IlYlPjND^fwD5(_ z#<~|eXEgBLShSMwF2bFcHO+#j6U85$=c(@k%RKLFE$=m7)+a*aGvyBhA7&?g81`3j z0Q7a=k0>9<-pU-F-*e~xlHpZ4mj&p1odu<+t#CMd*UQ+i|&O=j(_&vi?%MO<%|w&fvc9{kcCN z2F?LT=}3`xDD(8}Z&^;=u1sO)84KGhBE}!}${gXH&ULf7r)+L90q;-d7G*nRL*Z4Z zCI#Nu!Y80hVE5ejV=lMIdxtk?a^P-V`&dUyurD5&f8#qs<=?nR(gh6g=JJINcE-UG?e*{N&-0H4zp?Lme+_>=HYdvd-F@q3!9TkvHjMvHKQZ z??&V-B&)5Z*odIr{pP*eFI;bDkB~`yyE0ihh#=?h?(|7M!C}n6_uN@`RObZPfk@T% zOh(_P^Zn)&_!)L`c;NLwc2ED^yZW6rpTrz`r+spuYw!D3LH?o!YRDgfUsU&9kS*Cw z_x*i;TJh!3pFB$Cj<|Puk>GjTe4T*b#gYO1qsvigj;!wo_OTJLT^>Au9ptF;|Jmi1 zf#t0{nfLn8{15)|Y8QJsZw-!_7;E5i2` zaW6W83`HmlDGQO0u=WVx-pn}JL=%6hFL(ARPCQ*o8*o+sKq*{)9pt0IL-9y9=5Y7h zf#>eG2lEJa7Or3kwuAc-a9F<1wDi5?$+-7)v=ANWGe-Oh;((}hNVFmTN{Qc9L;iYB zw-)Zb6(Tb(e$qMud2w-;@D^=OhxyXfqYuc8&Z$nDS9S8Sfp{YB@6DY(C$>+XV)wN!+3-`(Z<3z;_@93v zngn{}_&bs=S$wiMoK7YskI2({(SHcb8OUgEdMamMBjgmBEJ7wFqhVw=ELqhZCdn(M zlUK>@{sNxS$S!g#`2}{lWS4T4a77;doZAQF(VriE^FE579|a>A$M0 zv^S8K9L*ER3;A*{GZbM?*)r^yWFoL*@qmB+8QCc^@Co>S+Hvq8oRwdP19B=Hvh!I&g z4GsQJ$3BX41gn@Q&g14om)zM^1%Km0K7JbKChVUg9Z$}2F;MbJx2Fs@zd|k!eNbLP zx`52+Zyv>D=Q-<%RjkOoD;b~0ePr%KM)jQoxfS*4(p`0MmN zYZFK4`PcC~zAx+!;#K@2cBm+8zp}A};vUgSHbA~+s08~*U(F$%(-=qZQ}lhLjUM4M zi?ja9(R_u!_f{-Y6URT1H;_!|443_qyU!ut`2oM_o!)QaGtU!FALcXbm_z@_y%)>p zvX^za1Zd&M2lxT}f3d!kYB}WR=9&*7BL(Dyv8TO!FUq~2VZ{adr`RCn>DRbn{f|0* q)@*e@KR(Q^NXK7PN7TE6zIxht*7_yi34iIbuYPIe+BIMPlKpQXlHtz) literal 27379 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 diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index 4542069df1b6cb4e34eebeb1d0a2b5a32380a013..70ce5050202bbf648ab31f5dc9cc64b927d9c161 100644 GIT binary patch literal 8455 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 literal 8643 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 h Date: Sat, 27 Aug 2022 03:08:39 -0400 Subject: [PATCH 05/23] update codeset --- Data/Sys/GameFiles/GALE01/GameSetup.dat | Bin 26855 -> 27467 bytes Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 8455 -> 7887 bytes Data/Sys/GameSettings/GALE01r2.ini | 265 ++++++++++++++---------- Data/Sys/GameSettings/GALJ01r2.ini | 265 ++++++++++++++---------- 4 files changed, 304 insertions(+), 226 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/GameSetup.dat b/Data/Sys/GameFiles/GALE01/GameSetup.dat index c00eda4f523e336227f2fbb531ddca47501f5b41..29dee4011d75df74d5ce301ac39dd435cd2d722f 100644 GIT binary patch literal 27467 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 diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index 70ce5050202bbf648ab31f5dc9cc64b927d9c161..94f39264c268076a20051450c152e0ec28f0e7a8 100644 GIT binary patch literal 7887 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 diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index bd05492d5a..ae31b87b2d 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -2790,10 +2790,10 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001DE #Online/Menus/CSS/LoadCSSText.asm +C2264534 000001E4 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820ED4 480001F8 +40820F04 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,10 +2930,10 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000A88 +7C0803A6 48000AB8 7C0802A6 90010004 9421FF50 BE810008 -FDA01890 7F83E378 +D0610038 7F83E378 389D0090 38A00000 C03D0068 C05D0048 38FD0098 3D808000 @@ -2941,7 +2941,7 @@ C03D0068 C05D0048 4E800421 7F83E378 389D0090 38A00000 C03D0080 C05D003C -FC606890 38FD0098 +C0610038 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 BA810008 800100B4 @@ -2999,7 +2999,7 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800082D 887E000A +4800085D 887E000A 2C030000 4182001C 3B1E0015 7C791B78 887C0018 38630001 @@ -3064,15 +3064,15 @@ BA810008 800100B4 2C030004 4182000C 38BD0098 48000008 38BD017C 38800009 -48000625 887E0000 +48000655 887E0000 2C030004 4182000C 38BD0098 48000008 38BE00B0 3880000A -48000605 887E0000 +48000635 887E0000 2C030004 4182000C 38BD0098 48000008 38BD0185 38800008 -480005E5 887E0000 +48000615 887E0000 2C030004 41820034 2C030005 41820020 2C030000 4181000C @@ -3081,16 +3081,16 @@ BA810008 800100B4 48000018 38BD0197 38DD01C4 4800000C 38BD01A5 38DD01B2 -38800007 48000599 +38800007 480005C9 3B600001 7F64DB78 -38BD0098 48000589 +38BD0098 480005B9 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 38BD0098 -48000555 3B7B0001 +48000585 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 3B60000B @@ -3106,7 +3106,7 @@ BA810008 800100B4 41810008 4800002C 38800000 7C96B9AE 7F64DB78 7EC5B378 -480004D5 3B7B0001 +48000505 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 41820020 @@ -3117,9 +3117,9 @@ BA810008 800100B4 3B600001 886DB657 7F64DB78 2C030000 40820018 38BD00BE -4800047D 38600001 +480004AD 38600001 987C000C 48000134 -38BD00D4 48000469 +38BD00D4 48000499 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 @@ -3137,9 +3137,9 @@ BA810008 800100B4 38DD010C 886DAFA0 2C030002 4180000C 38BD00E7 38DD0101 -480003DD 38600001 +4800040D 38600001 987C000D 48000094 -38BD0120 480003C9 +38BD0120 480003F9 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 @@ -3155,7 +3155,7 @@ BA810008 800100B4 2C0B0000 41820018 38BD013B 38DD0163 4800000C 38BD014C -38DD015A 48000349 +38DD015A 48000379 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 @@ -3163,19 +3163,19 @@ BA810008 800100B4 3880000F 7C632396 1C630003 386301D0 7CBD1A14 7F64DB78 -4800030D 7F43D378 +4800033D 7F43D378 7F64DB78 38BD0088 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 7F64DB78 -38BD01D6 480002D9 +38BD01D6 48000309 7F43D378 7F64DB78 38BD0084 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 38BD0098 -480002AD 3B7B0002 +480002DD 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 2C03001E @@ -3186,7 +3186,10 @@ B07C000F BA810008 4E800021 7C6E1B78 7C0802A6 90010004 9421FF50 BE810008 -4BFFF3C1 7FA802A6 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 DBC10058 +4BFFF3A9 7FA802A6 820E002C 8A300000 8A500001 8A700002 8A900003 82B00004 @@ -3208,7 +3211,7 @@ D04F003C 2C120000 618C55F4 7D8903A6 4E800421 C05D0030 C07D0008 EC6100F2 -EC42182A FDE01090 +EC42182A FFC01090 806DC2DC 38800003 9883000E C03D002C 886DAFE0 2C030000 @@ -3258,6 +3261,9 @@ C07D0034 C09D0038 38840001 7C032000 41820008 4800000C 38600000 987C0019 +B9C10008 CBE10050 +CBC10058 800100F4 +382100F0 7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 7C0802A6 @@ -3411,7 +3417,7 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm BA810008 800100B4 382100B0 7C0803A6 387C0000 00000000 -C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm +C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 01C02000 00C0A000 00C1BC00 00C18C00 @@ -3420,12 +3426,15 @@ C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 003DCCCC CD000000 3C608048 80639D30 5463443E 2C030008 -40820550 888DAFA0 -2C040003 40820544 +40820580 888DAFA0 +2C040003 40820574 7C0802A6 90010004 9421FF50 BE810008 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 DBC10058 3FC08000 63DE5614 -83DE0000 4BFFFF99 +83DE0000 4BFFFF81 7FE802A6 C3FF0011 C3DF0015 38600004 3D808037 618CF1E4 @@ -3475,10 +3484,10 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7E83A378 -480000B5 7C8802A6 +480000CD 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 -4E800421 480001F9 +4E800421 48000211 806DB620 38810034 38A0002B 38C0FFFF 3D808001 618C1E24 @@ -3495,6 +3504,9 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 +B9C10008 CBE10050 +CBC10058 800100F4 +382100F0 7C0803A6 BA810008 800100B4 382100B0 7C0803A6 480002E8 4E800021 @@ -3506,7 +3518,7 @@ BA810008 800100B4 63DE5614 83DE0000 807E0000 88630001 2C030000 4082007C -4BFFFD15 7FE802A6 +4BFFFCE5 7FE802A6 3BA00000 3C80804A 60840BC0 80840000 C024000C C0440010 @@ -4270,7 +4282,7 @@ C34C0000 C31D0000 800100B4 382100B0 7C0803A6 B9C10408 60000000 00000000 -C21B1040 00000163 #Online/Menus/TitleMenu/OnMenuPrep.asm +C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 9421FF50 BE810008 480000B5 7C6802A6 @@ -4295,7 +4307,7 @@ C21B1040 00000163 #Online/Menus/TitleMenu/OnMenuPrep.asm 7D8903A6 4E800421 BA810008 800100B4 382100B0 7C0803A6 -48000A4C 4E800021 +48000AAC 4E800021 3D808000 618C5618 7D8903A6 4E800421 7FC802A6 38000008 @@ -4464,7 +4476,10 @@ A09C0000 3D808022 0647064B 06480649 064A0000 7C0802A6 90010004 9421FF50 -BE810008 806DB518 +BE810008 7C0802A6 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 806DB518 3C80803E 6084FA0C 3D808038 618C0358 7D8903A6 4E800421 @@ -4480,9 +4495,9 @@ BE810008 806DB518 3C80803E 6084FA60 3D808038 618C0358 7D8903A6 4E800421 -7C7D1B78 48000465 -7FC802A6 C2DE0010 -C2FE0014 3AC00016 +7C7D1B78 480004AD +7FC802A6 C3FE0010 +C3DE0014 3AC00016 7EC3B378 3D808037 618CF1E4 7D8903A6 4E800421 7C771B78 @@ -4520,7 +4535,7 @@ C2FE0014 3AC00016 7FA6EB78 3D808036 618CFB5C 7D8903A6 4E800421 7F23CB78 -FC20B090 3D808036 +FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 38810034 38A00006 @@ -4544,17 +4559,23 @@ FC20B090 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7F03C378 -48000031 7C8802A6 +48000049 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 BA810008 +4E800421 B9C10008 +CBE10050 CBC10058 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 9421FF50 -BE810008 48000225 -7FC802A6 C2DE0010 -C2FE0014 7C781B78 +BE810008 7C0802A6 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 4800023D +7FC802A6 C3FE0010 +C3DE0014 7C781B78 83380028 8358002C 8B7A0000 839A0001 83BA0005 7F23CB78 @@ -4572,8 +4593,8 @@ C07E0008 C09E000C 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 -FC20B090 2C1B0000 -40820008 FC20B890 +FC20F890 2C1B0000 +40820008 FC20F090 80610034 3D808036 618CF8BC 7D8903A6 4E800421 80610034 @@ -4583,8 +4604,8 @@ FC20B090 2C1B0000 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 -FC20B090 2C1B0001 -40820008 FC20B890 +FC20F890 2C1B0001 +40820008 FC20F090 80610034 3D808036 618CF8BC 7D8903A6 4E800421 80610034 @@ -4618,7 +4639,10 @@ FC20B090 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 BA810008 +48000004 B9C10008 +CBE10050 CBC10058 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 4E800021 C0B00000 @@ -4642,10 +4666,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm 41820014 3D808017 618CBEC8 7D8903A6 4E800421 00000000 -C2186EC4 0000007D #Online/Menus/VSScreen/InitVsSplash.asm +C2186EC4 00000082 #Online/Menus/VSScreen/InitVsSplash.asm 3C608048 80639D30 5463443E 2C030408 -408203D0 48000060 +408203F8 48000060 4E800021 00000000 3F800000 3F000000 3F19999A F15959FF @@ -4684,10 +4708,10 @@ D03E0024 D03E0028 389F0055 38BD0053 38C00000 C03F0020 48000129 48000038 -807D000D 4800021D +807D000D 48000245 387F0010 389F0044 C03F001C 4800010D -807D0011 48000205 +807D0011 4800022D 387F0014 389F004B C03F0020 480000F5 48000004 38600000 @@ -4719,37 +4743,42 @@ A0DD026A 38600000 618C6368 7D8903A6 4E800421 BA810008 800100B4 382100B0 -7C0803A6 4800017C +7C0803A6 480001A4 7C0802A6 90010004 9421FF50 BE810008 -FFE00890 7C761B78 -7C942378 7CB92B78 -7CDA3378 7CF83B78 -7D174378 93210008 -9301000C 92E10010 -C3DF0028 C07F0040 -7F43D378 3D808000 -618C55F4 7D8903A6 -4E800421 EC630072 -EFDE1828 7FC3F378 -389F0018 7EC4B378 -38A00000 7E87A378 -C03F0008 FC40F890 -FC60F090 3D808000 -618C56B4 7D8903A6 -4E800421 39C00008 -39E00000 7C6E0A14 -80E30000 2C0F0000 -4182000C C07F003C -EFFF182A C09F0040 -EFDE202A 7FC3F378 -389F0018 38A00000 -C03F000C FC40F890 -FC60F090 3D808000 -618C56B4 7D8903A6 -4E800421 39CE0004 -39EF0001 7C0FD000 -4180FFAC BA810008 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 FFE00890 +7C761B78 7C942378 +7CB92B78 7CDA3378 +7CF83B78 7D174378 +93210008 9301000C +92E10010 C3DF0028 +C07F0040 7F43D378 +3D808000 618C55F4 +7D8903A6 4E800421 +EC630072 EFDE1828 +7FC3F378 389F0018 +7EC4B378 38A00000 +7E87A378 C03F0008 +FC40F890 FC60F090 +3D808000 618C56B4 +7D8903A6 4E800421 +39C00008 39E00000 +7C6E0A14 80E30000 +2C0F0000 4182000C +C07F003C EFFF182A +C09F0040 EFDE202A +7FC3F378 389F0018 +38A00000 C03F000C +FC40F890 FC60F090 +3D808000 618C56B4 +7D8903A6 4E800421 +39CE0004 39EF0001 +7C0FD000 4180FFAC +B9C10008 CBE10050 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 7C0802A6 90010004 @@ -5586,20 +5615,23 @@ C2005608 00000016 #Online/Static/SaveState.asm BA810008 800100B4 382100B0 7C0803A6 4E800020 00000000 -C20056B4 00000059 #Online/Static/SubtextFunctions.asm -2C050002 418201F8 +C20056B4 00000063 #Online/Static/SubtextFunctions.asm +2C050002 41820228 7C0802A6 90010004 -9421FF50 BE810008 +9421FEF8 BDC10008 +DBE10050 DBC10058 +DBA10060 DB810068 +DB610070 DB410078 7C751B78 7C962378 7CB82B78 7CD93378 -90E10038 9101003C -91210040 91410044 -91610048 9181004C -FEA00890 FEC01090 -FEE01890 FF202890 +90E100E0 910100E4 +912100E8 914100EC +916100F0 918100F4 +FFE00890 FFC01090 +FFA01890 FF602890 FF403090 2C180001 418000FC 39E00004 -FC20B090 FC40B890 +FC20F090 FC40E890 2C0F0001 41820020 2C0F0002 41820020 2C0F0003 41820020 @@ -5609,11 +5641,11 @@ FC20B090 FC40B890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -80810038 3D80803A +808100E0 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 -FC20A890 FC40A890 +FC20F890 FC40F890 3D80803A 618C7548 7D8903A6 4E800421 7F25CB78 2C0F0000 @@ -5622,44 +5654,49 @@ FC20A890 FC40A890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A10038 80C1003C -80E10040 81010044 -81210048 8141004C +80A100E0 80C100E4 +80E100E8 810100EC +812100F0 814100F4 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -80810038 FC20B090 -FC40B890 3D80803A +808100E0 FC20F090 +FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 -FC20A890 FC40A890 +FC20F890 FC40F890 3D80803A 618C7548 7D8903A6 4E800421 7EA3AB78 7EE4BB78 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A10038 -80C1003C 80E10040 -81010044 81210048 -8141004C 3D80803A +7EE4BB78 80A100E0 +80C100E4 80E100E8 +810100EC 812100F0 +814100F4 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -BA810008 800100B4 -382100B0 7C0803A6 +B9C10008 CBE10050 +CBC10058 CBA10060 +CB810068 CB610070 +CB410078 8001010C +38210108 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7D1B78 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 DBA10060 +DB810068 7C7D1B78 7C9C2378 7CDB3378 -FEC00890 FEE01090 -FF001890 FEA02090 -4800008D 7F4802A6 +FFC00890 FFA01090 +FF801890 FFE02090 +4800009D 7F4802A6 38600000 7F64DB78 -C01A0000 FC20B090 -FC40B890 FC60C090 +C01A0000 FC20F090 +FC40E890 FC60E090 C09A0004 C0BA0008 3D80803A 618C5ACC 7D8903A6 4E800421 @@ -5667,12 +5704,14 @@ C09A0004 C0BA0008 41820010 38600001 986DAFEC 7F86E378 7EA3AB78 7FA4EB78 -FC00A890 D0030024 +FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -BA810008 800100B4 -382100B0 7C0803A6 +B9C10008 CBE10050 +CBC10058 CBA10060 +CB810068 800100F4 +382100F0 7C0803A6 4E800020 4E800021 41100000 44160000 41A00000 00000000 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index cec0715979..1e7cfb3a52 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -2790,10 +2790,10 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001DE #Online/Menus/CSS/LoadCSSText.asm +C2264534 000001E4 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820ED4 480001F8 +40820F04 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,10 +2930,10 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000A88 +7C0803A6 48000AB8 7C0802A6 90010004 9421FF50 BE810008 -FDA01890 7F83E378 +D0610038 7F83E378 389D0090 38A00000 C03D0068 C05D0048 38FD0098 3D808000 @@ -2941,7 +2941,7 @@ C03D0068 C05D0048 4E800421 7F83E378 389D0090 38A00000 C03D0080 C05D003C -FC606890 38FD0098 +C0610038 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 BA810008 800100B4 @@ -2999,7 +2999,7 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800082D 887E000A +4800085D 887E000A 2C030000 4182001C 3B1E0015 7C791B78 887C0018 38630001 @@ -3064,15 +3064,15 @@ BA810008 800100B4 2C030004 4182000C 38BD0098 48000008 38BD017C 38800009 -48000625 887E0000 +48000655 887E0000 2C030004 4182000C 38BD0098 48000008 38BE00B0 3880000A -48000605 887E0000 +48000635 887E0000 2C030004 4182000C 38BD0098 48000008 38BD0185 38800008 -480005E5 887E0000 +48000615 887E0000 2C030004 41820034 2C030005 41820020 2C030000 4181000C @@ -3081,16 +3081,16 @@ BA810008 800100B4 48000018 38BD0197 38DD01C4 4800000C 38BD01A5 38DD01B2 -38800007 48000599 +38800007 480005C9 3B600001 7F64DB78 -38BD0098 48000589 +38BD0098 480005B9 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 38BD0098 -48000555 3B7B0001 +48000585 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 3B60000B @@ -3106,7 +3106,7 @@ BA810008 800100B4 41810008 4800002C 38800000 7C96B9AE 7F64DB78 7EC5B378 -480004D5 3B7B0001 +48000505 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 41820020 @@ -3117,9 +3117,9 @@ BA810008 800100B4 3B600001 886DB657 7F64DB78 2C030000 40820018 38BD00BE -4800047D 38600001 +480004AD 38600001 987C000C 48000134 -38BD00D4 48000469 +38BD00D4 48000499 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 @@ -3137,9 +3137,9 @@ BA810008 800100B4 38DD010C 886DAFA0 2C030002 4180000C 38BD00E7 38DD0101 -480003DD 38600001 +4800040D 38600001 987C000D 48000094 -38BD0120 480003C9 +38BD0120 480003F9 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 @@ -3155,7 +3155,7 @@ BA810008 800100B4 2C0B0000 41820018 38BD013B 38DD0163 4800000C 38BD014C -38DD015A 48000349 +38DD015A 48000379 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 @@ -3163,19 +3163,19 @@ BA810008 800100B4 3880000F 7C632396 1C630003 386301D0 7CBD1A14 7F64DB78 -4800030D 7F43D378 +4800033D 7F43D378 7F64DB78 38BD0088 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 7F64DB78 -38BD01D6 480002D9 +38BD01D6 48000309 7F43D378 7F64DB78 38BD0084 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 38BD0098 -480002AD 3B7B0002 +480002DD 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 2C03001E @@ -3186,7 +3186,10 @@ B07C000F BA810008 4E800021 7C6E1B78 7C0802A6 90010004 9421FF50 BE810008 -4BFFF3C1 7FA802A6 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 DBC10058 +4BFFF3A9 7FA802A6 820E002C 8A300000 8A500001 8A700002 8A900003 82B00004 @@ -3208,7 +3211,7 @@ D04F003C 2C120000 618C55F4 7D8903A6 4E800421 C05D0030 C07D0008 EC6100F2 -EC42182A FDE01090 +EC42182A FFC01090 806DC2DC 38800003 9883000E C03D002C 886DAFE0 2C030000 @@ -3258,6 +3261,9 @@ C07D0034 C09D0038 38840001 7C032000 41820008 4800000C 38600000 987C0019 +B9C10008 CBE10050 +CBC10058 800100F4 +382100F0 7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 7C0802A6 @@ -3411,7 +3417,7 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm BA810008 800100B4 382100B0 7C0803A6 387C0000 00000000 -C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm +C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 01C02000 00C0A000 00C1BC00 00C18C00 @@ -3420,12 +3426,15 @@ C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 003DCCCC CD000000 3C608048 80639D30 5463443E 2C030008 -40820550 888DAFA0 -2C040003 40820544 +40820580 888DAFA0 +2C040003 40820574 7C0802A6 90010004 9421FF50 BE810008 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 DBC10058 3FC08000 63DE5614 -83DE0000 4BFFFF99 +83DE0000 4BFFFF81 7FE802A6 C3FF0011 C3DF0015 38600004 3D808037 618CF1E4 @@ -3475,10 +3484,10 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7E83A378 -480000B5 7C8802A6 +480000CD 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 -4E800421 480001F9 +4E800421 48000211 806DB620 38810034 38A0002B 38C0FFFF 3D808001 618C1E24 @@ -3495,6 +3504,9 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 +B9C10008 CBE10050 +CBC10058 800100F4 +382100F0 7C0803A6 BA810008 800100B4 382100B0 7C0803A6 480002E8 4E800021 @@ -3506,7 +3518,7 @@ BA810008 800100B4 63DE5614 83DE0000 807E0000 88630001 2C030000 4082007C -4BFFFD15 7FE802A6 +4BFFFCE5 7FE802A6 3BA00000 3C80804A 60840BC0 80840000 C024000C C0440010 @@ -4270,7 +4282,7 @@ C34C0000 C31D0000 800100B4 382100B0 7C0803A6 B9C10408 60000000 00000000 -C21B1040 00000163 #Online/Menus/TitleMenu/OnMenuPrep.asm +C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 9421FF50 BE810008 480000B5 7C6802A6 @@ -4295,7 +4307,7 @@ C21B1040 00000163 #Online/Menus/TitleMenu/OnMenuPrep.asm 7D8903A6 4E800421 BA810008 800100B4 382100B0 7C0803A6 -48000A4C 4E800021 +48000AAC 4E800021 3D808000 618C5618 7D8903A6 4E800421 7FC802A6 38000008 @@ -4464,7 +4476,10 @@ A09C0000 3D808022 0647064B 06480649 064A0000 7C0802A6 90010004 9421FF50 -BE810008 806DB518 +BE810008 7C0802A6 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 806DB518 3C80803E 6084FA0C 3D808038 618C0358 7D8903A6 4E800421 @@ -4480,9 +4495,9 @@ BE810008 806DB518 3C80803E 6084FA60 3D808038 618C0358 7D8903A6 4E800421 -7C7D1B78 48000465 -7FC802A6 C2DE0010 -C2FE0014 3AC00016 +7C7D1B78 480004AD +7FC802A6 C3FE0010 +C3DE0014 3AC00016 7EC3B378 3D808037 618CF1E4 7D8903A6 4E800421 7C771B78 @@ -4520,7 +4535,7 @@ C2FE0014 3AC00016 7FA6EB78 3D808036 618CFB5C 7D8903A6 4E800421 7F23CB78 -FC20B090 3D808036 +FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 38810034 38A00006 @@ -4544,17 +4559,23 @@ FC20B090 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7F03C378 -48000031 7C8802A6 +48000049 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 BA810008 +4E800421 B9C10008 +CBE10050 CBC10058 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 9421FF50 -BE810008 48000225 -7FC802A6 C2DE0010 -C2FE0014 7C781B78 +BE810008 7C0802A6 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 4800023D +7FC802A6 C3FE0010 +C3DE0014 7C781B78 83380028 8358002C 8B7A0000 839A0001 83BA0005 7F23CB78 @@ -4572,8 +4593,8 @@ C07E0008 C09E000C 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 -FC20B090 2C1B0000 -40820008 FC20B890 +FC20F890 2C1B0000 +40820008 FC20F090 80610034 3D808036 618CF8BC 7D8903A6 4E800421 80610034 @@ -4583,8 +4604,8 @@ FC20B090 2C1B0000 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 -FC20B090 2C1B0001 -40820008 FC20B890 +FC20F890 2C1B0001 +40820008 FC20F090 80610034 3D808036 618CF8BC 7D8903A6 4E800421 80610034 @@ -4618,7 +4639,10 @@ FC20B090 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 BA810008 +48000004 B9C10008 +CBE10050 CBC10058 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 4E800021 C0B00000 @@ -4642,10 +4666,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm 41820014 3D808017 618CBEC8 7D8903A6 4E800421 00000000 -C2186EC4 0000007D #Online/Menus/VSScreen/InitVsSplash.asm +C2186EC4 00000082 #Online/Menus/VSScreen/InitVsSplash.asm 3C608048 80639D30 5463443E 2C030408 -408203D0 48000060 +408203F8 48000060 4E800021 00000000 3F800000 3F000000 3F19999A F15959FF @@ -4684,10 +4708,10 @@ D03E0024 D03E0028 389F0055 38BD0053 38C00000 C03F0020 48000129 48000038 -807D000D 4800021D +807D000D 48000245 387F0010 389F0044 C03F001C 4800010D -807D0011 48000205 +807D0011 4800022D 387F0014 389F004B C03F0020 480000F5 48000004 38600000 @@ -4719,37 +4743,42 @@ A0DD026A 38600000 618C6368 7D8903A6 4E800421 BA810008 800100B4 382100B0 -7C0803A6 4800017C +7C0803A6 480001A4 7C0802A6 90010004 9421FF50 BE810008 -FFE00890 7C761B78 -7C942378 7CB92B78 -7CDA3378 7CF83B78 -7D174378 93210008 -9301000C 92E10010 -C3DF0028 C07F0040 -7F43D378 3D808000 -618C55F4 7D8903A6 -4E800421 EC630072 -EFDE1828 7FC3F378 -389F0018 7EC4B378 -38A00000 7E87A378 -C03F0008 FC40F890 -FC60F090 3D808000 -618C56B4 7D8903A6 -4E800421 39C00008 -39E00000 7C6E0A14 -80E30000 2C0F0000 -4182000C C07F003C -EFFF182A C09F0040 -EFDE202A 7FC3F378 -389F0018 38A00000 -C03F000C FC40F890 -FC60F090 3D808000 -618C56B4 7D8903A6 -4E800421 39CE0004 -39EF0001 7C0FD000 -4180FFAC BA810008 +7C0802A6 90010004 +9421FF10 BDC10008 +DBE10050 FFE00890 +7C761B78 7C942378 +7CB92B78 7CDA3378 +7CF83B78 7D174378 +93210008 9301000C +92E10010 C3DF0028 +C07F0040 7F43D378 +3D808000 618C55F4 +7D8903A6 4E800421 +EC630072 EFDE1828 +7FC3F378 389F0018 +7EC4B378 38A00000 +7E87A378 C03F0008 +FC40F890 FC60F090 +3D808000 618C56B4 +7D8903A6 4E800421 +39C00008 39E00000 +7C6E0A14 80E30000 +2C0F0000 4182000C +C07F003C EFFF182A +C09F0040 EFDE202A +7FC3F378 389F0018 +38A00000 C03F000C +FC40F890 FC60F090 +3D808000 618C56B4 +7D8903A6 4E800421 +39CE0004 39EF0001 +7C0FD000 4180FFAC +B9C10008 CBE10050 +800100F4 382100F0 +7C0803A6 BA810008 800100B4 382100B0 7C0803A6 4E800020 7C0802A6 90010004 @@ -5586,20 +5615,23 @@ C2005608 00000016 #Online/Static/SaveState.asm BA810008 800100B4 382100B0 7C0803A6 4E800020 00000000 -C20056B4 00000059 #Online/Static/SubtextFunctions.asm -2C050002 418201F8 +C20056B4 00000063 #Online/Static/SubtextFunctions.asm +2C050002 41820228 7C0802A6 90010004 -9421FF50 BE810008 +9421FEF8 BDC10008 +DBE10050 DBC10058 +DBA10060 DB810068 +DB610070 DB410078 7C751B78 7C962378 7CB82B78 7CD93378 -90E10038 9101003C -91210040 91410044 -91610048 9181004C -FEA00890 FEC01090 -FEE01890 FF202890 +90E100E0 910100E4 +912100E8 914100EC +916100F0 918100F4 +FFE00890 FFC01090 +FFA01890 FF602890 FF403090 2C180001 418000FC 39E00004 -FC20B090 FC40B890 +FC20F090 FC40E890 2C0F0001 41820020 2C0F0002 41820020 2C0F0003 41820020 @@ -5609,11 +5641,11 @@ FC20B090 FC40B890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -80810038 3D80803A +808100E0 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 -FC20A890 FC40A890 +FC20F890 FC40F890 3D80803A 618C7548 7D8903A6 4E800421 7F25CB78 2C0F0000 @@ -5622,44 +5654,49 @@ FC20A890 FC40A890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A10038 80C1003C -80E10040 81010044 -81210048 8141004C +80A100E0 80C100E4 +80E100E8 810100EC +812100F0 814100F4 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -80810038 FC20B090 -FC40B890 3D80803A +808100E0 FC20F090 +FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 -FC20A890 FC40A890 +FC20F890 FC40F890 3D80803A 618C7548 7D8903A6 4E800421 7EA3AB78 7EE4BB78 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A10038 -80C1003C 80E10040 -81010044 81210048 -8141004C 3D80803A +7EE4BB78 80A100E0 +80C100E4 80E100E8 +810100EC 812100F0 +814100F4 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -BA810008 800100B4 -382100B0 7C0803A6 +B9C10008 CBE10050 +CBC10058 CBA10060 +CB810068 CB610070 +CB410078 8001010C +38210108 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7D1B78 +90010004 9421FF10 +BDC10008 DBE10050 +DBC10058 DBA10060 +DB810068 7C7D1B78 7C9C2378 7CDB3378 -FEC00890 FEE01090 -FF001890 FEA02090 -4800008D 7F4802A6 +FFC00890 FFA01090 +FF801890 FFE02090 +4800009D 7F4802A6 38600000 7F64DB78 -C01A0000 FC20B090 -FC40B890 FC60C090 +C01A0000 FC20F090 +FC40E890 FC60E090 C09A0004 C0BA0008 3D80803A 618C5ACC 7D8903A6 4E800421 @@ -5667,12 +5704,14 @@ C09A0004 C0BA0008 41820010 38600001 986DAFEC 7F86E378 7EA3AB78 7FA4EB78 -FC00A890 D0030024 +FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -BA810008 800100B4 -382100B0 7C0803A6 +B9C10008 CBE10050 +CBC10058 CBA10060 +CB810068 800100F4 +382100F0 7C0803A6 4E800020 4E800021 41100000 44160000 41A00000 00000000 From a6bec4b3b9da4976339ef6f78a6207b200f196a6 Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Mon, 29 Aug 2022 10:38:35 -0400 Subject: [PATCH 06/23] Update codeset --- Data/Sys/GameSettings/GALE01r2.ini | 285 ++++++++++++++--------------- Data/Sys/GameSettings/GALJ01r2.ini | 285 ++++++++++++++--------------- 2 files changed, 266 insertions(+), 304 deletions(-) diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index ae31b87b2d..539865a9bb 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -2790,10 +2790,10 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001E4 #Online/Menus/CSS/LoadCSSText.asm +C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820F04 480001F8 +40820EE4 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,7 +2930,7 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000AB8 +7C0803A6 48000A98 7C0802A6 90010004 9421FF50 BE810008 D0610038 7F83E378 @@ -2999,7 +2999,7 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800085D 887E000A +4800083D 887E000A 2C030000 4182001C 3B1E0015 7C791B78 887C0018 38630001 @@ -3064,15 +3064,15 @@ BA810008 800100B4 2C030004 4182000C 38BD0098 48000008 38BD017C 38800009 -48000655 887E0000 +48000635 887E0000 2C030004 4182000C 38BD0098 48000008 38BE00B0 3880000A -48000635 887E0000 +48000615 887E0000 2C030004 4182000C 38BD0098 48000008 38BD0185 38800008 -48000615 887E0000 +480005F5 887E0000 2C030004 41820034 2C030005 41820020 2C030000 4181000C @@ -3081,16 +3081,16 @@ BA810008 800100B4 48000018 38BD0197 38DD01C4 4800000C 38BD01A5 38DD01B2 -38800007 480005C9 +38800007 480005A9 3B600001 7F64DB78 -38BD0098 480005B9 +38BD0098 48000599 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 38BD0098 -48000585 3B7B0001 +48000565 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 3B60000B @@ -3106,7 +3106,7 @@ BA810008 800100B4 41810008 4800002C 38800000 7C96B9AE 7F64DB78 7EC5B378 -48000505 3B7B0001 +480004E5 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 41820020 @@ -3117,9 +3117,9 @@ BA810008 800100B4 3B600001 886DB657 7F64DB78 2C030000 40820018 38BD00BE -480004AD 38600001 +4800048D 38600001 987C000C 48000134 -38BD00D4 48000499 +38BD00D4 48000479 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 @@ -3137,9 +3137,9 @@ BA810008 800100B4 38DD010C 886DAFA0 2C030002 4180000C 38BD00E7 38DD0101 -4800040D 38600001 +480003ED 38600001 987C000D 48000094 -38BD0120 480003F9 +38BD0120 480003D9 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 @@ -3155,7 +3155,7 @@ BA810008 800100B4 2C0B0000 41820018 38BD013B 38DD0163 4800000C 38BD014C -38DD015A 48000379 +38DD015A 48000359 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 @@ -3163,19 +3163,19 @@ BA810008 800100B4 3880000F 7C632396 1C630003 386301D0 7CBD1A14 7F64DB78 -4800033D 7F43D378 +4800031D 7F43D378 7F64DB78 38BD0088 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 7F64DB78 -38BD01D6 48000309 +38BD01D6 480002E9 7F43D378 7F64DB78 38BD0084 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 38BD0098 -480002DD 3B7B0002 +480002BD 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 2C03001E @@ -3185,11 +3185,9 @@ B07C000F BA810008 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 90010004 -9421FF50 BE810008 -7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 DBC10058 -4BFFF3A9 7FA802A6 +9421FF40 BE810008 +DBE100B0 DBC100B8 +4BFFF3B9 7FA802A6 820E002C 8A300000 8A500001 8A700002 8A900003 82B00004 @@ -3261,11 +3259,9 @@ C07D0034 C09D0038 38840001 7C032000 41820008 4800000C 38600000 987C0019 -B9C10008 CBE10050 -CBC10058 800100F4 -382100F0 7C0803A6 -BA810008 800100B4 -382100B0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 800100C4 +382100C0 7C0803A6 4E800020 7C0802A6 90010004 9421FF50 BE810008 7F43D378 @@ -3417,7 +3413,7 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm BA810008 800100B4 382100B0 7C0803A6 387C0000 00000000 -C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm +C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 01C02000 00C0A000 00C1BC00 00C18C00 @@ -3426,15 +3422,13 @@ C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 003DCCCC CD000000 3C608048 80639D30 5463443E 2C030008 -40820580 888DAFA0 -2C040003 40820574 +40820560 888DAFA0 +2C040003 40820554 7C0802A6 90010004 -9421FF50 BE810008 -7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 DBC10058 +9421FF40 BE810008 +DBE100B0 DBC100B8 3FC08000 63DE5614 -83DE0000 4BFFFF81 +83DE0000 4BFFFF91 7FE802A6 C3FF0011 C3DF0015 38600004 3D808037 618CF1E4 @@ -3484,10 +3478,10 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7E83A378 -480000CD 7C8802A6 +480000BD 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 -4E800421 48000211 +4E800421 48000201 806DB620 38810034 38A0002B 38C0FFFF 3D808001 618C1E24 @@ -3504,11 +3498,9 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 -B9C10008 CBE10050 -CBC10058 800100F4 -382100F0 7C0803A6 -BA810008 800100B4 -382100B0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 800100C4 +382100C0 7C0803A6 480002E8 4E800021 7C0802A6 90010004 9421FF50 BE810008 @@ -3518,7 +3510,7 @@ BA810008 800100B4 63DE5614 83DE0000 807E0000 88630001 2C030000 4082007C -4BFFFCE5 7FE802A6 +4BFFFD05 7FE802A6 3BA00000 3C80804A 60840BC0 80840000 C024000C C0440010 @@ -4282,7 +4274,7 @@ C34C0000 C31D0000 800100B4 382100B0 7C0803A6 B9C10408 60000000 00000000 -C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm +C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 9421FF50 BE810008 480000B5 7C6802A6 @@ -4307,7 +4299,7 @@ C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm 7D8903A6 4E800421 BA810008 800100B4 382100B0 7C0803A6 -48000AAC 4E800021 +48000A6C 4E800021 3D808000 618C5618 7D8903A6 4E800421 7FC802A6 38000008 @@ -4475,11 +4467,9 @@ A09C0000 3D808022 4E800021 06450646 0647064B 06480649 064A0000 7C0802A6 -90010004 9421FF50 -BE810008 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 806DB518 +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 806DB518 3C80803E 6084FA0C 3D808038 618C0358 7D8903A6 4E800421 @@ -4495,7 +4485,7 @@ DBC10058 806DB518 3C80803E 6084FA60 3D808038 618C0358 7D8903A6 4E800421 -7C7D1B78 480004AD +7C7D1B78 4800047D 7FC802A6 C3FE0010 C3DE0014 3AC00016 7EC3B378 3D808037 @@ -4517,17 +4507,17 @@ C3DE0014 3AC00016 7F25CB78 3D808039 618C0A70 7D8903A6 4E800421 7F23CB78 -38810034 38A0000A +38810038 38A0000A 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 -38810034 38A0000B +38810038 38A0000B 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 @@ -4538,16 +4528,16 @@ C3DE0014 3AC00016 FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 -38810034 38A00006 +38810038 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 3C80C060 60840000 90830038 7F23CB78 -38810034 38A00007 +38810038 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 3C80405C 60840000 90830038 7F03C378 3C808039 60841070 @@ -4559,21 +4549,17 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7F03C378 -48000049 7C8802A6 +48000039 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 B9C10008 -CBE10050 CBC10058 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +4E800421 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 4800023D +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 4800022D 7FC802A6 C3FE0010 C3DE0014 7C781B78 83380028 8358002C @@ -4589,26 +4575,26 @@ C07E0008 C09E000C 3D808000 618C56B4 7D8903A6 4E800421 907A0005 48000198 -7F23CB78 38810034 +7F23CB78 38810038 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0000 40820008 FC20F090 -80610034 3D808036 +80610038 3D808036 618CF8BC 7D8903A6 -4E800421 80610034 +4E800421 80610038 3D808037 618C0928 7D8903A6 4E800421 -7F23CB78 38810034 +7F23CB78 38810038 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0001 40820008 FC20F090 -80610034 3D808036 +80610038 3D808036 618CF8BC 7D8903A6 -4E800421 80610034 +4E800421 80610038 3D808037 618C0928 7D8903A6 4E800421 39C00000 7DC37378 @@ -4639,11 +4625,9 @@ FC20F890 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 B9C10008 -CBE10050 CBC10058 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +48000004 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 4E800021 C0B00000 C0333333 41B80000 @@ -4666,10 +4650,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm 41820014 3D808017 618CBEC8 7D8903A6 4E800421 00000000 -C2186EC4 00000082 #Online/Menus/VSScreen/InitVsSplash.asm +C2186EC4 0000007F #Online/Menus/VSScreen/InitVsSplash.asm 3C608048 80639D30 5463443E 2C030408 -408203F8 48000060 +408203E0 48000060 4E800021 00000000 3F800000 3F000000 3F19999A F15959FF @@ -4708,10 +4692,10 @@ D03E0024 D03E0028 389F0055 38BD0053 38C00000 C03F0020 48000129 48000038 -807D000D 48000245 +807D000D 4800022D 387F0010 389F0044 C03F001C 4800010D -807D0011 4800022D +807D0011 48000215 387F0014 389F004B C03F0020 480000F5 48000004 38600000 @@ -4743,43 +4727,40 @@ A0DD026A 38600000 618C6368 7D8903A6 4E800421 BA810008 800100B4 382100B0 -7C0803A6 480001A4 -7C0802A6 90010004 -9421FF50 BE810008 +7C0803A6 4800018C 7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 FFE00890 -7C761B78 7C942378 -7CB92B78 7CDA3378 -7CF83B78 7D174378 -93210008 9301000C -92E10010 C3DF0028 -C07F0040 7F43D378 -3D808000 618C55F4 -7D8903A6 4E800421 -EC630072 EFDE1828 -7FC3F378 389F0018 -7EC4B378 38A00000 -7E87A378 C03F0008 -FC40F890 FC60F090 -3D808000 618C56B4 -7D8903A6 4E800421 -39C00008 39E00000 -7C6E0A14 80E30000 -2C0F0000 4182000C -C07F003C EFFF182A -C09F0040 EFDE202A -7FC3F378 389F0018 -38A00000 C03F000C -FC40F890 FC60F090 -3D808000 618C56B4 -7D8903A6 4E800421 -39CE0004 39EF0001 -7C0FD000 4180FFAC -B9C10008 CBE10050 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +9421FF40 BE810008 +DBE100B0 DBC100B8 +FFE00890 7C761B78 +7C942378 7CB92B78 +7CDA3378 7CF83B78 +7D174378 93210008 +9301000C 92E10010 +C3DF0028 C07F0040 +7F43D378 3D808000 +618C55F4 7D8903A6 +4E800421 EC630072 +EFDE1828 7FC3F378 +389F0018 7EC4B378 +38A00000 7E87A378 +C03F0008 FC40F890 +FC60F090 3D808000 +618C56B4 7D8903A6 +4E800421 39C00008 +39E00000 7C6E0A14 +80E30000 2C0F0000 +4182000C C07F003C +EFFF182A C09F0040 +EFDE202A 7FC3F378 +389F0018 38A00000 +C03F000C FC40F890 +FC60F090 3D808000 +618C56B4 7D8903A6 +4E800421 39CE0004 +39EF0001 7C0FD000 +4180FFAC BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 9421FF50 BE810008 @@ -5618,15 +5599,15 @@ BA810008 800100B4 C20056B4 00000063 #Online/Static/SubtextFunctions.asm 2C050002 41820228 7C0802A6 90010004 -9421FEF8 BDC10008 -DBE10050 DBC10058 -DBA10060 DB810068 -DB610070 DB410078 +9421FF20 BE810008 +DBE100B0 DBC100B8 +DBA100C0 DB8100C8 +DB6100D0 DB4100D8 7C751B78 7C962378 7CB82B78 7CD93378 -90E100E0 910100E4 -912100E8 914100EC -916100F0 918100F4 +90E10038 9101003C +91210040 91410044 +91610048 9181004C FFE00890 FFC01090 FFA01890 FF602890 FF403090 2C180001 @@ -5641,7 +5622,7 @@ FC20F090 FC40E890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -808100E0 3D80803A +80810038 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 @@ -5654,15 +5635,15 @@ FC20F890 FC40F890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A100E0 80C100E4 -80E100E8 810100EC -812100F0 814100F4 +80A10038 80C1003C +80E10040 81010044 +81210048 8141004C 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -808100E0 FC20F090 +80810038 FC20F090 FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 @@ -5674,22 +5655,22 @@ FC20F890 FC40F890 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A100E0 -80C100E4 80E100E8 -810100EC 812100F0 -814100F4 3D80803A +7EE4BB78 80A10038 +80C1003C 80E10040 +81010044 81210048 +8141004C 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -B9C10008 CBE10050 -CBC10058 CBA10060 -CB810068 CB610070 -CB410078 8001010C -38210108 7C0803A6 +BA810008 CBE100B0 +CBC100B8 CBA100C0 +CB8100C8 CB6100D0 +CB4100D8 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 DBA10060 -DB810068 7C7D1B78 +90010004 9421FF30 +BE810008 DBE100B0 +DBC100B8 DBA100C0 +DB8100C8 7C7D1B78 7C9C2378 7CDB3378 FFC00890 FFA01090 FF801890 FFE02090 @@ -5708,10 +5689,10 @@ FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -B9C10008 CBE10050 -CBC10058 CBA10060 -CB810068 800100F4 -382100F0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 CBA100C0 +CB8100C8 800100D4 +382100D0 7C0803A6 4E800020 4E800021 41100000 44160000 41A00000 00000000 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 1e7cfb3a52..e8b250dba2 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -2790,10 +2790,10 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001E4 #Online/Menus/CSS/LoadCSSText.asm +C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820F04 480001F8 +40820EE4 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,7 +2930,7 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000AB8 +7C0803A6 48000A98 7C0802A6 90010004 9421FF50 BE810008 D0610038 7F83E378 @@ -2999,7 +2999,7 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800085D 887E000A +4800083D 887E000A 2C030000 4182001C 3B1E0015 7C791B78 887C0018 38630001 @@ -3064,15 +3064,15 @@ BA810008 800100B4 2C030004 4182000C 38BD0098 48000008 38BD017C 38800009 -48000655 887E0000 +48000635 887E0000 2C030004 4182000C 38BD0098 48000008 38BE00B0 3880000A -48000635 887E0000 +48000615 887E0000 2C030004 4182000C 38BD0098 48000008 38BD0185 38800008 -48000615 887E0000 +480005F5 887E0000 2C030004 41820034 2C030005 41820020 2C030000 4181000C @@ -3081,16 +3081,16 @@ BA810008 800100B4 48000018 38BD0197 38DD01C4 4800000C 38BD01A5 38DD01B2 -38800007 480005C9 +38800007 480005A9 3B600001 7F64DB78 -38BD0098 480005B9 +38BD0098 48000599 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 38BD0098 -48000585 3B7B0001 +48000565 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 3B60000B @@ -3106,7 +3106,7 @@ BA810008 800100B4 41810008 4800002C 38800000 7C96B9AE 7F64DB78 7EC5B378 -48000505 3B7B0001 +480004E5 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 41820020 @@ -3117,9 +3117,9 @@ BA810008 800100B4 3B600001 886DB657 7F64DB78 2C030000 40820018 38BD00BE -480004AD 38600001 +4800048D 38600001 987C000C 48000134 -38BD00D4 48000499 +38BD00D4 48000479 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 @@ -3137,9 +3137,9 @@ BA810008 800100B4 38DD010C 886DAFA0 2C030002 4180000C 38BD00E7 38DD0101 -4800040D 38600001 +480003ED 38600001 987C000D 48000094 -38BD0120 480003F9 +38BD0120 480003D9 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 @@ -3155,7 +3155,7 @@ BA810008 800100B4 2C0B0000 41820018 38BD013B 38DD0163 4800000C 38BD014C -38DD015A 48000379 +38DD015A 48000359 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 @@ -3163,19 +3163,19 @@ BA810008 800100B4 3880000F 7C632396 1C630003 386301D0 7CBD1A14 7F64DB78 -4800033D 7F43D378 +4800031D 7F43D378 7F64DB78 38BD0088 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 7F64DB78 -38BD01D6 48000309 +38BD01D6 480002E9 7F43D378 7F64DB78 38BD0084 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 38BD0098 -480002DD 3B7B0002 +480002BD 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 2C03001E @@ -3185,11 +3185,9 @@ B07C000F BA810008 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 90010004 -9421FF50 BE810008 -7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 DBC10058 -4BFFF3A9 7FA802A6 +9421FF40 BE810008 +DBE100B0 DBC100B8 +4BFFF3B9 7FA802A6 820E002C 8A300000 8A500001 8A700002 8A900003 82B00004 @@ -3261,11 +3259,9 @@ C07D0034 C09D0038 38840001 7C032000 41820008 4800000C 38600000 987C0019 -B9C10008 CBE10050 -CBC10058 800100F4 -382100F0 7C0803A6 -BA810008 800100B4 -382100B0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 800100C4 +382100C0 7C0803A6 4E800020 7C0802A6 90010004 9421FF50 BE810008 7F43D378 @@ -3417,7 +3413,7 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm BA810008 800100B4 382100B0 7C0803A6 387C0000 00000000 -C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm +C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 01C02000 00C0A000 00C1BC00 00C18C00 @@ -3426,15 +3422,13 @@ C22652F4 000000BC #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 003DCCCC CD000000 3C608048 80639D30 5463443E 2C030008 -40820580 888DAFA0 -2C040003 40820574 +40820560 888DAFA0 +2C040003 40820554 7C0802A6 90010004 -9421FF50 BE810008 -7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 DBC10058 +9421FF40 BE810008 +DBE100B0 DBC100B8 3FC08000 63DE5614 -83DE0000 4BFFFF81 +83DE0000 4BFFFF91 7FE802A6 C3FF0011 C3DF0015 38600004 3D808037 618CF1E4 @@ -3484,10 +3478,10 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7E83A378 -480000CD 7C8802A6 +480000BD 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 -4E800421 48000211 +4E800421 48000201 806DB620 38810034 38A0002B 38C0FFFF 3D808001 618C1E24 @@ -3504,11 +3498,9 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 -B9C10008 CBE10050 -CBC10058 800100F4 -382100F0 7C0803A6 -BA810008 800100B4 -382100B0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 800100C4 +382100C0 7C0803A6 480002E8 4E800021 7C0802A6 90010004 9421FF50 BE810008 @@ -3518,7 +3510,7 @@ BA810008 800100B4 63DE5614 83DE0000 807E0000 88630001 2C030000 4082007C -4BFFFCE5 7FE802A6 +4BFFFD05 7FE802A6 3BA00000 3C80804A 60840BC0 80840000 C024000C C0440010 @@ -4282,7 +4274,7 @@ C34C0000 C31D0000 800100B4 382100B0 7C0803A6 B9C10408 60000000 00000000 -C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm +C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 9421FF50 BE810008 480000B5 7C6802A6 @@ -4307,7 +4299,7 @@ C21B1040 0000016F #Online/Menus/TitleMenu/OnMenuPrep.asm 7D8903A6 4E800421 BA810008 800100B4 382100B0 7C0803A6 -48000AAC 4E800021 +48000A6C 4E800021 3D808000 618C5618 7D8903A6 4E800421 7FC802A6 38000008 @@ -4475,11 +4467,9 @@ A09C0000 3D808022 4E800021 06450646 0647064B 06480649 064A0000 7C0802A6 -90010004 9421FF50 -BE810008 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 806DB518 +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 806DB518 3C80803E 6084FA0C 3D808038 618C0358 7D8903A6 4E800421 @@ -4495,7 +4485,7 @@ DBC10058 806DB518 3C80803E 6084FA60 3D808038 618C0358 7D8903A6 4E800421 -7C7D1B78 480004AD +7C7D1B78 4800047D 7FC802A6 C3FE0010 C3DE0014 3AC00016 7EC3B378 3D808037 @@ -4517,17 +4507,17 @@ C3DE0014 3AC00016 7F25CB78 3D808039 618C0A70 7D8903A6 4E800421 7F23CB78 -38810034 38A0000A +38810038 38A0000A 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 -38810034 38A0000B +38810038 38A0000B 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 @@ -4538,16 +4528,16 @@ C3DE0014 3AC00016 FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 -38810034 38A00006 +38810038 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 3C80C060 60840000 90830038 7F23CB78 -38810034 38A00007 +38810038 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610034 +4E800421 80610038 3C80405C 60840000 90830038 7F03C378 3C808039 60841070 @@ -4559,21 +4549,17 @@ FC20F890 3D808036 7EE6BB78 3D808039 618C0B68 7D8903A6 4E800421 7F03C378 -48000049 7C8802A6 +48000039 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 B9C10008 -CBE10050 CBC10058 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +4E800421 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 4800023D +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 4800022D 7FC802A6 C3FE0010 C3DE0014 7C781B78 83380028 8358002C @@ -4589,26 +4575,26 @@ C07E0008 C09E000C 3D808000 618C56B4 7D8903A6 4E800421 907A0005 48000198 -7F23CB78 38810034 +7F23CB78 38810038 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0000 40820008 FC20F090 -80610034 3D808036 +80610038 3D808036 618CF8BC 7D8903A6 -4E800421 80610034 +4E800421 80610038 3D808037 618C0928 7D8903A6 4E800421 -7F23CB78 38810034 +7F23CB78 38810038 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0001 40820008 FC20F090 -80610034 3D808036 +80610038 3D808036 618CF8BC 7D8903A6 -4E800421 80610034 +4E800421 80610038 3D808037 618C0928 7D8903A6 4E800421 39C00000 7DC37378 @@ -4639,11 +4625,9 @@ FC20F890 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 B9C10008 -CBE10050 CBC10058 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +48000004 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 4E800021 C0B00000 C0333333 41B80000 @@ -4666,10 +4650,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm 41820014 3D808017 618CBEC8 7D8903A6 4E800421 00000000 -C2186EC4 00000082 #Online/Menus/VSScreen/InitVsSplash.asm +C2186EC4 0000007F #Online/Menus/VSScreen/InitVsSplash.asm 3C608048 80639D30 5463443E 2C030408 -408203F8 48000060 +408203E0 48000060 4E800021 00000000 3F800000 3F000000 3F19999A F15959FF @@ -4708,10 +4692,10 @@ D03E0024 D03E0028 389F0055 38BD0053 38C00000 C03F0020 48000129 48000038 -807D000D 48000245 +807D000D 4800022D 387F0010 389F0044 C03F001C 4800010D -807D0011 4800022D +807D0011 48000215 387F0014 389F004B C03F0020 480000F5 48000004 38600000 @@ -4743,43 +4727,40 @@ A0DD026A 38600000 618C6368 7D8903A6 4E800421 BA810008 800100B4 382100B0 -7C0803A6 480001A4 -7C0802A6 90010004 -9421FF50 BE810008 +7C0803A6 4800018C 7C0802A6 90010004 -9421FF10 BDC10008 -DBE10050 FFE00890 -7C761B78 7C942378 -7CB92B78 7CDA3378 -7CF83B78 7D174378 -93210008 9301000C -92E10010 C3DF0028 -C07F0040 7F43D378 -3D808000 618C55F4 -7D8903A6 4E800421 -EC630072 EFDE1828 -7FC3F378 389F0018 -7EC4B378 38A00000 -7E87A378 C03F0008 -FC40F890 FC60F090 -3D808000 618C56B4 -7D8903A6 4E800421 -39C00008 39E00000 -7C6E0A14 80E30000 -2C0F0000 4182000C -C07F003C EFFF182A -C09F0040 EFDE202A -7FC3F378 389F0018 -38A00000 C03F000C -FC40F890 FC60F090 -3D808000 618C56B4 -7D8903A6 4E800421 -39CE0004 39EF0001 -7C0FD000 4180FFAC -B9C10008 CBE10050 -800100F4 382100F0 -7C0803A6 BA810008 -800100B4 382100B0 +9421FF40 BE810008 +DBE100B0 DBC100B8 +FFE00890 7C761B78 +7C942378 7CB92B78 +7CDA3378 7CF83B78 +7D174378 93210008 +9301000C 92E10010 +C3DF0028 C07F0040 +7F43D378 3D808000 +618C55F4 7D8903A6 +4E800421 EC630072 +EFDE1828 7FC3F378 +389F0018 7EC4B378 +38A00000 7E87A378 +C03F0008 FC40F890 +FC60F090 3D808000 +618C56B4 7D8903A6 +4E800421 39C00008 +39E00000 7C6E0A14 +80E30000 2C0F0000 +4182000C C07F003C +EFFF182A C09F0040 +EFDE202A 7FC3F378 +389F0018 38A00000 +C03F000C FC40F890 +FC60F090 3D808000 +618C56B4 7D8903A6 +4E800421 39CE0004 +39EF0001 7C0FD000 +4180FFAC BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 9421FF50 BE810008 @@ -5618,15 +5599,15 @@ BA810008 800100B4 C20056B4 00000063 #Online/Static/SubtextFunctions.asm 2C050002 41820228 7C0802A6 90010004 -9421FEF8 BDC10008 -DBE10050 DBC10058 -DBA10060 DB810068 -DB610070 DB410078 +9421FF20 BE810008 +DBE100B0 DBC100B8 +DBA100C0 DB8100C8 +DB6100D0 DB4100D8 7C751B78 7C962378 7CB82B78 7CD93378 -90E100E0 910100E4 -912100E8 914100EC -916100F0 918100F4 +90E10038 9101003C +91210040 91410044 +91610048 9181004C FFE00890 FFC01090 FFA01890 FF602890 FF403090 2C180001 @@ -5641,7 +5622,7 @@ FC20F090 FC40E890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -808100E0 3D80803A +80810038 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 @@ -5654,15 +5635,15 @@ FC20F890 FC40F890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A100E0 80C100E4 -80E100E8 810100EC -812100F0 814100F4 +80A10038 80C1003C +80E10040 81010044 +81210048 8141004C 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -808100E0 FC20F090 +80810038 FC20F090 FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 @@ -5674,22 +5655,22 @@ FC20F890 FC40F890 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A100E0 -80C100E4 80E100E8 -810100EC 812100F0 -814100F4 3D80803A +7EE4BB78 80A10038 +80C1003C 80E10040 +81010044 81210048 +8141004C 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -B9C10008 CBE10050 -CBC10058 CBA10060 -CB810068 CB610070 -CB410078 8001010C -38210108 7C0803A6 +BA810008 CBE100B0 +CBC100B8 CBA100C0 +CB8100C8 CB6100D0 +CB4100D8 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF10 -BDC10008 DBE10050 -DBC10058 DBA10060 -DB810068 7C7D1B78 +90010004 9421FF30 +BE810008 DBE100B0 +DBC100B8 DBA100C0 +DB8100C8 7C7D1B78 7C9C2378 7CDB3378 FFC00890 FFA01090 FF801890 FFE02090 @@ -5708,10 +5689,10 @@ FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -B9C10008 CBE10050 -CBC10058 CBA10060 -CB810068 800100F4 -382100F0 7C0803A6 +BA810008 CBE100B0 +CBC100B8 CBA100C0 +CB8100C8 800100D4 +382100D0 7C0803A6 4E800020 4E800021 41100000 44160000 41A00000 00000000 From 378b9b37721953237d217f8f87d6db64a0358481 Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Mon, 29 Aug 2022 11:46:35 -0400 Subject: [PATCH 07/23] Update codeset --- Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 7887 -> 7887 bytes Data/Sys/GameSettings/GALE01r2.ini | 518 ++++++++++++------------ Data/Sys/GameSettings/GALJ01r2.ini | 518 ++++++++++++------------ 3 files changed, 518 insertions(+), 518 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index 94f39264c268076a20051450c152e0ec28f0e7a8..a50280aa13abcc7fa8826fbe04b1f7dfdf70a9e3 100644 GIT binary patch delta 27 icmX?ad){`#c|Jyw%@_E>nHfbUYY6QJa$X2M=LP_j4+;AK delta 27 icmX?ad){`#c|Jy&%@_E>nHgm!YY6QJa$X2M=LP_kHwqH~ diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 539865a9bb..054e15649c 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -2793,7 +2793,7 @@ C05F0040 FC011040 C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820EE4 480001F8 +40820EE8 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,7 +2930,7 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000A98 +7C0803A6 48000A9C 7C0802A6 90010004 9421FF50 BE810008 D0610038 7F83E378 @@ -2999,278 +2999,278 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800083D 887E000A -2C030000 4182001C -3B1E0015 7C791B78 -887C0018 38630001 -987C0018 48000014 -887E000B 2C030000 -418201BC 7C791B78 -887C0019 2C030009 -40810010 38600000 -987C0019 418201A0 -386000B7 3880007F -38A00040 3D808002 -618C37A8 7D8903A6 -4E800421 887C0017 -38630001 987C0017 -3860000D 3D808037 -618CF1E4 7D8903A6 -4E800421 7C771B78 -3880001C 3D808000 -618CC160 7D8903A6 -4E800421 38600014 -38800000 98770000 -98970001 7F23CB78 -98770002 887C0019 -98770003 38630001 -987C0019 887E000C -98770008 7F83E378 -90770009 38600004 -38800005 38A00080 -3D808039 618C01F0 +48000841 480001EC +887E000A 2C030000 +4182001C 3B1E0015 +7C791B78 887C0018 +38630001 987C0018 +48000014 887E000B +2C030000 418201BC +7C791B78 887C0019 +2C030009 40810010 +38600000 987C0019 +418201A0 386000B7 +3880007F 38A00040 +3D808002 618C37A8 7D8903A6 4E800421 -7C761B78 807C0004 -80630004 80630000 -3D808037 618C0E44 +887C0017 38630001 +987C0017 3860000D +3D808037 618CF1E4 7D8903A6 4E800421 -7C651B78 7EC3B378 -888DC1A9 3D808039 -618C0A70 7D8903A6 -4E800421 7EC3B378 -3C808039 60841070 -38A00003 38C00080 -3D808039 618C069C +7C771B78 3880001C +3D808000 618CC160 7D8903A6 4E800421 -80760028 809C0004 -80840004 38A00000 -3D808016 618C895C +38600014 38800000 +98770000 98970001 +7F23CB78 98770002 +887C0019 98770003 +38630001 987C0019 +887E000C 98770008 +7F83E378 90770009 +38600004 38800005 +38A00080 3D808039 +618C01F0 7D8903A6 +4E800421 7C761B78 +807C0004 80630004 +80630000 3D808037 +618C0E44 7D8903A6 +4E800421 7C651B78 +7EC3B378 888DC1A9 +3D808039 618C0A70 7D8903A6 4E800421 -80760028 C022AE28 -3D808036 618CF8BC +7EC3B378 3C808039 +60841070 38A00003 +38C00080 3D808039 +618C069C 7D8903A6 +4E800421 80760028 +809C0004 80840004 +38A00000 3D808016 +618C895C 7D8903A6 +4E800421 80760028 +C022AE28 3D808036 +618CF8BC 7D8903A6 +4E800421 886DAFE0 +2C030000 41820010 +C03D0014 80760028 +D0230038 7EC3B378 +38800004 3CA08037 +60A5F1B0 7EE6BB78 +3D808039 618C0B68 +7D8903A6 4E800421 +7EC3B378 480003F1 +7C8802A6 38A00004 +3D808038 618CFD54 7D8903A6 4E800421 -886DAFE0 2C030000 -41820010 C03D0014 -80760028 D0230038 -7EC3B378 38800004 -3CA08037 60A5F1B0 -7EE6BB78 3D808039 -618C0B68 7D8903A6 -4E800421 7EC3B378 -480003F1 7C8802A6 -38A00004 3D808038 -618CFD54 7D8903A6 -4E800421 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BD017C 38800009 -48000635 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BE00B0 3880000A -48000615 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BD0185 38800008 -480005F5 887E0000 -2C030004 41820034 -2C030005 41820020 -2C030000 4181000C -38BD0098 48000024 -38BD0197 38DD01BD -48000018 38BD0197 -38DD01C4 4800000C -38BD01A5 38DD01B2 -38800007 480005A9 -3B600001 7F64DB78 -38BD0098 48000599 -3B7B0002 2C1B0005 -4081FFEC 3880000C -38600000 7C7C21AE -38840001 2C04000E -4081FFF4 3B60000B -7F64DB78 38BD0098 -48000565 3B7B0001 -2C1B000E 4081FFEC -887E0000 2C030005 -408200A8 3B60000B -3B200000 3B000000 -3AE00000 3ADE016B -7EB6C8AE 56A00631 -41820010 3B390002 -3B180001 48000018 -2C150020 40820008 -7F37CB78 3B390001 -3B180001 2C150000 -41820018 2C18001E -41810008 4800002C -38800000 7C96B9AE -7F64DB78 7EC5B378 -480004E5 3B7B0001 -7ED6BA14 3AD60001 -3B200000 3B000000 -2C150000 41820020 -387E025C 7C96CA14 -7C041800 40800010 -2C1B000E 41810008 -4BFFFF78 4800015C -3B600001 886DB657 -7F64DB78 2C030000 -40820018 38BD00BE -4800048D 38600001 -987C000C 48000134 -38BD00D4 48000479 -3B7B0002 38600002 -987C000C 887E0001 -7F64DB78 2C030000 -40820080 886DAFA0 -2C030002 41800034 887E0000 2C030004 -40820028 886DAFC9 -2C030000 4082001C -886DAFCA 2C030000 -40820010 38BD00E7 -38DD0113 48000034 -38BD00E7 38DD00F9 +4182000C 38BD0098 +48000008 38BD017C +38800009 48000635 887E0000 2C030004 -41820020 38BD00E7 -38DD010C 886DAFA0 -2C030002 4180000C -38BD00E7 38DD0101 -480003ED 38600001 -987C000D 48000094 -38BD0120 480003D9 -3B7B0002 38600002 -987C000D 887E0000 -7F64DB78 2C030004 -4182005C 2C030003 -4182002C 38BD012A -38DD015A 896DAFA0 -2C0B0001 41820048 -2C0B0000 41820040 -38BD012A 38DD0163 -48000034 38BD013B -38DD015A 896DAFA0 -2C0B0001 41820020 -2C0B0000 41820018 -38BD013B 38DD0163 -4800000C 38BD014C -38DD015A 48000359 -38600001 987C000E -3B20000C 3B600002 -7C7CC8AE 2C030001 -40820044 A07C000F -3880000F 7C632396 -1C630003 386301D0 -7CBD1A14 7F64DB78 -4800031D 7F43D378 -7F64DB78 38BD0088 -3D80803A 618C74F0 -7D8903A6 4E800421 -48000044 2C030002 -40820030 7F64DB78 -38BD01D6 480002E9 +4182000C 38BD0098 +48000008 38BE00B0 +3880000A 48000615 +887E0000 2C030004 +4182000C 38BD0098 +48000008 38BD0185 +38800008 480005F5 +887E0000 2C030004 +41820034 2C030005 +41820020 2C030000 +4181000C 38BD0098 +48000024 38BD0197 +38DD01BD 48000018 +38BD0197 38DD01C4 +4800000C 38BD01A5 +38DD01B2 38800007 +480005A9 3B600001 +7F64DB78 38BD0098 +48000599 3B7B0002 +2C1B0005 4081FFEC +3880000C 38600000 +7C7C21AE 38840001 +2C04000E 4081FFF4 +3B60000B 7F64DB78 +38BD0098 48000565 +3B7B0001 2C1B000E +4081FFEC 887E0000 +2C030005 408200A8 +3B60000B 3B200000 +3B000000 3AE00000 +3ADE016B 7EB6C8AE +56A00631 41820010 +3B390002 3B180001 +48000018 2C150020 +40820008 7F37CB78 +3B390001 3B180001 +2C150000 41820018 +2C18001E 41810008 +4800002C 38800000 +7C96B9AE 7F64DB78 +7EC5B378 480004E5 +3B7B0001 7ED6BA14 +3AD60001 3B200000 +3B000000 2C150000 +41820020 387E025C +7C96CA14 7C041800 +40800010 2C1B000E +41810008 4BFFFF78 +4800015C 3B600001 +886DB657 7F64DB78 +2C030000 40820018 +38BD00BE 4800048D +38600001 987C000C +48000134 38BD00D4 +48000479 3B7B0002 +38600002 987C000C +887E0001 7F64DB78 +2C030000 40820080 +886DAFA0 2C030002 +41800034 887E0000 +2C030004 40820028 +886DAFC9 2C030000 +4082001C 886DAFCA +2C030000 40820010 +38BD00E7 38DD0113 +48000034 38BD00E7 +38DD00F9 887E0000 +2C030004 41820020 +38BD00E7 38DD010C +886DAFA0 2C030002 +4180000C 38BD00E7 +38DD0101 480003ED +38600001 987C000D +48000094 38BD0120 +480003D9 3B7B0002 +38600002 987C000D +887E0000 7F64DB78 +2C030004 4182005C +2C030003 4182002C +38BD012A 38DD015A +896DAFA0 2C0B0001 +41820048 2C0B0000 +41820040 38BD012A +38DD0163 48000034 +38BD013B 38DD015A +896DAFA0 2C0B0001 +41820020 2C0B0000 +41820018 38BD013B +38DD0163 4800000C +38BD014C 38DD015A +48000359 38600001 +987C000E 3B20000C +3B600002 7C7CC8AE +2C030001 40820044 +A07C000F 3880000F +7C632396 1C630003 +386301D0 7CBD1A14 +7F64DB78 4800031D 7F43D378 7F64DB78 -38BD0084 3D80803A +38BD0088 3D80803A 618C74F0 7D8903A6 -4E800421 48000010 -7F64DB78 38BD0098 -480002BD 3B7B0002 -3B390001 2C19000E -4081FF68 A07C000F -38630001 2C03001E -41800008 38600000 -B07C000F BA810008 -800100B4 382100B0 -7C0803A6 4E800020 -4E800021 7C6E1B78 -7C0802A6 90010004 -9421FF40 BE810008 -DBE100B0 DBC100B8 -4BFFF3B9 7FA802A6 -820E002C 8A300000 -8A500001 8A700002 -8A900003 82B00004 -8AF00008 83900009 -81EE0028 81EF0010 -7DE37B78 3D808037 -618C0928 7D8903A6 -4E800421 2C150000 -408200CC 7E83A378 -3D808000 618C55F4 +4E800421 48000044 +2C030002 40820030 +7F64DB78 38BD01D6 +480002E9 7F43D378 +7F64DB78 38BD0084 +3D80803A 618C74F0 +7D8903A6 4E800421 +48000010 7F64DB78 +38BD0098 480002BD +3B7B0002 3B390001 +2C19000E 4081FF68 +A07C000F 38630001 +2C03001E 41800008 +38600000 B07C000F +BA810008 800100B4 +382100B0 7C0803A6 +4E800020 4E800021 +7C6E1B78 7C0802A6 +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 4BFFF3B5 +7FA802A6 820E002C +8A300000 8A500001 +8A700002 8A900003 +82B00004 8AF00008 +83900009 81EE0028 +81EF0010 7DE37B78 +3D808037 618C0928 7D8903A6 4E800421 -C05D0018 C07D0008 -EC6100F2 EC421828 -D04F003C 2C120000 -4182009C 3A2000AA -9A300000 3A400001 -9A500001 7C962378 +2C150000 408200CC 7E83A378 3D808000 618C55F4 7D8903A6 -4E800421 C05D0030 +4E800421 C05D0018 C07D0008 EC6100F2 -EC42182A FFC01090 -806DC2DC 38800003 -9883000E C03D002C -886DAFE0 2C030000 -41820008 C03D0028 -38770001 7E649B78 -38A00002 38C00000 -C07D0034 C09D0038 -3D808000 618C56B4 -7D8903A6 4E800421 -90700004 806DC2DC -38800001 9883000E -48000004 887C0017 -2C03000D 41800028 -887C0019 7C03A000 -4080000C 2C140009 -408100B4 887C0019 -7C741850 2C03000D -418100A4 2C110000 -4082001C 2C120000 -4182FF2C 2C120001 -41820018 2C120002 -41820084 3A31FFFF -9A300000 480000D4 -3A400002 9A500001 -3A200014 9A300000 -806E0028 809C0004 -80840004 38A00001 -3D808016 618C895C -7D8903A6 4E800421 -806E0028 C022AE28 -3D808036 618CF8BC -7D8903A6 4E800421 -8075005C 3D808037 -618CF1B0 7D8903A6 -4E800421 7EA3AB78 -3D80803A 618C5CC4 -7D8903A6 4E800421 -48000060 7DC37378 -3D808039 618C0228 +EC421828 D04F003C +2C120000 4182009C +3A2000AA 9A300000 +3A400001 9A500001 +7C962378 7E83A378 +3D808000 618C55F4 7D8903A6 4E800421 -809C0000 88840003 -7C172000 40820010 -887C0018 3863FFFF -987C0018 887C0017 -3863FFFF 987C0017 -887C0019 7E84A378 -38840001 7C032000 -41820008 4800000C -38600000 987C0019 -BA810008 CBE100B0 -CBC100B8 800100C4 -382100C0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7F43D378 -3D80803A 618C70A0 +C05D0030 C07D0008 +EC6100F2 EC42182A +FFC01090 806DC2DC +38800003 9883000E +C03D002C 886DAFE0 +2C030000 41820008 +C03D0028 38770001 +7E649B78 38A00002 +38C00000 C07D0034 +C09D0038 3D808000 +618C56B4 7D8903A6 +4E800421 90700004 +806DC2DC 38800001 +9883000E 48000004 +887C0017 2C03000D +41800028 887C0019 +7C03A000 4080000C +2C140009 408100B4 +887C0019 7C741850 +2C03000D 418100A4 +2C110000 4082001C +2C120000 4182FF2C +2C120001 41820018 +2C120002 41820084 +3A31FFFF 9A300000 +480000D4 3A400002 +9A500001 3A200014 +9A300000 806E0028 +809C0004 80840004 +38A00001 3D808016 +618C895C 7D8903A6 +4E800421 806E0028 +C022AE28 3D808036 +618CF8BC 7D8903A6 +4E800421 8075005C +3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 80CDB638 -60000000 00000000 +7EA3AB78 3D80803A +618C5CC4 7D8903A6 +4E800421 48000060 +7DC37378 3D808039 +618C0228 7D8903A6 +4E800421 809C0000 +88840003 7C172000 +40820010 887C0018 +3863FFFF 987C0018 +887C0017 3863FFFF +987C0017 887C0019 +7E84A378 38840001 +7C032000 41820008 +4800000C 38600000 +987C0019 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 +7C0803A6 4E800020 +7C0802A6 90010004 +9421FF50 BE810008 +7F43D378 3D80803A +618C70A0 7D8903A6 +4E800421 BA810008 +800100B4 382100B0 +7C0803A6 4E800020 +80CDB638 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm 3C608048 80639D30 5463443E 2C030008 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index e8b250dba2..5bec0e983e 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -2793,7 +2793,7 @@ C05F0040 FC011040 C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820EE4 480001F8 +40820EE8 480001F8 4E800021 00000000 3DCCCCCD 404CCCCD 413CCCCD 3F4CCCCD @@ -2930,7 +2930,7 @@ C05D007C C07D0074 4800009D C07D0064 48000095 BA810008 800100B4 382100B0 -7C0803A6 48000A98 +7C0803A6 48000A9C 7C0802A6 90010004 9421FF50 BE810008 D0610038 7F83E378 @@ -2999,278 +2999,278 @@ BA810008 800100B4 48000018 38DD00A9 48000010 38DD00B0 48000008 38BD0176 -4800083D 887E000A -2C030000 4182001C -3B1E0015 7C791B78 -887C0018 38630001 -987C0018 48000014 -887E000B 2C030000 -418201BC 7C791B78 -887C0019 2C030009 -40810010 38600000 -987C0019 418201A0 -386000B7 3880007F -38A00040 3D808002 -618C37A8 7D8903A6 -4E800421 887C0017 -38630001 987C0017 -3860000D 3D808037 -618CF1E4 7D8903A6 -4E800421 7C771B78 -3880001C 3D808000 -618CC160 7D8903A6 -4E800421 38600014 -38800000 98770000 -98970001 7F23CB78 -98770002 887C0019 -98770003 38630001 -987C0019 887E000C -98770008 7F83E378 -90770009 38600004 -38800005 38A00080 -3D808039 618C01F0 +48000841 480001EC +887E000A 2C030000 +4182001C 3B1E0015 +7C791B78 887C0018 +38630001 987C0018 +48000014 887E000B +2C030000 418201BC +7C791B78 887C0019 +2C030009 40810010 +38600000 987C0019 +418201A0 386000B7 +3880007F 38A00040 +3D808002 618C37A8 7D8903A6 4E800421 -7C761B78 807C0004 -80630004 80630000 -3D808037 618C0E44 +887C0017 38630001 +987C0017 3860000D +3D808037 618CF1E4 7D8903A6 4E800421 -7C651B78 7EC3B378 -888DC1A9 3D808039 -618C0A70 7D8903A6 -4E800421 7EC3B378 -3C808039 60841070 -38A00003 38C00080 -3D808039 618C069C +7C771B78 3880001C +3D808000 618CC160 7D8903A6 4E800421 -80760028 809C0004 -80840004 38A00000 -3D808016 618C895C +38600014 38800000 +98770000 98970001 +7F23CB78 98770002 +887C0019 98770003 +38630001 987C0019 +887E000C 98770008 +7F83E378 90770009 +38600004 38800005 +38A00080 3D808039 +618C01F0 7D8903A6 +4E800421 7C761B78 +807C0004 80630004 +80630000 3D808037 +618C0E44 7D8903A6 +4E800421 7C651B78 +7EC3B378 888DC1A9 +3D808039 618C0A70 7D8903A6 4E800421 -80760028 C022AE28 -3D808036 618CF8BC +7EC3B378 3C808039 +60841070 38A00003 +38C00080 3D808039 +618C069C 7D8903A6 +4E800421 80760028 +809C0004 80840004 +38A00000 3D808016 +618C895C 7D8903A6 +4E800421 80760028 +C022AE28 3D808036 +618CF8BC 7D8903A6 +4E800421 886DAFE0 +2C030000 41820010 +C03D0014 80760028 +D0230038 7EC3B378 +38800004 3CA08037 +60A5F1B0 7EE6BB78 +3D808039 618C0B68 +7D8903A6 4E800421 +7EC3B378 480003F1 +7C8802A6 38A00004 +3D808038 618CFD54 7D8903A6 4E800421 -886DAFE0 2C030000 -41820010 C03D0014 -80760028 D0230038 -7EC3B378 38800004 -3CA08037 60A5F1B0 -7EE6BB78 3D808039 -618C0B68 7D8903A6 -4E800421 7EC3B378 -480003F1 7C8802A6 -38A00004 3D808038 -618CFD54 7D8903A6 -4E800421 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BD017C 38800009 -48000635 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BE00B0 3880000A -48000615 887E0000 -2C030004 4182000C -38BD0098 48000008 -38BD0185 38800008 -480005F5 887E0000 -2C030004 41820034 -2C030005 41820020 -2C030000 4181000C -38BD0098 48000024 -38BD0197 38DD01BD -48000018 38BD0197 -38DD01C4 4800000C -38BD01A5 38DD01B2 -38800007 480005A9 -3B600001 7F64DB78 -38BD0098 48000599 -3B7B0002 2C1B0005 -4081FFEC 3880000C -38600000 7C7C21AE -38840001 2C04000E -4081FFF4 3B60000B -7F64DB78 38BD0098 -48000565 3B7B0001 -2C1B000E 4081FFEC -887E0000 2C030005 -408200A8 3B60000B -3B200000 3B000000 -3AE00000 3ADE016B -7EB6C8AE 56A00631 -41820010 3B390002 -3B180001 48000018 -2C150020 40820008 -7F37CB78 3B390001 -3B180001 2C150000 -41820018 2C18001E -41810008 4800002C -38800000 7C96B9AE -7F64DB78 7EC5B378 -480004E5 3B7B0001 -7ED6BA14 3AD60001 -3B200000 3B000000 -2C150000 41820020 -387E025C 7C96CA14 -7C041800 40800010 -2C1B000E 41810008 -4BFFFF78 4800015C -3B600001 886DB657 -7F64DB78 2C030000 -40820018 38BD00BE -4800048D 38600001 -987C000C 48000134 -38BD00D4 48000479 -3B7B0002 38600002 -987C000C 887E0001 -7F64DB78 2C030000 -40820080 886DAFA0 -2C030002 41800034 887E0000 2C030004 -40820028 886DAFC9 -2C030000 4082001C -886DAFCA 2C030000 -40820010 38BD00E7 -38DD0113 48000034 -38BD00E7 38DD00F9 +4182000C 38BD0098 +48000008 38BD017C +38800009 48000635 887E0000 2C030004 -41820020 38BD00E7 -38DD010C 886DAFA0 -2C030002 4180000C -38BD00E7 38DD0101 -480003ED 38600001 -987C000D 48000094 -38BD0120 480003D9 -3B7B0002 38600002 -987C000D 887E0000 -7F64DB78 2C030004 -4182005C 2C030003 -4182002C 38BD012A -38DD015A 896DAFA0 -2C0B0001 41820048 -2C0B0000 41820040 -38BD012A 38DD0163 -48000034 38BD013B -38DD015A 896DAFA0 -2C0B0001 41820020 -2C0B0000 41820018 -38BD013B 38DD0163 -4800000C 38BD014C -38DD015A 48000359 -38600001 987C000E -3B20000C 3B600002 -7C7CC8AE 2C030001 -40820044 A07C000F -3880000F 7C632396 -1C630003 386301D0 -7CBD1A14 7F64DB78 -4800031D 7F43D378 -7F64DB78 38BD0088 -3D80803A 618C74F0 -7D8903A6 4E800421 -48000044 2C030002 -40820030 7F64DB78 -38BD01D6 480002E9 +4182000C 38BD0098 +48000008 38BE00B0 +3880000A 48000615 +887E0000 2C030004 +4182000C 38BD0098 +48000008 38BD0185 +38800008 480005F5 +887E0000 2C030004 +41820034 2C030005 +41820020 2C030000 +4181000C 38BD0098 +48000024 38BD0197 +38DD01BD 48000018 +38BD0197 38DD01C4 +4800000C 38BD01A5 +38DD01B2 38800007 +480005A9 3B600001 +7F64DB78 38BD0098 +48000599 3B7B0002 +2C1B0005 4081FFEC +3880000C 38600000 +7C7C21AE 38840001 +2C04000E 4081FFF4 +3B60000B 7F64DB78 +38BD0098 48000565 +3B7B0001 2C1B000E +4081FFEC 887E0000 +2C030005 408200A8 +3B60000B 3B200000 +3B000000 3AE00000 +3ADE016B 7EB6C8AE +56A00631 41820010 +3B390002 3B180001 +48000018 2C150020 +40820008 7F37CB78 +3B390001 3B180001 +2C150000 41820018 +2C18001E 41810008 +4800002C 38800000 +7C96B9AE 7F64DB78 +7EC5B378 480004E5 +3B7B0001 7ED6BA14 +3AD60001 3B200000 +3B000000 2C150000 +41820020 387E025C +7C96CA14 7C041800 +40800010 2C1B000E +41810008 4BFFFF78 +4800015C 3B600001 +886DB657 7F64DB78 +2C030000 40820018 +38BD00BE 4800048D +38600001 987C000C +48000134 38BD00D4 +48000479 3B7B0002 +38600002 987C000C +887E0001 7F64DB78 +2C030000 40820080 +886DAFA0 2C030002 +41800034 887E0000 +2C030004 40820028 +886DAFC9 2C030000 +4082001C 886DAFCA +2C030000 40820010 +38BD00E7 38DD0113 +48000034 38BD00E7 +38DD00F9 887E0000 +2C030004 41820020 +38BD00E7 38DD010C +886DAFA0 2C030002 +4180000C 38BD00E7 +38DD0101 480003ED +38600001 987C000D +48000094 38BD0120 +480003D9 3B7B0002 +38600002 987C000D +887E0000 7F64DB78 +2C030004 4182005C +2C030003 4182002C +38BD012A 38DD015A +896DAFA0 2C0B0001 +41820048 2C0B0000 +41820040 38BD012A +38DD0163 48000034 +38BD013B 38DD015A +896DAFA0 2C0B0001 +41820020 2C0B0000 +41820018 38BD013B +38DD0163 4800000C +38BD014C 38DD015A +48000359 38600001 +987C000E 3B20000C +3B600002 7C7CC8AE +2C030001 40820044 +A07C000F 3880000F +7C632396 1C630003 +386301D0 7CBD1A14 +7F64DB78 4800031D 7F43D378 7F64DB78 -38BD0084 3D80803A +38BD0088 3D80803A 618C74F0 7D8903A6 -4E800421 48000010 -7F64DB78 38BD0098 -480002BD 3B7B0002 -3B390001 2C19000E -4081FF68 A07C000F -38630001 2C03001E -41800008 38600000 -B07C000F BA810008 -800100B4 382100B0 -7C0803A6 4E800020 -4E800021 7C6E1B78 -7C0802A6 90010004 -9421FF40 BE810008 -DBE100B0 DBC100B8 -4BFFF3B9 7FA802A6 -820E002C 8A300000 -8A500001 8A700002 -8A900003 82B00004 -8AF00008 83900009 -81EE0028 81EF0010 -7DE37B78 3D808037 -618C0928 7D8903A6 -4E800421 2C150000 -408200CC 7E83A378 -3D808000 618C55F4 +4E800421 48000044 +2C030002 40820030 +7F64DB78 38BD01D6 +480002E9 7F43D378 +7F64DB78 38BD0084 +3D80803A 618C74F0 +7D8903A6 4E800421 +48000010 7F64DB78 +38BD0098 480002BD +3B7B0002 3B390001 +2C19000E 4081FF68 +A07C000F 38630001 +2C03001E 41800008 +38600000 B07C000F +BA810008 800100B4 +382100B0 7C0803A6 +4E800020 4E800021 +7C6E1B78 7C0802A6 +90010004 9421FF40 +BE810008 DBE100B0 +DBC100B8 4BFFF3B5 +7FA802A6 820E002C +8A300000 8A500001 +8A700002 8A900003 +82B00004 8AF00008 +83900009 81EE0028 +81EF0010 7DE37B78 +3D808037 618C0928 7D8903A6 4E800421 -C05D0018 C07D0008 -EC6100F2 EC421828 -D04F003C 2C120000 -4182009C 3A2000AA -9A300000 3A400001 -9A500001 7C962378 +2C150000 408200CC 7E83A378 3D808000 618C55F4 7D8903A6 -4E800421 C05D0030 +4E800421 C05D0018 C07D0008 EC6100F2 -EC42182A FFC01090 -806DC2DC 38800003 -9883000E C03D002C -886DAFE0 2C030000 -41820008 C03D0028 -38770001 7E649B78 -38A00002 38C00000 -C07D0034 C09D0038 -3D808000 618C56B4 -7D8903A6 4E800421 -90700004 806DC2DC -38800001 9883000E -48000004 887C0017 -2C03000D 41800028 -887C0019 7C03A000 -4080000C 2C140009 -408100B4 887C0019 -7C741850 2C03000D -418100A4 2C110000 -4082001C 2C120000 -4182FF2C 2C120001 -41820018 2C120002 -41820084 3A31FFFF -9A300000 480000D4 -3A400002 9A500001 -3A200014 9A300000 -806E0028 809C0004 -80840004 38A00001 -3D808016 618C895C -7D8903A6 4E800421 -806E0028 C022AE28 -3D808036 618CF8BC -7D8903A6 4E800421 -8075005C 3D808037 -618CF1B0 7D8903A6 -4E800421 7EA3AB78 -3D80803A 618C5CC4 -7D8903A6 4E800421 -48000060 7DC37378 -3D808039 618C0228 +EC421828 D04F003C +2C120000 4182009C +3A2000AA 9A300000 +3A400001 9A500001 +7C962378 7E83A378 +3D808000 618C55F4 7D8903A6 4E800421 -809C0000 88840003 -7C172000 40820010 -887C0018 3863FFFF -987C0018 887C0017 -3863FFFF 987C0017 -887C0019 7E84A378 -38840001 7C032000 -41820008 4800000C -38600000 987C0019 -BA810008 CBE100B0 -CBC100B8 800100C4 -382100C0 7C0803A6 -4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7F43D378 -3D80803A 618C70A0 +C05D0030 C07D0008 +EC6100F2 EC42182A +FFC01090 806DC2DC +38800003 9883000E +C03D002C 886DAFE0 +2C030000 41820008 +C03D0028 38770001 +7E649B78 38A00002 +38C00000 C07D0034 +C09D0038 3D808000 +618C56B4 7D8903A6 +4E800421 90700004 +806DC2DC 38800001 +9883000E 48000004 +887C0017 2C03000D +41800028 887C0019 +7C03A000 4080000C +2C140009 408100B4 +887C0019 7C741850 +2C03000D 418100A4 +2C110000 4082001C +2C120000 4182FF2C +2C120001 41820018 +2C120002 41820084 +3A31FFFF 9A300000 +480000D4 3A400002 +9A500001 3A200014 +9A300000 806E0028 +809C0004 80840004 +38A00001 3D808016 +618C895C 7D8903A6 +4E800421 806E0028 +C022AE28 3D808036 +618CF8BC 7D8903A6 +4E800421 8075005C +3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 80CDB638 -60000000 00000000 +7EA3AB78 3D80803A +618C5CC4 7D8903A6 +4E800421 48000060 +7DC37378 3D808039 +618C0228 7D8903A6 +4E800421 809C0000 +88840003 7C172000 +40820010 887C0018 +3863FFFF 987C0018 +887C0017 3863FFFF +987C0017 887C0019 +7E84A378 38840001 +7C032000 41820008 +4800000C 38600000 +987C0019 BA810008 +CBE100B0 CBC100B8 +800100C4 382100C0 +7C0803A6 4E800020 +7C0802A6 90010004 +9421FF50 BE810008 +7F43D378 3D80803A +618C70A0 7D8903A6 +4E800421 BA810008 +800100B4 382100B0 +7C0803A6 4E800020 +80CDB638 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm 3C608048 80639D30 5463443E 2C030008 From 51ee7b17247de4e6a7faed4d212002193414b979 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Mon, 29 Aug 2022 19:00:28 -0400 Subject: [PATCH 08/23] chore: update asm and c codesets https://github.com/project-slippi/slippi-ssbm-asm/pull/106 --- Data/Sys/GameFiles/GALE01/GameSetup.dat | Bin 27467 -> 26739 bytes Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 7887 -> 7327 bytes Data/Sys/GameSettings/GALE01r2.ini | 1420 ++++++++++++----------- Data/Sys/GameSettings/GALJ01r2.ini | 1420 ++++++++++++----------- 4 files changed, 1426 insertions(+), 1414 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/GameSetup.dat b/Data/Sys/GameFiles/GALE01/GameSetup.dat index 29dee4011d75df74d5ce301ac39dd435cd2d722f..fdf81437e0217f85d451d7fffd82863fccf68684 100644 GIT binary patch literal 26739 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 hQSY1S8!`L*Ta+}ZD<6YCgBK$U+V;?Gnuk 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 literal 7887 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 GameCube C206A880 0000001B #Online/Core/BrawlOffscreenDamage.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030120 41820094 887F221F @@ -1111,8 +1099,8 @@ FC020840 41810028 C05F00B4 FC020840 4180000C 38600000 48000008 38600001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C22F7094 0000000F #Online/Core/CustomizeMessageLRAS.asm 3CE08048 80E79D30 @@ -1175,22 +1163,22 @@ C234DED8 0000000F #Online/Core/HandleRumble.asm 80639D30 5463443E 2C030208 4082005C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83EDB61C 887F0000 7C03E800 41820024 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808034 618CDF44 7D8903A6 4E800420 -887F0002 BA810008 -800100B4 382100B0 +887F0002 BA8100B0 +800100E4 382100E0 7C0803A6 7C7D1B78 60000000 00000000 C216E748 0000009E #Online/Core/InitOnlinePlay.asm 3D808022 618C54B8 7D8903A6 4E800421 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030208 408204A8 38600B2E @@ -1283,8 +1271,8 @@ C216E748 0000009E #Online/Core/InitOnlinePlay.asm 7C841A14 3C60804D 90835F90 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 838DB61C +90010004 9421FF20 +BE8100B0 838DB61C 3CA0803D 60A5AD40 80A50000 83650088 3F408047 635A9DA4 @@ -1339,11 +1327,11 @@ BE810008 838DB61C 7FC3F378 38800171 38A00001 3D808000 618C55F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C216E904 0000004C #Online/Core/InitPause.asm 3C608048 80639D30 @@ -1359,7 +1347,7 @@ C216E904 0000004C #Online/Core/InitPause.asm 50831F38 986C0002 48000200 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83ADB61C 3BC00000 7FC3F378 3D808003 618C241C 7D8903A6 @@ -1418,8 +1406,8 @@ C216E904 0000004C #Online/Core/InitPause.asm 38600005 3D808002 618C4030 7D8903A6 4E800421 48000004 -3860FFFF BA810008 -800100B4 382100B0 +3860FFFF BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm @@ -1431,8 +1419,8 @@ C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 3C608047 60639D64 80630000 2C030000 408202A4 7C0802A6 -90010004 9421FF50 -BE810008 3D808034 +90010004 9421FF20 +BE8100B0 3D808034 618C7364 7D8903A6 4E800421 7C7D1B78 83EDB61C 3BDF03A7 @@ -1477,21 +1465,21 @@ A0840001 7C032000 987F00DE 987F08FE 7FA3EB78 3D808034 618C738C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 3B5A0001 3D80801A 618C5024 7D8903A6 4E800420 7FA3EB78 3D808034 618C738C 7D8903A6 4E800421 48000029 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3B5A0001 3D80801A 618C4DE4 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 3D808003 +90010004 9421FF20 +BE8100B0 3D808003 618C0A50 7D8903A6 4E800421 3D808002 618CA4AC 7D8903A6 @@ -1507,13 +1495,13 @@ BE810008 3D808003 3D808008 618C6A8C 7D8903A6 4E800421 82940008 2C140000 -4082FFD4 BA810008 -800100B4 382100B0 +4082FFD4 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7FA3EB78 3D808034 618C738C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 00000000 C216D26C 00000003 #Online/Core/PauseCounter.asm 808DB61C 80640915 @@ -1561,7 +1549,7 @@ CDFFB800 FF444553 594E4320 44455445 43544544 00000000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08045 63FF3080 3FA08045 63BD5C30 3BC00000 7FC3F378 @@ -1569,8 +1557,8 @@ CDFFB800 FF444553 809F00B4 4800002D 7C7E1B78 3BFF0E90 7C1FE800 4081FFE0 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 2C040000 41820030 80A4002C 80850010 @@ -1580,7 +1568,7 @@ CDFFB800 FF444553 7C632278 80850008 7C632278 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 4BFFFF11 7FE802A6 7FFF2214 C03F0000 C05F0004 @@ -1595,8 +1583,8 @@ C05F0008 3D80803A 7FC4F378 38BF000C 3D80803A 618C74F0 7D8903A6 4E800421 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 886DAFA0 2C030000 40820028 818DB61C @@ -1605,8 +1593,8 @@ C05F0008 3D80803A 38800007 98830008 38800037 988324D5 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3C608048 +90010004 9421FF20 +BE8100B0 3C608048 80639D30 5463443E 2C030208 408203CC 3C608047 60639D64 @@ -1730,251 +1718,252 @@ BE810008 3C608048 4E800421 7F23CB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 -C2376A28 000000F1 #Online/Core/TriggerSendInput.asm +C2376A28 000000F2 #Online/Core/TriggerSendInput.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030208 -40820750 3C608047 +40820754 3C608047 60639D64 80630000 -2C030000 4082073C -836DB61C 833B00D6 -831B00DA 82FB039F -835B0003 889B0002 -1C84000C 386400DC -7FA11A14 887B00DE -2C030000 41820010 -887B00DF 2C030000 -4182067C 887B0020 -38800054 7C632050 -2C1A0003 4080001C -386100DC 38800030 -3D808000 618CC160 +2C030000 40820740 +83C10000 836DB61C +833B00D6 831B00DA +82FB039F 835B0003 +889B0002 1C84000C +3864002C 7FBE1A14 +887B00DE 2C030000 +41820010 887B00DF +2C030000 4182067C +887B0020 38800054 +7C632050 2C1A0003 +4080001C 387E002C +38800030 3D808000 +618CC160 7D8903A6 +4E800421 48000040 +88830000 7C840774 +2C04FFFE 4180002C +2C040002 41810024 +88830001 7C840774 +2C04FFFE 41800014 +2C040002 4181000C +38800000 B0830000 +4E800020 387D0002 +4BFFFFC1 387D0004 +4BFFFFB9 887D000A +7C630774 2C03FFFD +40820020 7FA3EB78 +389B0014 38A0000C +3D808000 618C31F4 7D8903A6 4E800421 -48000040 88830000 -7C840774 2C04FFFE -4180002C 2C040002 -41810024 88830001 -7C840774 2C04FFFE -41800014 2C040002 -4181000C 38800000 -B0830000 4E800020 -387D0002 4BFFFFC1 -387D0004 4BFFFFB9 -887D000A 7C630774 -2C03FFFD 40820020 -7FA3EB78 389B0014 +387B0014 7FA4EB78 38A0000C 3D808000 618C31F4 7D8903A6 -4E800421 387B0014 -7FA4EB78 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -386000B0 98790000 -93590001 807B0908 -90790005 819B0908 -39600000 1C6B0018 -38630926 7D5B1A14 -806A0000 7C036000 -40820010 806A0004 -90790009 48000010 -396B0001 2C0B0015 -4180FFD4 887B0020 -9879000D 3879000E -7FA4EB78 38A0000C -3D808000 618C31F4 +4E800421 386000B0 +98790000 93590001 +807B0908 90790005 +819B0908 39600000 +1C6B0018 38630926 +7D5B1A14 806A0000 +7C036000 40820010 +806A0004 90790009 +48000010 396B0001 +2C0B0015 4180FFD4 +887B0020 9879000D +3879000E 7FA4EB78 +38A0000C 3D808000 +618C31F4 7D8903A6 +4E800421 7F23CB78 +3880001A 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -7F23CB78 3880001A -38A00001 3D808000 +38780000 38800126 +38A00000 3D808000 618C55F0 7D8903A6 -4E800421 38780000 -38800126 38A00000 -3D808000 618C55F0 +4E800421 38600000 +987B0013 88780000 +2C030002 41820024 +2C030003 41820010 +2C030004 41820040 +48000044 38600001 +987B0010 48000038 +887B000F 2C030001 +4182002C BA8100B0 +800100E4 382100E0 +7C0803A6 3D808037 +618C6CEC 7D8903A6 +4E800420 38600001 +987B0013 889B0021 +1C84000C 38840022 +887B0000 1C63000C +3863002C 7C7E1A14 +7C9B2214 38A0000C +3D808000 618C31F4 7D8903A6 4E800421 -38600000 987B0013 -88780000 2C030002 -41820024 2C030003 -41820010 2C030004 -41820040 48000044 -38600001 987B0010 -48000038 887B000F -2C030001 4182002C -BA810008 800100B4 -382100B0 7C0803A6 -3D808037 618C6CEC -7D8903A6 4E800420 -38600001 987B0013 -889B0021 1C84000C -38840022 887B0000 -1C63000C 386300DC -7C611A14 7C9B2214 +887B00E4 1C63000C +386300E5 889B0000 +1C84000C 3884002C +7C7B1A14 7C9E2214 38A0000C 3D808000 618C31F4 7D8903A6 4E800421 887B00E4 -1C63000C 386300E5 -889B0000 1C84000C -388400DC 7C7B1A14 -7C812214 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -887B00E4 38630001 -2C03000E 41800008 -38600000 987B00E4 -887B0021 1C63000C -38630022 7C7B1A14 -3899000E 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -889B0020 887B0021 -38630001 7C032000 +38630001 2C03000E 41800008 38600000 -987B0021 8B9B00DE -887B038B 2C030000 -40820018 38600000 -987B039C 987B039D -987B039E 48000264 -3A800000 38D4039C -7C66D8AE 2C030001 -4082016C 1CD40004 -38C6001A 7C66C02E -1CD40004 38C60390 -7C86D82E 7EC41851 -4180014C 80DB0908 -7C043000 41810010 -7C032000 418100AC -48000134 1C76000C -3863002A 1CD40054 -7C633214 38D4018D -7C86D8AE 1C84000C -38840193 1CB400A8 -7C842A14 7CD81A14 -7CFB2214 88660000 -88870000 546306FE -548406FE 7C032000 -408200AC 88660001 -88870001 5463067E -5484067E 7C032000 -40820094 80660002 -80870002 7C032000 -40820084 38A00005 -38A50001 2C050008 -40800028 7C6530AE -7C8538AE 2C03002A -4181000C 2C04002A -4081FFE0 7C032000 -40820054 4BFFFFD4 -1CD40004 38C60390 -7C66D82E 38630001 -7C66D92E 38D4018D -7C66D8AE 38630001 -2C03000E 41800008 -3863FFF2 7C66D9AE -38D4018D 7C66D8AE -38D40190 7C86D8AE -7C041800 4082FED0 -48000044 3B800001 -4800003C 38600001 -987B00DE 987B00DF -935B00E0 3B5A0001 -935B0003 BA810008 -800100B4 382100B0 -7C0803A6 3D808037 -618C6CEC 7D8903A6 -4E800420 3A940001 -2C140003 4180FE80 -39600000 3A800000 -82BB0908 38D4039C -7C86D8AE 2C040001 -40820028 1CD40004 +987B00E4 887B0021 +1C63000C 38630022 +7C7B1A14 3899000E +38A0000C 3D808000 +618C31F4 7D8903A6 +4E800421 889B0020 +887B0021 38630001 +7C032000 41800008 +38600000 987B0021 +8B9B00DE 887B038B +2C030000 40820018 +38600000 987B039C +987B039D 987B039E +48000264 3A800000 +38D4039C 7C66D8AE +2C030001 4082016C +1CD40004 38C6001A +7C66C02E 1CD40004 38C60390 7C86D82E -2C0B0000 4182000C -7C04A800 40800008 -7C952378 39600001 +7EC41851 4180014C +80DB0908 7C043000 +41810010 7C032000 +418100AC 48000134 +1C76000C 3863002A +1CD40054 7C633214 +38D4018D 7C86D8AE +1C84000C 38840193 +1CB400A8 7C842A14 +7CD81A14 7CFB2214 +88660000 88870000 +546306FE 548406FE +7C032000 408200AC +88660001 88870001 +5463067E 5484067E +7C032000 40820094 +80660002 80870002 +7C032000 40820084 +38A00005 38A50001 +2C050008 40800028 +7C6530AE 7C8538AE +2C03002A 4181000C +2C04002A 4081FFE0 +7C032000 40820054 +4BFFFFD4 1CD40004 +38C60390 7C66D82E +38630001 7C66D92E +38D4018D 7C66D8AE +38630001 2C03000E +41800008 3863FFF2 +7C66D9AE 38D4018D +7C66D8AE 38D40190 +7C86D8AE 7C041800 +4082FED0 48000044 +3B800001 4800003C +38600001 987B00DE +987B00DF 935B00E0 +3B5A0001 935B0003 +BA8100B0 800100E4 +382100E0 7C0803A6 +3D808037 618C6CEC +7D8903A6 4E800420 3A940001 2C140003 -4180FFC4 92BB038C -92BB0919 80D80026 -7C153000 40810008 -90DB0919 2C1C0000 -4082FF54 3A800000 +4180FE80 39600000 +3A800000 82BB0908 38D4039C 7C86D8AE 2C040001 40820028 -38D4018D 7C66D8AE -38D40190 7C86D8AE -7C041800 40820010 -38600000 38D4039C -7C66D9AE 3A940001 +1CD40004 38C60390 +7C86D82E 2C0B0000 +4182000C 7C04A800 +40800008 7C952378 +39600001 3A940001 2C140003 4180FFC4 +92BB038C 92BB0919 +80D80026 7C153000 +40810008 90DB0919 +2C1C0000 4082FF54 3A800000 38D4039C 7C86D8AE 2C040001 -41820018 3A940001 -2C140003 4180FFE8 -38600000 987B038B -3A800000 3AA00000 -3B800001 887B0000 -7C151800 40820008 -3AB50001 1CD40004 -38C6001A 7C66C02E -7C7A1850 2C030000 -408000D8 887B0020 -38800054 7C632050 -7C1A1800 418000C0 -887B000F 2C030001 -418200B4 3B800000 -38D40190 7EC6D8AE -1C76000C 38630193 -1CB400A8 7C632A14 -1CD40054 38C6002A -7C7B1A14 7C983214 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 38760001 -2C03000E 41800008 -3863FFF2 38D40190 -7C66D9AE 38D4018D +40820028 38D4018D 7C66D8AE 38D40190 -7C86D8AE 38D4039C -7C66D8AE 2C030001 -4182003C 1CD40004 -38C60390 7F46D92E -38600001 38D4039C -7C66D9AE 38D4018D -7EC6D9AE 887B038B -2C030001 41820010 -935B038C 38600001 -987B038B 38600000 -1C63000C 38A3002A -1CD40054 7CA53214 -1C75000C 386300DC -7C611A14 7C982A14 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 3A940001 -3AB50001 2C140003 -4180FEC4 2C1C0000 -41820008 935B0919 -48000080 807B00E0 -7C1A1800 40810024 -BA810008 800100B4 -382100B0 7C0803A6 -3D808037 618C6CEC -7D8903A6 4E800420 -807B00E0 7C7A1850 -38630001 889B00E4 -7C632051 40800008 -3863000E 1C63000C -388300E5 887B0000 -1C63000C 386300DC -7C611A14 7C9B2214 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 4BFFFE2C -3B5A0001 935B0003 -BA810008 800100B4 -382100B0 7C0803A6 -2C1E0000 00000000 +7C86D8AE 7C041800 +40820010 38600000 +38D4039C 7C66D9AE +3A940001 2C140003 +4180FFC4 3A800000 +38D4039C 7C86D8AE +2C040001 41820018 +3A940001 2C140003 +4180FFE8 38600000 +987B038B 3A800000 +3AA00000 3B800001 +887B0000 7C151800 +40820008 3AB50001 +1CD40004 38C6001A +7C66C02E 7C7A1850 +2C030000 408000D8 +887B0020 38800054 +7C632050 7C1A1800 +418000C0 887B000F +2C030001 418200B4 +3B800000 38D40190 +7EC6D8AE 1C76000C +38630193 1CB400A8 +7C632A14 1CD40054 +38C6002A 7C7B1A14 +7C983214 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +38760001 2C03000E +41800008 3863FFF2 +38D40190 7C66D9AE +38D4018D 7C66D8AE +38D40190 7C86D8AE +38D4039C 7C66D8AE +2C030001 4182003C +1CD40004 38C60390 +7F46D92E 38600001 +38D4039C 7C66D9AE +38D4018D 7EC6D9AE +887B038B 2C030001 +41820010 935B038C +38600001 987B038B +38600000 1C63000C +38A3002A 1CD40054 +7CA53214 1C75000C +3863002C 7C7E1A14 +7C982A14 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +3A940001 3AB50001 +2C140003 4180FEC4 +2C1C0000 41820008 +935B0919 48000080 +807B00E0 7C1A1800 +40810024 BA8100B0 +800100E4 382100E0 +7C0803A6 3D808037 +618C6CEC 7D8903A6 +4E800420 807B00E0 +7C7A1850 38630001 +889B00E4 7C632051 +40800008 3863000E +1C63000C 388300E5 +887B0000 1C63000C +3863002C 7C7E1A14 +7C9B2214 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +4BFFFE2C 3B5A0001 +935B0003 BA8100B0 +800100E4 382100E0 +7C0803A6 2C1E0000 +60000000 00000000 C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm 38600080 3D808037 618CF1E4 7D8903A6 @@ -1982,11 +1971,11 @@ C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm 38000000 00000000 C20163FC 0000001B #Online/Core/EXIFileLoad/GetFileSize.asm 7C7E1B78 7C0802A6 -90010004 9421FF50 -BE810008 83EDAFC4 +90010004 9421FF20 +BE8100B0 83EDAFC4 2C1F0000 40820018 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 480000A0 386000D1 987F0000 387F0001 7FC4F378 3D808032 @@ -2001,8 +1990,8 @@ BA810008 800100B4 38800004 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 80630000 2C030000 40810014 3D808001 618C6488 @@ -2010,8 +1999,8 @@ BA810008 800100B4 7FC3F378 00000000 C20166B8 00000029 #Online/Core/EXIFileLoad/TransferFile.asm 7C7E1B78 7C0802A6 -90010004 9421FF50 -BE810008 83EDAFC4 +90010004 9421FF20 +BE8100B0 83EDAFC4 2C1F0000 41820110 386000D1 987F0000 387F0001 7FC4F378 @@ -2042,12 +2031,12 @@ BE810008 83EDAFC4 7FA4EB78 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 38600001 3D808001 618C674C 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 7FC3F378 60000000 00000000 C20D4C1C 00000005 #Online/Core/FreezeDeadUpFallPhysics/InitHitVelocity.asm @@ -2070,7 +2059,7 @@ D03F2364 3D80800D 4E800420 00000000 C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808003 618C10B8 7D8903A6 4E800421 3D808036 618C9808 @@ -2081,8 +2070,8 @@ C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm 80610080 907F0038 80610084 907F003C 80610088 907F0040 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808008 618C0EE4 7D8903A6 4E800420 60000000 00000000 @@ -2101,15 +2090,15 @@ C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm 25640A00 00000000 C23A63A8 0000000C #Online/Core/Hacks/LoadPremadeTextDataFromDolphin.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C9D2378 7CDC3378 886DAFEC 2C030000 41820024 7FA3EB78 7F84E378 3D808000 618C56A4 7D8903A6 4E800421 7C7E1B78 -93DF005C BA810008 -800100B4 382100B0 +93DF005C BA8100B0 +800100E4 382100E0 7C0803A6 38600000 986DAFEC 00000000 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm @@ -2142,8 +2131,8 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm 3C608047 60639D64 80630000 2C030000 40820090 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BDF03A7 8B9E0000 3C608048 80639D60 809F08F6 7C032000 @@ -2157,15 +2146,15 @@ BE810008 83EDB61C 3863FFFF 1C630006 38A60001 7CA51A14 807D000C 90650002 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm 3C608048 80639D30 5463443E 2C030208 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BBF03A7 57DE043E 8B9D0000 3C608048 80639D60 809F08F6 @@ -2182,20 +2171,20 @@ BE810008 83EDB61C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C8244 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm 3C608048 80639D30 5463443E 2C030208 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BBF03A7 57DE043E 8B9D0000 3C608048 80639D60 809F08F6 @@ -2212,12 +2201,12 @@ BE810008 83EDB61C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C82D0 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm @@ -2227,7 +2216,7 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm 60639D64 80630000 2C030000 40820120 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83EDB61C 3BDF03A7 3BA00000 3B400000 56FB043E 8B9E0000 @@ -2255,12 +2244,12 @@ A0650000 7C1B1800 93450002 88660000 38630001 98660000 2C1D0000 41820028 -7F43D378 BA810008 -800100B4 382100B0 +7F43D378 BA8100B0 +800100E4 382100E0 7C0803A6 3D808038 618CD2A0 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 2C1A0000 60000000 00000000 C216BE28 0000000A #Online/Core/Teams/PreventDeadStranding.asm @@ -2301,8 +2290,8 @@ C2263258 00000169 #Online/Menus/CSS/HandleInputsOnCSS.asm 41A20014 3D808026 618C3334 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 3C608048 +90010004 9421FF20 +BE8100B0 3C608048 80639D30 5463443E 2C030008 40820AFC 7CFB3B78 3F008000 @@ -2383,14 +2372,14 @@ BE810008 3C608048 7C6802A6 906DAFE8 48000878 887A0001 889A0002 7C632039 -41820868 BA810008 -800100B4 382100B0 +41820868 BA8100B0 +800100E4 382100E0 7C0803A6 3D808026 618C3264 7D8903A6 4E800420 576006F7 4082024D 4800083C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600014 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 @@ -2407,12 +2396,12 @@ BE810008 3C608048 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 38600009 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 @@ -2443,27 +2432,27 @@ BE810008 7C7F1B78 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 8A98001A +90010004 9421FF20 +BE8100B0 8A98001A 4BFFFECD 4BFFFE1D -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 38600001 +90010004 9421FF20 +BE8100B0 38600001 986DAFA3 4BFFFFB5 7C6802A6 906DAFE8 880DB650 980DB659 38000004 980DB656 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 38600001 +90010004 9421FF20 +BE8100B0 38600001 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 386000BA @@ -2473,11 +2462,11 @@ BE810008 38600001 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 2C1B0200 40820008 B3780015 2C1B0001 4182001C 2C1B0002 @@ -2486,12 +2475,12 @@ B3780015 2C1B0001 4082001D B3780015 88780014 2C030000 4082000C 7F63DB78 -480000B9 BA810008 -800100B4 382100B0 +480000B9 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 38600002 +90010004 9421FF20 +BE8100B0 38600002 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 386000BB @@ -2506,12 +2495,12 @@ BE810008 38600002 3880007F 38A00040 3D808002 618C37A8 7D8903A6 4E800421 -7F63DB78 BA810008 -800100B4 382100B0 +7F63DB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 48000419 +90010004 9421FF20 +BE8100B0 48000419 7DE802A6 38600002 3D808002 618C4030 7D8903A6 4E800421 @@ -2552,12 +2541,12 @@ D043003C 7E83A378 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 820E002C +90010004 9421FF20 +BE8100B0 820E002C 82EE0028 8A300000 8A500002 82700003 82B00007 A2D50015 @@ -2640,8 +2629,8 @@ C02F001C 3D808000 4E800421 7E639B78 3D80803A 618C5CC4 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 00000000 3DCCCCCD C3960000 C3E20000 @@ -2652,12 +2641,12 @@ C20C0000 C1840000 FFFFFFFF FFEA2FFF C9C387FF 43686174 3A202573 00000000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808026 618C3334 7D8903A6 4E800420 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm 3C608048 80639D30 @@ -2680,8 +2669,8 @@ C1AAE148 3FE3D70A C1823D71 C15BAE14 81692081 6A005300 5A000000 7C0802A6 -90010004 9421FF50 -BE810008 38600004 +90010004 9421FF20 +BE8100B0 38600004 38800005 38A00080 3D808039 618C01F0 7D8903A6 4E800421 @@ -2701,8 +2690,8 @@ C03F0008 D03E0024 D03E0028 3860004A C03F0010 48000025 3860004C C03F0014 -48000019 BA810008 -800100B4 382100B0 +48000019 BA8100B0 +800100E4 382100E0 7C0803A6 480002A4 7EE802A6 7C7A1B78 FC600890 C03F000C @@ -2724,8 +2713,8 @@ C03F001C C05F001C 7D8903A6 4E800421 7EE803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFE3D +90010004 9421FF20 +BE8100B0 4BFFFE3D 7FE802A6 83DF0000 3C608043 6063208F 88630000 2C030012 @@ -2785,8 +2774,8 @@ C05F0040 FC011040 7FC3F378 38990001 7F05C378 3D80803A 618C74F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 38600000 38980000 60000000 00000000 @@ -2857,8 +2846,8 @@ FF0000FF 00556E72 4E800021 C2E00000 41A00000 00000000 3DCCCCCD 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFDFD +90010004 9421FF20 +BE8100B0 4BFFFDFD 7FA802A6 3C60804D 606350D8 3C800200 60840801 90830000 @@ -2928,12 +2917,12 @@ C05D007C C07D0074 480000AD C07D005C 480000A5 C07D0060 4800009D C07D0064 -48000095 BA810008 -800100B4 382100B0 +48000095 BA8100B0 +800100E4 382100E0 7C0803A6 48000A9C 7C0802A6 90010004 -9421FF50 BE810008 -D0610038 7F83E378 +9421FF20 BE8100B0 +D0610008 7F83E378 389D0090 38A00000 C03D0068 C05D0048 38FD0098 3D808000 @@ -2941,24 +2930,24 @@ C03D0068 C05D0048 4E800421 7F83E378 389D0090 38A00000 C03D0080 C05D003C -C0610038 38FD0098 +C0610008 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7F83E378 +90010004 9421FF20 +BE8100B0 7F83E378 389D0094 38A00000 C03D0068 C05D003C 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 7C7B1B78 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 8363002C 4BFFFAD5 7FA802A6 3F808000 639C5614 839C0000 @@ -3181,12 +3170,12 @@ A07C000F 3880000F A07C000F 38630001 2C03001E 41800008 38600000 B07C000F -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 4BFFF3B5 7FA802A6 820E002C 8A300000 8A500001 @@ -3259,16 +3248,16 @@ C022AE28 3D808036 7E84A378 38840001 7C032000 41820008 4800000C 38600000 -987C0019 BA810008 +987C0019 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7F43D378 3D80803A 618C70A0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 80CDB638 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm @@ -3317,8 +3306,8 @@ C2E00000 41A00000 3C608048 80639D30 5463443E 2C030008 40820100 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFFB1 +90010004 9421FF20 +BE8100B0 4BFFFFB1 7FC802A6 3D808000 618C5618 7D8903A6 4E800421 7C6802A6 @@ -3346,8 +3335,8 @@ BE810008 4BFFFFB1 389E001B 3D808038 618C0358 7D8903A6 4E800421 907F0004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 @@ -3380,7 +3369,7 @@ B8610008 80010104 80630020 00000000 C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FC08000 63DE5614 83DE0000 3C608048 80639D30 5463443E @@ -3393,15 +3382,15 @@ C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm 7FE3FB78 3D808000 618C55F4 7D8903A6 4E800421 48000004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8061003C 38800006 38A00400 3CC08036 60C6410C 38E00001 60000000 00000000 C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3F808000 639C5614 839C0000 3C608048 80639D30 5463443E @@ -3410,8 +3399,8 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm 40820018 8B7C001A 2C1B0003 41820008 3B7BFFFF 9B7D0006 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 387C0000 00000000 C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 @@ -3425,7 +3414,7 @@ C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 40820560 888DAFA0 2C040003 40820554 7C0802A6 90010004 -9421FF40 BE810008 +9421FF40 BE810080 DBE100B0 DBC100B8 3FC08000 63DE5614 83DE0000 4BFFFF91 @@ -3498,12 +3487,12 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 480002E8 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C741B78 82B40028 886DB656 2C030000 40820098 3FC08000 @@ -3525,11 +3514,11 @@ FC013040 4181002C 1C630044 7C641A14 80630008 546305EF 41820008 48000019 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3D808000 +90010004 9421FF20 +BE8100B0 3D808000 618C56B8 7D8903A6 4E800421 7C651B78 38600000 1C630024 @@ -3543,11 +3532,11 @@ BE810008 3D808000 4800002D 38600002 3D808002 618C4030 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 808DB610 +90010004 9421FF20 +BE8100B0 808DB610 886DB650 1C630024 7F841A14 887C0070 7C7B1B78 8B3E001A @@ -3576,11 +3565,11 @@ BE810008 808DB610 7F05C378 38C00000 3D808000 618C56BC 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C791B78 +90010004 9421FF20 +BE8100B0 7C791B78 2C190003 4182001C 2C190002 4182000C 2C190001 41820014 @@ -3591,8 +3580,8 @@ BE810008 7C791B78 7C632A14 98830000 38600000 3D808025 618CDB34 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 38600000 38980000 3D80803A 618C6754 @@ -3600,7 +3589,7 @@ BE810008 7C791B78 60000000 00000000 C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08000 63FF5614 83FF0000 3C608048 80639D30 5463443E @@ -3623,8 +3612,8 @@ C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm 7C7B1B78 80ADB610 9B650073 3CA0803F 60A50E09 9B650000 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 9E9803C2 60000000 00000000 C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm @@ -3633,7 +3622,7 @@ C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm 60000000 00000000 C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08000 63FF5614 83FF0000 3C608048 80639D30 5463443E @@ -3654,13 +3643,13 @@ C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm 7F65DB78 38C00000 3D808000 618C56BC 7D8903A6 4E800421 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 38000000 60000000 00000000 C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C9D2378 7C7B1B78 3FE08000 63FF5614 83FF0000 3C608048 @@ -3679,8 +3668,8 @@ C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm 3D808000 618C56BC 7D8903A6 4E800421 48000004 7FA4EB78 -7F63DB78 BA810008 -800100B4 382100B0 +7F63DB78 BA8100B0 +800100E4 382100E0 7C0803A6 98830070 60000000 00000000 0423C710 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8Characters.asm @@ -3713,8 +3702,8 @@ C223CCA4 00000045 #Online/Menus/CSS/TextEntryScreen/CheckTriggersAndZ.asm 41820014 3D808023 618CCCAC 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 7C9A2378 +90010004 9421FF20 +BE8100B0 7C9A2378 4BFFFFC5 7C6802A6 83E30004 83DF0006 886DB56C 5463063E @@ -3736,12 +3725,12 @@ BE810008 7C9A2378 B07A0002 3D808023 618CCE4C 7D8903A6 4E800421 7F44D378 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808023 618CCCFC 7D8903A6 4E800420 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 886DAFA3 2C030000 418200C8 4BFFFEDD 7C6802A6 @@ -3768,11 +3757,11 @@ BA810008 800100B4 4E800421 807E001A 907F0000 3D808023 618CCE4C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 -7F44D378 BA810008 -800100B4 382100B0 +7F44D378 BA8100B0 +800100E4 382100E0 7C0803A6 3D808023 618CCD34 7D8903A6 4E800420 00000000 @@ -3805,7 +3794,7 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 41820128 38600001 986DAFCB 48000004 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608023 6063CCA4 80830000 5485863E 7CA50774 54A5801E @@ -3836,8 +3825,8 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 60841070 38A00004 38C00080 3D808039 618C069C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 48000004 38600000 00000000 C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm @@ -3878,8 +3867,8 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 418200D8 7C0802A6 -90010004 9421FF50 -BE810008 3C608023 +90010004 9421FF20 +BE8100B0 3C608023 6063CCA4 80830000 5485863E 7CA50774 54A5801E 5484043A @@ -3888,8 +3877,8 @@ BE810008 3C608023 2C030000 40820038 38600003 3D808002 618C4030 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 3D808023 618CCE38 7D8903A6 4E800420 887F0004 @@ -3900,8 +3889,8 @@ BE810008 3C608023 7D8903A6 4E800421 3860FFFE 818DAFE8 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 @@ -4004,16 +3993,16 @@ C22F6694 000000BD #Online/Menus/InGame/InitInGame.asm 44656C61 793A2025 64660000 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 880DB6CC 2C000001 41820018 7FE3FB78 3D808039 618C10D8 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C60804D 60636D5C 80630000 3C80803F 608494D0 3D808038 @@ -4173,8 +4162,8 @@ EC2100B2 D036002C 4180FCF8 7F43D378 3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8001001C 83E10014 60000000 00000000 043A69C0 4800003C #Online/Menus/InGame/ParseNumbersBetter.asm @@ -4238,7 +4227,7 @@ C34C0000 C31D0000 41880000 3D75C28F 4E800021 01000000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFFD5 7C6802A6 38800001 3D808000 618C5618 7D8903A6 @@ -4270,13 +4259,13 @@ C34C0000 C31D0000 7D8903A6 4E800421 7F83E378 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 B9C10408 60000000 00000000 C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 480000B5 7C6802A6 3C80803D 6084D908 90640000 3C60803E @@ -4297,8 +4286,8 @@ C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 39950014 7D8903A6 4E800421 3995000C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 48000A6C 4E800021 3D808000 618C5618 7D8903A6 4E800421 @@ -4313,8 +4302,8 @@ BA810008 800100B4 3D80801B 618C136C 7D8903A6 4E800420 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 3FE0804A +90010004 9421FF20 +BE8100B0 3FE0804A 63FF04F0 3FC0803E 63DEAE68 38000005 B00DB528 3D808000 @@ -4343,11 +4332,11 @@ B00DB528 3D808000 8803000D 508026B6 9803000D 38600001 986DAFA2 7F63DB78 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C731B78 80730008 2C030000 40820344 3C60804A 3BA304F0 @@ -4459,8 +4448,8 @@ A09C0000 3D808022 7F6802A6 387B0004 7C6903A6 4E800421 387B0008 7C6903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800021 803EB57C 430C0000 803EB684 07000000 @@ -4468,7 +4457,7 @@ A09C0000 3D808022 0647064B 06480649 064A0000 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 806DB518 3C80803E 6084FA0C 3D808038 618C0358 @@ -4507,17 +4496,17 @@ C3DE0014 3AC00016 7F25CB78 3D808039 618C0A70 7D8903A6 4E800421 7F23CB78 -38810038 38A0000A +38810008 38A0000A 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 -38810038 38A0000B +38810008 38A0000B 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 @@ -4528,16 +4517,16 @@ C3DE0014 3AC00016 FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 -38810038 38A00006 +38810008 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 3C80C060 60840000 90830038 7F23CB78 -38810038 38A00007 +38810008 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 3C80405C 60840000 90830038 7F03C378 3C808039 60841070 @@ -4552,13 +4541,13 @@ FC20F890 3D808036 48000039 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 BA810008 +4E800421 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 4800022D 7FC802A6 C3FE0010 C3DE0014 7C781B78 @@ -4575,26 +4564,26 @@ C07E0008 C09E000C 3D808000 618C56B4 7D8903A6 4E800421 907A0005 48000198 -7F23CB78 38810038 +7F23CB78 38810008 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0000 40820008 FC20F090 -80610038 3D808036 +80610008 3D808036 618CF8BC 7D8903A6 -4E800421 80610038 +4E800421 80610008 3D808037 618C0928 7D8903A6 4E800421 -7F23CB78 38810038 +7F23CB78 38810008 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0001 40820008 FC20F090 -80610038 3D808036 +80610008 3D808036 618CF8BC 7D8903A6 -4E800421 80610038 +4E800421 80610008 3D808037 618C0928 7D8903A6 4E800421 39C00000 7DC37378 @@ -4625,7 +4614,7 @@ FC20F890 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 BA810008 +48000004 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 @@ -4666,8 +4655,8 @@ C2186EC4 0000007F #Online/Menus/VSScreen/InitVsSplash.asm 5465616D 20310054 65616D20 32005031 00503200 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3C80803F 608411A4 3CA0803F 60A51194 3D80803A 618C62A0 @@ -4725,11 +4714,11 @@ A0DD026A 38600000 7C841A14 8884005C 7FC3F378 3D80803A 618C6368 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4800018C 7C0802A6 90010004 -9421FF40 BE810008 +9421FF40 BE810080 DBE100B0 DBC100B8 FFE00890 7C761B78 7C942378 7CB92B78 @@ -4758,12 +4747,12 @@ FC60F090 3D808000 618C56B4 7D8903A6 4E800421 39CE0004 39EF0001 7C0FD000 -4180FFAC BA810008 +4180FFAC BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38A00008 38C000FF 7C7A3039 7C632C30 38E00008 39200000 @@ -4774,16 +4763,16 @@ CBE100B0 CBC100B8 39290001 2C090003 4180FFD8 7F46D378 80A10010 80E1000C -81010008 BA810008 -800100B4 382100B0 +81010008 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 3800FFFF 00000000 C2184DE4 00000010 #Online/Menus/VSScreen/PlayOpponentCharAnnouncer.asm 3D808048 818C9D30 558C443E 2C0C0408 40820068 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 887F0004 @@ -4791,8 +4780,8 @@ BE810008 38600000 7FC418AE 7FE3FB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 48000008 887E00F4 00000000 C21B3650 00000004 #Online/Menus/VSScreen/PreventP2Color.asm @@ -4804,8 +4793,8 @@ C2185060 00000013 #Online/Menus/VSScreen/HideStageDisplay/HideAllJObjs.asm 3D808048 818C9D30 558C443E 2C0C0408 40820078 7C0802A6 -90010004 9421FF50 -BE810008 83E30028 +90010004 9421FF20 +BE8100B0 83E30028 3BC00000 7FE3FB78 38810080 7FC5F378 38C0FFFF 3D808001 @@ -4814,8 +4803,8 @@ BE810008 83E30028 80640014 60630010 90640014 3BDE0001 2C1E001B 4180FFC8 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808018 618C51AC 7D8903A6 4E800420 3C608047 3BE335A8 @@ -4825,8 +4814,8 @@ C2184ADC 00000010 #Online/Menus/VSScreen/HideStageText/HideLetterJObjs.asm 3D808048 818C9D30 558C443E 2C0C0408 40820068 7C0802A6 -90010004 9421FF50 -BE810008 3BE00009 +90010004 9421FF20 +BE8100B0 3BE00009 7F63DB78 38810080 7FE5FB78 38C0FFFF 3D808001 618C1E24 @@ -4835,8 +4824,8 @@ BE810008 3BE00009 618CF6B4 7D8903A6 4E800421 3BFF0001 2C1F000E 4180FFC4 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3BBE0038 00000000 04184B1C 480001D8 #Online/Menus/VSScreen/HideStageText/SkipStageNumberShow.asm C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm @@ -4860,8 +4849,8 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 38600001 00000000 C21A45B8 000001F0 #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 -90010004 9421FF50 -BE810008 3C80803E +90010004 9421FF20 +BE8100B0 3C80803E 6084DC1C 48000281 7C6802A6 38630000 90640008 38600000 @@ -4875,7 +4864,7 @@ BE810008 3C80803E 7C840734 7C841A14 90830000 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 3C80803D 6084AD30 48000091 7C6802A6 @@ -4893,12 +4882,12 @@ BE810008 3C80803E 4BFFFF5D 38740010 4BFFFF55 38740014 4BFFFF4D 3A940018 -4BFFFFCC BA810008 -800100B4 382100B0 +4BFFFFCC BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 3C808045 +90010004 9421FF20 +BE8100B0 3C808045 6084ABF0 886DAEF8 98640006 48000159 7C8802A6 48000B31 @@ -4914,15 +4903,15 @@ BE810008 3C808045 987400DD 48000014 3AD60001 3A94001C 7C16A800 4180FFDC -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600012 3C80803F 60840CC8 98640001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 00030000 480000B9 4800012D 08000000 @@ -4948,8 +4937,8 @@ FF000000 4E800021 00000000 00000000 00000000 00000000 00000000 7C0802A6 -90010004 9421FF50 -BE810008 808D8840 +90010004 9421FF20 +BE8100B0 808D8840 3BE40530 3D80801A 618C427C 7D8903A6 4E800421 88BF0002 @@ -4960,11 +4949,11 @@ BE810008 808D8840 7D8903A6 4E800421 3D808001 618C74BC 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7E1B78 +90010004 9421FF20 +BE8100B0 7C7E1B78 3D80801B 618CAAD0 7D8903A6 4E800421 809E0014 88840003 @@ -4997,18 +4986,18 @@ BE810008 7C7E1B78 98640005 48000018 3C808047 60849D30 38600002 98640005 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D80801B 618C1514 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 809F0014 88840004 2C040000 4082001C 38600000 3D80801A @@ -5026,11 +5015,11 @@ BE810008 7C7F1B78 38600000 3D80801A 618C42A0 7D8903A6 4E800421 48000004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3D80801B +90010004 9421FF20 +BE8100B0 3D80801B 618C15C8 7D8903A6 4E800421 38600000 3D808000 618C5610 @@ -5114,14 +5103,14 @@ BE810008 3D80801B 7D8903A6 4E800421 7FE3FB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 01780101 01FF2121 FF2121EE 0000EE00 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7E1B78 83ED8840 @@ -5221,17 +5210,17 @@ BE810008 38600000 7D8903A6 4E800421 3D808002 618C7168 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3C808047 +90010004 9421FF20 +BE8100B0 3C808047 60849D30 38600003 -98640005 BA810008 -800100B4 382100B0 +98640005 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 @@ -5257,11 +5246,11 @@ B0640003 3C808049 98640016 7FE3FB78 3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08047 63FF9DA4 887F0004 2C030001 41820010 2C030002 @@ -5290,11 +5279,11 @@ BA810008 800100B4 40820010 48000014 38600000 48000010 38600001 48000008 -3860FFFF BA810008 -800100B4 382100B0 +3860FFFF BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 3FE08047 63FF9DA4 1FDD00A8 7FDEFA14 887F0004 @@ -5322,19 +5311,19 @@ BA810008 800100B4 2C030000 41820010 48000004 38600000 48000008 38600001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 83E30010 +90010004 9421FF20 +BE8100B0 83E30010 887F0005 2C030000 40820014 3D808001 618C74BC 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83E30010 38600000 3D808000 618C5610 7D8903A6 4E800421 @@ -5349,16 +5338,16 @@ BE810008 83E30010 48000018 4BFFFC5D 3C808047 60849D30 38600005 98640005 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 BA810008 -800100B4 382100B0 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 BA8100B0 +800100E4 382100E0 7C0803A6 38600028 987E0000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 7CBD2B78 7CDC3378 3D808000 618C56B8 @@ -5371,8 +5360,8 @@ C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C9E2A14 7FE3FB78 7F85E378 3D808025 618CD5AC 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20056AC 0000002F #Online/Static/ChatMessages.asm @@ -5434,7 +5423,7 @@ C2005698 00000002 #Online/Static/GetCSSIconNum.asm 60000000 00000000 C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 7FC3F378 2C1F0003 41820028 2C1F0002 @@ -5446,8 +5435,8 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm 7D8903A6 4E800421 48000014 3D808016 618C9264 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20055F4 00000007 #Online/Static/IntToFloat.asm @@ -5460,7 +5449,7 @@ EC211028 C0410008 60000000 00000000 C2005610 00000012 #Online/Static/LoadMatchState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 2C030000 40820018 38600394 3D808037 618CF1E4 7D8903A6 @@ -5473,13 +5462,13 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm 38800394 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20056A4 00000022 #Online/Static/LoadPremadeText.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 3B800004 7F83E378 3D808037 618CF1E4 @@ -5495,11 +5484,11 @@ C20056A4 00000022 #Online/Static/LoadPremadeText.asm 618CF1E4 7D8903A6 4E800421 7C7D1B78 386000E2 4800001D -7FA3EB78 BA810008 -800100B4 382100B0 +7FA3EB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 987D0000 9BFD0001 9BDD0002 7FA3EB78 38800003 38A00001 @@ -5508,13 +5497,13 @@ C20056A4 00000022 #Online/Static/LoadPremadeText.asm 7FA3EB78 7F84E378 38A00000 3D808000 618C55F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C200560C 00000033 #Online/Static/LoadState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7B1B78 7C982378 7CBA2B78 88DA0000 3AC00000 3AD60001 @@ -5561,21 +5550,21 @@ BC610008 7F05C378 4E800421 7EE3BB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 00000000 C20055EC 00000008 #Online/Static/MultiplyRWithF.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C55F4 7D8903A6 4E800421 -EC2100B2 BA810008 -800100B4 382100B0 +EC2100B2 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C2005608 00000016 #Online/Static/SaveState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7B1B78 7C982378 7CBA2B78 887A0000 1C630004 389A0002 @@ -5593,21 +5582,21 @@ C2005608 00000016 #Online/Static/SaveState.asm 4E800421 7EE3BB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 00000000 C20056B4 00000063 #Online/Static/SubtextFunctions.asm 2C050002 41820228 7C0802A6 90010004 -9421FF20 BE810008 +9421FF20 BE810080 DBE100B0 DBC100B8 DBA100C0 DB8100C8 DB6100D0 DB4100D8 7C751B78 7C962378 7CB82B78 7CD93378 -90E10038 9101003C -91210040 91410044 -91610048 9181004C +90E10008 9101000C +91210010 91410014 +91610018 9181001C FFE00890 FFC01090 FFA01890 FF602890 FF403090 2C180001 @@ -5622,7 +5611,7 @@ FC20F090 FC40E890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -80810038 3D80803A +80810008 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 @@ -5635,15 +5624,15 @@ FC20F890 FC40F890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A10038 80C1003C -80E10040 81010044 -81210048 8141004C +80A10008 80C1000C +80E10010 81010014 +81210018 8141001C 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -80810038 FC20F090 +80810008 FC20F090 FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 @@ -5655,20 +5644,20 @@ FC20F890 FC40F890 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A10038 -80C1003C 80E10040 -81010044 81210048 -8141004C 3D80803A +7EE4BB78 80A10008 +80C1000C 80E10010 +81010014 81210018 +8141001C 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 CBA100C0 CB8100C8 CB6100D0 CB4100D8 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF30 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 DBA100C0 DB8100C8 7C7D1B78 7C9C2378 7CDB3378 @@ -5689,7 +5678,7 @@ FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 CBA100C0 CB8100C8 800100D4 382100D0 7C0803A6 @@ -5708,7 +5697,7 @@ FFFFFFFF 3ECCCCCD 7200436F 6E6E6563 7420436F 64650000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C791B78 7C9B2378 2C050000 41820008 480003D1 4BFFFFA9 @@ -5733,11 +5722,11 @@ D03C0028 38600001 480000D1 38600000 48000029 480000D5 886DAFA1 987E0004 -7FA3EB78 BA810008 -800100B4 382100B0 +7FA3EB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7A1B78 C03E000A C05E000E 7F83E378 389F001C 3D80803A @@ -5753,13 +5742,13 @@ FC400890 7F83E378 38BF000C 7F83E378 7F04C378 3D80803A 618C74F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 C05E000E EC42082A D05E000E 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFE25 7FE802A6 83DF0000 83BE0000 839E0005 48000159 @@ -5790,11 +5779,11 @@ D05E000E 4E800020 7F83E378 38800003 38BD0020 3D80803A 618C70A0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFD0D 7FE802A6 83DF0000 889E0004 886DAFA1 7C041800 @@ -5803,11 +5792,11 @@ D05E000E 4E800020 618C4030 7D8903A6 4E800421 806DB614 7C6903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFCA9 +90010004 9421FF20 +BE8100B0 4BFFFCA9 7FE802A6 83DF0000 83BE0000 386000B9 987D0000 7FA3EB78 @@ -5818,11 +5807,11 @@ BE810008 4BFFFCA9 38A00000 3D808000 618C55F0 7D8903A6 4E800421 889D0000 -988DAFA1 BA810008 -800100B4 382100B0 +988DAFA1 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3CA0803E 60A5AE68 88A508F4 38800000 38600008 3D808022 @@ -5830,11 +5819,11 @@ BE810008 4BFFFCA9 4E800421 2C030001 41820010 38840001 7C042800 4180FFDC -7C832378 BA810008 -800100B4 382100B0 +7C832378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFBCD 7FE802A6 38600012 3D808037 618CF1E4 7D8903A6 @@ -5842,8 +5831,8 @@ BE810008 4BFFFCA9 907F0000 3860002A 3D808037 618CF1E4 7D8903A6 4E800421 -907E0000 BA810008 -800100B4 382100B0 +907E0000 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm @@ -8515,7 +8504,7 @@ C21D24FC 00000018 #Common/PSCameraIndependentMonitor/PSCameraIndependentMonitor. C2F00000 42F00000 42A00000 C1A00000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 4BFFFFD9 7FA802A6 807E002C A86300EE 3D808003 @@ -8532,8 +8521,8 @@ FC020840 41810018 C03D000C FC020840 4180000C 38600001 48000008 38600000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 $Recommended: Normal Lag Reduction [Hannes Mann] @@ -8544,45 +8533,46 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200F8 +2C030004 408200FC 3C608048 88639D30 -2C030008 418200E8 +2C030008 418200EC 3C608047 60639D64 80630000 2C030000 -408200D4 7C0802A6 -90010004 9421FF50 -BE810008 3C60802F -6063666C 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 -83E30008 887F0000 -2C030000 40810080 -38610038 388100DC -38A00030 3D808000 -618C31F4 7D8903A6 -4E800421 887F0001 -1C630030 3BC30002 -386100DC 7C9FF214 -38A00030 3D808000 -618C31F4 7D8903A6 -4E800421 7C7FF214 -38810038 38A00030 +408200D8 7C0802A6 +90010004 9421FF20 +BE8100B0 83A10000 +3C60802F 6063666C +80830000 5485863E +7CA50774 54A5801E +5484043A 7C842B78 +7C632214 83E30008 +887F0000 2C030000 +40810080 38610008 +389D002C 38A00030 3D808000 618C31F4 7D8903A6 4E800421 -889F0000 887F0001 -38630001 7C032000 -41800008 38600000 -987F0001 BA810008 -800100B4 382100B0 -7C0803A6 00000000 +887F0001 1C630030 +3BC30002 387D002C +7C9FF214 38A00030 +3D808000 618C31F4 +7D8903A6 4E800421 +7C7FF214 38810008 +38A00030 3D808000 +618C31F4 7D8903A6 +4E800421 889F0000 +887F0001 38630001 +7C032000 41800008 +38600000 987F0001 +BA8100B0 800100E4 +382100E0 7C0803A6 +60000000 00000000 C22F666C 0000005C #Common/UseInGameDelay/InitializeInGameDelay.asm 4800007C 4E800021 80000000 4E800021 @@ -8591,19 +8581,19 @@ C22F666C 0000005C #Common/UseInGameDelay/InitializeInGameDelay.asm 3EA8F5C3 44656C61 793A2025 64660000 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 880DB6CC 2C000001 41820018 7FE3FB78 3D808039 618C10D8 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C7F1B78 3C608048 88639D30 2C030008 4182024C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 386002D2 3D808037 618CF1E4 7D8903A6 4E800421 7C7F1B78 @@ -8673,12 +8663,12 @@ C05D000C 7F83E378 C03D0010 C05D0010 3D80803A 618C7548 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 7FE3FB78 00000000 C200561C 00000013 #Common/GetCommonMinorID/GetCommonMinorID.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3CA08048 8BC59D30 8BE59D33 3FA0803D 63BDACA4 38800000 @@ -8692,11 +8682,27 @@ C200561C 00000013 #Common/GetCommonMinorID/GetCommonMinorID.asm 7C06F800 4082000C 8865000C 48000010 38840001 2C0600FF -4082FFDC BA810008 -800100B4 382100B0 +4082FFDC BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 +$Recommended: Lagless FoD [Achilles, Myougi, Dan Salvato] +*Disables particles and reflection on FoD to improve performance +C21CBB90 00000005 #Lagless FoD +9421FFF8 3CC0804A +80C6ED78 3CA00002 +60A5AE44 7CA53050 +88C50000 60C60004 +98C50000 00000000 +041CC8AC FC000028 +041CBE9C 60000000 +041CBEF0 60000000 +041CBF54 60000000 +04390838 60000000 +041CD250 60000000 +041CCDCC 480000B4 + $Optional: Widescreen 16:9 [Dan Salvato, mirrorbender, Achilles1515, UnclePunch] *Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ---------------------- *Will not cause desyncs when playing online diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 5bec0e983e..65e4aa460e 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -12,6 +12,7 @@ $Required: Slippi Recording $Required: Slippi Online $Recommended: Normal Lag Reduction $Recommended: Apply Delay to all In-Game Scenes +$Recommended: Lagless FoD [Gecko] $Required: General Codes [Achilles, Dan Salvato, Magus, UnclePunch, tauKhan, Ptomerty, Cilan, Zauron, Datel, donny2112, Jorgasms, strikebowler585, Myougi] @@ -59,7 +60,7 @@ C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm 041B0A14 38600002 #Exiting Debug Menu Returns to CSS [Achilles] C216E510 00000098 #External/NeutralSpawn/NeutralSpawn.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808016 618CB41C 7D8903A6 4E800421 2C030000 40820480 @@ -115,7 +116,7 @@ C216E510 00000098 #External/NeutralSpawn/NeutralSpawn.asm 7F24CB78 88BF24D0 48000009 480002E8 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 7CBD2B78 48000121 7F8802A6 80CD9348 @@ -151,8 +152,8 @@ C022A8F8 48000008 C022A8CC 7FE3FB78 3D808003 618C3094 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 00000020 C2700000 41200000 42700000 @@ -206,8 +207,8 @@ C2200000 40A00000 42200000 42000000 42200000 40A00000 FFFFFFFF 4E800021 -00030102 BA810008 -800100B4 382100B0 +00030102 BA8100B0 +800100E4 382100E0 7C0803A6 881F24D0 60000000 00000000 042641B0 38000001 #Faster CSS Load [UnclePunch] @@ -233,8 +234,8 @@ C21F0318 FE0F802A D21F0318 00000000 C20C9A44 0000002B #External/UCF 0.8/Logic/UCF DB.asm D01F002C 7C0802A6 -90010004 9421FF50 -BE810008 48000121 +90010004 9421FF20 +BE8100B0 48000121 7FC802A6 C03F0894 C05E0000 FC011040 40820118 808DAEB4 @@ -272,12 +273,12 @@ FC011040 4181000C 88640002 7C630774 4E800020 4E800021 40000000 00000000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C20998A4 00000026 #External/UCF 0.8/Logic/UCF SD.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 83FE002C 480000DD 7FA802A6 C03F063C 806DAEB4 @@ -292,8 +293,8 @@ C05D000C FC011040 2C040003 408100A8 C01D0010 C03F0624 FC000840 40800098 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8061001C 83E10014 38210018 38630008 7C6803A6 4E800020 @@ -311,12 +312,12 @@ C03D0000 EC200824 43300000 3F800000 BF4CCCCD 43300000 80000000 7FC3F378 -7FE4FB78 BA810008 -800100B4 382100B0 +7FE4FB78 BA8100B0 +800100E4 382100E0 7C0803A6 00000000 C20908F4 00000017 #External/UCF 0.8/Logic/UCF Tumble.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 2C030001 4082008C C03F0628 FC200A10 806DAEB4 C0430210 @@ -335,12 +336,12 @@ FC011040 40800074 7C841A14 1C65000C 7C841A14 88640002 7C630774 4E800020 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C22662D0 0000001A #External/UCF 0.8/Indicator/UCF Text.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 48000089 7FC802A6 38600000 38800000 3D80803A 618C6754 @@ -362,8 +363,8 @@ C05E0008 3D80803A C3898000 3EE66666 3DCCCCCD 4E800021 55434620 302E3800 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 38980000 00000000 C226325C 00000008 #External/DPad Down at CSS for Random Stage/DPad Down at CSS for Random Stage.asm 3C808045 6084BF17 @@ -374,19 +375,6 @@ C226325C 00000008 #External/DPad Down at CSS for Random Stage/DPad Down at CSS f 54E004E7 4182000C 38600000 98640000 54E004E7 00000000 -C21CBB90 00000005 #Lagless FoD [Achilles, Myougi, Dan Salvato] -9421FFF8 3CC0804A -80C6ED78 3CA00002 -60A5AE44 7CA53050 -88C50000 60C60004 -98C50000 00000000 -041CC8AC FC000028 -041CBE9C 60000000 -041CBEF0 60000000 -041CBF54 60000000 -04390838 60000000 -041CD250 60000000 -041CCDCC 480000B4 041C26B0 38000032 #Random Stage Music [UnclePunch] C215ECEC 0000000C #Random CSS Music v3 [UnclePunch] 38600003 3DC08038 @@ -452,8 +440,8 @@ C2265220 00000028 #Common/Winners Names are Gold on CSS/Change Name Color.asm 3D80803A 618C74F0 7D8903A6 4E800421 48000100 7C0802A6 -90010004 9421FF50 -BE810008 7C7D1B78 +90010004 9421FF20 +BE8100B0 7C7D1B78 3FE08047 63FF9DA4 1FDD00A8 7FDEFA14 887F0004 2C030000 @@ -480,8 +468,8 @@ BE810008 7C7D1B78 887E005D 2C030000 41820010 48000004 38600000 48000008 -38600001 BA810008 -800100B4 382100B0 +38600001 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 880DB655 00000000 C216EA30 00000004 #Common/Winners Names are Gold on CSS/Remember Who LRA Started.asm @@ -506,7 +494,7 @@ C213C388 0000000A #Common/CostumeBoundCheck/PuffCostume.asm 809C002C 00000000 C216DED4 00000039 #Common/CostumeBoundCheck/main.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3BE00000 7FE3FB78 3D808003 618C241C 7D8903A6 4E800421 @@ -558,8 +546,8 @@ C216DED4 00000039 #Common/CostumeBoundCheck/main.asm 4E800421 3B7B0001 2C1B0006 4180FF68 3BFF0001 2C1F0006 -4180FEF4 BA810008 -800100B4 382100B0 +4180FEF4 BA8100B0 +800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 @@ -569,7 +557,7 @@ $Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337, Krohn 040679BC 38802600 #Recording/ExtendPlayerBlock.asm C23219EC 0000001D #Recording/FlushFrameBuffer.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 2C030000 418200A8 @@ -593,13 +581,13 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 38A00001 3D808000 618C55F0 7D8903A6 4E800421 38600000 -906DB650 BA810008 -800100B4 382100B0 +906DB650 BA8100B0 +800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 C216D884 0000001C #Recording/SendGameEnd.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 2C030000 418200A0 @@ -622,13 +610,13 @@ C216D884 0000001C #Recording/SendGameEnd.asm 38A00001 3D808000 618C55F0 7D8903A6 4E800421 38600001 -98780004 BA810008 -800100B4 382100B0 +98780004 BA8100B0 +800100E4 382100E0 7C0803A6 819F2514 60000000 00000000 C216E74C 000000FC #Recording/SendGameInfo.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 2C030000 418207A0 @@ -820,7 +808,7 @@ A0B50201 3D808000 7D8903A6 4E800421 48000070 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 806DB64C 83A30000 838DB650 7FBDE214 3860003A 987D0000 @@ -829,8 +817,8 @@ A0B50201 3D808000 907D0005 3C608048 80639D60 907D0009 838DB650 3B9C000D -938DB650 BA810008 -800100B4 382100B0 +938DB650 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 38600004 38800007 38A00000 3D808039 @@ -841,7 +829,7 @@ A0B50201 3D808000 7D8903A6 4E800421 48000124 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 806DB64C 83E30000 83CDB650 7FFFF214 3B600000 806DC18C @@ -873,15 +861,15 @@ B07F001C 807C0D44 3BDE002B 93CDB650 3BFF002B 83BD0008 2C1D0000 4082FF30 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 BA810008 -800100B4 382100B0 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 BA8100B0 +800100E4 382100E0 7C0803A6 3C608017 60000000 00000000 C206DA34 00000036 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 2C030000 41820170 @@ -930,13 +918,13 @@ B07D0030 887F1968 807F195C 907D0049 807F0014 907D004D 838DB650 3B9C0051 -938DB650 BA810008 -800100B4 382100B0 +938DB650 BA8100B0 +800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 C206B0DC 0000002B #Recording/SendGamePreFrame.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 2C030000 41820118 @@ -974,8 +962,8 @@ B07D0031 80640030 88630002 987D003B 807F1830 907D003C 838DB650 3B9C0040 -938DB650 BA810008 -800100B4 382100B0 +938DB650 BA8100B0 +800100E4 382100E0 7C0803A6 881F2219 60000000 00000000 C2005604 0000000A #Recording/ShouldRecord.asm @@ -1000,7 +988,7 @@ C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm 807E00B0 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 3BE00000 887E221F 5460EFFF 41820038 887E000C @@ -1010,8 +998,8 @@ C20055F8 0000000F #Common/GetIsFollower.asm 1C030003 7C640214 88030002 2C000000 40820008 3BE00001 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C216D294 00000006 #Common/IncrementFrameIndex.asm @@ -1088,7 +1076,7 @@ $Required: Slippi Online [Fizzi, UnclePunch] *Change settings in Config > GameCube C206A880 0000001B #Online/Core/BrawlOffscreenDamage.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030120 41820094 887F221F @@ -1111,8 +1099,8 @@ FC020840 41810028 C05F00B4 FC020840 4180000C 38600000 48000008 38600001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C22F7094 0000000F #Online/Core/CustomizeMessageLRAS.asm 3CE08048 80E79D30 @@ -1175,22 +1163,22 @@ C234DED8 0000000F #Online/Core/HandleRumble.asm 80639D30 5463443E 2C030208 4082005C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83EDB61C 887F0000 7C03E800 41820024 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808034 618CDF44 7D8903A6 4E800420 -887F0002 BA810008 -800100B4 382100B0 +887F0002 BA8100B0 +800100E4 382100E0 7C0803A6 7C7D1B78 60000000 00000000 C216E748 0000009E #Online/Core/InitOnlinePlay.asm 3D808022 618C54B8 7D8903A6 4E800421 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030208 408204A8 38600B2E @@ -1283,8 +1271,8 @@ C216E748 0000009E #Online/Core/InitOnlinePlay.asm 7C841A14 3C60804D 90835F90 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 838DB61C +90010004 9421FF20 +BE8100B0 838DB61C 3CA0803D 60A5AD40 80A50000 83650088 3F408047 635A9DA4 @@ -1339,11 +1327,11 @@ BE810008 838DB61C 7FC3F378 38800171 38A00001 3D808000 618C55F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C216E904 0000004C #Online/Core/InitPause.asm 3C608048 80639D30 @@ -1359,7 +1347,7 @@ C216E904 0000004C #Online/Core/InitPause.asm 50831F38 986C0002 48000200 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83ADB61C 3BC00000 7FC3F378 3D808003 618C241C 7D8903A6 @@ -1418,8 +1406,8 @@ C216E904 0000004C #Online/Core/InitPause.asm 38600005 3D808002 618C4030 7D8903A6 4E800421 48000004 -3860FFFF BA810008 -800100B4 382100B0 +3860FFFF BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 881F0001 00000000 C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm @@ -1431,8 +1419,8 @@ C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm 3C608047 60639D64 80630000 2C030000 408202A4 7C0802A6 -90010004 9421FF50 -BE810008 3D808034 +90010004 9421FF20 +BE8100B0 3D808034 618C7364 7D8903A6 4E800421 7C7D1B78 83EDB61C 3BDF03A7 @@ -1477,21 +1465,21 @@ A0840001 7C032000 987F00DE 987F08FE 7FA3EB78 3D808034 618C738C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 3B5A0001 3D80801A 618C5024 7D8903A6 4E800420 7FA3EB78 3D808034 618C738C 7D8903A6 4E800421 48000029 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3B5A0001 3D80801A 618C4DE4 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 3D808003 +90010004 9421FF20 +BE8100B0 3D808003 618C0A50 7D8903A6 4E800421 3D808002 618CA4AC 7D8903A6 @@ -1507,13 +1495,13 @@ BE810008 3D808003 3D808008 618C6A8C 7D8903A6 4E800421 82940008 2C140000 -4082FFD4 BA810008 -800100B4 382100B0 +4082FFD4 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7FA3EB78 3D808034 618C738C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 00000000 C216D26C 00000003 #Online/Core/PauseCounter.asm 808DB61C 80640915 @@ -1561,7 +1549,7 @@ CDFFB800 FF444553 594E4320 44455445 43544544 00000000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08045 63FF3080 3FA08045 63BD5C30 3BC00000 7FC3F378 @@ -1569,8 +1557,8 @@ CDFFB800 FF444553 809F00B4 4800002D 7C7E1B78 3BFF0E90 7C1FE800 4081FFE0 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 2C040000 41820030 80A4002C 80850010 @@ -1580,7 +1568,7 @@ CDFFB800 FF444553 7C632278 80850008 7C632278 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 4BFFFF11 7FE802A6 7FFF2214 C03F0000 C05F0004 @@ -1595,8 +1583,8 @@ C05F0008 3D80803A 7FC4F378 38BF000C 3D80803A 618C74F0 7D8903A6 4E800421 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 886DAFA0 2C030000 40820028 818DB61C @@ -1605,8 +1593,8 @@ C05F0008 3D80803A 38800007 98830008 38800037 988324D5 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3C608048 +90010004 9421FF20 +BE8100B0 3C608048 80639D30 5463443E 2C030208 408203CC 3C608047 60639D64 @@ -1730,251 +1718,252 @@ BE810008 3C608048 4E800421 7F23CB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 -C2376A28 000000F1 #Online/Core/TriggerSendInput.asm +C2376A28 000000F2 #Online/Core/TriggerSendInput.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608048 80639D30 5463443E 2C030208 -40820750 3C608047 +40820754 3C608047 60639D64 80630000 -2C030000 4082073C -836DB61C 833B00D6 -831B00DA 82FB039F -835B0003 889B0002 -1C84000C 386400DC -7FA11A14 887B00DE -2C030000 41820010 -887B00DF 2C030000 -4182067C 887B0020 -38800054 7C632050 -2C1A0003 4080001C -386100DC 38800030 -3D808000 618CC160 +2C030000 40820740 +83C10000 836DB61C +833B00D6 831B00DA +82FB039F 835B0003 +889B0002 1C84000C +3864002C 7FBE1A14 +887B00DE 2C030000 +41820010 887B00DF +2C030000 4182067C +887B0020 38800054 +7C632050 2C1A0003 +4080001C 387E002C +38800030 3D808000 +618CC160 7D8903A6 +4E800421 48000040 +88830000 7C840774 +2C04FFFE 4180002C +2C040002 41810024 +88830001 7C840774 +2C04FFFE 41800014 +2C040002 4181000C +38800000 B0830000 +4E800020 387D0002 +4BFFFFC1 387D0004 +4BFFFFB9 887D000A +7C630774 2C03FFFD +40820020 7FA3EB78 +389B0014 38A0000C +3D808000 618C31F4 7D8903A6 4E800421 -48000040 88830000 -7C840774 2C04FFFE -4180002C 2C040002 -41810024 88830001 -7C840774 2C04FFFE -41800014 2C040002 -4181000C 38800000 -B0830000 4E800020 -387D0002 4BFFFFC1 -387D0004 4BFFFFB9 -887D000A 7C630774 -2C03FFFD 40820020 -7FA3EB78 389B0014 +387B0014 7FA4EB78 38A0000C 3D808000 618C31F4 7D8903A6 -4E800421 387B0014 -7FA4EB78 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -386000B0 98790000 -93590001 807B0908 -90790005 819B0908 -39600000 1C6B0018 -38630926 7D5B1A14 -806A0000 7C036000 -40820010 806A0004 -90790009 48000010 -396B0001 2C0B0015 -4180FFD4 887B0020 -9879000D 3879000E -7FA4EB78 38A0000C -3D808000 618C31F4 +4E800421 386000B0 +98790000 93590001 +807B0908 90790005 +819B0908 39600000 +1C6B0018 38630926 +7D5B1A14 806A0000 +7C036000 40820010 +806A0004 90790009 +48000010 396B0001 +2C0B0015 4180FFD4 +887B0020 9879000D +3879000E 7FA4EB78 +38A0000C 3D808000 +618C31F4 7D8903A6 +4E800421 7F23CB78 +3880001A 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -7F23CB78 3880001A -38A00001 3D808000 +38780000 38800126 +38A00000 3D808000 618C55F0 7D8903A6 -4E800421 38780000 -38800126 38A00000 -3D808000 618C55F0 +4E800421 38600000 +987B0013 88780000 +2C030002 41820024 +2C030003 41820010 +2C030004 41820040 +48000044 38600001 +987B0010 48000038 +887B000F 2C030001 +4182002C BA8100B0 +800100E4 382100E0 +7C0803A6 3D808037 +618C6CEC 7D8903A6 +4E800420 38600001 +987B0013 889B0021 +1C84000C 38840022 +887B0000 1C63000C +3863002C 7C7E1A14 +7C9B2214 38A0000C +3D808000 618C31F4 7D8903A6 4E800421 -38600000 987B0013 -88780000 2C030002 -41820024 2C030003 -41820010 2C030004 -41820040 48000044 -38600001 987B0010 -48000038 887B000F -2C030001 4182002C -BA810008 800100B4 -382100B0 7C0803A6 -3D808037 618C6CEC -7D8903A6 4E800420 -38600001 987B0013 -889B0021 1C84000C -38840022 887B0000 -1C63000C 386300DC -7C611A14 7C9B2214 +887B00E4 1C63000C +386300E5 889B0000 +1C84000C 3884002C +7C7B1A14 7C9E2214 38A0000C 3D808000 618C31F4 7D8903A6 4E800421 887B00E4 -1C63000C 386300E5 -889B0000 1C84000C -388400DC 7C7B1A14 -7C812214 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -887B00E4 38630001 -2C03000E 41800008 -38600000 987B00E4 -887B0021 1C63000C -38630022 7C7B1A14 -3899000E 38A0000C -3D808000 618C31F4 -7D8903A6 4E800421 -889B0020 887B0021 -38630001 7C032000 +38630001 2C03000E 41800008 38600000 -987B0021 8B9B00DE -887B038B 2C030000 -40820018 38600000 -987B039C 987B039D -987B039E 48000264 -3A800000 38D4039C -7C66D8AE 2C030001 -4082016C 1CD40004 -38C6001A 7C66C02E -1CD40004 38C60390 -7C86D82E 7EC41851 -4180014C 80DB0908 -7C043000 41810010 -7C032000 418100AC -48000134 1C76000C -3863002A 1CD40054 -7C633214 38D4018D -7C86D8AE 1C84000C -38840193 1CB400A8 -7C842A14 7CD81A14 -7CFB2214 88660000 -88870000 546306FE -548406FE 7C032000 -408200AC 88660001 -88870001 5463067E -5484067E 7C032000 -40820094 80660002 -80870002 7C032000 -40820084 38A00005 -38A50001 2C050008 -40800028 7C6530AE -7C8538AE 2C03002A -4181000C 2C04002A -4081FFE0 7C032000 -40820054 4BFFFFD4 -1CD40004 38C60390 -7C66D82E 38630001 -7C66D92E 38D4018D -7C66D8AE 38630001 -2C03000E 41800008 -3863FFF2 7C66D9AE -38D4018D 7C66D8AE -38D40190 7C86D8AE -7C041800 4082FED0 -48000044 3B800001 -4800003C 38600001 -987B00DE 987B00DF -935B00E0 3B5A0001 -935B0003 BA810008 -800100B4 382100B0 -7C0803A6 3D808037 -618C6CEC 7D8903A6 -4E800420 3A940001 -2C140003 4180FE80 -39600000 3A800000 -82BB0908 38D4039C -7C86D8AE 2C040001 -40820028 1CD40004 +987B00E4 887B0021 +1C63000C 38630022 +7C7B1A14 3899000E +38A0000C 3D808000 +618C31F4 7D8903A6 +4E800421 889B0020 +887B0021 38630001 +7C032000 41800008 +38600000 987B0021 +8B9B00DE 887B038B +2C030000 40820018 +38600000 987B039C +987B039D 987B039E +48000264 3A800000 +38D4039C 7C66D8AE +2C030001 4082016C +1CD40004 38C6001A +7C66C02E 1CD40004 38C60390 7C86D82E -2C0B0000 4182000C -7C04A800 40800008 -7C952378 39600001 +7EC41851 4180014C +80DB0908 7C043000 +41810010 7C032000 +418100AC 48000134 +1C76000C 3863002A +1CD40054 7C633214 +38D4018D 7C86D8AE +1C84000C 38840193 +1CB400A8 7C842A14 +7CD81A14 7CFB2214 +88660000 88870000 +546306FE 548406FE +7C032000 408200AC +88660001 88870001 +5463067E 5484067E +7C032000 40820094 +80660002 80870002 +7C032000 40820084 +38A00005 38A50001 +2C050008 40800028 +7C6530AE 7C8538AE +2C03002A 4181000C +2C04002A 4081FFE0 +7C032000 40820054 +4BFFFFD4 1CD40004 +38C60390 7C66D82E +38630001 7C66D92E +38D4018D 7C66D8AE +38630001 2C03000E +41800008 3863FFF2 +7C66D9AE 38D4018D +7C66D8AE 38D40190 +7C86D8AE 7C041800 +4082FED0 48000044 +3B800001 4800003C +38600001 987B00DE +987B00DF 935B00E0 +3B5A0001 935B0003 +BA8100B0 800100E4 +382100E0 7C0803A6 +3D808037 618C6CEC +7D8903A6 4E800420 3A940001 2C140003 -4180FFC4 92BB038C -92BB0919 80D80026 -7C153000 40810008 -90DB0919 2C1C0000 -4082FF54 3A800000 +4180FE80 39600000 +3A800000 82BB0908 38D4039C 7C86D8AE 2C040001 40820028 -38D4018D 7C66D8AE -38D40190 7C86D8AE -7C041800 40820010 -38600000 38D4039C -7C66D9AE 3A940001 +1CD40004 38C60390 +7C86D82E 2C0B0000 +4182000C 7C04A800 +40800008 7C952378 +39600001 3A940001 2C140003 4180FFC4 +92BB038C 92BB0919 +80D80026 7C153000 +40810008 90DB0919 +2C1C0000 4082FF54 3A800000 38D4039C 7C86D8AE 2C040001 -41820018 3A940001 -2C140003 4180FFE8 -38600000 987B038B -3A800000 3AA00000 -3B800001 887B0000 -7C151800 40820008 -3AB50001 1CD40004 -38C6001A 7C66C02E -7C7A1850 2C030000 -408000D8 887B0020 -38800054 7C632050 -7C1A1800 418000C0 -887B000F 2C030001 -418200B4 3B800000 -38D40190 7EC6D8AE -1C76000C 38630193 -1CB400A8 7C632A14 -1CD40054 38C6002A -7C7B1A14 7C983214 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 38760001 -2C03000E 41800008 -3863FFF2 38D40190 -7C66D9AE 38D4018D +40820028 38D4018D 7C66D8AE 38D40190 -7C86D8AE 38D4039C -7C66D8AE 2C030001 -4182003C 1CD40004 -38C60390 7F46D92E -38600001 38D4039C -7C66D9AE 38D4018D -7EC6D9AE 887B038B -2C030001 41820010 -935B038C 38600001 -987B038B 38600000 -1C63000C 38A3002A -1CD40054 7CA53214 -1C75000C 386300DC -7C611A14 7C982A14 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 3A940001 -3AB50001 2C140003 -4180FEC4 2C1C0000 -41820008 935B0919 -48000080 807B00E0 -7C1A1800 40810024 -BA810008 800100B4 -382100B0 7C0803A6 -3D808037 618C6CEC -7D8903A6 4E800420 -807B00E0 7C7A1850 -38630001 889B00E4 -7C632051 40800008 -3863000E 1C63000C -388300E5 887B0000 -1C63000C 386300DC -7C611A14 7C9B2214 -38A0000C 3D808000 -618C31F4 7D8903A6 -4E800421 4BFFFE2C -3B5A0001 935B0003 -BA810008 800100B4 -382100B0 7C0803A6 -2C1E0000 00000000 +7C86D8AE 7C041800 +40820010 38600000 +38D4039C 7C66D9AE +3A940001 2C140003 +4180FFC4 3A800000 +38D4039C 7C86D8AE +2C040001 41820018 +3A940001 2C140003 +4180FFE8 38600000 +987B038B 3A800000 +3AA00000 3B800001 +887B0000 7C151800 +40820008 3AB50001 +1CD40004 38C6001A +7C66C02E 7C7A1850 +2C030000 408000D8 +887B0020 38800054 +7C632050 7C1A1800 +418000C0 887B000F +2C030001 418200B4 +3B800000 38D40190 +7EC6D8AE 1C76000C +38630193 1CB400A8 +7C632A14 1CD40054 +38C6002A 7C7B1A14 +7C983214 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +38760001 2C03000E +41800008 3863FFF2 +38D40190 7C66D9AE +38D4018D 7C66D8AE +38D40190 7C86D8AE +38D4039C 7C66D8AE +2C030001 4182003C +1CD40004 38C60390 +7F46D92E 38600001 +38D4039C 7C66D9AE +38D4018D 7EC6D9AE +887B038B 2C030001 +41820010 935B038C +38600001 987B038B +38600000 1C63000C +38A3002A 1CD40054 +7CA53214 1C75000C +3863002C 7C7E1A14 +7C982A14 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +3A940001 3AB50001 +2C140003 4180FEC4 +2C1C0000 41820008 +935B0919 48000080 +807B00E0 7C1A1800 +40810024 BA8100B0 +800100E4 382100E0 +7C0803A6 3D808037 +618C6CEC 7D8903A6 +4E800420 807B00E0 +7C7A1850 38630001 +889B00E4 7C632051 +40800008 3863000E +1C63000C 388300E5 +887B0000 1C63000C +3863002C 7C7E1A14 +7C9B2214 38A0000C +3D808000 618C31F4 +7D8903A6 4E800421 +4BFFFE2C 3B5A0001 +935B0003 BA8100B0 +800100E4 382100E0 +7C0803A6 2C1E0000 +60000000 00000000 C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm 38600080 3D808037 618CF1E4 7D8903A6 @@ -1982,11 +1971,11 @@ C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm 38000000 00000000 C20163FC 0000001B #Online/Core/EXIFileLoad/GetFileSize.asm 7C7E1B78 7C0802A6 -90010004 9421FF50 -BE810008 83EDAFC4 +90010004 9421FF20 +BE8100B0 83EDAFC4 2C1F0000 40820018 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 480000A0 386000D1 987F0000 387F0001 7FC4F378 3D808032 @@ -2001,8 +1990,8 @@ BA810008 800100B4 38800004 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 80630000 2C030000 40810014 3D808001 618C6488 @@ -2010,8 +1999,8 @@ BA810008 800100B4 7FC3F378 00000000 C20166B8 00000029 #Online/Core/EXIFileLoad/TransferFile.asm 7C7E1B78 7C0802A6 -90010004 9421FF50 -BE810008 83EDAFC4 +90010004 9421FF20 +BE8100B0 83EDAFC4 2C1F0000 41820110 386000D1 987F0000 387F0001 7FC4F378 @@ -2042,12 +2031,12 @@ BE810008 83EDAFC4 7FA4EB78 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 38600001 3D808001 618C674C 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 7FC3F378 60000000 00000000 C20D4C1C 00000005 #Online/Core/FreezeDeadUpFallPhysics/InitHitVelocity.asm @@ -2070,7 +2059,7 @@ D03F2364 3D80800D 4E800420 00000000 C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808003 618C10B8 7D8903A6 4E800421 3D808036 618C9808 @@ -2081,8 +2070,8 @@ C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm 80610080 907F0038 80610084 907F003C 80610088 907F0040 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808008 618C0EE4 7D8903A6 4E800420 60000000 00000000 @@ -2101,15 +2090,15 @@ C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm 25640A00 00000000 C23A63A8 0000000C #Online/Core/Hacks/LoadPremadeTextDataFromDolphin.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C9D2378 7CDC3378 886DAFEC 2C030000 41820024 7FA3EB78 7F84E378 3D808000 618C56A4 7D8903A6 4E800421 7C7E1B78 -93DF005C BA810008 -800100B4 382100B0 +93DF005C BA8100B0 +800100E4 382100E0 7C0803A6 38600000 986DAFEC 00000000 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm @@ -2142,8 +2131,8 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm 3C608047 60639D64 80630000 2C030000 40820090 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BDF03A7 8B9E0000 3C608048 80639D60 809F08F6 7C032000 @@ -2157,15 +2146,15 @@ BE810008 83EDB61C 3863FFFF 1C630006 38A60001 7CA51A14 807D000C 90650002 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm 3C608048 80639D30 5463443E 2C030208 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BBF03A7 57DE043E 8B9D0000 3C608048 80639D60 809F08F6 @@ -2182,20 +2171,20 @@ BE810008 83EDB61C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C8244 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm 3C608048 80639D30 5463443E 2C030208 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB61C +90010004 9421FF20 +BE8100B0 83EDB61C 3BBF03A7 57DE043E 8B9D0000 3C608048 80639D60 809F08F6 @@ -2212,12 +2201,12 @@ BE810008 83EDB61C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C82D0 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm @@ -2227,7 +2216,7 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm 60639D64 80630000 2C030000 40820120 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83EDB61C 3BDF03A7 3BA00000 3B400000 56FB043E 8B9E0000 @@ -2255,12 +2244,12 @@ A0650000 7C1B1800 93450002 88660000 38630001 98660000 2C1D0000 41820028 -7F43D378 BA810008 -800100B4 382100B0 +7F43D378 BA8100B0 +800100E4 382100E0 7C0803A6 3D808038 618CD2A0 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 2C1A0000 60000000 00000000 C216BE28 0000000A #Online/Core/Teams/PreventDeadStranding.asm @@ -2301,8 +2290,8 @@ C2263258 00000169 #Online/Menus/CSS/HandleInputsOnCSS.asm 41A20014 3D808026 618C3334 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 3C608048 +90010004 9421FF20 +BE8100B0 3C608048 80639D30 5463443E 2C030008 40820AFC 7CFB3B78 3F008000 @@ -2383,14 +2372,14 @@ BE810008 3C608048 7C6802A6 906DAFE8 48000878 887A0001 889A0002 7C632039 -41820868 BA810008 -800100B4 382100B0 +41820868 BA8100B0 +800100E4 382100E0 7C0803A6 3D808026 618C3264 7D8903A6 4E800420 576006F7 4082024D 4800083C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600014 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 @@ -2407,12 +2396,12 @@ BE810008 3C608048 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 38600009 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 @@ -2443,27 +2432,27 @@ BE810008 7C7F1B78 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 8A98001A +90010004 9421FF20 +BE8100B0 8A98001A 4BFFFECD 4BFFFE1D -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 38600001 +90010004 9421FF20 +BE8100B0 38600001 986DAFA3 4BFFFFB5 7C6802A6 906DAFE8 880DB650 980DB659 38000004 980DB656 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 38600001 +90010004 9421FF20 +BE8100B0 38600001 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 386000BA @@ -2473,11 +2462,11 @@ BE810008 38600001 7D8903A6 4E800421 7F23CB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 2C1B0200 40820008 B3780015 2C1B0001 4182001C 2C1B0002 @@ -2486,12 +2475,12 @@ B3780015 2C1B0001 4082001D B3780015 88780014 2C030000 4082000C 7F63DB78 -480000B9 BA810008 -800100B4 382100B0 +480000B9 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 38600002 +90010004 9421FF20 +BE8100B0 38600002 3D808037 618CF1E4 7D8903A6 4E800421 7C791B78 386000BB @@ -2506,12 +2495,12 @@ BE810008 38600002 3880007F 38A00040 3D808002 618C37A8 7D8903A6 4E800421 -7F63DB78 BA810008 -800100B4 382100B0 +7F63DB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 48000419 +90010004 9421FF20 +BE8100B0 48000419 7DE802A6 38600002 3D808002 618C4030 7D8903A6 4E800421 @@ -2552,12 +2541,12 @@ D043003C 7E83A378 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 -90010004 9421FF50 -BE810008 820E002C +90010004 9421FF20 +BE8100B0 820E002C 82EE0028 8A300000 8A500002 82700003 82B00007 A2D50015 @@ -2640,8 +2629,8 @@ C02F001C 3D808000 4E800421 7E639B78 3D80803A 618C5CC4 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 00000000 3DCCCCCD C3960000 C3E20000 @@ -2652,12 +2641,12 @@ C20C0000 C1840000 FFFFFFFF FFEA2FFF C9C387FF 43686174 3A202573 00000000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808026 618C3334 7D8903A6 4E800420 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm 3C608048 80639D30 @@ -2680,8 +2669,8 @@ C1AAE148 3FE3D70A C1823D71 C15BAE14 81692081 6A005300 5A000000 7C0802A6 -90010004 9421FF50 -BE810008 38600004 +90010004 9421FF20 +BE8100B0 38600004 38800005 38A00080 3D808039 618C01F0 7D8903A6 4E800421 @@ -2701,8 +2690,8 @@ C03F0008 D03E0024 D03E0028 3860004A C03F0010 48000025 3860004C C03F0014 -48000019 BA810008 -800100B4 382100B0 +48000019 BA8100B0 +800100E4 382100E0 7C0803A6 480002A4 7EE802A6 7C7A1B78 FC600890 C03F000C @@ -2724,8 +2713,8 @@ C03F001C C05F001C 7D8903A6 4E800421 7EE803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFE3D +90010004 9421FF20 +BE8100B0 4BFFFE3D 7FE802A6 83DF0000 3C608043 6063208F 88630000 2C030012 @@ -2785,8 +2774,8 @@ C05F0040 FC011040 7FC3F378 38990001 7F05C378 3D80803A 618C74F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 38600000 38980000 60000000 00000000 @@ -2857,8 +2846,8 @@ FF0000FF 00556E72 4E800021 C2E00000 41A00000 00000000 3DCCCCCD 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFDFD +90010004 9421FF20 +BE8100B0 4BFFFDFD 7FA802A6 3C60804D 606350D8 3C800200 60840801 90830000 @@ -2928,12 +2917,12 @@ C05D007C C07D0074 480000AD C07D005C 480000A5 C07D0060 4800009D C07D0064 -48000095 BA810008 -800100B4 382100B0 +48000095 BA8100B0 +800100E4 382100E0 7C0803A6 48000A9C 7C0802A6 90010004 -9421FF50 BE810008 -D0610038 7F83E378 +9421FF20 BE8100B0 +D0610008 7F83E378 389D0090 38A00000 C03D0068 C05D0048 38FD0098 3D808000 @@ -2941,24 +2930,24 @@ C03D0068 C05D0048 4E800421 7F83E378 389D0090 38A00000 C03D0080 C05D003C -C0610038 38FD0098 +C0610008 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7F83E378 +90010004 9421FF20 +BE8100B0 7F83E378 389D0094 38A00000 C03D0068 C05D003C 38FD0098 3D808000 618C56B4 7D8903A6 4E800421 7C7B1B78 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 8363002C 4BFFFAD5 7FA802A6 3F808000 639C5614 839C0000 @@ -3181,12 +3170,12 @@ A07C000F 3880000F A07C000F 38630001 2C03001E 41800008 38600000 B07C000F -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C6E1B78 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 4BFFF3B5 7FA802A6 820E002C 8A300000 8A500001 @@ -3259,16 +3248,16 @@ C022AE28 3D808036 7E84A378 38840001 7C032000 41820008 4800000C 38600000 -987C0019 BA810008 +987C0019 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7F43D378 3D80803A 618C70A0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 80CDB638 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm @@ -3317,8 +3306,8 @@ C2E00000 41A00000 3C608048 80639D30 5463443E 2C030008 40820100 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFFB1 +90010004 9421FF20 +BE8100B0 4BFFFFB1 7FC802A6 3D808000 618C5618 7D8903A6 4E800421 7C6802A6 @@ -3346,8 +3335,8 @@ BE810008 4BFFFFB1 389E001B 3D808038 618C0358 7D8903A6 4E800421 907F0004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 @@ -3380,7 +3369,7 @@ B8610008 80010104 80630020 00000000 C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FC08000 63DE5614 83DE0000 3C608048 80639D30 5463443E @@ -3393,15 +3382,15 @@ C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm 7FE3FB78 3D808000 618C55F4 7D8903A6 4E800421 48000004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8061003C 38800006 38A00400 3CC08036 60C6410C 38E00001 60000000 00000000 C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3F808000 639C5614 839C0000 3C608048 80639D30 5463443E @@ -3410,8 +3399,8 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm 40820018 8B7C001A 2C1B0003 41820008 3B7BFFFF 9B7D0006 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 387C0000 00000000 C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 48000030 4E800021 @@ -3425,7 +3414,7 @@ C22652F4 000000B8 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm 40820560 888DAFA0 2C040003 40820554 7C0802A6 90010004 -9421FF40 BE810008 +9421FF40 BE810080 DBE100B0 DBC100B8 3FC08000 63DE5614 83DE0000 4BFFFF91 @@ -3498,12 +3487,12 @@ FC20F890 3D808036 80630008 FC20F890 3D808036 618C3C2C 7D8903A6 4E800421 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 480002E8 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C741B78 82B40028 886DB656 2C030000 40820098 3FC08000 @@ -3525,11 +3514,11 @@ FC013040 4181002C 1C630044 7C641A14 80630008 546305EF 41820008 48000019 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3D808000 +90010004 9421FF20 +BE8100B0 3D808000 618C56B8 7D8903A6 4E800421 7C651B78 38600000 1C630024 @@ -3543,11 +3532,11 @@ BE810008 3D808000 4800002D 38600002 3D808002 618C4030 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 808DB610 +90010004 9421FF20 +BE8100B0 808DB610 886DB650 1C630024 7F841A14 887C0070 7C7B1B78 8B3E001A @@ -3576,11 +3565,11 @@ BE810008 808DB610 7F05C378 38C00000 3D808000 618C56BC 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C791B78 +90010004 9421FF20 +BE8100B0 7C791B78 2C190003 4182001C 2C190002 4182000C 2C190001 41820014 @@ -3591,8 +3580,8 @@ BE810008 7C791B78 7C632A14 98830000 38600000 3D808025 618CDB34 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 38600000 38980000 3D80803A 618C6754 @@ -3600,7 +3589,7 @@ BE810008 7C791B78 60000000 00000000 C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08000 63FF5614 83FF0000 3C608048 80639D30 5463443E @@ -3623,8 +3612,8 @@ C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm 7C7B1B78 80ADB610 9B650073 3CA0803F 60A50E09 9B650000 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 9E9803C2 60000000 00000000 C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm @@ -3633,7 +3622,7 @@ C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm 60000000 00000000 C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08000 63FF5614 83FF0000 3C608048 80639D30 5463443E @@ -3654,13 +3643,13 @@ C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm 7F65DB78 38C00000 3D808000 618C56BC 7D8903A6 4E800421 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 38000000 60000000 00000000 C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C9D2378 7C7B1B78 3FE08000 63FF5614 83FF0000 3C608048 @@ -3679,8 +3668,8 @@ C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm 3D808000 618C56BC 7D8903A6 4E800421 48000004 7FA4EB78 -7F63DB78 BA810008 -800100B4 382100B0 +7F63DB78 BA8100B0 +800100E4 382100E0 7C0803A6 98830070 60000000 00000000 0423C710 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8Characters.asm @@ -3713,8 +3702,8 @@ C223CCA4 00000045 #Online/Menus/CSS/TextEntryScreen/CheckTriggersAndZ.asm 41820014 3D808023 618CCCAC 7D8903A6 4E800420 7C0802A6 -90010004 9421FF50 -BE810008 7C9A2378 +90010004 9421FF20 +BE8100B0 7C9A2378 4BFFFFC5 7C6802A6 83E30004 83DF0006 886DB56C 5463063E @@ -3736,12 +3725,12 @@ BE810008 7C9A2378 B07A0002 3D808023 618CCE4C 7D8903A6 4E800421 7F44D378 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808023 618CCCFC 7D8903A6 4E800420 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 886DAFA3 2C030000 418200C8 4BFFFEDD 7C6802A6 @@ -3768,11 +3757,11 @@ BA810008 800100B4 4E800421 807E001A 907F0000 3D808023 618CCE4C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 -7F44D378 BA810008 -800100B4 382100B0 +7F44D378 BA8100B0 +800100E4 382100E0 7C0803A6 3D808023 618CCD34 7D8903A6 4E800420 00000000 @@ -3805,7 +3794,7 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 41820128 38600001 986DAFCB 48000004 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C608023 6063CCA4 80830000 5485863E 7CA50774 54A5801E @@ -3836,8 +3825,8 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 60841070 38A00004 38C00080 3D808039 618C069C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 48000004 38600000 00000000 C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm @@ -3878,8 +3867,8 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 418200D8 7C0802A6 -90010004 9421FF50 -BE810008 3C608023 +90010004 9421FF20 +BE8100B0 3C608023 6063CCA4 80830000 5485863E 7CA50774 54A5801E 5484043A @@ -3888,8 +3877,8 @@ BE810008 3C608023 2C030000 40820038 38600003 3D808002 618C4030 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 3D808023 618CCE38 7D8903A6 4E800420 887F0004 @@ -3900,8 +3889,8 @@ BE810008 3C608023 7D8903A6 4E800421 3860FFFE 818DAFE8 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 @@ -4004,16 +3993,16 @@ C22F6694 000000BD #Online/Menus/InGame/InitInGame.asm 44656C61 793A2025 64660000 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 880DB6CC 2C000001 41820018 7FE3FB78 3D808039 618C10D8 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C60804D 60636D5C 80630000 3C80803F 608494D0 3D808038 @@ -4173,8 +4162,8 @@ EC2100B2 D036002C 4180FCF8 7F43D378 3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8001001C 83E10014 60000000 00000000 043A69C0 4800003C #Online/Menus/InGame/ParseNumbersBetter.asm @@ -4238,7 +4227,7 @@ C34C0000 C31D0000 41880000 3D75C28F 4E800021 01000000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFFD5 7C6802A6 38800001 3D808000 618C5618 7D8903A6 @@ -4270,13 +4259,13 @@ C34C0000 C31D0000 7D8903A6 4E800421 7F83E378 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 B9C10408 60000000 00000000 C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 480000B5 7C6802A6 3C80803D 6084D908 90640000 3C60803E @@ -4297,8 +4286,8 @@ C21B1040 00000167 #Online/Menus/TitleMenu/OnMenuPrep.asm 39950014 7D8903A6 4E800421 3995000C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 48000A6C 4E800021 3D808000 618C5618 7D8903A6 4E800421 @@ -4313,8 +4302,8 @@ BA810008 800100B4 3D80801B 618C136C 7D8903A6 4E800420 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 3FE0804A +90010004 9421FF20 +BE8100B0 3FE0804A 63FF04F0 3FC0803E 63DEAE68 38000005 B00DB528 3D808000 @@ -4343,11 +4332,11 @@ B00DB528 3D808000 8803000D 508026B6 9803000D 38600001 986DAFA2 7F63DB78 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C731B78 80730008 2C030000 40820344 3C60804A 3BA304F0 @@ -4459,8 +4448,8 @@ A09C0000 3D808022 7F6802A6 387B0004 7C6903A6 4E800421 387B0008 7C6903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800021 803EB57C 430C0000 803EB684 07000000 @@ -4468,7 +4457,7 @@ A09C0000 3D808022 0647064B 06480649 064A0000 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 806DB518 3C80803E 6084FA0C 3D808038 618C0358 @@ -4507,17 +4496,17 @@ C3DE0014 3AC00016 7F25CB78 3D808039 618C0A70 7D8903A6 4E800421 7F23CB78 -38810038 38A0000A +38810008 38A0000A 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 -38810038 38A0000B +38810008 38A0000B 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 38800010 3D808037 618C1D9C 7D8903A6 4E800421 7F23CB78 @@ -4528,16 +4517,16 @@ C3DE0014 3AC00016 FC20F890 3D808036 618CF8BC 7D8903A6 4E800421 7F23CB78 -38810038 38A00006 +38810008 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 3C80C060 60840000 90830038 7F23CB78 -38810038 38A00007 +38810008 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 -4E800421 80610038 +4E800421 80610008 3C80405C 60840000 90830038 7F03C378 3C808039 60841070 @@ -4552,13 +4541,13 @@ FC20F890 3D808036 48000039 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 BA810008 +4E800421 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 9421FF40 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 4800022D 7FC802A6 C3FE0010 C3DE0014 7C781B78 @@ -4575,26 +4564,26 @@ C07E0008 C09E000C 3D808000 618C56B4 7D8903A6 4E800421 907A0005 48000198 -7F23CB78 38810038 +7F23CB78 38810008 38A00007 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0000 40820008 FC20F090 -80610038 3D808036 +80610008 3D808036 618CF8BC 7D8903A6 -4E800421 80610038 +4E800421 80610008 3D808037 618C0928 7D8903A6 4E800421 -7F23CB78 38810038 +7F23CB78 38810008 38A00006 38C0FFFF 3D808001 618C1E24 7D8903A6 4E800421 FC20F890 2C1B0001 40820008 FC20F090 -80610038 3D808036 +80610008 3D808036 618CF8BC 7D8903A6 -4E800421 80610038 +4E800421 80610008 3D808037 618C0928 7D8903A6 4E800421 39C00000 7DC37378 @@ -4625,7 +4614,7 @@ FC20F890 2C1B0001 618C5CC4 7D8903A6 4E800421 3C600000 60630000 907C0008 -48000004 BA810008 +48000004 BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 @@ -4666,8 +4655,8 @@ C2186EC4 0000007F #Online/Menus/VSScreen/InitVsSplash.asm 5465616D 20310054 65616D20 32005031 00503200 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3C80803F 608411A4 3CA0803F 60A51194 3D80803A 618C62A0 @@ -4725,11 +4714,11 @@ A0DD026A 38600000 7C841A14 8884005C 7FC3F378 3D80803A 618C6368 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4800018C 7C0802A6 90010004 -9421FF40 BE810008 +9421FF40 BE810080 DBE100B0 DBC100B8 FFE00890 7C761B78 7C942378 7CB92B78 @@ -4758,12 +4747,12 @@ FC60F090 3D808000 618C56B4 7D8903A6 4E800421 39CE0004 39EF0001 7C0FD000 -4180FFAC BA810008 +4180FFAC BA810080 CBE100B0 CBC100B8 800100C4 382100C0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38A00008 38C000FF 7C7A3039 7C632C30 38E00008 39200000 @@ -4774,16 +4763,16 @@ CBE100B0 CBC100B8 39290001 2C090003 4180FFD8 7F46D378 80A10010 80E1000C -81010008 BA810008 -800100B4 382100B0 +81010008 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 3800FFFF 00000000 C2184DE4 00000010 #Online/Menus/VSScreen/PlayOpponentCharAnnouncer.asm 3D808048 818C9D30 558C443E 2C0C0408 40820068 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 887F0004 @@ -4791,8 +4780,8 @@ BE810008 38600000 7FC418AE 7FE3FB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 BA810008 -800100B4 382100B0 +7FC3F378 BA8100B0 +800100E4 382100E0 7C0803A6 48000008 887E00F4 00000000 C21B3650 00000004 #Online/Menus/VSScreen/PreventP2Color.asm @@ -4804,8 +4793,8 @@ C2185060 00000013 #Online/Menus/VSScreen/HideStageDisplay/HideAllJObjs.asm 3D808048 818C9D30 558C443E 2C0C0408 40820078 7C0802A6 -90010004 9421FF50 -BE810008 83E30028 +90010004 9421FF20 +BE8100B0 83E30028 3BC00000 7FE3FB78 38810080 7FC5F378 38C0FFFF 3D808001 @@ -4814,8 +4803,8 @@ BE810008 83E30028 80640014 60630010 90640014 3BDE0001 2C1E001B 4180FFC8 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808018 618C51AC 7D8903A6 4E800420 3C608047 3BE335A8 @@ -4825,8 +4814,8 @@ C2184ADC 00000010 #Online/Menus/VSScreen/HideStageText/HideLetterJObjs.asm 3D808048 818C9D30 558C443E 2C0C0408 40820068 7C0802A6 -90010004 9421FF50 -BE810008 3BE00009 +90010004 9421FF20 +BE8100B0 3BE00009 7F63DB78 38810080 7FE5FB78 38C0FFFF 3D808001 618C1E24 @@ -4835,8 +4824,8 @@ BE810008 3BE00009 618CF6B4 7D8903A6 4E800421 3BFF0001 2C1F000E 4180FFC4 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3BBE0038 00000000 04184B1C 480001D8 #Online/Menus/VSScreen/HideStageText/SkipStageNumberShow.asm C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm @@ -4860,8 +4849,8 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm 38600001 00000000 C21A45B8 000001F0 #Online/Slippi Online Scene/main.asm 3BA30004 7C0802A6 -90010004 9421FF50 -BE810008 3C80803E +90010004 9421FF20 +BE8100B0 3C80803E 6084DC1C 48000281 7C6802A6 38630000 90640008 38600000 @@ -4875,7 +4864,7 @@ BE810008 3C80803E 7C840734 7C841A14 90830000 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 3C80803D 6084AD30 48000091 7C6802A6 @@ -4893,12 +4882,12 @@ BE810008 3C80803E 4BFFFF5D 38740010 4BFFFF55 38740014 4BFFFF4D 3A940018 -4BFFFFCC BA810008 -800100B4 382100B0 +4BFFFFCC BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 3C808045 +90010004 9421FF20 +BE8100B0 3C808045 6084ABF0 886DAEF8 98640006 48000159 7C8802A6 48000B31 @@ -4914,15 +4903,15 @@ BE810008 3C808045 987400DD 48000014 3AD60001 3A94001C 7C16A800 4180FFDC -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600012 3C80803F 60840CC8 98640001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 00030000 480000B9 4800012D 08000000 @@ -4948,8 +4937,8 @@ FF000000 4E800021 00000000 00000000 00000000 00000000 00000000 7C0802A6 -90010004 9421FF50 -BE810008 808D8840 +90010004 9421FF20 +BE8100B0 808D8840 3BE40530 3D80801A 618C427C 7D8903A6 4E800421 88BF0002 @@ -4960,11 +4949,11 @@ BE810008 808D8840 7D8903A6 4E800421 3D808001 618C74BC 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7E1B78 +90010004 9421FF20 +BE8100B0 7C7E1B78 3D80801B 618CAAD0 7D8903A6 4E800421 809E0014 88840003 @@ -4997,18 +4986,18 @@ BE810008 7C7E1B78 98640005 48000018 3C808047 60849D30 38600002 98640005 -48000004 BA810008 -800100B4 382100B0 +48000004 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D80801B 618C1514 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 809F0014 88840004 2C040000 4082001C 38600000 3D80801A @@ -5026,11 +5015,11 @@ BE810008 7C7F1B78 38600000 3D80801A 618C42A0 7D8903A6 4E800421 48000004 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3D80801B +90010004 9421FF20 +BE8100B0 3D80801B 618C15C8 7D8903A6 4E800421 38600000 3D808000 618C5610 @@ -5114,14 +5103,14 @@ BE810008 3D80801B 7D8903A6 4E800421 7FE3FB78 3D808037 618CF1B0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 4E800021 01780101 01FF2121 FF2121EE 0000EE00 7C0802A6 -90010004 9421FF50 -BE810008 38600000 +90010004 9421FF20 +BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7E1B78 83ED8840 @@ -5221,17 +5210,17 @@ BE810008 38600000 7D8903A6 4E800421 3D808002 618C7168 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 3C808047 +90010004 9421FF20 +BE8100B0 3C808047 60849D30 38600003 -98640005 BA810008 -800100B4 382100B0 +98640005 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 38600000 3D808000 618C5610 7D8903A6 4E800421 7C7F1B78 @@ -5257,11 +5246,11 @@ B0640003 3C808049 98640016 7FE3FB78 3D808037 618CF1B0 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3FE08047 63FF9DA4 887F0004 2C030001 41820010 2C030002 @@ -5290,11 +5279,11 @@ BA810008 800100B4 40820010 48000014 38600000 48000010 38600001 48000008 -3860FFFF BA810008 -800100B4 382100B0 +3860FFFF BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7D1B78 3FE08047 63FF9DA4 1FDD00A8 7FDEFA14 887F0004 @@ -5322,19 +5311,19 @@ BA810008 800100B4 2C030000 41820010 48000004 38600000 48000008 38600001 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 83E30010 +90010004 9421FF20 +BE8100B0 83E30010 887F0005 2C030000 40820014 3D808001 618C74BC 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83E30010 38600000 3D808000 618C5610 7D8903A6 4E800421 @@ -5349,16 +5338,16 @@ BE810008 83E30010 48000018 4BFFFC5D 3C808047 60849D30 38600005 98640005 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 BA810008 -800100B4 382100B0 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 BA8100B0 +800100E4 382100E0 7C0803A6 38600028 987E0000 00000000 04005694 4E800020 #Online/Static/AdjustNullCharID.asm C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 7CBD2B78 7CDC3378 3D808000 618C56B8 @@ -5371,8 +5360,8 @@ C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm 7C9E2A14 7FE3FB78 7F85E378 3D808025 618CD5AC 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20056AC 0000002F #Online/Static/ChatMessages.asm @@ -5434,7 +5423,7 @@ C2005698 00000002 #Online/Static/GetCSSIconNum.asm 60000000 00000000 C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 7FC3F378 2C1F0003 41820028 2C1F0002 @@ -5446,8 +5435,8 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm 7D8903A6 4E800421 48000014 3D808016 618C9264 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20055F4 00000007 #Online/Static/IntToFloat.asm @@ -5460,7 +5449,7 @@ EC211028 C0410008 60000000 00000000 C2005610 00000012 #Online/Static/LoadMatchState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 2C030000 40820018 38600394 3D808037 618CF1E4 7D8903A6 @@ -5473,13 +5462,13 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm 38800394 38A00000 3D808000 618C55F0 7D8903A6 4E800421 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C20056A4 00000022 #Online/Static/LoadPremadeText.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 7C9E2378 3B800004 7F83E378 3D808037 618CF1E4 @@ -5495,11 +5484,11 @@ C20056A4 00000022 #Online/Static/LoadPremadeText.asm 618CF1E4 7D8903A6 4E800421 7C7D1B78 386000E2 4800001D -7FA3EB78 BA810008 -800100B4 382100B0 +7FA3EB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 987D0000 9BFD0001 9BDD0002 7FA3EB78 38800003 38A00001 @@ -5508,13 +5497,13 @@ C20056A4 00000022 #Online/Static/LoadPremadeText.asm 7FA3EB78 7F84E378 38A00000 3D808000 618C55F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C200560C 00000033 #Online/Static/LoadState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7B1B78 7C982378 7CBA2B78 88DA0000 3AC00000 3AD60001 @@ -5561,21 +5550,21 @@ BC610008 7F05C378 4E800421 7EE3BB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 00000000 C20055EC 00000008 #Online/Static/MultiplyRWithF.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808000 618C55F4 7D8903A6 4E800421 -EC2100B2 BA810008 -800100B4 382100B0 +EC2100B2 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C2005608 00000016 #Online/Static/SaveState.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7B1B78 7C982378 7CBA2B78 887A0000 1C630004 389A0002 @@ -5593,21 +5582,21 @@ C2005608 00000016 #Online/Static/SaveState.asm 4E800421 7EE3BB78 3D808034 618C738C 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 00000000 C20056B4 00000063 #Online/Static/SubtextFunctions.asm 2C050002 41820228 7C0802A6 90010004 -9421FF20 BE810008 +9421FF20 BE810080 DBE100B0 DBC100B8 DBA100C0 DB8100C8 DB6100D0 DB4100D8 7C751B78 7C962378 7CB82B78 7CD93378 -90E10038 9101003C -91210040 91410044 -91610048 9181004C +90E10008 9101000C +91210010 91410014 +91610018 9181001C FFE00890 FFC01090 FFA01890 FF602890 FF403090 2C180001 @@ -5622,7 +5611,7 @@ FC20F090 FC40E890 48000014 EC42D028 4800000C EC42D02A 48000004 7EA3AB78 -80810038 3D80803A +80810008 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 7EA3AB78 7EE4BB78 @@ -5635,15 +5624,15 @@ FC20F890 FC40F890 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 7EE4BB78 -80A10038 80C1003C -80E10040 81010044 -81210048 8141004C +80A10008 80C1000C +80E10010 81010014 +81210018 8141001C 3D80803A 618C70A0 7D8903A6 4E800421 2C0F0000 4182000C 39EFFFFF 4BFFFF14 48000094 7EA3AB78 -80810038 FC20F090 +80810008 FC20F090 FC40E890 3D80803A 618C6B98 7D8903A6 4E800421 7C771B78 @@ -5655,20 +5644,20 @@ FC20F890 FC40F890 7EC5B378 3D80803A 618C74F0 7D8903A6 4E800421 7EA3AB78 -7EE4BB78 80A10038 -80C1003C 80E10040 -81010044 81210048 -8141004C 3D80803A +7EE4BB78 80A10008 +80C1000C 80E10010 +81010014 81210018 +8141001C 3D80803A 618C70A0 7D8903A6 4E800421 7EE3BB78 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 CBA100C0 CB8100C8 CB6100D0 CB4100D8 800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 9421FF30 -BE810008 DBE100B0 +BE810080 DBE100B0 DBC100B8 DBA100C0 DB8100C8 7C7D1B78 7C9C2378 7CDB3378 @@ -5689,7 +5678,7 @@ FC00F890 D0030024 D0030028 3D80803A 618C6368 7D8903A6 4E800421 7EA3AB78 -BA810008 CBE100B0 +BA810080 CBE100B0 CBC100B8 CBA100C0 CB8100C8 800100D4 382100D0 7C0803A6 @@ -5708,7 +5697,7 @@ FFFFFFFF 3ECCCCCD 7200436F 6E6E6563 7420436F 64650000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C791B78 7C9B2378 2C050000 41820008 480003D1 4BFFFFA9 @@ -5733,11 +5722,11 @@ D03C0028 38600001 480000D1 38600000 48000029 480000D5 886DAFA1 987E0004 -7FA3EB78 BA810008 -800100B4 382100B0 +7FA3EB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7A1B78 C03E000A C05E000E 7F83E378 389F001C 3D80803A @@ -5753,13 +5742,13 @@ FC400890 7F83E378 38BF000C 7F83E378 7F04C378 3D80803A 618C74F0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 C05E000E EC42082A D05E000E 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFE25 7FE802A6 83DF0000 83BE0000 839E0005 48000159 @@ -5790,11 +5779,11 @@ D05E000E 4E800020 7F83E378 38800003 38BD0020 3D80803A 618C70A0 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFD0D 7FE802A6 83DF0000 889E0004 886DAFA1 7C041800 @@ -5803,11 +5792,11 @@ D05E000E 4E800020 618C4030 7D8903A6 4E800421 806DB614 7C6903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C0802A6 -90010004 9421FF50 -BE810008 4BFFFCA9 +90010004 9421FF20 +BE8100B0 4BFFFCA9 7FE802A6 83DF0000 83BE0000 386000B9 987D0000 7FA3EB78 @@ -5818,11 +5807,11 @@ BE810008 4BFFFCA9 38A00000 3D808000 618C55F0 7D8903A6 4E800421 889D0000 -988DAFA1 BA810008 -800100B4 382100B0 +988DAFA1 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3CA0803E 60A5AE68 88A508F4 38800000 38600008 3D808022 @@ -5830,11 +5819,11 @@ BE810008 4BFFFCA9 4E800421 2C030001 41820010 38840001 7C042800 4180FFDC -7C832378 BA810008 -800100B4 382100B0 +7C832378 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 4BFFFBCD 7FE802A6 38600012 3D808037 618CF1E4 7D8903A6 @@ -5842,8 +5831,8 @@ BE810008 4BFFFCA9 907F0000 3860002A 3D808037 618CF1E4 7D8903A6 4E800421 -907E0000 BA810008 -800100B4 382100B0 +907E0000 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm @@ -8515,7 +8504,7 @@ C21D24FC 00000018 #Common/PSCameraIndependentMonitor/PSCameraIndependentMonitor. C2F00000 42F00000 42A00000 C1A00000 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 4BFFFFD9 7FA802A6 807E002C A86300EE 3D808003 @@ -8532,8 +8521,8 @@ FC020840 41810018 C03D000C FC020840 4180000C 38600001 48000008 38600000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 60000000 00000000 $Recommended: Normal Lag Reduction [Hannes Mann] @@ -8544,45 +8533,46 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200F8 +2C030004 408200FC 3C608048 88639D30 -2C030008 418200E8 +2C030008 418200EC 3C608047 60639D64 80630000 2C030000 -408200D4 7C0802A6 -90010004 9421FF50 -BE810008 3C60802F -6063666C 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 -83E30008 887F0000 -2C030000 40810080 -38610038 388100DC -38A00030 3D808000 -618C31F4 7D8903A6 -4E800421 887F0001 -1C630030 3BC30002 -386100DC 7C9FF214 -38A00030 3D808000 -618C31F4 7D8903A6 -4E800421 7C7FF214 -38810038 38A00030 +408200D8 7C0802A6 +90010004 9421FF20 +BE8100B0 83A10000 +3C60802F 6063666C +80830000 5485863E +7CA50774 54A5801E +5484043A 7C842B78 +7C632214 83E30008 +887F0000 2C030000 +40810080 38610008 +389D002C 38A00030 3D808000 618C31F4 7D8903A6 4E800421 -889F0000 887F0001 -38630001 7C032000 -41800008 38600000 -987F0001 BA810008 -800100B4 382100B0 -7C0803A6 00000000 +887F0001 1C630030 +3BC30002 387D002C +7C9FF214 38A00030 +3D808000 618C31F4 +7D8903A6 4E800421 +7C7FF214 38810008 +38A00030 3D808000 +618C31F4 7D8903A6 +4E800421 889F0000 +887F0001 38630001 +7C032000 41800008 +38600000 987F0001 +BA8100B0 800100E4 +382100E0 7C0803A6 +60000000 00000000 C22F666C 0000005C #Common/UseInGameDelay/InitializeInGameDelay.asm 4800007C 4E800021 80000000 4E800021 @@ -8591,19 +8581,19 @@ C22F666C 0000005C #Common/UseInGameDelay/InitializeInGameDelay.asm 3EA8F5C3 44656C61 793A2025 64660000 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 7C7F1B78 +90010004 9421FF20 +BE8100B0 7C7F1B78 880DB6CC 2C000001 41820018 7FE3FB78 3D808039 618C10D8 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 7C7F1B78 3C608048 88639D30 2C030008 4182024C 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 386002D2 3D808037 618CF1E4 7D8903A6 4E800421 7C7F1B78 @@ -8673,12 +8663,12 @@ C05D000C 7F83E378 C03D0010 C05D0010 3D80803A 618C7548 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 7FE3FB78 00000000 C200561C 00000013 #Common/GetCommonMinorID/GetCommonMinorID.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3CA08048 8BC59D30 8BE59D33 3FA0803D 63BDACA4 38800000 @@ -8692,11 +8682,27 @@ C200561C 00000013 #Common/GetCommonMinorID/GetCommonMinorID.asm 7C06F800 4082000C 8865000C 48000010 38840001 2C0600FF -4082FFDC BA810008 -800100B4 382100B0 +4082FFDC BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 +$Recommended: Lagless FoD [Achilles, Myougi, Dan Salvato] +*Disables particles and reflection on FoD to improve performance +C21CBB90 00000005 #Lagless FoD +9421FFF8 3CC0804A +80C6ED78 3CA00002 +60A5AE44 7CA53050 +88C50000 60C60004 +98C50000 00000000 +041CC8AC FC000028 +041CBE9C 60000000 +041CBEF0 60000000 +041CBF54 60000000 +04390838 60000000 +041CD250 60000000 +041CCDCC 480000B4 + $Optional: Widescreen 16:9 [Dan Salvato, mirrorbender, Achilles1515, UnclePunch] *Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ---------------------- *Will not cause desyncs when playing online From cd78b29c7c553d7a336dff46c7e19fc5047e08ff Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Tue, 8 Nov 2022 21:08:09 -0400 Subject: [PATCH 09/23] Use iconv fallbacks on macos so special and SJIS characters are properly converted and rendered in-game. --- Source/Core/Common/StringUtil.cpp | 55 ++++++++++++++++++++++-- Source/Core/Common/StringUtil.h | 9 ++++ Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 2 +- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 1ad9e7f52c..83d0a82a52 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -544,11 +544,18 @@ std::string UTF32toUTF8(const std::u32string &input) } #else template -std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string& input) +std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const std::basic_string &input, + iconv_fallbacks *fallbacks) { std::string result; iconv_t const conv_desc = iconv_open(tocode, fromcode); + + if (fallbacks) + { + iconvctl(conv_desc, ICONV_SET_FALLBACKS, fallbacks); + } + if ((iconv_t)-1 == conv_desc) { ERROR_LOG(COMMON, "Iconv initialization failure [%s]: %s", fromcode, strerror(errno)); @@ -599,6 +606,11 @@ std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_st return result; } +template std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string &input) +{ + return CodeToWithFallbacks(tocode, fromcode, input, nullptr); +} + template std::string CodeToUTF8(const char* fromcode, const std::basic_string& input) { @@ -618,9 +630,46 @@ std::string SHIFTJISToUTF8(const std::string& input) return CodeToUTF8("SJIS", input); } -std::string UTF8ToSHIFTJIS(const std::string& input) +#ifdef __APPLE__ +void uc_to_mb_fb(unsigned int code, void (*write_replacement)(const char *buf, size_t buflen, void *callback_arg), + void *callback_arg, void *data) +{ + static std::unordered_map specialCharConvert = { + {'!', (const char*)"\x81\x49"}, {'"', (const char*)"\x81\x68"}, {'#', (const char*)"\x81\x94"}, {'$', (const char*)"\x81\x90"}, + {'%', (const char*)"\x81\x93"}, {'&', (const char*)"\x81\x95"}, {'\'', (const char*)"\x81\x66"}, {'(', (const char*)"\x81\x69"}, + {')', (const char*)"\x81\x6a"}, {'*', (const char*)"\x81\x96"}, {'+', (const char*)"\x81\x7b"}, {',', (const char*)"\x81\x43"}, + {'-', (const char*)"\x81\x7c"}, {'.', (const char*)"\x81\x44"}, {'/', (const char*)"\x81\x5e"}, {':', (const char*)"\x81\x46"}, + {';', (const char*)"\x81\x47"}, {'<', (const char*)"\x81\x83"}, {'=', (const char*)"\x81\x81"}, {'>', (const char*)"\x81\x84"}, + {'?', (const char*)"\x81\x48"}, {'@', (const char*)"\x81\x97"}, {'[', (const char*)"\x81\x6d"}, {'\\', (const char*)"\x81\x5f"}, + {']', (const char*)"\x81\x6e"}, {'^', (const char*)"\x81\x4f"}, {'_', (const char*)"\x81\x51"}, {'`', (const char*)"\x81\x4d"}, + {'{', (const char*)"\x81\x6f"}, {'|', (const char*)"\x81\x62"}, {'}', (const char*)"\x81\x70"}, {'~', (const char*)"\x81\x60"}, + {U'¥', "\x81\x8f"}, {U'•', "\x81\x45"}, {U'—', "\x81\x7C"} + }; + + bool hasConversion = specialCharConvert.count(code); + if (!hasConversion) + return; + + auto newChar = specialCharConvert[code]; + // Add new chars to pos to replace + write_replacement(newChar, 2, callback_arg); +} +#endif + +std::string UTF8ToSHIFTJIS(const std::string &input) { - return CodeTo("SJIS", "UTF-8", input); + auto fallbacks = new iconv_fallbacks(); +#ifdef __APPLE__ + // Set SHIFTJIS callbacks only if converting to shift jis + fallbacks->uc_to_mb_fallback = uc_to_mb_fb; + fallbacks->mb_to_uc_fallback = nullptr; + fallbacks->mb_to_wc_fallback = nullptr; + fallbacks->wc_to_mb_fallback = nullptr; + fallbacks->data = nullptr; +#endif + auto str = CodeToWithFallbacks("SJIS", "UTF-8", input, fallbacks); + free(fallbacks); + return str; } std::string UTF16ToUTF8(const std::wstring& input) diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index 45c79b322c..cdc4ad5222 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -134,6 +134,15 @@ std::string SHIFTJISToUTF8(const std::string& str); std::string UTF8ToSHIFTJIS(const std::string& str); std::string UTF16ToUTF8(const std::wstring &str); + +#ifdef __APPLE__ +/** + * Callback Implementation used for iconv when a unicode character could not be automatically converted. + * This callback is used specifically for SHIFTJIS failures when converting some special wide characters for melee. + */ +void uc_to_mb_fb(unsigned int code,void (*write_replacement)(const char *buf, size_t buflen, void* callback_arg), void* callback_arg, void* data); +#endif + #ifdef _WIN32 std::wstring UTF8ToUTF16(const std::string& str); diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 27dc9b106f..a5dcb3a772 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -2066,7 +2066,7 @@ void CEXISlippi::prepareOnlineMatchState() chatMessagePlayerIdx = 0; localChatMessageId = 0; // in CSS p1 is always current player and p2 is opponent - localPlayerName = p1Name = "Player 1"; + localPlayerName = p1Name = userInfo.displayName; oppName = p2Name = "Player 2"; #endif From f4f90deed8b3c221cf7502a8ad46324a96189bc8 Mon Sep 17 00:00:00 2001 From: Robert Peralta Date: Tue, 8 Nov 2022 21:12:13 -0400 Subject: [PATCH 10/23] build codesets --- Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 7335 -> 12659 bytes Data/Sys/GameSettings/GALE01r2.ini | 813 +++++++----------------- Data/Sys/GameSettings/GALJ01r2.ini | 813 +++++++----------------- 3 files changed, 490 insertions(+), 1136 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index cd1fadc0258cfbae29cf13027974c9240868c416..234f50ad79f1d9704e67ab1810073ec5f5bfe05e 100644 GIT binary patch literal 12659 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 literal 7335 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 G?tcP?I-l$S diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index 378f794569..1f5c968ff5 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -2340,14 +2340,14 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm 618C5610 7D8903A6 4E800421 38000000 60000000 00000000 -C2263258 00000169 #Online/Menus/CSS/HandleInputsOnCSS.asm +C2263258 000000B9 #Online/Menus/CSS/HandleInputsOnCSS.asm 41A20014 3D808026 618C3334 7D8903A6 4E800420 7C0802A6 90010004 9421FF20 BE8100B0 3C608048 80639D30 5463443E -2C030008 40820AFC +2C030008 4082057C 7CFB3B78 3F008000 63185614 83180000 83580000 3B800000 @@ -2370,30 +2370,30 @@ BE8100B0 3C608048 2C030003 4081008C 2C030004 41820090 2C030005 418201E8 -48000A28 88780014 -2C030000 40820A1C -576004E7 41820A14 +480004A8 88780014 +2C030000 4082049C +576004E7 41820494 3C608048 80639D60 -2C030000 41820A04 +2C030000 41820484 3860FFFF 986DAFC9 38600000 986DAFCA 886DB657 2C030000 -418209E8 886DAFA0 +41820468 886DAFA0 2C030000 41820018 2C030001 41820010 2C030002 40800014 48000000 3860FFFE -48000355 480009BC -4800037D 480009B4 +48000355 4800043C +4800037D 48000434 576006F7 408203B9 -480009A8 3D80801A +48000428 3D80801A 618C3680 7D8903A6 4E800421 548006F7 41820024 88780013 38630001 98780013 2C030030 40810014 9B980013 48000381 -48000970 9B980013 +480003F0 9B980013 887A0001 2C030000 408200EC 576004E7 4082002C 886DAFA0 @@ -2424,14 +2424,14 @@ BE8100B0 3C608048 98640018 38600001 986DB656 480000F5 7C6802A6 906DAFE8 -48000878 887A0001 +480002F8 887A0001 889A0002 7C632039 -41820868 BA8100B0 +418202E8 BA8100B0 800100E4 382100E0 7C0803A6 3D808026 618C3264 7D8903A6 4E800420 576006F7 -4082024D 4800083C +4082024D 480002BC 7C0802A6 90010004 9421FF20 BE8100B0 38600014 3D808037 @@ -2519,182 +2519,6 @@ BE8100B0 38600001 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -2C1B0200 40820008 -B3780015 2C1B0001 -4182001C 2C1B0002 -41820014 2C1B0008 -4182000C 2C1B0004 -4082001D B3780015 -88780014 2C030000 -4082000C 7F63DB78 -480000B9 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -7C6E1B78 7C0802A6 -90010004 9421FF20 -BE8100B0 38600002 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C791B78 386000BB -98790000 7DC37378 -98790001 7F23CB78 -38800002 38A00001 -3D808000 618C55F0 -7D8903A6 4E800421 -7F23CB78 3D808037 -618CF1B0 7D8903A6 -4E800421 386000B7 -3880007F 38A00040 -3D808002 618C37A8 -7D8903A6 4E800421 -7F63DB78 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -7C6E1B78 7C0802A6 -90010004 9421FF20 -BE8100B0 48000419 -7DE802A6 38600002 -3D808002 618C4030 -7D8903A6 4E800421 -7DC37378 98780014 -3860000B 3D808037 -618CF1E4 7D8903A6 -4E800421 7C771B78 -3880000B 3D808000 -618CC160 7D8903A6 -4E800421 7DC37378 -98770000 7F03C378 -90770007 38600004 -38800005 38A00080 -3D808039 618C01F0 -7D8903A6 4E800421 -7C741B78 80780004 -80630000 80630000 -3D808037 618C0E44 -7D8903A6 4E800421 -7C751B78 C02F0024 -888DAFE0 2C040000 -41820008 C02F0028 -C04F002C D0230038 -D043003C 7E83A378 -38800004 7EA5AB78 -3D808039 618C0A70 -7D8903A6 4E800421 -7E83A378 3C808039 -60841070 38A00001 -38C00080 3D808039 -618C069C 7D8903A6 -4E800421 7E83A378 -38800004 3CA08037 -60A5F1B0 7EE6BB78 -3D808039 618C0B68 -7D8903A6 4E800421 -7E83A378 48000031 -7C8802A6 38A00004 -3D808038 618CFD54 -7D8903A6 4E800421 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 -7C6E1B78 7C0802A6 -90010004 9421FF08 -BDC100B0 820E002C -82EE0028 8A300000 -8A500002 82700003 -82B00007 A2D50015 -83550000 38600000 -B0750015 88700001 -2C030000 40820234 -2C130000 40820194 -38600090 7C721B78 -98700002 48000261 -7DE802A6 7E238B78 -3D808000 618C56AC -7D8903A6 4E800421 -7C741B78 38600000 -38800000 3D80803A -618C6754 7D8903A6 -4E800421 7C731B78 -92700003 38600001 -38800000 C02F0000 -C04F0004 98730049 -9893004A D0330008 -D0530024 D0530028 -C04F0008 886DAFE0 -2C030000 41820008 -C04F000C 388F0034 -887A0000 2C030004 -41820008 388F0038 -7E639B78 38A00000 -38CF0030 38EF003C -39140004 C02F001C -C06F0018 3D808000 -618C56B4 7D8903A6 -4E800421 7C641B78 -7C8A2378 7C8B2378 -386B0002 C04F0020 -3D808000 618C55EC -7D8903A6 4E800421 -C06F0018 EC63082A -2C0B0000 4182001C -2C0B0001 4182002C -2C0B0002 4182001C -2C0B0003 4182000C -38800008 48000018 -38800004 48000010 -38800002 48000008 -38800001 7E238B78 -3D808000 618C56AC -7D8903A6 4E800421 -7C872378 C04F0010 -886DAFE0 2C030000 -41820008 C04F0014 -7E639B78 388F0030 -38A00000 38CF0030 -C02F001C 3D808000 -618C56B4 7D8903A6 -4E800421 7C6B1B78 -386A0004 7C0B1800 -4082FF48 480000CC -88750018 2C030000 -41820010 88700002 -2C03008A 41810070 -2C160200 40820008 -48000078 2C160000 -4182005C 88750018 -2C030003 4080003C -88750017 2C030005 -40800030 38600000 -98700002 7E238B78 -7EC4B378 38A00004 -7C632830 7C632214 -4BFFFBB1 38600001 -98700001 4800005C -38600003 3D808002 -618C4030 7D8903A6 -4E800421 2C120000 -41820010 3A52FFFF -9A500002 48000034 -38600000 98750014 -7DC37378 3D808039 -618C0228 7D8903A6 -4E800421 7E639B78 -3D80803A 618C5CC4 -7D8903A6 4E800421 -B9C100B0 800100FC -382100F8 7C0803A6 -4E800020 4E800021 -00000000 3DCCCCCD -C3960000 C3E20000 -C38E8000 C3DA8000 -429E0000 3EE66666 -41C80000 C1A00000 -C20C0000 C1840000 -FFFFFFFF FFEA2FFF -C9C387FF 43686174 -3A202573 00000000 BA8100B0 800100E4 382100E0 7C0803A6 3D808026 618C3334 @@ -2833,307 +2657,239 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm +C2264534 0000014D #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820EE8 480001F8 +40820A4C 480001C4 4E800021 00000000 -3DCCCCCD 404CCCCD -413CCCCD 3F4CCCCD -C1600000 41C00000 -00000000 41F00000 -42480000 C2320000 -C1EC0000 C1BA0000 -40A00000 3D23D70A -428C0000 41B80000 -3F000000 42B40000 -42500000 42960000 -42C40000 42500000 -428C0000 42B00000 -42D40000 3ECCCCCD -43048000 43188000 -C3760000 C3020000 -C2480000 3EE66666 -33FF2FFF 3CBCFFFF -8E9196FF FFFFFFFF -FF0000FF 00556E72 -616E6B65 64004469 -72656374 0052616E -6B656400 5465616D -73002573 204D6F64 -65005365 6C656374 -20796F75 72206368 -61726163 74657200 -43686172 61637465 -72207365 6C656374 -65640050 72657373 -20535441 52542074 -6F202573 006C6F63 -6B20696E 00656E74 -65722063 6F646500 -73656172 63680073 -656C6563 74207374 -61676500 4C6F636B -65642069 6E005365 -61726368 696E6720 -666F7220 25730043 -6F6E6E65 6374696E -6720746F 20257300 -57616974 696E6720 -6F6E2025 73006F70 -706F6E65 6E74002D +3DCCCCCD 428C0000 +41B80000 3F000000 +42B40000 42500000 +42960000 42C40000 +42500000 428C0000 +42B00000 42D40000 +3ECCCCCD 43048000 +43188000 C3760000 +C3020000 C2480000 +3EE66666 33FF2FFF +3CBCFFFF 8E9196FF +FFFFFFFF FF0000FF +00556E72 616E6B65 +64004469 72656374 +0052616E 6B656400 +5465616D 73002573 +204D6F64 65005365 +6C656374 20796F75 +72206368 61726163 +74657200 43686172 +61637465 72207365 +6C656374 65640050 +72657373 20535441 +52542074 6F202573 +006C6F63 6B20696E +00656E74 65722063 +6F646500 73656172 +63680073 656C6563 +74207374 61676500 +4C6F636B 65642069 +6E005365 61726368 +696E6720 666F7220 +25730043 6F6E6E65 +6374696E 6720746F +20257300 57616974 +696E6720 6F6E2025 +73006F70 706F6E65 +6E74002D 2D2F2F2D 2D2F2F2D 2D2F2F2D -2D2F2F2D 2D2F2F30 -30004572 726F7200 -506C6179 696E673A -00557365 20442D50 -61642074 6F204368 -61740050 72657373 -205A2074 6F202573 -00486F6C 64205A20 -746F2025 73006469 -73636F6E 6E656374 -0063616E 63656C00 -636C6561 72206572 -726F7200 817B0081 -7E00817C 00000000 -4E800021 C2E00000 -41A00000 00000000 -3DCCCCCD 7C0802A6 -90010004 9421FF20 -BE8100B0 4BFFFDFD -7FA802A6 3C60804D -606350D8 3C800200 -60840801 90830000 -888DAFA0 2C040002 -38800001 41800008 -38800002 4BFFFFAD -7C6802A6 3D808000 -618C5618 7D8903A6 -4E800421 38A00000 -4E800021 38600004 -38800005 38A00080 -3D808039 618C01F0 -7D8903A6 4E800421 -7C791B78 38600004 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C781B78 38790000 -38800004 3CA08037 -60A5F1B0 38D80000 -3D808039 618C0B68 +2D2F2F30 30004572 +726F7200 506C6179 +696E673A 00557365 +20442D50 61642074 +6F204368 61740050 +72657373 205A2074 +6F202573 00486F6C +64205A20 746F2025 +73006469 73636F6E +6E656374 0063616E +63656C00 636C6561 +72206572 726F7200 +817B0081 7E00817C +00000000 4E800021 +C2E00000 41A00000 +00000000 3DCCCCCD +7C0802A6 90010004 +9421FF20 BE8100B0 +4BFFFE31 7FA802A6 +3C60804D 606350D8 +3C800200 60840801 +90830000 888DAFA0 +2C040002 38800001 +41800008 38800002 +4BFFFFAD 7C6802A6 +3D808000 618C5618 7D8903A6 4E800421 -38790000 48000261 -7C8802A6 38A00004 -3D808038 618CFD54 +38A00000 4E800021 +38600004 38800005 +38A00080 3D808039 +618C01F0 7D8903A6 +4E800421 7C791B78 +38600004 3D808037 +618CF1E4 7D8903A6 +4E800421 7C781B78 +38790000 38800004 +3CA08037 60A5F1B0 +38D80000 3D808039 +618C0B68 7D8903A6 +4E800421 38790000 +48000261 7C8802A6 +38A00004 3D808038 +618CFD54 7D8903A6 +4E800421 3FE08000 +63FF5614 83FF0000 +38600000 38800000 +3D80803A 618C6754 7D8903A6 4E800421 -3FE08000 63FF5614 -83FF0000 38600000 -38800000 3D80803A -618C6754 7D8903A6 -4E800421 7C7C1B78 -939F0008 38800001 -989C0049 38800000 -989C004A C03D0000 -D03C0008 C03D0004 -D03C0024 D03C0028 -7F83E378 389D0090 -38A00000 C03D0044 -C05D003C C07D0040 -38FD0098 3D808000 -618C56B4 7D8903A6 -4E800421 C07D004C -480000F9 C07D0050 -480000F1 C07D0054 -480000E9 7F83E378 -389D008C 38A00000 -C03D0068 C05D003C -C07D006C 38FD0098 +7C7C1B78 939F0008 +38800001 989C0049 +38800000 989C004A +C03D0000 D03C0008 +C03D0004 D03C0024 +D03C0028 7F83E378 +389D005C 38A00000 +C03D0010 C05D0008 +C07D000C 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 -7F83E378 389D008C -38A00000 C03D0068 -C05D003C C07D0070 -38FD0098 3D808000 +C07D0018 480000F9 +C07D001C 480000F1 +C07D0020 480000E9 +7F83E378 389D0058 +38A00000 C03D0034 +C05D0008 C07D0038 +38FD0064 3D808000 618C56B4 7D8903A6 4E800421 7F83E378 -389D008C 38A00000 -C03D0044 C05D0078 -C07D0074 38FD0098 +389D0058 38A00000 +C03D0034 C05D0008 +C07D003C 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 -7F83E378 389D0090 -38A00000 C03D0044 -C05D007C C07D0074 -38FD0098 3D808000 -618C56B4 7D8903A6 -4E800421 C07D0058 -480000AD C07D005C -480000A5 C07D0060 -4800009D C07D0064 -48000095 BA8100B0 -800100E4 382100E0 -7C0803A6 48000A9C -7C0802A6 90010004 -9421FF20 BE8100B0 -D0610008 7F83E378 -389D0090 38A00000 -C03D0068 C05D0048 -38FD0098 3D808000 +7F83E378 389D0058 +38A00000 C03D0010 +C05D0044 C07D0040 +38FD0064 3D808000 618C56B4 7D8903A6 4E800421 7F83E378 -389D0090 38A00000 -C03D0080 C05D003C -C0610008 38FD0098 +389D005C 38A00000 +C03D0010 C05D0048 +C07D0040 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 +C07D0024 480000AD +C07D0028 480000A5 +C07D002C 4800009D +C07D0030 48000095 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 7C0802A6 +48000634 7C0802A6 90010004 9421FF20 -BE8100B0 7F83E378 -389D0094 38A00000 -C03D0068 C05D003C -38FD0098 3D808000 +BE8100B0 D0610008 +7F83E378 389D005C +38A00000 C03D0034 +C05D0014 38FD0064 +3D808000 618C56B4 +7D8903A6 4E800421 +7F83E378 389D005C +38A00000 C03D004C +C05D0008 C0610008 +38FD0064 3D808000 618C56B4 7D8903A6 -4E800421 7C7B1B78 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 +4E800421 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -8363002C 4BFFFAD5 -7FA802A6 3F808000 -639C5614 839C0000 -83DC0000 835C0008 -38FD0163 3CC0804A -60C60740 38800000 -38A00000 7C66222E -7C672B2E 38840003 -38A50002 2C050012 -4180FFEC 806DB620 -38810080 38A00024 -38C0FFFF 3D808001 -618C1E24 7D8903A6 -4E800421 80610080 -3D808036 618CF644 +7F83E378 389D0060 +38A00000 C03D0034 +C05D0008 38FD0064 +3D808000 618C56B4 +7D8903A6 4E800421 +7C7B1B78 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 +4E800021 7C0802A6 +90010004 9421FF20 +BE8100B0 8363002C +4BFFFB09 7FA802A6 +3F808000 639C5614 +839C0000 83DC0000 +835C0008 38FD012F +3CC0804A 60C60740 +38800000 38A00000 +7C66222E 7C672B2E +38840003 38A50002 +2C050012 4180FFEC +806DB620 38810080 +38A00024 38C0FFFF +3D808001 618C1E24 7D8903A6 4E800421 -80610080 38800000 -80BC0004 80A50008 -38C00000 3D808036 -618CFA10 7D8903A6 -4E800421 C022AEC4 -886DAFA0 2C030003 -40820008 C022AEC8 80610080 3D808036 -618CF934 7D8903A6 +618CF644 7D8903A6 4E800421 80610080 -3D808037 618C0780 -7D8903A6 4E800421 -38800000 38BD00B6 -887E0000 2C030004 -4181004C 886DAFA0 -2C030001 41820020 -2C030002 41820020 -2C030000 41820020 -2C030003 41820020 -48000024 38DD0099 -48000020 38DD00A2 -48000018 38DD00A9 -48000010 38DD00B0 -48000008 38BD0176 -48000841 480001EC -887E000A 2C030000 -4182001C 3B1E0015 -7C791B78 887C0018 -38630001 987C0018 -48000014 887E000B -2C030000 418201BC -7C791B78 887C0019 -2C030009 40810010 -38600000 987C0019 -418201A0 386000B7 -3880007F 38A00040 -3D808002 618C37A8 -7D8903A6 4E800421 -887C0017 38630001 -987C0017 3860000D -3D808037 618CF1E4 -7D8903A6 4E800421 -7C771B78 3880001C -3D808000 618CC160 -7D8903A6 4E800421 -38600014 38800000 -98770000 98970001 -7F23CB78 98770002 -887C0019 98770003 -38630001 987C0019 -887E000C 98770008 -7F83E378 90770009 -38600004 38800005 -38A00080 3D808039 -618C01F0 7D8903A6 -4E800421 7C761B78 -807C0004 80630004 -80630000 3D808037 -618C0E44 7D8903A6 -4E800421 7C651B78 -7EC3B378 888DC1A9 -3D808039 618C0A70 -7D8903A6 4E800421 -7EC3B378 3C808039 -60841070 38A00003 -38C00080 3D808039 -618C069C 7D8903A6 -4E800421 80760028 -809C0004 80840004 -38A00000 3D808016 -618C895C 7D8903A6 -4E800421 80760028 -C022AE28 3D808036 -618CF8BC 7D8903A6 -4E800421 886DAFE0 -2C030000 41820010 -C03D0014 80760028 -D0230038 7EC3B378 -38800004 3CA08037 -60A5F1B0 7EE6BB78 -3D808039 618C0B68 -7D8903A6 4E800421 -7EC3B378 480003F1 -7C8802A6 38A00004 -3D808038 618CFD54 -7D8903A6 4E800421 +38800000 80BC0004 +80A50008 38C00000 +3D808036 618CFA10 +7D8903A6 4E800421 +C022AEC4 886DAFA0 +2C030003 40820008 +C022AEC8 80610080 +3D808036 618CF934 +7D8903A6 4E800421 +80610080 3D808037 +618C0780 7D8903A6 +4E800421 38800000 +38BD0082 887E0000 +2C030004 4181004C +886DAFA0 2C030001 +41820020 2C030002 +41820020 2C030000 +41820020 2C030003 +41820020 48000024 +38DD0065 48000020 +38DD006E 48000018 +38DD0075 48000010 +38DD007C 48000008 +38BD0142 480003D9 887E0000 2C030004 -4182000C 38BD0098 -48000008 38BD017C -38800009 48000635 +4182000C 38BD0064 +48000008 38BD0148 +38800009 480003B9 887E0000 2C030004 -4182000C 38BD0098 +4182000C 38BD0064 48000008 38BE00B0 -3880000A 48000615 +3880000A 48000399 887E0000 2C030004 -4182000C 38BD0098 -48000008 38BD0185 -38800008 480005F5 +4182000C 38BD0064 +48000008 38BD0151 +38800008 48000379 887E0000 2C030004 41820034 2C030005 41820020 2C030000 -4181000C 38BD0098 -48000024 38BD0197 -38DD01BD 48000018 -38BD0197 38DD01C4 -4800000C 38BD01A5 -38DD01B2 38800007 -480005A9 3B600001 -7F64DB78 38BD0098 -48000599 3B7B0002 +4181000C 38BD0064 +48000024 38BD0163 +38DD0189 48000018 +38BD0163 38DD0190 +4800000C 38BD0171 +38DD017E 38800007 +4800032D 3B600001 +7F64DB78 38BD0064 +4800031D 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 -38BD0098 48000565 +38BD0064 480002E9 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 @@ -3149,7 +2905,7 @@ D0230038 7EC3B378 2C18001E 41810008 4800002C 38800000 7C96B9AE 7F64DB78 -7EC5B378 480004E5 +7EC5B378 48000269 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 @@ -3160,10 +2916,10 @@ D0230038 7EC3B378 4800015C 3B600001 886DB657 7F64DB78 2C030000 40820018 -38BD00BE 4800048D +38BD008A 48000211 38600001 987C000C -48000134 38BD00D4 -48000479 3B7B0002 +48000134 38BD00A0 +480001FD 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 40820080 @@ -3173,52 +2929,52 @@ D0230038 7EC3B378 886DAFC9 2C030000 4082001C 886DAFCA 2C030000 40820010 -38BD00E7 38DD0113 -48000034 38BD00E7 -38DD00F9 887E0000 +38BD00B3 38DD00DF +48000034 38BD00B3 +38DD00C5 887E0000 2C030004 41820020 -38BD00E7 38DD010C +38BD00B3 38DD00D8 886DAFA0 2C030002 -4180000C 38BD00E7 -38DD0101 480003ED +4180000C 38BD00B3 +38DD00CD 48000171 38600001 987C000D -48000094 38BD0120 -480003D9 3B7B0002 +48000094 38BD00EC +4800015D 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 4182005C 2C030003 4182002C -38BD012A 38DD015A +38BD00F6 38DD0126 896DAFA0 2C0B0001 41820048 2C0B0000 -41820040 38BD012A -38DD0163 48000034 -38BD013B 38DD015A +41820040 38BD00F6 +38DD012F 48000034 +38BD0107 38DD0126 896DAFA0 2C0B0001 41820020 2C0B0000 -41820018 38BD013B -38DD0163 4800000C -38BD014C 38DD015A -48000359 38600001 +41820018 38BD0107 +38DD012F 4800000C +38BD0118 38DD0126 +480000DD 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 40820044 A07C000F 3880000F 7C632396 1C630003 -386301D0 7CBD1A14 -7F64DB78 4800031D +3863019C 7CBD1A14 +7F64DB78 480000A1 7F43D378 7F64DB78 -38BD0088 3D80803A +38BD0054 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 -7F64DB78 38BD01D6 -480002E9 7F43D378 -7F64DB78 38BD0084 +7F64DB78 38BD01A2 +4800006D 7F43D378 +7F64DB78 38BD0050 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 -38BD0098 480002BD +38BD0064 48000041 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 @@ -3226,94 +2982,15 @@ A07C000F 38630001 38600000 B07C000F BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 4E800021 -7C0802A6 90010004 -9421FEF8 BDC100B0 -DBE100F8 DBC10100 -7C6E1B78 4BFFF3B5 -7FA802A6 820E002C -8A300000 8A500001 -8A700002 8A900003 -82B00004 8AF00008 -83900009 81EE0028 -81EF0010 7DE37B78 -3D808037 618C0928 -7D8903A6 4E800421 -2C150000 408200CC -7E83A378 3D808000 -618C55F4 7D8903A6 -4E800421 C05D0018 -C07D0008 EC6100F2 -EC421828 D04F003C -2C120000 4182009C -3A2000AA 9A300000 -3A400001 9A500001 -7C962378 7E83A378 -3D808000 618C55F4 -7D8903A6 4E800421 -C05D0030 C07D0008 -EC6100F2 EC42182A -FFC01090 806DC2DC -38800003 9883000E -C03D002C 886DAFE0 -2C030000 41820008 -C03D0028 38770001 -7E649B78 38A00002 -38C00000 C07D0034 -C09D0038 3D808000 -618C56B4 7D8903A6 -4E800421 90700004 -806DC2DC 38800001 -9883000E 48000004 -887C0017 2C03000D -41800028 887C0019 -7C03A000 4080000C -2C140009 408100B4 -887C0019 7C741850 -2C03000D 418100A4 -2C110000 4082001C -2C120000 4182FF2C -2C120001 41820018 -2C120002 41820084 -3A31FFFF 9A300000 -480000D4 3A400002 -9A500001 3A200014 -9A300000 806E0028 -809C0004 80840004 -38A00001 3D808016 -618C895C 7D8903A6 -4E800421 806E0028 -C022AE28 3D808036 -618CF8BC 7D8903A6 -4E800421 8075005C -3D808037 618CF1B0 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 7F43D378 +3D80803A 618C70A0 7D8903A6 4E800421 -7EA3AB78 3D80803A -618C5CC4 7D8903A6 -4E800421 48000060 -7DC37378 3D808039 -618C0228 7D8903A6 -4E800421 809C0000 -88840003 7C172000 -40820010 887C0018 -3863FFFF 987C0018 -887C0017 3863FFFF -987C0017 887C0019 -7E84A378 38840001 -7C032000 41820008 -4800000C 38600000 -987C0019 B9C100B0 -CBE100F8 CBC10100 -8001010C 38210108 -7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -7F43D378 3D80803A -618C70A0 7D8903A6 -4E800421 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -80CDB638 00000000 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 80CDB638 +60000000 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm 3C608048 80639D30 5463443E 2C030008 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index a7d469b4f7..89321102f9 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -2340,14 +2340,14 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm 618C5610 7D8903A6 4E800421 38000000 60000000 00000000 -C2263258 00000169 #Online/Menus/CSS/HandleInputsOnCSS.asm +C2263258 000000B9 #Online/Menus/CSS/HandleInputsOnCSS.asm 41A20014 3D808026 618C3334 7D8903A6 4E800420 7C0802A6 90010004 9421FF20 BE8100B0 3C608048 80639D30 5463443E -2C030008 40820AFC +2C030008 4082057C 7CFB3B78 3F008000 63185614 83180000 83580000 3B800000 @@ -2370,30 +2370,30 @@ BE8100B0 3C608048 2C030003 4081008C 2C030004 41820090 2C030005 418201E8 -48000A28 88780014 -2C030000 40820A1C -576004E7 41820A14 +480004A8 88780014 +2C030000 4082049C +576004E7 41820494 3C608048 80639D60 -2C030000 41820A04 +2C030000 41820484 3860FFFF 986DAFC9 38600000 986DAFCA 886DB657 2C030000 -418209E8 886DAFA0 +41820468 886DAFA0 2C030000 41820018 2C030001 41820010 2C030002 40800014 48000000 3860FFFE -48000355 480009BC -4800037D 480009B4 +48000355 4800043C +4800037D 48000434 576006F7 408203B9 -480009A8 3D80801A +48000428 3D80801A 618C3680 7D8903A6 4E800421 548006F7 41820024 88780013 38630001 98780013 2C030030 40810014 9B980013 48000381 -48000970 9B980013 +480003F0 9B980013 887A0001 2C030000 408200EC 576004E7 4082002C 886DAFA0 @@ -2424,14 +2424,14 @@ BE8100B0 3C608048 98640018 38600001 986DB656 480000F5 7C6802A6 906DAFE8 -48000878 887A0001 +480002F8 887A0001 889A0002 7C632039 -41820868 BA8100B0 +418202E8 BA8100B0 800100E4 382100E0 7C0803A6 3D808026 618C3264 7D8903A6 4E800420 576006F7 -4082024D 4800083C +4082024D 480002BC 7C0802A6 90010004 9421FF20 BE8100B0 38600014 3D808037 @@ -2519,182 +2519,6 @@ BE8100B0 38600001 4E800421 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -2C1B0200 40820008 -B3780015 2C1B0001 -4182001C 2C1B0002 -41820014 2C1B0008 -4182000C 2C1B0004 -4082001D B3780015 -88780014 2C030000 -4082000C 7F63DB78 -480000B9 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -7C6E1B78 7C0802A6 -90010004 9421FF20 -BE8100B0 38600002 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C791B78 386000BB -98790000 7DC37378 -98790001 7F23CB78 -38800002 38A00001 -3D808000 618C55F0 -7D8903A6 4E800421 -7F23CB78 3D808037 -618CF1B0 7D8903A6 -4E800421 386000B7 -3880007F 38A00040 -3D808002 618C37A8 -7D8903A6 4E800421 -7F63DB78 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -7C6E1B78 7C0802A6 -90010004 9421FF20 -BE8100B0 48000419 -7DE802A6 38600002 -3D808002 618C4030 -7D8903A6 4E800421 -7DC37378 98780014 -3860000B 3D808037 -618CF1E4 7D8903A6 -4E800421 7C771B78 -3880000B 3D808000 -618CC160 7D8903A6 -4E800421 7DC37378 -98770000 7F03C378 -90770007 38600004 -38800005 38A00080 -3D808039 618C01F0 -7D8903A6 4E800421 -7C741B78 80780004 -80630000 80630000 -3D808037 618C0E44 -7D8903A6 4E800421 -7C751B78 C02F0024 -888DAFE0 2C040000 -41820008 C02F0028 -C04F002C D0230038 -D043003C 7E83A378 -38800004 7EA5AB78 -3D808039 618C0A70 -7D8903A6 4E800421 -7E83A378 3C808039 -60841070 38A00001 -38C00080 3D808039 -618C069C 7D8903A6 -4E800421 7E83A378 -38800004 3CA08037 -60A5F1B0 7EE6BB78 -3D808039 618C0B68 -7D8903A6 4E800421 -7E83A378 48000031 -7C8802A6 38A00004 -3D808038 618CFD54 -7D8903A6 4E800421 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 -7C6E1B78 7C0802A6 -90010004 9421FF08 -BDC100B0 820E002C -82EE0028 8A300000 -8A500002 82700003 -82B00007 A2D50015 -83550000 38600000 -B0750015 88700001 -2C030000 40820234 -2C130000 40820194 -38600090 7C721B78 -98700002 48000261 -7DE802A6 7E238B78 -3D808000 618C56AC -7D8903A6 4E800421 -7C741B78 38600000 -38800000 3D80803A -618C6754 7D8903A6 -4E800421 7C731B78 -92700003 38600001 -38800000 C02F0000 -C04F0004 98730049 -9893004A D0330008 -D0530024 D0530028 -C04F0008 886DAFE0 -2C030000 41820008 -C04F000C 388F0034 -887A0000 2C030004 -41820008 388F0038 -7E639B78 38A00000 -38CF0030 38EF003C -39140004 C02F001C -C06F0018 3D808000 -618C56B4 7D8903A6 -4E800421 7C641B78 -7C8A2378 7C8B2378 -386B0002 C04F0020 -3D808000 618C55EC -7D8903A6 4E800421 -C06F0018 EC63082A -2C0B0000 4182001C -2C0B0001 4182002C -2C0B0002 4182001C -2C0B0003 4182000C -38800008 48000018 -38800004 48000010 -38800002 48000008 -38800001 7E238B78 -3D808000 618C56AC -7D8903A6 4E800421 -7C872378 C04F0010 -886DAFE0 2C030000 -41820008 C04F0014 -7E639B78 388F0030 -38A00000 38CF0030 -C02F001C 3D808000 -618C56B4 7D8903A6 -4E800421 7C6B1B78 -386A0004 7C0B1800 -4082FF48 480000CC -88750018 2C030000 -41820010 88700002 -2C03008A 41810070 -2C160200 40820008 -48000078 2C160000 -4182005C 88750018 -2C030003 4080003C -88750017 2C030005 -40800030 38600000 -98700002 7E238B78 -7EC4B378 38A00004 -7C632830 7C632214 -4BFFFBB1 38600001 -98700001 4800005C -38600003 3D808002 -618C4030 7D8903A6 -4E800421 2C120000 -41820010 3A52FFFF -9A500002 48000034 -38600000 98750014 -7DC37378 3D808039 -618C0228 7D8903A6 -4E800421 7E639B78 -3D80803A 618C5CC4 -7D8903A6 4E800421 -B9C100B0 800100FC -382100F8 7C0803A6 -4E800020 4E800021 -00000000 3DCCCCCD -C3960000 C3E20000 -C38E8000 C3DA8000 -429E0000 3EE66666 -41C80000 C1A00000 -C20C0000 C1840000 -FFFFFFFF FFEA2FFF -C9C387FF 43686174 -3A202573 00000000 BA8100B0 800100E4 382100E0 7C0803A6 3D808026 618C3334 @@ -2833,307 +2657,239 @@ C05F0040 FC011040 7C0803A6 4E800020 38600000 38980000 60000000 00000000 -C2264534 000001E0 #Online/Menus/CSS/LoadCSSText.asm +C2264534 0000014D #Online/Menus/CSS/LoadCSSText.asm 3C608048 80639D30 5463443E 2C030008 -40820EE8 480001F8 +40820A4C 480001C4 4E800021 00000000 -3DCCCCCD 404CCCCD -413CCCCD 3F4CCCCD -C1600000 41C00000 -00000000 41F00000 -42480000 C2320000 -C1EC0000 C1BA0000 -40A00000 3D23D70A -428C0000 41B80000 -3F000000 42B40000 -42500000 42960000 -42C40000 42500000 -428C0000 42B00000 -42D40000 3ECCCCCD -43048000 43188000 -C3760000 C3020000 -C2480000 3EE66666 -33FF2FFF 3CBCFFFF -8E9196FF FFFFFFFF -FF0000FF 00556E72 -616E6B65 64004469 -72656374 0052616E -6B656400 5465616D -73002573 204D6F64 -65005365 6C656374 -20796F75 72206368 -61726163 74657200 -43686172 61637465 -72207365 6C656374 -65640050 72657373 -20535441 52542074 -6F202573 006C6F63 -6B20696E 00656E74 -65722063 6F646500 -73656172 63680073 -656C6563 74207374 -61676500 4C6F636B -65642069 6E005365 -61726368 696E6720 -666F7220 25730043 -6F6E6E65 6374696E -6720746F 20257300 -57616974 696E6720 -6F6E2025 73006F70 -706F6E65 6E74002D +3DCCCCCD 428C0000 +41B80000 3F000000 +42B40000 42500000 +42960000 42C40000 +42500000 428C0000 +42B00000 42D40000 +3ECCCCCD 43048000 +43188000 C3760000 +C3020000 C2480000 +3EE66666 33FF2FFF +3CBCFFFF 8E9196FF +FFFFFFFF FF0000FF +00556E72 616E6B65 +64004469 72656374 +0052616E 6B656400 +5465616D 73002573 +204D6F64 65005365 +6C656374 20796F75 +72206368 61726163 +74657200 43686172 +61637465 72207365 +6C656374 65640050 +72657373 20535441 +52542074 6F202573 +006C6F63 6B20696E +00656E74 65722063 +6F646500 73656172 +63680073 656C6563 +74207374 61676500 +4C6F636B 65642069 +6E005365 61726368 +696E6720 666F7220 +25730043 6F6E6E65 +6374696E 6720746F +20257300 57616974 +696E6720 6F6E2025 +73006F70 706F6E65 +6E74002D 2D2F2F2D 2D2F2F2D 2D2F2F2D -2D2F2F2D 2D2F2F30 -30004572 726F7200 -506C6179 696E673A -00557365 20442D50 -61642074 6F204368 -61740050 72657373 -205A2074 6F202573 -00486F6C 64205A20 -746F2025 73006469 -73636F6E 6E656374 -0063616E 63656C00 -636C6561 72206572 -726F7200 817B0081 -7E00817C 00000000 -4E800021 C2E00000 -41A00000 00000000 -3DCCCCCD 7C0802A6 -90010004 9421FF20 -BE8100B0 4BFFFDFD -7FA802A6 3C60804D -606350D8 3C800200 -60840801 90830000 -888DAFA0 2C040002 -38800001 41800008 -38800002 4BFFFFAD -7C6802A6 3D808000 -618C5618 7D8903A6 -4E800421 38A00000 -4E800021 38600004 -38800005 38A00080 -3D808039 618C01F0 -7D8903A6 4E800421 -7C791B78 38600004 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C781B78 38790000 -38800004 3CA08037 -60A5F1B0 38D80000 -3D808039 618C0B68 +2D2F2F30 30004572 +726F7200 506C6179 +696E673A 00557365 +20442D50 61642074 +6F204368 61740050 +72657373 205A2074 +6F202573 00486F6C +64205A20 746F2025 +73006469 73636F6E +6E656374 0063616E +63656C00 636C6561 +72206572 726F7200 +817B0081 7E00817C +00000000 4E800021 +C2E00000 41A00000 +00000000 3DCCCCCD +7C0802A6 90010004 +9421FF20 BE8100B0 +4BFFFE31 7FA802A6 +3C60804D 606350D8 +3C800200 60840801 +90830000 888DAFA0 +2C040002 38800001 +41800008 38800002 +4BFFFFAD 7C6802A6 +3D808000 618C5618 7D8903A6 4E800421 -38790000 48000261 -7C8802A6 38A00004 -3D808038 618CFD54 +38A00000 4E800021 +38600004 38800005 +38A00080 3D808039 +618C01F0 7D8903A6 +4E800421 7C791B78 +38600004 3D808037 +618CF1E4 7D8903A6 +4E800421 7C781B78 +38790000 38800004 +3CA08037 60A5F1B0 +38D80000 3D808039 +618C0B68 7D8903A6 +4E800421 38790000 +48000261 7C8802A6 +38A00004 3D808038 +618CFD54 7D8903A6 +4E800421 3FE08000 +63FF5614 83FF0000 +38600000 38800000 +3D80803A 618C6754 7D8903A6 4E800421 -3FE08000 63FF5614 -83FF0000 38600000 -38800000 3D80803A -618C6754 7D8903A6 -4E800421 7C7C1B78 -939F0008 38800001 -989C0049 38800000 -989C004A C03D0000 -D03C0008 C03D0004 -D03C0024 D03C0028 -7F83E378 389D0090 -38A00000 C03D0044 -C05D003C C07D0040 -38FD0098 3D808000 -618C56B4 7D8903A6 -4E800421 C07D004C -480000F9 C07D0050 -480000F1 C07D0054 -480000E9 7F83E378 -389D008C 38A00000 -C03D0068 C05D003C -C07D006C 38FD0098 +7C7C1B78 939F0008 +38800001 989C0049 +38800000 989C004A +C03D0000 D03C0008 +C03D0004 D03C0024 +D03C0028 7F83E378 +389D005C 38A00000 +C03D0010 C05D0008 +C07D000C 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 -7F83E378 389D008C -38A00000 C03D0068 -C05D003C C07D0070 -38FD0098 3D808000 +C07D0018 480000F9 +C07D001C 480000F1 +C07D0020 480000E9 +7F83E378 389D0058 +38A00000 C03D0034 +C05D0008 C07D0038 +38FD0064 3D808000 618C56B4 7D8903A6 4E800421 7F83E378 -389D008C 38A00000 -C03D0044 C05D0078 -C07D0074 38FD0098 +389D0058 38A00000 +C03D0034 C05D0008 +C07D003C 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 -7F83E378 389D0090 -38A00000 C03D0044 -C05D007C C07D0074 -38FD0098 3D808000 -618C56B4 7D8903A6 -4E800421 C07D0058 -480000AD C07D005C -480000A5 C07D0060 -4800009D C07D0064 -48000095 BA8100B0 -800100E4 382100E0 -7C0803A6 48000A9C -7C0802A6 90010004 -9421FF20 BE8100B0 -D0610008 7F83E378 -389D0090 38A00000 -C03D0068 C05D0048 -38FD0098 3D808000 +7F83E378 389D0058 +38A00000 C03D0010 +C05D0044 C07D0040 +38FD0064 3D808000 618C56B4 7D8903A6 4E800421 7F83E378 -389D0090 38A00000 -C03D0080 C05D003C -C0610008 38FD0098 +389D005C 38A00000 +C03D0010 C05D0048 +C07D0040 38FD0064 3D808000 618C56B4 7D8903A6 4E800421 +C07D0024 480000AD +C07D0028 480000A5 +C07D002C 4800009D +C07D0030 48000095 BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 7C0802A6 +48000634 7C0802A6 90010004 9421FF20 -BE8100B0 7F83E378 -389D0094 38A00000 -C03D0068 C05D003C -38FD0098 3D808000 +BE8100B0 D0610008 +7F83E378 389D005C +38A00000 C03D0034 +C05D0014 38FD0064 +3D808000 618C56B4 +7D8903A6 4E800421 +7F83E378 389D005C +38A00000 C03D004C +C05D0008 C0610008 +38FD0064 3D808000 618C56B4 7D8903A6 -4E800421 7C7B1B78 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 4E800021 +4E800421 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 7C0802A6 90010004 9421FF20 BE8100B0 -8363002C 4BFFFAD5 -7FA802A6 3F808000 -639C5614 839C0000 -83DC0000 835C0008 -38FD0163 3CC0804A -60C60740 38800000 -38A00000 7C66222E -7C672B2E 38840003 -38A50002 2C050012 -4180FFEC 806DB620 -38810080 38A00024 -38C0FFFF 3D808001 -618C1E24 7D8903A6 -4E800421 80610080 -3D808036 618CF644 +7F83E378 389D0060 +38A00000 C03D0034 +C05D0008 38FD0064 +3D808000 618C56B4 +7D8903A6 4E800421 +7C7B1B78 BA8100B0 +800100E4 382100E0 +7C0803A6 4E800020 +4E800021 7C0802A6 +90010004 9421FF20 +BE8100B0 8363002C +4BFFFB09 7FA802A6 +3F808000 639C5614 +839C0000 83DC0000 +835C0008 38FD012F +3CC0804A 60C60740 +38800000 38A00000 +7C66222E 7C672B2E +38840003 38A50002 +2C050012 4180FFEC +806DB620 38810080 +38A00024 38C0FFFF +3D808001 618C1E24 7D8903A6 4E800421 -80610080 38800000 -80BC0004 80A50008 -38C00000 3D808036 -618CFA10 7D8903A6 -4E800421 C022AEC4 -886DAFA0 2C030003 -40820008 C022AEC8 80610080 3D808036 -618CF934 7D8903A6 +618CF644 7D8903A6 4E800421 80610080 -3D808037 618C0780 -7D8903A6 4E800421 -38800000 38BD00B6 -887E0000 2C030004 -4181004C 886DAFA0 -2C030001 41820020 -2C030002 41820020 -2C030000 41820020 -2C030003 41820020 -48000024 38DD0099 -48000020 38DD00A2 -48000018 38DD00A9 -48000010 38DD00B0 -48000008 38BD0176 -48000841 480001EC -887E000A 2C030000 -4182001C 3B1E0015 -7C791B78 887C0018 -38630001 987C0018 -48000014 887E000B -2C030000 418201BC -7C791B78 887C0019 -2C030009 40810010 -38600000 987C0019 -418201A0 386000B7 -3880007F 38A00040 -3D808002 618C37A8 -7D8903A6 4E800421 -887C0017 38630001 -987C0017 3860000D -3D808037 618CF1E4 -7D8903A6 4E800421 -7C771B78 3880001C -3D808000 618CC160 -7D8903A6 4E800421 -38600014 38800000 -98770000 98970001 -7F23CB78 98770002 -887C0019 98770003 -38630001 987C0019 -887E000C 98770008 -7F83E378 90770009 -38600004 38800005 -38A00080 3D808039 -618C01F0 7D8903A6 -4E800421 7C761B78 -807C0004 80630004 -80630000 3D808037 -618C0E44 7D8903A6 -4E800421 7C651B78 -7EC3B378 888DC1A9 -3D808039 618C0A70 -7D8903A6 4E800421 -7EC3B378 3C808039 -60841070 38A00003 -38C00080 3D808039 -618C069C 7D8903A6 -4E800421 80760028 -809C0004 80840004 -38A00000 3D808016 -618C895C 7D8903A6 -4E800421 80760028 -C022AE28 3D808036 -618CF8BC 7D8903A6 -4E800421 886DAFE0 -2C030000 41820010 -C03D0014 80760028 -D0230038 7EC3B378 -38800004 3CA08037 -60A5F1B0 7EE6BB78 -3D808039 618C0B68 -7D8903A6 4E800421 -7EC3B378 480003F1 -7C8802A6 38A00004 -3D808038 618CFD54 -7D8903A6 4E800421 +38800000 80BC0004 +80A50008 38C00000 +3D808036 618CFA10 +7D8903A6 4E800421 +C022AEC4 886DAFA0 +2C030003 40820008 +C022AEC8 80610080 +3D808036 618CF934 +7D8903A6 4E800421 +80610080 3D808037 +618C0780 7D8903A6 +4E800421 38800000 +38BD0082 887E0000 +2C030004 4181004C +886DAFA0 2C030001 +41820020 2C030002 +41820020 2C030000 +41820020 2C030003 +41820020 48000024 +38DD0065 48000020 +38DD006E 48000018 +38DD0075 48000010 +38DD007C 48000008 +38BD0142 480003D9 887E0000 2C030004 -4182000C 38BD0098 -48000008 38BD017C -38800009 48000635 +4182000C 38BD0064 +48000008 38BD0148 +38800009 480003B9 887E0000 2C030004 -4182000C 38BD0098 +4182000C 38BD0064 48000008 38BE00B0 -3880000A 48000615 +3880000A 48000399 887E0000 2C030004 -4182000C 38BD0098 -48000008 38BD0185 -38800008 480005F5 +4182000C 38BD0064 +48000008 38BD0151 +38800008 48000379 887E0000 2C030004 41820034 2C030005 41820020 2C030000 -4181000C 38BD0098 -48000024 38BD0197 -38DD01BD 48000018 -38BD0197 38DD01C4 -4800000C 38BD01A5 -38DD01B2 38800007 -480005A9 3B600001 -7F64DB78 38BD0098 -48000599 3B7B0002 +4181000C 38BD0064 +48000024 38BD0163 +38DD0189 48000018 +38BD0163 38DD0190 +4800000C 38BD0171 +38DD017E 38800007 +4800032D 3B600001 +7F64DB78 38BD0064 +4800031D 3B7B0002 2C1B0005 4081FFEC 3880000C 38600000 7C7C21AE 38840001 2C04000E 4081FFF4 3B60000B 7F64DB78 -38BD0098 48000565 +38BD0064 480002E9 3B7B0001 2C1B000E 4081FFEC 887E0000 2C030005 408200A8 @@ -3149,7 +2905,7 @@ D0230038 7EC3B378 2C18001E 41810008 4800002C 38800000 7C96B9AE 7F64DB78 -7EC5B378 480004E5 +7EC5B378 48000269 3B7B0001 7ED6BA14 3AD60001 3B200000 3B000000 2C150000 @@ -3160,10 +2916,10 @@ D0230038 7EC3B378 4800015C 3B600001 886DB657 7F64DB78 2C030000 40820018 -38BD00BE 4800048D +38BD008A 48000211 38600001 987C000C -48000134 38BD00D4 -48000479 3B7B0002 +48000134 38BD00A0 +480001FD 3B7B0002 38600002 987C000C 887E0001 7F64DB78 2C030000 40820080 @@ -3173,52 +2929,52 @@ D0230038 7EC3B378 886DAFC9 2C030000 4082001C 886DAFCA 2C030000 40820010 -38BD00E7 38DD0113 -48000034 38BD00E7 -38DD00F9 887E0000 +38BD00B3 38DD00DF +48000034 38BD00B3 +38DD00C5 887E0000 2C030004 41820020 -38BD00E7 38DD010C +38BD00B3 38DD00D8 886DAFA0 2C030002 -4180000C 38BD00E7 -38DD0101 480003ED +4180000C 38BD00B3 +38DD00CD 48000171 38600001 987C000D -48000094 38BD0120 -480003D9 3B7B0002 +48000094 38BD00EC +4800015D 3B7B0002 38600002 987C000D 887E0000 7F64DB78 2C030004 4182005C 2C030003 4182002C -38BD012A 38DD015A +38BD00F6 38DD0126 896DAFA0 2C0B0001 41820048 2C0B0000 -41820040 38BD012A -38DD0163 48000034 -38BD013B 38DD015A +41820040 38BD00F6 +38DD012F 48000034 +38BD0107 38DD0126 896DAFA0 2C0B0001 41820020 2C0B0000 -41820018 38BD013B -38DD0163 4800000C -38BD014C 38DD015A -48000359 38600001 +41820018 38BD0107 +38DD012F 4800000C +38BD0118 38DD0126 +480000DD 38600001 987C000E 3B20000C 3B600002 7C7CC8AE 2C030001 40820044 A07C000F 3880000F 7C632396 1C630003 -386301D0 7CBD1A14 -7F64DB78 4800031D +3863019C 7CBD1A14 +7F64DB78 480000A1 7F43D378 7F64DB78 -38BD0088 3D80803A +38BD0054 3D80803A 618C74F0 7D8903A6 4E800421 48000044 2C030002 40820030 -7F64DB78 38BD01D6 -480002E9 7F43D378 -7F64DB78 38BD0084 +7F64DB78 38BD01A2 +4800006D 7F43D378 +7F64DB78 38BD0050 3D80803A 618C74F0 7D8903A6 4E800421 48000010 7F64DB78 -38BD0098 480002BD +38BD0064 48000041 3B7B0002 3B390001 2C19000E 4081FF68 A07C000F 38630001 @@ -3226,94 +2982,15 @@ A07C000F 38630001 38600000 B07C000F BA8100B0 800100E4 382100E0 7C0803A6 -4E800020 4E800021 -7C0802A6 90010004 -9421FEF8 BDC100B0 -DBE100F8 DBC10100 -7C6E1B78 4BFFF3B5 -7FA802A6 820E002C -8A300000 8A500001 -8A700002 8A900003 -82B00004 8AF00008 -83900009 81EE0028 -81EF0010 7DE37B78 -3D808037 618C0928 -7D8903A6 4E800421 -2C150000 408200CC -7E83A378 3D808000 -618C55F4 7D8903A6 -4E800421 C05D0018 -C07D0008 EC6100F2 -EC421828 D04F003C -2C120000 4182009C -3A2000AA 9A300000 -3A400001 9A500001 -7C962378 7E83A378 -3D808000 618C55F4 -7D8903A6 4E800421 -C05D0030 C07D0008 -EC6100F2 EC42182A -FFC01090 806DC2DC -38800003 9883000E -C03D002C 886DAFE0 -2C030000 41820008 -C03D0028 38770001 -7E649B78 38A00002 -38C00000 C07D0034 -C09D0038 3D808000 -618C56B4 7D8903A6 -4E800421 90700004 -806DC2DC 38800001 -9883000E 48000004 -887C0017 2C03000D -41800028 887C0019 -7C03A000 4080000C -2C140009 408100B4 -887C0019 7C741850 -2C03000D 418100A4 -2C110000 4082001C -2C120000 4182FF2C -2C120001 41820018 -2C120002 41820084 -3A31FFFF 9A300000 -480000D4 3A400002 -9A500001 3A200014 -9A300000 806E0028 -809C0004 80840004 -38A00001 3D808016 -618C895C 7D8903A6 -4E800421 806E0028 -C022AE28 3D808036 -618CF8BC 7D8903A6 -4E800421 8075005C -3D808037 618CF1B0 +4E800020 7C0802A6 +90010004 9421FF20 +BE8100B0 7F43D378 +3D80803A 618C70A0 7D8903A6 4E800421 -7EA3AB78 3D80803A -618C5CC4 7D8903A6 -4E800421 48000060 -7DC37378 3D808039 -618C0228 7D8903A6 -4E800421 809C0000 -88840003 7C172000 -40820010 887C0018 -3863FFFF 987C0018 -887C0017 3863FFFF -987C0017 887C0019 -7E84A378 38840001 -7C032000 41820008 -4800000C 38600000 -987C0019 B9C100B0 -CBE100F8 CBC10100 -8001010C 38210108 -7C0803A6 4E800020 -7C0802A6 90010004 -9421FF20 BE8100B0 -7F43D378 3D80803A -618C70A0 7D8903A6 -4E800421 BA8100B0 -800100E4 382100E0 -7C0803A6 4E800020 -80CDB638 00000000 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 80CDB638 +60000000 00000000 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm 3C608048 80639D30 5463443E 2C030008 From 508cd45e50bbe1dbdc74623f976f8c2a9bdc66b8 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Sun, 14 May 2023 11:26:51 -0400 Subject: [PATCH 11/23] start support for configured chat messages --- Data/Sys/GameFiles/GALE01/GameSetup.dat | Bin 26799 -> 27379 bytes Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 12659 -> 13011 bytes Data/Sys/GameSettings/GALE01r2.ini | 96 +++++++++--------- Data/Sys/GameSettings/GALJ01r2.ini | 96 +++++++++--------- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 31 ++++++ Source/Core/Core/HW/EXI_DeviceSlippi.h | 3 + Source/Core/Core/Slippi/SlippiExiTypes.h | 9 ++ Source/Core/Core/Slippi/SlippiMatchmaking.cpp | 8 ++ Source/Core/Core/Slippi/SlippiUser.cpp | 22 ++++ Source/Core/Core/Slippi/SlippiUser.h | 4 + 10 files changed, 173 insertions(+), 96 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/GameSetup.dat b/Data/Sys/GameFiles/GALE01/GameSetup.dat index 63279235ec0571b7694a56aa499ac08c97901d4d..2f6672becddf40047a98a5b3db117c1e950778cb 100644 GIT binary patch literal 27379 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 messagesByPlayer = { + SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages, + SlippiUser::defaultChatMessages}; + + auto playerInfo = matchmaking->GetPlayerInfo(); + for (auto &player : playerInfo) + { + messagesByPlayer[player.port - 1] = player.chatMessages; + } + + for (int i = 0; i < 4; i++) + { + for (int j = 0; j < 16; j++) + { + sprintf(resp.settings[i].chatMessages[j], "%s", messagesByPlayer[i][j].c_str()); + } + } + + auto data_ptr = (u8 *)&resp; + m_read_queue.insert(m_read_queue.end(), data_ptr, data_ptr + sizeof(SlippiExiTypes::GetPlayerSettingsResponse)); +} + void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize) { u8 *memPtr = Memory::GetPointer(_uAddr); @@ -3183,6 +3211,9 @@ void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize) case CMD_REPORT_SET_COMPLETE: handleCompleteSet(SlippiExiTypes::Convert(&memPtr[bufLoc])); break; + case CMD_GET_PLAYER_SETTINGS: + handleGetPlayerSettings(); + break; default: writeToFileAsync(&memPtr[bufLoc], payloadLen + 1, ""); m_slippiserver->write(&memPtr[bufLoc], payloadLen + 1); diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.h b/Source/Core/Core/HW/EXI_DeviceSlippi.h index fe48337d84..2a989cfbbd 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.h +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.h @@ -79,6 +79,7 @@ class CEXISlippi : public IEXIDevice CMD_GP_COMPLETE_STEP = 0xC0, CMD_GP_FETCH_STEP = 0xC1, CMD_REPORT_SET_COMPLETE = 0xC2, + CMD_GET_PLAYER_SETTINGS = 0xC3, // Misc CMD_LOG_MESSAGE = 0xD0, @@ -134,6 +135,7 @@ class CEXISlippi : public IEXIDevice {CMD_GP_COMPLETE_STEP, static_cast(sizeof(SlippiExiTypes::GpCompleteStepQuery) - 1)}, {CMD_GP_FETCH_STEP, static_cast(sizeof(SlippiExiTypes::GpFetchStepQuery) - 1)}, {CMD_REPORT_SET_COMPLETE, static_cast(sizeof(SlippiExiTypes::ReportSetCompletionQuery) - 1)}, + {CMD_GET_PLAYER_SETTINGS, 0}, // Misc {CMD_LOG_MESSAGE, 0xFFFF}, // Variable size... will only work if by itself @@ -205,6 +207,7 @@ class CEXISlippi : public IEXIDevice void handleGamePrepStepComplete(const SlippiExiTypes::GpCompleteStepQuery &query); void prepareGamePrepOppStep(const SlippiExiTypes::GpFetchStepQuery &query); void handleCompleteSet(const SlippiExiTypes::ReportSetCompletionQuery &query); + void handleGetPlayerSettings(); // replay playback stuff void prepareGameInfo(u8 *payload); diff --git a/Source/Core/Core/Slippi/SlippiExiTypes.h b/Source/Core/Core/Slippi/SlippiExiTypes.h index e83363b734..75c4b7cfa1 100644 --- a/Source/Core/Core/Slippi/SlippiExiTypes.h +++ b/Source/Core/Core/Slippi/SlippiExiTypes.h @@ -79,6 +79,15 @@ struct OverwriteSelectionsQuery OverwriteCharSelections chars[4]; }; +struct PlayerSettings +{ + char chatMessages[16][51]; +}; +struct GetPlayerSettingsResponse +{ + PlayerSettings settings[4]; +}; + // Not sure if resetting is strictly needed, might be contained to the file #pragma pack() diff --git a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp index 4728bb2e99..9e6f7110a8 100644 --- a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp +++ b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp @@ -428,6 +428,8 @@ void SlippiMatchmaking::handleMatchmaking() return; } + ERROR_LOG(SLIPPI, "Response: %s", getResp.dump().c_str()); + std::string respType = getResp["type"]; if (respType != MmMessageType::GET_TICKET_RESP) { @@ -479,6 +481,12 @@ void SlippiMatchmaking::handleMatchmaking() playerInfo.displayName = el.value("displayName", ""); playerInfo.connectCode = el.value("connectCode", ""); playerInfo.port = el.value("port", 0); + playerInfo.chatMessages = el.value("chatMessages", SlippiUser::defaultChatMessages); + if (playerInfo.port == 1) + { + playerInfo.chatMessages = std::vector{"1", "2", "3", "4", "5", "6", "7", "8", "9", + "10", "11", "12", "13", "14", "15", "16"}; + } m_playerInfo.push_back(playerInfo); if (isLocal) diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp index c6e7da7684..674fa154fc 100644 --- a/Source/Core/Core/Slippi/SlippiUser.cpp +++ b/Source/Core/Core/Slippi/SlippiUser.cpp @@ -30,6 +30,28 @@ #include using json = nlohmann::json; +const std::vector SlippiUser::defaultChatMessages = { + "ggs", + "one more", + "brb", + "good luck", + + "well played", + "that was fun", + "thanks", + "too good", + + "sorry", + "my b", + "lol", + "wow", + + "gotta go", + "one sec", + "let's play again later", + "bad connection", +}; + #ifdef _WIN32 #define MAX_SYSTEM_PROGRAM (4096) static void system_hidden(const char *cmd) diff --git a/Source/Core/Core/Slippi/SlippiUser.h b/Source/Core/Core/Slippi/SlippiUser.h index b35411add8..cecb17d1af 100644 --- a/Source/Core/Core/Slippi/SlippiUser.h +++ b/Source/Core/Core/Slippi/SlippiUser.h @@ -21,6 +21,8 @@ class SlippiUser std::string fileContents = ""; int port; + + std::vector chatMessages; }; SlippiUser(); @@ -36,6 +38,8 @@ class SlippiUser bool IsLoggedIn(); void FileListenThread(); + const static std::vector defaultChatMessages; + protected: UserInfo parseFile(std::string fileContents); void deleteFile(); From 4743b82eb56a9ad69686550d95f9c04f00ae5757 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Wed, 31 May 2023 10:14:14 -0400 Subject: [PATCH 12/23] use test default messages --- Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 13011 -> 12223 bytes Data/Sys/GameFiles/GALE01/slpCSS.dat | Bin 129859 -> 129859 bytes Data/Sys/GameSettings/GALE01r2.ini | 67 ++++-------------------- Data/Sys/GameSettings/GALJ01r2.ini | 67 ++++-------------------- Source/Core/Core/Slippi/SlippiUser.cpp | 40 ++++++++++---- 5 files changed, 49 insertions(+), 125 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index d9f3f211b48a3d2081c1be2d848e1c3834d4c04c..c1c3626763b7f9c5e263c3e787289650010ed2a1 100644 GIT binary patch delta 4097 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 diff --git a/Data/Sys/GameFiles/GALE01/slpCSS.dat b/Data/Sys/GameFiles/GALE01/slpCSS.dat index 138ef2ad02a3c920ecfccb79867b43a797217449..f2c8638ea58aa9555be4bb20dd103d3f4e683d95 100644 GIT binary patch delta 118 zcmX^7js5U9_J%EtF3&j7@ucMZj=+5p75MeXS&Y|My~18o->+3Sl56oCI*S= zd@mTKd1otKv~TKI2bq>7@ucMZj=+5p75Mehf!gA?{h|bAaxcl&OT_7Wn-u|4!9 H<2ykBcN#EH diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index e96aa5b8d3..38a58901e7 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -647,7 +647,7 @@ C216E74C 00000109 #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +3860072A 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -661,7 +661,7 @@ C216E74C 00000109 #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 3860003F B07E0006 38600038 987E0008 38600050 B07E0009 38600039 @@ -677,7 +677,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C60030E 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -956,12 +956,12 @@ B07D0030 887F1968 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0DC 0000002C #Recording/SendGamePreFrame.asm +C206B0DC 0000002B #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820118 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -992,11 +992,10 @@ B07D0031 80640030 3884FFFF 2C040000 40A00008 38840005 1C840030 7C632214 -1C9B000C 7C832214 -88640002 987D003B -88640003 987D0040 +1C9B000C 7C632214 +88630002 987D003B 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0040 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 @@ -5542,7 +5541,7 @@ BE8100B0 4BFFFCA9 7C0802A6 90010004 9421FF20 BE8100B0 3CA0803E 60A5AE68 -88A508F4 38800001 +88A508F4 38800000 38600008 3D808022 618C9938 7D8903A6 4E800421 2C030001 @@ -6896,51 +6895,3 @@ C0230064 BA810008 BA810008 800100B4 382100B0 7C0803A6 60000000 00000000 - -$DANGER: Char Balance [Fizzi, UnclePunch] -*This WILL cause desyncs -C2068F30 0000002C #External/Balance/Core/Character DAT Patcher.asm -7C0802A6 90010004 -9421FF20 BE8100B0 -83FE010C 83FF0008 -3BFFFFE0 807D0000 -2C03001B 40800124 -48000071 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -7C8802A6 1C630004 -7C841A14 80A40000 -54A501BA 7CA42A14 -80650000 80850004 -2C0300FF 41820014 -7C63FA14 90830000 -38A50008 4BFFFFE4 -48000078 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -00003914 00000003 -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -BA8100B0 800100E4 -382100E0 7C0803A6 -3C60803C 00000000 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 50e42b9ac2..2762959b4d 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -646,7 +646,7 @@ C216E74C 00000109 #Recording/SendGameInfo.asm 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +3860072A 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -660,7 +660,7 @@ C216E74C 00000109 #Recording/SendGameInfo.asm 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 -987E0005 38600040 +987E0005 3860003F B07E0006 38600038 987E0008 38600050 B07E0009 38600039 @@ -676,7 +676,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C60030E 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -955,12 +955,12 @@ B07D0030 887F1968 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -C206B0DC 0000002C #Recording/SendGamePreFrame.asm +C206B0DC 0000002B #Recording/SendGamePreFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820120 +2C030000 41820118 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600037 @@ -991,11 +991,10 @@ B07D0031 80640030 3884FFFF 2C040000 40A00008 38840005 1C840030 7C632214 -1C9B000C 7C832214 -88640002 987D003B -88640003 987D0040 +1C9B000C 7C632214 +88630002 987D003B 807F1830 907D003C -838DB650 3B9C0041 +838DB650 3B9C0040 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 881F2219 @@ -5541,7 +5540,7 @@ BE8100B0 4BFFFCA9 7C0802A6 90010004 9421FF20 BE8100B0 3CA0803E 60A5AE68 -88A508F4 38800001 +88A508F4 38800000 38600008 3D808022 618C9938 7D8903A6 4E800421 2C030001 @@ -6895,51 +6894,3 @@ C0230064 BA810008 BA810008 800100B4 382100B0 7C0803A6 60000000 00000000 - -$DANGER: Char Balance [Fizzi, UnclePunch] -*This WILL cause desyncs -C2068F30 0000002C #External/Balance/Core/Character DAT Patcher.asm -7C0802A6 90010004 -9421FF20 BE8100B0 -83FE010C 83FF0008 -3BFFFFE0 807D0000 -2C03001B 40800124 -48000071 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000A9 -480000A9 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -480000B1 480000B1 -7C8802A6 1C630004 -7C841A14 80A40000 -54A501BA 7CA42A14 -80650000 80850004 -2C0300FF 41820014 -7C63FA14 90830000 -38A50008 4BFFFFE4 -48000078 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -00003914 00000003 -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -000000FF 000000FF -BA8100B0 800100E4 -382100E0 7C0803A6 -3C60803C 00000000 diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp index 674fa154fc..9b32b01136 100644 --- a/Source/Core/Core/Slippi/SlippiUser.cpp +++ b/Source/Core/Core/Slippi/SlippiUser.cpp @@ -30,23 +30,45 @@ #include using json = nlohmann::json; +//const std::vector SlippiUser::defaultChatMessages = { +// "ggs", +// "one more", +// "brb", +// "good luck", +// +// "well played", +// "that was fun", +// "thanks", +// "too good", +// +// "sorry", +// "my b", +// "lol", +// "wow", +// +// "gotta go", +// "one sec", +// "let's play again later", +// "bad connection", +//}; + const std::vector SlippiUser::defaultChatMessages = { "ggs", "one more", "brb", "good luck", - "well played", - "that was fun", - "thanks", - "too good", + "imo should be replayed", + "we both played good", + "we both played bad", + "crimson blur hits that", - "sorry", - "my b", - "lol", - "wow", + ":3", + ":)", + ":(", + ">:[", - "gotta go", + "XD", "one sec", "let's play again later", "bad connection", From c69a93dd61fe81a85f1e52cc655a57222f57e1e2 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Mon, 5 Jun 2023 23:55:11 -0400 Subject: [PATCH 13/23] receive chat messages from mm service --- Data/Sys/GameFiles/GALE01/SlippiCSS.dat | Bin 12223 -> 12223 bytes Source/Core/Common/Version.cpp | 2 +- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 3 ++- Source/Core/Core/HW/EXI_DeviceSlippi.h | 1 + Source/Core/Core/Slippi/SlippiMatchmaking.cpp | 12 ++++++++---- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Data/Sys/GameFiles/GALE01/SlippiCSS.dat b/Data/Sys/GameFiles/GALE01/SlippiCSS.dat index c1c3626763b7f9c5e263c3e787289650010ed2a1..2409f7cac00d705789a3f1461acbf60891831b24 100644 GIT binary patch delta 14 WcmdlVzdwG%d3i?0%@^d~^8)}hkp_JL delta 14 WcmdlVzdwG%d3i>L%@^d~^8)}hiw1lE diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index c184a16559..02d460e675 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -24,7 +24,7 @@ //" " BUILD_TYPE_STR " " SCM_DESC_STR; //#endif #ifndef IS_PLAYBACK -#define SLIPPI_REV_STR "3.0.4" // netplay version +#define SLIPPI_REV_STR "3.0.5-dev.1" // netplay version #else #define SLIPPI_REV_STR "3.0.1" // playback version #endif diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 9be4a0801f..6fc209fed7 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -3040,7 +3040,8 @@ void CEXISlippi::handleGetPlayerSettings() { for (int j = 0; j < 16; j++) { - sprintf(resp.settings[i].chatMessages[j], "%s", messagesByPlayer[i][j].c_str()); + auto str = ConvertStringForGame(messagesByPlayer[i][j], MAX_MESSAGE_LENGTH); + sprintf(resp.settings[i].chatMessages[j], "%s", str.c_str()); } } diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.h b/Source/Core/Core/HW/EXI_DeviceSlippi.h index 2a989cfbbd..d919c31344 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.h +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.h @@ -22,6 +22,7 @@ #define ROLLBACK_MAX_FRAMES 7 #define MAX_NAME_LENGTH 15 +#define MAX_MESSAGE_LENGTH 25 #define CONNECT_CODE_LENGTH 8 extern bool g_needInputForFrame; diff --git a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp index 9e6f7110a8..4b04a30215 100644 --- a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp +++ b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp @@ -481,12 +481,16 @@ void SlippiMatchmaking::handleMatchmaking() playerInfo.displayName = el.value("displayName", ""); playerInfo.connectCode = el.value("connectCode", ""); playerInfo.port = el.value("port", 0); - playerInfo.chatMessages = el.value("chatMessages", SlippiUser::defaultChatMessages); - if (playerInfo.port == 1) + playerInfo.chatMessages = SlippiUser::defaultChatMessages; + if (el["chatMessages"].is_array()) { - playerInfo.chatMessages = std::vector{"1", "2", "3", "4", "5", "6", "7", "8", "9", - "10", "11", "12", "13", "14", "15", "16"}; + playerInfo.chatMessages = el.value("chatMessages", SlippiUser::defaultChatMessages); + if (playerInfo.chatMessages.size() != 16) + { + playerInfo.chatMessages = SlippiUser::defaultChatMessages; + } } + m_playerInfo.push_back(playerInfo); if (isLocal) From 6017c634694387c9df74ece19443793314a9b11d Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 00:13:22 -0400 Subject: [PATCH 14/23] feature: show configured messages in preview --- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 7 +++++++ Source/Core/Core/Slippi/SlippiUser.cpp | 21 ++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 6fc209fed7..6cbd6f5a45 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -3030,6 +3030,13 @@ void CEXISlippi::handleGetPlayerSettings() SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages, SlippiUser::defaultChatMessages}; + // These chat messages will be used when previewing messages + auto userChatMessages = user->GetUserInfo().chatMessages; + if (userChatMessages.size() == 16) { + messagesByPlayer[0] = userChatMessages; + } + + // These chat messages will be set when we have an opponent. We load their and our messages auto playerInfo = matchmaking->GetPlayerInfo(); for (auto &player : playerInfo) { diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp index 9b32b01136..d51157d266 100644 --- a/Source/Core/Core/Slippi/SlippiUser.cpp +++ b/Source/Core/Core/Slippi/SlippiUser.cpp @@ -319,6 +319,16 @@ SlippiUser::UserInfo SlippiUser::parseFile(std::string fileContents) info.connectCode = readString(res, "connectCode"); info.latestVersion = readString(res, "latestVersion"); + info.chatMessages = SlippiUser::defaultChatMessages; + if (res["chatMessages"].is_array()) + { + info.chatMessages = res.value("chatMessages", SlippiUser::defaultChatMessages); + if (info.chatMessages.size() != 16) + { + info.chatMessages = SlippiUser::defaultChatMessages; + } + } + return info; } @@ -344,7 +354,7 @@ void SlippiUser::overwriteFromServer() // Perform curl request std::string resp; - curl_easy_setopt(m_curl, CURLOPT_URL, (url + "/" + userInfo.uid).c_str()); + curl_easy_setopt(m_curl, CURLOPT_URL, (url + "/" + userInfo.uid + "?additionalFields=chatMessages").c_str()); curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &resp); CURLcode res = curl_easy_perform(m_curl); @@ -367,4 +377,13 @@ void SlippiUser::overwriteFromServer() userInfo.connectCode = r.value("connectCode", userInfo.connectCode); userInfo.latestVersion = r.value("latestVersion", userInfo.latestVersion); userInfo.displayName = r.value("displayName", userInfo.displayName); + + if (r["chatMessages"].is_array()) + { + userInfo.chatMessages = r.value("chatMessages", SlippiUser::defaultChatMessages); + if (userInfo.chatMessages.size() != 16) + { + userInfo.chatMessages = SlippiUser::defaultChatMessages; + } + } } From c8bf3ca60cf3b666d7d3a5eef83cc9d01b85dea6 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 00:25:26 -0400 Subject: [PATCH 15/23] chore: clean comments and loggers --- Source/Core/Core/Slippi/SlippiMatchmaking.cpp | 2 - Source/Core/Core/Slippi/SlippiUser.cpp | 40 +++++-------------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp index 4b04a30215..4cbc9a0ef0 100644 --- a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp +++ b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp @@ -428,8 +428,6 @@ void SlippiMatchmaking::handleMatchmaking() return; } - ERROR_LOG(SLIPPI, "Response: %s", getResp.dump().c_str()); - std::string respType = getResp["type"]; if (respType != MmMessageType::GET_TICKET_RESP) { diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp index d51157d266..6ad40994ca 100644 --- a/Source/Core/Core/Slippi/SlippiUser.cpp +++ b/Source/Core/Core/Slippi/SlippiUser.cpp @@ -30,45 +30,23 @@ #include using json = nlohmann::json; -//const std::vector SlippiUser::defaultChatMessages = { -// "ggs", -// "one more", -// "brb", -// "good luck", -// -// "well played", -// "that was fun", -// "thanks", -// "too good", -// -// "sorry", -// "my b", -// "lol", -// "wow", -// -// "gotta go", -// "one sec", -// "let's play again later", -// "bad connection", -//}; - const std::vector SlippiUser::defaultChatMessages = { "ggs", "one more", "brb", "good luck", - "imo should be replayed", - "we both played good", - "we both played bad", - "crimson blur hits that", + "well played", + "that was fun", + "thanks", + "too good", - ":3", - ":)", - ":(", - ">:[", + "sorry", + "my b", + "lol", + "wow", - "XD", + "gotta go", "one sec", "let's play again later", "bad connection", From fc25a5cc7e5914e696601a27dcdefa3c4d3a563c Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 08:45:12 -0400 Subject: [PATCH 16/23] fix: ifdef iconvctl for mac only --- Source/Core/Common/StringUtil.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 83d0a82a52..ee8b2a74df 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -551,10 +551,13 @@ std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const iconv_t const conv_desc = iconv_open(tocode, fromcode); + // Only on OS X can we call iconvctl, it isn't found on Linux +#ifdef __APPLE__ if (fallbacks) { iconvctl(conv_desc, ICONV_SET_FALLBACKS, fallbacks); } +#endif if ((iconv_t)-1 == conv_desc) { From 4da8023bc1dbd2258a7604fc1571bf6280f1445a Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 09:02:40 -0400 Subject: [PATCH 17/23] chore: try to get linux building --- Source/Core/Common/StringUtil.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index ee8b2a74df..7207c692e6 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -661,9 +661,10 @@ void uc_to_mb_fb(unsigned int code, void (*write_replacement)(const char *buf, s std::string UTF8ToSHIFTJIS(const std::string &input) { - auto fallbacks = new iconv_fallbacks(); + iconv_fallbacks *fallbacks = NULL; #ifdef __APPLE__ // Set SHIFTJIS callbacks only if converting to shift jis + fallbacks = new iconv_fallbacks(); fallbacks->uc_to_mb_fallback = uc_to_mb_fb; fallbacks->mb_to_uc_fallback = nullptr; fallbacks->mb_to_wc_fallback = nullptr; From 3d1cb13ea73020007128d02a18089dd15762db91 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 09:07:53 -0400 Subject: [PATCH 18/23] chore: use nullptr instead of NULL --- Source/Core/Common/StringUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 7207c692e6..b4f5c8d6d1 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -661,7 +661,7 @@ void uc_to_mb_fb(unsigned int code, void (*write_replacement)(const char *buf, s std::string UTF8ToSHIFTJIS(const std::string &input) { - iconv_fallbacks *fallbacks = NULL; + iconv_fallbacks *fallbacks = nullptr; #ifdef __APPLE__ // Set SHIFTJIS callbacks only if converting to shift jis fallbacks = new iconv_fallbacks(); From 1212c9be0c561b4854882c96ccd8ce7f85d6f218 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 21:37:45 -0400 Subject: [PATCH 19/23] chore: ifdef attempt 3 for linux --- Source/Core/Common/StringUtil.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index b4f5c8d6d1..39522ed41f 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -544,8 +544,12 @@ std::string UTF32toUTF8(const std::u32string &input) } #else template +#ifdef __APPLE__ std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const std::basic_string &input, iconv_fallbacks *fallbacks) +#elif +std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string &input) +#endif { std::string result; @@ -609,10 +613,12 @@ std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const return result; } +#ifdef __APPLE__ template std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string &input) { return CodeToWithFallbacks(tocode, fromcode, input, nullptr); } +#endif template std::string CodeToUTF8(const char* fromcode, const std::basic_string& input) From c95d5a2255eb50ae82dfe0a041566bda0069e23d Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 21:39:30 -0400 Subject: [PATCH 20/23] chore: dont call functions that dont exist --- Source/Core/Common/StringUtil.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 39522ed41f..7262f5eaee 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -667,18 +667,19 @@ void uc_to_mb_fb(unsigned int code, void (*write_replacement)(const char *buf, s std::string UTF8ToSHIFTJIS(const std::string &input) { - iconv_fallbacks *fallbacks = nullptr; #ifdef __APPLE__ // Set SHIFTJIS callbacks only if converting to shift jis - fallbacks = new iconv_fallbacks(); + auto fallbacks = new iconv_fallbacks(); fallbacks->uc_to_mb_fallback = uc_to_mb_fb; fallbacks->mb_to_uc_fallback = nullptr; fallbacks->mb_to_wc_fallback = nullptr; fallbacks->wc_to_mb_fallback = nullptr; fallbacks->data = nullptr; -#endif auto str = CodeToWithFallbacks("SJIS", "UTF-8", input, fallbacks); free(fallbacks); +#elif + auto str = CodeTo("SJIS", "UTF-8", input); +#endif return str; } From 028056834d73ae1297fc050da2a8fe1c58509d61 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Tue, 6 Jun 2023 18:46:09 -0700 Subject: [PATCH 21/23] swap elif for else --- Source/Core/Common/StringUtil.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 7262f5eaee..e62667fadc 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -543,11 +543,12 @@ std::string UTF32toUTF8(const std::u32string &input) return utf8Convert.to_bytes(p, p + input.size()); } #else -template #ifdef __APPLE__ +template std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const std::basic_string &input, iconv_fallbacks *fallbacks) -#elif +#else +template std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string &input) #endif { @@ -677,7 +678,7 @@ std::string UTF8ToSHIFTJIS(const std::string &input) fallbacks->data = nullptr; auto str = CodeToWithFallbacks("SJIS", "UTF-8", input, fallbacks); free(fallbacks); -#elif +#else auto str = CodeTo("SJIS", "UTF-8", input); #endif return str; @@ -731,4 +732,4 @@ std::string ValueToString(int value) std::string ValueToString(bool value) { return value ? "True" : "False"; -} \ No newline at end of file +} From 08b773033984d8c71b8e7e1fd3c62ab674342b7f Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Tue, 6 Jun 2023 18:47:37 -0700 Subject: [PATCH 22/23] undo template name move --- Source/Core/Common/StringUtil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index e62667fadc..0c2a60d3b2 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -543,12 +543,11 @@ std::string UTF32toUTF8(const std::u32string &input) return utf8Convert.to_bytes(p, p + input.size()); } #else -#ifdef __APPLE__ template +#ifdef __APPLE__ std::string CodeToWithFallbacks(const char *tocode, const char *fromcode, const std::basic_string &input, iconv_fallbacks *fallbacks) #else -template std::string CodeTo(const char *tocode, const char *fromcode, const std::basic_string &input) #endif { From 54abd78a4713cc07e31e1faf2ab78d02db3df8f4 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Tue, 6 Jun 2023 21:52:23 -0400 Subject: [PATCH 23/23] chore: update code lists --- Data/Sys/Slippi/InjectionLists/list_netplay-old2.json | 11 +++++++++++ Data/Sys/Slippi/InjectionLists/list_netplay.json | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 Data/Sys/Slippi/InjectionLists/list_netplay-old2.json diff --git a/Data/Sys/Slippi/InjectionLists/list_netplay-old2.json b/Data/Sys/Slippi/InjectionLists/list_netplay-old2.json new file mode 100644 index 0000000000..be7092461f --- /dev/null +++ b/Data/Sys/Slippi/InjectionLists/list_netplay-old2.json @@ -0,0 +1,11 @@ +{ + "Details": [ + { + "InjectionAddress": "800056AC", + "Name": "Required: Slippi Online", + "Codetype": "Auto", + "Annotation": "Online/Static/ChatMessages.asm", + "Tags": "" + } + ] +} \ No newline at end of file diff --git a/Data/Sys/Slippi/InjectionLists/list_netplay.json b/Data/Sys/Slippi/InjectionLists/list_netplay.json index 068f2730d2..732af658ab 100644 --- a/Data/Sys/Slippi/InjectionLists/list_netplay.json +++ b/Data/Sys/Slippi/InjectionLists/list_netplay.json @@ -1232,13 +1232,6 @@ "Annotation": "Online/Static/CSSUpdateCSP.asm", "Tags": "" }, - { - "InjectionAddress": "800056AC", - "Name": "Required: Slippi Online", - "Codetype": "Auto", - "Annotation": "Online/Static/ChatMessages.asm", - "Tags": "" - }, { "InjectionAddress": "80005690", "Name": "Required: Slippi Online",