From 65f9064989f61e29fa2587f00cc5e258bfb15e78 Mon Sep 17 00:00:00 2001
From: Jas Laferriere <Fizzi36@gmail.com>
Date: Sat, 17 Dec 2022 04:55:40 -0500
Subject: [PATCH] send out completion messages

---
 Common/Common.s                     |   1 +
 Online/Slippi Online Scene/main.asm |  35 +-
 Output/Netplay/GALE01r2.ini         | 579 ++++++++++++++--------------
 Output/Netplay/GALJ01r2.ini         | 579 ++++++++++++++--------------
 4 files changed, 627 insertions(+), 567 deletions(-)

diff --git a/Common/Common.s b/Common/Common.s
index 7764a7ff..f2e987de 100644
--- a/Common/Common.s
+++ b/Common/Common.s
@@ -541,6 +541,7 @@ add \reg, r3, r4
 .set CONST_SlippiCmdReportMatch,0xBD
 .set CONST_SlippiCmdSendNameEntryIndex,0xBE
 .set CONST_SlippiCmdNameEntryAutoComplete,0xBF
+.set CONST_SlippiCmdReportSetCompletion,0xC2
 # For Slippi file loads
 .set CONST_SlippiCmdFileLength, 0xD1
 .set CONST_SlippiCmdFileLoad, 0xD2
diff --git a/Online/Slippi Online Scene/main.asm b/Online/Slippi Online Scene/main.asm
index fca73868..883f11be 100644
--- a/Online/Slippi Online Scene/main.asm	
+++ b/Online/Slippi Online Scene/main.asm	
@@ -559,6 +559,25 @@ restore
 blr
 #endregion
 
+FN_ReportSetCompletion:
+backup
+mr r31, r3
+
+li r3, 1
+branchl r12, HSD_MemAlloc
+
+# Write tx data
+li r4, CONST_SlippiCmdReportSetCompletion
+stb r4, 0(r3)
+stb r31, 1(r3)
+
+# Transfer completion
+li r4, 1
+li r5, CONST_ExiWrite
+branchl r12, FN_EXITransferBuffer
+
+blr
+
 #region VSSceneDecide
 VSSceneDecide:
 .set REG_MSRB_ADDR, 31
@@ -587,7 +606,12 @@ bne VSSceneDecide_SkipRankedHandler
 # If connection is not active, just go back to CSS
 lbz r3, MSRB_CONNECTION_STATE(REG_MSRB_ADDR)
 cmpwi r3, MM_STATE_IDLE
-beq VSSceneDecide_SkipRankedHandler
+bne VSSceneDecide_ConnectionActive
+# Report disconnect
+li r3, 1
+bl FN_ReportSetCompletion
+b VSSceneDecide_SkipRankedHandler
+VSSceneDecide_ConnectionActive:
 
 bl GamePrepData_BLRL
 mflr REG_GPD
@@ -654,6 +678,10 @@ stb r3, 0x5(r4)
 b VSSceneDecide_ModeHandlerEnd
 
 VSSceneDecide_RankedSetOver:
+# Report normal set completion
+li r3, 0
+bl FN_ReportSetCompletion
+
 # Disconnect from opponent
 # Prepare buffer for EXI transfer
 li r3, 1
@@ -1377,6 +1405,11 @@ cmpwi r3, MM_STATE_CONNECTION_SUCCESS
 beq GamePrepSceneDecide_ExecNormal
 
 # Here we have disconnected from opponent, go back to CSS
+
+# I commented the below because the game setup scene itself already sends the communication
+# li r3, 1
+# bl FN_ReportSetCompletion
+
 # Go back to CSS
 load r4, 0x80479d30
 li r3, 0x01
diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini
index 18304fb9..399223cb 100644
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/GALE01r2.ini
@@ -4924,7 +4924,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 000001F0 #Online/Slippi Online Scene/main.asm
+C21A45B8 000001FD #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
 BE8100B0 3C80803E
@@ -4935,7 +4935,7 @@ BE8100B0 3C80803E
 986DAFEC 986DAFE0
 38600008 480001C1
 7C8802A6 4800002D
-48000F14 80830000
+48000F78 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -4967,7 +4967,7 @@ BE8100B0 3C80803E
 BE8100B0 3C808045
 6084ABF0 886DAEF8
 98640006 48000159
-7C8802A6 48000B31
+7C8802A6 48000B95
 7C6802A6 90640018
 3D808000 618C56B8
 7D8903A6 4E800421
@@ -4997,16 +4997,16 @@ BA8100B0 800100E4
 48000275 09000000
 80480668 80480668
 02030000 801B1588
-4800030D 02000000
+4800035D 02000000
 80480530 80479D98
 03030000 00000000
 00000000 05000000
 00000000 00000000
-04030000 480005B9
-480008F5 20000000
+04030000 4800061D
+48000959 20000000
 80490880 804D68D0
-05030000 48000C09
-48000C49 50000000
+05030000 48000C6D
+48000CAD 50000000
 48000019 48000015
 FF000000 4E800021
 81940000 4E800021
@@ -5044,7 +5044,7 @@ BE8100B0 7C7E1B78
 7F6802A6 7F63DB78
 3880001C 3D808000
 618CC160 7D8903A6
-4E800421 480008C9
+4E800421 4800092D
 7C6802A6 907B0018
 38600003 987B0000
 38600001 B07B0001
@@ -5058,7 +5058,7 @@ BE8100B0 7C7E1B78
 2C030000 40820000
 886DAFCA 2C030000
 41820020 48000004
-48000771 3C808047
+480007D5 3C808047
 60849D30 38600005
 98640005 48000018
 3C808047 60849D30
@@ -5086,7 +5086,7 @@ BE8100B0 7C7F1B78
 4E800421 7C7E1B78
 887E0001 889E0002
 7C032000 4082001C
-48000691 3C808047
+480006F5 3C808047
 60849D30 38600005
 98640005 4800001C
 38600000 3D80801A
@@ -5096,331 +5096,344 @@ BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
+BE8100B0 7C7F1B78
+38600001 3D808037
+618CF1E4 7D8903A6
+4E800421 388000C2
+98830000 9BE30001
+38800001 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+4E800020 7C0802A6
+90010004 9421FF20
 BE8100B0 3D80801B
 618C15C8 7D8903A6
 4E800421 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 886DAFA0
-2C030000 40820108
+2C030000 4082011C
 887F0000 2C030000
-418200FC 4BFFFD09
-7F6802A6 3C808046
-6084B6A0 88640008
-987B0017 480006D5
-7C7C1B78 2C1C0000
-40800014 887B0006
-38630001 987B0006
-48000060 9B9B0005
-A09B0001 38840006
-7F9B21AE 387C0003
-7C9B18AE 38A40001
-7CBB19AE 1C9C0002
-38840010 A07F026A
-7C7B232E 889B0000
-38840001 38600002
-7C841B96 7C052000
-4080002C A07B0001
-38630001 B07B0001
-38600000 987B0006
+40820010 38600001
+4BFFFF5D 48000104
+4BFFFCAD 7F6802A6
+3C808046 6084B6A0
+88640008 987B0017
+480006DD 7C7C1B78
+2C1C0000 40800014
+887B0006 38630001
+987B0006 48000060
+9B9B0005 A09B0001
+38840006 7F9B21AE
+387C0003 7C9B18AE
+38A40001 7CBB19AE
+1C9C0002 38840010
+A07F026A 7C7B232E
+889B0000 38840001
+38600002 7C841B96
+7C052000 4080002C
+A07B0001 38630001
+B07B0001 38600000
+987B0006 3C808047
+60849D30 38600006
+98640005 4800006C
+38600000 4BFFFEA9
+38600001 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+386000BA 987E0000
+7FC3F378 38800001
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7FC3F378
+3D808037 618CF1B0
+7D8903A6 4E800421
 3C808047 60849D30
-38600006 98640005
-48000064 38600001
+38600001 98640005
+887F0003 480006E9
+986DAFC9 886DAFA0
+2C030003 40820020
+887F0003 38800001
+2C030000 40820008
+38800000 988DAFC9
+4800003C 3A800000
+3AA00000 7E83A378
+480006AD 2C030000
+41820008 3AB50001
+3A940001 2C140004
+4180FFE4 2C150001
+4182000C 38600000
+986DAFC9 3E808047
+62949DA4 887F0003
+48000675 2C030000
+41820018 38600001
+98740000 38600000
+9874005D 48000014
+38600000 98740000
+38600001 9874005D
+886DAFA0 2C030003
+4182000C 2C030000
+4082000C 38600000
+98740004 38600000
+986DAFCA 38600004
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7E1B78 386000BA
+7C7E1B78 386000BC
 987E0000 7FC3F378
 38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
+7FC3F378 38800004
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 3C80804D
+807E0000 90645F90
 7FC3F378 3D808037
 618CF1B0 7D8903A6
-4E800421 3C808047
-60849D30 38600001
-98640005 887F0003
-480006E9 986DAFC9
-886DAFA0 2C030003
-40820020 887F0003
-38800001 2C030000
-40820008 38800000
-988DAFC9 4800003C
-3A800000 3AA00000
-7E83A378 480006AD
-2C030000 41820008
-3AB50001 3A940001
-2C140004 4180FFE4
-2C150001 4182000C
-38600000 986DAFC9
-3E808047 62949DA4
-887F0003 48000675
-2C030000 41820018
-38600001 98740000
-38600000 9874005D
-48000014 38600000
-98740000 38600001
-9874005D 886DAFA0
-2C030003 4182000C
-2C030000 4082000C
-38600000 98740004
-38600000 986DAFCA
-38600004 3D808037
-618CF1E4 7D8903A6
+4E800421 7FE3FB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 4E800021
+01780101 01FF2121
+FF2121EE 0000EE00
+7C0802A6 90010004
+9421FF20 BE8100B0
+38600000 3D808000
+618C5610 7D8903A6
 4E800421 7C7E1B78
-386000BC 987E0000
-7FC3F378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FC3F378
-38800004 38A00000
-3D808000 618C55F0
+83ED8840 3BFF0598
+886DAFA0 2C030003
+40820048 3BA00000
+1CBD0024 38650069
+7C7F18AE 38630001
+38850060 7C9F20AE
+3D808000 618C56B0
 7D8903A6 4E800421
-3C80804D 807E0000
-90645F90 7FC3F378
-3D808037 618CF1B0
+1C9D0024 38840063
+7C7F21AE 3BBD0001
+2C1D0004 4180FFC4
+3C608049 60630888
+4BFFFF65 7C8802A6
+38A00010 3D808000
+618C31F4 7D8903A6
+4E800421 3C808049
+60840888 887F0060
+98640005 887F0063
+9864000B 887F0084
+98640008 887F0087
+9864000E 38600000
+9864FFFF 9864FFFB
+887E0264 2C030000
+418200F4 887E0003
+1C630024 386302C5
+7F7E18AE 38600002
+98640002 38600001
+9864FFFB 98640006
+98640007 98640009
+9864000A 9864000C
+9864000D 9864000F
+98640010 3BA00000
+3B800000 1C7D0024
+38630069 7C7F18AE
+7C03D800 40820030
+1CBD0024 38A50060
+7CBF28AE 38DC0005
+7CA621AE 1CBD0024
+38A50063 7CBF28AE
+38DC000B 7CA621AE
+3B9C0001 3BBD0001
+2C1D0004 4180FFB8
+9B840003 3BA00000
+3B800000 1C7D0024
+38630069 7C7F18AE
+7C03D800 41820030
+1CBD0024 38A50060
+7CBF28AE 38DC0008
+7CA621AE 1CBD0024
+38A50063 7CBF28AE
+38DC000E 7CA621AE
+3B9C0001 3BBD0001
+2C1D0004 4180FFB8
+9B840004 3C808043
+60842078 887F0060
+90640014 887F0063
+98640018 887F0084
+9064001C 887F0087
+98640020 887E0264
+2C030000 41820024
+887F00A8 90640024
+887F00AB 98640028
+887F00CC 9064002C
+887F00CF 98640030
+A07F000E 9064000C
+3D808001 618C8254
+7D8903A6 4E800421
+386000C7 3D808001
+618C8C2C 7D8903A6
+4E800421 38600004
+3D808001 618C7700
 7D8903A6 4E800421
-7FE3FB78 3D808037
-618CF1B0 7D8903A6
+3860001C 3D808002
+618C6F2C 7D8903A6
+4E800421 3A800000
+1C140024 7FF5FB78
+7EB50214 3D808000
+618C569C 7D8903A6
+4E800421 88950060
+7C840774 7C041800
+41820028 38600000
+3D808000 618C56A0
+7D8903A6 4E800421
+3D808000 618C56A8
+7D8903A6 4E800421
+3A940001 2C140006
+3AB50024 4180FFB0
+A07F000E 3D808022
+618C519C 7D8903A6
+4E800421 7C641B78
+38600001 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3D808002
+618C7168 7D8903A6
 4E800421 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
-4E800021 01780101
-01FF2121 FF2121EE
-0000EE00 7C0802A6
+7C0802A6 90010004
+9421FF20 BE8100B0
+3C808047 60849D30
+38600003 98640005
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 7C0802A6
 90010004 9421FF20
 BE8100B0 38600000
 3D808000 618C5610
 7D8903A6 4E800421
-7C7E1B78 83ED8840
-3BFF0598 886DAFA0
-2C030003 40820048
-3BA00000 1CBD0024
-38650069 7C7F18AE
-38630001 38850060
-7C9F20AE 3D808000
-618C56B0 7D8903A6
-4E800421 1C9D0024
-38840063 7C7F21AE
-3BBD0001 2C1D0004
-4180FFC4 3C608049
-60630888 4BFFFF65
-7C8802A6 38A00010
+7C7F1B78 83CD8840
+3BDE0598 7FC3F378
+389F025C 38A00138
 3D808000 618C31F4
 7D8903A6 4E800421
-3C808049 60840888
-887F0060 98640005
-887F0063 9864000B
-887F0084 98640008
-887F0087 9864000E
-38600000 9864FFFF
-9864FFFB 887E0264
-2C030000 418200F4
-887E0003 1C630024
-386302C5 7F7E18AE
-38600002 98640002
-38600001 9864FFFB
-98640006 98640007
-98640009 9864000A
-9864000C 9864000D
-9864000F 98640010
-3BA00000 3B800000
-1C7D0024 38630069
-7C7F18AE 7C03D800
-40820030 1CBD0024
-38A50060 7CBF28AE
-38DC0005 7CA621AE
-1CBD0024 38A50063
-7CBF28AE 38DC000B
-7CA621AE 3B9C0001
-3BBD0001 2C1D0004
-4180FFB8 9B840003
-3BA00000 3B800000
-1C7D0024 38630069
-7C7F18AE 7C03D800
-41820030 1CBD0024
-38A50060 7CBF28AE
-38DC0008 7CA621AE
-1CBD0024 38A50063
-7CBF28AE 38DC000E
-7CA621AE 3B9C0001
-3BBD0001 2C1D0004
-4180FFB8 9B840004
-3C808043 60842078
-887F0060 90640014
-887F0063 98640018
-887F0084 9064001C
-887F0087 98640020
-887E0264 2C030000
-41820024 887F00A8
-90640024 887F00AB
-98640028 887F00CC
-9064002C 887F00CF
-98640030 A07F000E
-9064000C 3D808001
-618C8254 7D8903A6
-4E800421 386000C7
-3D808001 618C8C2C
-7D8903A6 4E800421
-38600004 3D808001
-618C7700 7D8903A6
-4E800421 3860001C
-3D808002 618C6F2C
-7D8903A6 4E800421
-3A800000 1C140024
-7FF5FB78 7EB50214
-3D808000 618C569C
+7FC3F378 3D808000
+618C5694 7D8903A6
+4E800421 3D808017
+618CEB30 7D8903A6
+4E800421 889F02BC
+98830000 889F02BF
+98830001 38800000
+98830002 38800003
+98830005 38800078
+98830004 3C80803D
+6084DEC8 8084000C
+887F02E0 98640002
+38602121 B0640003
+3C808049 60840880
+887F02E3 98640016
+7FE3FB78 3D808037
+618CF1B0 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 3FE08047
+63FF9DA4 887F0004
+2C030001 41820010
+2C030002 4182007C
+480000C4 38600000
+3D808003 618C3BD8
 7D8903A6 4E800421
-88950060 7C840774
-7C041800 41820028
-38600000 3D808000
-618C56A0 7D8903A6
-4E800421 3D808000
-618C56A8 7D8903A6
-4E800421 3A940001
-2C140006 3AB50024
-4180FFB0 A07F000E
-3D808022 618C519C
+7C7B1B78 38600001
+3D808003 618C3BD8
 7D8903A6 4E800421
-7C641B78 38600001
-3D808000 618C56A0
+7C1B1800 41810080
+41800084 38600000
+3D808003 618C42B4
 7D8903A6 4E800421
-3D808000 618C56A8
+7C7B1B78 38600001
+3D808003 618C42B4
 7D8903A6 4E800421
-3D808002 618C7168
+7C1B1800 41800048
+4181004C 48000050
+38600000 3D808003
+618C3BD8 7D8903A6
+4E800421 2C030000
+40820024 38600001
+3D808003 618C3BD8
 7D8903A6 4E800421
+2C030000 40820010
+48000014 38600000
+48000010 38600001
+48000008 3860FFFF
 BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
-BE8100B0 3C808047
-60849D30 38600003
-98640005 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C7F1B78
-83CD8840 3BDE0598
-7FC3F378 389F025C
-38A00138 3D808000
-618C31F4 7D8903A6
-4E800421 7FC3F378
-3D808000 618C5694
-7D8903A6 4E800421
-3D808017 618CEB30
-7D8903A6 4E800421
-889F02BC 98830000
-889F02BF 98830001
-38800000 98830002
-38800003 98830005
-38800078 98830004
-3C80803D 6084DEC8
-8084000C 887F02E0
-98640002 38602121
-B0640003 3C808049
-60840880 887F02E3
-98640016 7FE3FB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-BA8100B0 800100E4
-382100E0 7C0803A6
-4E800020 4E800021
-7C0802A6 90010004
-9421FF20 BE8100B0
+BE8100B0 7C7D1B78
 3FE08047 63FF9DA4
-887F0004 2C030001
-41820010 2C030002
-4182007C 480000C4
-38600000 3D808003
-618C3BD8 7D8903A6
-4E800421 7C7B1B78
-38600001 3D808003
-618C3BD8 7D8903A6
-4E800421 7C1B1800
-41810080 41800084
-38600000 3D808003
-618C42B4 7D8903A6
-4E800421 7C7B1B78
-38600001 3D808003
-618C42B4 7D8903A6
-4E800421 7C1B1800
-41800048 4181004C
-48000050 38600000
-3D808003 618C3BD8
+1FDD00A8 7FDEFA14
+887F0004 2C030000
+418200B0 3C608046
+6063B6A0 886324D0
+889F0006 7C032000
+40820098 887E0058
+2C030003 4182008C
+887F0004 2C030007
+40820040 887F0006
+2C030001 40820024
+887F0000 1C6300A8
+7C63FA14 8863005F
+889E005F 7C032000
+41820058 4800005C
+887F0000 7C03E800
+41820048 4800004C
+887F0006 2C030001
+40820028 7FE3FB78
+3D808016 618C54A0
 7D8903A6 4E800421
-2C030000 40820024
-38600001 3D808003
-618C3BD8 7D8903A6
-4E800421 2C030000
-40820010 48000014
-38600000 48000010
-38600001 48000008
-3860FFFF BA8100B0
+889E005F 7C032000
+41820020 48000014
+887E005D 2C030000
+41820010 48000004
+38600000 48000008
+38600001 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF20 BE8100B0
-7C7D1B78 3FE08047
-63FF9DA4 1FDD00A8
-7FDEFA14 887F0004
-2C030000 418200B0
-3C608046 6063B6A0
-886324D0 889F0006
-7C032000 40820098
-887E0058 2C030003
-4182008C 887F0004
-2C030007 40820040
-887F0006 2C030001
-40820024 887F0000
-1C6300A8 7C63FA14
-8863005F 889E005F
-7C032000 41820058
-4800005C 887F0000
-7C03E800 41820048
-4800004C 887F0006
-2C030001 40820028
-7FE3FB78 3D808016
-618C54A0 7D8903A6
-4E800421 889E005F
-7C032000 41820020
-48000014 887E005D
-2C030000 41820010
-48000004 38600000
-48000008 38600001
+83E30010 887F0006
+2C030000 40820014
+3D808001 618C74BC
+7D8903A6 4E800421
 BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
 BE8100B0 83E30010
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7E1B78
+887E0000 2C030004
+41820018 3C808047
+60849D30 38600001
+98640005 48000038
 887F0006 2C030000
-40820014 3D808001
-618C74BC 7D8903A6
-4E800421 BA8100B0
+41820018 3C808047
+60849D30 38600003
+98640005 48000018
+4BFFFC5D 3C808047
+60849D30 38600005
+98640005 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-83E30010 38600000
-3D808000 618C5610
-7D8903A6 4E800421
-7C7E1B78 887E0000
-2C030004 41820018
-3C808047 60849D30
-38600001 98640005
-48000038 887F0006
-2C030000 41820018
-3C808047 60849D30
-38600003 98640005
-48000018 4BFFFC5D
-3C808047 60849D30
-38600005 98640005
 BA8100B0 800100E4
 382100E0 7C0803A6
-4E800020 BA8100B0
-800100E4 382100E0
-7C0803A6 38600028
-987E0000 00000000
+38600028 987E0000
+60000000 00000000
 04005694 4E800020 #Online/Static/AdjustNullCharID.asm
 C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 7C0802A6 90010004
diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini
index 8ef9e40a..a7d1b80f 100644
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/GALJ01r2.ini
@@ -4923,7 +4923,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 000001F0 #Online/Slippi Online Scene/main.asm
+C21A45B8 000001FD #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
 BE8100B0 3C80803E
@@ -4934,7 +4934,7 @@ BE8100B0 3C80803E
 986DAFEC 986DAFE0
 38600008 480001C1
 7C8802A6 4800002D
-48000F14 80830000
+48000F78 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -4966,7 +4966,7 @@ BE8100B0 3C80803E
 BE8100B0 3C808045
 6084ABF0 886DAEF8
 98640006 48000159
-7C8802A6 48000B31
+7C8802A6 48000B95
 7C6802A6 90640018
 3D808000 618C56B8
 7D8903A6 4E800421
@@ -4996,16 +4996,16 @@ BA8100B0 800100E4
 48000275 09000000
 80480668 80480668
 02030000 801B1588
-4800030D 02000000
+4800035D 02000000
 80480530 80479D98
 03030000 00000000
 00000000 05000000
 00000000 00000000
-04030000 480005B9
-480008F5 20000000
+04030000 4800061D
+48000959 20000000
 80490880 804D68D0
-05030000 48000C09
-48000C49 50000000
+05030000 48000C6D
+48000CAD 50000000
 48000019 48000015
 FF000000 4E800021
 81940000 4E800021
@@ -5043,7 +5043,7 @@ BE8100B0 7C7E1B78
 7F6802A6 7F63DB78
 3880001C 3D808000
 618CC160 7D8903A6
-4E800421 480008C9
+4E800421 4800092D
 7C6802A6 907B0018
 38600003 987B0000
 38600001 B07B0001
@@ -5057,7 +5057,7 @@ BE8100B0 7C7E1B78
 2C030000 40820000
 886DAFCA 2C030000
 41820020 48000004
-48000771 3C808047
+480007D5 3C808047
 60849D30 38600005
 98640005 48000018
 3C808047 60849D30
@@ -5085,7 +5085,7 @@ BE8100B0 7C7F1B78
 4E800421 7C7E1B78
 887E0001 889E0002
 7C032000 4082001C
-48000691 3C808047
+480006F5 3C808047
 60849D30 38600005
 98640005 4800001C
 38600000 3D80801A
@@ -5095,331 +5095,344 @@ BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
+BE8100B0 7C7F1B78
+38600001 3D808037
+618CF1E4 7D8903A6
+4E800421 388000C2
+98830000 9BE30001
+38800001 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+4E800020 7C0802A6
+90010004 9421FF20
 BE8100B0 3D80801B
 618C15C8 7D8903A6
 4E800421 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 886DAFA0
-2C030000 40820108
+2C030000 4082011C
 887F0000 2C030000
-418200FC 4BFFFD09
-7F6802A6 3C808046
-6084B6A0 88640008
-987B0017 480006D5
-7C7C1B78 2C1C0000
-40800014 887B0006
-38630001 987B0006
-48000060 9B9B0005
-A09B0001 38840006
-7F9B21AE 387C0003
-7C9B18AE 38A40001
-7CBB19AE 1C9C0002
-38840010 A07F026A
-7C7B232E 889B0000
-38840001 38600002
-7C841B96 7C052000
-4080002C A07B0001
-38630001 B07B0001
-38600000 987B0006
+40820010 38600001
+4BFFFF5D 48000104
+4BFFFCAD 7F6802A6
+3C808046 6084B6A0
+88640008 987B0017
+480006DD 7C7C1B78
+2C1C0000 40800014
+887B0006 38630001
+987B0006 48000060
+9B9B0005 A09B0001
+38840006 7F9B21AE
+387C0003 7C9B18AE
+38A40001 7CBB19AE
+1C9C0002 38840010
+A07F026A 7C7B232E
+889B0000 38840001
+38600002 7C841B96
+7C052000 4080002C
+A07B0001 38630001
+B07B0001 38600000
+987B0006 3C808047
+60849D30 38600006
+98640005 4800006C
+38600000 4BFFFEA9
+38600001 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+386000BA 987E0000
+7FC3F378 38800001
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7FC3F378
+3D808037 618CF1B0
+7D8903A6 4E800421
 3C808047 60849D30
-38600006 98640005
-48000064 38600001
+38600001 98640005
+887F0003 480006E9
+986DAFC9 886DAFA0
+2C030003 40820020
+887F0003 38800001
+2C030000 40820008
+38800000 988DAFC9
+4800003C 3A800000
+3AA00000 7E83A378
+480006AD 2C030000
+41820008 3AB50001
+3A940001 2C140004
+4180FFE4 2C150001
+4182000C 38600000
+986DAFC9 3E808047
+62949DA4 887F0003
+48000675 2C030000
+41820018 38600001
+98740000 38600000
+9874005D 48000014
+38600000 98740000
+38600001 9874005D
+886DAFA0 2C030003
+4182000C 2C030000
+4082000C 38600000
+98740004 38600000
+986DAFCA 38600004
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7E1B78 386000BA
+7C7E1B78 386000BC
 987E0000 7FC3F378
 38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
+7FC3F378 38800004
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 3C80804D
+807E0000 90645F90
 7FC3F378 3D808037
 618CF1B0 7D8903A6
-4E800421 3C808047
-60849D30 38600001
-98640005 887F0003
-480006E9 986DAFC9
-886DAFA0 2C030003
-40820020 887F0003
-38800001 2C030000
-40820008 38800000
-988DAFC9 4800003C
-3A800000 3AA00000
-7E83A378 480006AD
-2C030000 41820008
-3AB50001 3A940001
-2C140004 4180FFE4
-2C150001 4182000C
-38600000 986DAFC9
-3E808047 62949DA4
-887F0003 48000675
-2C030000 41820018
-38600001 98740000
-38600000 9874005D
-48000014 38600000
-98740000 38600001
-9874005D 886DAFA0
-2C030003 4182000C
-2C030000 4082000C
-38600000 98740004
-38600000 986DAFCA
-38600004 3D808037
-618CF1E4 7D8903A6
+4E800421 7FE3FB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 4E800021
+01780101 01FF2121
+FF2121EE 0000EE00
+7C0802A6 90010004
+9421FF20 BE8100B0
+38600000 3D808000
+618C5610 7D8903A6
 4E800421 7C7E1B78
-386000BC 987E0000
-7FC3F378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FC3F378
-38800004 38A00000
-3D808000 618C55F0
+83ED8840 3BFF0598
+886DAFA0 2C030003
+40820048 3BA00000
+1CBD0024 38650069
+7C7F18AE 38630001
+38850060 7C9F20AE
+3D808000 618C56B0
 7D8903A6 4E800421
-3C80804D 807E0000
-90645F90 7FC3F378
-3D808037 618CF1B0
+1C9D0024 38840063
+7C7F21AE 3BBD0001
+2C1D0004 4180FFC4
+3C608049 60630888
+4BFFFF65 7C8802A6
+38A00010 3D808000
+618C31F4 7D8903A6
+4E800421 3C808049
+60840888 887F0060
+98640005 887F0063
+9864000B 887F0084
+98640008 887F0087
+9864000E 38600000
+9864FFFF 9864FFFB
+887E0264 2C030000
+418200F4 887E0003
+1C630024 386302C5
+7F7E18AE 38600002
+98640002 38600001
+9864FFFB 98640006
+98640007 98640009
+9864000A 9864000C
+9864000D 9864000F
+98640010 3BA00000
+3B800000 1C7D0024
+38630069 7C7F18AE
+7C03D800 40820030
+1CBD0024 38A50060
+7CBF28AE 38DC0005
+7CA621AE 1CBD0024
+38A50063 7CBF28AE
+38DC000B 7CA621AE
+3B9C0001 3BBD0001
+2C1D0004 4180FFB8
+9B840003 3BA00000
+3B800000 1C7D0024
+38630069 7C7F18AE
+7C03D800 41820030
+1CBD0024 38A50060
+7CBF28AE 38DC0008
+7CA621AE 1CBD0024
+38A50063 7CBF28AE
+38DC000E 7CA621AE
+3B9C0001 3BBD0001
+2C1D0004 4180FFB8
+9B840004 3C808043
+60842078 887F0060
+90640014 887F0063
+98640018 887F0084
+9064001C 887F0087
+98640020 887E0264
+2C030000 41820024
+887F00A8 90640024
+887F00AB 98640028
+887F00CC 9064002C
+887F00CF 98640030
+A07F000E 9064000C
+3D808001 618C8254
+7D8903A6 4E800421
+386000C7 3D808001
+618C8C2C 7D8903A6
+4E800421 38600004
+3D808001 618C7700
 7D8903A6 4E800421
-7FE3FB78 3D808037
-618CF1B0 7D8903A6
+3860001C 3D808002
+618C6F2C 7D8903A6
+4E800421 3A800000
+1C140024 7FF5FB78
+7EB50214 3D808000
+618C569C 7D8903A6
+4E800421 88950060
+7C840774 7C041800
+41820028 38600000
+3D808000 618C56A0
+7D8903A6 4E800421
+3D808000 618C56A8
+7D8903A6 4E800421
+3A940001 2C140006
+3AB50024 4180FFB0
+A07F000E 3D808022
+618C519C 7D8903A6
+4E800421 7C641B78
+38600001 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3D808002
+618C7168 7D8903A6
 4E800421 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
-4E800021 01780101
-01FF2121 FF2121EE
-0000EE00 7C0802A6
+7C0802A6 90010004
+9421FF20 BE8100B0
+3C808047 60849D30
+38600003 98640005
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 7C0802A6
 90010004 9421FF20
 BE8100B0 38600000
 3D808000 618C5610
 7D8903A6 4E800421
-7C7E1B78 83ED8840
-3BFF0598 886DAFA0
-2C030003 40820048
-3BA00000 1CBD0024
-38650069 7C7F18AE
-38630001 38850060
-7C9F20AE 3D808000
-618C56B0 7D8903A6
-4E800421 1C9D0024
-38840063 7C7F21AE
-3BBD0001 2C1D0004
-4180FFC4 3C608049
-60630888 4BFFFF65
-7C8802A6 38A00010
+7C7F1B78 83CD8840
+3BDE0598 7FC3F378
+389F025C 38A00138
 3D808000 618C31F4
 7D8903A6 4E800421
-3C808049 60840888
-887F0060 98640005
-887F0063 9864000B
-887F0084 98640008
-887F0087 9864000E
-38600000 9864FFFF
-9864FFFB 887E0264
-2C030000 418200F4
-887E0003 1C630024
-386302C5 7F7E18AE
-38600002 98640002
-38600001 9864FFFB
-98640006 98640007
-98640009 9864000A
-9864000C 9864000D
-9864000F 98640010
-3BA00000 3B800000
-1C7D0024 38630069
-7C7F18AE 7C03D800
-40820030 1CBD0024
-38A50060 7CBF28AE
-38DC0005 7CA621AE
-1CBD0024 38A50063
-7CBF28AE 38DC000B
-7CA621AE 3B9C0001
-3BBD0001 2C1D0004
-4180FFB8 9B840003
-3BA00000 3B800000
-1C7D0024 38630069
-7C7F18AE 7C03D800
-41820030 1CBD0024
-38A50060 7CBF28AE
-38DC0008 7CA621AE
-1CBD0024 38A50063
-7CBF28AE 38DC000E
-7CA621AE 3B9C0001
-3BBD0001 2C1D0004
-4180FFB8 9B840004
-3C808043 60842078
-887F0060 90640014
-887F0063 98640018
-887F0084 9064001C
-887F0087 98640020
-887E0264 2C030000
-41820024 887F00A8
-90640024 887F00AB
-98640028 887F00CC
-9064002C 887F00CF
-98640030 A07F000E
-9064000C 3D808001
-618C8254 7D8903A6
-4E800421 386000C7
-3D808001 618C8C2C
-7D8903A6 4E800421
-38600004 3D808001
-618C7700 7D8903A6
-4E800421 3860001C
-3D808002 618C6F2C
-7D8903A6 4E800421
-3A800000 1C140024
-7FF5FB78 7EB50214
-3D808000 618C569C
+7FC3F378 3D808000
+618C5694 7D8903A6
+4E800421 3D808017
+618CEB30 7D8903A6
+4E800421 889F02BC
+98830000 889F02BF
+98830001 38800000
+98830002 38800003
+98830005 38800078
+98830004 3C80803D
+6084DEC8 8084000C
+887F02E0 98640002
+38602121 B0640003
+3C808049 60840880
+887F02E3 98640016
+7FE3FB78 3D808037
+618CF1B0 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 3FE08047
+63FF9DA4 887F0004
+2C030001 41820010
+2C030002 4182007C
+480000C4 38600000
+3D808003 618C3BD8
 7D8903A6 4E800421
-88950060 7C840774
-7C041800 41820028
-38600000 3D808000
-618C56A0 7D8903A6
-4E800421 3D808000
-618C56A8 7D8903A6
-4E800421 3A940001
-2C140006 3AB50024
-4180FFB0 A07F000E
-3D808022 618C519C
+7C7B1B78 38600001
+3D808003 618C3BD8
 7D8903A6 4E800421
-7C641B78 38600001
-3D808000 618C56A0
+7C1B1800 41810080
+41800084 38600000
+3D808003 618C42B4
 7D8903A6 4E800421
-3D808000 618C56A8
+7C7B1B78 38600001
+3D808003 618C42B4
 7D8903A6 4E800421
-3D808002 618C7168
+7C1B1800 41800048
+4181004C 48000050
+38600000 3D808003
+618C3BD8 7D8903A6
+4E800421 2C030000
+40820024 38600001
+3D808003 618C3BD8
 7D8903A6 4E800421
+2C030000 40820010
+48000014 38600000
+48000010 38600001
+48000008 3860FFFF
 BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
-BE8100B0 3C808047
-60849D30 38600003
-98640005 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C7F1B78
-83CD8840 3BDE0598
-7FC3F378 389F025C
-38A00138 3D808000
-618C31F4 7D8903A6
-4E800421 7FC3F378
-3D808000 618C5694
-7D8903A6 4E800421
-3D808017 618CEB30
-7D8903A6 4E800421
-889F02BC 98830000
-889F02BF 98830001
-38800000 98830002
-38800003 98830005
-38800078 98830004
-3C80803D 6084DEC8
-8084000C 887F02E0
-98640002 38602121
-B0640003 3C808049
-60840880 887F02E3
-98640016 7FE3FB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-BA8100B0 800100E4
-382100E0 7C0803A6
-4E800020 4E800021
-7C0802A6 90010004
-9421FF20 BE8100B0
+BE8100B0 7C7D1B78
 3FE08047 63FF9DA4
-887F0004 2C030001
-41820010 2C030002
-4182007C 480000C4
-38600000 3D808003
-618C3BD8 7D8903A6
-4E800421 7C7B1B78
-38600001 3D808003
-618C3BD8 7D8903A6
-4E800421 7C1B1800
-41810080 41800084
-38600000 3D808003
-618C42B4 7D8903A6
-4E800421 7C7B1B78
-38600001 3D808003
-618C42B4 7D8903A6
-4E800421 7C1B1800
-41800048 4181004C
-48000050 38600000
-3D808003 618C3BD8
+1FDD00A8 7FDEFA14
+887F0004 2C030000
+418200B0 3C608046
+6063B6A0 886324D0
+889F0006 7C032000
+40820098 887E0058
+2C030003 4182008C
+887F0004 2C030007
+40820040 887F0006
+2C030001 40820024
+887F0000 1C6300A8
+7C63FA14 8863005F
+889E005F 7C032000
+41820058 4800005C
+887F0000 7C03E800
+41820048 4800004C
+887F0006 2C030001
+40820028 7FE3FB78
+3D808016 618C54A0
 7D8903A6 4E800421
-2C030000 40820024
-38600001 3D808003
-618C3BD8 7D8903A6
-4E800421 2C030000
-40820010 48000014
-38600000 48000010
-38600001 48000008
-3860FFFF BA8100B0
+889E005F 7C032000
+41820020 48000014
+887E005D 2C030000
+41820010 48000004
+38600000 48000008
+38600001 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF20 BE8100B0
-7C7D1B78 3FE08047
-63FF9DA4 1FDD00A8
-7FDEFA14 887F0004
-2C030000 418200B0
-3C608046 6063B6A0
-886324D0 889F0006
-7C032000 40820098
-887E0058 2C030003
-4182008C 887F0004
-2C030007 40820040
-887F0006 2C030001
-40820024 887F0000
-1C6300A8 7C63FA14
-8863005F 889E005F
-7C032000 41820058
-4800005C 887F0000
-7C03E800 41820048
-4800004C 887F0006
-2C030001 40820028
-7FE3FB78 3D808016
-618C54A0 7D8903A6
-4E800421 889E005F
-7C032000 41820020
-48000014 887E005D
-2C030000 41820010
-48000004 38600000
-48000008 38600001
+83E30010 887F0006
+2C030000 40820014
+3D808001 618C74BC
+7D8903A6 4E800421
 BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 7C0802A6
 90010004 9421FF20
 BE8100B0 83E30010
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7E1B78
+887E0000 2C030004
+41820018 3C808047
+60849D30 38600001
+98640005 48000038
 887F0006 2C030000
-40820014 3D808001
-618C74BC 7D8903A6
-4E800421 BA8100B0
+41820018 3C808047
+60849D30 38600003
+98640005 48000018
+4BFFFC5D 3C808047
+60849D30 38600005
+98640005 BA8100B0
 800100E4 382100E0
 7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-83E30010 38600000
-3D808000 618C5610
-7D8903A6 4E800421
-7C7E1B78 887E0000
-2C030004 41820018
-3C808047 60849D30
-38600001 98640005
-48000038 887F0006
-2C030000 41820018
-3C808047 60849D30
-38600003 98640005
-48000018 4BFFFC5D
-3C808047 60849D30
-38600005 98640005
 BA8100B0 800100E4
 382100E0 7C0803A6
-4E800020 BA8100B0
-800100E4 382100E0
-7C0803A6 38600028
-987E0000 00000000
+38600028 987E0000
+60000000 00000000
 04005694 4E800020 #Online/Static/AdjustNullCharID.asm
 C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 7C0802A6 90010004