diff --git a/Data/Sys/GameSettings/Netplay/GALE01r2.ini b/Data/Sys/GameSettings/Netplay/GALE01r2.ini
index 49ffe0a418..96e8ce7751 100644
--- a/Data/Sys/GameSettings/Netplay/GALE01r2.ini
+++ b/Data/Sys/GameSettings/Netplay/GALE01r2.ini
@@ -11,12 +11,23 @@ $Required: General Codes
 $Required: Slippi Recording
 $Required: Slippi Online
 $Recommended: Normal Lag Reduction
-$Recommended: Polling drift fix + VB
 
 [Gecko]
 $Required: General Codes [Achilles, Dan Salvato, Magus, UnclePunch, tauKhan, Ptomerty, Cilan, Zauron, Datel, donny2112, Jorgasms, strikebowler585, Myougi]
-0445BF28 FFFFFFFF #Unlock All Characters and Stages [Datel]
-0445BF2C FFFFFFFF
+0415EE98 38600001 #Unlock All Characters and Stages [Datel]
+0415EDDC 38600001
+04164B14 38600001
+041648F4 38600001
+0415EE4C 38600001
+0415EE14 38600001
+0415D968 38600001
+0415D9D8 38600001
+0417229C 38600000
+041737B0 38600000
+04164658 38600001
+041644E8 38600001
+0430490C 38600063
+043044F0 38600001
 043D4A48 00340102 #Stock Mode [Magus]
 043D4A4C 04000A00 #4 Stocks [Magus]
 043D4A50 08010100 #8 Minutes [Magus]
@@ -31,8 +42,6 @@ C21AF6F4 00000006 #External/Skip Memcard Prompt/Skip Memcard Prompt.asm
 60000000 00000000
 0415D94C 4E800020 #Disable Special Messages [Most]
 0415D984 4E800020 #Disable Trophy Messages [Achilles]
-0245C390 00000125 #Unlock All 293 Trophies [Datel]
-0245C395 01266363
 C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm
 3BA00000 7FA3EB78
 3D80801A 618C3680
@@ -143,10 +152,10 @@ BA810008 800100B4
 41200000 42700000
 41200000 C1A00000
 41200000 41A00000
-41200000 C1A00000
 41200000 C2700000
-41200000 41A00000
+41200000 C1A00000
 41200000 42700000
+41200000 41A00000
 41200000 0000001F
 C21B3333 420CCCCD
 421B3333 420CCCCD
@@ -524,7 +533,7 @@ C2266CE0 0000000C #External/Disable FoD During Doubles/Disable FoD During Double
 41820010 2C030020
 41820008 48000034
 806DB610 88630018
-2C030001 41820014
+2C030001 48000014
 38600001 50652EB4
 90A60018 48000014
 38600000 50652EB4
@@ -580,8 +589,77 @@ C216EA30 00000004 #Common/Winners Names are Gold on CSS/Remember Who LRA Started
 04261B30 60000000 #External/Closing CSS Door Preserves Nametag/On Window Close/Skip isUsingNametag Bool Reset.asm
 042605FC 38C00003 #External/Unplugging Closes CSS Door/Unplugging Closes CSS Door.asm
 041239A8 60000000 #External/FreezeGlitchFix/FreezeGlitchFix.asm
+C213C388 0000000A #Common/CostumeBoundCheck/PuffCostume.asm
+83DC002C 887E000C
+3D808003 618C2330
+7D8903A6 4E800421
+3D808016 618C9238
+7D8903A6 4E800421
+889E0619 7C041800
+40800008 48000014
+3D808013 618CC46C
+7D8903A6 4E800420
+809C002C 00000000
+C216DED4 00000039 #Common/CostumeBoundCheck/main.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3BE00000 7FE3FB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 41820060
+7FE3FB78 3D808003
+618C3198 7D8903A6
+4E800421 7C7E1B78
+7FE3FB78 3D808003
+618C2330 7D8903A6
+4E800421 3D808016
+618C9238 7D8903A6
+4E800421 7C1E1800
+4180001C 7FE3FB78
+38800000 3D808003
+618C3208 7D8903A6
+4E800421 3BFF0001
+2C1F0006 4180FF80
+3BE00000 7FE3FB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 418200EC
+7FE3FB78 3D808003
+618C2330 7D8903A6
+4E800421 7C7E1B78
+7FE3FB78 3D808003
+618C3198 7D8903A6
+4E800421 7C7D1B78
+7FE3FB78 3D808003
+618C3284 7D8903A6
+4E800421 7C7C1B78
+3B600000 7C1FD800
+4182008C 7F63DB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 41820070
+7F63DB78 3D808003
+618C2330 7D8903A6
+4E800421 7C03F000
+40820054 7F63DB78
+3D808003 618C3198
+7D8903A6 4E800421
+7C03E800 40820038
+7F63DB78 3D808003
+618C3284 7D8903A6
+4E800421 7C03E000
+4082001C 38830001
+7F63DB78 3D808003
+618C32F4 7D8903A6
+4E800421 3B7B0001
+2C1B0006 4180FF68
+3BFF0001 2C1F0006
+4180FEF4 BA810008
+800100B4 382100B0
+7C0803A6 8001001C
+60000000 00000000
 
-$Required: Slippi Recording [Fizzi, Achilles, UnclePunch]
+$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337]
 *Saves replays, Slippi device must be in Slot B.
 *To disable saving replays, visit the Slippi settings in Config > GameCube
 040679BC 38802600 #Recording/ExtendPlayerBlock.asm
@@ -602,7 +680,7 @@ C23219EC 0000001C #Recording/FlushFrameBuffer.asm
 80ADB61C 8885000D
 2C040000 40820024
 8885000C 2C040000
-40820018 808506FC
+40820018 808507B7
 3884FF85 7C041800
 40800008 7C832378
 907C0005 3BBD0009
@@ -643,34 +721,35 @@ C216D884 0000001C #Recording/SendGameEnd.asm
 800100B4 382100B0
 7C0803A6 819F2514
 60000000 00000000
-C216E74C 000000BE #Recording/SendGameInfo.asm
+C216E74C 000000E3 #Recording/SendGameInfo.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418205B4
+2C030000 418206DC
 38600005 3D808037
 618CF1E4 7D8903A6
-4E800421 7C791B78
-932DB64C 38800005
+4E800421 7C7B1B78
+936DB64C 38800005
 3D808000 618CC160
 7D8903A6 4E800421
-386006E2 3D808037
+38600702 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7E1B78
-93D90000 38600000
-906DB650 3C608019
-606310E8 38800000
+93DB0000 38600000
+906DB650 3C608000
+60635600 80630000
+38630008 38800000
 3D808000 618C55FC
 7D8903A6 4E800421
 7C7C1B78 38600035
 987E0000 3860001C
 987E0001 38600036
-987E0002 386001A4
+987E0002 38600248
 B07E0003 38600037
 987E0005 3860003F
 B07E0006 38600038
-987E0008 38600048
+987E0008 3860004C
 B07E0009 38600039
 987E000B 38600002
 B07E000C 3860003A
@@ -684,7 +763,7 @@ B07E0015 3860003D
 38600010 987E001A
 38600204 B07E001B
 38600036 987E001D
-3C600307 60630000
+3C600309 60630000
 907E001E 387E0022
 7FE4FB78 38A00138
 3D808000 618C31F4
@@ -742,30 +821,66 @@ B07E0015 3860003D
 8862F23C 987E01BF
 3C608048 80639D30
 5463443E B07E01C0
-7FC3F378 388001C2
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 38600205
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7B1B78 38600010
-987B0000 3860003D
-987B0203 38600200
-B07B0201 38600000
-987B0204 3B400000
-7C7AE050 2C030200
-41810010 B07B0201
-38600001 987B0204
-387B0001 3C808019
-608410E8 7C84D214
-A0BB0201 3D808000
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C791B78
+3A800000 3ABF0060
+3AFE01C2 3B590034
+1C74001F 7F03BA14
+1ED40024 7ED6AA14
+88760001 2C030000
+40820028 1C74001F
+7C83D214 7F03C378
+38A0001F 3D808000
 618C31F4 7D8903A6
-4E800421 7F63DB78
+4E800421 4800001C
+7F03C378 3880001F
+3D808000 618CC160
+7D8903A6 4E800421
+3A940001 2C140004
+4180FFA0 3A800000
+3ABF0060 3AFE023E
+3B5900EF 1C74000A
+7F03BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820028
+1C74000A 7C83D214
+7F03C378 38A0000A
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+3880000A 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
+7F23CB78 3D808037
+618CF1B0 7D8903A6
+4E800421 7FC3F378
+38800266 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+38600205 3D808037
+618CF1E4 7D8903A6
+4E800421 7C751B78
+3C608000 60635600
+80630000 3AE30008
+38600010 98750000
+3860003D 98750203
+38600200 B0750201
+38600000 98750204
+3AC00000 7C76E050
+2C030200 41810010
+B0750201 38600001
+98750204 38750001
+7EE4BB78 7C84B214
+A0B50201 3D808000
+618C31F4 7D8903A6
+4E800421 7EA3AB78
 38800205 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-3B5A0200 7C1AE000
-4180FFA0 7F63DB78
+3AD60200 7C16E000
+4180FFA4 7EA3AB78
 3D808037 618CF1B0
 7D8903A6 4E800421
 38600004 38800007
@@ -834,14 +949,14 @@ BE810008 806DB64C
 BA810008 800100B4
 382100B0 7C0803A6
 3C608017 00000000
-C206DA34 00000034 #Recording/SendGamePostFrame.asm
+C206DA34 00000035 #Recording/SendGamePostFrame.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 41820160
+2C030000 41820168
 887F221F 546306F7
-40820154 8B7F000C
+4082015C 8B7F000C
 806DB64C 83A30000
 838DB650 7FBDE214
 38600038 987D0000
@@ -882,7 +997,8 @@ B07D0030 887F1968
 807F008C 907D003D
 807F0090 907D0041
 807F00EC 907D0045
-838DB650 3B9C0049
+807F195C 907D0049
+838DB650 3B9C004D
 938DB650 BA810008
 800100B4 382100B0
 7C0803A6 8001001C
@@ -948,51 +1064,6 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
 C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
 38600000 987E25FF
 807E00B0 00000000
-C20055F0 0000002C #Common/EXITransferBuffer.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7E1B78 7C9D2378
-7CBF2B78 3D808034
-618C7364 7D8903A6
-4E800421 7C7C1B78
-7FC3F378 7C9EEA14
-2C1F0000 4182001C
-7C0018AC 38630020
-7C032000 4180FFF4
-7C0004AC 4C00012C
-38600001 38800000
-3D808034 618C64C0
-7D8903A6 4E800421
-38600001 3D808034
-618C6D80 7D8903A6
-4E800421 38600001
-38800000 38A00005
-3D808034 618C6688
-7D8903A6 4E800421
-38600001 7FC4F378
-7FA5EB78 7FE6FB78
-38E00000 3D808034
-618C5E60 7D8903A6
-4E800421 38600001
-3D808034 618C5F4C
-7D8903A6 4E800421
-38600001 3D808034
-618C67B4 7D8903A6
-4E800421 38600001
-3D808034 618C6E74
-7D8903A6 4E800421
-38600001 3D808034
-618C65CC 7D8903A6
-4E800421 2C1F0000
-4082001C 7C001BAC
-38630020 7C032000
-4180FFEC 7C0004AC
-4C00012C 7F83E378
-3D808034 618C738C
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 00000000
 C20055F8 0000000F #Common/GetIsFollower.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -1016,6 +1087,88 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
+C20055F4 00000007 #Common/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
+C20055EC 00000008 #Common/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C20056B4 00000040 #Common/SubtextFunctions.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF002090
+FF202890 FF403090
+2C180001 418000FC
+39E00004 FC20B890
+FC40C090 2C0F0001
+41820020 2C0F0002
+41820020 2C0F0003
+41820020 2C0F0004
+41820020 48000024
+EC21D028 4800001C
+EC21D02A 48000014
+EC42D028 4800000C
+EC42D02A 48000004
+7EA3AB78 80810038
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C771B78 7EA3AB78
+7EE4BB78 FC20A890
+FC40B090 3D80803A
+618C7548 7D8903A6
+4E800421 7F25CB78
+2C0F0000 40820008
+7EC5B378 7EA3AB78
+7EE4BB78 3D80803A
+618C74F0 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 80A10038
+80C1003C 80E10040
+81010044 81210048
+8141004C 3D80803A
+618C70A0 7D8903A6
+4E800421 2C0F0000
+4182000C 39EFFFFF
+4BFFFF14 48000094
+7EA3AB78 80810038
+FC20B890 FC40C090
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C771B78 7EA3AB78
+7EE4BB78 FC20A890
+FC40B090 3D80803A
+618C7548 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 7EC5B378
+3D80803A 618C74F0
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+80A10038 80C1003C
+80E10040 81010044
+81210048 8141004C
+3D80803A 618C70A0
+7D8903A6 4E800421
+7EE3BB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -1077,41 +1230,6 @@ C216EBAC 0000000C #Common/CSS KO Stars/Asign KO Stars Upon Exiting Dairantou.asm
 7D8903A6 4E800421
 8001001C 83E10014
 60000000 00000000
-C20055FC 00000022 #Common/Gecko/ProcessCodeList.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7D1B78 7C9E2378
-3B800000 807D0000
-5463463C 3B600008
-3B200000 2C0300C0
-41820044 2C0300C2
-4182004C 2C030004
-41820058 2C030006
-41820058 2C030008
-41820068 807D0000
-5463213E 2C03000F
-40820010 807D0004
-2C030000 4182007C
-4800004C 807D0004
-1C630008 3B630008
-4800003C 807D0004
-1C630008 3B630008
-3B200004 48000028
-3B200004 48000020
-807D0004 38630007
-54630038 3B630008
-833D0004 48000008
-3B600010 3B9C0001
-2C1E0000 4182001C
-807D0000 5463463C
-7FA4EB78 7F25CB78
-7FC903A6 4E800421
-7FBDDA14 4BFFFF38
-3C608019 606310E8
-7C63E850 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
 
 $Required: Slippi Online [Fizzi, UnclePunch]
 *Adds online mode, Slippi device must be in Slot B.
@@ -1141,63 +1259,42 @@ FC020840 4180000C
 38600001 BA810008
 800100B4 382100B0
 7C0803A6 00000000
-C21A4DB4 00000031 #Online/Core/ForceEngineOnRollback.asm
+C21A4DB4 0000001C #Online/Core/ForceEngineOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-4082015C 3C608047
+408200B0 3C608047
 60639D64 80630000
-2C030000 40820148
+2C030000 4082009C
 3D808034 618C7364
 7D8903A6 4E800421
 7C7A1B78 80ADB61C
 2C1B0000 41810014
 888500D9 2C040000
 41820038 3B600001
-888500D9 988506F2
-808500DB 908506F3
-888500DA 988506F7
-8085018B 908506F8
-808500D5 80840001
-908506FC 480000D4
-88850700 2C040000
-418200C8 38800000
-98850700 3D808001
+888500D9 988507AD
+808500DB 908507AE
+888500DA 988507B2
+80850237 908507B3
+808500D5 80840002
+908507B7 48000028
+888507BB 2C040000
+4182001C 38800000
+988507BB 3D808001
 618C95FC 7D8903A6
-4E800421 48000020
-4E800021 466F7263
-65642061 20706164
-2072656E 65772E2E
-2E000000 7C0802A6
-90010004 9421FF00
-BC610008 60000000
-60000000 60000000
-60000000 60000000
-806DAFC4 38630003
-4BFFFFB9 7C8802A6
-4CC63242 3D808032
-618C3CF4 7D8903A6
-4E800421 806DAFC4
-388000D0 98830000
-38800000 98830001
-38800001 98830002
-38800080 38A00001
-3D808000 618C55F0
+4E800421 7F43D378
+3D808034 618C738C
 7D8903A6 4E800421
-B8610008 80010104
-38210100 7C0803A6
-7F43D378 3D808034
-618C738C 7D8903A6
-4E800421 2C1B0000
-40820014 3D80801A
-618C4DA8 7D8903A6
-4E800420 00000000
+2C1B0000 40820014
+3D80801A 618C4DA8
+7D8903A6 4E800420
+60000000 00000000
 C216D310 00000009 #Online/Core/HandleLRAS.asm
 3C608048 80639D30
 5463443E 2C030208
 40820028 3C608046
 6063B6A0 88630008
 2C030007 40820014
-808DB61C 806406EE
+808DB61C 806407A9
 7C6903A6 4E800421
 8001003C 83E10034
 60000000 00000000
@@ -1217,46 +1314,46 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 7C7D1B78
 60000000 00000000
-C216E748 00000053 #Online/Core/InitOnlinePlay.asm
+C216E748 00000069 #Online/Core/InitOnlinePlay.asm
 3D808022 618C54B8
 7D8903A6 4E800421
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820250 38600705
+40820304 386007C0
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7B1B78 38800705
+7C7B1B78 388007C0
 3D808000 618CC160
 7D8903A6 4E800421
 936DB61C 38600001
 907B0003 48000201
-7C6802A6 907B06EE
+7C6802A6 907B07A9
 38600012 3D808037
 618CF1E4 7D8903A6
 4E800421 907B00D1
-38600059 3D808037
+3860010A 3D808037
 618CF1E4 7D8903A6
 4E800421 907B00D5
-7C7A1B78 38800059
+7C7A1B78 3880010A
 3D808000 618CC160
 7D8903A6 4E800421
 38600021 3D808037
 618CF1E4 7D8903A6
 4E800421 7C791B78
-933B018F 3860009E
+933B024A 3860009E
 3D808037 618CF1E4
 7D8903A6 4E800421
-907B0193 3880009E
+907B024E 3880009E
 3D808000 618CC160
 7D8903A6 4E800421
 38800000 98830000
 38800007 98830001
-93790005 38600705
+93790005 386007C0
 90790009 9359000D
-38600059 90790011
-807B0193 90790015
+3860010A 90790011
+807B024E 90790015
 3860009E 90790019
 38600000 9079001D
 38600000 3D808000
@@ -1267,7 +1364,7 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 88780004 987B0001
 80780005 907B0007
 3C80804D 90645F90
-7FE3FB78 38980158
+7FE3FB78 38980208
 38A00138 3D808000
 618C31F4 7D8903A6
 4E800421 88780009
@@ -1276,7 +1373,7 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 48000010 38600001
 48000008 3860000F
 987B001B 8062F228
-907B06EA 3C600101
+907B07A5 3C600101
 60630101 9062F228
 38A00000 3C60804C
 606320BC 1C850044
@@ -1290,28 +1387,50 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 7C8802A6 38A00000
 3D808038 618CFD54
 7D8903A6 4E800421
-48000040 4E800021
+480000F4 4E800021
 3C608048 80639D60
 5464803E 806DB61C
 80630007 7C841A14
 3C60804D 90835F90
 4E800020 4E800021
-808DB61C 806406EA
-9062F228 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+838DB61C 807C07A5
+9062F228 886DAFA0
+2C030001 4082008C
+38600011 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+386000BD 987E0000
+807C0003 907E0001
+3BE00000 3BBE0005
+7FE3FB78 3D808003
+618C1724 7D8903A6
+4E800421 38800001
+989D0000 8883008E
+989D0001 80830D28
+909D0002 3BFF0001
+3BBD0006 2C1F0002
+4180FFC8 7FC3F378
+38800011 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-60000000 00000000
-C216E904 0000003B #Online/Core/InitPause.asm
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 00000000
+C216E904 0000003F #Online/Core/InitPause.asm
 3C608048 80639D30
 5463443E 2C030208
-408201C0 3D808046
+408201DC 3D808046
 618CDB68 886C0002
 54630739 41820028
 48000029 7C6802A6
 906C0040 38600000
 986DAFC8 886C0002
 38800000 50831F38
-986C0002 48000184
+986C0002 480001A0
 4E800021 7C0802A6
 90010004 9421FF50
 BE810008 83ADB61C
@@ -1330,37 +1449,41 @@ BE810008 83ADB61C
 546005EF 4182000C
 546004E7 40820020
 886DAFC8 2C030000
-41820084 807F0008
-546004E7 40820048
-480000C8 38600002
+418200A0 807F0008
+546004E7 40820064
+480000E4 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-7FC3F378 38800007
-3D808016 618CCF4C
+3D808037 618C8330
 7D8903A6 4E800421
-38600003 3C808046
-6084B6A0 98640000
-48000088 38600000
+3C608046 6063B6A0
+9BC30001 7FC3F378
+38800007 3D808016
+618CCF4C 7D8903A6
+4E800421 38600003
+3C808046 6084B6A0
+98640000 48000088
+38600000 986DAFC8
+3D80802F 618C33CC
+7D8903A6 4E800421
+7FC3F378 3D80801A
+618C10FC 7D8903A6
+4E800421 48000058
+807F0008 546004E7
+4182004C 38600001
 986DAFC8 3D80802F
-618C33CC 7D8903A6
+618C3394 7D8903A6
 4E800421 7FC3F378
-3D80801A 618C10FC
+38800005 3D80801A
+618C0FEC 7D8903A6
+4E800421 38600005
+3D808002 618C4030
 7D8903A6 4E800421
-48000058 807F0008
-546004E7 4182004C
-38600001 986DAFC8
-3D80802F 618C3394
-7D8903A6 4E800421
-7FC3F378 38800005
-3D80801A 618C0FEC
-7D8903A6 4E800421
-38600005 3D808002
-618C4030 7D8903A6
-4E800421 48000004
-3860FFFF BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-881F0001 00000000
+48000004 3860FFFF
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 881F0001
+60000000 00000000
 C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
 41A20014 3D80801A
 618C5024 7D8903A6
@@ -1374,10 +1497,10 @@ C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
 BE810008 3D808034
 618C7364 7D8903A6
 4E800421 7C7D1B78
-83EDB61C 3BDF0197
+83EDB61C 3BDF0252
 8B9E0000 3F008048
 83189D60 3B18FFFF
-82FF06E6 7C18B800
+82FF07A1 7C18B800
 4181009C 7C78B850
 38630001 8B9E0000
 7F83E051 40800008
@@ -1406,13 +1529,13 @@ A0840001 7C032000
 38800061 3D808000
 618CC160 7D8903A6
 4E800421 7C18B800
-4081001C 931F06E6
+4081001C 931F07A1
 3B9C0001 2C1C0007
 41800008 3B9CFFF9
 9B9E0000 7FA3EB78
 3D808034 618C738C
 7D8903A6 4E800421
-8B7F06F2 2C1B0001
+8B7F07AD 2C1B0001
 408200CC 48000025
 BA810008 800100B4
 382100B0 7C0803A6
@@ -1446,7 +1569,18 @@ C216EA30 00000004 #Online/Core/Remember Who LRA Started.asm
 40820014 3C808046
 6084B6A0 88840001
 989E000C 00000000
-C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
+C2376A20 0000000A #Online/Core/SkipNewInputFetchOnRollback.asm
+3C608048 80639D30
+5463443E 2C030208
+40820038 3C608047
+60639D64 80630000
+2C030000 40820024
+806DB61C 886300D9
+2C030001 40820014
+3D808037 618C6A28
+7D8903A6 4E800420
+3861002C 00000000
+C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
 3D808037 618CE214
 7D8903A6 4E800421
 48000030 4E800021
@@ -1459,9 +1593,9 @@ C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820260 3C608047
+4082026C 3C608047
 60639D64 80630000
-2C030000 4082024C
+2C030000 40820258
 834DB61C 3F608048
 837B9D60 3D808034
 618C7364 7D8903A6
@@ -1473,7 +1607,7 @@ C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
 618C4030 7D8903A6
 4E800421 4BFFFF51
 7EE802A6 38600002
-809A0701 3D80803A
+809A07BC 3D80803A
 618C6754 7D8903A6
 4E800421 7C781B78
 38800001 98980049
@@ -1493,11 +1627,11 @@ C0570010 3D80803A
 3D80803A 618C74F0
 7D8903A6 4E800421
 38600001 987A000E
-887A06F2 2C030000
-418200AC 887A06F7
-2C030000 41820078
-807A018F 809A06F8
-80BA0193 3D808000
+887A07AD 2C030000
+418200B8 887A07B2
+2C030000 41820084
+807A024A 809A07B3
+80BA024E 3D808000
 618C560C 7D8903A6
 4E800421 3D808001
 618C9894 7D8903A6
@@ -1507,49 +1641,50 @@ C0570010 3D80803A
 88650000 7C841A14
 98850002 38600000
 98650003 3F608048
-837B9D60 807A018B
+837B9D60 807A0237
 907A0003 38600000
-987A018A 987A00DA
-987A06F7 3D808001
-618C95FC 7D8903A6
-4E800421 807A06F3
-7C1B1800 41800010
-38600000 987A00D9
-987A06F2 887A018A
-2C030000 4182002C
-807A018B 7C1B1800
-41800020 807A018F
-7F64DB78 80BA0193
-3D808000 618C5608
+987A0236 987A0247
+987A0248 987A0249
+987A00DA 987A07B2
+3D808001 618C95FC
 7D8903A6 4E800421
-887A000C 2C030001
-4182004C 3C608046
-6063B6A0 88630008
-2C030000 40820010
-38600000 987A000B
-4800002C 887A000B
-38630001 987A000B
-2C030007 40810018
-38600001 987A000C
-807A06EE 7C6903A6
-4E800421 7F23CB78
-3D808034 618C738C
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-60000000 00000000
-C2376A28 0000009B #Online/Core/TriggerSendInput.asm
+807A07AE 7C1B1800
+41800010 38600000
+987A00D9 987A07AD
+887A0236 2C030000
+4182002C 807A0237
+7C1B1800 41800020
+807A024A 7F64DB78
+80BA024E 3D808000
+618C5608 7D8903A6
+4E800421 887A000C
+2C030001 4182004C
+3C608046 6063B6A0
+88630008 2C030000
+40820010 38600000
+987A000B 4800002C
+887A000B 38630001
+987A000B 2C030007
+40810018 38600001
+987A000C 807A07A9
+7C6903A6 4E800421
+7F23CB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 00000000
+C2376A28 000000DD #Online/Core/TriggerSendInput.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-408204A0 3C608047
+408206B0 3C608047
 60639D64 80630000
-2C030000 4082048C
+2C030000 4082069C
 836DB61C 833B00D1
-831B00D5 82FB018F
+831B00D5 82FB024A
 835B0003 887B00D9
-2C030001 418203E8
+2C030001 418205F8
 887B001B 38800054
 7C632050 2C1A0003
 4080001C 386100DC
@@ -1579,7 +1714,7 @@ C2376A28 0000009B #Online/Core/TriggerSendInput.asm
 38800012 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-38780000 38800059
+38780000 3880010A
 38A00000 3D808000
 618C55F0 7D8903A6
 4E800421 88780000
@@ -1615,65 +1750,131 @@ BA810008 800100B4
 889B001B 887B001C
 38630001 7C032000
 41800008 38600000
-987B001C 887B018A
-2C030000 41820110
-80780001 809B018B
-7C641851 41800100
-1C63000C 38630005
-889B0134 1C84000C
-38840136 7CD81A14
-7CFB2214 88660000
-88870000 546306FE
-548406FE 7C032000
-4082009C 88660001
-88870001 5463067E
-5484067E 7C032000
-40820084 80660002
-80870002 7C032000
-40820074 38A00005
-38A50001 2C050008
-40800028 7C6530AE
-7C8538AE 2C03002A
-4181000C 2C04002A
-4081FFE0 7C032000
-40820044 4BFFFFD4
-807B018B 38630001
-907B018B 887B0134
+987B001C 887B0236
+2C030000 40820018
+38600000 987B0247
+987B0248 987B0249
+48000284 3A800000
+38D40247 7C66D8AE
+2C030001 40820178
+1CD40004 38C60002
+7C66C02E 1CD40004
+38C6023B 7C86D82E
+7C641851 41800158
+7C761B78 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7EC3B378
+1C63000C 3863000E
+1CD40054 7C633214
+38D40134 7C86D8AE
+1C84000C 3884013A
+1CB40054 7C842A14
+7CD81A14 7CFB2214
+88660000 88870000
+546306FE 548406FE
+7C032000 408200BC
+88660001 88870001
+5463067E 5484067E
+7C032000 408200A4
+80660002 80870002
+7C032000 40820094
+38A00005 38A50001
+2C050008 40800028
+7C6530AE 7C8538AE
+2C03002A 4181000C
+2C04002A 4081FFE0
+7C032000 40820064
+4BFFFFD4 1CD40004
+38C6023B 7C66D82E
+38630001 7C66D92E
+38D40134 7C66D8AE
 38630001 2C030007
 41800008 3863FFF9
-987B0134 889B0135
-7C041800 4082FF34
-38600000 987B018A
-48000034 38600001
+7C66D9AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7C041800
+4082FEC0 48000040
+1CD40004 38C6023B
+7C66D82E 38600001
 987B00D9 987B00DA
 935B00DB BA810008
 800100B4 382100B0
 7C0803A6 3D808037
 618C6CEC 7D8903A6
-4E800420 80780001
+4E800420 3A940001
+2C140003 4180FE74
+3AA00000 3A800000
+807B0237 7C761B78
+7EC3B378 38D40247
+7C86D8AE 7C761B78
+7EC3B378 38D40247
+7C86D8AE 2C040001
+40820030 1CD40004
+38C6023B 7C86D82E
+2C150000 4182000C
+7C041800 40800014
+7C832378 7C761B78
+7EC3B378 3AA00001
+3A940001 2C140003
+4180FFAC 907B0237
+3A800000 38D40247
+7C86D8AE 2C040001
+40820038 38D40134
+7C66D8AE 38D40137
+7C86D8AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7C041800
+40820010 38600000
+38D40247 7C66D9AE
+3A940001 2C140003
+4180FFB4 3A800000
+38D40247 7C86D8AE
+2C040001 41820018
+3A940001 2C140003
+4180FFE8 38600000
+987B0236 3A800000
+3AA00000 887B0000
+7C151800 40820008
+3AB50001 1CD40004
+38C60002 7C66C02E
 7C7A1850 2C030000
-40800080 887B001B
+408000D4 887B001B
 38800054 7C632050
-7C1A1800 41800068
+7C1A1800 418000BC
 887B000C 2C030001
-4182005C 8ADB0135
-1C76000C 38630136
-7C7B1A14 38980005
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 38760001
-2C030007 41800008
-3863FFF9 987B0135
-887B018A 2C030001
-41820014 935B018B
-38600001 987B018A
-9ADB0134 38600000
-1C63000C 38A30005
-887B0001 1C63000C
+418200B0 38D40137
+7EC6D8AE 1C76000C
+3863013A 1CB40054
+7C632A14 1CD40054
+38C6000E 7C7B1A14
+7C983214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+38760001 2C030007
+41800008 3863FFF9
+38D40137 7C66D9AE
+38D40134 7C66D8AE
+38D40137 7C86D8AE
+38D40247 7C66D8AE
+2C030001 4182003C
+1CD40004 38C6023B
+7F46D92E 38600001
+38D40247 7C66D9AE
+38D40134 7EC6D9AE
+887B0236 2C030001
+41820010 935B0237
+38600001 987B0236
+38600000 1C63000C
+38A3000E 1CD40054
+7CA53214 1C75000C
 386300DC 7C611A14
 7C982A14 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
+3A940001 3AB50001
+2C140003 4180FEC8
 48000080 807B00DB
 7C1A1800 40810024
 BA810008 800100B4
@@ -1689,7 +1890,7 @@ BA810008 800100B4
 7C611A14 7C9B2214
 38A0000C 3D808000
 618C31F4 7D8903A6
-4E800421 4BFFFEC8
+4E800421 4BFFFE40
 3B5A0001 935B0003
 BA810008 800100B4
 382100B0 7C0803A6
@@ -1783,41 +1984,18 @@ C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm
 2056616C 75653A20
 25640A00 00000000
 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm
-C2019608 00000025 #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
+C2019608 0000000E #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
 9421FFF8 3C608048
 80639D30 5463443E
-2C030208 40820108
+2C030208 40820050
 3C608047 60639D64
 80630000 2C030000
-408200F4 3C608037
+4082003C 3C608037
 60635E00 2C000003
-408200E4 80ADB61C
+4082002C 80ADB61C
 886500D9 2C030000
-418200D4 4800002C
-4E800021 56492072
-65747261 63652043
-42206475 72696E67
-20726F6C 6C626163
-6B2E2E2E 00000000
-7C0802A6 90010004
-9421FF00 BC610008
-60000000 60000000
-60000000 60000000
-60000000 806DAFC4
-38630003 4BFFFFAD
-7C8802A6 4CC63242
-3D808032 618C3CF4
-7D8903A6 4E800421
-806DAFC4 388000D0
-98830000 38800000
-98830001 38800001
-98830002 38800080
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 B8610008
-80010104 38210100
-7C0803A6 38600001
-98650700 3D808001
+4182001C 38600001
+986507BB 3D808001
 618C9618 7D8903A6
 4E800420 38600000
 60000000 00000000
@@ -1836,11 +2014,11 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm
 40820090 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BDF0197 8B9E0000
+3BDF0252 8B9E0000
 3C608048 80639D60
-809F06E6 7C032000
+809F07A1 7C032000
 41810028 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -1858,12 +2036,12 @@ C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0197 57DE043E
+3BBF0252 57DE043E
 8B9D0000 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C032000 41810088
 3C608048 80639D60
-809F06E6 7C632050
+809F07A1 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -1888,12 +2066,12 @@ C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0197 57DE043E
+3BBF0252 57DE043E
 8B9D0000 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C032000 41810088
 3C608048 80639D60
-809F06E6 7C632050
+809F07A1 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -1920,13 +2098,13 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm
 2C030000 40820120
 7C0802A6 90010004
 9421FF50 BE810008
-83EDB61C 3BDF0197
+83EDB61C 3BDF0252
 3BA00000 3B400000
 56FB043E 8B9E0000
 3C608048 80639D60
-809F06E6 7C032000
+809F07A1 7C032000
 41810070 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -1978,144 +2156,161 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm
 618C5610 7D8903A6
 4E800421 38000000
 60000000 00000000
-C2263258 000000A3 #Online/Menus/CSS/HandleInputsOnCSS.asm
+C2263258 00000165 #Online/Menus/CSS/HandleInputsOnCSS.asm
 41A20014 3D808026
 618C3334 7D8903A6
 4E800420 7C0802A6
 90010004 9421FF50
 BE810008 3C608048
 80639D30 5463443E
-2C030008 408204D0
+2C030008 40820AE0
 7CFB3B78 3F008000
 63185614 83180000
-83580000 8878000D
-889A0001 9898000D
-2C030001 40820010
-2C040000 40820008
-4800003C 8878000E
-889A0000 9898000E
-2C030005 41820010
-2C040005 40820008
-48000034 2C030004
-40820010 2C040004
-41820008 48000008
-48000030 38600000
-3D808002 618C4030
+83580000 3B800000
+8878000D 889A0001
+9898000D 2C030001
+40820010 2C040000
+40820008 4800003C
+8878000E 889A0000
+9898000E 2C030005
+41820010 2C040005
+40820008 48000034
+2C030004 40820010
+2C040004 41820008
+48000008 48000030
+38600000 3D808002
+618C4030 7D8903A6
+4E800421 48000018
+38600003 3D808002
+618C4030 7D8903A6
+4E800421 887A0000
+2C030000 40810020
+2C030003 40810078
+2C030004 4182007C
+2C030005 418201BC
+480009FC 576004E7
+418209F4 3C608048
+80639D60 2C030000
+418209E4 3860FFFF
+986DAFC9 38600000
+986DAFCA 886DB657
+2C030000 418209C8
+886DAFA0 2C030001
+41820010 2C030002
+40800014 48000000
+3860FFFE 48000335
+480009A4 4800035D
+4800099C 576006F7
+40820399 48000990
+3D80801A 618C3680
 7D8903A6 4E800421
-48000018 38600003
-3D808002 618C4030
-7D8903A6 4E800421
-887A0000 2C030000
-40810020 2C030003
-40810068 2C030004
-4182006C 2C030005
-4182016C 480003F0
-576004E7 418203E8
-3860FFFF 986DAFC9
-38600000 986DAFCA
-886DB657 2C030000
-418203CC 886DAFA0
-2C030001 41820010
-2C030002 41820014
-48000000 3860FFFE
-480002C5 480003A8
-480002E9 480003A0
-576006F7 40820325
-48000394 576006F7
-4182000C 48000315
-48000384 887A0001
-2C030000 408200C0
+548006F7 41820024
+8878000F 38630001
+9878000F 2C030030
+40810014 9B98000F
+48000361 48000958
+9B98000F 887A0001
+2C030000 408200D0
 576004E7 4082002C
 886DAFA0 2C030002
-408200AC 886DAFC9
-2C030000 408200A0
+418000BC 886DAFC9
+2C030000 408200B0
 886DAFCA 2C030001
-40820094 48000004
+408200A4 48000004
 886DB657 2C030000
+41820094 3C608048
+80639D60 2C030000
 41820084 886DAFA0
 2C030001 41820010
-2C030002 41820014
+2C030002 40800014
 48000000 3860FFFE
-4800014D 48000060
+48000151 48000060
 886DAFC9 2C030000
 4182001C 2C030001
 41820008 48000000
-3860FFFF 48000129
+3860FFFF 4800012D
 4800003C 886DAFCA
 2C030000 41820018
 806D8840 38630598
-A063001E 48000109
+A063001E 4800010D
 4800001C 38600001
-986DB656 480000F5
+986DB656 480000F9
 7C6802A6 906DAFE8
-480002BC 887A0001
-889A0002 7C632039
-418202AC BA810008
-800100B4 382100B0
-7C0803A6 3D808026
-618C3264 7D8903A6
-4E800420 576006F7
-40820211 48000280
+4800087C 480002F1
+887A0001 889A0002
+7C632039 41820868
+BA810008 800100B4
+382100B0 7C0803A6
+3D808026 618C3264
+7D8903A6 4E800420
+576006F7 40820245
+4800083C 7C0802A6
+90010004 9421FF50
+BE810008 38600014
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C791B78 386000B4
+98790000 886DAFA0
+98790001 38F90002
+3CC0804A 60C60740
+38800000 38A00000
+7C66222E 7C672B2E
+38840003 38A50002
+2C050012 4180FFEC
+7F23CB78 38800014
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7F23CB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
-38600014 3D808037
-618CF1E4 7D8903A6
-4E800421 7C791B78
-386000B4 98790000
-886DAFA0 98790001
-38F90002 3CC0804A
-60C60740 38800000
-38A00000 7C66222E
-7C672B2E 38840003
-38A50002 2C050012
-4180FFEC 7F23CB78
-38800014 38A00001
-3D808000 618C55F0
+7C7F1B78 38600008
+3D808037 618CF1E4
 7D8903A6 4E800421
-7F23CB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 7C7F1B78
-38600007 3D808037
-618CF1E4 7D8903A6
-4E800421 7C791B78
-386000B5 98790000
-808DB610 886DAEF8
-1C630024 7C841A14
-88640070 98790001
-88640073 98790002
-38600001 98790003
-2C1FFFFE 41820014
-2C1FFFFF 41820018
-2C1F0000 4080001C
-38600000 38800003
-4800001C 38600000
-38800000 48000010
-7FE3FB78 38800001
-48000004 B0790004
-98990006 7F23CB78
-38800007 38A00001
-3D808000 618C55F0
+7C791B78 386000B5
+98790000 808DB610
+886DAEF8 1C630024
+7C841A14 88640070
+98790002 88640073
+98790003 38600001
+98790004 886DAFA0
+2C030003 41820010
+38600000 98790001
+4800001C 3C608000
+60635614 80630000
+88630014 3863FFFF
+98790001 2C1FFFFE
+41820014 2C1FFFFF
+41820018 2C1F0000
+4080001C 38600000
+38800003 4800001C
+38600000 38800000
+48000010 7FE3FB78
+38800001 48000004
+B0790005 98990007
+7F23CB78 38800008
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7F23CB78
+3D808037 618CF1B0
 7D8903A6 4E800421
-7F23CB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFF09
-4BFFFE59 BA810008
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+8A980014 4BFFFED5
+4BFFFE25 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
 38600001 986DAFA3
-4BFFFFB9 7C6802A6
+4BFFFFB5 7C6802A6
 906DAFE8 880DB650
 980DB659 38000004
 980DB656 BA810008
@@ -2135,6 +2330,183 @@ BE810008 4BFFFF09
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7F63DB78
+98780011 2C1B0001
+4182005C 2C1B0002
+41820054 2C1B0008
+4182004C 2C1B0004
+41820044 2C1B0041
+4182003C 2C1B0042
+41820034 2C1B0048
+4182002C 2C1B0044
+41820024 2C1B0021
+4182001C 2C1B0022
+41820014 2C1B0028
+4182000C 2C1B0024
+40820019 88780010
+2C030000 4082000C
+7F63DB78 480000B9
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+48000379 7DE802A6
+386000B7 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 7DC37378
+98780010 38600006
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800006
+3D808000 618CC160
+7D8903A6 4E800421
+7DC37378 98770000
+7F03C378 90770006
+38600004 38800005
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C741B78
+806DB614 80630018
+3D808037 618C0E44
+7D8903A6 4E800421
+7C751B78 C02F001C
+C04F0020 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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C6E1B78 7C0802A6
+90010004 9421FF50
+BE810008 820E002C
+82EE0028 8A300000
+8A500001 82700002
+82B00006 8AD50011
+2C130000 40820144
+38600090 7C721B78
+98700001 480001E5
+7DE802A6 7E238B78
+3D808000 618C56AC
+7D8903A6 4E800421
+7C741B78 38600001
+38800000 C02F0000
+C04F0004 48000209
+7C731B78 92700002
+7E639B78 388F0028
+38A00000 38CF0024
+38EF002D 39140004
+C02F0014 C04F0014
+C06F0008 C08F0010
+3D808000 618C56B4
+7D8903A6 4E800421
+7C641B78 7C8A2378
+7C8B2378 386B0002
+C04F0018 3D808000
+618C55EC 7D8903A6
+4E800421 C06F0010
+EC83082A 2C0B0000
+4182001C 2C0B0001
+4182002C 2C0B0002
+4182001C 2C0B0003
+4182000C 38800008
+48000018 38800004
+48000010 38800002
+48000008 38800001
+7E238B78 3D808000
+618C56AC 7D8903A6
+4E800421 7C872378
+7E639B78 388F0024
+38A00000 38CF0024
+C02F0014 C04F0014
+C06F000C 3D808000
+618C56B4 7D8903A6
+4E800421 7C6B1B78
+386A0004 7C0B1800
+4082FF54 480000A0
+88700001 2C030086
+4181003C 2C160000
+41820034 88750012
+2C030004 40800028
+38600000 98700001
+7E238B78 7EC4B378
+38A00004 7C632830
+7C632214 4BFFFC49
+4800005C 2C120000
+41820010 3A52FFFF
+9A500001 48000048
+38600000 98750010
+7DC37378 3D808038
+618CFED4 7D8903A6
+4E800421 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+7E639B78 3D80803A
+618C5CC4 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 00000000
+3DCCCCCD C3960000
+C38E8000 429E0000
+3EE66666 41C80000
+C1A00000 C1840000
+FFFFFFFF FFEA2FFF
+00436861 743A2025
+73002573 3A202573
+0047616D 65005500
+4C005200 4400817B
+00000000 7C761B78
+7C972378 FEC00890
+FEE01090 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C781B78
+9AD80049 9AF8004A
+D2D80008 D2F80024
+D2F80028 7F03C378
+BA810008 800100B4
+382100B0 7C0803A6
 4E800020 BA810008
 800100B4 382100B0
 7C0803A6 3D808026
@@ -2142,85 +2514,105 @@ BA810008 800100B4
 4E800420 BA810008
 800100B4 382100B0
 7C0803A6 00000000
-C2264534 0000013A #Online/Menus/CSS/InitCSS.asm
+C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm
 3C608048 80639D30
 5463443E 2C030008
-408209B8 4800019C
+4082000C 38604800
+48000008 38602400
+60000000 00000000
+C2264534 000001D3 #Online/Menus/CSS/InitCSS.asm
+3C608048 80639D30
+5463443E 2C030008
+40820E7C 480001F8
 4E800021 00000000
-3DCCCCCD 428C0000
+3DCCCCCD C39B0000
+C3848000 3EE66666
+3ECCCCCD 3F800000
+41C80000 428C0000
 41B80000 3F000000
 42B40000 42500000
 42960000 42C40000
 42500000 428C0000
 42B00000 42D40000
 3ECCCCCD 43048000
+43188000 42200000
+C2E00000 3F000000
 C3760000 C3020000
 C2480000 3EE66666
 33FF2FFF 3CBCFFFF
 8E9196FF FF0000FF
+FFFFFFFF D4D4D4FF
+33FF2FFF 00000000
 00556E72 616E6B65
-64204D6F 64650044
-69726563 74204D6F
-64650052 616E6B65
-64204D6F 64650053
-656C6563 7420796F
-75722063 68617261
-63746572 00436861
-72616374 65722073
-656C6563 74656400
-50726573 73205354
-41525420 746F2025
-73006C6F 636B2069
-6E00656E 74657220
-636F6465 00736561
-72636800 73656C65
-63742073 74616765
-004C6F63 6B656420
-696E0053 65617263
-68696E67 20666F72
-20257300 436F6E6E
-65637469 6E672074
-6F202573 00576169
-74696E67 206F6E20
-2573006F 70706F6E
-656E7400 2D2D2F2F
-2D2D2F2F 2D2D2F2F
-2D2D2F2F 30300045
-72726F72 00506C61
-79696E67 3A005072
-65737320 5A20746F
-20257300 64697363
-6F6E6E65 63740063
-616E6365 6C00636C
-65617220 6572726F
-7200817B 00817E00
-817C0000 4E800021
-C2E00000 41A00000
-00000000 3DCCCCCD
-7C0802A6 90010004
-9421FF50 BE810008
-4BFFFE59 7FA802A6
+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
+2D2F2F30 30004572
+726F7200 506C6179
+696E673A 00557365
+20442D50 61642074
+6F204368 61740050
+72657373 205A2074
+6F202573 00486F6C
+64205A20 746F2025
+73006469 73636F6E
+6E656374 0063616E
+63656C00 636C6561
+72206572 726F7200
+25733A20 25730081
+7B00817E 00817C00
+4E800021 C2E00000
+41A00000 00000000
+3DCCCCCD 7C0802A6
+90010004 9421FF50
+BE810008 4BFFFDFD
+7FA802A6 3C60804D
+606350D8 3C800200
+60840801 90830000
 888DAFA0 2C040002
-38800001 40820008
-38800002 4BFFFFC1
+38800001 41800008
+38800002 4BFFFFAD
 7C6802A6 3D808000
 618C5618 7D8903A6
 4E800421 4E800021
 38600004 38800005
 38A00080 3D808039
 618C01F0 7D8903A6
-4E800421 48000341
+4E800421 4800039D
 7C8802A6 38A00004
 3D808038 618CFD54
 7D8903A6 4E800421
-3860000F 3D808037
+38600016 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
-3880000F 3D808000
+38800016 3D808000
 618CC160 7D8903A6
 4E800421 3C608000
 60635614 93E30000
-38600290 3D808037
+38600340 3D808037
 618CF1E4 7D8903A6
 4E800421 907F0000
 38600000 38800000
@@ -2231,142 +2623,209 @@ C2E00000 41A00000
 38800000 989C004A
 C03D0000 D03C0008
 C03D0004 D03C0024
-D03C0028 C03D0008
-C05D000C 7F83E378
-389D005C 3D80803A
+D03C0028 C03D0020
+C05D0024 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7C641B78
-7F83E378 C03D0010
-C05D0010 3D80803A
+7F83E378 C03D0028
+C05D0028 3D80803A
 618C7548 7D8903A6
-4E800421 C05D0018
-48000141 C05D001C
-48000139 C05D0020
-48000131 C03D0008
-C05D0038 7F83E378
-389D005C 3D80803A
+4E800421 C05D0030
+4800019D C05D0034
+48000195 C05D0038
+4800018D C03D0020
+C05D0050 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7F83E378
-38800007 C03D0034
-C05D0034 3D80803A
+38800007 C03D004C
+C05D004C 3D80803A
 618C7548 7D8903A6
 4E800421 7F83E378
-38800007 38BD0054
+38800007 38BD007C
 3D80803A 618C74F0
 7D8903A6 4E800421
-C03D0040 C05D003C
-7F83E378 389D005C
+C03D0020 C05D0054
+7F83E378 389D0094
 3D80803A 618C6B98
 7D8903A6 4E800421
 7F83E378 38800008
-C03D0010 C05D0010
+C03D004C C05D004C
 3D80803A 618C7548
 7D8903A6 4E800421
 7F83E378 38800008
-38BD0054 3D80803A
+38BD007C 3D80803A
 618C74F0 7D8903A6
-4E800421 C03D0044
-C05D003C 7F83E378
-389D005C 3D80803A
+4E800421 C03D0068
+C05D0064 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7F83E378
-38800009 C03D0010
-C05D0010 3D80803A
-618C7548 7D8903A6
-4E800421 C05D0024
-480000BD C05D0028
-480000B5 C05D002C
-480000AD C05D0030
-480000A5 BA810008
-800100B4 382100B0
-7C0803A6 48000584
-7EA802A6 FC601090
-C03D0014 7F83E378
-389D005C 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7F83E378 C03D0034
-C05D0034 3D80803A
-618C7548 7D8903A6
-4E800421 C03D0008
-FC401890 7F83E378
-389D005C 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7F83E378 C03D0048
-C05D0048 3D80803A
-618C7548 7D8903A6
-4E800421 7EA803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 C03D0008
-7F83E378 389D005C
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C7B1B78 7F83E378
-7F64DB78 C03D0034
-C05D0034 3D80803A
+38800009 C03D0028
+C05D0028 3D80803A
 618C7548 7D8903A6
 4E800421 7F83E378
-7F64DB78 38BD0058
+38800009 38BD007C
 3D80803A 618C74F0
 7D8903A6 4E800421
+C03D006C C05D0064
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7F83E378 3880000A
+C03D0028 C05D0028
+3D80803A 618C7548
+7D8903A6 4E800421
+C05D003C 480000BD
+C05D0040 480000B5
+C05D0044 480000AD
+C05D0048 480000A5
 BA810008 800100B4
 382100B0 7C0803A6
-4E800020 4E800021
+4800097C 7EA802A6
+FC601090 C03D002C
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C641B78 7F83E378
+C03D004C C05D004C
+3D80803A 618C7548
+7D8903A6 4E800421
+C03D0020 FC401890
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C641B78 7F83E378
+C03D0070 C05D0070
+3D80803A 618C7548
+7D8903A6 4E800421
+7EA803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-4BFFFAB1 7FA802A6
-3FE08000 63FF5614
-83FF0000 83DF0000
-839F0004 38FD0128
-3CC0804A 60C60740
-38800000 38A00000
-7C66222E 7C672B2E
-38840003 38A50002
-2C050012 4180FFEC
+C03D0020 7F83E378
+389D0094 3D80803A
+618C6B98 7D8903A6
+4E800421 7C7B1B78
+7F83E378 7F64DB78
+C03D004C C05D004C
+3D80803A 618C7548
+7D8903A6 4E800421
+7F83E378 7F64DB78
+38BD0080 3D80803A
+618C74F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 4BFFF9E5
+7FA802A6 3FE08000
+63FF5614 83FF0000
+83DF0000 839F0004
+38FD015F 3CC0804A
+60C60740 38800000
+38A00000 7C66222E
+7C672B2E 38840003
+38A50002 2C050012
+4180FFEC C022AF04
+886DAFA0 2C030003
+40820008 C022AD44
+806DB620 38810038
+38A00024 38C0FFFF
+3D808001 618C1E24
+7D8903A6 4E800421
+80610038 3D808036
+618CF8BC 7D8903A6
+4E800421 80610038
+3D808037 618C0928
+7D8903A6 4E800421
 887E0000 2C030004
-4181003C 886DAFA0
-2C030001 41820018
-2C030002 41820018
-2C030000 41820018
-4800001C 38BD005D
-4800001C 38BD006B
-48000014 38BD0077
-4800000C 38BD013B
-48000004 38800000
-480003A9 887E0000
+41810054 38800000
+38BD00B2 886DAFA0
+2C030001 41820020
+2C030002 41820020
+2C030000 41820020
+2C030003 41820020
+48000024 38DD0095
+48000020 38DD009E
+48000018 38DD00A5
+48000010 38DD00AC
+48000008 38BD0172
+48000735 887E000A
+2C030000 41820010
+3B3E0015 7C7A1B78
+48000024 887E000B
+2C030000 41820110
+7C7A1B78 887E000C
+1C63001F 38630034
+7F3E1A14 887F0013
+2C03000C 40810010
+38600000 987F0013
+418200E4 386000B7
+3880007F 38A00040
+3D808002 618C37A8
+7D8903A6 4E800421
+887F0012 38630001
+987F0012 3860000F
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800016
+3D808000 618CC160
+7D8903A6 4E800421
+386000AA 98770000
+7F43D378 98770001
+887F0013 98770002
+38630001 987F0013
+93370007 7FE3FB78
+9077000B 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C6E1B78 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7DC37378
+480003E1 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 887E0000
 2C030004 4182000C
-38BD005C 48000008
-38BD0141 38800008
-48000389 887E0000
+38BD0094 48000008
+38BD0178 38800009
+480005E5 887E0000
 2C030004 4182000C
-38BD005C 48000008
-38BE0048 38800009
-48000369 887E0000
+38BD0094 48000008
+38BE00B0 3880000A
+480005C5 887E0000
+2C030004 4182000C
+38BD0094 48000008
+38BD0181 38800008
+480005A5 887E0000
 2C030004 41820034
 2C030005 41820020
 2C030000 4181000C
-38BD005C 48000024
-38BD014A 38DD0163
-48000018 38BD014A
-38DD016A 4800000C
-38BD014A 38DD0158
-38800007 4800031D
+38BD0094 48000024
+38BD0193 38DD01B9
+48000018 38BD0193
+38DD01C0 4800000C
+38BD01A1 38DD01AE
+38800007 48000559
 3B600001 7F64DB78
-38BD005C 4800030D
+38BD0094 48000549
 3B7B0002 2C1B0005
 4081FFEC 38800008
 38600000 7C7F21AE
 38840001 2C04000A
-4081FFF4 3B60000A
-7F64DB78 38BD005C
-480002D9 3B7B0001
-2C1B000D 4081FFEC
+4081FFF4 3B60000B
+7F64DB78 38BD0094
+48000515 3B7B0001
+2C1B000E 4081FFEC
 887E0000 2C030005
-408200A8 3B60000A
+408200A8 3B60000B
 3B400000 3B200000
-3B000000 3AFE0067
+3B000000 3AFE0117
 7ED7D0AE 56C00631
 41820010 3B5A0002
 3B390001 48000018
@@ -2377,74 +2836,74 @@ BA810008 800100B4
 41810008 4800002C
 38800000 7C97C1AE
 7F64DB78 7EE5BB78
-48000259 3B7B0001
+48000495 3B7B0001
 7EF7C214 3AF70001
 3B400000 3B200000
 2C160000 41820020
-387E0158 7C97D214
+387E0208 7C97D214
 7C041800 40800010
-2C1B000D 41810008
+2C1B000E 41810008
 4BFFFF78 4800014C
 3B600001 886DB657
 7F64DB78 2C030000
-40820018 38BD0083
-48000201 38600001
+40820018 38BD00BA
+4800043D 38600001
 987F0008 48000124
-38BD0099 480001ED
+38BD00D0 48000429
 3B7B0002 38600002
 987F0008 887E0001
 7F64DB78 2C030000
 40820080 886DAFA0
-2C030002 40820034
+2C030002 41800034
 887E0000 2C030004
 40820028 886DAFC9
 2C030000 4082001C
 886DAFCA 2C030000
-40820010 38BD00AC
-38DD00D8 48000034
-38BD00AC 38DD00BE
+40820010 38BD00E3
+38DD010F 48000034
+38BD00E3 38DD00F5
 887E0000 2C030004
-41820020 38BD00AC
-38DD00D1 886DAFA0
-2C030002 4082000C
-38BD00AC 38DD00C6
-48000161 38600001
+41820020 38BD00E3
+38DD0108 886DAFA0
+2C030002 4180000C
+38BD00E3 38DD00FD
+4800039D 38600001
 987F0009 48000084
-38BD00E5 4800014D
+38BD011C 48000389
 3B7B0002 38600002
 987F0009 887E0000
 7F64DB78 2C030004
 4182004C 2C030003
 41820024 88ADAFA0
-2C050002 38BD00EF
-38DD011F 40820038
-38BD00EF 38DD0128
+2C050001 38BD0126
+38DD0156 41820038
+38BD0126 38DD015F
 4800002C 88ADAFA0
-2C050002 38BD0100
-38DD011F 40820018
-38BD0100 38DD0128
-4800000C 38BD0111
-38DD011F 480000DD
+2C050001 38BD0137
+38DD0156 41820018
+38BD0137 38DD015F
+4800000C 38BD0148
+38DD0156 48000319
 38600001 987F000A
 3B400008 3B600002
 7C7FD0AE 2C030001
 40820044 A07F000B
 3880000F 7C632396
-1C630003 38630176
+1C630003 386301D3
 7CBD1A14 7F64DB78
-480000A1 7F83E378
-7F64DB78 38BD0050
+480002DD 7F83E378
+7F64DB78 38BD0078
 3D80803A 618C74F0
 7D8903A6 4E800421
 48000044 2C030002
 40820030 7F64DB78
-38BD017C 4800006D
+38BD01D9 480002A9
 7F83E378 7F64DB78
-38BD004C 3D80803A
+38BD0074 3D80803A
 618C74F0 7D8903A6
 4E800421 48000010
-7F64DB78 38BD005C
-48000041 3B7B0002
+7F64DB78 38BD0094
+4800027D 3B7B0002
 3B5A0001 2C1A000A
 4081FF68 A07F000B
 38630001 2C03001E
@@ -2452,11 +2911,83 @@ BA810008 800100B4
 B07F000B BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-7EA802A6 7F83E378
-3D80803A 618C70A0
+4E800021 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFF3D1 7FA802A6
+81EE002C 8A0F0000
+8A2F0001 8A4F0002
+826F0003 82AF0007
+83EF000B 2C130000
+4082013C 806DC2DC
+38800003 9883000E
+3C6080BD 60635C6C
+38600000 38800000
+3D80803A 618C6754
 7D8903A6 4E800421
-7EA803A6 4E800020
-80CDB638 00000000
+7C731B78 926F0003
+806DC2DC 38800001
+9883000E 38800001
+98930049 38800000
+9893004A C03D0000
+D0330008 C03D0004
+D0330024 D0330028
+7E258B78 38800004
+7CA52430 7CA52030
+7C858850 7E238B78
+38A00004 7C632C30
+3D808000 618C56AC
+7D8903A6 4E800421
+7C761B78 7C942378
+7E439378 3D808000
+618C55F4 7D8903A6
+4E800421 C09D001C
+EC210132 FC600890
+C03D0008 C05D000C
+EC42182A FDC00890
+FDE01090 3C608000
+60635614 80630000
+83C30000 387E0015
+7C03A800 4082000C
+389D0088 48000008
+389D008C 7E639B78
+38A00001 38DD0090
+38FD01CC 7EA8AB78
+7E89A378 C03D0010
+C05D0010 FC607090
+FC807890 C0BD0014
+C0DD0018 3D808000
+618C56B4 7D8903A6
+4E800421 887F0012
+2C030006 41800028
+887F0013 7C039000
+4080000C 2C12000C
+40810028 887F0013
+7C721850 2C030006
+41810018 2C100000
+41820010 3A10FFFF
+9A0F0000 4800006C
+7DC37378 3D808038
+618CFED4 7D8903A6
+4E800421 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+7E639B78 3D80803A
+618C5CC4 7D8903A6
+4E800421 887F0012
+3863FFFF 987F0012
+887F0013 7E449378
+38840001 7C032000
+41820008 4800000C
+38600000 987F0013
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7EA802A6
+7F83E378 3D80803A
+618C70A0 7D8903A6
+4E800421 7EA803A6
+4E800020 80CDB638
+60000000 00000000
 C22652F0 0000007C #Online/Menus/CSS/InitSheikSelector.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2582,6 +3113,191 @@ C05F0040 FC011040
 7C0803A6 4E800020
 38600000 38980000
 60000000 00000000
+C22652F4 000000B8 #Online/Menus/CSS/InitTeamToggleButton.asm
+3C608048 80639D30
+5463443E 2C030008
+40820594 888DAFA0
+2C040003 40820588
+4800002C 4E800021
+C0200000 C0A00000
+C1BC0000 C18C0000
+00000000 3F800000
+C19C0000 C0400000
+3DCCCCCD 7C0802A6
+90010004 9421FF50
+BE810008 3FC08000
+63DE5614 83DE0000
+4BFFFFBD 7FE802A6
+C3FF0010 C3DF0014
+38600004 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+38800004 3D808000
+618CC160 7D8903A6
+4E800421 7FC3F378
+90770006 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C741B78 806DB638
+80630030 80630008
+38800000 8063000C
+38840001 2C040007
+4180FFF4 80630008
+3D808037 618C0E44
+7D8903A6 4E800421
+7C751B78 7EA3AB78
+809F0018 90830038
+809F001C 9083003C
+809F0020 90830040
+806DB638 80630038
+80630000 38800000
+80630004 38840001
+2C040007 4180FFF4
+80A30000 7EA3AB78
+38800000 38C00000
+3D808036 618CFB5C
+7D8903A6 4E800421
+7EA3AB78 FC20F890
+3D808036 618CF8BC
+7D8903A6 4E800421
+7EA3AB78 3D808037
+618C0928 7D8903A6
+4E800421 7E83A378
+38800004 7EA5AB78
+3D808039 618C0A70
+7D8903A6 4E800421
+7E83A378 3C808039
+60841070 38A00002
+38C00080 3D808039
+618C069C 7D8903A6
+4E800421 7E83A378
+38800004 3CA08037
+60A5F1B0 7EE6BB78
+3D808039 618C0B68
+7D8903A6 4E800421
+7E83A378 480000CD
+7C8802A6 38A00004
+3D808038 618CFD54
+7D8903A6 4E800421
+386D8844 89C30000
+39E00000 48000175
+39EF0001 7C0F7000
+4180FFF4 806DB620
+38810034 38A0002B
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80C040 60840000
+9083003C 806DB620
+38810034 38A00029
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3D808037 618C1BEC
+7D8903A6 4E800421
+80630004 80630008
+FC20F890 3D808036
+618C3C2C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 480002E8
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 7C741B78
+82B40028 886DB656
+2C030000 40820098
+3FC08000 63DE5614
+83DE0000 807E0000
+88630001 2C030000
+4082007C 4BFFFD21
+7FE802A6 3BA00000
+3C80804A 60840BC0
+80840000 C024000C
+C0440010 C07F0000
+C09F0004 C0BF0008
+C0DF000C FC021840
+41810044 FC022040
+4180003C FC012840
+41800034 FC013040
+4181002C 3BA00001
+3C80804C 608420BC
+886DB650 1C630044
+7C641A14 80630008
+546305EF 41820008
+48000019 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+808DB610 886DB650
+1C630024 7F841A14
+887C0070 7C7B1B78
+3D808000 618C56B8
+7D8903A6 4E800421
+7C651B78 38600000
+1C630024 3C80803F
+60840A48 7C832214
+886403C2 1C63001C
+7C832A14 8B4400DD
+889E0014 38840001
+2C040004 41800008
+38800001 989E0014
+386D8844 98830000
+7C992378 2C190003
+4182001C 2C190002
+4182000C 2C190001
+40810014 38600000
+48000010 38600001
+48000008 38600002
+3D808000 618C55F4
+7D8903A6 4E800421
+7EA3AB78 3D808036
+618CF8BC 7D8903A6
+4E800421 7EA3AB78
+3D808037 618C0928
+7D8903A6 4E800421
+7C0802A6 90010004
+9421FF00 BC610008
+7F23CB78 4800009D
+B8610008 80010104
+38210100 7C0803A6
+7F23CB78 7F64DB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C781B78 886DB657
+2C030000 41820050
+80ADB610 9B1C0073
+3CA0803F 60A50E09
+9B050000 9B1E0015
+38600000 7F44D378
+7F05C378 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+38600002 3D808002
+618C4030 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+7C791B78 2C190003
+4182001C 2C190002
+4182000C 2C190001
+41820014 38800000
+48000014 38800001
+4800000C 38800002
+48000004 88ADB650
+386D9A38 7C632A14
+98830000 38600000
+3D808025 618CDB34
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 38600000
+38980000 3D80803A
+618C6754 7D8903A6
+4E800421 00000000
 C2262004 00000009 #Online/Menus/CSS/PreventAPressCharUnselect.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2602,10 +3318,13 @@ C22620AC 00000009 #Online/Menus/CSS/PreventBPressCharUnselect.asm
 3D808026 618C2154
 7D8903A6 4E800420
 88FF0004 00000000
-C22600A8 00000009 #Online/Menus/CSS/PreventColorChange.asm
+C22600A8 0000000C #Online/Menus/CSS/PreventColorChange.asm
 3C608048 80639D30
 5463443E 2C030008
-40820030 3C608000
+40820048 3C608000
+60635614 80630000
+88630014 2C030000
+40820020 3C608000
 60635614 80630000
 80630000 88630001
 2C030000 41820014
@@ -2635,6 +3354,106 @@ BA810008 800100B4
 BA810008 800100B4
 382100B0 7C0803A6
 54601838 00000000
+C2262478 00000016 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FC08000 63DE5614
+83DE0000 3C608048
+80639D30 5463443E
+2C030008 40820054
+888DAFA0 2C040003
+40820048 807E0000
+88630001 2C030000
+40820038 8BFE0014
+2C1F0003 41820008
+3BFFFFFF 88CDB650
+1CC60004 7FFF3214
+7FE3FB78 3D808000
+618C55F4 7D8903A6
+4E800421 48000004
+BA810008 800100B4
+382100B0 7C0803A6
+8061003C 38800006
+38A00400 3CC08036
+60C6410C 38E00001
+60000000 00000000
+C226295C 00000010 #Online/Menus/CSS/Teams/AnimateToken.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3F808000 639C5614
+839C0000 3C608048
+80639D30 5463443E
+2C030008 40820038
+888DAFA0 2C040003
+4082002C 807C0000
+88630001 2C030000
+4082001C 8B7C0014
+2C1B0003 41820008
+3B7BFFFF 9B7D0006
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 881D0006
+60000000 00000000
+C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820098
+888DAFA0 2C040003
+4082008C 8BDF0014
+808DB610 886DB650
+1C630024 7F441A14
+887A0070 7C7D1B78
+3D808000 618C56B8
+7D8903A6 4E800421
+7C651B78 38600000
+1C630024 3C80803F
+60840A48 7C832214
+886403C2 1C63001C
+7C832A14 8B8400DD
+7FC3F378 7F84E378
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7B1B78 80ADB610
+9B650073 3CA0803F
+60A50E09 9B650000
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 9E9803C2
+60000000 00000000
+C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm
+3D808026 618C0B90
+7D8903A6 4E800420
+60000000 00000000
+C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820088
+888DAFA0 2C040003
+4082007C 808DB610
+886DB650 1C630024
+7F441A14 887A0070
+7C7D1B78 8BDF0014
+7FC3F378 7FA4EB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7B1B78 80ADB610
+9B7A0073 3CA0803F
+60A50E09 9B650000
+88650001 98650002
+38600000 7FA4EB78
+7F65DB78 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 38000000
+60000000 00000000
 0423C710 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8Characters.asm
 0423C320 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8CharactersJapanese.asm
 C223E730 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect.asm
@@ -2659,73 +3478,13 @@ C223E290 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect3.
 618CAE90 7D8903A6
 4E800421 00000000
 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm
-C223B3AC 00000005 #Online/Menus/CSS/TextEntryScreen/HideDescriptionText.asm
-886DAFA3 2C030000
-41820014 3D808023
-618CB3E4 7D8903A6
-4E800420 888DB514
+C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm
+888DAFA3 2C040000
+4182001C 38800057
+88ADAFA0 2C050003
+40820010 38800058
+48000008 7FE4FB78
 60000000 00000000
-C223E994 0000003C #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
-886DAFA3 2C030000
-418201D0 48000084
-4E800021 41880000
-3D883127 C3100000
-42E40000 42FA0000
-C28F0000 3EB33333
-FFCB00FF 456E7465
-7220796F 75722025
-73206162 6F76652E
-00596F75 72206F70
-706F6E65 6E742077
-696C6C20 616C736F
-206E6565 6420746F
-20656E74 65722079
-6F757273 006F7070
-6F6E656E 74277320
-636F6E6E 65637420
-636F6465 00000000
-7C0802A6 90010004
-9421FF50 BE810008
-4BFFFF71 7FE802A6
-38600000 38800000
-3D80803A 618C6754
-7D8903A6 4E800421
-7C7E1B78 38800001
-989E0049 38800000
-989E004A C03F0000
-D03E0008 C03F0004
-D03E0024 D03E0028
-C03F0008 C05F000C
-7FC3F378 389F0020
-38BF0061 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 C03F0008
-C05F0010 7FC3F378
-389F0035 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 C03F0014
-C05F000C 7FC3F378
-389F0061 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 7FC3F378
-38800002 38BF001C
-3D80803A 618C74F0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-38600000 00000000
 C223E9C8 0000000A #Online/Menus/CSS/TextEntryScreen/KeepPreviousTag.asm
 880DAFA3 2C000000
 38A00000 41820008
@@ -2785,7 +3544,7 @@ C216E9B4 000000B3 #Online/Menus/InGame/InitInGame.asm
 40820580 480000A8
 4E800021 00000000
 3DCCCCCD 43870000
-43420000 3EA8F5C3
+434F0000 3EA8F5C3
 3EA8F5C3 000000FF
 3F1EB852 3F466666
 C1C07AE1 3C6F34D7
@@ -2833,7 +3592,7 @@ BE810008 3C60804D
 39400008 3D80803A
 618C611C 7D8903A6
 4E800421 7C7F1B78
-83CDB61C 93FE0701
+83CDB61C 93FE07BC
 4BFFFE69 7F8802A6
 38600000 3D808000
 618C5610 7D8903A6
@@ -2878,7 +3637,7 @@ D03D0008 C03C003C
 D03D000C D03D0010
 4CC63242 C03C0044
 C05C0044 7FA3EB78
-389A000A 1CB4001F
+389A0034 1CB4001F
 7C842A14 3D80803A
 618C6B98 7D8903A6
 4E800421 7FA3EB78
@@ -2988,25 +3747,27 @@ C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm
 7D8903A6 4E800420
 38600000 986DAFA2
 60000000 00000000
-C22299F0 00000017 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
-2C030008 408200A8
+C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
+2C030008 408200B8
 886DAFA1 2C030000
 41820014 2C030001
-41820038 2C030002
-4182004C 2C040000
-41820070 2C040001
-41820068 2C040002
-41820060 2C040004
-41820058 2C040005
-41820050 48000060
-2C040000 41820044
-2C040003 4182003C
-2C040005 41820034
-48000044 2C040000
-41820028 2C040001
-41820020 2C040002
-41820018 2C040003
-41820010 2C040004
+41820040 2C030002
+41820054 2C040000
+41820080 2C040001
+41820078 2C040002
+41820070 2C040003
+41820068 2C040005
+41820060 2C040006
+41820058 48000068
+2C040000 4182004C
+2C040004 41820044
+2C040006 4182003C
+4800004C 2C040000
+41820030 2C040001
+41820028 2C040002
+41820020 2C040003
+41820018 2C040004
+41820010 2C040005
 41820008 48000018
 38600000 3D808022
 618C99F4 7D8903A6
@@ -3053,7 +3814,7 @@ C34C0000 C31D0000
 BA810008 800100B4
 382100B0 7C0803A6
 B9C10408 00000000
-C21B1040 000000BB #Online/Menus/TitleMenu/OnMenuPrep.asm
+C21B1040 00000172 #Online/Menus/TitleMenu/OnMenuPrep.asm
 7C0802A6 90010004
 9421FF50 BE810008
 480000B5 7C6802A6
@@ -3061,24 +3822,24 @@ C21B1040 000000BB #Online/Menus/TitleMenu/OnMenuPrep.asm
 90640000 3C60803E
 6063B750 48000209
 7C8802A6 90830010
-48000571 7C8802A6
+480005AD 7C8802A6
 38A00010 3D808000
 618C31F4 7D8903A6
 4E800421 3C60803E
-6063B750 48000561
+6063B750 4800059D
 7C8802A6 90830008
 3C60803E 6063B66C
 38800644 B0830004
 480000B1 7C6802A6
 906DB614 3D808000
 618C5618 7D8903A6
-4E800421 7FC802A6
-399E0014 7D8903A6
-4E800421 399E000C
+4E800421 7EA802A6
+39950014 7D8903A6
+4E800421 3995000C
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-4800050C 4E800021
+48000AC4 4E800021
 3D808000 618C5618
 7D8903A6 4E800421
 7FC802A6 38000008
@@ -3127,12 +3888,14 @@ BA810008 800100B4
 4E800020 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
+7C731B78 80730008
+2C030000 40820354
 3C60804A 3BA304F0
 38600004 3D808022
 618C9624 7D8903A6
 4E800421 907D000C
 3BC00000 93DD0008
-546006F7 41820160
+546006F7 4182018C
 38000005 B00DB528
 3BE00001 3B9E0000
 9BFD0011 5783063E
@@ -3147,99 +3910,280 @@ BA810008 800100B4
 3D808016 618C77E8
 7D8903A6 4E800421
 A01D0002 2C000000
-41820030 2C000001
-41820040 2C000002
-41820040 2C000003
-41820040 2C000004
-41820054 2C000005
-41820054 48000258
+41820038 2C000001
+41820048 2C000002
+41820048 2C000003
+41820048 2C000004
+41820048 2C000005
+4182005C 2C000006
+41820078 4800027C
 38600003 3D808002
 618C4030 7D8903A6
-4E800421 48000240
-38600001 4800004C
-38600002 48000044
+4E800421 48000264
+38600001 48000070
+38600002 48000068
+38600003 48000060
 38600001 3D808002
 618C4030 7D8903A6
 4E800421 388000B6
-48000058 388000B7
-48000050 38600001
+48000074 386000BC
+3880007F 38A00040
+3D808002 618C37A8
+7D8903A6 4E800421
+48000275 4800020C
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 388000B8
+48000034 986DAFA0
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 38600008
+3D808022 618C9860
+7D8903A6 4E800421
+480001C0 806DAFC4
+98830000 38800001
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 4800019C
+546006B5 418200D0
+38600000 3D808002
+618C4030 7D8903A6
+4E800421 9BDD0011
+38600005 38000001
+B06DB528 38600003
+889D0000 989D0001
+981D0000 38000002
+B01D0002 3D808022
+618CB3A0 7D8903A6
+4E800421 3D808039
+618C0CD4 7D8903A6
+4E800421 806DC17C
+3D808039 618C0228
+7D8903A6 4E800421
+3C60803F 3863B6B0
+83830024 281C0000
+41820110 38600000
+38800001 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+389C0000 38A00000
+3D808038 618CFD54
+7D8903A6 4E800421
+808DC19C 8803000D
+508026B6 9803000D
+480000C8 546007FF
+41820060 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-388000B8 48000034
-986DAFA0 38600001
+3BE00006 3B9D0002
+A07C0000 28030000
+41820010 3803FFFF
+B01C0000 48000008
+B3FC0000 38600008
+A09C0000 3D808022
+618C9938 7D8903A6
+4E800421 2C030000
+4182FFC8 48000064
+546007BD 4182005C
+38600002 3D808002
+618C4030 7D8903A6
+4E800421 3B9D0002
+A07C0000 28030006
+41820010 38030001
+B01C0000 48000008
+B3DC0000 38600008
+A09C0000 3D808022
+618C9938 7D8903A6
+4E800421 2C030000
+4182FFC8 48000004
+3D808000 618C5618
+7D8903A6 4E800421
+7F6802A6 387B0004
+7C6903A6 4E800421
+387B0008 7C6903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800021
+803EB57C 430C0000
+803EB684 07000000
+4E800021 06450646
+0647064B 06480649
+064A0000 7C0802A6
+90010004 9421FF50
+BE810008 806DB518
+3C80803E 6084FA0C
+3D808038 618C0358
+7D8903A6 4E800421
+7C7A1B78 806DB518
+3C80803E 6084FA24
+3D808038 618C0358
+7D8903A6 4E800421
+7C7B1B78 806DB518
+3C80803E 6084FA40
+3D808038 618C0358
+7D8903A6 4E800421
+7C7C1B78 806DB518
+3C80803E 6084FA60
+3D808038 618C0358
+7D8903A6 4E800421
+7C7D1B78 480004C1
+7FC802A6 C2DE001C
+C2FE0020 3AC00016
+7EC3B378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+7EC4B378 3D808000
+618CC160 7D8903A6
+4E800421 38600000
+98770000 7E639B78
+90770001 92F30008
+38600006 38800007
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C781B78
+7F43D378 3D808037
+618C0E44 7D8903A6
+4E800421 7C791B78
+7F03C378 38800003
+7F25CB78 3D808039
+618C0A70 7D8903A6
+4E800421 7F23CB78
+38810034 38A0000A
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+38800010 3D808037
+618C1D9C 7D8903A6
+4E800421 7F23CB78
+38810034 38A0000B
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+38800010 3D808037
+618C1D9C 7D8903A6
+4E800421 7F23CB78
+7F64DB78 7F85E378
+7FA6EB78 3D808036
+618CFB5C 7D8903A6
+4E800421 7F23CB78
+FC20B090 3D808036
+618CF8BC 7D8903A6
+4E800421 7F23CB78
+38810034 38A00006
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80C060 60840000
+90830038 7F23CB78
+38810034 38A00007
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80405C 60840000
+90830038 7F03C378
+3C808039 60841070
+38A00006 38C00080
+3D808039 618C069C
+7D8903A6 4E800421
+7F03C378 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7F03C378
+48000031 7C8802A6
+38A0000F 3D808038
+618CFD54 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 48000281
+7FC802A6 C2DE001C
+C2FE0020 7C781B78
+83380028 8358002C
+8B7A0000 839A0001
+83BA0005 7F23CB78
+3D808037 618C0928
+7D8903A6 4E800421
+2C1D0000 40820070
+38600000 38800001
+C01E0008 C03E0000
+C05E0004 C07E000C
+C09E0010 C0BE0014
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C7D1B78 7C7D1B78
+93BA0005 38000001
+3880013F 7FA3EB78
+C01E0018 D0030024
+D0030028 981D004A
+3D80803A 618C6368
+7D8903A6 4E800421
+480001C0 7F23CB78
+38810034 38A00007
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 FC20B090
+2C1B0000 40820008
+FC20B890 80610034
+3D808036 618CF8BC
+7D8903A6 4E800421
+80610034 3D808037
+618C0928 7D8903A6
+4E800421 7F23CB78
+38810034 38A00006
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 FC20B090
+2C1B0001 40820008
+FC20B890 80610034
+3D808036 618CF8BC
+7D8903A6 4E800421
+80610034 3D808037
+618C0928 7D8903A6
+4E800421 39C00000
+7DC37378 3D80801A
+618C36A0 7D8903A6
+4E800421 2C030040
+4182002C 2C030080
+41820024 2C030001
+4182003C 2C030002
+41820064 39CE0001
+2C0E0004 4180FFC4
+480000C8 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-38600008 3D808022
-618C9860 7D8903A6
-4E800421 480001C0
+6B630001 987A0000
+480000A8 2C1B0001
+4082002C 388000B7
 806DAFC4 98830000
 38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-4800019C 546006B5
-418200D0 38600000
+48000004 38600000
 3D808002 618C4030
 7D8903A6 4E800421
-9BDD0011 38600005
-38000001 B06DB528
-38600003 889D0000
-989D0001 981D0000
-38000002 B01D0002
-3D808022 618CB3A0
+7F23CB78 3D808036
+618CF6B4 7D8903A6
+4E800421 7F03C378
+3D808038 618CFED4
 7D8903A6 4E800421
-3D808039 618C0CD4
-7D8903A6 4E800421
-806DC17C 3D808039
+7F03C378 3D808039
 618C0228 7D8903A6
-4E800421 3C60803F
-3863B6B0 83830024
-281C0000 41820110
-38600000 38800001
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 389C0000
-38A00000 3D808038
-618CFD54 7D8903A6
-4E800421 808DC19C
-8803000D 508026B6
-9803000D 480000C8
-546007FF 41820060
-38600002 3D808002
-618C4030 7D8903A6
-4E800421 3BE00005
-3B9D0002 A07C0000
-28030000 41820010
-3803FFFF B01C0000
-48000008 B3FC0000
-38600008 A09C0000
-3D808022 618C9938
+4E800421 7FA3EB78
+3D80803A 618C5CC4
 7D8903A6 4E800421
-2C030000 4182FFC8
-48000064 546007BD
-4182005C 38600002
-3D808002 618C4030
-7D8903A6 4E800421
-3B9D0002 A07C0000
-28030005 41820010
-38030001 B01C0000
-48000008 B3DC0000
-38600008 A09C0000
-3D808022 618C9938
-7D8903A6 4E800421
-2C030000 4182FFC8
-48000004 3D808000
-618C5618 7D8903A6
-4E800421 7F6802A6
-387B0004 7C6903A6
-4E800421 387B0008
-7C6903A6 4E800421
+3C600000 60630000
+907C0008 48000004
 BA810008 800100B4
 382100B0 7C0803A6
-4E800021 803EB57C
-430C0000 803EB684
-06000000 4E800021
-06450646 06470648
-0649064A 3C60804A
+4E800020 4E800021
+C0B00000 C0333333
+41100000 41B80000
+437A0000 41A00000
+3D4CCCCD 00000000
+3F800000 3C60804A
 60000000 00000000
 C222D88C 00000008 #Online/Menus/TitleMenu/OnlineModeOptionSelected.asm
 40820038 38600001
@@ -3257,46 +4201,58 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm
 41820014 3D808017
 618CBEC8 7D8903A6
 4E800421 00000000
-C2186EC4 00000056 #Online/Menus/VSScreen/InitVsSplash.asm
+C2186EC4 00000078 #Online/Menus/VSScreen/InitVsSplash.asm
 3C608048 80639D30
 5463443E 2C030408
-40820294 4800004C
+408203A4 48000060
 4E800021 00000000
 3F800000 3F000000
 3F19999A F15959FF
-6565FEFF 42700000
-43C80000 436E0000
-42700000 43DC0000
-41F00000 43200000
-43960000 41B00000
-50310050 32000000
-7C0802A6 90010004
-9421FF50 BE810008
-38600000 3C80803F
-608411A4 3CA0803F
-60A51194 3D80803A
-618C62A0 7D8903A6
-4E800421 38600000
-3D808000 618C5610
+6565FEFF FFFFFFFF
+42700000 43C80000
+436E0000 42820000
+43DC0000 41F00000
+43200000 43960000
+41B00000 41B00000
+5465616D 20310054
+65616D20 32005031
+00503200 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+3C80803F 608411A4
+3CA0803F 60A51194
+3D80803A 618C62A0
 7D8903A6 4E800421
-7C7D1B78 4BFFFF6D
-7FE802A6 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7E1B78
-38800001 989E0049
-38800000 989E004A
-C03F0000 D03E0008
-C03F0004 D03E0024
-D03E0028 387F0010
-389F003C 38BD000A
-C03F0018 480000D1
-387F0014 389F003F
-38BD0029 C03F001C
-480000BD 38600000
-38800000 C03F0020
-C05F0028 C07F002C
-C09F0030 C0BF0034
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7D1B78
+4BFFFF59 7FE802A6
+38600000 38800000
+3D80803A 618C6754
+7D8903A6 4E800421
+7C7E1B78 38800001
+989E0049 38800000
+989E004A C03F0000
+D03E0008 C03F0004
+D03E0024 D03E0028
+887D0210 2C030001
+41820038 387F0010
+389F0052 38BD0034
+38C00000 C03F001C
+4800010D 387F0014
+389F0055 38BD0053
+38C00000 C03F0020
+480000F5 48000038
+807D000D 480001F1
+387F0010 389F0044
+C03F001C 480000D9
+807D0011 480001D9
+387F0014 389F004B
+C03F0020 480000C1
+48000004 38600000
+38800000 C03F0024
+C05F002C C07F0030
+C09F0034 C0BF0038
 3D80803A 618C5ACC
 7D8903A6 4E800421
 7C7E1B78 C03F0004
@@ -3304,7 +4260,7 @@ D03E0024 D03E0028
 38800001 989E004A
 989E0049 C03F0000
 D03E0008 3CA0803B
-60A57808 A0DD0166
+60A57808 A0DD0216
 38600000 1C830002
 7C85222E 7C043000
 41820014 38630001
@@ -3316,30 +4272,52 @@ D03E0008 3CA0803B
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-480000D4 7C0802A6
+48000184 7C0802A6
 90010004 9421FF50
-BE810008 D0210080
-7C7D1B78 7CBC2B78
-C05F0024 7FC3F378
-3D80803A 618C6B98
+BE810008 FFE00890
+7C761B78 7C942378
+7CB92B78 7CDA3378
+7CF83B78 7D174378
+93210008 9301000C
+92E10010 C3DF0028
+C07F0040 7F43D378
+3D808000 618C55F4
 7D8903A6 4E800421
-7C7B1B78 7FC3F378
-7F64DB78 C03F0008
-C05F0008 3D80803A
-618C7548 7D8903A6
-4E800421 7FC3F378
-7F64DB78 7FA5EB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-C0210080 C05F0024
-C07F0038 EC42182A
-7FC3F378 7F84E378
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C641B78 7FC3F378
+EC630072 EFDE1828
+7FC3F378 389F0018
+7EC4B378 38A00000
+7E87A378 C03F0008
+C05F0008 FC60F890
+FC80F090 3D808000
+618C56B4 7D8903A6
+4E800421 39C00008
+39E00000 7C6E0A14
+80E30000 2C0F0000
+4182000C C07F003C
+EFFF182A C09F0040
+EFDE202A 7FC3F378
+389F0018 38A00000
 C03F000C C05F000C
-3D80803A 618C7548
+FC60F890 FC80F090
+3D808000 618C56B4
 7D8903A6 4E800421
+39CE0004 39EF0001
+7C0FD000 4180FFA8
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 38A00008
+38C000FF 7C7A3039
+7C632C30 38E00008
+39200000 7C643039
+1C84001F 38840034
+7C84EA14 7D070A14
+90880000 7C632C30
+38E70004 39290001
+2C090003 4180FFD8
+7F46D378 80A10010
+80E1000C 81010008
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 3800FFFF
@@ -3353,7 +4331,7 @@ BE810008 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 887F0004
-1C630024 389F01B8
+1C630024 389F0268
 7FC418AE 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
@@ -3424,17 +4402,17 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 00000128 #Online/Slippi Online Scene/main.asm
+C21A45B8 00000163 #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF50
 BE810008 3C80803E
-6084DC1C 480001F5
+6084DC1C 4800020D
 7C6802A6 38630000
 90640008 38600000
 986DAFA3 986DAFC8
-38600008 48000155
+38600008 4800016D
 7C8802A6 4800002D
-480008D8 80830000
+48000AB4 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -3444,7 +4422,7 @@ BE810008 3C80803E
 7C7F1B78 7C9E2378
 3C80803D 6084AD30
 48000081 7C6802A6
-90640004 480000BD
+90640004 480000D5
 7C6802A6 90640008
 38600001 98640000
 3C60803D 6063ACA4
@@ -3463,9 +4441,12 @@ BE810008 3C80803E
 90010004 9421FF50
 BE810008 3C808045
 6084ABF0 886DAEF8
-98640006 38600013
-3C80803F 60840CC8
-98640001 BA810008
+98640006 3D808000
+618C56B8 7D8903A6
+4E800421 7C641B78
+3860000F 1C63001C
+7C832214 38600013
+986400DD BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 4E800021 7C0802A6
@@ -3479,16 +4460,16 @@ BE810008 38600012
 48000081 480000F5
 08000000 80497758
 80497758 01030000
-480001AD 480001DD
+480001B5 480001E5
 09000000 80480668
 80480668 02030000
-801B1588 48000275
+801B1588 4800027D
 02000000 80480530
 80479D98 03030000
 00000000 00000000
 05000000 00000000
 00000000 04030000
-4800039D 4800051D
+48000411 480006E1
 20000000 80490880
 804D68D0 FF000000
 4E800021 81940000
@@ -3513,9 +4494,10 @@ BE810008 38600012
 618CAAD0 7D8903A6
 4E800421 809E0014
 88840003 2C040002
-40820008 48000084
+40820008 4800008C
 886DAFA0 2C030001
-41820014 2C030002
+4182001C 2C030002
+4182001C 2C030003
 41820014 2C030000
 41820008 48000038
 48000034 886DAFC9
@@ -3524,7 +4506,7 @@ BE810008 38600012
 4182001C 2C030000
 40820000 886DAFCA
 2C030000 41820020
-48000004 48000431
+48000004 480005ED
 3C808047 60849D30
 38600005 98640005
 48000018 3C808047
@@ -3552,7 +4534,7 @@ BE810008 3D80801B
 7D8903A6 4E800421
 7C7E1B78 887E0001
 889E0002 7C032000
-4082001C 48000351
+4082001C 4800050D
 3C808047 60849D30
 38600005 98640005
 4800001C 38600000
@@ -3568,59 +4550,114 @@ BE810008 3D80801B
 38600000 3D808000
 618C5610 7D8903A6
 4E800421 7C7F1B78
-3A800000 3AA00000
-7E83A378 480003A1
-2C030000 41820008
-3AB50001 3A940001
-2C140004 4180FFE4
-2C150001 4082001C
-887F0003 48000379
-2C030000 4182000C
-38600001 48000008
-38600000 986DAFC9
-38600000 986DAFCA
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7E1B78
-386000BC 987E0000
-7FC3F378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FC3F378
-38800004 38A00000
+887F0003 48000565
+986DAFC9 886DAFA0
+2C030003 40820020
+887F0003 38800001
+2C030000 40820008
+38800000 988DAFC9
+4800003C 3A800000
+3AA00000 7E83A378
+48000529 2C030000
+41820008 3AB50001
+3A940001 2C140004
+4180FFE4 2C150001
+4182000C 38600000
+986DAFC9 3E808047
+62949DA4 887F0003
+480004F1 2C030000
+41820018 38600001
+98740000 38600000
+9874005D 48000014
+38600000 98740000
+38600001 9874005D
+886DAFA0 2C030003
+4082000C 38600000
+98740004 38600000
+986DAFCA 38600004
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7E1B78 386000BC
+987E0000 7FC3F378
+38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-3C80804D 807E0000
-90645F90 7FC3F378
+7FC3F378 38800004
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 3C80804D
+807E0000 90645F90
+7FC3F378 3D808037
+618CF1B0 7D8903A6
+4E800421 3C808047
+60849D30 38600001
+98640005 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
-3C808047 60849D30
-38600001 98640005
-7FE3FB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 01780101
-01FF2121 FF2121EE
-0000EE00 7C0802A6
-90010004 9421FF50
-BE810008 83ED8840
-3BFF0598 3C608049
-60630888 4BFFFFCD
-7C8802A6 38A00010
-3D808000 618C31F4
-7D8903A6 4E800421
-3C808049 60840888
-887F0060 98640005
-887F0063 9864000B
-887F0084 98640008
-887F0087 9864000E
-3C808043 60842078
-887F0060 90640014
-887F0063 98640018
-887F0084 9064001C
-887F0087 98640020
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+01780101 01FF2121
+FF2121EE 0000EE00
+7C0802A6 90010004
+9421FF50 BE810008
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7E1B78
+83ED8840 3BFF0598
+3C608049 60630888
+4BFFFFB5 7C8802A6
+38A00010 3D808000
+618C31F4 7D8903A6
+4E800421 3C808049
+60840888 887F0060
+98640005 887F0063
+9864000B 887F0084
+98640008 887F0087
+9864000E 38600000
+9864FFFF 9864FFFB
+887E0210 2C030000
+418200F4 887E0003
+1C630024 38630271
+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 887E0210
+2C030000 41820024
+887F00A8 90640024
+887F00AB 98640028
+887F00CC 9064002C
+887F00CF 98640030
 A07F000E 9064000C
 3D808001 618C8254
 7D8903A6 4E800421
@@ -3629,103 +4666,197 @@ A07F000E 9064000C
 4E800421 38600004
 3D808001 618C7700
 7D8903A6 4E800421
-3A800000 1C140024
-7FF7FB78 7EF70214
-3AA00000 3AC00000
-88770060 7C630774
-3D808002 618C6E84
+3860001C 3D808002
+618C6F2C 7D8903A6
+4E800421 3A800000
+1C140024 7FF5FB78
+7EB50214 88750060
+7C630774 2C030021
+41820024 3C80803B
+6084B3C0 1C630010
+7C6320AE 3D808000
+618C56A8 7D8903A6
+4E800421 3A940001
+2C140006 3AB50024
+4180FFC4 A07F000E
+3D808022 618C519C
 7D8903A6 4E800421
-3A940001 2C140006
-7ED62378 7EB51B78
-3AF70024 4180FFD4
-A07F000E 3D808002
-618C6EBC 7D8903A6
-4E800421 7C75AB78
-7C96B378 3860001C
-3D808002 618C6F2C
+3C80803B 6084B6B0
+1C630003 7C6320AE
+3D808000 618C56A8
 7D8903A6 4E800421
-38D60000 38B50000
-3860000C 3D808002
-618C702C 7D8903A6
-4E800421 3D808002
-618C7168 7D8903A6
+3D808002 618C7168
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 3C808047
+60849D30 38600003
+98640005 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7F1B78
+83CD8840 3BDE0598
+7FC3F378 389F0208
+38A00138 3D808000
+618C31F4 7D8903A6
+4E800421 3D808017
+618CEB30 7D8903A6
+4E800421 889F0268
+98830000 889F026B
+98830001 38800000
+98830002 38800003
+98830005 38800078
+98830004 3C80803D
+6084DEC8 8084000C
+887F028C 98640002
+38602121 B0640003
+3C808049 60840880
+887F028F 98640016
+7FE3FB78 3D808037
+618CF1B0 7D8903A6
 4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-3C808047 60849D30
-38600003 98640005
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 38600000
-3D808000 618C5610
-7D8903A6 4E800421
-7C7F1B78 83CD8840
-3BDE0598 7FC3F378
-389F0158 38A00138
-3D808000 618C31F4
-7D8903A6 4E800421
-3D808017 618CEB30
-7D8903A6 4E800421
-889F01B8 98830000
-889F01BB 98830001
-38800000 98830002
-38800003 98830005
-38800078 98830004
-3C80803D 6084DEC8
-8084000C 887F01DC
-98640002 38602121
-B0640003 3C808049
-60840880 887F01DF
-98640016 7FE3FB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 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
+7C7D1B78 3FE08047
+63FF9DA4 1FDD00A8
+7FDEFA14 887F0004
+2C030000 418200B0
+3C608046 6063B6A0
+886324D0 889F0006
+7C032000 40820098
+887E0058 2C030003
+4182008C 887F0004
+2C030007 40820040
 887F0006 2C030001
-40820028 7FE3FB78
-3D808016 618C54A0
+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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 38600028
+987E0000 00000000
+C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+7CBD2B78 7CDC3378
+3D808000 618C56B8
 7D8903A6 4E800421
-889E005F 7C032000
-41820020 48000014
-887E005D 2C030000
-41820010 48000004
-38600000 48000008
-38600001 BA810008
+7C651B78 1C7F0024
+3C80803F 60840A48
+7C832214 886403C2
+1C63001C 7C832A14
+8BC400DC 1CBD001E
+7C9E2A14 7FE3FB78
+7F85E378 3D808025
+618CD5AC 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C20056AC 00000035 #Online/Static/ChatMessages.asm
+7CA802A6 2C030008
+4182001C 2C030004
+41820020 2C030002
+41820024 2C030001
+41820028 480000A9
+7C6802A6 48000024
+4800012D 7C6802A6
+48000018 480000FD
+7C6802A6 4800000C
+480000B1 7C6802A6
+88E30000 89030001
+89230002 89430003
+2C040008 4182001C
+2C040004 41820044
+2C040002 41820028
+2C040001 41820010
+38830004 7C843A14
+4800003C 38830004
+7C843A14 7C844214
+4800002C 38830004
+7C843A14 7C844214
+7C844A14 48000018
+38830004 7C843A14
+7C844214 7C844A14
+7C845214 7CA903A6
+4E800420 4E800021
+07040904 436F6D6D
+6F6E0067 6773006F
+6E65206D 6F726500
+62726200 676F6F64
+206C7563 6B000000
+4E800021 0C0C0D07
+436F6D70 6C696D65
+6E747300 77656C6C
+20706C61 79656400
+74686174 20776173
+2066756E 00746861
+6E6B7300 746F6F20
+676F6F64 00000000
+4E800021 0A040504
+52656163 74696F6E
+73006F6F 66006D79
+2062006C 6F6C0077
+6F770000 4E800021
+05050917 4D697363
+006F6B61 79007468
+696E6B69 6E67006C
+65742773 20706C61
+79206167 61696E20
+6C617465 72006261
+6420636F 6E6E6563
+74696F6E 00000000
+60000000 00000000
+C20056B8 00000002 #Online/Static/GetCSSIconData.asm
+3C60803F 60630A48
+4E800020 00000000
+C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+7FC3F378 2C1F0003
+41820028 2C1F0002
+4182000C 2C1F0001
+4182002C 3D808016
+618C92BC 7D8903A6
+4E800421 48000028
+3D808016 618C9290
+7D8903A6 4E800421
+48000014 3D808016
+618C9264 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-BA810008 800100B4
-382100B0 7C0803A6
-38600028 987E0000
 60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 2C030000 40820018
-38600290 3D808037
+38600340 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
 386000B3 987F0000
@@ -3733,7 +4864,7 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 7FE3FB78
-38800290 38A00000
+38800340 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
 7FE3FB78 BA810008
@@ -3763,6 +4894,12 @@ C200560C 00000016 #Online/Static/LoadState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20056A8 00000005 #Online/Static/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3936,14 +5073,6 @@ BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
 043775B8 A0190000 #Online/Logging/LogInputOnCopy.asm
-
-$Recommended: Normal Lag Reduction [Hannes Mann]
-*Reduces input lag
-043761EC 4800001C
-04376238 48000018
-
-$Recommended: Polling drift fix + VB [Dan Salvato, tauKhan]
-*Synchronizes polling rate with FPS.
 041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
 0401985C 3C60804C
 04019860 91231F5C
@@ -3959,8 +5088,13 @@ C21A5018 00000005
 4D820420 00000000
 04218D68 C8228000
 
+$Recommended: Normal Lag Reduction [Hannes Mann]
+*Reduces input lag
+043761EC 4800001C
+04376238 48000018
+
 $Optional: Widescreen 16:9 [Dan Salvato, mirrorbender, Achilles1515, UnclePunch]
-*Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ---------------------- 
+*Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ----------------------
 *Will not cause desyncs when playing online
 043BB05C 3EB00000 #External/Widescreen/Fix Screen Flash.asm
 C236A4A8 00000006 #External/Widescreen/Overwrite CObj Values.asm
@@ -3987,17 +5121,17 @@ C0030000 4800000C
 044DDB84 3E89FEFA #External/Widescreen/Nametag Fixes/Adjust Nametag Text X Scale.asm
 
 $Optional: Disable Screen Shake [Achilles1515]
-*Will prevent screen from shaking on hits, KOs, collisions, etc ----------------------- 
+*Will prevent screen from shaking on hits, KOs, collisions, etc -----------------------
 *Will not cause desyncs when playing online
 04030E44 4E800020
 
 $Optional: Center Align 2P HUD [UnclePunch]
-*When playing online, character %'s will always be centered ------------------------- 
+*When playing online, character %'s will always be centered -------------------------
 *Will not cause desyncs when playing online
 0416E9AC 38600002
 
 $Optional: Flash Red on Failed L-Cancel [Achilles1515, Fizzi]
-*When playing online, this will only affect your character --------------------------- 
+*When playing online, this will only affect your character ---------------------------
 *Will not cause desyncs when playing online
 C20C0148 0000000C #External/FlashRedFailedLCancel/ChangeColor.asm
 387F0488 89FE0564
diff --git a/Data/Sys/GameSettings/Netplay/GALJ01r2.ini b/Data/Sys/GameSettings/Netplay/GALJ01r2.ini
index 822fb94764..0f7c1caa9e 100644
--- a/Data/Sys/GameSettings/Netplay/GALJ01r2.ini
+++ b/Data/Sys/GameSettings/Netplay/GALJ01r2.ini
@@ -11,12 +11,23 @@ $Required: General Codes
 $Required: Slippi Recording
 $Required: Slippi Online
 $Recommended: Normal Lag Reduction
-$Recommended: Polling drift fix + VB
 
 [Gecko]
 $Required: General Codes [Achilles, Dan Salvato, Magus, UnclePunch, tauKhan, Ptomerty, Cilan, Zauron, Datel, donny2112, Jorgasms, strikebowler585, Myougi]
-0445BF28 FFFFFFFF #Unlock All Characters and Stages [Datel]
-0445BF2C FFFFFFFF
+0415EE98 38600001 #Unlock All Characters and Stages [Datel]
+0415EDDC 38600001
+04164B14 38600001
+041648F4 38600001
+0415EE4C 38600001
+0415EE14 38600001
+0415D968 38600001
+0415D9D8 38600001
+0417229C 38600000
+041737B0 38600000
+04164658 38600001
+041644E8 38600001
+0430490C 38600063
+043044F0 38600001
 043D4A48 00340102 #Stock Mode [Magus]
 043D4A4C 04000A00 #4 Stocks [Magus]
 043D4A50 08010100 #8 Minutes [Magus]
@@ -31,8 +42,6 @@ C21AF6F4 00000006 #External/Skip Memcard Prompt/Skip Memcard Prompt.asm
 60000000 00000000
 0415D94C 4E800020 #Disable Special Messages [Most]
 0415D984 4E800020 #Disable Trophy Messages [Achilles]
-0245C390 00000125 #Unlock All 293 Trophies [Datel]
-0245C395 01266363
 C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm
 3BA00000 7FA3EB78
 3D80801A 618C3680
@@ -143,10 +152,10 @@ BA810008 800100B4
 41200000 42700000
 41200000 C1A00000
 41200000 41A00000
-41200000 C1A00000
 41200000 C2700000
-41200000 41A00000
+41200000 C1A00000
 41200000 42700000
+41200000 41A00000
 41200000 0000001F
 C21B3333 420CCCCD
 421B3333 420CCCCD
@@ -524,7 +533,7 @@ C2266CE0 0000000C #External/Disable FoD During Doubles/Disable FoD During Double
 41820010 2C030020
 41820008 48000034
 806DB610 88630018
-2C030001 41820014
+2C030001 48000014
 38600001 50652EB4
 90A60018 48000014
 38600000 50652EB4
@@ -580,8 +589,77 @@ C216EA30 00000004 #Common/Winners Names are Gold on CSS/Remember Who LRA Started
 04261B30 60000000 #External/Closing CSS Door Preserves Nametag/On Window Close/Skip isUsingNametag Bool Reset.asm
 042605FC 38C00003 #External/Unplugging Closes CSS Door/Unplugging Closes CSS Door.asm
 041239A8 60000000 #External/FreezeGlitchFix/FreezeGlitchFix.asm
+C213C388 0000000A #Common/CostumeBoundCheck/PuffCostume.asm
+83DC002C 887E000C
+3D808003 618C2330
+7D8903A6 4E800421
+3D808016 618C9238
+7D8903A6 4E800421
+889E0619 7C041800
+40800008 48000014
+3D808013 618CC46C
+7D8903A6 4E800420
+809C002C 00000000
+C216DED4 00000039 #Common/CostumeBoundCheck/main.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3BE00000 7FE3FB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 41820060
+7FE3FB78 3D808003
+618C3198 7D8903A6
+4E800421 7C7E1B78
+7FE3FB78 3D808003
+618C2330 7D8903A6
+4E800421 3D808016
+618C9238 7D8903A6
+4E800421 7C1E1800
+4180001C 7FE3FB78
+38800000 3D808003
+618C3208 7D8903A6
+4E800421 3BFF0001
+2C1F0006 4180FF80
+3BE00000 7FE3FB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 418200EC
+7FE3FB78 3D808003
+618C2330 7D8903A6
+4E800421 7C7E1B78
+7FE3FB78 3D808003
+618C3198 7D8903A6
+4E800421 7C7D1B78
+7FE3FB78 3D808003
+618C3284 7D8903A6
+4E800421 7C7C1B78
+3B600000 7C1FD800
+4182008C 7F63DB78
+3D808003 618C241C
+7D8903A6 4E800421
+2C030003 41820070
+7F63DB78 3D808003
+618C2330 7D8903A6
+4E800421 7C03F000
+40820054 7F63DB78
+3D808003 618C3198
+7D8903A6 4E800421
+7C03E800 40820038
+7F63DB78 3D808003
+618C3284 7D8903A6
+4E800421 7C03E000
+4082001C 38830001
+7F63DB78 3D808003
+618C32F4 7D8903A6
+4E800421 3B7B0001
+2C1B0006 4180FF68
+3BFF0001 2C1F0006
+4180FEF4 BA810008
+800100B4 382100B0
+7C0803A6 8001001C
+60000000 00000000
 
-$Required: Slippi Recording [Fizzi, Achilles, UnclePunch]
+$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337]
 *Saves replays, Slippi device must be in Slot B.
 *To disable saving replays, visit the Slippi settings in Config > GameCube
 040679BC 38802600 #Recording/ExtendPlayerBlock.asm
@@ -602,7 +680,7 @@ C23219EC 0000001C #Recording/FlushFrameBuffer.asm
 80ADB61C 8885000D
 2C040000 40820024
 8885000C 2C040000
-40820018 808506FC
+40820018 808507B7
 3884FF85 7C041800
 40800008 7C832378
 907C0005 3BBD0009
@@ -643,34 +721,35 @@ C216D884 0000001C #Recording/SendGameEnd.asm
 800100B4 382100B0
 7C0803A6 819F2514
 60000000 00000000
-C216E74C 000000BE #Recording/SendGameInfo.asm
+C216E74C 000000E3 #Recording/SendGameInfo.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418205B4
+2C030000 418206DC
 38600005 3D808037
 618CF1E4 7D8903A6
-4E800421 7C791B78
-932DB64C 38800005
+4E800421 7C7B1B78
+936DB64C 38800005
 3D808000 618CC160
 7D8903A6 4E800421
-386006E2 3D808037
+38600702 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7E1B78
-93D90000 38600000
-906DB650 3C608019
-606310E8 38800000
+93DB0000 38600000
+906DB650 3C608000
+60635600 80630000
+38630008 38800000
 3D808000 618C55FC
 7D8903A6 4E800421
 7C7C1B78 38600035
 987E0000 3860001C
 987E0001 38600036
-987E0002 386001A4
+987E0002 38600248
 B07E0003 38600037
 987E0005 3860003F
 B07E0006 38600038
-987E0008 38600048
+987E0008 3860004C
 B07E0009 38600039
 987E000B 38600002
 B07E000C 3860003A
@@ -684,7 +763,7 @@ B07E0015 3860003D
 38600010 987E001A
 38600204 B07E001B
 38600036 987E001D
-3C600307 60630000
+3C600309 60630000
 907E001E 387E0022
 7FE4FB78 38A00138
 3D808000 618C31F4
@@ -742,30 +821,66 @@ B07E0015 3860003D
 8862F23C 987E01BF
 3C608048 80639D30
 5463443E B07E01C0
-7FC3F378 388001C2
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 38600205
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7B1B78 38600010
-987B0000 3860003D
-987B0203 38600200
-B07B0201 38600000
-987B0204 3B400000
-7C7AE050 2C030200
-41810010 B07B0201
-38600001 987B0204
-387B0001 3C808019
-608410E8 7C84D214
-A0BB0201 3D808000
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C791B78
+3A800000 3ABF0060
+3AFE01C2 3B590034
+1C74001F 7F03BA14
+1ED40024 7ED6AA14
+88760001 2C030000
+40820028 1C74001F
+7C83D214 7F03C378
+38A0001F 3D808000
 618C31F4 7D8903A6
-4E800421 7F63DB78
+4E800421 4800001C
+7F03C378 3880001F
+3D808000 618CC160
+7D8903A6 4E800421
+3A940001 2C140004
+4180FFA0 3A800000
+3ABF0060 3AFE023E
+3B5900EF 1C74000A
+7F03BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820028
+1C74000A 7C83D214
+7F03C378 38A0000A
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+3880000A 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
+7F23CB78 3D808037
+618CF1B0 7D8903A6
+4E800421 7FC3F378
+38800266 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+38600205 3D808037
+618CF1E4 7D8903A6
+4E800421 7C751B78
+3C608000 60635600
+80630000 3AE30008
+38600010 98750000
+3860003D 98750203
+38600200 B0750201
+38600000 98750204
+3AC00000 7C76E050
+2C030200 41810010
+B0750201 38600001
+98750204 38750001
+7EE4BB78 7C84B214
+A0B50201 3D808000
+618C31F4 7D8903A6
+4E800421 7EA3AB78
 38800205 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-3B5A0200 7C1AE000
-4180FFA0 7F63DB78
+3AD60200 7C16E000
+4180FFA4 7EA3AB78
 3D808037 618CF1B0
 7D8903A6 4E800421
 38600004 38800007
@@ -834,14 +949,14 @@ BE810008 806DB64C
 BA810008 800100B4
 382100B0 7C0803A6
 3C608017 00000000
-C206DA34 00000034 #Recording/SendGamePostFrame.asm
+C206DA34 00000035 #Recording/SendGamePostFrame.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 41820160
+2C030000 41820168
 887F221F 546306F7
-40820154 8B7F000C
+4082015C 8B7F000C
 806DB64C 83A30000
 838DB650 7FBDE214
 38600038 987D0000
@@ -882,7 +997,8 @@ B07D0030 887F1968
 807F008C 907D003D
 807F0090 907D0041
 807F00EC 907D0045
-838DB650 3B9C0049
+807F195C 907D0049
+838DB650 3B9C004D
 938DB650 BA810008
 800100B4 382100B0
 7C0803A6 8001001C
@@ -948,51 +1064,6 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
 C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
 38600000 987E25FF
 807E00B0 00000000
-C20055F0 0000002C #Common/EXITransferBuffer.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7E1B78 7C9D2378
-7CBF2B78 3D808034
-618C7364 7D8903A6
-4E800421 7C7C1B78
-7FC3F378 7C9EEA14
-2C1F0000 4182001C
-7C0018AC 38630020
-7C032000 4180FFF4
-7C0004AC 4C00012C
-38600001 38800000
-3D808034 618C64C0
-7D8903A6 4E800421
-38600001 3D808034
-618C6D80 7D8903A6
-4E800421 38600001
-38800000 38A00005
-3D808034 618C6688
-7D8903A6 4E800421
-38600001 7FC4F378
-7FA5EB78 7FE6FB78
-38E00000 3D808034
-618C5E60 7D8903A6
-4E800421 38600001
-3D808034 618C5F4C
-7D8903A6 4E800421
-38600001 3D808034
-618C67B4 7D8903A6
-4E800421 38600001
-3D808034 618C6E74
-7D8903A6 4E800421
-38600001 3D808034
-618C65CC 7D8903A6
-4E800421 2C1F0000
-4082001C 7C001BAC
-38630020 7C032000
-4180FFEC 7C0004AC
-4C00012C 7F83E378
-3D808034 618C738C
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 00000000
 C20055F8 0000000F #Common/GetIsFollower.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -1016,6 +1087,88 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
+C20055F4 00000007 #Common/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
+C20055EC 00000008 #Common/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C20056B4 00000040 #Common/SubtextFunctions.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF002090
+FF202890 FF403090
+2C180001 418000FC
+39E00004 FC20B890
+FC40C090 2C0F0001
+41820020 2C0F0002
+41820020 2C0F0003
+41820020 2C0F0004
+41820020 48000024
+EC21D028 4800001C
+EC21D02A 48000014
+EC42D028 4800000C
+EC42D02A 48000004
+7EA3AB78 80810038
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C771B78 7EA3AB78
+7EE4BB78 FC20A890
+FC40B090 3D80803A
+618C7548 7D8903A6
+4E800421 7F25CB78
+2C0F0000 40820008
+7EC5B378 7EA3AB78
+7EE4BB78 3D80803A
+618C74F0 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 80A10038
+80C1003C 80E10040
+81010044 81210048
+8141004C 3D80803A
+618C70A0 7D8903A6
+4E800421 2C0F0000
+4182000C 39EFFFFF
+4BFFFF14 48000094
+7EA3AB78 80810038
+FC20B890 FC40C090
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C771B78 7EA3AB78
+7EE4BB78 FC20A890
+FC40B090 3D80803A
+618C7548 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 7EC5B378
+3D80803A 618C74F0
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+80A10038 80C1003C
+80E10040 81010044
+81210048 8141004C
+3D80803A 618C70A0
+7D8903A6 4E800421
+7EE3BB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -1077,41 +1230,6 @@ C216EBAC 0000000C #Common/CSS KO Stars/Asign KO Stars Upon Exiting Dairantou.asm
 7D8903A6 4E800421
 8001001C 83E10014
 60000000 00000000
-C20055FC 00000022 #Common/Gecko/ProcessCodeList.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7D1B78 7C9E2378
-3B800000 807D0000
-5463463C 3B600008
-3B200000 2C0300C0
-41820044 2C0300C2
-4182004C 2C030004
-41820058 2C030006
-41820058 2C030008
-41820068 807D0000
-5463213E 2C03000F
-40820010 807D0004
-2C030000 4182007C
-4800004C 807D0004
-1C630008 3B630008
-4800003C 807D0004
-1C630008 3B630008
-3B200004 48000028
-3B200004 48000020
-807D0004 38630007
-54630038 3B630008
-833D0004 48000008
-3B600010 3B9C0001
-2C1E0000 4182001C
-807D0000 5463463C
-7FA4EB78 7F25CB78
-7FC903A6 4E800421
-7FBDDA14 4BFFFF38
-3C608019 606310E8
-7C63E850 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
 
 $Required: Slippi Online [Fizzi, UnclePunch]
 *Adds online mode, Slippi device must be in Slot B.
@@ -1141,63 +1259,42 @@ FC020840 4180000C
 38600001 BA810008
 800100B4 382100B0
 7C0803A6 00000000
-C21A4DB4 00000031 #Online/Core/ForceEngineOnRollback.asm
+C21A4DB4 0000001C #Online/Core/ForceEngineOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-4082015C 3C608047
+408200B0 3C608047
 60639D64 80630000
-2C030000 40820148
+2C030000 4082009C
 3D808034 618C7364
 7D8903A6 4E800421
 7C7A1B78 80ADB61C
 2C1B0000 41810014
 888500D9 2C040000
 41820038 3B600001
-888500D9 988506F2
-808500DB 908506F3
-888500DA 988506F7
-8085018B 908506F8
-808500D5 80840001
-908506FC 480000D4
-88850700 2C040000
-418200C8 38800000
-98850700 3D808001
+888500D9 988507AD
+808500DB 908507AE
+888500DA 988507B2
+80850237 908507B3
+808500D5 80840002
+908507B7 48000028
+888507BB 2C040000
+4182001C 38800000
+988507BB 3D808001
 618C95FC 7D8903A6
-4E800421 48000020
-4E800021 466F7263
-65642061 20706164
-2072656E 65772E2E
-2E000000 7C0802A6
-90010004 9421FF00
-BC610008 60000000
-60000000 60000000
-60000000 60000000
-806DAFC4 38630003
-4BFFFFB9 7C8802A6
-4CC63242 3D808032
-618C3CF4 7D8903A6
-4E800421 806DAFC4
-388000D0 98830000
-38800000 98830001
-38800001 98830002
-38800080 38A00001
-3D808000 618C55F0
+4E800421 7F43D378
+3D808034 618C738C
 7D8903A6 4E800421
-B8610008 80010104
-38210100 7C0803A6
-7F43D378 3D808034
-618C738C 7D8903A6
-4E800421 2C1B0000
-40820014 3D80801A
-618C4DA8 7D8903A6
-4E800420 00000000
+2C1B0000 40820014
+3D80801A 618C4DA8
+7D8903A6 4E800420
+60000000 00000000
 C216D310 00000009 #Online/Core/HandleLRAS.asm
 3C608048 80639D30
 5463443E 2C030208
 40820028 3C608046
 6063B6A0 88630008
 2C030007 40820014
-808DB61C 806406EE
+808DB61C 806407A9
 7C6903A6 4E800421
 8001003C 83E10034
 60000000 00000000
@@ -1217,46 +1314,46 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 7C7D1B78
 60000000 00000000
-C216E748 00000053 #Online/Core/InitOnlinePlay.asm
+C216E748 00000069 #Online/Core/InitOnlinePlay.asm
 3D808022 618C54B8
 7D8903A6 4E800421
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820250 38600705
+40820304 386007C0
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7B1B78 38800705
+7C7B1B78 388007C0
 3D808000 618CC160
 7D8903A6 4E800421
 936DB61C 38600001
 907B0003 48000201
-7C6802A6 907B06EE
+7C6802A6 907B07A9
 38600012 3D808037
 618CF1E4 7D8903A6
 4E800421 907B00D1
-38600059 3D808037
+3860010A 3D808037
 618CF1E4 7D8903A6
 4E800421 907B00D5
-7C7A1B78 38800059
+7C7A1B78 3880010A
 3D808000 618CC160
 7D8903A6 4E800421
 38600021 3D808037
 618CF1E4 7D8903A6
 4E800421 7C791B78
-933B018F 3860009E
+933B024A 3860009E
 3D808037 618CF1E4
 7D8903A6 4E800421
-907B0193 3880009E
+907B024E 3880009E
 3D808000 618CC160
 7D8903A6 4E800421
 38800000 98830000
 38800007 98830001
-93790005 38600705
+93790005 386007C0
 90790009 9359000D
-38600059 90790011
-807B0193 90790015
+3860010A 90790011
+807B024E 90790015
 3860009E 90790019
 38600000 9079001D
 38600000 3D808000
@@ -1267,7 +1364,7 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 88780004 987B0001
 80780005 907B0007
 3C80804D 90645F90
-7FE3FB78 38980158
+7FE3FB78 38980208
 38A00138 3D808000
 618C31F4 7D8903A6
 4E800421 88780009
@@ -1276,7 +1373,7 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 48000010 38600001
 48000008 3860000F
 987B001B 8062F228
-907B06EA 3C600101
+907B07A5 3C600101
 60630101 9062F228
 38A00000 3C60804C
 606320BC 1C850044
@@ -1290,28 +1387,50 @@ C216E748 00000053 #Online/Core/InitOnlinePlay.asm
 7C8802A6 38A00000
 3D808038 618CFD54
 7D8903A6 4E800421
-48000040 4E800021
+480000F4 4E800021
 3C608048 80639D60
 5464803E 806DB61C
 80630007 7C841A14
 3C60804D 90835F90
 4E800020 4E800021
-808DB61C 806406EA
-9062F228 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+838DB61C 807C07A5
+9062F228 886DAFA0
+2C030001 4082008C
+38600011 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+386000BD 987E0000
+807C0003 907E0001
+3BE00000 3BBE0005
+7FE3FB78 3D808003
+618C1724 7D8903A6
+4E800421 38800001
+989D0000 8883008E
+989D0001 80830D28
+909D0002 3BFF0001
+3BBD0006 2C1F0002
+4180FFC8 7FC3F378
+38800011 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-60000000 00000000
-C216E904 0000003B #Online/Core/InitPause.asm
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 00000000
+C216E904 0000003F #Online/Core/InitPause.asm
 3C608048 80639D30
 5463443E 2C030208
-408201C0 3D808046
+408201DC 3D808046
 618CDB68 886C0002
 54630739 41820028
 48000029 7C6802A6
 906C0040 38600000
 986DAFC8 886C0002
 38800000 50831F38
-986C0002 48000184
+986C0002 480001A0
 4E800021 7C0802A6
 90010004 9421FF50
 BE810008 83ADB61C
@@ -1330,37 +1449,41 @@ BE810008 83ADB61C
 546005EF 4182000C
 546004E7 40820020
 886DAFC8 2C030000
-41820084 807F0008
-546004E7 40820048
-480000C8 38600002
+418200A0 807F0008
+546004E7 40820064
+480000E4 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-7FC3F378 38800007
-3D808016 618CCF4C
+3D808037 618C8330
 7D8903A6 4E800421
-38600003 3C808046
-6084B6A0 98640000
-48000088 38600000
+3C608046 6063B6A0
+9BC30001 7FC3F378
+38800007 3D808016
+618CCF4C 7D8903A6
+4E800421 38600003
+3C808046 6084B6A0
+98640000 48000088
+38600000 986DAFC8
+3D80802F 618C33CC
+7D8903A6 4E800421
+7FC3F378 3D80801A
+618C10FC 7D8903A6
+4E800421 48000058
+807F0008 546004E7
+4182004C 38600001
 986DAFC8 3D80802F
-618C33CC 7D8903A6
+618C3394 7D8903A6
 4E800421 7FC3F378
-3D80801A 618C10FC
+38800005 3D80801A
+618C0FEC 7D8903A6
+4E800421 38600005
+3D808002 618C4030
 7D8903A6 4E800421
-48000058 807F0008
-546004E7 4182004C
-38600001 986DAFC8
-3D80802F 618C3394
-7D8903A6 4E800421
-7FC3F378 38800005
-3D80801A 618C0FEC
-7D8903A6 4E800421
-38600005 3D808002
-618C4030 7D8903A6
-4E800421 48000004
-3860FFFF BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-881F0001 00000000
+48000004 3860FFFF
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 881F0001
+60000000 00000000
 C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
 41A20014 3D80801A
 618C5024 7D8903A6
@@ -1374,10 +1497,10 @@ C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
 BE810008 3D808034
 618C7364 7D8903A6
 4E800421 7C7D1B78
-83EDB61C 3BDF0197
+83EDB61C 3BDF0252
 8B9E0000 3F008048
 83189D60 3B18FFFF
-82FF06E6 7C18B800
+82FF07A1 7C18B800
 4181009C 7C78B850
 38630001 8B9E0000
 7F83E051 40800008
@@ -1406,13 +1529,13 @@ A0840001 7C032000
 38800061 3D808000
 618CC160 7D8903A6
 4E800421 7C18B800
-4081001C 931F06E6
+4081001C 931F07A1
 3B9C0001 2C1C0007
 41800008 3B9CFFF9
 9B9E0000 7FA3EB78
 3D808034 618C738C
 7D8903A6 4E800421
-8B7F06F2 2C1B0001
+8B7F07AD 2C1B0001
 408200CC 48000025
 BA810008 800100B4
 382100B0 7C0803A6
@@ -1446,7 +1569,18 @@ C216EA30 00000004 #Online/Core/Remember Who LRA Started.asm
 40820014 3C808046
 6084B6A0 88840001
 989E000C 00000000
-C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
+C2376A20 0000000A #Online/Core/SkipNewInputFetchOnRollback.asm
+3C608048 80639D30
+5463443E 2C030208
+40820038 3C608047
+60639D64 80630000
+2C030000 40820024
+806DB61C 886300D9
+2C030001 40820014
+3D808037 618C6A28
+7D8903A6 4E800420
+3861002C 00000000
+C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
 3D808037 618CE214
 7D8903A6 4E800421
 48000030 4E800021
@@ -1459,9 +1593,9 @@ C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820260 3C608047
+4082026C 3C608047
 60639D64 80630000
-2C030000 4082024C
+2C030000 40820258
 834DB61C 3F608048
 837B9D60 3D808034
 618C7364 7D8903A6
@@ -1473,7 +1607,7 @@ C21A4DE4 0000005B #Online/Core/StartEngineLoop.asm
 618C4030 7D8903A6
 4E800421 4BFFFF51
 7EE802A6 38600002
-809A0701 3D80803A
+809A07BC 3D80803A
 618C6754 7D8903A6
 4E800421 7C781B78
 38800001 98980049
@@ -1493,11 +1627,11 @@ C0570010 3D80803A
 3D80803A 618C74F0
 7D8903A6 4E800421
 38600001 987A000E
-887A06F2 2C030000
-418200AC 887A06F7
-2C030000 41820078
-807A018F 809A06F8
-80BA0193 3D808000
+887A07AD 2C030000
+418200B8 887A07B2
+2C030000 41820084
+807A024A 809A07B3
+80BA024E 3D808000
 618C560C 7D8903A6
 4E800421 3D808001
 618C9894 7D8903A6
@@ -1507,49 +1641,50 @@ C0570010 3D80803A
 88650000 7C841A14
 98850002 38600000
 98650003 3F608048
-837B9D60 807A018B
+837B9D60 807A0237
 907A0003 38600000
-987A018A 987A00DA
-987A06F7 3D808001
-618C95FC 7D8903A6
-4E800421 807A06F3
-7C1B1800 41800010
-38600000 987A00D9
-987A06F2 887A018A
-2C030000 4182002C
-807A018B 7C1B1800
-41800020 807A018F
-7F64DB78 80BA0193
-3D808000 618C5608
+987A0236 987A0247
+987A0248 987A0249
+987A00DA 987A07B2
+3D808001 618C95FC
 7D8903A6 4E800421
-887A000C 2C030001
-4182004C 3C608046
-6063B6A0 88630008
-2C030000 40820010
-38600000 987A000B
-4800002C 887A000B
-38630001 987A000B
-2C030007 40810018
-38600001 987A000C
-807A06EE 7C6903A6
-4E800421 7F23CB78
-3D808034 618C738C
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-60000000 00000000
-C2376A28 0000009B #Online/Core/TriggerSendInput.asm
+807A07AE 7C1B1800
+41800010 38600000
+987A00D9 987A07AD
+887A0236 2C030000
+4182002C 807A0237
+7C1B1800 41800020
+807A024A 7F64DB78
+80BA024E 3D808000
+618C5608 7D8903A6
+4E800421 887A000C
+2C030001 4182004C
+3C608046 6063B6A0
+88630008 2C030000
+40820010 38600000
+987A000B 4800002C
+887A000B 38630001
+987A000B 2C030007
+40810018 38600001
+987A000C 807A07A9
+7C6903A6 4E800421
+7F23CB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 00000000
+C2376A28 000000DD #Online/Core/TriggerSendInput.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-408204A0 3C608047
+408206B0 3C608047
 60639D64 80630000
-2C030000 4082048C
+2C030000 4082069C
 836DB61C 833B00D1
-831B00D5 82FB018F
+831B00D5 82FB024A
 835B0003 887B00D9
-2C030001 418203E8
+2C030001 418205F8
 887B001B 38800054
 7C632050 2C1A0003
 4080001C 386100DC
@@ -1579,7 +1714,7 @@ C2376A28 0000009B #Online/Core/TriggerSendInput.asm
 38800012 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-38780000 38800059
+38780000 3880010A
 38A00000 3D808000
 618C55F0 7D8903A6
 4E800421 88780000
@@ -1615,65 +1750,131 @@ BA810008 800100B4
 889B001B 887B001C
 38630001 7C032000
 41800008 38600000
-987B001C 887B018A
-2C030000 41820110
-80780001 809B018B
-7C641851 41800100
-1C63000C 38630005
-889B0134 1C84000C
-38840136 7CD81A14
-7CFB2214 88660000
-88870000 546306FE
-548406FE 7C032000
-4082009C 88660001
-88870001 5463067E
-5484067E 7C032000
-40820084 80660002
-80870002 7C032000
-40820074 38A00005
-38A50001 2C050008
-40800028 7C6530AE
-7C8538AE 2C03002A
-4181000C 2C04002A
-4081FFE0 7C032000
-40820044 4BFFFFD4
-807B018B 38630001
-907B018B 887B0134
+987B001C 887B0236
+2C030000 40820018
+38600000 987B0247
+987B0248 987B0249
+48000284 3A800000
+38D40247 7C66D8AE
+2C030001 40820178
+1CD40004 38C60002
+7C66C02E 1CD40004
+38C6023B 7C86D82E
+7C641851 41800158
+7C761B78 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7EC3B378
+1C63000C 3863000E
+1CD40054 7C633214
+38D40134 7C86D8AE
+1C84000C 3884013A
+1CB40054 7C842A14
+7CD81A14 7CFB2214
+88660000 88870000
+546306FE 548406FE
+7C032000 408200BC
+88660001 88870001
+5463067E 5484067E
+7C032000 408200A4
+80660002 80870002
+7C032000 40820094
+38A00005 38A50001
+2C050008 40800028
+7C6530AE 7C8538AE
+2C03002A 4181000C
+2C04002A 4081FFE0
+7C032000 40820064
+4BFFFFD4 1CD40004
+38C6023B 7C66D82E
+38630001 7C66D92E
+38D40134 7C66D8AE
 38630001 2C030007
 41800008 3863FFF9
-987B0134 889B0135
-7C041800 4082FF34
-38600000 987B018A
-48000034 38600001
+7C66D9AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7C041800
+4082FEC0 48000040
+1CD40004 38C6023B
+7C66D82E 38600001
 987B00D9 987B00DA
 935B00DB BA810008
 800100B4 382100B0
 7C0803A6 3D808037
 618C6CEC 7D8903A6
-4E800420 80780001
+4E800420 3A940001
+2C140003 4180FE74
+3AA00000 3A800000
+807B0237 7C761B78
+7EC3B378 38D40247
+7C86D8AE 7C761B78
+7EC3B378 38D40247
+7C86D8AE 2C040001
+40820030 1CD40004
+38C6023B 7C86D82E
+2C150000 4182000C
+7C041800 40800014
+7C832378 7C761B78
+7EC3B378 3AA00001
+3A940001 2C140003
+4180FFAC 907B0237
+3A800000 38D40247
+7C86D8AE 2C040001
+40820038 38D40134
+7C66D8AE 38D40137
+7C86D8AE 38D40134
+7C66D8AE 38D40137
+7C86D8AE 7C041800
+40820010 38600000
+38D40247 7C66D9AE
+3A940001 2C140003
+4180FFB4 3A800000
+38D40247 7C86D8AE
+2C040001 41820018
+3A940001 2C140003
+4180FFE8 38600000
+987B0236 3A800000
+3AA00000 887B0000
+7C151800 40820008
+3AB50001 1CD40004
+38C60002 7C66C02E
 7C7A1850 2C030000
-40800080 887B001B
+408000D4 887B001B
 38800054 7C632050
-7C1A1800 41800068
+7C1A1800 418000BC
 887B000C 2C030001
-4182005C 8ADB0135
-1C76000C 38630136
-7C7B1A14 38980005
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 38760001
-2C030007 41800008
-3863FFF9 987B0135
-887B018A 2C030001
-41820014 935B018B
-38600001 987B018A
-9ADB0134 38600000
-1C63000C 38A30005
-887B0001 1C63000C
+418200B0 38D40137
+7EC6D8AE 1C76000C
+3863013A 1CB40054
+7C632A14 1CD40054
+38C6000E 7C7B1A14
+7C983214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+38760001 2C030007
+41800008 3863FFF9
+38D40137 7C66D9AE
+38D40134 7C66D8AE
+38D40137 7C86D8AE
+38D40247 7C66D8AE
+2C030001 4182003C
+1CD40004 38C6023B
+7F46D92E 38600001
+38D40247 7C66D9AE
+38D40134 7EC6D9AE
+887B0236 2C030001
+41820010 935B0237
+38600001 987B0236
+38600000 1C63000C
+38A3000E 1CD40054
+7CA53214 1C75000C
 386300DC 7C611A14
 7C982A14 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
+3A940001 3AB50001
+2C140003 4180FEC8
 48000080 807B00DB
 7C1A1800 40810024
 BA810008 800100B4
@@ -1689,7 +1890,7 @@ BA810008 800100B4
 7C611A14 7C9B2214
 38A0000C 3D808000
 618C31F4 7D8903A6
-4E800421 4BFFFEC8
+4E800421 4BFFFE40
 3B5A0001 935B0003
 BA810008 800100B4
 382100B0 7C0803A6
@@ -1783,41 +1984,18 @@ C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm
 2056616C 75653A20
 25640A00 00000000
 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm
-C2019608 00000025 #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
+C2019608 0000000E #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
 9421FFF8 3C608048
 80639D30 5463443E
-2C030208 40820108
+2C030208 40820050
 3C608047 60639D64
 80630000 2C030000
-408200F4 3C608037
+4082003C 3C608037
 60635E00 2C000003
-408200E4 80ADB61C
+4082002C 80ADB61C
 886500D9 2C030000
-418200D4 4800002C
-4E800021 56492072
-65747261 63652043
-42206475 72696E67
-20726F6C 6C626163
-6B2E2E2E 00000000
-7C0802A6 90010004
-9421FF00 BC610008
-60000000 60000000
-60000000 60000000
-60000000 806DAFC4
-38630003 4BFFFFAD
-7C8802A6 4CC63242
-3D808032 618C3CF4
-7D8903A6 4E800421
-806DAFC4 388000D0
-98830000 38800000
-98830001 38800001
-98830002 38800080
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 B8610008
-80010104 38210100
-7C0803A6 38600001
-98650700 3D808001
+4182001C 38600001
+986507BB 3D808001
 618C9618 7D8903A6
 4E800420 38600000
 60000000 00000000
@@ -1836,11 +2014,11 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm
 40820090 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BDF0197 8B9E0000
+3BDF0252 8B9E0000
 3C608048 80639D60
-809F06E6 7C032000
+809F07A1 7C032000
 41810028 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -1858,12 +2036,12 @@ C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0197 57DE043E
+3BBF0252 57DE043E
 8B9D0000 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C032000 41810088
 3C608048 80639D60
-809F06E6 7C632050
+809F07A1 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -1888,12 +2066,12 @@ C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0197 57DE043E
+3BBF0252 57DE043E
 8B9D0000 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C032000 41810088
 3C608048 80639D60
-809F06E6 7C632050
+809F07A1 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -1920,13 +2098,13 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm
 2C030000 40820120
 7C0802A6 90010004
 9421FF50 BE810008
-83EDB61C 3BDF0197
+83EDB61C 3BDF0252
 3BA00000 3B400000
 56FB043E 8B9E0000
 3C608048 80639D60
-809F06E6 7C032000
+809F07A1 7C032000
 41810070 3C608048
-80639D60 809F06E6
+80639D60 809F07A1
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -1978,144 +2156,161 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm
 618C5610 7D8903A6
 4E800421 38000000
 60000000 00000000
-C2263258 000000A3 #Online/Menus/CSS/HandleInputsOnCSS.asm
+C2263258 00000165 #Online/Menus/CSS/HandleInputsOnCSS.asm
 41A20014 3D808026
 618C3334 7D8903A6
 4E800420 7C0802A6
 90010004 9421FF50
 BE810008 3C608048
 80639D30 5463443E
-2C030008 408204D0
+2C030008 40820AE0
 7CFB3B78 3F008000
 63185614 83180000
-83580000 8878000D
-889A0001 9898000D
-2C030001 40820010
-2C040000 40820008
-4800003C 8878000E
-889A0000 9898000E
-2C030005 41820010
-2C040005 40820008
-48000034 2C030004
-40820010 2C040004
-41820008 48000008
-48000030 38600000
-3D808002 618C4030
+83580000 3B800000
+8878000D 889A0001
+9898000D 2C030001
+40820010 2C040000
+40820008 4800003C
+8878000E 889A0000
+9898000E 2C030005
+41820010 2C040005
+40820008 48000034
+2C030004 40820010
+2C040004 41820008
+48000008 48000030
+38600000 3D808002
+618C4030 7D8903A6
+4E800421 48000018
+38600003 3D808002
+618C4030 7D8903A6
+4E800421 887A0000
+2C030000 40810020
+2C030003 40810078
+2C030004 4182007C
+2C030005 418201BC
+480009FC 576004E7
+418209F4 3C608048
+80639D60 2C030000
+418209E4 3860FFFF
+986DAFC9 38600000
+986DAFCA 886DB657
+2C030000 418209C8
+886DAFA0 2C030001
+41820010 2C030002
+40800014 48000000
+3860FFFE 48000335
+480009A4 4800035D
+4800099C 576006F7
+40820399 48000990
+3D80801A 618C3680
 7D8903A6 4E800421
-48000018 38600003
-3D808002 618C4030
-7D8903A6 4E800421
-887A0000 2C030000
-40810020 2C030003
-40810068 2C030004
-4182006C 2C030005
-4182016C 480003F0
-576004E7 418203E8
-3860FFFF 986DAFC9
-38600000 986DAFCA
-886DB657 2C030000
-418203CC 886DAFA0
-2C030001 41820010
-2C030002 41820014
-48000000 3860FFFE
-480002C5 480003A8
-480002E9 480003A0
-576006F7 40820325
-48000394 576006F7
-4182000C 48000315
-48000384 887A0001
-2C030000 408200C0
+548006F7 41820024
+8878000F 38630001
+9878000F 2C030030
+40810014 9B98000F
+48000361 48000958
+9B98000F 887A0001
+2C030000 408200D0
 576004E7 4082002C
 886DAFA0 2C030002
-408200AC 886DAFC9
-2C030000 408200A0
+418000BC 886DAFC9
+2C030000 408200B0
 886DAFCA 2C030001
-40820094 48000004
+408200A4 48000004
 886DB657 2C030000
+41820094 3C608048
+80639D60 2C030000
 41820084 886DAFA0
 2C030001 41820010
-2C030002 41820014
+2C030002 40800014
 48000000 3860FFFE
-4800014D 48000060
+48000151 48000060
 886DAFC9 2C030000
 4182001C 2C030001
 41820008 48000000
-3860FFFF 48000129
+3860FFFF 4800012D
 4800003C 886DAFCA
 2C030000 41820018
 806D8840 38630598
-A063001E 48000109
+A063001E 4800010D
 4800001C 38600001
-986DB656 480000F5
+986DB656 480000F9
 7C6802A6 906DAFE8
-480002BC 887A0001
-889A0002 7C632039
-418202AC BA810008
-800100B4 382100B0
-7C0803A6 3D808026
-618C3264 7D8903A6
-4E800420 576006F7
-40820211 48000280
+4800087C 480002F1
+887A0001 889A0002
+7C632039 41820868
+BA810008 800100B4
+382100B0 7C0803A6
+3D808026 618C3264
+7D8903A6 4E800420
+576006F7 40820245
+4800083C 7C0802A6
+90010004 9421FF50
+BE810008 38600014
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C791B78 386000B4
+98790000 886DAFA0
+98790001 38F90002
+3CC0804A 60C60740
+38800000 38A00000
+7C66222E 7C672B2E
+38840003 38A50002
+2C050012 4180FFEC
+7F23CB78 38800014
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7F23CB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
-38600014 3D808037
-618CF1E4 7D8903A6
-4E800421 7C791B78
-386000B4 98790000
-886DAFA0 98790001
-38F90002 3CC0804A
-60C60740 38800000
-38A00000 7C66222E
-7C672B2E 38840003
-38A50002 2C050012
-4180FFEC 7F23CB78
-38800014 38A00001
-3D808000 618C55F0
+7C7F1B78 38600008
+3D808037 618CF1E4
 7D8903A6 4E800421
-7F23CB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 7C7F1B78
-38600007 3D808037
-618CF1E4 7D8903A6
-4E800421 7C791B78
-386000B5 98790000
-808DB610 886DAEF8
-1C630024 7C841A14
-88640070 98790001
-88640073 98790002
-38600001 98790003
-2C1FFFFE 41820014
-2C1FFFFF 41820018
-2C1F0000 4080001C
-38600000 38800003
-4800001C 38600000
-38800000 48000010
-7FE3FB78 38800001
-48000004 B0790004
-98990006 7F23CB78
-38800007 38A00001
-3D808000 618C55F0
+7C791B78 386000B5
+98790000 808DB610
+886DAEF8 1C630024
+7C841A14 88640070
+98790002 88640073
+98790003 38600001
+98790004 886DAFA0
+2C030003 41820010
+38600000 98790001
+4800001C 3C608000
+60635614 80630000
+88630014 3863FFFF
+98790001 2C1FFFFE
+41820014 2C1FFFFF
+41820018 2C1F0000
+4080001C 38600000
+38800003 4800001C
+38600000 38800000
+48000010 7FE3FB78
+38800001 48000004
+B0790005 98990007
+7F23CB78 38800008
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7F23CB78
+3D808037 618CF1B0
 7D8903A6 4E800421
-7F23CB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFF09
-4BFFFE59 BA810008
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+8A980014 4BFFFED5
+4BFFFE25 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
 38600001 986DAFA3
-4BFFFFB9 7C6802A6
+4BFFFFB5 7C6802A6
 906DAFE8 880DB650
 980DB659 38000004
 980DB656 BA810008
@@ -2135,6 +2330,183 @@ BE810008 4BFFFF09
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7F63DB78
+98780011 2C1B0001
+4182005C 2C1B0002
+41820054 2C1B0008
+4182004C 2C1B0004
+41820044 2C1B0041
+4182003C 2C1B0042
+41820034 2C1B0048
+4182002C 2C1B0044
+41820024 2C1B0021
+4182001C 2C1B0022
+41820014 2C1B0028
+4182000C 2C1B0024
+40820019 88780010
+2C030000 4082000C
+7F63DB78 480000B9
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+48000379 7DE802A6
+386000B7 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 7DC37378
+98780010 38600006
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800006
+3D808000 618CC160
+7D8903A6 4E800421
+7DC37378 98770000
+7F03C378 90770006
+38600004 38800005
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C741B78
+806DB614 80630018
+3D808037 618C0E44
+7D8903A6 4E800421
+7C751B78 C02F001C
+C04F0020 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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C6E1B78 7C0802A6
+90010004 9421FF50
+BE810008 820E002C
+82EE0028 8A300000
+8A500001 82700002
+82B00006 8AD50011
+2C130000 40820144
+38600090 7C721B78
+98700001 480001E5
+7DE802A6 7E238B78
+3D808000 618C56AC
+7D8903A6 4E800421
+7C741B78 38600001
+38800000 C02F0000
+C04F0004 48000209
+7C731B78 92700002
+7E639B78 388F0028
+38A00000 38CF0024
+38EF002D 39140004
+C02F0014 C04F0014
+C06F0008 C08F0010
+3D808000 618C56B4
+7D8903A6 4E800421
+7C641B78 7C8A2378
+7C8B2378 386B0002
+C04F0018 3D808000
+618C55EC 7D8903A6
+4E800421 C06F0010
+EC83082A 2C0B0000
+4182001C 2C0B0001
+4182002C 2C0B0002
+4182001C 2C0B0003
+4182000C 38800008
+48000018 38800004
+48000010 38800002
+48000008 38800001
+7E238B78 3D808000
+618C56AC 7D8903A6
+4E800421 7C872378
+7E639B78 388F0024
+38A00000 38CF0024
+C02F0014 C04F0014
+C06F000C 3D808000
+618C56B4 7D8903A6
+4E800421 7C6B1B78
+386A0004 7C0B1800
+4082FF54 480000A0
+88700001 2C030086
+4181003C 2C160000
+41820034 88750012
+2C030004 40800028
+38600000 98700001
+7E238B78 7EC4B378
+38A00004 7C632830
+7C632214 4BFFFC49
+4800005C 2C120000
+41820010 3A52FFFF
+9A500001 48000048
+38600000 98750010
+7DC37378 3D808038
+618CFED4 7D8903A6
+4E800421 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+7E639B78 3D80803A
+618C5CC4 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 00000000
+3DCCCCCD C3960000
+C38E8000 429E0000
+3EE66666 41C80000
+C1A00000 C1840000
+FFFFFFFF FFEA2FFF
+00436861 743A2025
+73002573 3A202573
+0047616D 65005500
+4C005200 4400817B
+00000000 7C761B78
+7C972378 FEC00890
+FEE01090 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C781B78
+9AD80049 9AF8004A
+D2D80008 D2F80024
+D2F80028 7F03C378
+BA810008 800100B4
+382100B0 7C0803A6
 4E800020 BA810008
 800100B4 382100B0
 7C0803A6 3D808026
@@ -2142,85 +2514,105 @@ BA810008 800100B4
 4E800420 BA810008
 800100B4 382100B0
 7C0803A6 00000000
-C2264534 0000013A #Online/Menus/CSS/InitCSS.asm
+C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm
 3C608048 80639D30
 5463443E 2C030008
-408209B8 4800019C
+4082000C 38604800
+48000008 38602400
+60000000 00000000
+C2264534 000001D3 #Online/Menus/CSS/InitCSS.asm
+3C608048 80639D30
+5463443E 2C030008
+40820E7C 480001F8
 4E800021 00000000
-3DCCCCCD 428C0000
+3DCCCCCD C39B0000
+C3848000 3EE66666
+3ECCCCCD 3F800000
+41C80000 428C0000
 41B80000 3F000000
 42B40000 42500000
 42960000 42C40000
 42500000 428C0000
 42B00000 42D40000
 3ECCCCCD 43048000
+43188000 42200000
+C2E00000 3F000000
 C3760000 C3020000
 C2480000 3EE66666
 33FF2FFF 3CBCFFFF
 8E9196FF FF0000FF
+FFFFFFFF D4D4D4FF
+33FF2FFF 00000000
 00556E72 616E6B65
-64204D6F 64650044
-69726563 74204D6F
-64650052 616E6B65
-64204D6F 64650053
-656C6563 7420796F
-75722063 68617261
-63746572 00436861
-72616374 65722073
-656C6563 74656400
-50726573 73205354
-41525420 746F2025
-73006C6F 636B2069
-6E00656E 74657220
-636F6465 00736561
-72636800 73656C65
-63742073 74616765
-004C6F63 6B656420
-696E0053 65617263
-68696E67 20666F72
-20257300 436F6E6E
-65637469 6E672074
-6F202573 00576169
-74696E67 206F6E20
-2573006F 70706F6E
-656E7400 2D2D2F2F
-2D2D2F2F 2D2D2F2F
-2D2D2F2F 30300045
-72726F72 00506C61
-79696E67 3A005072
-65737320 5A20746F
-20257300 64697363
-6F6E6E65 63740063
-616E6365 6C00636C
-65617220 6572726F
-7200817B 00817E00
-817C0000 4E800021
-C2E00000 41A00000
-00000000 3DCCCCCD
-7C0802A6 90010004
-9421FF50 BE810008
-4BFFFE59 7FA802A6
+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
+2D2F2F30 30004572
+726F7200 506C6179
+696E673A 00557365
+20442D50 61642074
+6F204368 61740050
+72657373 205A2074
+6F202573 00486F6C
+64205A20 746F2025
+73006469 73636F6E
+6E656374 0063616E
+63656C00 636C6561
+72206572 726F7200
+25733A20 25730081
+7B00817E 00817C00
+4E800021 C2E00000
+41A00000 00000000
+3DCCCCCD 7C0802A6
+90010004 9421FF50
+BE810008 4BFFFDFD
+7FA802A6 3C60804D
+606350D8 3C800200
+60840801 90830000
 888DAFA0 2C040002
-38800001 40820008
-38800002 4BFFFFC1
+38800001 41800008
+38800002 4BFFFFAD
 7C6802A6 3D808000
 618C5618 7D8903A6
 4E800421 4E800021
 38600004 38800005
 38A00080 3D808039
 618C01F0 7D8903A6
-4E800421 48000341
+4E800421 4800039D
 7C8802A6 38A00004
 3D808038 618CFD54
 7D8903A6 4E800421
-3860000F 3D808037
+38600016 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
-3880000F 3D808000
+38800016 3D808000
 618CC160 7D8903A6
 4E800421 3C608000
 60635614 93E30000
-38600290 3D808037
+38600340 3D808037
 618CF1E4 7D8903A6
 4E800421 907F0000
 38600000 38800000
@@ -2231,142 +2623,209 @@ C2E00000 41A00000
 38800000 989C004A
 C03D0000 D03C0008
 C03D0004 D03C0024
-D03C0028 C03D0008
-C05D000C 7F83E378
-389D005C 3D80803A
+D03C0028 C03D0020
+C05D0024 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7C641B78
-7F83E378 C03D0010
-C05D0010 3D80803A
+7F83E378 C03D0028
+C05D0028 3D80803A
 618C7548 7D8903A6
-4E800421 C05D0018
-48000141 C05D001C
-48000139 C05D0020
-48000131 C03D0008
-C05D0038 7F83E378
-389D005C 3D80803A
+4E800421 C05D0030
+4800019D C05D0034
+48000195 C05D0038
+4800018D C03D0020
+C05D0050 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7F83E378
-38800007 C03D0034
-C05D0034 3D80803A
+38800007 C03D004C
+C05D004C 3D80803A
 618C7548 7D8903A6
 4E800421 7F83E378
-38800007 38BD0054
+38800007 38BD007C
 3D80803A 618C74F0
 7D8903A6 4E800421
-C03D0040 C05D003C
-7F83E378 389D005C
+C03D0020 C05D0054
+7F83E378 389D0094
 3D80803A 618C6B98
 7D8903A6 4E800421
 7F83E378 38800008
-C03D0010 C05D0010
+C03D004C C05D004C
 3D80803A 618C7548
 7D8903A6 4E800421
 7F83E378 38800008
-38BD0054 3D80803A
+38BD007C 3D80803A
 618C74F0 7D8903A6
-4E800421 C03D0044
-C05D003C 7F83E378
-389D005C 3D80803A
+4E800421 C03D0068
+C05D0064 7F83E378
+389D0094 3D80803A
 618C6B98 7D8903A6
 4E800421 7F83E378
-38800009 C03D0010
-C05D0010 3D80803A
-618C7548 7D8903A6
-4E800421 C05D0024
-480000BD C05D0028
-480000B5 C05D002C
-480000AD C05D0030
-480000A5 BA810008
-800100B4 382100B0
-7C0803A6 48000584
-7EA802A6 FC601090
-C03D0014 7F83E378
-389D005C 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7F83E378 C03D0034
-C05D0034 3D80803A
-618C7548 7D8903A6
-4E800421 C03D0008
-FC401890 7F83E378
-389D005C 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7F83E378 C03D0048
-C05D0048 3D80803A
-618C7548 7D8903A6
-4E800421 7EA803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 C03D0008
-7F83E378 389D005C
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C7B1B78 7F83E378
-7F64DB78 C03D0034
-C05D0034 3D80803A
+38800009 C03D0028
+C05D0028 3D80803A
 618C7548 7D8903A6
 4E800421 7F83E378
-7F64DB78 38BD0058
+38800009 38BD007C
 3D80803A 618C74F0
 7D8903A6 4E800421
+C03D006C C05D0064
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7F83E378 3880000A
+C03D0028 C05D0028
+3D80803A 618C7548
+7D8903A6 4E800421
+C05D003C 480000BD
+C05D0040 480000B5
+C05D0044 480000AD
+C05D0048 480000A5
 BA810008 800100B4
 382100B0 7C0803A6
-4E800020 4E800021
+4800097C 7EA802A6
+FC601090 C03D002C
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C641B78 7F83E378
+C03D004C C05D004C
+3D80803A 618C7548
+7D8903A6 4E800421
+C03D0020 FC401890
+7F83E378 389D0094
+3D80803A 618C6B98
+7D8903A6 4E800421
+7C641B78 7F83E378
+C03D0070 C05D0070
+3D80803A 618C7548
+7D8903A6 4E800421
+7EA803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-4BFFFAB1 7FA802A6
-3FE08000 63FF5614
-83FF0000 83DF0000
-839F0004 38FD0128
-3CC0804A 60C60740
-38800000 38A00000
-7C66222E 7C672B2E
-38840003 38A50002
-2C050012 4180FFEC
+C03D0020 7F83E378
+389D0094 3D80803A
+618C6B98 7D8903A6
+4E800421 7C7B1B78
+7F83E378 7F64DB78
+C03D004C C05D004C
+3D80803A 618C7548
+7D8903A6 4E800421
+7F83E378 7F64DB78
+38BD0080 3D80803A
+618C74F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 4BFFF9E5
+7FA802A6 3FE08000
+63FF5614 83FF0000
+83DF0000 839F0004
+38FD015F 3CC0804A
+60C60740 38800000
+38A00000 7C66222E
+7C672B2E 38840003
+38A50002 2C050012
+4180FFEC C022AF04
+886DAFA0 2C030003
+40820008 C022AD44
+806DB620 38810038
+38A00024 38C0FFFF
+3D808001 618C1E24
+7D8903A6 4E800421
+80610038 3D808036
+618CF8BC 7D8903A6
+4E800421 80610038
+3D808037 618C0928
+7D8903A6 4E800421
 887E0000 2C030004
-4181003C 886DAFA0
-2C030001 41820018
-2C030002 41820018
-2C030000 41820018
-4800001C 38BD005D
-4800001C 38BD006B
-48000014 38BD0077
-4800000C 38BD013B
-48000004 38800000
-480003A9 887E0000
+41810054 38800000
+38BD00B2 886DAFA0
+2C030001 41820020
+2C030002 41820020
+2C030000 41820020
+2C030003 41820020
+48000024 38DD0095
+48000020 38DD009E
+48000018 38DD00A5
+48000010 38DD00AC
+48000008 38BD0172
+48000735 887E000A
+2C030000 41820010
+3B3E0015 7C7A1B78
+48000024 887E000B
+2C030000 41820110
+7C7A1B78 887E000C
+1C63001F 38630034
+7F3E1A14 887F0013
+2C03000C 40810010
+38600000 987F0013
+418200E4 386000B7
+3880007F 38A00040
+3D808002 618C37A8
+7D8903A6 4E800421
+887F0012 38630001
+987F0012 3860000F
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800016
+3D808000 618CC160
+7D8903A6 4E800421
+386000AA 98770000
+7F43D378 98770001
+887F0013 98770002
+38630001 987F0013
+93370007 7FE3FB78
+9077000B 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C6E1B78 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7DC37378
+480003E1 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 887E0000
 2C030004 4182000C
-38BD005C 48000008
-38BD0141 38800008
-48000389 887E0000
+38BD0094 48000008
+38BD0178 38800009
+480005E5 887E0000
 2C030004 4182000C
-38BD005C 48000008
-38BE0048 38800009
-48000369 887E0000
+38BD0094 48000008
+38BE00B0 3880000A
+480005C5 887E0000
+2C030004 4182000C
+38BD0094 48000008
+38BD0181 38800008
+480005A5 887E0000
 2C030004 41820034
 2C030005 41820020
 2C030000 4181000C
-38BD005C 48000024
-38BD014A 38DD0163
-48000018 38BD014A
-38DD016A 4800000C
-38BD014A 38DD0158
-38800007 4800031D
+38BD0094 48000024
+38BD0193 38DD01B9
+48000018 38BD0193
+38DD01C0 4800000C
+38BD01A1 38DD01AE
+38800007 48000559
 3B600001 7F64DB78
-38BD005C 4800030D
+38BD0094 48000549
 3B7B0002 2C1B0005
 4081FFEC 38800008
 38600000 7C7F21AE
 38840001 2C04000A
-4081FFF4 3B60000A
-7F64DB78 38BD005C
-480002D9 3B7B0001
-2C1B000D 4081FFEC
+4081FFF4 3B60000B
+7F64DB78 38BD0094
+48000515 3B7B0001
+2C1B000E 4081FFEC
 887E0000 2C030005
-408200A8 3B60000A
+408200A8 3B60000B
 3B400000 3B200000
-3B000000 3AFE0067
+3B000000 3AFE0117
 7ED7D0AE 56C00631
 41820010 3B5A0002
 3B390001 48000018
@@ -2377,74 +2836,74 @@ BA810008 800100B4
 41810008 4800002C
 38800000 7C97C1AE
 7F64DB78 7EE5BB78
-48000259 3B7B0001
+48000495 3B7B0001
 7EF7C214 3AF70001
 3B400000 3B200000
 2C160000 41820020
-387E0158 7C97D214
+387E0208 7C97D214
 7C041800 40800010
-2C1B000D 41810008
+2C1B000E 41810008
 4BFFFF78 4800014C
 3B600001 886DB657
 7F64DB78 2C030000
-40820018 38BD0083
-48000201 38600001
+40820018 38BD00BA
+4800043D 38600001
 987F0008 48000124
-38BD0099 480001ED
+38BD00D0 48000429
 3B7B0002 38600002
 987F0008 887E0001
 7F64DB78 2C030000
 40820080 886DAFA0
-2C030002 40820034
+2C030002 41800034
 887E0000 2C030004
 40820028 886DAFC9
 2C030000 4082001C
 886DAFCA 2C030000
-40820010 38BD00AC
-38DD00D8 48000034
-38BD00AC 38DD00BE
+40820010 38BD00E3
+38DD010F 48000034
+38BD00E3 38DD00F5
 887E0000 2C030004
-41820020 38BD00AC
-38DD00D1 886DAFA0
-2C030002 4082000C
-38BD00AC 38DD00C6
-48000161 38600001
+41820020 38BD00E3
+38DD0108 886DAFA0
+2C030002 4180000C
+38BD00E3 38DD00FD
+4800039D 38600001
 987F0009 48000084
-38BD00E5 4800014D
+38BD011C 48000389
 3B7B0002 38600002
 987F0009 887E0000
 7F64DB78 2C030004
 4182004C 2C030003
 41820024 88ADAFA0
-2C050002 38BD00EF
-38DD011F 40820038
-38BD00EF 38DD0128
+2C050001 38BD0126
+38DD0156 41820038
+38BD0126 38DD015F
 4800002C 88ADAFA0
-2C050002 38BD0100
-38DD011F 40820018
-38BD0100 38DD0128
-4800000C 38BD0111
-38DD011F 480000DD
+2C050001 38BD0137
+38DD0156 41820018
+38BD0137 38DD015F
+4800000C 38BD0148
+38DD0156 48000319
 38600001 987F000A
 3B400008 3B600002
 7C7FD0AE 2C030001
 40820044 A07F000B
 3880000F 7C632396
-1C630003 38630176
+1C630003 386301D3
 7CBD1A14 7F64DB78
-480000A1 7F83E378
-7F64DB78 38BD0050
+480002DD 7F83E378
+7F64DB78 38BD0078
 3D80803A 618C74F0
 7D8903A6 4E800421
 48000044 2C030002
 40820030 7F64DB78
-38BD017C 4800006D
+38BD01D9 480002A9
 7F83E378 7F64DB78
-38BD004C 3D80803A
+38BD0074 3D80803A
 618C74F0 7D8903A6
 4E800421 48000010
-7F64DB78 38BD005C
-48000041 3B7B0002
+7F64DB78 38BD0094
+4800027D 3B7B0002
 3B5A0001 2C1A000A
 4081FF68 A07F000B
 38630001 2C03001E
@@ -2452,11 +2911,83 @@ BA810008 800100B4
 B07F000B BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-7EA802A6 7F83E378
-3D80803A 618C70A0
+4E800021 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFF3D1 7FA802A6
+81EE002C 8A0F0000
+8A2F0001 8A4F0002
+826F0003 82AF0007
+83EF000B 2C130000
+4082013C 806DC2DC
+38800003 9883000E
+3C6080BD 60635C6C
+38600000 38800000
+3D80803A 618C6754
 7D8903A6 4E800421
-7EA803A6 4E800020
-80CDB638 00000000
+7C731B78 926F0003
+806DC2DC 38800001
+9883000E 38800001
+98930049 38800000
+9893004A C03D0000
+D0330008 C03D0004
+D0330024 D0330028
+7E258B78 38800004
+7CA52430 7CA52030
+7C858850 7E238B78
+38A00004 7C632C30
+3D808000 618C56AC
+7D8903A6 4E800421
+7C761B78 7C942378
+7E439378 3D808000
+618C55F4 7D8903A6
+4E800421 C09D001C
+EC210132 FC600890
+C03D0008 C05D000C
+EC42182A FDC00890
+FDE01090 3C608000
+60635614 80630000
+83C30000 387E0015
+7C03A800 4082000C
+389D0088 48000008
+389D008C 7E639B78
+38A00001 38DD0090
+38FD01CC 7EA8AB78
+7E89A378 C03D0010
+C05D0010 FC607090
+FC807890 C0BD0014
+C0DD0018 3D808000
+618C56B4 7D8903A6
+4E800421 887F0012
+2C030006 41800028
+887F0013 7C039000
+4080000C 2C12000C
+40810028 887F0013
+7C721850 2C030006
+41810018 2C100000
+41820010 3A10FFFF
+9A0F0000 4800006C
+7DC37378 3D808038
+618CFED4 7D8903A6
+4E800421 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+7E639B78 3D80803A
+618C5CC4 7D8903A6
+4E800421 887F0012
+3863FFFF 987F0012
+887F0013 7E449378
+38840001 7C032000
+41820008 4800000C
+38600000 987F0013
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7EA802A6
+7F83E378 3D80803A
+618C70A0 7D8903A6
+4E800421 7EA803A6
+4E800020 80CDB638
+60000000 00000000
 C22652F0 0000007C #Online/Menus/CSS/InitSheikSelector.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2582,6 +3113,191 @@ C05F0040 FC011040
 7C0803A6 4E800020
 38600000 38980000
 60000000 00000000
+C22652F4 000000B8 #Online/Menus/CSS/InitTeamToggleButton.asm
+3C608048 80639D30
+5463443E 2C030008
+40820594 888DAFA0
+2C040003 40820588
+4800002C 4E800021
+C0200000 C0A00000
+C1BC0000 C18C0000
+00000000 3F800000
+C19C0000 C0400000
+3DCCCCCD 7C0802A6
+90010004 9421FF50
+BE810008 3FC08000
+63DE5614 83DE0000
+4BFFFFBD 7FE802A6
+C3FF0010 C3DF0014
+38600004 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+38800004 3D808000
+618CC160 7D8903A6
+4E800421 7FC3F378
+90770006 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C741B78 806DB638
+80630030 80630008
+38800000 8063000C
+38840001 2C040007
+4180FFF4 80630008
+3D808037 618C0E44
+7D8903A6 4E800421
+7C751B78 7EA3AB78
+809F0018 90830038
+809F001C 9083003C
+809F0020 90830040
+806DB638 80630038
+80630000 38800000
+80630004 38840001
+2C040007 4180FFF4
+80A30000 7EA3AB78
+38800000 38C00000
+3D808036 618CFB5C
+7D8903A6 4E800421
+7EA3AB78 FC20F890
+3D808036 618CF8BC
+7D8903A6 4E800421
+7EA3AB78 3D808037
+618C0928 7D8903A6
+4E800421 7E83A378
+38800004 7EA5AB78
+3D808039 618C0A70
+7D8903A6 4E800421
+7E83A378 3C808039
+60841070 38A00002
+38C00080 3D808039
+618C069C 7D8903A6
+4E800421 7E83A378
+38800004 3CA08037
+60A5F1B0 7EE6BB78
+3D808039 618C0B68
+7D8903A6 4E800421
+7E83A378 480000CD
+7C8802A6 38A00004
+3D808038 618CFD54
+7D8903A6 4E800421
+386D8844 89C30000
+39E00000 48000175
+39EF0001 7C0F7000
+4180FFF4 806DB620
+38810034 38A0002B
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80C040 60840000
+9083003C 806DB620
+38810034 38A00029
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3D808037 618C1BEC
+7D8903A6 4E800421
+80630004 80630008
+FC20F890 3D808036
+618C3C2C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 480002E8
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 7C741B78
+82B40028 886DB656
+2C030000 40820098
+3FC08000 63DE5614
+83DE0000 807E0000
+88630001 2C030000
+4082007C 4BFFFD21
+7FE802A6 3BA00000
+3C80804A 60840BC0
+80840000 C024000C
+C0440010 C07F0000
+C09F0004 C0BF0008
+C0DF000C FC021840
+41810044 FC022040
+4180003C FC012840
+41800034 FC013040
+4181002C 3BA00001
+3C80804C 608420BC
+886DB650 1C630044
+7C641A14 80630008
+546305EF 41820008
+48000019 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+808DB610 886DB650
+1C630024 7F841A14
+887C0070 7C7B1B78
+3D808000 618C56B8
+7D8903A6 4E800421
+7C651B78 38600000
+1C630024 3C80803F
+60840A48 7C832214
+886403C2 1C63001C
+7C832A14 8B4400DD
+889E0014 38840001
+2C040004 41800008
+38800001 989E0014
+386D8844 98830000
+7C992378 2C190003
+4182001C 2C190002
+4182000C 2C190001
+40810014 38600000
+48000010 38600001
+48000008 38600002
+3D808000 618C55F4
+7D8903A6 4E800421
+7EA3AB78 3D808036
+618CF8BC 7D8903A6
+4E800421 7EA3AB78
+3D808037 618C0928
+7D8903A6 4E800421
+7C0802A6 90010004
+9421FF00 BC610008
+7F23CB78 4800009D
+B8610008 80010104
+38210100 7C0803A6
+7F23CB78 7F64DB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C781B78 886DB657
+2C030000 41820050
+80ADB610 9B1C0073
+3CA0803F 60A50E09
+9B050000 9B1E0015
+38600000 7F44D378
+7F05C378 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+38600002 3D808002
+618C4030 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+7C791B78 2C190003
+4182001C 2C190002
+4182000C 2C190001
+41820014 38800000
+48000014 38800001
+4800000C 38800002
+48000004 88ADB650
+386D9A38 7C632A14
+98830000 38600000
+3D808025 618CDB34
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 38600000
+38980000 3D80803A
+618C6754 7D8903A6
+4E800421 00000000
 C2262004 00000009 #Online/Menus/CSS/PreventAPressCharUnselect.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2602,10 +3318,13 @@ C22620AC 00000009 #Online/Menus/CSS/PreventBPressCharUnselect.asm
 3D808026 618C2154
 7D8903A6 4E800420
 88FF0004 00000000
-C22600A8 00000009 #Online/Menus/CSS/PreventColorChange.asm
+C22600A8 0000000C #Online/Menus/CSS/PreventColorChange.asm
 3C608048 80639D30
 5463443E 2C030008
-40820030 3C608000
+40820048 3C608000
+60635614 80630000
+88630014 2C030000
+40820020 3C608000
 60635614 80630000
 80630000 88630001
 2C030000 41820014
@@ -2635,6 +3354,106 @@ BA810008 800100B4
 BA810008 800100B4
 382100B0 7C0803A6
 54601838 00000000
+C2262478 00000016 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FC08000 63DE5614
+83DE0000 3C608048
+80639D30 5463443E
+2C030008 40820054
+888DAFA0 2C040003
+40820048 807E0000
+88630001 2C030000
+40820038 8BFE0014
+2C1F0003 41820008
+3BFFFFFF 88CDB650
+1CC60004 7FFF3214
+7FE3FB78 3D808000
+618C55F4 7D8903A6
+4E800421 48000004
+BA810008 800100B4
+382100B0 7C0803A6
+8061003C 38800006
+38A00400 3CC08036
+60C6410C 38E00001
+60000000 00000000
+C226295C 00000010 #Online/Menus/CSS/Teams/AnimateToken.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3F808000 639C5614
+839C0000 3C608048
+80639D30 5463443E
+2C030008 40820038
+888DAFA0 2C040003
+4082002C 807C0000
+88630001 2C030000
+4082001C 8B7C0014
+2C1B0003 41820008
+3B7BFFFF 9B7D0006
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 881D0006
+60000000 00000000
+C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820098
+888DAFA0 2C040003
+4082008C 8BDF0014
+808DB610 886DB650
+1C630024 7F441A14
+887A0070 7C7D1B78
+3D808000 618C56B8
+7D8903A6 4E800421
+7C651B78 38600000
+1C630024 3C80803F
+60840A48 7C832214
+886403C2 1C63001C
+7C832A14 8B8400DD
+7FC3F378 7F84E378
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7B1B78 80ADB610
+9B650073 3CA0803F
+60A50E09 9B650000
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 9E9803C2
+60000000 00000000
+C2260E14 00000003 #Online/Menus/CSS/Teams/PreventColorResetLastChar.asm
+3D808026 618C0B90
+7D8903A6 4E800420
+60000000 00000000
+C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820088
+888DAFA0 2C040003
+4082007C 808DB610
+886DB650 1C630024
+7F441A14 887A0070
+7C7D1B78 8BDF0014
+7FC3F378 7FA4EB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7B1B78 80ADB610
+9B7A0073 3CA0803F
+60A50E09 9B650000
+88650001 98650002
+38600000 7FA4EB78
+7F65DB78 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+48000004 BA810008
+800100B4 382100B0
+7C0803A6 38000000
+60000000 00000000
 0423C710 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8Characters.asm
 0423C320 28030007 #Online/Menus/CSS/TextEntryScreen/Allow8CharactersJapanese.asm
 C223E730 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect.asm
@@ -2659,73 +3478,13 @@ C223E290 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect3.
 618CAE90 7D8903A6
 4E800421 00000000
 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm
-C223B3AC 00000005 #Online/Menus/CSS/TextEntryScreen/HideDescriptionText.asm
-886DAFA3 2C030000
-41820014 3D808023
-618CB3E4 7D8903A6
-4E800420 888DB514
+C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm
+888DAFA3 2C040000
+4182001C 38800057
+88ADAFA0 2C050003
+40820010 38800058
+48000008 7FE4FB78
 60000000 00000000
-C223E994 0000003C #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
-886DAFA3 2C030000
-418201D0 48000084
-4E800021 41880000
-3D883127 C3100000
-42E40000 42FA0000
-C28F0000 3EB33333
-FFCB00FF 456E7465
-7220796F 75722025
-73206162 6F76652E
-00596F75 72206F70
-706F6E65 6E742077
-696C6C20 616C736F
-206E6565 6420746F
-20656E74 65722079
-6F757273 006F7070
-6F6E656E 74277320
-636F6E6E 65637420
-636F6465 00000000
-7C0802A6 90010004
-9421FF50 BE810008
-4BFFFF71 7FE802A6
-38600000 38800000
-3D80803A 618C6754
-7D8903A6 4E800421
-7C7E1B78 38800001
-989E0049 38800000
-989E004A C03F0000
-D03E0008 C03F0004
-D03E0024 D03E0028
-C03F0008 C05F000C
-7FC3F378 389F0020
-38BF0061 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 C03F0008
-C05F0010 7FC3F378
-389F0035 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 C03F0014
-C05F000C 7FC3F378
-389F0061 3D80803A
-618C6B98 7D8903A6
-4E800421 7C641B78
-7FC3F378 C03F0018
-C05F0018 3D80803A
-618C7548 7D8903A6
-4E800421 7FC3F378
-38800002 38BF001C
-3D80803A 618C74F0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-38600000 00000000
 C223E9C8 0000000A #Online/Menus/CSS/TextEntryScreen/KeepPreviousTag.asm
 880DAFA3 2C000000
 38A00000 41820008
@@ -2785,7 +3544,7 @@ C216E9B4 000000B3 #Online/Menus/InGame/InitInGame.asm
 40820580 480000A8
 4E800021 00000000
 3DCCCCCD 43870000
-43420000 3EA8F5C3
+434F0000 3EA8F5C3
 3EA8F5C3 000000FF
 3F1EB852 3F466666
 C1C07AE1 3C6F34D7
@@ -2833,7 +3592,7 @@ BE810008 3C60804D
 39400008 3D80803A
 618C611C 7D8903A6
 4E800421 7C7F1B78
-83CDB61C 93FE0701
+83CDB61C 93FE07BC
 4BFFFE69 7F8802A6
 38600000 3D808000
 618C5610 7D8903A6
@@ -2878,7 +3637,7 @@ D03D0008 C03C003C
 D03D000C D03D0010
 4CC63242 C03C0044
 C05C0044 7FA3EB78
-389A000A 1CB4001F
+389A0034 1CB4001F
 7C842A14 3D80803A
 618C6B98 7D8903A6
 4E800421 7FA3EB78
@@ -2988,25 +3747,27 @@ C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm
 7D8903A6 4E800420
 38600000 986DAFA2
 60000000 00000000
-C22299F0 00000017 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
-2C030008 408200A8
+C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
+2C030008 408200B8
 886DAFA1 2C030000
 41820014 2C030001
-41820038 2C030002
-4182004C 2C040000
-41820070 2C040001
-41820068 2C040002
-41820060 2C040004
-41820058 2C040005
-41820050 48000060
-2C040000 41820044
-2C040003 4182003C
-2C040005 41820034
-48000044 2C040000
-41820028 2C040001
-41820020 2C040002
-41820018 2C040003
-41820010 2C040004
+41820040 2C030002
+41820054 2C040000
+41820080 2C040001
+41820078 2C040002
+41820070 2C040003
+41820068 2C040005
+41820060 2C040006
+41820058 48000068
+2C040000 4182004C
+2C040004 41820044
+2C040006 4182003C
+4800004C 2C040000
+41820030 2C040001
+41820028 2C040002
+41820020 2C040003
+41820018 2C040004
+41820010 2C040005
 41820008 48000018
 38600000 3D808022
 618C99F4 7D8903A6
@@ -3053,7 +3814,7 @@ C34C0000 C31D0000
 BA810008 800100B4
 382100B0 7C0803A6
 B9C10408 00000000
-C21B1040 000000BB #Online/Menus/TitleMenu/OnMenuPrep.asm
+C21B1040 00000172 #Online/Menus/TitleMenu/OnMenuPrep.asm
 7C0802A6 90010004
 9421FF50 BE810008
 480000B5 7C6802A6
@@ -3061,24 +3822,24 @@ C21B1040 000000BB #Online/Menus/TitleMenu/OnMenuPrep.asm
 90640000 3C60803E
 6063B750 48000209
 7C8802A6 90830010
-48000571 7C8802A6
+480005AD 7C8802A6
 38A00010 3D808000
 618C31F4 7D8903A6
 4E800421 3C60803E
-6063B750 48000561
+6063B750 4800059D
 7C8802A6 90830008
 3C60803E 6063B66C
 38800644 B0830004
 480000B1 7C6802A6
 906DB614 3D808000
 618C5618 7D8903A6
-4E800421 7FC802A6
-399E0014 7D8903A6
-4E800421 399E000C
+4E800421 7EA802A6
+39950014 7D8903A6
+4E800421 3995000C
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-4800050C 4E800021
+48000AC4 4E800021
 3D808000 618C5618
 7D8903A6 4E800421
 7FC802A6 38000008
@@ -3127,12 +3888,14 @@ BA810008 800100B4
 4E800020 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
+7C731B78 80730008
+2C030000 40820354
 3C60804A 3BA304F0
 38600004 3D808022
 618C9624 7D8903A6
 4E800421 907D000C
 3BC00000 93DD0008
-546006F7 41820160
+546006F7 4182018C
 38000005 B00DB528
 3BE00001 3B9E0000
 9BFD0011 5783063E
@@ -3147,99 +3910,280 @@ BA810008 800100B4
 3D808016 618C77E8
 7D8903A6 4E800421
 A01D0002 2C000000
-41820030 2C000001
-41820040 2C000002
-41820040 2C000003
-41820040 2C000004
-41820054 2C000005
-41820054 48000258
+41820038 2C000001
+41820048 2C000002
+41820048 2C000003
+41820048 2C000004
+41820048 2C000005
+4182005C 2C000006
+41820078 4800027C
 38600003 3D808002
 618C4030 7D8903A6
-4E800421 48000240
-38600001 4800004C
-38600002 48000044
+4E800421 48000264
+38600001 48000070
+38600002 48000068
+38600003 48000060
 38600001 3D808002
 618C4030 7D8903A6
 4E800421 388000B6
-48000058 388000B7
-48000050 38600001
+48000074 386000BC
+3880007F 38A00040
+3D808002 618C37A8
+7D8903A6 4E800421
+48000275 4800020C
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 388000B8
+48000034 986DAFA0
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 38600008
+3D808022 618C9860
+7D8903A6 4E800421
+480001C0 806DAFC4
+98830000 38800001
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 4800019C
+546006B5 418200D0
+38600000 3D808002
+618C4030 7D8903A6
+4E800421 9BDD0011
+38600005 38000001
+B06DB528 38600003
+889D0000 989D0001
+981D0000 38000002
+B01D0002 3D808022
+618CB3A0 7D8903A6
+4E800421 3D808039
+618C0CD4 7D8903A6
+4E800421 806DC17C
+3D808039 618C0228
+7D8903A6 4E800421
+3C60803F 3863B6B0
+83830024 281C0000
+41820110 38600000
+38800001 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+389C0000 38A00000
+3D808038 618CFD54
+7D8903A6 4E800421
+808DC19C 8803000D
+508026B6 9803000D
+480000C8 546007FF
+41820060 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-388000B8 48000034
-986DAFA0 38600001
+3BE00006 3B9D0002
+A07C0000 28030000
+41820010 3803FFFF
+B01C0000 48000008
+B3FC0000 38600008
+A09C0000 3D808022
+618C9938 7D8903A6
+4E800421 2C030000
+4182FFC8 48000064
+546007BD 4182005C
+38600002 3D808002
+618C4030 7D8903A6
+4E800421 3B9D0002
+A07C0000 28030006
+41820010 38030001
+B01C0000 48000008
+B3DC0000 38600008
+A09C0000 3D808022
+618C9938 7D8903A6
+4E800421 2C030000
+4182FFC8 48000004
+3D808000 618C5618
+7D8903A6 4E800421
+7F6802A6 387B0004
+7C6903A6 4E800421
+387B0008 7C6903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800021
+803EB57C 430C0000
+803EB684 07000000
+4E800021 06450646
+0647064B 06480649
+064A0000 7C0802A6
+90010004 9421FF50
+BE810008 806DB518
+3C80803E 6084FA0C
+3D808038 618C0358
+7D8903A6 4E800421
+7C7A1B78 806DB518
+3C80803E 6084FA24
+3D808038 618C0358
+7D8903A6 4E800421
+7C7B1B78 806DB518
+3C80803E 6084FA40
+3D808038 618C0358
+7D8903A6 4E800421
+7C7C1B78 806DB518
+3C80803E 6084FA60
+3D808038 618C0358
+7D8903A6 4E800421
+7C7D1B78 480004C1
+7FC802A6 C2DE001C
+C2FE0020 3AC00016
+7EC3B378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+7EC4B378 3D808000
+618CC160 7D8903A6
+4E800421 38600000
+98770000 7E639B78
+90770001 92F30008
+38600006 38800007
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C781B78
+7F43D378 3D808037
+618C0E44 7D8903A6
+4E800421 7C791B78
+7F03C378 38800003
+7F25CB78 3D808039
+618C0A70 7D8903A6
+4E800421 7F23CB78
+38810034 38A0000A
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+38800010 3D808037
+618C1D9C 7D8903A6
+4E800421 7F23CB78
+38810034 38A0000B
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+38800010 3D808037
+618C1D9C 7D8903A6
+4E800421 7F23CB78
+7F64DB78 7F85E378
+7FA6EB78 3D808036
+618CFB5C 7D8903A6
+4E800421 7F23CB78
+FC20B090 3D808036
+618CF8BC 7D8903A6
+4E800421 7F23CB78
+38810034 38A00006
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80C060 60840000
+90830038 7F23CB78
+38810034 38A00007
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610034
+3C80405C 60840000
+90830038 7F03C378
+3C808039 60841070
+38A00006 38C00080
+3D808039 618C069C
+7D8903A6 4E800421
+7F03C378 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7F03C378
+48000031 7C8802A6
+38A0000F 3D808038
+618CFD54 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+4E800021 7C0802A6
+90010004 9421FF50
+BE810008 48000281
+7FC802A6 C2DE001C
+C2FE0020 7C781B78
+83380028 8358002C
+8B7A0000 839A0001
+83BA0005 7F23CB78
+3D808037 618C0928
+7D8903A6 4E800421
+2C1D0000 40820070
+38600000 38800001
+C01E0008 C03E0000
+C05E0004 C07E000C
+C09E0010 C0BE0014
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C7D1B78 7C7D1B78
+93BA0005 38000001
+3880013F 7FA3EB78
+C01E0018 D0030024
+D0030028 981D004A
+3D80803A 618C6368
+7D8903A6 4E800421
+480001C0 7F23CB78
+38810034 38A00007
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 FC20B090
+2C1B0000 40820008
+FC20B890 80610034
+3D808036 618CF8BC
+7D8903A6 4E800421
+80610034 3D808037
+618C0928 7D8903A6
+4E800421 7F23CB78
+38810034 38A00006
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 FC20B090
+2C1B0001 40820008
+FC20B890 80610034
+3D808036 618CF8BC
+7D8903A6 4E800421
+80610034 3D808037
+618C0928 7D8903A6
+4E800421 39C00000
+7DC37378 3D80801A
+618C36A0 7D8903A6
+4E800421 2C030040
+4182002C 2C030080
+41820024 2C030001
+4182003C 2C030002
+41820064 39CE0001
+2C0E0004 4180FFC4
+480000C8 38600002
 3D808002 618C4030
 7D8903A6 4E800421
-38600008 3D808022
-618C9860 7D8903A6
-4E800421 480001C0
+6B630001 987A0000
+480000A8 2C1B0001
+4082002C 388000B7
 806DAFC4 98830000
 38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-4800019C 546006B5
-418200D0 38600000
+48000004 38600000
 3D808002 618C4030
 7D8903A6 4E800421
-9BDD0011 38600005
-38000001 B06DB528
-38600003 889D0000
-989D0001 981D0000
-38000002 B01D0002
-3D808022 618CB3A0
+7F23CB78 3D808036
+618CF6B4 7D8903A6
+4E800421 7F03C378
+3D808038 618CFED4
 7D8903A6 4E800421
-3D808039 618C0CD4
-7D8903A6 4E800421
-806DC17C 3D808039
+7F03C378 3D808039
 618C0228 7D8903A6
-4E800421 3C60803F
-3863B6B0 83830024
-281C0000 41820110
-38600000 38800001
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 389C0000
-38A00000 3D808038
-618CFD54 7D8903A6
-4E800421 808DC19C
-8803000D 508026B6
-9803000D 480000C8
-546007FF 41820060
-38600002 3D808002
-618C4030 7D8903A6
-4E800421 3BE00005
-3B9D0002 A07C0000
-28030000 41820010
-3803FFFF B01C0000
-48000008 B3FC0000
-38600008 A09C0000
-3D808022 618C9938
+4E800421 7FA3EB78
+3D80803A 618C5CC4
 7D8903A6 4E800421
-2C030000 4182FFC8
-48000064 546007BD
-4182005C 38600002
-3D808002 618C4030
-7D8903A6 4E800421
-3B9D0002 A07C0000
-28030005 41820010
-38030001 B01C0000
-48000008 B3DC0000
-38600008 A09C0000
-3D808022 618C9938
-7D8903A6 4E800421
-2C030000 4182FFC8
-48000004 3D808000
-618C5618 7D8903A6
-4E800421 7F6802A6
-387B0004 7C6903A6
-4E800421 387B0008
-7C6903A6 4E800421
+3C600000 60630000
+907C0008 48000004
 BA810008 800100B4
 382100B0 7C0803A6
-4E800021 803EB57C
-430C0000 803EB684
-06000000 4E800021
-06450646 06470648
-0649064A 3C60804A
+4E800020 4E800021
+C0B00000 C0333333
+41100000 41B80000
+437A0000 41A00000
+3D4CCCCD 00000000
+3F800000 3C60804A
 60000000 00000000
 C222D88C 00000008 #Online/Menus/TitleMenu/OnlineModeOptionSelected.asm
 40820038 38600001
@@ -3257,46 +4201,58 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm
 41820014 3D808017
 618CBEC8 7D8903A6
 4E800421 00000000
-C2186EC4 00000056 #Online/Menus/VSScreen/InitVsSplash.asm
+C2186EC4 00000078 #Online/Menus/VSScreen/InitVsSplash.asm
 3C608048 80639D30
 5463443E 2C030408
-40820294 4800004C
+408203A4 48000060
 4E800021 00000000
 3F800000 3F000000
 3F19999A F15959FF
-6565FEFF 42700000
-43C80000 436E0000
-42700000 43DC0000
-41F00000 43200000
-43960000 41B00000
-50310050 32000000
-7C0802A6 90010004
-9421FF50 BE810008
-38600000 3C80803F
-608411A4 3CA0803F
-60A51194 3D80803A
-618C62A0 7D8903A6
-4E800421 38600000
-3D808000 618C5610
+6565FEFF FFFFFFFF
+42700000 43C80000
+436E0000 42820000
+43DC0000 41F00000
+43200000 43960000
+41B00000 41B00000
+5465616D 20310054
+65616D20 32005031
+00503200 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+3C80803F 608411A4
+3CA0803F 60A51194
+3D80803A 618C62A0
 7D8903A6 4E800421
-7C7D1B78 4BFFFF6D
-7FE802A6 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7E1B78
-38800001 989E0049
-38800000 989E004A
-C03F0000 D03E0008
-C03F0004 D03E0024
-D03E0028 387F0010
-389F003C 38BD000A
-C03F0018 480000D1
-387F0014 389F003F
-38BD0029 C03F001C
-480000BD 38600000
-38800000 C03F0020
-C05F0028 C07F002C
-C09F0030 C0BF0034
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7D1B78
+4BFFFF59 7FE802A6
+38600000 38800000
+3D80803A 618C6754
+7D8903A6 4E800421
+7C7E1B78 38800001
+989E0049 38800000
+989E004A C03F0000
+D03E0008 C03F0004
+D03E0024 D03E0028
+887D0210 2C030001
+41820038 387F0010
+389F0052 38BD0034
+38C00000 C03F001C
+4800010D 387F0014
+389F0055 38BD0053
+38C00000 C03F0020
+480000F5 48000038
+807D000D 480001F1
+387F0010 389F0044
+C03F001C 480000D9
+807D0011 480001D9
+387F0014 389F004B
+C03F0020 480000C1
+48000004 38600000
+38800000 C03F0024
+C05F002C C07F0030
+C09F0034 C0BF0038
 3D80803A 618C5ACC
 7D8903A6 4E800421
 7C7E1B78 C03F0004
@@ -3304,7 +4260,7 @@ D03E0024 D03E0028
 38800001 989E004A
 989E0049 C03F0000
 D03E0008 3CA0803B
-60A57808 A0DD0166
+60A57808 A0DD0216
 38600000 1C830002
 7C85222E 7C043000
 41820014 38630001
@@ -3316,30 +4272,52 @@ D03E0008 3CA0803B
 7D8903A6 4E800421
 BA810008 800100B4
 382100B0 7C0803A6
-480000D4 7C0802A6
+48000184 7C0802A6
 90010004 9421FF50
-BE810008 D0210080
-7C7D1B78 7CBC2B78
-C05F0024 7FC3F378
-3D80803A 618C6B98
+BE810008 FFE00890
+7C761B78 7C942378
+7CB92B78 7CDA3378
+7CF83B78 7D174378
+93210008 9301000C
+92E10010 C3DF0028
+C07F0040 7F43D378
+3D808000 618C55F4
 7D8903A6 4E800421
-7C7B1B78 7FC3F378
-7F64DB78 C03F0008
-C05F0008 3D80803A
-618C7548 7D8903A6
-4E800421 7FC3F378
-7F64DB78 7FA5EB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-C0210080 C05F0024
-C07F0038 EC42182A
-7FC3F378 7F84E378
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C641B78 7FC3F378
+EC630072 EFDE1828
+7FC3F378 389F0018
+7EC4B378 38A00000
+7E87A378 C03F0008
+C05F0008 FC60F890
+FC80F090 3D808000
+618C56B4 7D8903A6
+4E800421 39C00008
+39E00000 7C6E0A14
+80E30000 2C0F0000
+4182000C C07F003C
+EFFF182A C09F0040
+EFDE202A 7FC3F378
+389F0018 38A00000
 C03F000C C05F000C
-3D80803A 618C7548
+FC60F890 FC80F090
+3D808000 618C56B4
 7D8903A6 4E800421
+39CE0004 39EF0001
+7C0FD000 4180FFA8
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 38A00008
+38C000FF 7C7A3039
+7C632C30 38E00008
+39200000 7C643039
+1C84001F 38840034
+7C84EA14 7D070A14
+90880000 7C632C30
+38E70004 39290001
+2C090003 4180FFD8
+7F46D378 80A10010
+80E1000C 81010008
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 3800FFFF
@@ -3353,7 +4331,7 @@ BE810008 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 887F0004
-1C630024 389F01B8
+1C630024 389F0268
 7FC418AE 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
@@ -3424,17 +4402,17 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 00000128 #Online/Slippi Online Scene/main.asm
+C21A45B8 00000163 #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF50
 BE810008 3C80803E
-6084DC1C 480001F5
+6084DC1C 4800020D
 7C6802A6 38630000
 90640008 38600000
 986DAFA3 986DAFC8
-38600008 48000155
+38600008 4800016D
 7C8802A6 4800002D
-480008D8 80830000
+48000AB4 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -3444,7 +4422,7 @@ BE810008 3C80803E
 7C7F1B78 7C9E2378
 3C80803D 6084AD30
 48000081 7C6802A6
-90640004 480000BD
+90640004 480000D5
 7C6802A6 90640008
 38600001 98640000
 3C60803D 6063ACA4
@@ -3463,9 +4441,12 @@ BE810008 3C80803E
 90010004 9421FF50
 BE810008 3C808045
 6084ABF0 886DAEF8
-98640006 38600013
-3C80803F 60840CC8
-98640001 BA810008
+98640006 3D808000
+618C56B8 7D8903A6
+4E800421 7C641B78
+3860000F 1C63001C
+7C832214 38600013
+986400DD BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 4E800021 7C0802A6
@@ -3479,16 +4460,16 @@ BE810008 38600012
 48000081 480000F5
 08000000 80497758
 80497758 01030000
-480001AD 480001DD
+480001B5 480001E5
 09000000 80480668
 80480668 02030000
-801B1588 48000275
+801B1588 4800027D
 02000000 80480530
 80479D98 03030000
 00000000 00000000
 05000000 00000000
 00000000 04030000
-4800039D 4800051D
+48000411 480006E1
 20000000 80490880
 804D68D0 FF000000
 4E800021 81940000
@@ -3513,9 +4494,10 @@ BE810008 38600012
 618CAAD0 7D8903A6
 4E800421 809E0014
 88840003 2C040002
-40820008 48000084
+40820008 4800008C
 886DAFA0 2C030001
-41820014 2C030002
+4182001C 2C030002
+4182001C 2C030003
 41820014 2C030000
 41820008 48000038
 48000034 886DAFC9
@@ -3524,7 +4506,7 @@ BE810008 38600012
 4182001C 2C030000
 40820000 886DAFCA
 2C030000 41820020
-48000004 48000431
+48000004 480005ED
 3C808047 60849D30
 38600005 98640005
 48000018 3C808047
@@ -3552,7 +4534,7 @@ BE810008 3D80801B
 7D8903A6 4E800421
 7C7E1B78 887E0001
 889E0002 7C032000
-4082001C 48000351
+4082001C 4800050D
 3C808047 60849D30
 38600005 98640005
 4800001C 38600000
@@ -3568,59 +4550,114 @@ BE810008 3D80801B
 38600000 3D808000
 618C5610 7D8903A6
 4E800421 7C7F1B78
-3A800000 3AA00000
-7E83A378 480003A1
-2C030000 41820008
-3AB50001 3A940001
-2C140004 4180FFE4
-2C150001 4082001C
-887F0003 48000379
-2C030000 4182000C
-38600001 48000008
-38600000 986DAFC9
-38600000 986DAFCA
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7E1B78
-386000BC 987E0000
-7FC3F378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FC3F378
-38800004 38A00000
+887F0003 48000565
+986DAFC9 886DAFA0
+2C030003 40820020
+887F0003 38800001
+2C030000 40820008
+38800000 988DAFC9
+4800003C 3A800000
+3AA00000 7E83A378
+48000529 2C030000
+41820008 3AB50001
+3A940001 2C140004
+4180FFE4 2C150001
+4182000C 38600000
+986DAFC9 3E808047
+62949DA4 887F0003
+480004F1 2C030000
+41820018 38600001
+98740000 38600000
+9874005D 48000014
+38600000 98740000
+38600001 9874005D
+886DAFA0 2C030003
+4082000C 38600000
+98740004 38600000
+986DAFCA 38600004
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7E1B78 386000BC
+987E0000 7FC3F378
+38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-3C80804D 807E0000
-90645F90 7FC3F378
+7FC3F378 38800004
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 3C80804D
+807E0000 90645F90
+7FC3F378 3D808037
+618CF1B0 7D8903A6
+4E800421 3C808047
+60849D30 38600001
+98640005 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
-3C808047 60849D30
-38600001 98640005
-7FE3FB78 3D808037
-618CF1B0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 01780101
-01FF2121 FF2121EE
-0000EE00 7C0802A6
-90010004 9421FF50
-BE810008 83ED8840
-3BFF0598 3C608049
-60630888 4BFFFFCD
-7C8802A6 38A00010
-3D808000 618C31F4
-7D8903A6 4E800421
-3C808049 60840888
-887F0060 98640005
-887F0063 9864000B
-887F0084 98640008
-887F0087 9864000E
-3C808043 60842078
-887F0060 90640014
-887F0063 98640018
-887F0084 9064001C
-887F0087 98640020
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+01780101 01FF2121
+FF2121EE 0000EE00
+7C0802A6 90010004
+9421FF50 BE810008
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7E1B78
+83ED8840 3BFF0598
+3C608049 60630888
+4BFFFFB5 7C8802A6
+38A00010 3D808000
+618C31F4 7D8903A6
+4E800421 3C808049
+60840888 887F0060
+98640005 887F0063
+9864000B 887F0084
+98640008 887F0087
+9864000E 38600000
+9864FFFF 9864FFFB
+887E0210 2C030000
+418200F4 887E0003
+1C630024 38630271
+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 887E0210
+2C030000 41820024
+887F00A8 90640024
+887F00AB 98640028
+887F00CC 9064002C
+887F00CF 98640030
 A07F000E 9064000C
 3D808001 618C8254
 7D8903A6 4E800421
@@ -3629,103 +4666,197 @@ A07F000E 9064000C
 4E800421 38600004
 3D808001 618C7700
 7D8903A6 4E800421
-3A800000 1C140024
-7FF7FB78 7EF70214
-3AA00000 3AC00000
-88770060 7C630774
-3D808002 618C6E84
+3860001C 3D808002
+618C6F2C 7D8903A6
+4E800421 3A800000
+1C140024 7FF5FB78
+7EB50214 88750060
+7C630774 2C030021
+41820024 3C80803B
+6084B3C0 1C630010
+7C6320AE 3D808000
+618C56A8 7D8903A6
+4E800421 3A940001
+2C140006 3AB50024
+4180FFC4 A07F000E
+3D808022 618C519C
 7D8903A6 4E800421
-3A940001 2C140006
-7ED62378 7EB51B78
-3AF70024 4180FFD4
-A07F000E 3D808002
-618C6EBC 7D8903A6
-4E800421 7C75AB78
-7C96B378 3860001C
-3D808002 618C6F2C
+3C80803B 6084B6B0
+1C630003 7C6320AE
+3D808000 618C56A8
 7D8903A6 4E800421
-38D60000 38B50000
-3860000C 3D808002
-618C702C 7D8903A6
-4E800421 3D808002
-618C7168 7D8903A6
+3D808002 618C7168
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 3C808047
+60849D30 38600003
+98640005 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+38600000 3D808000
+618C5610 7D8903A6
+4E800421 7C7F1B78
+83CD8840 3BDE0598
+7FC3F378 389F0208
+38A00138 3D808000
+618C31F4 7D8903A6
+4E800421 3D808017
+618CEB30 7D8903A6
+4E800421 889F0268
+98830000 889F026B
+98830001 38800000
+98830002 38800003
+98830005 38800078
+98830004 3C80803D
+6084DEC8 8084000C
+887F028C 98640002
+38602121 B0640003
+3C808049 60840880
+887F028F 98640016
+7FE3FB78 3D808037
+618CF1B0 7D8903A6
 4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-3C808047 60849D30
-38600003 98640005
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 38600000
-3D808000 618C5610
-7D8903A6 4E800421
-7C7F1B78 83CD8840
-3BDE0598 7FC3F378
-389F0158 38A00138
-3D808000 618C31F4
-7D8903A6 4E800421
-3D808017 618CEB30
-7D8903A6 4E800421
-889F01B8 98830000
-889F01BB 98830001
-38800000 98830002
-38800003 98830005
-38800078 98830004
-3C80803D 6084DEC8
-8084000C 887F01DC
-98640002 38602121
-B0640003 3C808049
-60840880 887F01DF
-98640016 7FE3FB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 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
+7C7D1B78 3FE08047
+63FF9DA4 1FDD00A8
+7FDEFA14 887F0004
+2C030000 418200B0
+3C608046 6063B6A0
+886324D0 889F0006
+7C032000 40820098
+887E0058 2C030003
+4182008C 887F0004
+2C030007 40820040
 887F0006 2C030001
-40820028 7FE3FB78
-3D808016 618C54A0
+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
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 38600028
+987E0000 00000000
+C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+7CBD2B78 7CDC3378
+3D808000 618C56B8
 7D8903A6 4E800421
-889E005F 7C032000
-41820020 48000014
-887E005D 2C030000
-41820010 48000004
-38600000 48000008
-38600001 BA810008
+7C651B78 1C7F0024
+3C80803F 60840A48
+7C832214 886403C2
+1C63001C 7C832A14
+8BC400DC 1CBD001E
+7C9E2A14 7FE3FB78
+7F85E378 3D808025
+618CD5AC 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C20056AC 00000035 #Online/Static/ChatMessages.asm
+7CA802A6 2C030008
+4182001C 2C030004
+41820020 2C030002
+41820024 2C030001
+41820028 480000A9
+7C6802A6 48000024
+4800012D 7C6802A6
+48000018 480000FD
+7C6802A6 4800000C
+480000B1 7C6802A6
+88E30000 89030001
+89230002 89430003
+2C040008 4182001C
+2C040004 41820044
+2C040002 41820028
+2C040001 41820010
+38830004 7C843A14
+4800003C 38830004
+7C843A14 7C844214
+4800002C 38830004
+7C843A14 7C844214
+7C844A14 48000018
+38830004 7C843A14
+7C844214 7C844A14
+7C845214 7CA903A6
+4E800420 4E800021
+07040904 436F6D6D
+6F6E0067 6773006F
+6E65206D 6F726500
+62726200 676F6F64
+206C7563 6B000000
+4E800021 0C0C0D07
+436F6D70 6C696D65
+6E747300 77656C6C
+20706C61 79656400
+74686174 20776173
+2066756E 00746861
+6E6B7300 746F6F20
+676F6F64 00000000
+4E800021 0A040504
+52656163 74696F6E
+73006F6F 66006D79
+2062006C 6F6C0077
+6F770000 4E800021
+05050917 4D697363
+006F6B61 79007468
+696E6B69 6E67006C
+65742773 20706C61
+79206167 61696E20
+6C617465 72006261
+6420636F 6E6E6563
+74696F6E 00000000
+60000000 00000000
+C20056B8 00000002 #Online/Static/GetCSSIconData.asm
+3C60803F 60630A48
+4E800020 00000000
+C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+7FC3F378 2C1F0003
+41820028 2C1F0002
+4182000C 2C1F0001
+4182002C 3D808016
+618C92BC 7D8903A6
+4E800421 48000028
+3D808016 618C9290
+7D8903A6 4E800421
+48000014 3D808016
+618C9264 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-BA810008 800100B4
-382100B0 7C0803A6
-38600028 987E0000
 60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 2C030000 40820018
-38600290 3D808037
+38600340 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
 386000B3 987F0000
@@ -3733,7 +4864,7 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 7FE3FB78
-38800290 38A00000
+38800340 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
 7FE3FB78 BA810008
@@ -3763,6 +4894,12 @@ C200560C 00000016 #Online/Static/LoadState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20056A8 00000005 #Online/Static/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3936,14 +5073,6 @@ BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
 043775B8 A0190000 #Online/Logging/LogInputOnCopy.asm
-
-$Recommended: Normal Lag Reduction [Hannes Mann]
-*Reduces input lag
-043761EC 4800001C
-04376238 48000018
-
-$Recommended: Polling drift fix + VB [Dan Salvato, tauKhan]
-*Synchronizes polling rate with FPS.
 041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
 0401985C 3C60804C
 04019860 91231F5C
@@ -3959,8 +5088,13 @@ C21A5018 00000005
 4D820420 00000000
 04218D68 C8228000
 
+$Recommended: Normal Lag Reduction [Hannes Mann]
+*Reduces input lag
+043761EC 4800001C
+04376238 48000018
+
 $Optional: Widescreen 16:9 [Dan Salvato, mirrorbender, Achilles1515, UnclePunch]
-*Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ---------------------- 
+*Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors ----------------------
 *Will not cause desyncs when playing online
 043BB05C 3EB00000 #External/Widescreen/Fix Screen Flash.asm
 C236A4A8 00000006 #External/Widescreen/Overwrite CObj Values.asm
@@ -3987,17 +5121,17 @@ C0030000 4800000C
 044DDB84 3E89FEFA #External/Widescreen/Nametag Fixes/Adjust Nametag Text X Scale.asm
 
 $Optional: Disable Screen Shake [Achilles1515]
-*Will prevent screen from shaking on hits, KOs, collisions, etc ----------------------- 
+*Will prevent screen from shaking on hits, KOs, collisions, etc -----------------------
 *Will not cause desyncs when playing online
 04030E44 4E800020
 
 $Optional: Center Align 2P HUD [UnclePunch]
-*When playing online, character %'s will always be centered ------------------------- 
+*When playing online, character %'s will always be centered -------------------------
 *Will not cause desyncs when playing online
 0416E9AC 38600002
 
 $Optional: Flash Red on Failed L-Cancel [Achilles1515, Fizzi]
-*When playing online, this will only affect your character --------------------------- 
+*When playing online, this will only affect your character ---------------------------
 *Will not cause desyncs when playing online
 C20C0148 0000000C #External/FlashRedFailedLCancel/ChangeColor.asm
 387F0488 89FE0564
diff --git a/Data/Sys/bootloader.gct b/Data/Sys/bootloader.gct
new file mode 100644
index 0000000000..a46c729ff0
Binary files /dev/null and b/Data/Sys/bootloader.gct differ
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index aaf7716ed7..a041c07f05 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -128,6 +128,7 @@
 #define WII_SETTING "setting.txt"
 
 #define GECKO_CODE_HANDLER "codehandler.bin"
+#define GCT_BOOTLOADER "bootloader.gct"
 
 // Subdirs in Sys
 #define GC_SYS_DIR "GC"
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 2c069dfca6..2e5e5dfb43 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -26,13 +26,13 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <ShlObj.h>
 #include <Shlwapi.h>
 #include <commdlg.h>  // for GetSaveFileName
 #include <direct.h>   // getcwd
 #include <io.h>
 #include <objbase.h>  // guid stuff
 #include <shellapi.h>
-#include <ShlObj.h>
 #include <winerror.h>
 #else
 #include <dirent.h>
@@ -791,21 +791,22 @@ std::string GetExePath()
   return dolphin_path;
 }
 
-// SLIPPITODO: refactor with c++17 std::filesystem?
 std::string GetHomeDirectory()
 {
   std::string homeDir;
 #ifdef _WIN32
   wchar_t* path = nullptr;
 
-  if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, nullptr, &path))) {
+  if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, nullptr, &path)))
+  {
     char pathStr[MAX_PATH];
     wcstombs(pathStr, path, MAX_PATH);
 
     homeDir = std::string(pathStr);
     CoTaskMemFree(path);
   }
-  else {
+  else
+  {
     const char* home = getenv("USERPROFILE");
     homeDir = std::string(home) + "\\Documents";
   }
@@ -853,13 +854,15 @@ std::string GetSysDirectory()
   ASSERT_MSG(COMMON, !sysDir.empty(), "Sys directory has not been set");
 #else
   const char* home = getenv("HOME");
-  if (!home) home = getenv("PWD");
-  if (!home) home = "";
+  if (!home)
+    home = getenv("PWD");
+  if (!home)
+    home = "";
   std::string home_path = std::string(home) + DIR_SEP;
   const char* config_home = getenv("XDG_CONFIG_HOME");
-  sysDir = std::string(config_home && config_home[0] == '/'
-    ? config_home : (home_path + ".config"))
-    + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP "Sys" DIR_SEP;
+  sysDir =
+      std::string(config_home && config_home[0] == '/' ? config_home : (home_path + ".config")) +
+      DIR_SEP DOLPHIN_DATA_DIR DIR_SEP "Sys" DIR_SEP;
 #endif
 
   INFO_LOG_FMT(COMMON, "GetSysDirectory: Setting to {}:", sysDir);
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 6a8a4461f8..0adde651bf 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -41,6 +41,7 @@ namespace fs = std::filesystem;
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/GeckoCode.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
@@ -537,6 +538,7 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> boot)
 
   PatchEngine::LoadPatches();
   HLE::PatchFixedFunctions();
+  Gecko::RunCodeHandler();
   return true;
 }
 
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 0cebb583bd..592c6a6ad0 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -51,6 +51,7 @@
 #include "VideoCommon/HiresTextures.h"
 
 #include "DiscIO/Enums.h"
+#include "DiscIO/Filesystem.h"
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeWad.h"
 
@@ -959,7 +960,32 @@ bool SConfig::SetPathsAndGameMetadata(const BootParameters& boot)
   const std::string region_dir = GetDirectoryForRegion(ToGameCubeRegion(m_region));
   m_strSRAM = File::GetUserPath(F_GCSRAM_IDX);
   m_strBootROM = GetBootROMPath(region_dir);
-  m_strIsoPath = (boot.parameters.index() == 0) ? std::get<BootParameters::Disc>(boot.parameters).path : "";
+  m_strIsoPath =
+      (boot.parameters.index() == 0) ? std::get<BootParameters::Disc>(boot.parameters).path : "";
+
+  std::shared_ptr<DiscIO::Volume> volume = DiscIO::CreateVolume(m_strIsoPath);
+
+  if (m_game_id == "GALE01" || m_game_id == "GALJ01")
+  {
+    m_melee_version = Melee::Version::NTSC;
+
+    if (volume->GetLongNames()[DiscIO::Language::English].find("20XX") != std::string::npos)
+      m_melee_version = Melee::Version::TwentyXX;
+    else
+    {
+      // check for m-ex based build
+      if (volume->FileExists("MxDt.dat"))
+      {
+        m_melee_version = Melee::Version::MEX;
+      }
+    }
+  }
+  else if (m_game_id == "GTME01")
+  {
+    m_melee_version = Melee::Version::UPTM;
+  }
+
+  INFO_LOG_FMT(BOOT, "Melee Version: {}", m_melee_version);
 
   return true;
 }
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
index 4c031c805d..5d7d5a2b88 100644
--- a/Source/Core/Core/ConfigManager.h
+++ b/Source/Core/Core/ConfigManager.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <future>
 #include <limits>
 #include <optional>
 #include <set>
@@ -45,6 +46,18 @@ namespace SerialInterface
 enum SIDevices : int;
 }  // namespace SerialInterface
 
+namespace Melee
+{
+enum class Version
+{
+  NTSC,
+  TwentyXX,
+  UPTM,
+  MEX,
+  OTHER,
+};
+}
+
 struct BootParameters;
 
 // DSP Backend Types
@@ -67,6 +80,8 @@ enum class GPUDeterminismMode
 
 struct SConfig
 {
+  // Melee Version
+  Melee::Version m_melee_version;
   // Wii Devices
   bool m_WiiSDCard;
   bool m_WiiKeyboard;
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
index 3296af2daa..f9de54bb22 100644
--- a/Source/Core/Core/GeckoCode.cpp
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -19,6 +19,8 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 
+#include "VideoCommon/OnScreenDisplay.h"
+
 namespace Gecko
 {
 static constexpr u32 CODE_SIZE = 8;
@@ -68,6 +70,8 @@ void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
 {
   std::lock_guard<std::mutex> lk(s_active_codes_lock);
 
+  DEBUG_LOG_FMT(ACTIONREPLAY, "Setting up active codes...");
+
   s_active_codes.clear();
   if (SConfig::GetInstance().bEnableCheats)
   {
@@ -153,69 +157,84 @@ static Installation InstallCodeHandlerLocked()
     }
   }
 
-  u32 codelist_base_address;
-  u32 codelist_end_address;
-  // Let the Gecko codehandler use free space from Melee's tournament mode region
-  if (SConfig::GetInstance().GetGameID() == "GALE01")
+  u32 codelist_base_address = INSTALLER_BASE_ADDRESS + static_cast<u32>(data.length()) - CODE_SIZE;
+  u32 codelist_end_address = INSTALLER_END_ADDRESS;
+
+  // Write a magic value to 'gameid' (codehandleronly does not actually read this).
+  PowerPC::HostWrite_U32(MAGIC_GAMEID, INSTALLER_BASE_ADDRESS);
+
+  // Install the custom bootloader to write gecko codes to the heaps
+  if (SConfig::GetInstance().m_melee_version == Melee::Version::NTSC ||
+      SConfig::GetInstance().m_melee_version == Melee::Version::MEX)
   {
-    INFO_LOG(ACTIONREPLAY,
-      "Detected GALE01 - using tournament mode region for Gecko codelist");
+    // Write GCT loader into memory which will eventually load the real GCT into the heap
+    std::string bootloaderData;
+    std::string _bootloaderFilename = File::GetSysDirectory() + GCT_BOOTLOADER;
+    if (!File::ReadFileToString(_bootloaderFilename, bootloaderData))
+    {
+      OSD::AddMessage("bootloader.gct not found in Sys folder.", 30000, 0xFFFF0000);
+      ERROR_LOG_FMT(ACTIONREPLAY, "Could not enable cheats because bootloader.gct was missing.");
+      return Installation::Failed;
+    }
 
-    // Set codelist base to the tournament mode region
-    codelist_base_address = 0x801910E0;
-    codelist_end_address = 0x8019AF4C;
+    if (bootloaderData.length() > codelist_end_address - codelist_base_address)
+    {
+      OSD::AddMessage("Gecko bootloader too large.", 30000, 0xFFFF0000);
+      ERROR_LOG_FMT(SLIPPI, "Gecko bootloader too large");
+      return Installation::Failed;
+    }
 
-    // Patch codehandler to use tournament mode region
-    PowerPC::HostWrite_U32(0x3DE08019, 0x80001904); // lis r15, 0x8019
-    PowerPC::HostWrite_U32(0x61EF10E0, 0x80001908); // ori r15, r15, 0x10e0
+    // Install bootloader gct
+    for (size_t i = 0; i < bootloaderData.length(); ++i)
+      PowerPC::HostWrite_U8(bootloaderData[i], static_cast<u32>(codelist_base_address + i));
   }
   else
   {
-    codelist_base_address = INSTALLER_BASE_ADDRESS + static_cast<u32>(data.size()) - CODE_SIZE;
-    codelist_end_address = INSTALLER_END_ADDRESS;
-  }
+    // Create GCT in memory
+    PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address);
+    PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address + 4);
 
-  // Write a magic value to 'gameid' (codehandleronly does not actually read this).
-  // This value will be read back and modified over time by HLE_Misc::GeckoCodeHandlerICacheFlush.
-  PowerPC::HostWrite_U32(MAGIC_GAMEID, INSTALLER_BASE_ADDRESS);
+    // Each code is 8 bytes (2 words) wide. There is a starter code and an end code.
+    const u32 start_address = codelist_base_address + CODE_SIZE;
+    const u32 end_address = codelist_end_address - CODE_SIZE;
+    u32 next_address = start_address;
 
-  // Create GCT in memory
-  PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address);
-  PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address + 4);
-
-  // Each code is 8 bytes (2 words) wide. There is a starter code and an end code.
-  const u32 start_address = codelist_base_address + CODE_SIZE;
-  const u32 end_address = codelist_end_address - CODE_SIZE;
-  u32 next_address = start_address;
-
-  // NOTE: Only active codes are in the list
-  for (const GeckoCode& active_code : s_active_codes)
-  {
-    // If the code is not going to fit in the space we have left then we have to skip it
-    if (next_address + active_code.codes.size() * CODE_SIZE > end_address)
+    // NOTE: Only active codes are in the list
+    for (const GeckoCode& active_code : s_active_codes)
     {
-      NOTICE_LOG_FMT(ACTIONREPLAY,
-                     "Too many GeckoCodes! Ran out of storage space in Game RAM. Could "
-                     "not write: \"{}\". Need {} bytes, only {} remain.",
-                     active_code.name, active_code.codes.size() * CODE_SIZE,
-                     end_address - next_address);
-      continue;
+      // If the code is not going to fit in the space we have left then we have to skip it
+      if (next_address + active_code.codes.size() * CODE_SIZE > end_address)
+      {
+        OSD::AddMessage(
+            fmt::format("Ran out of memory applying gecko codes. Too many codes enabled. "
+                        "Need {} bytes, only {} remain.",
+                        active_code.codes.size() * CODE_SIZE, end_address - next_address),
+            30000, 0xFFFF0000);
+        NOTICE_LOG_FMT(ACTIONREPLAY,
+                       "Too many GeckoCodes! Ran out of storage space in Game RAM. Could "
+                       "not write: \"{}\". Need {} bytes, only {} remain.",
+                       active_code.name, active_code.codes.size() * CODE_SIZE,
+                       end_address - next_address);
+        continue;
+      }
+
+      for (const GeckoCode::Code& code : active_code.codes)
+      {
+        PowerPC::HostWrite_U32(code.address, next_address);
+        PowerPC::HostWrite_U32(code.data, next_address + 4);
+        next_address += CODE_SIZE;
+      }
     }
 
-    for (const GeckoCode::Code& code : active_code.codes)
-    {
-      PowerPC::HostWrite_U32(code.address, next_address);
-      PowerPC::HostWrite_U32(code.data, next_address + 4);
-      next_address += CODE_SIZE;
-    }
+    WARN_LOG_FMT(ACTIONREPLAY, "GeckoCodes: Using {} of {} bytes", next_address - start_address,
+                 end_address - start_address);
+
+    // Stop code. Tells the handler that this is the end of the list.
+    PowerPC::HostWrite_U32(0xF0000000, next_address);
+    PowerPC::HostWrite_U32(0x00000000, next_address + 4);
   }
 
-  WARN_LOG_FMT(ACTIONREPLAY, "GeckoCodes: Using {} of {} bytes", next_address - start_address,
-               end_address - start_address);
-
-  // Stop code. Tells the handler that this is the end of the list.
-  PowerPC::HostWrite_U32(0xF0000000, next_address);
-  PowerPC::HostWrite_U32(0x00000000, next_address + 4);
+  // Write 0 to trampoline address, not sure why this is necessary
   PowerPC::HostWrite_U32(0, HLE_TRAMPOLINE_ADDRESS);
 
   // Turn on codes
@@ -226,6 +245,7 @@ static Installation InstallCodeHandlerLocked()
   {
     PowerPC::ppcState.iCache.Invalidate(INSTALLER_BASE_ADDRESS + j);
   }
+
   return Installation::Installed;
 }
 
@@ -296,10 +316,73 @@ void RunCodeHandler()
   }
   DEBUG_LOG_FMT(ACTIONREPLAY,
                 "GeckoCodes: Initiating phantom branch-and-link. "
-                "PC = {:#010x}, SP = {:#010x}, SFP = {:#010x}",
+                "PC = {:#010x}, SP = {:#010x}, SFP = {:#010x}\n",
                 PC, SP, SFP);
   LR = HLE_TRAMPOLINE_ADDRESS;
   PC = NPC = ENTRY_POINT;
 }
 
+u32 GetGctLength()
+{
+  std::lock_guard<std::mutex> lk(s_active_codes_lock);
+
+  int i = 0;
+
+  for (const GeckoCode& active_code : s_active_codes)
+  {
+    if (active_code.enabled)
+    {
+      i += 8 * static_cast<int>(active_code.codes.size());
+    }
+  }
+
+  return i + 0x10;  // 0x10 is the fixed size of the header and terminator
+}
+
+std::vector<u8> uint32ToVector(u32 num)
+{
+  u8 byte0 = num >> 24;
+  u8 byte1 = (num & 0xFF0000) >> 16;
+  u8 byte2 = (num & 0xFF00) >> 8;
+  u8 byte3 = num & 0xFF;
+
+  return std::vector<u8>({byte0, byte1, byte2, byte3});
+}
+
+void appendWordToBuffer(std::vector<u8>* buf, u32 word)
+{
+  auto wordVector = uint32ToVector(word);
+  buf->insert(buf->end(), wordVector.begin(), wordVector.end());
+}
+
+std::vector<u8> GenerateGct()
+{
+  std::vector<u8> res;
+
+  // Write header
+  appendWordToBuffer(&res, 0x00d0c0de);
+  appendWordToBuffer(&res, 0x00d0c0de);
+
+  std::lock_guard<std::mutex> lk(s_active_codes_lock);
+
+  // Write codes
+  for (const GeckoCode& active_code : s_active_codes)
+  {
+    if (active_code.enabled)
+    {
+      for (const GeckoCode::Code& code : active_code.codes)
+      {
+        appendWordToBuffer(&res, code.address);
+        appendWordToBuffer(&res, code.data);
+      }
+    }
+  }
+
+  // Write footer
+  appendWordToBuffer(&res, 0xff000000);
+  appendWordToBuffer(&res, 0x00000000);
+
+  return res;
+}
+
 }  // namespace Gecko
diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h
index 9c6c7c7a14..9f80ba8951 100644
--- a/Source/Core/Core/GeckoCode.h
+++ b/Source/Core/Core/GeckoCode.h
@@ -66,4 +66,7 @@ void RunCodeHandler();
 void Shutdown();
 void DoState(PointerWrap&);
 
+u32 GetGctLength();
+std::vector<u8> GenerateGct();
+
 }  // namespace Gecko
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
index e4639b6b20..544465f277 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
@@ -20,11 +20,13 @@
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/GeckoCode.h"
 #include "Core/HW/EXI/EXI_DeviceSlippi.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/Host.h"
 #include "Core/NetPlayClient.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/Slippi/SlippiPlayback.h"
 #include "Core/Slippi/SlippiReplayComm.h"
 #include "Core/State.h"
@@ -95,6 +97,18 @@ void appendHalfToBuffer(std::vector<u8>* buf, u16 word)
   buf->insert(buf->end(), halfVector.begin(), halfVector.end());
 }
 
+std::string ConvertConnectCodeForGame(const std::string& input)
+{
+  // Shift-Jis '#' symbol is two bytes (0x8194), followed by 0x00 null terminator
+  char fullWidthShiftJisHashtag[] = {-127, -108, 0};  // 0x81, 0x94, 0x00
+  std::string connectCode(input);
+  // SLIPPITODO：Not the best use of ReplaceAll. potential bug if more than one '#' found.
+  connectCode = ReplaceAll(connectCode, "#", std::string(fullWidthShiftJisHashtag));
+  connectCode.resize(CONNECT_CODE_LENGTH +
+                     2);  // fixed length + full width (two byte) hashtag +1, null terminator +1
+  return connectCode;
+}
+
 CEXISlippi::CEXISlippi()
 {
   INFO_LOG(SLIPPI, "EXI SLIPPI Constructor called.");
@@ -1484,8 +1498,7 @@ bool CEXISlippi::isDisconnected()
     return true;
 
   auto status = slippi_netplay->GetSlippiConnectStatus();
-  return status != SlippiNetplayClient::SlippiConnectStatus::NET_CONNECT_STATUS_CONNECTED ||
-         isConnectionStalled;
+  return status != SlippiNetplayClient::SlippiConnectStatus::NET_CONNECT_STATUS_CONNECTED;
 }
 
 static int tempTestCount = 0;
@@ -2100,16 +2113,6 @@ void CEXISlippi::prepareOnlineMatchState()
       // Set p3/p4 player type to human
       onlineMatchBlock[0x61 + 2 * 0x24] = 0;
       onlineMatchBlock[0x61 + 3 * 0x24] = 0;
-
-      // Set alt color to light/dark costume for multiples of the same character on a team
-      int characterCount[26][3] = {0};
-      for (int i = 0; i < 4; i++)
-      {
-        int charId = onlineMatchBlock[0x60 + i * 0x24];
-        int teamId = onlineMatchBlock[0x69 + i * 0x24];
-        onlineMatchBlock[0x67 + i * 0x24] = characterCount[charId][teamId];
-        characterCount[charId][teamId]++;
-      }
     }
 
     // Overwrite stage
@@ -2133,7 +2136,7 @@ void CEXISlippi::prepareOnlineMatchState()
              onlineMatchBlock[0x84]);
 
     // Turn pause on in direct, off in everything else
-    u8* gameBitField3 = (u8*)&onlineMatchBlock[2];
+    u8* gameBitField3 = static_cast<u8*>(&onlineMatchBlock[2]);
     *gameBitField3 = lastSearch.mode >= directMode ? *gameBitField3 & 0xF7 : *gameBitField3 | 0x8;
     //*gameBitField3 = *gameBitField3 | 0x8;
 
@@ -2146,8 +2149,8 @@ void CEXISlippi::prepareOnlineMatchState()
       else
         rightTeamPlayers.push_back(i);
     }
-    auto leftTeamSize = leftTeamPlayers.size();
-    auto rightTeamSize = rightTeamPlayers.size();
+    int leftTeamSize = static_cast<int>(leftTeamPlayers.size());
+    int rightTeamSize = static_cast<int>(rightTeamPlayers.size());
     leftTeamPlayers.resize(4, 0);
     rightTeamPlayers.resize(4, 0);
     leftTeamPlayers[3] = static_cast<u8>(leftTeamSize);
@@ -2211,6 +2214,21 @@ void CEXISlippi::prepareOnlineMatchState()
   oppName = ConvertStringForGame(oppText, MAX_NAME_LENGTH * 2 + 1);
   m_read_queue.insert(m_read_queue.end(), oppName.begin(), oppName.end());
 
+#ifdef LOCAL_TESTING
+  std::string defaultConnectCodes[] = {"PLYR#001", "PLYR#002", "PLYR#003", "PLYR#004"};
+#endif
+
+  auto playerInfo = matchmaking->GetPlayerInfo();
+  for (int i = 0; i < 4; i++)
+  {
+    std::string connectCode = i < playerInfo.size() ? playerInfo[i].connect_code : "";
+#ifdef LOCAL_TESTING
+    connectCode = defaultConnectCodes[i];
+#endif
+    connectCode = ConvertConnectCodeForGame(connectCode);
+    m_read_queue.insert(m_read_queue.end(), connectCode.begin(), connectCode.end());
+  }
+
   // Add error message if there is one
   auto errorStr = !forcedError.empty() ? forcedError : matchmaking->GetErrorMessage();
   errorStr = ConvertStringForGame(errorStr, 120);
@@ -2317,6 +2335,32 @@ void CEXISlippi::prepareFileLoad(u8* payload)
   m_read_queue.insert(m_read_queue.end(), buf.begin(), buf.end());
 }
 
+void CEXISlippi::prepareGctLength()
+{
+  m_read_queue.clear();
+
+  u32 size = Gecko::GetGctLength();
+
+  INFO_LOG(SLIPPI, "Getting gct size: %d", size);
+
+  // Write size to output
+  appendWordToBuffer(&m_read_queue, size);
+}
+
+void CEXISlippi::prepareGctLoad(u8* payload)
+{
+  m_read_queue.clear();
+
+  auto gct = Gecko::GenerateGct();
+
+  // This is the address where the codes will be written to
+  auto address = Common::swap32(&payload[0]);
+
+  INFO_LOG(SLIPPI, "Preparing to write gecko codes at: 0x%X", address);
+
+  m_read_queue.insert(m_read_queue.end(), gct.begin(), gct.end());
+}
+
 void CEXISlippi::handleChatMessage(u8* payload)
 {
   int messageId = payload[0];
@@ -2468,6 +2512,7 @@ void CEXISlippi::prepareNewSeed()
 
 void CEXISlippi::handleReportGame(u8* payload)
 {
+#ifndef LOCAL_TESTING
   SlippiGameReporter::GameReport r;
   r.duration_frames = Common::swap32(&payload[0]);
 
@@ -2488,6 +2533,7 @@ void CEXISlippi::handleReportGame(u8* payload)
   }
 
   game_reporter->StartReport(r);
+#endif
 }
 
 void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize)
@@ -2619,6 +2665,12 @@ void CEXISlippi::DMAWrite(u32 _uAddr, u32 _uSize)
     case CMD_REPORT_GAME:
       handleReportGame(&memPtr[bufLoc + 1]);
       break;
+    case CMD_GCT_LENGTH:
+      prepareGctLength();
+      break;
+    case CMD_GCT_LOAD:
+      prepareGctLoad(&memPtr[bufLoc + 1]);
+      break;
     default:
       writeToFileAsync(&memPtr[bufLoc], payloadLen + 1, "");
       SlippiSpectateServer::getInstance().write(&memPtr[bufLoc], payloadLen + 1);
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h
index c905443ff4..f172579112 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h
@@ -10,6 +10,7 @@
 #include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Core/Slippi/SlippiGameFileLoader.h"
+#include "Core/Slippi/SlippiGameReporter.h"
 #include "Core/Slippi/SlippiMatchmaking.h"
 #include "Core/Slippi/SlippiNetplay.h"
 #include "Core/Slippi/SlippiPlayback.h"
@@ -17,7 +18,6 @@
 #include "Core/Slippi/SlippiSavestate.h"
 #include "Core/Slippi/SlippiSpectate.h"
 #include "Core/Slippi/SlippiUser.h"
-#include "Core/Slippi/SlippiGameReporter.h"
 #include "EXI_Device.h"
 
 #define ROLLBACK_MAX_FRAMES 7
@@ -79,6 +79,8 @@ private:
     CMD_LOG_MESSAGE = 0xD0,
     CMD_FILE_LENGTH = 0xD1,
     CMD_FILE_LOAD = 0xD2,
+    CMD_GCT_LENGTH = 0xD3,
+    CMD_GCT_LOAD = 0xD4,
   };
 
   enum
@@ -124,6 +126,8 @@ private:
       {CMD_LOG_MESSAGE, 0xFFFF},  // Variable size... will only work if by itself
       {CMD_FILE_LENGTH, 0x40},
       {CMD_FILE_LOAD, 0x40},
+      {CMD_GCT_LENGTH, 0x0},
+      {CMD_GCT_LOAD, 0x4},
   };
 
   struct WriteMessage
@@ -174,7 +178,7 @@ private:
   void prepareOnlineStatus();
   void handleConnectionCleanup();
   void prepareNewSeed();
-  void handleReportGame(u8 *payload);
+  void handleReportGame(u8* payload);
 
   // replay playback stuff
   void prepareGameInfo(u8* payload);
@@ -185,10 +189,12 @@ private:
   void prepareIsFileReady();
 
   // misc stuff
-  void handleChatMessage(u8 *payload);
+  void handleChatMessage(u8* payload);
   void logMessageFromGame(u8* payload);
   void prepareFileLength(u8* payload);
   void prepareFileLoad(u8* payload);
+  void prepareGctLength();
+  void prepareGctLoad(u8* payload);
   int getCharColor(u8 charId, u8 teamId);
 
   void FileWriteThread(void);
@@ -222,7 +228,7 @@ private:
   std::string forcedError = "";
 
   // Used to determine when to detect when a new session has started
-	bool is_play_session_active = false;
+  bool is_play_session_active = false;
 
   // Frame skipping variables
   int framesToSkip = 0;
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index c2b05c563c..57309e8921 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -77,7 +77,7 @@ CoreTiming::EventType* et_AudioDMA;
 CoreTiming::EventType* et_DSP;
 CoreTiming::EventType* et_IPC_HLE;
 // PatchEngine updates every 1/60th of a second by default
-CoreTiming::EventType* et_PatchEngine;
+// CoreTiming::EventType* et_PatchEngine;
 CoreTiming::EventType* et_Throttle;
 
 u32 s_cpu_core_clock = 486000000u;  // 486 mhz (its not 485, stop bugging me!)
@@ -163,7 +163,7 @@ void PatchEngineCallback(u64 userdata, s64 cycles_late)
     cycles_pruned += next_schedule;
   }
 
-  CoreTiming::ScheduleEvent(next_schedule, et_PatchEngine, cycles_pruned);
+  // CoreTiming::ScheduleEvent(next_schedule, et_PatchEngine, cycles_pruned);
 }
 
 void ThrottleCallback(u64 last_time, s64 cyclesLate)
@@ -326,7 +326,7 @@ void Init()
   et_DSP = CoreTiming::RegisterEvent("DSPCallback", DSPCallback);
   et_AudioDMA = CoreTiming::RegisterEvent("AudioDMACallback", AudioDMACallback);
   et_IPC_HLE = CoreTiming::RegisterEvent("IPC_HLE_UpdateCallback", IPC_HLE_UpdateCallback);
-  et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
+  // et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
   et_Throttle = CoreTiming::RegisterEvent("Throttle", ThrottleCallback);
 
   CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerHalfLine(), et_VI);
@@ -334,7 +334,7 @@ void Init()
   CoreTiming::ScheduleEvent(s_audio_dma_period, et_AudioDMA);
   CoreTiming::ScheduleEvent(0, et_Throttle, Common::Timer::GetTimeUs());
 
-  CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerField(), et_PatchEngine);
+  // CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerField(), et_PatchEngine);
 
   if (SConfig::GetInstance().bWii)
     CoreTiming::ScheduleEvent(s_ipc_hle_period, et_IPC_HLE);
diff --git a/Source/Core/Core/Slippi/SlippiGameReporter.cpp b/Source/Core/Core/Slippi/SlippiGameReporter.cpp
index 08b759d003..fcd2af3d21 100644
--- a/Source/Core/Core/Slippi/SlippiGameReporter.cpp
+++ b/Source/Core/Core/Slippi/SlippiGameReporter.cpp
@@ -16,18 +16,6 @@
 #include <json.hpp>
 using json = nlohmann::json;
 
-inline size_t receive(char* ptr, size_t size, size_t nmemb, void* rcvBuf)
-{
-  size_t len = size * nmemb;
-  INFO_LOG(SLIPPI_ONLINE, "[User] Received data: %d", len);
-
-  std::string* buf = (std::string*)rcvBuf;
-
-  buf->insert(buf->end(), ptr, ptr + len);
-
-  return len;
-}
-
 SlippiGameReporter::SlippiGameReporter(SlippiUser* user)
 {
   CURL* curl = curl_easy_init();
@@ -76,7 +64,7 @@ void SlippiGameReporter::StartReport(GameReport report)
 
 void SlippiGameReporter::StartNewSession(std::vector<std::string> new_player_uids)
 {
-  this->player_uids = new_player_uids;
+  this->m_player_uids = new_player_uids;
   gameIndex = 1;
 }
 
@@ -108,7 +96,7 @@ void SlippiGameReporter::ReportThreadHandler()
       for (int i = 0; i < report.players.size(); i++)
       {
         json p;
-        p["uid"] = player_uids[i];
+        p["uid"] = m_player_uids[i];
         p["damage_done"] = report.players[i].damage_done;
         p["stocks_remaining"] = report.players[i].stocks_remaining;
 
diff --git a/Source/Core/Core/Slippi/SlippiGameReporter.h b/Source/Core/Core/Slippi/SlippiGameReporter.h
index 1a0b825700..ea68933e23 100644
--- a/Source/Core/Core/Slippi/SlippiGameReporter.h
+++ b/Source/Core/Core/Slippi/SlippiGameReporter.h
@@ -38,7 +38,7 @@ protected:
   struct curl_slist* m_curl_header_list = nullptr;
 
   u32 gameIndex = 1;
-  std::vector<std::string> player_uids;
+  std::vector<std::string> m_player_uids;
 
   SlippiUser* m_user;
   std::queue<GameReport> game_report_queue;
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.cpp b/Source/Core/Core/Slippi/SlippiNetplay.cpp
index 0fb0511703..81eb7e2f09 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.cpp
+++ b/Source/Core/Core/Slippi/SlippiNetplay.cpp
@@ -67,13 +67,13 @@ SlippiNetplayClient::SlippiNetplayClient(std::vector<std::string> addrs, std::ve
 
   this->isDecider = isDecider;
   this->m_remotePlayerCount = remotePlayerCount;
-  this->playerIdx = playerIdx;
+  this->m_player_idx = playerIdx;
 
   // Set up remote player data structures.
   int j = 0;
   for (int i = 0; i < SLIPPI_REMOTE_PLAYER_MAX; i++, j++)
   {
-    if (j == playerIdx)
+    if (j == m_player_idx)
       j++;
     this->matchInfo.remotePlayerSelections[i] = SlippiPlayerSelections();
     this->matchInfo.remotePlayerSelections[i].playerIdx = j;
@@ -151,7 +151,7 @@ SlippiNetplayClient::SlippiNetplayClient(bool isDecider)
 u8 SlippiNetplayClient::PlayerIdxFromPort(u8 port)
 {
   u8 p = port;
-  if (port > playerIdx)
+  if (port > m_player_idx)
   {
     p--;
   }
@@ -160,7 +160,7 @@ u8 SlippiNetplayClient::PlayerIdxFromPort(u8 port)
 
 u8 SlippiNetplayClient::LocalPlayerPort()
 {
-  return this->playerIdx;
+  return this->m_player_idx;
 }
 
 // called from ---NETPLAY--- thread
@@ -267,7 +267,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
     sf::Packet spac;
     spac << (NetPlay::MessageId)NetPlay::NP_MSG_SLIPPI_PAD_ACK;
     spac << frame;
-    spac << playerIdx;
+    spac << m_player_idx;
     INFO_LOG(SLIPPI_ONLINE, "Sending ack packet for frame %d (player %d) to peer at %d:%d", frame,
              packetPlayerPort, peer->address.host, peer->address.port);
 
@@ -835,7 +835,7 @@ void SlippiNetplayClient::SendSlippiPad(std::unique_ptr<SlippiPad> pad)
   auto spac = std::make_unique<sf::Packet>();
   *spac << static_cast<NetPlay::MessageId>(NetPlay::NP_MSG_SLIPPI_PAD);
   *spac << frame;
-  *spac << this->playerIdx;
+  *spac << this->m_player_idx;
   // INFO_LOG(SLIPPI_ONLINE, "Sending a packet of inputs [%d]...", frame);
   for (auto it = localPadQueue.begin(); it != localPadQueue.end(); ++it)
   {
@@ -869,7 +869,7 @@ void SlippiNetplayClient::SendSlippiPad(std::unique_ptr<SlippiPad> pad)
 void SlippiNetplayClient::SetMatchSelections(SlippiPlayerSelections& s)
 {
   matchInfo.localPlayerSelections.Merge(s);
-  matchInfo.localPlayerSelections.playerIdx = playerIdx;
+  matchInfo.localPlayerSelections.playerIdx = m_player_idx;
 
   // Send packet containing selections
   auto spac = std::make_unique<sf::Packet>();
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.h b/Source/Core/Core/Slippi/SlippiNetplay.h
index 90821f7a39..ffb5eeaad9 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.h
+++ b/Source/Core/Core/Slippi/SlippiNetplay.h
@@ -192,7 +192,7 @@ protected:
   bool isConnectionSelected = false;
   bool isDecider = false;
   bool hasGameStarted = false;
-  u8 playerIdx = 0;
+  u8 m_player_idx = 0;
 
   std::deque<std::unique_ptr<SlippiPad>> localPadQueue;  // most recent inputs at start of deque
   std::deque<std::unique_ptr<SlippiPad>>
diff --git a/Source/Core/DiscIO/Volume.cpp b/Source/Core/DiscIO/Volume.cpp
index ab4b0e562b..bcbc21b688 100644
--- a/Source/Core/DiscIO/Volume.cpp
+++ b/Source/Core/DiscIO/Volume.cpp
@@ -85,6 +85,26 @@ std::map<Language, std::string> Volume::ReadWiiNames(const std::vector<char16_t>
   return names;
 }
 
+bool Volume::FileExists(std::string file_name)
+{
+  std::vector<DiscIO::Partition> partitions = this->GetPartitions();
+  if (partitions.empty())
+    partitions.emplace_back(PARTITION_NONE);
+
+  for (const auto& partition : partitions)
+  {
+    const DiscIO::FileInfo& root_dir = this->GetFileSystem(partition)->GetRoot();
+    for (const auto& file_info : root_dir)
+    {
+      if (file_info.GetName() == file_name)
+      {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 static std::unique_ptr<VolumeDisc> CreateDisc(std::unique_ptr<BlobReader>& reader)
 {
   // Check for Wii
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index 0673ab00af..b172bbb772 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -152,6 +152,8 @@ public:
   // The way the hash is calculated may change with updates to Dolphin.
   virtual std::array<u8, 20> GetSyncHash() const = 0;
 
+  bool FileExists(std::string file_name);
+
 protected:
   template <u32 N>
   std::string DecodeString(const char (&data)[N]) const