diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini
index 540e651390..ff849ad879 100644
--- a/Data/Sys/GameSettings/GALE01r2.ini
+++ b/Data/Sys/GameSettings/GALE01r2.ini
@@ -57,13 +57,18 @@ C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm
 0416B480 60000000 #C-Stick in Single Player [Zauron]
 0422D638 38000006 #Debug Menu [Magus, donny2112]
 041B0A14 38600002 #Exiting Debug Menu Returns to CSS [Achilles]
-C216E510 00000093 #External/NeutralSpawn/NeutralSpawn.asm
+C216E510 00000098 #External/NeutralSpawn/NeutralSpawn.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808016 618CB41C
 7D8903A6 4E800421
-2C030000 40820458
-2C1C0005 40800450
+2C030000 40820480
+2C1C0005 40800478
+3C608048 80639D30
+5463443E 2C03021C
+41820464 3C608048
+80639D30 5463443E
+2C03010F 41820450
 887F24D0 2C030001
 41820054 3B200000
 3B400000 7F43D378
@@ -338,16 +343,16 @@ C22662D0 0000001A #External/UCF 0.8/Indicator/UCF Text.asm
 9421FF50 BE810008
 48000089 7FC802A6
 38600000 38800000
-3DC0803A 61CE6754
-7DC903A6 4E800421
+3D80803A 618C6754
+7D8903A6 4E800421
 7C7F1B78 38800001
 989F0049 38800001
 989F004A C03E000C
 D03F0024 D03F0028
 7FE3FB78 48000059
 7C8802A6 C03E0000
-C05E0004 3DC0803A
-61CE6B98 7DC903A6
+C05E0004 3D80803A
+618C6B98 7D8903A6
 4E800421 7C641B78
 7FE3FB78 C03E0008
 C05E0008 3D80803A
@@ -558,29 +563,30 @@ C216DED4 00000039 #Common/CostumeBoundCheck/main.asm
 7C0803A6 8001001C
 60000000 00000000
 
-$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337]
+$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337, Krohnos]
 *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
-C23219EC 0000001C #Recording/FlushFrameBuffer.asm
+C23219EC 0000001D #Recording/FlushFrameBuffer.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418200A0
+2C030000 418200A8
 806DB64C 83C30000
 83ADB650 7F9EEA14
-2C1D0000 41820088
+2C1D0000 41820090
 3860003C 987C0000
 806DB654 907C0001
 3C608048 80639D30
 5463443E 2C030208
-806DB654 40820034
+806DB654 4082003C
 80ADB61C 8885000D
-2C040000 40820024
+2C040000 4082002C
 8885000C 2C040000
-40820018 808507B3
-3884FF85 7C041800
+40820020 80850904
+3884FF85 80E5090D
+7C872050 7C041800
 40800008 7C832378
 907C0005 3BBD0009
 7FC3F378 7FA4EB78
@@ -620,19 +626,19 @@ C216D884 0000001C #Recording/SendGameEnd.asm
 800100B4 382100B0
 7C0803A6 819F2514
 60000000 00000000
-C216E74C 000000E3 #Recording/SendGameInfo.asm
+C216E74C 000000FC #Recording/SendGameInfo.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418206DC
+2C030000 418207A0
 38600005 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7B1B78
 936DB64C 38800005
 3D808000 618CC160
 7D8903A6 4E800421
-38600702 3D808037
+38600726 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7E1B78
 93DB0000 38600000
@@ -644,15 +650,15 @@ C216E74C 000000E3 #Recording/SendGameInfo.asm
 7C7C1B78 38600035
 987E0000 3860001C
 987E0001 38600036
-987E0002 38600248
+987E0002 386002BD
 B07E0003 38600037
 987E0005 3860003F
 B07E0006 38600038
-987E0008 3860004C
+987E0008 38600050
 B07E0009 38600039
 987E000B 38600002
 B07E000C 3860003A
-987E000E 38600008
+987E000E 3860000C
 B07E000F 3860003B
 987E0011 3860002A
 B07E0012 3860003C
@@ -662,7 +668,7 @@ B07E0015 3860003D
 38600010 987E001A
 38600204 B07E001B
 38600036 987E001D
-3C600309 60630000
+3C60030C 60630000
 907E001E 387E0022
 7FE4FB78 38A00138
 3D808000 618C31F4
@@ -720,42 +726,65 @@ B07E0015 3860003D
 8862F23C 987E01BF
 3C608048 80639D30
 5463443E B07E01C0
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C791B78
+3C608048 80639D30
+5463443E 2C030208
+40820190 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
+4800001C 7F03C378
+3880001F 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
 3A800000 3ABF0060
-3AFE01C2 3B590034
-1C74001F 7F03BA14
+3AFE023E 3B5900EF
+1C74000A 7F03BA14
 1ED40024 7ED6AA14
 88760001 2C030000
-40820028 1C74001F
+40820028 1C74000A
 7C83D214 7F03C378
-38A0001F 3D808000
+38A0000A 3D808000
 618C31F4 7D8903A6
 4E800421 4800001C
-7F03C378 3880001F
+7F03C378 3880000A
 3D808000 618CC160
 7D8903A6 4E800421
 3A940001 2C140004
 4180FFA0 3A800000
-3ABF0060 3AFE023E
-3B5900EF 1C74000A
+3ABF0060 3AFE0266
+3B590117 1C74001D
 7F03BA14 1ED40024
 7ED6AA14 88760001
 2C030000 40820028
-1C74000A 7C83D214
-7F03C378 38A0000A
+1C74001D 7C83D214
+7F03C378 38A0001D
 3D808000 618C31F4
 7D8903A6 4E800421
 4800001C 7F03C378
-3880000A 3D808000
+3880001D 3D808000
 618CC160 7D8903A6
 4E800421 3A940001
 2C140004 4180FFA0
 7F23CB78 3D808037
 618CF1B0 7D8903A6
-4E800421 7FC3F378
-38800266 38A00001
+4E800421 4800001C
+387E01C2 38800118
+3D808000 618CC160
+7D8903A6 4E800421
+3D808000 618CADF4
+7D8903A6 4E800421
+987E02DA 7FC3F378
+388002DB 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
 38600205 3D808037
@@ -789,7 +818,7 @@ A0B50201 3D808000
 7C8802A6 38A00000
 3D808038 618CFD54
 7D8903A6 4E800421
-48000064 4E800021
+48000070 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
 806DB64C 83A30000
@@ -797,65 +826,67 @@ A0B50201 3D808000
 3860003A 987D0000
 806DB654 907D0001
 3C60804D 80635F90
-907D0005 838DB650
-3B9C0009 938DB650
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 38600004
-38800007 38A00000
-3D808039 618C01F0
-7D8903A6 4E800421
-48000021 7C8802A6
-38A0000F 3D808038
-618CFD54 7D8903A6
-4E800421 48000124
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 806DB64C
-83E30000 83CDB650
-7FFFF214 3B600000
-806DC18C 83A30024
-2C1D0000 418200D8
-3B7B0001 2C1B000F
-418100CC 839D002C
-3860003B 987F0000
-806DB654 907F0001
-807C0010 B07F0005
-807C0024 987F0007
-807C002C 907F0008
-807C0040 907F000C
-807C0044 907F0010
-807C004C 907F0014
-807C0050 907F0018
-807C0C9C B07F001C
-807C0D44 907F001E
-807C001C 907F0022
-887C0DD7 987F0026
-887C0DDB 987F0027
-887C0DEB 987F0028
-887C0DEF 987F0029
-807C0518 2C030000
-41820018 8063002C
-2C030000 4182000C
-8863000C 48000008
-3860FFFF 987F002A
-83CDB650 3BDE002B
-93CDB650 3BFF002B
-83BD0008 2C1D0000
-4082FF30 BA810008
+907D0005 3C608048
+80639D60 907D0009
+838DB650 3B9C000D
+938DB650 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
+38600004 38800007
+38A00000 3D808039
+618C01F0 7D8903A6
+4E800421 48000021
+7C8802A6 38A0000F
+3D808038 618CFD54
+7D8903A6 4E800421
+48000124 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+806DB64C 83E30000
+83CDB650 7FFFF214
+3B600000 806DC18C
+83A30024 2C1D0000
+418200D8 3B7B0001
+2C1B000F 418100CC
+839D002C 3860003B
+987F0000 806DB654
+907F0001 807C0010
+B07F0005 807C0024
+987F0007 807C002C
+907F0008 807C0040
+907F000C 807C0044
+907F0010 807C004C
+907F0014 807C0050
+907F0018 807C0C9C
+B07F001C 807C0D44
+907F001E 807C001C
+907F0022 887C0DD7
+987F0026 887C0DDB
+987F0027 887C0DEB
+987F0028 887C0DEF
+987F0029 807C0518
+2C030000 41820018
+8063002C 2C030000
+4182000C 8863000C
+48000008 3860FFFF
+987F002A 83CDB650
+3BDE002B 93CDB650
+3BFF002B 83BD0008
+2C1D0000 4082FF30
 BA810008 800100B4
 382100B0 7C0803A6
-3C608017 00000000
-C206DA34 00000035 #Recording/SendGamePostFrame.asm
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 3C608017
+60000000 00000000
+C206DA34 00000036 #Recording/SendGamePostFrame.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 41820168
+2C030000 41820170
 887F221F 546306F7
-4082015C 8B7F000C
+40820164 8B7F000C
 806DB64C 83A30000
 838DB650 7FBDE214
 38600038 987D0000
@@ -897,7 +928,8 @@ B07D0030 887F1968
 807F0090 907D0041
 807F00EC 907D0045
 807F195C 907D0049
-838DB650 3B9C004D
+807F0014 907D004D
+838DB650 3B9C0051
 938DB650 BA810008
 800100B4 382100B0
 7C0803A6 8001001C
@@ -946,10 +978,13 @@ B07D0031 80640030
 800100B4 382100B0
 7C0803A6 881F2219
 60000000 00000000
-C2005604 00000007 #Recording/ShouldRecord.asm
+C2005604 0000000A #Recording/ShouldRecord.asm
 3C608048 80639D30
 5463443E 2C030202
-41820014 2C030208
+4182002C 2C030302
+41820024 2C030208
+4182001C 2C03010F
+41820014 2C030120
 4182000C 38600000
 4800000C 38600001
 48000004 4E800020
@@ -986,148 +1021,6 @@ 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
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 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 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-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 FC40A890
-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 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-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 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -1193,59 +1086,86 @@ C216EBAC 0000000C #Common/CSS KO Stars/Asign KO Stars Upon Exiting Dairantou.asm
 $Required: Slippi Online [Fizzi, UnclePunch]
 *Adds online mode, Slippi device must be in Slot B.
 *Change settings in Config > GameCube
-C206A880 00000018 #Online/Core/BrawlOffscreenDamage.asm
+C206A880 0000001B #Online/Core/BrawlOffscreenDamage.asm
 7C0802A6 90010004
 9421FF50 BE810008
-887F221F 54630673
-40820088 807F0010
-2C030004 4182007C
-2C030006 41820074
-3D808022 618C4A54
+3C608048 80639D30
+5463443E 2C030120
+41820094 887F221F
+54630673 40820088
+807F0010 2C030004
+4182007C 2C030006
+41820074 3D808022
+618C4A54 7D8903A6
+4E800421 C05F00B0
+FC020840 41800060
+3D808022 618C4A68
 7D8903A6 4E800421
 C05F00B0 FC020840
-41800060 3D808022
-618C4A68 7D8903A6
-4E800421 C05F00B0
-FC020840 41810044
-3D808022 618C4A80
+41810044 3D808022
+618C4A80 7D8903A6
+4E800421 C05F00B4
+FC020840 41810028
+3D808022 618C4A98
 7D8903A6 4E800421
 C05F00B4 FC020840
-41810028 3D808022
-618C4A98 7D8903A6
-4E800421 C05F00B4
-FC020840 4180000C
-38600000 48000008
-38600001 BA810008
-800100B4 382100B0
-7C0803A6 00000000
-C21A4DB4 0000001C #Online/Core/ForceEngineOnRollback.asm
+4180000C 38600000
+48000008 38600001
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C22F7094 0000000C #Online/Core/CustomizeMessageLRAS.asm
+3CE08048 80E79D30
+54E7443E 2C070208
+40820048 88E30008
+2C070007 4082003C
+89430001 816DB61C
+886B0000 7C035000
+41820018 38600005
+3D808002 618C4030
+7D8903A6 4E800421
+3D80802F 618C7120
+7D8903A6 4E800420
+8903000B 00000000
+C21A4DB4 0000001A #Online/Core/ForceEngineOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-408200B0 3C608047
+408200A4 3C608047
 60639D64 80630000
-2C030000 4082009C
+2C030000 40820090
 3D808034 618C7364
 7D8903A6 4E800421
 7C7A1B78 80ADB61C
 2C1B0000 41810014
-888500D9 2C040000
-41820038 3B600001
-888500D9 988507A9
-808500DB 908507AA
-888500DA 988507AE
-80850237 908507AF
-808500D5 80840002
-908507B3 48000028
-888507B7 2C040000
-4182001C 38800000
-988507B7 3D808001
-618C95FC 7D8903A6
-4E800421 7F43D378
-3D808034 618C738C
+888500DA 2C040000
+4182002C 3B600001
+888500DA 988508FA
+808500DC 908508FB
+888500DB 988508FF
+80850388 90850900
+48000028 88850908
+2C040000 4182001C
+38800000 98850908
+3D808001 618C95FC
+7D8903A6 4E800421
+7F43D378 3D808034
+618C738C 7D8903A6
+4E800421 2C1B0000
+40820014 3D80801A
+618C4DA8 7D8903A6
+4E800420 00000000
+C2019614 0000000C #Online/Core/ForceInputRefetchOnAdvance.asm
+3D808001 618CD2BC
+7D8903A6 4E800421
+3C608048 80639D30
+5463443E 2C030208
+40820038 3C608047
+60639D64 80630000
+2C030000 40820024
+80ADB61C 8865000F
+2C030000 41820014
+3D808001 618C95FC
 7D8903A6 4E800421
-2C1B0000 40820014
-3D80801A 618C4DA8
-7D8903A6 4E800420
 60000000 00000000
 C216D310 00000009 #Online/Core/HandleLRAS.asm
 3C608048 80639D30
@@ -1253,7 +1173,7 @@ C216D310 00000009 #Online/Core/HandleLRAS.asm
 40820028 3C608046
 6063B6A0 88630008
 2C030007 40820014
-808DB61C 806407A5
+808DB61C 806408F6
 7C6903A6 4E800421
 8001003C 83E10034
 60000000 00000000
@@ -1280,39 +1200,39 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820338 386007BC
+40820338 38600919
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7B1B78 388007BC
+7C7B1B78 38800919
 3D808000 618CC160
 7D8903A6 4E800421
 936DB61C 38600001
 907B0003 4800023D
-7C6802A6 907B07A5
-38600012 3D808037
+7C6802A6 907B08F6
+38600016 3D808037
 618CF1E4 7D8903A6
-4E800421 907B00D1
-3860010A 3D808037
+4E800421 907B00D2
+3860010E 3D808037
 618CF1E4 7D8903A6
-4E800421 907B00D5
-7C7A1B78 3880010A
+4E800421 907B00D6
+7C7A1B78 3880010E
 3D808000 618CC160
 7D8903A6 4E800421
 38600021 3D808037
 618CF1E4 7D8903A6
 4E800421 7C791B78
-933B024A 3860009E
+933B039B 3860009E
 3D808037 618CF1E4
 7D8903A6 4E800421
-907B024E 3880009E
+907B039F 3880009E
 3D808000 618CC160
 7D8903A6 4E800421
 38800000 98830000
 38800007 98830001
-93790005 386007BC
+93790005 38600919
 90790009 9359000D
-3860010A 90790011
-807B024E 90790015
+3860010E 90790011
+807B039F 90790015
 3860009E 90790019
 38600000 9079001D
 38600000 3D808000
@@ -1323,7 +1243,7 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 88780004 987B0001
 80780005 907B0007
 3C80804D 90645F90
-7FE3FB78 38980208
+7FE3FB78 3898027C
 38A00138 3D808000
 618C31F4 7D8903A6
 4E800421 886DAFA0
@@ -1341,7 +1261,7 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 2C03000F 41810010
 48000010 38600001
 48000008 3860000F
-987B001B 38A00000
+987B001C 38A00000
 3C60804C 606320BC
 1C850044 7C632214
 38800000 90830000
@@ -1386,55 +1306,67 @@ BE810008 838DB61C
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
-C216E904 0000003F #Online/Core/InitPause.asm
+C216E904 0000004B #Online/Core/InitPause.asm
 3C608048 80639D30
 5463443E 2C030208
-408201DC 3D808046
+4082023C 3D808046
 618CDB68 886C0002
 54630739 41820028
 48000029 7C6802A6
 906C0040 38600000
 986DAFC8 886C0002
 38800000 50831F38
-986C0002 480001A0
+986C0002 48000200
 4E800021 7C0802A6
 90010004 9421FF50
 BE810008 83ADB61C
-8BDD0001 3C80804C
-60841FAC 1C7E0044
-7C632214 80630000
-54600673 4182001C
-546006B5 41820014
-546005EF 4182000C
-546004E7 40820058
+3BC00000 7FC3F378
+3D808003 618C241C
+7D8903A6 4E800421
+2C030000 40820060
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
+7D8903A6 4E800421
+2C030000 41820038
+3C80804C 60841FAC
+1C7E0044 7C632214
+80630000 54600673
+4182001C 546006B5
+41820014 546005EF
+4182000C 546004E7
+40820068 3BDE0001
+2C1E0004 4180FF80
 8BDD0000 3C80804C
 60841FAC 1C7E0044
-7FE32214 807F0000
-54600673 4182001C
-546006B5 41820014
-546005EF 4182000C
-546004E7 40820020
-886DAFC8 2C030000
-418200A0 807F0008
-546004E7 40820064
-480000E4 38600002
-3D808002 618C4030
-7D8903A6 4E800421
-3D808037 618C8330
+7FE32214 886DAFC8
+2C030000 418200AC
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
 7D8903A6 4E800421
+2C030000 41820054
+807F0008 546004E7
+40820048 480000F0
 3C608046 6063B6A0
-9BC30001 7FC3F378
-38800007 3D808016
-618CCF4C 7D8903A6
-4E800421 38600003
-3C808046 6084B6A0
-98640000 48000088
+9BC30001 38800007
+98830008 3880001E
+988324D5 3D80802F
+618C3394 7D8903A6
+4E800421 3D80801A
+618C10FC 7D8903A6
+4E800421 480000B0
 38600000 986DAFC8
 3D80802F 618C33CC
 7D8903A6 4E800421
 7FC3F378 3D80801A
 618C10FC 7D8903A6
-4E800421 48000058
+4E800421 48000080
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
+7D8903A6 4E800421
+2C030000 41820058
 807F0008 546004E7
 4182004C 38600001
 986DAFC8 3D80802F
@@ -1450,23 +1382,23 @@ BA810008 800100B4
 382100B0 7C0803A6
 4E800020 881F0001
 60000000 00000000
-C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
+C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm
 41A20014 3D80801A
 618C5024 7D8903A6
 4E800420 3C608048
 80639D30 5463443E
-2C030208 40820250
+2C030208 408202B8
 3C608047 60639D64
 80630000 2C030000
-4082023C 7C0802A6
+408202A4 7C0802A6
 90010004 9421FF50
 BE810008 3D808034
 618C7364 7D8903A6
 4E800421 7C7D1B78
-83EDB61C 3BDF0252
+83EDB61C 3BDF03A3
 8B9E0000 3F008048
 83189D60 3B18FFFF
-82FF07A1 7C18B800
+82FF08F2 7C18B800
 4181009C 7C78B850
 38630001 8B9E0000
 7F83E051 40800008
@@ -1495,58 +1427,88 @@ A0840001 7C032000
 38800061 3D808000
 618CC160 7D8903A6
 4E800421 7C18B800
-4081001C 931F07A1
+4081001C 931F08F2
 3B9C0001 2C1C0007
 41800008 3B9CFFF9
-9B9E0000 7FA3EB78
-3D808034 618C738C
-7D8903A6 4E800421
-8B7F07A9 2C1B0001
-408200CC 48000025
-BA810008 800100B4
-382100B0 7C0803A6
-3D80801A 618C4DE4
+9B9E0000 8B7F08FA
+2C1B0001 40820134
+807F08FB 7C181800
+41800048 38600000
+987F00DA 987F08FA
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 3B5A0001
+3D80801A 618C5024
 7D8903A6 4E800420
-7C0802A6 90010004
-9421FF50 BE810008
-3D808003 618C0A50
-7D8903A6 4E800421
-3D808002 618CA4AC
-7D8903A6 4E800421
-3D808003 618C0A50
-7D8903A6 4E800421
-80630028 3D808036
-618C8458 7D8903A6
-4E800421 806DC18C
-82830020 4800002C
-82B4002C 8875221F
-546006F7 40820018
-7E83A378 3D808008
-618C6A8C 7D8903A6
-4E800421 82940008
-2C140000 4082FFD4
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 48000029
 BA810008 800100B4
 382100B0 7C0803A6
-4E800020 BA810008
+3B5A0001 3D80801A
+618C4DE4 7D8903A6
+4E800420 7C0802A6
+90010004 9421FF50
+BE810008 3D808003
+618C0A50 7D8903A6
+4E800421 3D808002
+618CA4AC 7D8903A6
+4E800421 3D808003
+618C0A50 7D8903A6
+4E800421 80630028
+3D808036 618C8458
+7D8903A6 4E800421
+806DC18C 82830020
+4800002C 82B4002C
+8875221F 546006F7
+40820018 7E83A378
+3D808008 618C6A8C
+7D8903A6 4E800421
+82940008 2C140000
+4082FFD4 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 00000000
+C216D26C 00000003 #Online/Core/PauseCounter.asm
+808DB61C 8064090D
+38630001 9064090D
+387F0000 00000000
+C216CD08 0000000A #Online/Core/PreventPauseStranding.asm
+3C608048 80639D30
+5463443E 2C030208
+40820038 83ADB61C
+887D000D 2C030001
+40820028 889D0000
+887E0001 7C630774
+7C032000 41820014
+3C608016 6063CD28
+7C6903A6 4E800420
+3880FFFF 00000000
 C216EA30 00000004 #Online/Core/Remember Who LRA Started.asm
 981E0010 2C000007
 40820014 3C808046
 6084B6A0 88840001
 989E000C 00000000
-C2376A20 0000000A #Online/Core/SkipNewInputFetchOnRollback.asm
+C2376A20 0000000C #Online/Core/SkipNewInputFetchOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-40820038 3C608047
+40820044 3C608047
 60639D64 80630000
-2C030000 40820024
-806DB61C 886300D9
-2C030001 40820014
-3D808037 618C6A28
-7D8903A6 4E800420
-3861002C 00000000
-C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
+2C030000 40820030
+808DB61C 886400DA
+2C030000 41820020
+886400DB 2C030000
+40820014 3D808037
+618C6A28 7D8903A6
+4E800420 3861002C
+60000000 00000000
+C21A4DE4 00000060 #Online/Core/StartEngineLoop.asm
 3D808037 618CE214
 7D8903A6 4E800421
 48000030 4E800021
@@ -1559,21 +1521,21 @@ C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-4082026C 3C608047
+40820288 3C608047
 60639D64 80630000
-2C030000 40820258
-834DB61C 3F608048
-837B9D60 3D808034
+2C030000 40820274
+83CDB61C 3FE08048
+83FF9D60 3D808034
 618C7364 7D8903A6
 4E800421 7C791B78
-887A000E 2C030000
-408200D0 887A000D
+887E000E 2C030000
+408200D0 887E000D
 2C030000 418200C4
 38600003 3D808002
 618C4030 7D8903A6
 4E800421 4BFFFF51
 7EE802A6 38600002
-809A07B8 3D80803A
+809E0909 3D80803A
 618C6754 7D8903A6
 4E800421 7C781B78
 38800001 98980049
@@ -1592,12 +1554,14 @@ C0570010 3D80803A
 38800000 38B70014
 3D80803A 618C74F0
 7D8903A6 4E800421
-38600001 987A000E
-887A07A9 2C030000
-418200B8 887A07AE
-2C030000 41820084
-807A024A 809A07AF
-80BA024E 3D808000
+38600001 987E000E
+887E08FA 2C030000
+418200B0 887E08FF
+2C030000 41820094
+807E0900 7C1F1800
+41820024 41800094
+807E039B 809E0900
+80BE039F 3D808000
 618C560C 7D8903A6
 4E800421 3D808001
 618C9894 7D8903A6
@@ -1606,261 +1570,275 @@ C0570010 3D80803A
 7C832051 4080000C
 88650000 7C841A14
 98850002 38600000
-98650003 3F608048
-837B9D60 807A0237
-907A0003 38600000
-987A0236 987A0247
-987A0248 987A0249
-987A00DA 987A07AE
+98650003 3FE08048
+83FF9D60 807E0388
+907E0003 38600000
+987E0387 987E0398
+987E0399 987E039A
+987E00DB 987E08FF
 3D808001 618C95FC
 7D8903A6 4E800421
-807A07AA 7C1B1800
-41800010 38600000
-987A00D9 987A07A9
-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 807A07A5
-7C6903A6 4E800421
-7F23CB78 3D808034
-618C738C 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 00000000
-C2376A28 000000DD #Online/Core/TriggerSendInput.asm
+807E0911 7C1F1800
+4181000C 7FE3FB78
+48000004 809E0904
+7C032000 40810008
+907E0904 887E0387
+2C030000 4182002C
+807E0904 7C1F1800
+40810020 807E039B
+7FE4FB78 80BE039F
+3D808000 618C5608
+7D8903A6 4E800421
+887E000C 2C030001
+4182004C 3C608046
+6063B6A0 88630008
+2C030000 40820010
+38600000 987E000B
+4800002C 887E000B
+38630001 987E000B
+2C030007 40810018
+38600001 987E000C
+807E08F6 7C6903A6
+4E800421 7F23CB78
+3D808034 618C738C
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C2376A28 000000E9 #Online/Core/TriggerSendInput.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-408206B0 3C608047
+4082070C 3C608047
 60639D64 80630000
-2C030000 4082069C
-836DB61C 833B00D1
-831B00D5 82FB024A
-835B0003 887B00D9
-2C030001 418205F8
-887B001B 38800054
-7C632050 2C1A0003
-4080001C 386100DC
-38800030 3D808000
-618CC160 7D8903A6
-4E800421 889B0002
-1C84000C 386400E6
-7C6118AE 7C630774
-2C03FFFD 40820024
-386400DC 7C611A14
-389B000F 38A0000C
-3D808000 618C31F4
+2C030000 408206F8
+836DB61C 833B00D2
+831B00D6 82FB039B
+835B0003 889B0002
+1C84000C 386400DC
+7FA11A14 887B00DA
+2C030000 41820010
+887B00DB 2C030000
+41820638 887B001C
+38800054 7C632050
+2C1A0003 4080001C
+386100DC 38800030
+3D808000 618CC160
 7D8903A6 4E800421
-889B0002 1C84000C
-388400DC 387B000F
-7C812214 38A0000C
+48000040 88830000
+7C840774 2C04FFFE
+4180002C 2C040002
+41810024 88830001
+7C840774 2C04FFFE
+41800014 2C040002
+4181000C 38800000
+B0830000 4E800020
+387D0002 4BFFFFC1
+387D0004 4BFFFFB9
+887D000A 7C630774
+2C03FFFD 40820020
+7FA3EB78 389B0010
+38A0000C 3D808000
+618C31F4 7D8903A6
+4E800421 387B0010
+7FA4EB78 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
 386000B0 98790000
-93590001 887B001B
-98790005 889B0002
-1C84000C 388400DC
-38790006 7C812214
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 7F23CB78
-38800012 38A00001
+93590001 807B0904
+90790005 887B001C
+98790009 3879000A
+7FA4EB78 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+7F23CB78 38800016
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38780000
+3880010E 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
-38780000 3880010A
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 88780000
-2C030002 4182001C
-2C030003 41820008
-48000030 38600001
-987B000D 48000024
-BA810008 800100B4
-382100B0 7C0803A6
-3D808037 618C6CEC
-7D8903A6 4E800420
-889B001C 1C84000C
-3884001D 887B0000
-1C63000C 386300DC
-7C611A14 7C9B2214
+38600000 987B000F
+88780000 2C030002
+41820024 2C030003
+41820010 2C030004
+41820034 48000038
+38600001 987B000D
+4800002C BA810008
+800100B4 382100B0
+7C0803A6 3D808037
+618C6CEC 7D8903A6
+4E800420 38600001
+987B000F 889B001D
+1C84000C 3884001E
+887B0000 1C63000C
+386300DC 7C611A14
+7C9B2214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+887B00E0 1C63000C
+386300E1 889B0000
+1C84000C 388400DC
+7C7B1A14 7C812214
 38A0000C 3D808000
 618C31F4 7D8903A6
-4E800421 887B00DF
-1C63000C 386300E0
-889B0000 1C84000C
-388400DC 7C7B1A14
-7C812214 38A0000C
-3D808000 618C31F4
-7D8903A6 4E800421
-887B00DF 38630001
-2C030007 41800008
-38600000 987B00DF
-887B001C 1C63000C
-3863001D 7C7B1A14
-38990006 38A0000C
-3D808000 618C31F4
-7D8903A6 4E800421
-889B001B 887B001C
-38630001 7C032000
+4E800421 887B00E0
+38630001 2C03000E
 41800008 38600000
-987B001C 887B0236
+987B00E0 887B001D
+1C63000C 3863001E
+7C7B1A14 3899000A
+38A0000C 3D808000
+618C31F4 7D8903A6
+4E800421 889B001C
+887B001D 38630001
+7C032000 41800008
+38600000 987B001D
+8B9B00DA 887B0387
 2C030000 40820018
-38600000 987B0247
-987B0248 987B0249
-48000284 3A800000
-38D40247 7C66D8AE
-2C030001 40820178
+38600000 987B0398
+987B0399 987B039A
+48000264 3A800000
+38D40398 7C66D8AE
+2C030001 4082016C
 1CD40004 38C60002
 7C66C02E 1CD40004
-38C6023B 7C86D82E
-7C641851 41800158
-7C761B78 38D40134
-7C66D8AE 38D40137
-7C86D8AE 7EC3B378
-1C63000C 3863000E
+38C6038C 7C86D82E
+7EC41851 4180014C
+80DB0904 7C043000
+41810010 7C032000
+418100AC 48000134
+1C76000C 38630012
 1CD40054 7C633214
-38D40134 7C86D8AE
-1C84000C 3884013A
-1CB40054 7C842A14
+38D40189 7C86D8AE
+1C84000C 3884018F
+1CB400A8 7C842A14
 7CD81A14 7CFB2214
 88660000 88870000
 546306FE 548406FE
-7C032000 408200BC
+7C032000 408200AC
 88660001 88870001
 5463067E 5484067E
-7C032000 408200A4
-80660002 80870002
 7C032000 40820094
+80660002 80870002
+7C032000 40820084
 38A00005 38A50001
 2C050008 40800028
 7C6530AE 7C8538AE
 2C03002A 4181000C
 2C04002A 4081FFE0
-7C032000 40820064
+7C032000 40820054
 4BFFFFD4 1CD40004
-38C6023B 7C66D82E
+38C6038C 7C66D82E
 38630001 7C66D92E
-38D40134 7C66D8AE
-38630001 2C030007
-41800008 3863FFF9
-7C66D9AE 38D40134
-7C66D8AE 38D40137
-7C86D8AE 38D40134
-7C66D8AE 38D40137
+38D40189 7C66D8AE
+38630001 2C03000E
+41800008 3863FFF2
+7C66D9AE 38D40189
+7C66D8AE 38D4018C
 7C86D8AE 7C041800
-4082FEC0 48000040
-1CD40004 38C6023B
-7C66D82E 38600001
-987B00D9 987B00DA
-935B00DB BA810008
-800100B4 382100B0
-7C0803A6 3D808037
-618C6CEC 7D8903A6
-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
+4082FED0 48000044
+3B800001 4800003C
+38600001 987B00DA
+987B00DB 935B00DC
+3B5A0001 935B0003
+BA810008 800100B4
+382100B0 7C0803A6
+3D808037 618C6CEC
+7D8903A6 4E800420
 3A940001 2C140003
-4180FFAC 907B0237
-3A800000 38D40247
+4180FE80 39600000
+3A800000 82BB0904
+38D40398 7C86D8AE
+2C040001 40820028
+1CD40004 38C6038C
+7C86D82E 2C0B0000
+4182000C 7C04A800
+40800008 7C952378
+39600001 3A940001
+2C140003 4180FFC4
+92BB0388 92BB0911
+80D8000E 7C153000
+40810008 90DB0911
+2C1C0000 4082FF54
+3A800000 38D40398
 7C86D8AE 2C040001
-40820038 38D40134
-7C66D8AE 38D40137
-7C86D8AE 38D40134
-7C66D8AE 38D40137
+40820028 38D40189
+7C66D8AE 38D4018C
 7C86D8AE 7C041800
 40820010 38600000
-38D40247 7C66D9AE
+38D40398 7C66D9AE
 3A940001 2C140003
-4180FFB4 3A800000
-38D40247 7C86D8AE
+4180FFC4 3A800000
+38D40398 7C86D8AE
 2C040001 41820018
 3A940001 2C140003
 4180FFE8 38600000
-987B0236 3A800000
-3AA00000 887B0000
-7C151800 40820008
-3AB50001 1CD40004
-38C60002 7C66C02E
-7C7A1850 2C030000
-408000D4 887B001B
-38800054 7C632050
-7C1A1800 418000BC
-887B000C 2C030001
-418200B0 38D40137
+987B0387 3A800000
+3AA00000 3B800001
+887B0000 7C151800
+40820008 3AB50001
+1CD40004 38C60002
+7C66C02E 7C7A1850
+2C030000 408000D8
+887B001C 38800054
+7C632050 7C1A1800
+418000C0 887B000C
+2C030001 418200B4
+3B800000 38D4018C
 7EC6D8AE 1C76000C
-3863013A 1CB40054
+3863018F 1CB400A8
 7C632A14 1CD40054
-38C6000E 7C7B1A14
+38C60012 7C7B1A14
 7C983214 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
-38760001 2C030007
-41800008 3863FFF9
-38D40137 7C66D9AE
-38D40134 7C66D8AE
-38D40137 7C86D8AE
-38D40247 7C66D8AE
+38760001 2C03000E
+41800008 3863FFF2
+38D4018C 7C66D9AE
+38D40189 7C66D8AE
+38D4018C 7C86D8AE
+38D40398 7C66D8AE
 2C030001 4182003C
-1CD40004 38C6023B
+1CD40004 38C6038C
 7F46D92E 38600001
-38D40247 7C66D9AE
-38D40134 7EC6D9AE
-887B0236 2C030001
-41820010 935B0237
-38600001 987B0236
+38D40398 7C66D9AE
+38D40189 7EC6D9AE
+887B0387 2C030001
+41820010 935B0388
+38600001 987B0387
 38600000 1C63000C
-38A3000E 1CD40054
+38A30012 1CD40054
 7CA53214 1C75000C
 386300DC 7C611A14
 7C982A14 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
 3A940001 3AB50001
-2C140003 4180FEC8
-48000080 807B00DB
-7C1A1800 40810024
-BA810008 800100B4
-382100B0 7C0803A6
-3D808037 618C6CEC
-7D8903A6 4E800420
-807B00DB 7C7A1850
-38630001 889B00DF
-7C632051 40800008
-38630007 1C63000C
-388300E0 887B0000
-1C63000C 386300DC
-7C611A14 7C9B2214
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 4BFFFE40
-3B5A0001 935B0003
-BA810008 800100B4
-382100B0 7C0803A6
-2C1E0000 00000000
+2C140003 4180FEC4
+2C1C0000 41820008
+935B0911 48000080
+807B00DC 7C1A1800
+40810024 BA810008
+800100B4 382100B0
+7C0803A6 3D808037
+618C6CEC 7D8903A6
+4E800420 807B00DC
+7C7A1850 38630001
+889B00E0 7C632051
+40800008 3863000E
+1C63000C 388300E1
+887B0000 1C63000C
+386300DC 7C611A14
+7C9B2214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+4BFFFE2C 3B5A0001
+935B0003 BA810008
+800100B4 382100B0
+7C0803A6 2C1E0000
+60000000 00000000
 C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm
 38600080 3D808037
 618CF1E4 7D8903A6
@@ -1936,6 +1914,42 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 7FC3F378
 60000000 00000000
+C20D4C1C 00000005 #Online/Core/FreezeDeadUpFallPhysics/InitHitVelocity.asm
+901F2344 C01E0030
+D01F2348 C01E003C
+D01F234C 38600000
+907F0080 907F0084
+907F0088 00000000
+C20D4D68 0000000B #Online/Core/FreezeDeadUpFallPhysics/UpdateFallVelocity.asm
+C03E0034 C05E0038
+C07F2348 FC630828
+FC401050 FC031040
+41810008 FC601090
+D07F2348 C03F2360
+C05F2348 EC21102A
+D03F2360 C03F234C
+C05F2364 EC21102A
+D03F2364 3D80800D
+618C4D84 7D8903A6
+4E800420 00000000
+C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808003 618C10B8
+7D8903A6 4E800421
+3D808036 618C9808
+7D8903A6 4E800421
+389E2350 38A10080
+3D808034 618C2AA8
+7D8903A6 4E800421
+80610080 907F0038
+80610084 907F003C
+80610088 907F0040
+BA810008 800100B4
+382100B0 7C0803A6
+3D808008 618C0EE4
+7D8903A6 4E800420
+60000000 00000000
 04019260 48000034 #Online/Core/Hacks/ForceNoDiskCrash.asm
 C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm
 48000031 7C6802A6
@@ -1963,18 +1977,19 @@ C23A63A8 0000000C #Online/Core/Hacks/LoadPremadeTextDataFromDolphin.asm
 7C0803A6 38600000
 986DAFEC 00000000
 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm
-C2019608 0000000E #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
+C2019608 0000000F #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
 9421FFF8 3C608048
 80639D30 5463443E
-2C030208 40820050
+2C030208 40820058
 3C608047 60639D64
 80630000 2C030000
-4082003C 3C608037
-60635E00 2C000003
-4082002C 80ADB61C
-886500D9 2C030000
+40820044 80ADB61C
+38600000 9865000F
+3C608037 60635E00
+2C000003 40820028
+886500DA 2C030000
 4182001C 38600001
-986507B7 3D808001
+98650908 3D808001
 618C9618 7D8903A6
 4E800420 38600000
 60000000 00000000
@@ -1993,11 +2008,11 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm
 40820090 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BDF0252 8B9E0000
+3BDF03A3 8B9E0000
 3C608048 80639D60
-809F07A1 7C032000
+809F08F2 7C032000
 41810028 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -2015,12 +2030,12 @@ C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0252 57DE043E
+3BBF03A3 57DE043E
 8B9D0000 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C032000 41810088
 3C608048 80639D60
-809F07A1 7C632050
+809F08F2 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -2045,12 +2060,12 @@ C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0252 57DE043E
+3BBF03A3 57DE043E
 8B9D0000 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C032000 41810088
 3C608048 80639D60
-809F07A1 7C632050
+809F08F2 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -2077,13 +2092,13 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm
 2C030000 40820120
 7C0802A6 90010004
 9421FF50 BE810008
-83EDB61C 3BDF0252
+83EDB61C 3BDF03A3
 3BA00000 3B400000
 56FB043E 8B9E0000
 3C608048 80639D60
-809F07A1 7C032000
+809F08F2 7C032000
 41810070 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -2112,6 +2127,17 @@ A0650000 7C1B1800
 800100B4 382100B0
 7C0803A6 2C1A0000
 60000000 00000000
+C216BE28 0000000A #Online/Core/Teams/PreventDeadStranding.asm
+2C030000 41820040
+3C808048 80849D30
+5484443E 2C040208
+4082002C 888DAFA0
+2C040003 40820020
+808DB61C 8884000D
+2C040001 41820008
+4800000C 38600000
+48000004 2C030000
+60000000 00000000
 C2266BC4 00000006 #Online/Menus/CSS/DisableLRSTART.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2135,14 +2161,14 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm
 618C5610 7D8903A6
 4E800421 38000000
 60000000 00000000
-C2263258 00000163 #Online/Menus/CSS/HandleInputsOnCSS.asm
+C2263258 00000168 #Online/Menus/CSS/HandleInputsOnCSS.asm
 41A20014 3D808026
 618C3334 7D8903A6
 4E800420 7C0802A6
 90010004 9421FF50
 BE810008 3C608048
 80639D30 5463443E
-2C030008 40820ACC
+2C030008 40820AF8
 7CFB3B78 3F008000
 63185614 83180000
 83580000 3B800000
@@ -2160,73 +2186,73 @@ BE810008 3C608048
 38600000 48000008
 38600003 3D808002
 618C4030 7D8903A6
-4E800421 887A0000
-2C030000 40810020
-2C030003 40810084
-2C030004 41820088
-2C030005 418201E4
-480009F8 88780014
-2C030000 408209EC
-576004E7 418209E4
-3C608048 80639D60
-2C030000 418209D4
-3860FFFF 986DAFC9
-38600000 986DAFCA
-886DB657 2C030000
-418209B8 886DAFA0
-2C030001 41820010
-2C030002 40800014
-48000000 3860FFFE
-48000359 48000994
-48000381 4800098C
-576006F7 408203BD
-48000980 3D80801A
-618C3680 7D8903A6
-4E800421 548006F7
-41820024 88780013
-38630001 98780013
-2C030030 40810014
-9B980013 48000385
-48000948 9B980013
-887A0001 2C030000
-408200EC 576004E7
-4082002C 886DAFA0
-2C030002 418000D8
-886DAFC9 2C030000
-408200CC 886DAFCA
-2C030001 408200C0
-48000004 886DB657
-2C030000 418200B0
-3C608048 80639D60
-2C030000 418200A0
+4E800421 480004C9
+887A0000 2C030000
+40810020 2C030003
+40810084 2C030004
+41820088 2C030005
+418201E0 48000A20
+88780014 2C030000
+40820A14 576004E7
+41820A0C 3C608048
+80639D60 2C030000
+418209FC 3860FFFF
+986DAFC9 38600000
+986DAFCA 886DB657
+2C030000 418209E0
 886DAFA0 2C030001
 41820010 2C030002
 40800014 48000000
-3860FFFE 4800016D
-4800007C 886DAFC9
-2C030000 4182001C
-2C030001 41820008
-48000000 3860FFFF
-48000149 48000058
-886DAFCA 2C030000
-41820018 806D8840
-38630598 A063001E
-48000129 48000038
-888DAFA0 2C040003
-38600000 40820008
-38600001 808DB610
-98640018 38600001
-986DB656 480000F9
-7C6802A6 906DAFE8
-48000850 480002F9
+3860FFFE 48000355
+480009BC 4800037D
+480009B4 576006F7
+408203B9 480009A8
+3D80801A 618C3680
+7D8903A6 4E800421
+548006F7 41820024
+88780013 38630001
+98780013 2C030030
+40810014 9B980013
+48000381 48000970
+9B980013 887A0001
+2C030000 408200EC
+576004E7 4082002C
+886DAFA0 2C030002
+418000D8 886DAFC9
+2C030000 408200CC
+886DAFCA 2C030001
+408200C0 48000004
+886DB657 2C030000
+418200B0 3C608048
+80639D60 2C030000
+418200A0 886DAFA0
+2C030001 41820010
+2C030002 40800014
+48000000 3860FFFE
+48000169 4800007C
+886DAFC9 2C030000
+4182001C 2C030001
+41820008 48000000
+3860FFFF 48000145
+48000058 886DAFCA
+2C030000 41820018
+806D8840 38630598
+A063001E 48000125
+48000038 888DAFA0
+2C040003 38600000
+40820008 38600001
+808DB610 98640018
+38600001 986DB656
+480000F5 7C6802A6
+906DAFE8 48000878
 887A0001 889A0002
-7C632039 4182083C
+7C632039 41820868
 BA810008 800100B4
 382100B0 7C0803A6
 3D808026 618C3264
 7D8903A6 4E800420
 576006F7 4082024D
-48000810 7C0802A6
+4800083C 7C0802A6
 90010004 9421FF50
 BE810008 38600014
 3D808037 618CF1E4
@@ -2349,18 +2375,18 @@ BA810008 800100B4
 4E800020 7C6E1B78
 7C0802A6 90010004
 9421FF50 BE810008
-480003F1 7DE802A6
+48000419 7DE802A6
 38600002 3D808002
 618C4030 7D8903A6
 4E800421 7DC37378
-98780014 3860000A
+98780014 3860000B
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C771B78 3880000A
+7C771B78 3880000B
 3D808000 618CC160
 7D8903A6 4E800421
 7DC37378 98770000
-7F03C378 90770006
+7F03C378 90770007
 38600004 38800005
 38A00080 3D808039
 618C01F0 7D8903A6
@@ -2396,20 +2422,22 @@ D0230038 D043003C
 7C0802A6 90010004
 9421FF50 BE810008
 820E002C 82EE0028
-8A300000 8A500001
-82700002 82B00006
-A2D50015 38600000
-B0750015 2C130000
-40820184 38600090
-7C721B78 98700001
-48000249 7DE802A6
+8A300000 8A500002
+82700003 82B00007
+A2D50015 83550000
+38600000 B0750015
+88700001 2C030000
+40820234 2C130000
+40820194 38600090
+7C721B78 98700002
+48000261 7DE802A6
 7E238B78 3D808000
 618C56AC 7D8903A6
 4E800421 7C741B78
 38600000 38800000
 3D80803A 618C6754
 7D8903A6 4E800421
-7C731B78 92700002
+7C731B78 92700003
 38600001 38800000
 C02F0000 C04F0004
 98730049 9893004A
@@ -2417,9 +2445,11 @@ D0330008 D0530024
 D0530028 C04F0008
 886DAFE0 2C030000
 41820008 C04F000C
-7E639B78 388F0034
+388F0034 887A0000
+2C030004 41820008
+388F0038 7E639B78
 38A00000 38CF0030
-38EF0038 39140004
+38EF003C 39140004
 C02F001C C06F0018
 3D808000 618C56B4
 7D8903A6 4E800421
@@ -2448,24 +2478,25 @@ C04F0014 7E639B78
 7D8903A6 4E800421
 7C6B1B78 386A0004
 7C0B1800 4082FF48
-480000C4 88750018
+480000CC 88750018
 2C030000 41820010
-88700001 2C03008A
-41810068 2C160200
-40820008 48000070
-2C160000 41820054
+88700002 2C03008A
+41810070 2C160200
+40820008 48000078
+2C160000 4182005C
 88750018 2C030003
-40800034 88750017
-2C030005 40800028
-38600000 98700001
+4080003C 88750017
+2C030005 40800030
+38600000 98700002
 7E238B78 7EC4B378
 38A00004 7C632830
-7C632214 4BFFFBD1
+7C632214 4BFFFBB1
+38600001 98700001
 4800005C 38600003
 3D808002 618C4030
 7D8903A6 4E800421
 2C120000 41820010
-3A52FFFF 9A500001
+3A52FFFF 9A500002
 48000034 38600000
 98750014 7DC37378
 3D808039 618C0228
@@ -2482,508 +2513,21 @@ C3DA8000 429E0000
 3EE66666 41C80000
 C1A00000 C20C0000
 C1840000 FFFFFFFF
-FFEA2FFF 43686174
-3A202573 00000000
-BA810008 800100B4
-382100B0 7C0803A6
-3D808026 618C3334
-7D8903A6 4E800420
-BA810008 800100B4
-382100B0 7C0803A6
-60000000 00000000
+FFEA2FFF C9C387FF
+43686174 3A202573
+00000000 BA810008
+800100B4 382100B0
+7C0803A6 3D808026
+618C3334 7D8903A6
+4E800420 BA810008
+800100B4 382100B0
+7C0803A6 00000000
 C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm
 3C608048 80639D30
 5463443E 2C030008
 4082000C 38604800
 48000008 38602400
 60000000 00000000
-C2264534 000001E6 #Online/Menus/CSS/InitCSS.asm
-3C608048 80639D30
-5463443E 2C030008
-40820F18 48000208
-4E800021 00000000
-3DCCCCCD 404CCCCD
-413CCCCD 3F4CCCCD
-C1600000 41C00000
-00000000 41F00000
-42480000 C2320000
-C1EC0000 C1BA0000
-40A00000 3D23D70A
-428C0000 41B80000
-3F000000 42B40000
-42500000 42960000
-42C40000 42500000
-428C0000 42B00000
-42D40000 3ECCCCCD
-43048000 43188000
-C3760000 C3020000
-C2480000 3EE66666
-33FF2FFF 3CBCFFFF
-8E9196FF FFFFFFFF
-FF0000FF 00556E72
-616E6B65 64004469
-72656374 0052616E
-6B656400 5465616D
-73002573 204D6F64
-65005365 6C656374
-20796F75 72206368
-61726163 74657200
-43686172 61637465
-72207365 6C656374
-65640050 72657373
-20535441 52542074
-6F202573 006C6F63
-6B20696E 00656E74
-65722063 6F646500
-73656172 63680073
-656C6563 74207374
-61676500 4C6F636B
-65642069 6E005365
-61726368 696E6720
-666F7220 25730043
-6F6E6E65 6374696E
-6720746F 20257300
-57616974 696E6720
-6F6E2025 73006F70
-706F6E65 6E74002D
-2D2F2F2D 2D2F2F2D
-2D2F2F2D 2D2F2F30
-30004572 726F7200
-506C6179 696E673A
-00557365 20442D50
-61642074 6F204368
-61740050 72657373
-205A2074 6F202573
-00486F6C 64205A20
-746F2025 73006469
-73636F6E 6E656374
-0063616E 63656C00
-636C6561 72206572
-726F7200 817B0081
-7E00817C 00736C70
-4353532E 64617400
-736C7043 53530000
-4E800021 C2E00000
-41A00000 00000000
-3DCCCCCD 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFDED
-7FA802A6 3C60804D
-606350D8 3C800200
-60840801 90830000
-888DAFA0 2C040002
-38800001 41800008
-38800002 4BFFFFAD
-7C6802A6 3D808000
-618C5618 7D8903A6
-4E800421 4E800021
-38600004 38800005
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 7C761B78
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C781B78
-38760000 38800004
-3CA08037 60A5F1B0
-38D80000 3D808039
-618C0B68 7D8903A6
-4E800421 38760000
-480002C1 7C8802A6
-38A00004 3D808038
-618CFD54 7D8903A6
-4E800421 3860001C
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7F1B78 3880001C
-3D808000 618CC160
-7D8903A6 4E800421
-3C608000 60635614
-93E30000 38600340
-3D808037 618CF1E4
-7D8903A6 4E800421
-907F0000 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7C1B78
-939F0008 38800001
-989C0049 38800000
-989C004A C03D0000
-D03C0008 C03D0004
-D03C0024 D03C0028
-7F83E378 389D0090
-38A00000 C03D0044
-C05D003C C07D0040
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 C07D004C
-4800012D C07D0050
-48000125 C07D0054
-4800011D 7F83E378
-389D008C 38A00000
-C03D0068 C05D003C
-C07D006C 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7F83E378 389D008C
-38A00000 C03D0068
-C05D003C C07D0070
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 7F83E378
-389D008C 38A00000
-C03D0044 C05D0078
-C07D0074 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7F83E378 389D0090
-38A00000 C03D0044
-C05D007C C07D0074
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 C07D0058
-480000C9 C07D005C
-480000C1 C07D0060
-480000B9 C07D0064
-480000B1 4BFFFB7D
-7E8802A6 387401D9
-3D808001 618C6BE0
-7D8903A6 4E800421
-389401E4 3D808038
-618C0358 7D8903A6
-4E800421 907F0004
-BA810008 800100B4
-382100B0 7C0803A6
-48000A48 7EA802A6
-FDA01890 7F83E378
-389D0090 38A00000
-C03D0068 C05D0048
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 7F83E378
-389D0090 38A00000
-C03D0080 C05D003C
-FC606890 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7EA803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-7F83E378 389D0094
-38A00000 C03D0068
-C05D003C 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7C7B1B78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 8363002C
-4BFFFA69 7FA802A6
-3F808000 639C5614
-839C0000 83DC0000
-835C0008 38FD0163
-3CC0804A 60C60740
-38800000 38A00000
-7C66222E 7C672B2E
-38840003 38A50002
-2C050012 4180FFEC
-806DB620 38810080
-38A00024 38C0FFFF
-3D808001 618C1E24
-7D8903A6 4E800421
-80610080 3D808036
-618CF644 7D8903A6
-4E800421 80610080
-38800000 80BC0004
-80A50008 38C00000
-3D808036 618CFA10
-7D8903A6 4E800421
-C022AEC4 886DAFA0
-2C030003 40820008
-C022AEC8 80610080
-3D808036 618CF934
-7D8903A6 4E800421
-80610080 3D808037
-618C0780 7D8903A6
-4E800421 887E0000
-2C030004 41810054
-38800000 38BD00B6
-886DAFA0 2C030001
-41820020 2C030002
-41820020 2C030000
-41820020 2C030003
-41820020 48000024
-38DD0099 48000020
-38DD00A2 48000018
-38DD00A9 48000010
-38DD00B0 48000008
-38BD0176 4800081D
-887E000A 2C030000
-4182001C 3B1E0015
-7C791B78 887C0018
-38630001 987C0018
-48000014 887E000B
-2C030000 418201BC
-7C791B78 887C0019
-2C030009 40810010
-38600000 987C0019
-418201A0 386000B7
-3880007F 38A00040
-3D808002 618C37A8
-7D8903A6 4E800421
-887C0017 38630001
-987C0017 3860000D
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C771B78 3880001C
-3D808000 618CC160
-7D8903A6 4E800421
-38600014 38800000
-98770000 98970001
-7F23CB78 98770002
-887C0019 98770003
-38630001 987C0019
-887E000C 98770008
-7F83E378 90770009
-38600004 38800005
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 7C761B78
-807C0004 80630004
-80630000 3D808037
-618C0E44 7D8903A6
-4E800421 7C651B78
-7EC3B378 888DC1A9
-3D808039 618C0A70
-7D8903A6 4E800421
-7EC3B378 3C808039
-60841070 38A00003
-38C00080 3D808039
-618C069C 7D8903A6
-4E800421 80760028
-809C0004 80840004
-38A00000 3D808016
-618C895C 7D8903A6
-4E800421 80760028
-C022AE28 3D808036
-618CF8BC 7D8903A6
-4E800421 886DAFE0
-2C030000 41820010
-C03D0014 80760028
-D0230038 7EC3B378
-38800004 3CA08037
-60A5F1B0 7EE6BB78
-3D808039 618C0B68
-7D8903A6 4E800421
-7EC3B378 480003E1
-7C8802A6 38A00004
-3D808038 618CFD54
-7D8903A6 4E800421
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BD017C
-38800009 48000615
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BE00B0
-3880000A 480005F5
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BD0185
-38800008 480005D5
-887E0000 2C030004
-41820034 2C030005
-41820020 2C030000
-4181000C 38BD0098
-48000024 38BD0197
-38DD01BD 48000018
-38BD0197 38DD01C4
-4800000C 38BD01A5
-38DD01B2 38800007
-48000589 3B600001
-7F64DB78 38BD0098
-48000579 3B7B0002
-2C1B0005 4081FFEC
-3880000C 38600000
-7C7C21AE 38840001
-2C04000E 4081FFF4
-3B60000B 7F64DB78
-38BD0098 48000545
-3B7B0001 2C1B000E
-4081FFEC 887E0000
-2C030005 408200A8
-3B60000B 3B200000
-3B000000 3AE00000
-3ADE0117 7EB6C8AE
-56A00631 41820010
-3B390002 3B180001
-48000018 2C150020
-40820008 7F37CB78
-3B390001 3B180001
-2C150000 41820018
-2C18001E 41810008
-4800002C 38800000
-7C96B9AE 7F64DB78
-7EC5B378 480004C5
-3B7B0001 7ED6BA14
-3AD60001 3B200000
-3B000000 2C150000
-41820020 387E0208
-7C96CA14 7C041800
-40800010 2C1B000E
-41810008 4BFFFF78
-4800014C 3B600001
-886DB657 7F64DB78
-2C030000 40820018
-38BD00BE 4800046D
-38600001 987C000C
-48000124 38BD00D4
-48000459 3B7B0002
-38600002 987C000C
-887E0001 7F64DB78
-2C030000 40820080
-886DAFA0 2C030002
-41800034 887E0000
-2C030004 40820028
-886DAFC9 2C030000
-4082001C 886DAFCA
-2C030000 40820010
-38BD00E7 38DD0113
-48000034 38BD00E7
-38DD00F9 887E0000
-2C030004 41820020
-38BD00E7 38DD010C
-886DAFA0 2C030002
-4180000C 38BD00E7
-38DD0101 480003CD
-38600001 987C000D
-48000084 38BD0120
-480003B9 3B7B0002
-38600002 987C000D
-887E0000 7F64DB78
-2C030004 4182004C
-2C030003 41820024
-88ADAFA0 2C050001
-38BD012A 38DD015A
-41820038 38BD012A
-38DD0163 4800002C
-88ADAFA0 2C050001
-38BD013B 38DD015A
-41820018 38BD013B
-38DD0163 4800000C
-38BD014C 38DD015A
-48000349 38600001
-987C000E 3B20000C
-3B600002 7C7CC8AE
-2C030001 40820044
-A07C000F 3880000F
-7C632396 1C630003
-386301D0 7CBD1A14
-7F64DB78 4800030D
-7F43D378 7F64DB78
-38BD0088 3D80803A
-618C74F0 7D8903A6
-4E800421 48000044
-2C030002 40820030
-7F64DB78 38BD01D6
-480002D9 7F43D378
-7F64DB78 38BD0084
-3D80803A 618C74F0
-7D8903A6 4E800421
-48000010 7F64DB78
-38BD0098 480002AD
-3B7B0002 3B390001
-2C19000E 4081FF68
-A07C000F 38630001
-2C03001E 41800008
-38600000 B07C000F
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-7C6E1B78 7C0802A6
-90010004 9421FF50
-BE810008 4BFFF365
-7FA802A6 820E002C
-8A300000 8A500001
-8A700002 8A900003
-82B00004 8AF00008
-83900009 81EE0028
-81EF0010 7DE37B78
-3D808037 618C0928
-7D8903A6 4E800421
-2C150000 408200CC
-7E83A378 3D808000
-618C55F4 7D8903A6
-4E800421 C05D0018
-C07D0008 EC6100F2
-EC421828 D04F003C
-2C120000 4182009C
-3A2000AA 9A300000
-3A400001 9A500001
-7C962378 7E83A378
-3D808000 618C55F4
-7D8903A6 4E800421
-C05D0030 C07D0008
-EC6100F2 EC42182A
-FDE01090 806DC2DC
-38800003 9883000E
-C03D002C 886DAFE0
-2C030000 41820008
-C03D0028 38770001
-7E649B78 38A00002
-38C00000 C07D0034
-C09D0038 3D808000
-618C56B4 7D8903A6
-4E800421 90700004
-806DC2DC 38800001
-9883000E 48000004
-887C0017 2C030006
-41800028 887C0019
-7C03A000 4080000C
-2C140009 408100B4
-887C0019 7C741850
-2C030006 418100A4
-2C110000 4082001C
-2C120000 4182FF2C
-2C120001 41820018
-2C120002 41820084
-3A31FFFF 9A300000
-480000D4 3A400002
-9A500001 3A200014
-9A300000 806E0028
-809C0004 80840004
-38A00001 3D808016
-618C895C 7D8903A6
-4E800421 806E0028
-C022AE28 3D808036
-618CF8BC 7D8903A6
-4E800421 8075005C
-3D808037 618CF1B0
-7D8903A6 4E800421
-7EA3AB78 3D80803A
-618C5CC4 7D8903A6
-4E800421 48000060
-7DC37378 3D808039
-618C0228 7D8903A6
-4E800421 809C0000
-88840003 7C172000
-40820010 887C0018
-3863FFFF 987C0018
-887C0017 3863FFFF
-987C0017 887C0019
-7E84A378 38840001
-7C032000 41820008
-4800000C 38600000
-987C0019 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7EA802A6 7F43D378
-3D80803A 618C70A0
-7D8903A6 4E800421
-7EA803A6 4E800020
-80CDB638 00000000
 C22652F0 0000007C #Online/Menus/CSS/InitSheikSelector.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -3109,190 +2653,482 @@ C05F0040 FC011040
 7C0803A6 4E800020
 38600000 38980000
 60000000 00000000
-C22652F4 000000B8 #Online/Menus/CSS/InitTeamToggleButton.asm
+C2264534 000001DC #Online/Menus/CSS/LoadCSSText.asm
 3C608048 80639D30
 5463443E 2C030008
-40820590 888DAFA0
-2C040003 40820584
-4800002C 4E800021
-C0200000 C0A00000
-C1BC0000 C18C0000
-00000000 3F800000
-C19C0000 C0400000
+40820EC4 480001F8
+4E800021 00000000
+3DCCCCCD 404CCCCD
+413CCCCD 3F4CCCCD
+C1600000 41C00000
+00000000 41F00000
+42480000 C2320000
+C1EC0000 C1BA0000
+40A00000 3D23D70A
+428C0000 41B80000
+3F000000 42B40000
+42500000 42960000
+42C40000 42500000
+428C0000 42B00000
+42D40000 3ECCCCCD
+43048000 43188000
+C3760000 C3020000
+C2480000 3EE66666
+33FF2FFF 3CBCFFFF
+8E9196FF FFFFFFFF
+FF0000FF 00556E72
+616E6B65 64004469
+72656374 0052616E
+6B656400 5465616D
+73002573 204D6F64
+65005365 6C656374
+20796F75 72206368
+61726163 74657200
+43686172 61637465
+72207365 6C656374
+65640050 72657373
+20535441 52542074
+6F202573 006C6F63
+6B20696E 00656E74
+65722063 6F646500
+73656172 63680073
+656C6563 74207374
+61676500 4C6F636B
+65642069 6E005365
+61726368 696E6720
+666F7220 25730043
+6F6E6E65 6374696E
+6720746F 20257300
+57616974 696E6720
+6F6E2025 73006F70
+706F6E65 6E74002D
+2D2F2F2D 2D2F2F2D
+2D2F2F2D 2D2F2F30
+30004572 726F7200
+506C6179 696E673A
+00557365 20442D50
+61642074 6F204368
+61740050 72657373
+205A2074 6F202573
+00486F6C 64205A20
+746F2025 73006469
+73636F6E 6E656374
+0063616E 63656C00
+636C6561 72206572
+726F7200 817B0081
+7E00817C 00000000
+4E800021 C2E00000
+41A00000 00000000
 3DCCCCCD 7C0802A6
 90010004 9421FF50
-BE810008 3FC08000
-63DE5614 83DE0000
-4BFFFFBD 7FE802A6
-C3FF0010 C3DF0014
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C771B78
-38800004 3D808000
-618CC160 7D8903A6
-4E800421 7FC3F378
-90770006 38600004
+BE810008 4BFFFDFD
+7FA802A6 3C60804D
+606350D8 3C800200
+60840801 90830000
+888DAFA0 2C040002
+38800001 41800008
+38800002 4BFFFFAD
+7C6802A6 3D808000
+618C5618 7D8903A6
+4E800421 38A00000
+4E800021 38600004
 38800005 38A00080
 3D808039 618C01F0
 7D8903A6 4E800421
-7C741B78 806DB638
-80630030 80630008
-38800000 8063000C
-38840001 2C040007
-4180FFF4 80630008
-3D808037 618C0E44
+7C761B78 38600004
+3D808037 618CF1E4
 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
+7C781B78 38760000
 38800004 3CA08037
-60A5F1B0 7EE6BB78
+60A5F1B0 38D80000
 3D808039 618C0B68
 7D8903A6 4E800421
-7E83A378 480000CD
+38760000 48000261
 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
+3FE08000 63FF5614
+83FF0000 38600000
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C7C1B78
+939F0008 38800001
+989C0049 38800000
+989C004A C03D0000
+D03C0008 C03D0004
+D03C0024 D03C0028
+7F83E378 389D0090
+38A00000 C03D0044
+C05D003C C07D0040
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 C07D004C
+480000F9 C07D0050
+480000F1 C07D0054
+480000E9 7F83E378
+389D008C 38A00000
+C03D0068 C05D003C
+C07D006C 38FD0098
+3D808000 618C56B4
 7D8903A6 4E800421
-80630004 80630008
-FC20F890 3D808036
-618C3C2C 7D8903A6
-4E800421 BA810008
+7F83E378 389D008C
+38A00000 C03D0068
+C05D003C C07D0070
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7F83E378
+389D008C 38A00000
+C03D0044 C05D0078
+C07D0074 38FD0098
+3D808000 618C56B4
+7D8903A6 4E800421
+7F83E378 389D0090
+38A00000 C03D0044
+C05D007C C07D0074
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 C07D0058
+480000AD C07D005C
+480000A5 C07D0060
+4800009D C07D0064
+48000095 BA810008
 800100B4 382100B0
-7C0803A6 480002E4
-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
+7C0803A6 48000A78
 7C0802A6 90010004
 9421FF50 BE810008
-808DB610 886DB650
-1C630024 7F841A14
-887C0070 7C7B1B78
-3D808000 618C56B8
-7D8903A6 4E800421
-7C651B78 38600000
-1C630024 3C80803F
-60840A48 7C832214
-886403C2 1C63001C
-7C832A14 8B4400DD
-889E001A 38840001
-2C040004 41800008
-38800001 989E001A
-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 48000099
-B8610008 80010104
-38210100 7C0803A6
-7F23CB78 7F64DB78
-3D808000 618C56B0
-7D8903A6 4E800421
-7C781B78 886DB657
-2C030000 4182004C
-9B1C0073 3CA0803F
-60A50E09 9B050000
-9B1E001B 38600000
-7F44D378 7F05C378
-38C00000 3D808000
-618C56BC 7D8903A6
-4E800421 38600002
-3D808002 618C4030
+FDA01890 7F83E378
+389D0090 38A00000
+C03D0068 C05D0048
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7F83E378
+389D0090 38A00000
+C03D0080 C05D003C
+FC606890 38FD0098
+3D808000 618C56B4
 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
+BE810008 7F83E378
+389D0094 38A00000
+C03D0068 C05D003C
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7C7B1B78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+8363002C 4BFFFAD5
+7FA802A6 3F808000
+639C5614 839C0000
+83DC0000 835C0008
+38FD0163 3CC0804A
+60C60740 38800000
+38A00000 7C66222E
+7C672B2E 38840003
+38A50002 2C050012
+4180FFEC 806DB620
+38810080 38A00024
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610080
+3D808036 618CF644
+7D8903A6 4E800421
+80610080 38800000
+80BC0004 80A50008
+38C00000 3D808036
+618CFA10 7D8903A6
+4E800421 C022AEC4
+886DAFA0 2C030003
+40820008 C022AEC8
+80610080 3D808036
+618CF934 7D8903A6
+4E800421 80610080
+3D808037 618C0780
+7D8903A6 4E800421
+38800000 38BD00B6
+887E0000 2C030004
+4181004C 886DAFA0
+2C030001 41820020
+2C030002 41820020
+2C030000 41820020
+2C030003 41820020
+48000024 38DD0099
+48000020 38DD00A2
+48000018 38DD00A9
+48000010 38DD00B0
+48000008 38BD0176
+4800081D 887E000A
+2C030000 4182001C
+3B1E0015 7C791B78
+887C0018 38630001
+987C0018 48000014
+887E000B 2C030000
+418201BC 7C791B78
+887C0019 2C030009
+40810010 38600000
+987C0019 418201A0
+386000B7 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 887C0017
+38630001 987C0017
+3860000D 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+3880001C 3D808000
+618CC160 7D8903A6
+4E800421 38600014
+38800000 98770000
+98970001 7F23CB78
+98770002 887C0019
+98770003 38630001
+987C0019 887E000C
+98770008 7F83E378
+90770009 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C761B78 807C0004
+80630004 80630000
+3D808037 618C0E44
+7D8903A6 4E800421
+7C651B78 7EC3B378
+888DC1A9 3D808039
+618C0A70 7D8903A6
+4E800421 7EC3B378
+3C808039 60841070
+38A00003 38C00080
+3D808039 618C069C
+7D8903A6 4E800421
+80760028 809C0004
+80840004 38A00000
+3D808016 618C895C
+7D8903A6 4E800421
+80760028 C022AE28
+3D808036 618CF8BC
+7D8903A6 4E800421
+886DAFE0 2C030000
+41820010 C03D0014
+80760028 D0230038
+7EC3B378 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7EC3B378
+480003E1 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BD017C 38800009
+48000615 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BE00B0 3880000A
+480005F5 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BD0185 38800008
+480005D5 887E0000
+2C030004 41820034
+2C030005 41820020
+2C030000 4181000C
+38BD0098 48000024
+38BD0197 38DD01BD
+48000018 38BD0197
+38DD01C4 4800000C
+38BD01A5 38DD01B2
+38800007 48000589
+3B600001 7F64DB78
+38BD0098 48000579
+3B7B0002 2C1B0005
+4081FFEC 3880000C
+38600000 7C7C21AE
+38840001 2C04000E
+4081FFF4 3B60000B
+7F64DB78 38BD0098
+48000545 3B7B0001
+2C1B000E 4081FFEC
+887E0000 2C030005
+408200A8 3B60000B
+3B200000 3B000000
+3AE00000 3ADE018B
+7EB6C8AE 56A00631
+41820010 3B390002
+3B180001 48000018
+2C150020 40820008
+7F37CB78 3B390001
+3B180001 2C150000
+41820018 2C18001E
+41810008 4800002C
+38800000 7C96B9AE
+7F64DB78 7EC5B378
+480004C5 3B7B0001
+7ED6BA14 3AD60001
+3B200000 3B000000
+2C150000 41820020
+387E027C 7C96CA14
+7C041800 40800010
+2C1B000E 41810008
+4BFFFF78 4800014C
+3B600001 886DB657
+7F64DB78 2C030000
+40820018 38BD00BE
+4800046D 38600001
+987C000C 48000124
+38BD00D4 48000459
+3B7B0002 38600002
+987C000C 887E0001
+7F64DB78 2C030000
+40820080 886DAFA0
+2C030002 41800034
+887E0000 2C030004
+40820028 886DAFC9
+2C030000 4082001C
+886DAFCA 2C030000
+40820010 38BD00E7
+38DD0113 48000034
+38BD00E7 38DD00F9
+887E0000 2C030004
+41820020 38BD00E7
+38DD010C 886DAFA0
+2C030002 4180000C
+38BD00E7 38DD0101
+480003CD 38600001
+987C000D 48000084
+38BD0120 480003B9
+3B7B0002 38600002
+987C000D 887E0000
+7F64DB78 2C030004
+4182004C 2C030003
+41820024 88ADAFA0
+2C050001 38BD012A
+38DD015A 41820038
+38BD012A 38DD0163
+4800002C 88ADAFA0
+2C050001 38BD013B
+38DD015A 41820018
+38BD013B 38DD0163
+4800000C 38BD014C
+38DD015A 48000349
+38600001 987C000E
+3B20000C 3B600002
+7C7CC8AE 2C030001
+40820044 A07C000F
+3880000F 7C632396
+1C630003 386301D0
+7CBD1A14 7F64DB78
+4800030D 7F43D378
+7F64DB78 38BD0088
+3D80803A 618C74F0
+7D8903A6 4E800421
+48000044 2C030002
+40820030 7F64DB78
+38BD01D6 480002D9
+7F43D378 7F64DB78
+38BD0084 3D80803A
+618C74F0 7D8903A6
+4E800421 48000010
+7F64DB78 38BD0098
+480002AD 3B7B0002
+3B390001 2C19000E
+4081FF68 A07C000F
+38630001 2C03001E
+41800008 38600000
+B07C000F BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-38600000 38980000
-3D80803A 618C6754
+4E800021 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFF3D1 7FA802A6
+820E002C 8A300000
+8A500001 8A700002
+8A900003 82B00004
+8AF00008 83900009
+81EE0028 81EF0010
+7DE37B78 3D808037
+618C0928 7D8903A6
+4E800421 2C150000
+408200CC 7E83A378
+3D808000 618C55F4
 7D8903A6 4E800421
+C05D0018 C07D0008
+EC6100F2 EC421828
+D04F003C 2C120000
+4182009C 3A2000AA
+9A300000 3A400001
+9A500001 7C962378
+7E83A378 3D808000
+618C55F4 7D8903A6
+4E800421 C05D0030
+C07D0008 EC6100F2
+EC42182A FDE01090
+806DC2DC 38800003
+9883000E C03D002C
+886DAFE0 2C030000
+41820008 C03D0028
+38770001 7E649B78
+38A00002 38C00000
+C07D0034 C09D0038
+3D808000 618C56B4
+7D8903A6 4E800421
+90700004 806DC2DC
+38800001 9883000E
+48000004 887C0017
+2C03000D 41800028
+887C0019 7C03A000
+4080000C 2C140009
+408100B4 887C0019
+7C741850 2C03000D
+418100A4 2C110000
+4082001C 2C120000
+4182FF2C 2C120001
+41820018 2C120002
+41820084 3A31FFFF
+9A300000 480000D4
+3A400002 9A500001
+3A200014 9A300000
+806E0028 809C0004
+80840004 38A00001
+3D808016 618C895C
+7D8903A6 4E800421
+806E0028 C022AE28
+3D808036 618CF8BC
+7D8903A6 4E800421
+8075005C 3D808037
+618CF1B0 7D8903A6
+4E800421 7EA3AB78
+3D80803A 618C5CC4
+7D8903A6 4E800421
+48000060 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+809C0000 88840003
+7C172000 40820010
+887C0018 3863FFFF
+987C0018 887C0017
+3863FFFF 987C0017
+887C0019 7E84A378
+38840001 7C032000
+41820008 4800000C
+38600000 987C0019
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7F43D378
+3D80803A 618C70A0
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 80CDB638
 60000000 00000000
 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm
 3C608048 80639D30
@@ -3318,52 +3154,97 @@ C22620AC 0000000B #Online/Menus/CSS/PreventBPressCharUnselect.asm
 618C2154 7D8903A6
 4E800420 88FF0004
 60000000 00000000
-C22600A8 0000000C #Online/Menus/CSS/PreventColorChange.asm
+C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm
 3C608048 80639D30
 5463443E 2C030008
-40820048 3C608000
-60635614 80630000
-8863001A 2C030000
-40820020 3C608000
-60635614 80630000
-80630000 88630001
-2C030000 41820014
-3D808026 618C028C
-7D8903A6 4E800420
-3C60803F 00000000
-C2264110 00000016 #Online/Menus/CSS/SkipReturnToCssSound.asm
-7C030378 7C0802A6
+4082003C 886DAFA0
+2C030003 41820020
+3C608000 60635614
+80630000 80630000
+88630001 2C030000
+41820014 3D808026
+618C028C 7D8903A6
+4E800420 3C60803F
+60000000 00000000
+C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm
+4800002C 4E800021
+C2E00000 41A00000
+00000000 3DCCCCCD
+736C7043 53532E64
+61740073 6C704353
+53000000 900DB638
+3C608048 80639D30
+5463443E 2C030008
+40820100 7C0802A6
 90010004 9421FF50
-BE810008 7C7F1B78
+BE810008 4BFFFFB1
+7FC802A6 3D808000
+618C5618 7D8903A6
+4E800421 7C6802A6
+39830014 7D8903A6
+4E800421 3860001C
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7F1B78 3880001C
+3D808000 618CC160
+7D8903A6 4E800421
+3C608000 60635614
+93E30000 386003B4
+3D808037 618CF1E4
+7D8903A6 4E800421
+907F0000 886DAFA0
+2C030003 40820030
+3C608026 606352F4
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 88630008
+987F001A 387E0010
+3D808001 618C6BE0
+7D8903A6 4E800421
+389E001B 3D808038
+618C0358 7D8903A6
+4E800421 907F0004
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm
+7C0802A6 90010004
+9421FF00 BC610008
 886DAFA3 2C030000
-40820044 38600000
+40820038 38600000
 3D808000 618C5610
 7D8903A6 4E800421
-8BC30000 3D808037
+8BC30001 3D808037
 618CF1B0 7D8903A6
-4E800421 2C1E0004
-40820044 886DAFC9
-2C030000 41820010
-48000034 38600000
-986DAFA3 7FE3FB78
-BA810008 800100B4
-382100B0 7C0803A6
-7C601B78 3D808026
-618C41A8 7D8903A6
-4E800420 7FE3FB78
-BA810008 800100B4
-382100B0 7C0803A6
-54601838 00000000
-C2262478 00000016 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
+4E800421 2C1E0000
+40820060 4800007C
+38600000 986DAFA3
+3C608023 6063CCA4
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E3000C
+807F0006 3D808037
+618CF1B0 7D8903A6
+4E800421 7FE3FB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+B8610008 80010104
+38210100 7C0803A6
+3D808026 618C41A8
+7D8903A6 4E800420
+B8610008 80010104
+38210100 7C0803A6
+80630020 00000000
+C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3FC08000 63DE5614
 83DE0000 3C608048
 80639D30 5463443E
-2C030008 40820054
+2C030008 40820044
 888DAFA0 2C040003
-40820048 807E0000
-88630001 2C030000
 40820038 8BFE001A
 2C1F0003 41820008
 3BFFFFFF 88CDB650
@@ -3391,6 +3272,189 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm
 BA810008 800100B4
 382100B0 7C0803A6
 387C0000 00000000
+C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm
+48000030 4E800021
+01C02000 00C0A000
+00C1BC00 00C18C00
+00000000 003F8000
+00C19C00 00C04000
+003DCCCC CD000000
+3C608048 80639D30
+5463443E 2C030008
+40820550 888DAFA0
+2C040003 40820544
+7C0802A6 90010004
+9421FF50 BE810008
+3FC08000 63DE5614
+83DE0000 4BFFFF99
+7FE802A6 C3FF0011
+C3DF0015 38600004
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800004
+3D808000 618CC160
+7D8903A6 4E800421
+7FC3F378 90770007
+38600004 38800005
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C741B78
+806DB638 80630030
+80630008 38800000
+8063000C 38840001
+2C040007 4180FFF4
+80630008 3D808037
+618C0E44 7D8903A6
+4E800421 7C751B78
+7EA3AB78 809F0019
+90830038 809F001D
+9083003C 809F0021
+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
+480000B5 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 480001F9
+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
+4BFFFD15 7FE802A6
+3BA00000 3C80804A
+60840BC0 80840000
+C024000C C0440010
+C07F0001 C09F0005
+C0BF0009 C0DF000D
+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 3D808000
+618C56B8 7D8903A6
+4E800421 7C651B78
+38600000 1C630024
+3C80803F 60840A48
+7C832214 886403C2
+1C63001C 7C832A14
+8B4400DD 889E001A
+38840001 2C040004
+41800008 38800001
+989E001A 989F0000
+4800002D 38600002
+3D808002 618C4030
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 808DB610
+886DB650 1C630024
+7F841A14 887C0070
+7C7B1B78 8B3E001A
+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 7F23CB78
+48000075 7F23CB78
+7F64DB78 3D808000
+618C56B0 7D8903A6
+4E800421 7C781B78
+886DB657 2C030000
+4182FF30 9B1C0073
+3CA0803F 60A50E09
+9B050000 9B1E001B
+38600000 7F44D378
+7F05C378 38C00000
+3D808000 618C56BC
+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
+60000000 00000000
 C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3451,6 +3515,31 @@ C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm
 800100B4 382100B0
 7C0803A6 38000000
 60000000 00000000
+C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C9D2378 7C7B1B78
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820068
+888DAFA0 2C040003
+4082005C 8BDF001A
+7FC3F378 7FA4EB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7C1B78 80ADB610
+9B850073 3CA0803F
+60A50E09 9B850000
+38600000 7FA4EB78
+7F85E378 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+48000004 7FA4EB78
+7F63DB78 BA810008
+800100B4 382100B0
+7C0803A6 98830070
+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
@@ -3567,9 +3656,10 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm
 40820010 38800058
 48000008 7FE4FB78
 60000000 00000000
-C223E994 0000002A #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
+0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm
+C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
 886DAFA3 2C030000
-41820140 38600001
+41820128 38600001
 986DAFCB 48000004
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3586,10 +3676,7 @@ C223E994 0000002A #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
 38600020 3D808037
 618CF1E4 7D8903A6
 4E800421 8099000C
-90640006 38600001
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7B1B78 38600004
+90640006 38600004
 38800005 38A00080
 3D808039 618C01F0
 7D8903A6 4E800421
@@ -3675,6 +3762,21 @@ BA810008 800100B4
 3D808023 618CCC80
 7D8903A6 4E800420
 38000000 00000000
+C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm
+886DAFA3 2C030000
+41820054 3C608023
+6063CCA4 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+8083000C 88A40004
+2C050008 4080000C
+38A50001 98A40004
+38830008 7C8903A6
+38600003 4E800421
+48000014 3D808023
+618CCE4C 7D8903A6
+4E800421 00000000
 C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm
 886DAFA3 2C030000
 41820054 3C608023
@@ -3796,7 +3898,7 @@ BE810008 3C60804D
 39400008 3D80803A
 618C611C 7D8903A6
 4E800421 7C7F1B78
-83CDB61C 93FE07B8
+83CDB61C 93FE0909
 4BFFFE69 7F8802A6
 38600000 3D808000
 618C5610 7D8903A6
@@ -3811,7 +3913,7 @@ D03D0008 C03C0004
 D03D0024 D03D0028
 C03C0008 C05C000C
 7FA3EB78 389C0048
-88BE001B 3D80803A
+88BE001C 3D80803A
 618C6B98 7D8903A6
 4E800421 7FA3EB78
 38800000 C03C0010
@@ -3977,7 +4079,7 @@ C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
 618C99F4 7D8903A6
 4E800420 38600001
 60000000 00000000
-C222E93C 00000028 #Online/Menus/TitleMenu/OnMenuLoad.asm
+C222E93C 00000029 #Online/Menus/TitleMenu/OnMenuLoad.asm
 48000020 4E800021
 C34C0000 C31D0000
 41880000 3D75C28F
@@ -3988,36 +4090,37 @@ C34C0000 C31D0000
 38800001 3D808000
 618C5618 7D8903A6
 4E800421 7FC802A6
-4E800021 4BFFFFC5
-7FA802A6 887D0000
-2C030000 41820074
-3D808002 618C6F2C
+38A00001 4E800021
+4BFFFFC1 7FA802A6
+887D0000 2C030000
+41820074 3D808002
+618C6F2C 7D8903A6
+4E800421 38600002
+38A00000 38C00008
+3D808002 618C702C
 7D8903A6 4E800421
-38600002 38A00000
-38C00008 3D808002
-618C702C 7D8903A6
-4E800421 3D808002
-618C7168 7D8903A6
-4E800421 3D808002
-618C7648 7D8903A6
-4E800421 38607535
-3880007F 38A00040
-3D808002 618C37A8
+3D808002 618C7168
 7D8903A6 4E800421
-38600000 987D0000
-38600001 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7C1B78
-386000BA 987C0000
-7F83E378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7F83E378
-3D808037 618CF1B0
+3D808002 618C7648
 7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-B9C10408 00000000
+38607535 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 38600000
+987D0000 38600001
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7C1B78 386000BA
+987C0000 7F83E378
+38800001 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1B0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 B9C10408
+60000000 00000000
 C21B1040 00000165 #Online/Menus/TitleMenu/OnMenuPrep.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -4392,10 +4495,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm
 41820014 3D808017
 618CBEC8 7D8903A6
 4E800421 00000000
-C2186EC4 00000077 #Online/Menus/VSScreen/InitVsSplash.asm
+C2186EC4 0000007D #Online/Menus/VSScreen/InitVsSplash.asm
 3C608048 80639D30
 5463443E 2C030408
-4082039C 48000060
+408203D0 48000060
 4E800021 00000000
 3F800000 3F000000
 3F19999A F15959FF
@@ -4426,92 +4529,98 @@ BE810008 38600000
 989E004A C03F0000
 D03E0008 C03F0004
 D03E0024 D03E0028
-887D0210 2C030001
+887D0284 2C030001
 41820038 387F0010
 389F0052 38BD0034
 38C00000 C03F001C
-4800010D 387F0014
+48000141 387F0014
 389F0055 38BD0053
 38C00000 C03F0020
-480000F5 48000038
-807D000D 480001E9
+48000129 48000038
+807D000D 4800021D
 387F0010 389F0044
-C03F001C 480000D9
-807D0011 480001D1
+C03F001C 4800010D
+807D0011 48000205
 387F0014 389F004B
-C03F0020 480000C1
+C03F0020 480000F5
 48000004 38600000
-38800000 C03F0024
-C05F002C C07F0030
-C09F0034 C0BF0038
-3D80803A 618C5ACC
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C7E1B78
+C03F0024 D03E0000
+C03F002C D03E0004
+C03F0030 D03E0008
+C03F0034 D03E000C
+C03F0038 D03E0010
+C03F0004 D03E0024
+D03E0028 38800001
+989E004A 989E0049
+C03F0000 D03E0008
+7FC3F378 A09D028A
+3D808000 618C5690
 7D8903A6 4E800421
-7C7E1B78 C03F0004
-D03E0024 D03E0028
-38800001 989E004A
-989E0049 C03F0000
-D03E0008 3CA0803B
-60A57808 A0DD0216
-38600000 1C830002
-7C85222E 7C043000
-41820014 38630001
-2C03001D 4180FFE8
-38600000 3C80803E
-6084D488 7C841A14
-8884005C 7FC3F378
-3D80803A 618C6368
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4800017C 7C0802A6
-90010004 9421FF50
-BE810008 FFE00890
-7C761B78 7C942378
-7CB92B78 7CDA3378
-7CF83B78 7D174378
-93210008 9301000C
-92E10010 C3DF0028
-C07F0040 7F43D378
-3D808000 618C55F4
-7D8903A6 4E800421
-EC630072 EFDE1828
-7FC3F378 389F0018
-7EC4B378 38A00000
-7E87A378 C03F0008
-FC40F890 FC60F090
-3D808000 618C56B4
-7D8903A6 4E800421
-39C00008 39E00000
-7C6E0A14 80E30000
-2C0F0000 4182000C
-C07F003C EFFF182A
-C09F0040 EFDE202A
-7FC3F378 389F0018
-38A00000 C03F000C
-FC40F890 FC60F090
-3D808000 618C56B4
-7D8903A6 4E800421
-39CE0004 39EF0001
-7C0FD000 4180FFAC
-BA810008 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
-60000000 00000000
+2C030001 41820058
+3CA0803B 60A57808
+A0DD028A 38600000
+1C830002 7C85222E
+7C043000 41820014
+38630001 2C03001D
+4180FFE8 38600000
+3C80803E 6084D488
+7C841A14 8884005C
+7FC3F378 3D80803A
+618C6368 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4800017C
+7C0802A6 90010004
+9421FF50 BE810008
+FFE00890 7C761B78
+7C942378 7CB92B78
+7CDA3378 7CF83B78
+7D174378 93210008
+9301000C 92E10010
+C3DF0028 C07F0040
+7F43D378 3D808000
+618C55F4 7D8903A6
+4E800421 EC630072
+EFDE1828 7FC3F378
+389F0018 7EC4B378
+38A00000 7E87A378
+C03F0008 FC40F890
+FC60F090 3D808000
+618C56B4 7D8903A6
+4E800421 39C00008
+39E00000 7C6E0A14
+80E30000 2C0F0000
+4182000C C07F003C
+EFFF182A C09F0040
+EFDE202A 7FC3F378
+389F0018 38A00000
+C03F000C FC40F890
+FC60F090 3D808000
+618C56B4 7D8903A6
+4E800421 39CE0004
+39EF0001 7C0FD000
+4180FFAC BA810008
+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 00000000
 C2184DE4 00000010 #Online/Menus/VSScreen/PlayOpponentCharAnnouncer.asm
 3D808048 818C9D30
 558C443E 2C0C0408
@@ -4521,7 +4630,7 @@ BE810008 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 887F0004
-1C630024 389F0268
+1C630024 389F02DC
 7FC418AE 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
@@ -4592,18 +4701,18 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 0000016E #Online/Slippi Online Scene/main.asm
+C21A45B8 0000017A #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF50
 BE810008 3C80803E
-6084DC1C 48000215
+6084DC1C 48000245
 7C6802A6 38630000
 90640008 38600000
 986DAFA3 986DAFC8
 986DAFEC 986DAFE0
-38600008 4800016D
+38600008 4800019D
 7C8802A6 4800002D
-48000B04 80830000
+48000B64 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -4613,7 +4722,7 @@ BE810008 3C80803E
 7C7F1B78 7C9E2378
 3C80803D 6084AD30
 48000081 7C6802A6
-90640004 480000D5
+90640004 48000105
 7C6802A6 90640008
 38600001 98640000
 3C60803D 6063ACA4
@@ -4634,10 +4743,16 @@ BE810008 3C808045
 6084ABF0 886DAEF8
 98640006 3D808000
 618C56B8 7D8903A6
-4E800421 7C641B78
-3860000F 1C63001C
-7C832214 38600013
-986400DD BA810008
+4E800421 7C741B78
+3D808000 618C5698
+7D8903A6 4E800421
+7C751B78 3AC00000
+48000024 887400DD
+2C030012 40820010
+38600013 987400DD
+48000014 3AD60001
+3A94001C 7C16A800
+4180FFDC BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 4E800021 7C0802A6
@@ -4660,7 +4775,7 @@ BE810008 38600012
 00000000 00000000
 05000000 00000000
 00000000 04030000
-48000411 48000731
+48000411 4800074D
 20000000 80490880
 804D68D0 FF000000
 4E800021 81940000
@@ -4697,7 +4812,7 @@ BE810008 38600012
 4182001C 2C030000
 40820000 886DAFCA
 2C030000 41820020
-48000004 4800063D
+48000004 48000659
 3C808047 60849D30
 38600005 98640005
 48000018 3C808047
@@ -4725,7 +4840,7 @@ BE810008 3D80801B
 7D8903A6 4E800421
 7C7E1B78 887E0001
 889E0002 7C032000
-4082001C 4800055D
+4082001C 48000579
 3C808047 60849D30
 38600005 98640005
 4800001C 38600000
@@ -4741,7 +4856,7 @@ BE810008 3D80801B
 38600000 3D808000
 618C5610 7D8903A6
 4E800421 7C7F1B78
-887F0003 480005B5
+887F0003 480005E5
 986DAFC9 886DAFA0
 2C030003 40820020
 887F0003 38800001
@@ -4749,14 +4864,14 @@ BE810008 3D80801B
 38800000 988DAFC9
 4800003C 3A800000
 3AA00000 7E83A378
-48000579 2C030000
+480005A9 2C030000
 41820008 3AB50001
 3A940001 2C140004
 4180FFE4 2C150001
 4182000C 38600000
 986DAFC9 3E808047
 62949DA4 887F0003
-48000541 2C030000
+48000571 2C030000
 41820018 38600001
 98740000 38600000
 9874005D 48000014
@@ -4817,9 +4932,9 @@ FF2121EE 0000EE00
 98640008 887F0087
 9864000E 38600000
 9864FFFF 9864FFFB
-887E0210 2C030000
+887E0284 2C030000
 418200F4 887E0003
-1C630024 38630271
+1C630024 386302E5
 7F7E18AE 38600002
 98640002 38600001
 9864FFFB 98640006
@@ -4853,7 +4968,7 @@ FF2121EE 0000EE00
 90640014 887F0063
 98640018 887F0084
 9064001C 887F0087
-98640020 887E0210
+98640020 887E0284
 2C030000 41820024
 887F00A8 90640024
 887F00AB 98640028
@@ -4871,54 +4986,60 @@ A07F000E 9064000C
 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
+7EB50214 3D808000
+618C569C 7D8903A6
+4E800421 88950060
+7C840774 7C041800
+41820028 38600000
+3D808000 618C56A0
 7D8903A6 4E800421
-3C80803B 6084B6B0
-1C630003 7C6320AE
 3D808000 618C56A8
 7D8903A6 4E800421
-3D808002 618C7168
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 3C808047
-60849D30 38600003
-98640005 BA810008
+3A940001 2C140006
+3AB50024 4180FFB0
+A07F000E 3D808022
+618C519C 7D8903A6
+4E800421 7C641B78
+38600001 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3D808002
+618C7168 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C7F1B78
-83CD8840 3BDE0598
-7FC3F378 389F0208
-38A00138 3D808000
-618C31F4 7D8903A6
+3C808047 60849D30
+38600003 98640005
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+3D808000 618C5610
+7D8903A6 4E800421
+7C7F1B78 83CD8840
+3BDE0598 7FC3F378
+389F027C 38A00138
+3D808000 618C31F4
+7D8903A6 4E800421
+7FC3F378 3D808000
+618C5694 7D8903A6
 4E800421 3D808017
 618CEB30 7D8903A6
-4E800421 889F0268
-98830000 889F026B
+4E800421 889F02DC
+98830000 889F02DF
 98830001 38800000
 98830002 38800003
 98830005 38800078
 98830004 3C80803D
 6084DEC8 8084000C
-887F028C 98640002
+887F0300 98640002
 38602121 B0640003
 3C808049 60840880
-887F028F 98640016
+887F0303 98640016
 7FE3FB78 3D808037
 618CF1B0 7D8903A6
 4E800421 BA810008
@@ -4959,6 +5080,7 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 38600028
 987E0000 00000000
+04005694 4E800020 #Online/Static/AdjustNullCharID.asm
 C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -4978,14 +5100,14 @@ C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
-C20056AC 0000002E #Online/Static/ChatMessages.asm
+C20056AC 0000002F #Online/Static/ChatMessages.asm
 7CA802A6 2C030008
 4182001C 2C030004
 41820020 2C030002
 41820024 2C030001
 41820028 48000075
 7C6802A6 48000024
-480000F9 7C6802A6
+480000FD 7C6802A6
 48000018 480000C9
 7C6802A6 4800000C
 4800007D 7C6802A6
@@ -5012,22 +5134,29 @@ C20056AC 0000002E #Online/Static/ChatMessages.asm
 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 00000000
+0A060504 52656163
+74696F6E 7300736F
+72727900 6D792062
+006C6F6C 00776F77
+00000000 4E800021
+05090817 4D697363
+00676F74 74612067
+6F006F6E 65207365
+63006C65 74277320
+706C6179 20616761
+696E206C 61746572
+00626164 20636F6E
+6E656374 696F6E00
+60000000 00000000
+C2005690 00000002 #Online/Static/CheckAltStageName.asm
+38600000 4E800020
+60000000 00000000
 C20056B8 00000002 #Online/Static/GetCSSIconData.asm
 3C60803F 60630A48
 4E800020 00000000
+C2005698 00000002 #Online/Static/GetCSSIconNum.asm
+38600019 4E800020
+60000000 00000000
 C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5046,11 +5175,19 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20055F4 00000007 #Online/Static/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 2C030000 40820018
-38600340 3D808037
+386003B4 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
 386000B3 987F0000
@@ -5058,23 +5195,87 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 7FE3FB78
-38800340 38A00000
+388003B4 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
 7FE3FB78 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
-C200560C 00000016 #Online/Static/LoadState.asm
+C20056A4 00000022 #Online/Static/LoadPremadeText.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+3B800004 7F83E378
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7D1B78 7F84E378
+3D808000 618CC160
+7D8903A6 4E800421
+386000E1 48000055
+839D0000 7FA3EB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7D1B78
+386000E2 4800001D
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+987D0000 9BFD0001
+9BDD0002 7FA3EB78
+38800003 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7FA3EB78 7F84E378
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C200560C 00000033 #Online/Static/LoadState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 7C7B1B78 7C982378
 7CBA2B78 88DA0000
+3AC00000 3AD60001
+2C160007 408100DC
+48000044 4E800021
+4C6F6164 20737461
+74652072 65717565
+73746564 20666F72
+20667261 6D652025
+64206275 74206672
+616D6520 77617320
+6E6F7420 666F756E
+642E0000 7C0802A6
+90010004 9421FF00
+BC610008 7F05C378
+60000000 60000000
+60000000 60000000
+60000000 806DAFC4
+38630003 4BFFFF91
+7C8802A6 4CC63242
+3D808032 618C3CF4
+7D8903A6 4E800421
+806DAFC4 388000D0
+98830000 38800000
+98830001 38800001
+98830002 38800080
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 B8610008
+80010104 38210100
+7C0803A6 48000000
 38C6FFFF 2C060000
 40800008 38C60007
 1C660004 38630002
 7F3A1A14 80790000
-7C03C000 4082FFDC
+7C03C000 4082FEF8
 3D808034 618C7364
 7D8903A6 4E800421
 7C771B78 386000B2
@@ -5088,11 +5289,14 @@ 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
+C20055EC 00000008 #Online/Static/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
 60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
@@ -5117,11 +5321,101 @@ C2005608 00000016 #Online/Static/SaveState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
-C2005618 00000094 #Online/Static/UserDisplayFunctions.asm
+C20056B4 00000059 #Online/Static/SubtextFunctions.asm
+2C050002 418201F8
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF202890
+FF403090 2C180001
+418000FC 39E00004
+FC20B090 FC40B890
+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 FC40A890
+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 FC20B090
+FC40B890 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+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 7C0802A6
+90010004 9421FF50
+BE810008 7C7D1B78
+7C9C2378 7CDB3378
+FEC00890 FEE01090
+FF001890 FEA02090
+4800008D 7F4802A6
+38600000 7F64DB78
+C01A0000 FC20B090
+FC40B890 FC60C090
+C09A0004 C0BA0008
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C751B78 2C1C0000
+41820010 38600001
+986DAFEC 7F86E378
+7EA3AB78 7FA4EB78
+FC00A890 D0030024
+D0030028 3D80803A
+618C6368 7D8903A6
+4E800421 7EA3AB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+41100000 44160000
+41A00000 00000000
+C2005618 00000095 #Online/Static/UserDisplayFunctions.asm
 4E800021 4800004C
-480001DC 480002F0
-48000350 480003C8
-48000424 4E800021
+480001E0 480002F4
+48000354 480003CC
+48000428 4E800021
 00000000 41A00000
 41C80000 8E9196FF
 FFFFFFFF 3ECCCCCD
@@ -5131,142 +5425,143 @@ FFFFFFFF 3ECCCCCD
 7C0802A6 90010004
 9421FF50 BE810008
 7C791B78 7C9B2378
-7CBA2B78 480003D1
-4BFFFFAD 7FE802A6
-83DF0000 83BE0000
-C0390000 D03E000A
-C0590004 D05E000E
-9B7E0009 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7C1B78
-939E0005 38800001
-989C0049 38800000
-989C004A C0390008
-D03C0008 C039000C
-D03C0024 D03C0028
-38600001 48000059
-C03F0004 480000F1
-38600000 48000049
-C03F0008 480000E1
-38600001 48000039
-C03F0004 480000D1
-38600000 48000029
-480000D5 886DAFA1
-987E0004 7FA3EB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7A1B78
-C03E000A C05E000E
-7F83E378 389F001C
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C781B78 C03F0018
-2C1A0000 41820008
-C03F0014 FC400890
-7F83E378 7F04C378
-3D80803A 618C7548
-7D8903A6 4E800421
-38BF0010 2C1A0000
-41820008 38BF000C
-7F83E378 7F04C378
-3D80803A 618C74F0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 C05E000E
-EC42082A D05E000E
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFE29
+2C050000 41820008
+480003D1 4BFFFFA9
 7FE802A6 83DF0000
-83BE0000 839E0005
-48000159 3B600000
-7F83E378 7F64DB78
-38BF001C 3D80803A
-618C70A0 7D8903A6
-4E800421 3B7B0001
-2C1B0004 4180FFDC
-887D0000 2C030001
-408200A8 3C608047
-60639D30 88630000
-2C030001 40820018
-3C60804A 606304F0
-88630000 2C030008
-40820080 7F83E378
-38800000 38BF001D
+83BE0000 C0390000
+D03E000A C0590004
+D05E000E 9B7E0009
+38600000 38800000
+3D80803A 618C6754
+7D8903A6 4E800421
+7C7C1B78 939E0005
+38800001 989C0049
+38800000 989C004A
+C0390008 D03C0008
+C039000C D03C0024
+D03C0028 38600001
+48000059 C03F0004
+480000F1 38600000
+48000049 C03F0008
+480000E1 38600001
+48000039 C03F0004
+480000D1 38600000
+48000029 480000D5
+886DAFA1 987E0004
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+7C7A1B78 C03E000A
+C05E000E 7F83E378
+389F001C 3D80803A
+618C6B98 7D8903A6
+4E800421 7C781B78
+C03F0018 2C1A0000
+41820008 C03F0014
+FC400890 7F83E378
+7F04C378 3D80803A
+618C7548 7D8903A6
+4E800421 38BF0010
+2C1A0000 41820008
+38BF000C 7F83E378
+7F04C378 3D80803A
+618C74F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+C05E000E EC42082A
+D05E000E 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFFE25 7FE802A6
+83DF0000 83BE0000
+839E0005 48000159
+3B600000 7F83E378
+7F64DB78 38BF001C
 3D80803A 618C70A0
 7D8903A6 4E800421
-7F83E378 38800001
-38BD0001 3D80803A
-618C70A0 7D8903A6
-4E800421 887E0009
-2C030002 4082003C
-7F83E378 38800002
-38BF0022 3D80803A
+3B7B0001 2C1B0004
+4180FFDC 887D0000
+2C030001 408200A8
+3C608047 60639D30
+88630000 2C030001
+40820018 3C60804A
+606304F0 88630000
+2C030008 40820080
+7F83E378 38800000
+38BF001D 3D80803A
 618C70A0 7D8903A6
 4E800421 7F83E378
-38800003 38BD0020
+38800001 38BD0001
 3D80803A 618C70A0
 7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFD11
-7FE802A6 83DF0000
-889E0004 886DAFA1
-7C041800 987E0004
-41820024 38600001
-3D808002 618C4030
+887E0009 2C030002
+4082003C 7F83E378
+38800002 38BF0022
+3D80803A 618C70A0
 7D8903A6 4E800421
-806DB614 7C6903A6
+7F83E378 38800003
+38BD0020 3D80803A
+618C70A0 7D8903A6
 4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-4BFFFCAD 7FE802A6
-83DF0000 83BE0000
-386000B9 987D0000
-7FA3EB78 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FA3EB78
-3880002A 38A00000
+4BFFFD0D 7FE802A6
+83DF0000 889E0004
+886DAFA1 7C041800
+987E0004 41820024
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 806DB614
+7C6903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 4BFFFCA9
+7FE802A6 83DF0000
+83BE0000 386000B9
+987D0000 7FA3EB78
+38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-889D0000 988DAFA1
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 3CA0803E
-60A5AE68 88A508F4
-38800000 38600008
-3D808022 618C9938
-7D8903A6 4E800421
-2C030001 41820010
-38840001 7C042800
-4180FFDC 7C832378
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFBD1
-7FE802A6 38600012
+7FA3EB78 3880002A
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 889D0000
+988DAFA1 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+3CA0803E 60A5AE68
+88A508F4 38800000
+38600008 3D808022
+618C9938 7D8903A6
+4E800421 2C030001
+41820010 38840001
+7C042800 4180FFDC
+7C832378 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFFBCD 7FE802A6
+38600012 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+907F0000 3860002A
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7E1B78 907F0000
-3860002A 3D808037
-618CF1E4 7D8903A6
-4E800421 907E0000
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 00000000
-043775B8 A0190000 #Online/Logging/LogInputOnCopy.asm
+907E0000 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+043775B0 7C600775 #Online/Logging/LogInputOnCopy.asm
 041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
 0401985C 3C60804C
 04019860 91231F5C
@@ -5299,6 +5594,51 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 8001001C 38210018
 7C0803A6 4E800020
 BB010028 00000000
+C200569C 00000002 #Common/CompatibilityHooks/GetFighterNum.asm
+38600021 4E800020
+60000000 00000000
+C20056A0 00000007 #Common/CompatibilityHooks/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
+C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
+C20AC5B8 00000002 #Common/NanaDeterminism/NanaDeterminism.asm
+7C7D1B78 3BC00000
+60000000 00000000
+C21D24FC 00000018 #Common/PSCameraIndependentMonitor/PSCameraIndependentMonitor.asm
+48000018 4E800021
+C2F00000 42F00000
+42A00000 C1A00000
+7C0802A6 90010004
+9421FF50 BE810008
+7C7E1B78 4BFFFFD9
+7FA802A6 807E002C
+A86300EE 3D808003
+618C4110 7D8903A6
+4E800421 83E3002C
+7FC3F378 3D80801D
+618C32D0 7D8903A6
+4E800421 C05F00B0
+C03D0000 FC020840
+41800034 C03D0004
+FC020840 41810028
+C05F00B4 C03D0008
+FC020840 41810018
+C03D000C FC020840
+4180000C 38600001
+48000008 38600000
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
 
 $Recommended: Normal Lag Reduction [Hannes Mann]
 *Reduces input lag
@@ -5494,10 +5834,19 @@ $Optional: Disable Screen Shake [Achilles1515]
 *Will not cause desyncs when playing online
 04030E44 4E800020
 
-$Optional: Center Align 2P HUD [UnclePunch]
+$Optional: Center Align 2P HUD [UnclePunch, Fizzi]
 *When playing online, character %'s will always be centered ------------------------- 
 *Will not cause desyncs when playing online
-0416E9AC 38600002
+C216E9AC 00000009 #External/Force2PCenterHud/Force2PCenterHud.asm
+887F0061 2C030003
+41820030 887F0085
+2C030003 41820024
+887F00A9 2C030003
+40820018 887F00CD
+2C030003 4082000C
+38600002 4800000C
+887F0000 5463F77E
+60000000 00000000
 
 $Optional: Flash Red on Failed L-Cancel [Achilles1515, Fizzi]
 *When playing online, this will only affect your character --------------------------- 
@@ -5525,3 +5874,61 @@ C208D690 00000009 #External/FlashRedFailedLCancel/TriggerColor.asm
 88A5067F 2C050007
 4180000C 39E000D4
 99E30564 00000000
+
+$Optional: Show Friendly Player Indicators [Fizzi, UnclePunch]
+*When playing online, nametag YOU will show above your character. A heart will always be shown over your teammate. Helpful for colorblind players to keep track of the players.
+*Will not cause desyncs when playing online
+C20355B4 00000008 #Online/Optional/IndicateLocalPlayer/ForceLocalPlayerTag.asm
+3C608048 80639D30
+5463443E 2C030208
+40820028 806DB61C
+88630000 7C03F800
+40820018 38600000
+3D808003 618C55CC
+7D8903A6 4E800420
+1C9F0E90 00000000
+C22FD1EC 0000000E #Online/Optional/IndicateLocalPlayer/SetLocalPlayerTag.asm
+48000010 4E800021
+8278826E 82740000
+3C608048 80639D30
+5463443E 2C030208
+40820020 806DB61C
+88630000 7C03D800
+40820010 4BFFFFD1
+7C6802A6 4800002C
+7F63DB78 3D808003
+618C556C 7D8903A6
+4E800421 5463063E
+3D808023 618C754C
+7D8903A6 4E800421
+60000000 00000000
+C22FC9E4 0000001D #Online/Optional/ShowAllyIndicator/ShowAllyIndicator.asm
+3B840000 7C0802A6
+90010004 9421FF50
+BE810008 7C7E1B78
+3C608048 80639D30
+5463443E 2C030208
+408200A4 3D808016
+618CB168 7D8903A6
+4E800421 2C030000
+4182008C 806DB61C
+88630000 7C03F000
+4182007C 3D808003
+618C3370 7D8903A6
+4E800421 7C7D1B78
+7FC3F378 3D808003
+618C3370 7D8903A6
+4E800421 7C03E800
+4082004C 1C7E000E
+3C808046 6084B6A0
+7CA32214 8865003C
+60630010 9865003C
+1C7D0004 7C63FA14
+C0230064 BA810008
+800100B4 382100B0
+7C0803A6 3D80802F
+618CCA84 7D8903A6
+4E800420 7FC3F378
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini
index 1886a98164..ad818250c7 100644
--- a/Data/Sys/GameSettings/GALJ01r2.ini
+++ b/Data/Sys/GameSettings/GALJ01r2.ini
@@ -57,13 +57,18 @@ C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm
 0416B480 60000000 #C-Stick in Single Player [Zauron]
 0422D638 38000006 #Debug Menu [Magus, donny2112]
 041B0A14 38600002 #Exiting Debug Menu Returns to CSS [Achilles]
-C216E510 00000093 #External/NeutralSpawn/NeutralSpawn.asm
+C216E510 00000098 #External/NeutralSpawn/NeutralSpawn.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808016 618CB41C
 7D8903A6 4E800421
-2C030000 40820458
-2C1C0005 40800450
+2C030000 40820480
+2C1C0005 40800478
+3C608048 80639D30
+5463443E 2C03021C
+41820464 3C608048
+80639D30 5463443E
+2C03010F 41820450
 887F24D0 2C030001
 41820054 3B200000
 3B400000 7F43D378
@@ -338,16 +343,16 @@ C22662D0 0000001A #External/UCF 0.8/Indicator/UCF Text.asm
 9421FF50 BE810008
 48000089 7FC802A6
 38600000 38800000
-3DC0803A 61CE6754
-7DC903A6 4E800421
+3D80803A 618C6754
+7D8903A6 4E800421
 7C7F1B78 38800001
 989F0049 38800001
 989F004A C03E000C
 D03F0024 D03F0028
 7FE3FB78 48000059
 7C8802A6 C03E0000
-C05E0004 3DC0803A
-61CE6B98 7DC903A6
+C05E0004 3D80803A
+618C6B98 7D8903A6
 4E800421 7C641B78
 7FE3FB78 C03E0008
 C05E0008 3D80803A
@@ -558,29 +563,30 @@ C216DED4 00000039 #Common/CostumeBoundCheck/main.asm
 7C0803A6 8001001C
 60000000 00000000
 
-$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337]
+$Required: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337, Krohnos]
 *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
-C23219EC 0000001C #Recording/FlushFrameBuffer.asm
+C23219EC 0000001D #Recording/FlushFrameBuffer.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418200A0
+2C030000 418200A8
 806DB64C 83C30000
 83ADB650 7F9EEA14
-2C1D0000 41820088
+2C1D0000 41820090
 3860003C 987C0000
 806DB654 907C0001
 3C608048 80639D30
 5463443E 2C030208
-806DB654 40820034
+806DB654 4082003C
 80ADB61C 8885000D
-2C040000 40820024
+2C040000 4082002C
 8885000C 2C040000
-40820018 808507B3
-3884FF85 7C041800
+40820020 80850904
+3884FF85 80E5090D
+7C872050 7C041800
 40800008 7C832378
 907C0005 3BBD0009
 7FC3F378 7FA4EB78
@@ -620,19 +626,19 @@ C216D884 0000001C #Recording/SendGameEnd.asm
 800100B4 382100B0
 7C0803A6 819F2514
 60000000 00000000
-C216E74C 000000E3 #Recording/SendGameInfo.asm
+C216E74C 000000FC #Recording/SendGameInfo.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 418206DC
+2C030000 418207A0
 38600005 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7B1B78
 936DB64C 38800005
 3D808000 618CC160
 7D8903A6 4E800421
-38600702 3D808037
+38600726 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7E1B78
 93DB0000 38600000
@@ -644,15 +650,15 @@ C216E74C 000000E3 #Recording/SendGameInfo.asm
 7C7C1B78 38600035
 987E0000 3860001C
 987E0001 38600036
-987E0002 38600248
+987E0002 386002BD
 B07E0003 38600037
 987E0005 3860003F
 B07E0006 38600038
-987E0008 3860004C
+987E0008 38600050
 B07E0009 38600039
 987E000B 38600002
 B07E000C 3860003A
-987E000E 38600008
+987E000E 3860000C
 B07E000F 3860003B
 987E0011 3860002A
 B07E0012 3860003C
@@ -662,7 +668,7 @@ B07E0015 3860003D
 38600010 987E001A
 38600204 B07E001B
 38600036 987E001D
-3C600309 60630000
+3C60030C 60630000
 907E001E 387E0022
 7FE4FB78 38A00138
 3D808000 618C31F4
@@ -720,42 +726,65 @@ B07E0015 3860003D
 8862F23C 987E01BF
 3C608048 80639D30
 5463443E B07E01C0
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C791B78
+3C608048 80639D30
+5463443E 2C030208
+40820190 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
+4800001C 7F03C378
+3880001F 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
 3A800000 3ABF0060
-3AFE01C2 3B590034
-1C74001F 7F03BA14
+3AFE023E 3B5900EF
+1C74000A 7F03BA14
 1ED40024 7ED6AA14
 88760001 2C030000
-40820028 1C74001F
+40820028 1C74000A
 7C83D214 7F03C378
-38A0001F 3D808000
+38A0000A 3D808000
 618C31F4 7D8903A6
 4E800421 4800001C
-7F03C378 3880001F
+7F03C378 3880000A
 3D808000 618CC160
 7D8903A6 4E800421
 3A940001 2C140004
 4180FFA0 3A800000
-3ABF0060 3AFE023E
-3B5900EF 1C74000A
+3ABF0060 3AFE0266
+3B590117 1C74001D
 7F03BA14 1ED40024
 7ED6AA14 88760001
 2C030000 40820028
-1C74000A 7C83D214
-7F03C378 38A0000A
+1C74001D 7C83D214
+7F03C378 38A0001D
 3D808000 618C31F4
 7D8903A6 4E800421
 4800001C 7F03C378
-3880000A 3D808000
+3880001D 3D808000
 618CC160 7D8903A6
 4E800421 3A940001
 2C140004 4180FFA0
 7F23CB78 3D808037
 618CF1B0 7D8903A6
-4E800421 7FC3F378
-38800266 38A00001
+4E800421 4800001C
+387E01C2 38800118
+3D808000 618CC160
+7D8903A6 4E800421
+3D808000 618CADF4
+7D8903A6 4E800421
+987E02DA 7FC3F378
+388002DB 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
 38600205 3D808037
@@ -789,7 +818,7 @@ A0B50201 3D808000
 7C8802A6 38A00000
 3D808038 618CFD54
 7D8903A6 4E800421
-48000064 4E800021
+48000070 4E800021
 7C0802A6 90010004
 9421FF50 BE810008
 806DB64C 83A30000
@@ -797,65 +826,67 @@ A0B50201 3D808000
 3860003A 987D0000
 806DB654 907D0001
 3C60804D 80635F90
-907D0005 838DB650
-3B9C0009 938DB650
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 38600004
-38800007 38A00000
-3D808039 618C01F0
-7D8903A6 4E800421
-48000021 7C8802A6
-38A0000F 3D808038
-618CFD54 7D8903A6
-4E800421 48000124
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 806DB64C
-83E30000 83CDB650
-7FFFF214 3B600000
-806DC18C 83A30024
-2C1D0000 418200D8
-3B7B0001 2C1B000F
-418100CC 839D002C
-3860003B 987F0000
-806DB654 907F0001
-807C0010 B07F0005
-807C0024 987F0007
-807C002C 907F0008
-807C0040 907F000C
-807C0044 907F0010
-807C004C 907F0014
-807C0050 907F0018
-807C0C9C B07F001C
-807C0D44 907F001E
-807C001C 907F0022
-887C0DD7 987F0026
-887C0DDB 987F0027
-887C0DEB 987F0028
-887C0DEF 987F0029
-807C0518 2C030000
-41820018 8063002C
-2C030000 4182000C
-8863000C 48000008
-3860FFFF 987F002A
-83CDB650 3BDE002B
-93CDB650 3BFF002B
-83BD0008 2C1D0000
-4082FF30 BA810008
+907D0005 3C608048
+80639D60 907D0009
+838DB650 3B9C000D
+938DB650 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
+38600004 38800007
+38A00000 3D808039
+618C01F0 7D8903A6
+4E800421 48000021
+7C8802A6 38A0000F
+3D808038 618CFD54
+7D8903A6 4E800421
+48000124 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+806DB64C 83E30000
+83CDB650 7FFFF214
+3B600000 806DC18C
+83A30024 2C1D0000
+418200D8 3B7B0001
+2C1B000F 418100CC
+839D002C 3860003B
+987F0000 806DB654
+907F0001 807C0010
+B07F0005 807C0024
+987F0007 807C002C
+907F0008 807C0040
+907F000C 807C0044
+907F0010 807C004C
+907F0014 807C0050
+907F0018 807C0C9C
+B07F001C 807C0D44
+907F001E 807C001C
+907F0022 887C0DD7
+987F0026 887C0DDB
+987F0027 887C0DEB
+987F0028 887C0DEF
+987F0029 807C0518
+2C030000 41820018
+8063002C 2C030000
+4182000C 8863000C
+48000008 3860FFFF
+987F002A 83CDB650
+3BDE002B 93CDB650
+3BFF002B 83BD0008
+2C1D0000 4082FF30
 BA810008 800100B4
 382100B0 7C0803A6
-3C608017 00000000
-C206DA34 00000035 #Recording/SendGamePostFrame.asm
+4E800020 BA810008
+800100B4 382100B0
+7C0803A6 3C608017
+60000000 00000000
+C206DA34 00000036 #Recording/SendGamePostFrame.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3D808000 618C5604
 7D8903A6 4E800421
-2C030000 41820168
+2C030000 41820170
 887F221F 546306F7
-4082015C 8B7F000C
+40820164 8B7F000C
 806DB64C 83A30000
 838DB650 7FBDE214
 38600038 987D0000
@@ -897,7 +928,8 @@ B07D0030 887F1968
 807F0090 907D0041
 807F00EC 907D0045
 807F195C 907D0049
-838DB650 3B9C004D
+807F0014 907D004D
+838DB650 3B9C0051
 938DB650 BA810008
 800100B4 382100B0
 7C0803A6 8001001C
@@ -946,10 +978,13 @@ B07D0031 80640030
 800100B4 382100B0
 7C0803A6 881F2219
 60000000 00000000
-C2005604 00000007 #Recording/ShouldRecord.asm
+C2005604 0000000A #Recording/ShouldRecord.asm
 3C608048 80639D30
 5463443E 2C030202
-41820014 2C030208
+4182002C 2C030302
+41820024 2C030208
+4182001C 2C03010F
+41820014 2C030120
 4182000C 38600000
 4800000C 38600001
 48000004 4E800020
@@ -986,148 +1021,6 @@ 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
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 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 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-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 FC40A890
-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 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-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 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -1193,59 +1086,86 @@ C216EBAC 0000000C #Common/CSS KO Stars/Asign KO Stars Upon Exiting Dairantou.asm
 $Required: Slippi Online [Fizzi, UnclePunch]
 *Adds online mode, Slippi device must be in Slot B.
 *Change settings in Config > GameCube
-C206A880 00000018 #Online/Core/BrawlOffscreenDamage.asm
+C206A880 0000001B #Online/Core/BrawlOffscreenDamage.asm
 7C0802A6 90010004
 9421FF50 BE810008
-887F221F 54630673
-40820088 807F0010
-2C030004 4182007C
-2C030006 41820074
-3D808022 618C4A54
+3C608048 80639D30
+5463443E 2C030120
+41820094 887F221F
+54630673 40820088
+807F0010 2C030004
+4182007C 2C030006
+41820074 3D808022
+618C4A54 7D8903A6
+4E800421 C05F00B0
+FC020840 41800060
+3D808022 618C4A68
 7D8903A6 4E800421
 C05F00B0 FC020840
-41800060 3D808022
-618C4A68 7D8903A6
-4E800421 C05F00B0
-FC020840 41810044
-3D808022 618C4A80
+41810044 3D808022
+618C4A80 7D8903A6
+4E800421 C05F00B4
+FC020840 41810028
+3D808022 618C4A98
 7D8903A6 4E800421
 C05F00B4 FC020840
-41810028 3D808022
-618C4A98 7D8903A6
-4E800421 C05F00B4
-FC020840 4180000C
-38600000 48000008
-38600001 BA810008
-800100B4 382100B0
-7C0803A6 00000000
-C21A4DB4 0000001C #Online/Core/ForceEngineOnRollback.asm
+4180000C 38600000
+48000008 38600001
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C22F7094 0000000C #Online/Core/CustomizeMessageLRAS.asm
+3CE08048 80E79D30
+54E7443E 2C070208
+40820048 88E30008
+2C070007 4082003C
+89430001 816DB61C
+886B0000 7C035000
+41820018 38600005
+3D808002 618C4030
+7D8903A6 4E800421
+3D80802F 618C7120
+7D8903A6 4E800420
+8903000B 00000000
+C21A4DB4 0000001A #Online/Core/ForceEngineOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-408200B0 3C608047
+408200A4 3C608047
 60639D64 80630000
-2C030000 4082009C
+2C030000 40820090
 3D808034 618C7364
 7D8903A6 4E800421
 7C7A1B78 80ADB61C
 2C1B0000 41810014
-888500D9 2C040000
-41820038 3B600001
-888500D9 988507A9
-808500DB 908507AA
-888500DA 988507AE
-80850237 908507AF
-808500D5 80840002
-908507B3 48000028
-888507B7 2C040000
-4182001C 38800000
-988507B7 3D808001
-618C95FC 7D8903A6
-4E800421 7F43D378
-3D808034 618C738C
+888500DA 2C040000
+4182002C 3B600001
+888500DA 988508FA
+808500DC 908508FB
+888500DB 988508FF
+80850388 90850900
+48000028 88850908
+2C040000 4182001C
+38800000 98850908
+3D808001 618C95FC
+7D8903A6 4E800421
+7F43D378 3D808034
+618C738C 7D8903A6
+4E800421 2C1B0000
+40820014 3D80801A
+618C4DA8 7D8903A6
+4E800420 00000000
+C2019614 0000000C #Online/Core/ForceInputRefetchOnAdvance.asm
+3D808001 618CD2BC
+7D8903A6 4E800421
+3C608048 80639D30
+5463443E 2C030208
+40820038 3C608047
+60639D64 80630000
+2C030000 40820024
+80ADB61C 8865000F
+2C030000 41820014
+3D808001 618C95FC
 7D8903A6 4E800421
-2C1B0000 40820014
-3D80801A 618C4DA8
-7D8903A6 4E800420
 60000000 00000000
 C216D310 00000009 #Online/Core/HandleLRAS.asm
 3C608048 80639D30
@@ -1253,7 +1173,7 @@ C216D310 00000009 #Online/Core/HandleLRAS.asm
 40820028 3C608046
 6063B6A0 88630008
 2C030007 40820014
-808DB61C 806407A5
+808DB61C 806408F6
 7C6903A6 4E800421
 8001003C 83E10034
 60000000 00000000
@@ -1280,39 +1200,39 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-40820338 386007BC
+40820338 38600919
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7B1B78 388007BC
+7C7B1B78 38800919
 3D808000 618CC160
 7D8903A6 4E800421
 936DB61C 38600001
 907B0003 4800023D
-7C6802A6 907B07A5
-38600012 3D808037
+7C6802A6 907B08F6
+38600016 3D808037
 618CF1E4 7D8903A6
-4E800421 907B00D1
-3860010A 3D808037
+4E800421 907B00D2
+3860010E 3D808037
 618CF1E4 7D8903A6
-4E800421 907B00D5
-7C7A1B78 3880010A
+4E800421 907B00D6
+7C7A1B78 3880010E
 3D808000 618CC160
 7D8903A6 4E800421
 38600021 3D808037
 618CF1E4 7D8903A6
 4E800421 7C791B78
-933B024A 3860009E
+933B039B 3860009E
 3D808037 618CF1E4
 7D8903A6 4E800421
-907B024E 3880009E
+907B039F 3880009E
 3D808000 618CC160
 7D8903A6 4E800421
 38800000 98830000
 38800007 98830001
-93790005 386007BC
+93790005 38600919
 90790009 9359000D
-3860010A 90790011
-807B024E 90790015
+3860010E 90790011
+807B039F 90790015
 3860009E 90790019
 38600000 9079001D
 38600000 3D808000
@@ -1323,7 +1243,7 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 88780004 987B0001
 80780005 907B0007
 3C80804D 90645F90
-7FE3FB78 38980208
+7FE3FB78 3898027C
 38A00138 3D808000
 618C31F4 7D8903A6
 4E800421 886DAFA0
@@ -1341,7 +1261,7 @@ C216E748 00000070 #Online/Core/InitOnlinePlay.asm
 2C03000F 41810010
 48000010 38600001
 48000008 3860000F
-987B001B 38A00000
+987B001C 38A00000
 3C60804C 606320BC
 1C850044 7C632214
 38800000 90830000
@@ -1386,55 +1306,67 @@ BE810008 838DB61C
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
-C216E904 0000003F #Online/Core/InitPause.asm
+C216E904 0000004B #Online/Core/InitPause.asm
 3C608048 80639D30
 5463443E 2C030208
-408201DC 3D808046
+4082023C 3D808046
 618CDB68 886C0002
 54630739 41820028
 48000029 7C6802A6
 906C0040 38600000
 986DAFC8 886C0002
 38800000 50831F38
-986C0002 480001A0
+986C0002 48000200
 4E800021 7C0802A6
 90010004 9421FF50
 BE810008 83ADB61C
-8BDD0001 3C80804C
-60841FAC 1C7E0044
-7C632214 80630000
-54600673 4182001C
-546006B5 41820014
-546005EF 4182000C
-546004E7 40820058
+3BC00000 7FC3F378
+3D808003 618C241C
+7D8903A6 4E800421
+2C030000 40820060
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
+7D8903A6 4E800421
+2C030000 41820038
+3C80804C 60841FAC
+1C7E0044 7C632214
+80630000 54600673
+4182001C 546006B5
+41820014 546005EF
+4182000C 546004E7
+40820068 3BDE0001
+2C1E0004 4180FF80
 8BDD0000 3C80804C
 60841FAC 1C7E0044
-7FE32214 807F0000
-54600673 4182001C
-546006B5 41820014
-546005EF 4182000C
-546004E7 40820020
-886DAFC8 2C030000
-418200A0 807F0008
-546004E7 40820064
-480000E4 38600002
-3D808002 618C4030
-7D8903A6 4E800421
-3D808037 618C8330
+7FE32214 886DAFC8
+2C030000 418200AC
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
 7D8903A6 4E800421
+2C030000 41820054
+807F0008 546004E7
+40820048 480000F0
 3C608046 6063B6A0
-9BC30001 7FC3F378
-38800007 3D808016
-618CCF4C 7D8903A6
-4E800421 38600003
-3C808046 6084B6A0
-98640000 48000088
+9BC30001 38800007
+98830008 3880001E
+988324D5 3D80802F
+618C3394 7D8903A6
+4E800421 3D80801A
+618C10FC 7D8903A6
+4E800421 480000B0
 38600000 986DAFC8
 3D80802F 618C33CC
 7D8903A6 4E800421
 7FC3F378 3D80801A
 618C10FC 7D8903A6
-4E800421 48000058
+4E800421 48000080
+887D000D 2C030000
+40820020 7FC3F378
+3D808003 618C3BD8
+7D8903A6 4E800421
+2C030000 41820058
 807F0008 546004E7
 4182004C 38600001
 986DAFC8 3D80802F
@@ -1450,23 +1382,23 @@ BA810008 800100B4
 382100B0 7C0803A6
 4E800020 881F0001
 60000000 00000000
-C21A5014 0000004F #Online/Core/LoopEngineForRollback.asm
+C21A5014 0000005C #Online/Core/LoopEngineForRollback.asm
 41A20014 3D80801A
 618C5024 7D8903A6
 4E800420 3C608048
 80639D30 5463443E
-2C030208 40820250
+2C030208 408202B8
 3C608047 60639D64
 80630000 2C030000
-4082023C 7C0802A6
+408202A4 7C0802A6
 90010004 9421FF50
 BE810008 3D808034
 618C7364 7D8903A6
 4E800421 7C7D1B78
-83EDB61C 3BDF0252
+83EDB61C 3BDF03A3
 8B9E0000 3F008048
 83189D60 3B18FFFF
-82FF07A1 7C18B800
+82FF08F2 7C18B800
 4181009C 7C78B850
 38630001 8B9E0000
 7F83E051 40800008
@@ -1495,58 +1427,88 @@ A0840001 7C032000
 38800061 3D808000
 618CC160 7D8903A6
 4E800421 7C18B800
-4081001C 931F07A1
+4081001C 931F08F2
 3B9C0001 2C1C0007
 41800008 3B9CFFF9
-9B9E0000 7FA3EB78
-3D808034 618C738C
-7D8903A6 4E800421
-8B7F07A9 2C1B0001
-408200CC 48000025
-BA810008 800100B4
-382100B0 7C0803A6
-3D80801A 618C4DE4
+9B9E0000 8B7F08FA
+2C1B0001 40820134
+807F08FB 7C181800
+41800048 38600000
+987F00DA 987F08FA
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 3B5A0001
+3D80801A 618C5024
 7D8903A6 4E800420
-7C0802A6 90010004
-9421FF50 BE810008
-3D808003 618C0A50
-7D8903A6 4E800421
-3D808002 618CA4AC
-7D8903A6 4E800421
-3D808003 618C0A50
-7D8903A6 4E800421
-80630028 3D808036
-618C8458 7D8903A6
-4E800421 806DC18C
-82830020 4800002C
-82B4002C 8875221F
-546006F7 40820018
-7E83A378 3D808008
-618C6A8C 7D8903A6
-4E800421 82940008
-2C140000 4082FFD4
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 48000029
 BA810008 800100B4
 382100B0 7C0803A6
-4E800020 BA810008
+3B5A0001 3D80801A
+618C4DE4 7D8903A6
+4E800420 7C0802A6
+90010004 9421FF50
+BE810008 3D808003
+618C0A50 7D8903A6
+4E800421 3D808002
+618CA4AC 7D8903A6
+4E800421 3D808003
+618C0A50 7D8903A6
+4E800421 80630028
+3D808036 618C8458
+7D8903A6 4E800421
+806DC18C 82830020
+4800002C 82B4002C
+8875221F 546006F7
+40820018 7E83A378
+3D808008 618C6A8C
+7D8903A6 4E800421
+82940008 2C140000
+4082FFD4 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7FA3EB78 3D808034
+618C738C 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 00000000
+C216D26C 00000003 #Online/Core/PauseCounter.asm
+808DB61C 8064090D
+38630001 9064090D
+387F0000 00000000
+C216CD08 0000000A #Online/Core/PreventPauseStranding.asm
+3C608048 80639D30
+5463443E 2C030208
+40820038 83ADB61C
+887D000D 2C030001
+40820028 889D0000
+887E0001 7C630774
+7C032000 41820014
+3C608016 6063CD28
+7C6903A6 4E800420
+3880FFFF 00000000
 C216EA30 00000004 #Online/Core/Remember Who LRA Started.asm
 981E0010 2C000007
 40820014 3C808046
 6084B6A0 88840001
 989E000C 00000000
-C2376A20 0000000A #Online/Core/SkipNewInputFetchOnRollback.asm
+C2376A20 0000000C #Online/Core/SkipNewInputFetchOnRollback.asm
 3C608048 80639D30
 5463443E 2C030208
-40820038 3C608047
+40820044 3C608047
 60639D64 80630000
-2C030000 40820024
-806DB61C 886300D9
-2C030001 40820014
-3D808037 618C6A28
-7D8903A6 4E800420
-3861002C 00000000
-C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
+2C030000 40820030
+808DB61C 886400DA
+2C030000 41820020
+886400DB 2C030000
+40820014 3D808037
+618C6A28 7D8903A6
+4E800420 3861002C
+60000000 00000000
+C21A4DE4 00000060 #Online/Core/StartEngineLoop.asm
 3D808037 618CE214
 7D8903A6 4E800421
 48000030 4E800021
@@ -1559,21 +1521,21 @@ C21A4DE4 0000005C #Online/Core/StartEngineLoop.asm
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-4082026C 3C608047
+40820288 3C608047
 60639D64 80630000
-2C030000 40820258
-834DB61C 3F608048
-837B9D60 3D808034
+2C030000 40820274
+83CDB61C 3FE08048
+83FF9D60 3D808034
 618C7364 7D8903A6
 4E800421 7C791B78
-887A000E 2C030000
-408200D0 887A000D
+887E000E 2C030000
+408200D0 887E000D
 2C030000 418200C4
 38600003 3D808002
 618C4030 7D8903A6
 4E800421 4BFFFF51
 7EE802A6 38600002
-809A07B8 3D80803A
+809E0909 3D80803A
 618C6754 7D8903A6
 4E800421 7C781B78
 38800001 98980049
@@ -1592,12 +1554,14 @@ C0570010 3D80803A
 38800000 38B70014
 3D80803A 618C74F0
 7D8903A6 4E800421
-38600001 987A000E
-887A07A9 2C030000
-418200B8 887A07AE
-2C030000 41820084
-807A024A 809A07AF
-80BA024E 3D808000
+38600001 987E000E
+887E08FA 2C030000
+418200B0 887E08FF
+2C030000 41820094
+807E0900 7C1F1800
+41820024 41800094
+807E039B 809E0900
+80BE039F 3D808000
 618C560C 7D8903A6
 4E800421 3D808001
 618C9894 7D8903A6
@@ -1606,261 +1570,275 @@ C0570010 3D80803A
 7C832051 4080000C
 88650000 7C841A14
 98850002 38600000
-98650003 3F608048
-837B9D60 807A0237
-907A0003 38600000
-987A0236 987A0247
-987A0248 987A0249
-987A00DA 987A07AE
+98650003 3FE08048
+83FF9D60 807E0388
+907E0003 38600000
+987E0387 987E0398
+987E0399 987E039A
+987E00DB 987E08FF
 3D808001 618C95FC
 7D8903A6 4E800421
-807A07AA 7C1B1800
-41800010 38600000
-987A00D9 987A07A9
-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 807A07A5
-7C6903A6 4E800421
-7F23CB78 3D808034
-618C738C 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 00000000
-C2376A28 000000DD #Online/Core/TriggerSendInput.asm
+807E0911 7C1F1800
+4181000C 7FE3FB78
+48000004 809E0904
+7C032000 40810008
+907E0904 887E0387
+2C030000 4182002C
+807E0904 7C1F1800
+40810020 807E039B
+7FE4FB78 80BE039F
+3D808000 618C5608
+7D8903A6 4E800421
+887E000C 2C030001
+4182004C 3C608046
+6063B6A0 88630008
+2C030000 40820010
+38600000 987E000B
+4800002C 887E000B
+38630001 987E000B
+2C030007 40810018
+38600001 987E000C
+807E08F6 7C6903A6
+4E800421 7F23CB78
+3D808034 618C738C
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C2376A28 000000E9 #Online/Core/TriggerSendInput.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3C608048 80639D30
 5463443E 2C030208
-408206B0 3C608047
+4082070C 3C608047
 60639D64 80630000
-2C030000 4082069C
-836DB61C 833B00D1
-831B00D5 82FB024A
-835B0003 887B00D9
-2C030001 418205F8
-887B001B 38800054
-7C632050 2C1A0003
-4080001C 386100DC
-38800030 3D808000
-618CC160 7D8903A6
-4E800421 889B0002
-1C84000C 386400E6
-7C6118AE 7C630774
-2C03FFFD 40820024
-386400DC 7C611A14
-389B000F 38A0000C
-3D808000 618C31F4
+2C030000 408206F8
+836DB61C 833B00D2
+831B00D6 82FB039B
+835B0003 889B0002
+1C84000C 386400DC
+7FA11A14 887B00DA
+2C030000 41820010
+887B00DB 2C030000
+41820638 887B001C
+38800054 7C632050
+2C1A0003 4080001C
+386100DC 38800030
+3D808000 618CC160
 7D8903A6 4E800421
-889B0002 1C84000C
-388400DC 387B000F
-7C812214 38A0000C
+48000040 88830000
+7C840774 2C04FFFE
+4180002C 2C040002
+41810024 88830001
+7C840774 2C04FFFE
+41800014 2C040002
+4181000C 38800000
+B0830000 4E800020
+387D0002 4BFFFFC1
+387D0004 4BFFFFB9
+887D000A 7C630774
+2C03FFFD 40820020
+7FA3EB78 389B0010
+38A0000C 3D808000
+618C31F4 7D8903A6
+4E800421 387B0010
+7FA4EB78 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
 386000B0 98790000
-93590001 887B001B
-98790005 889B0002
-1C84000C 388400DC
-38790006 7C812214
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 7F23CB78
-38800012 38A00001
+93590001 807B0904
+90790005 887B001C
+98790009 3879000A
+7FA4EB78 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+7F23CB78 38800016
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38780000
+3880010E 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
-38780000 3880010A
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 88780000
-2C030002 4182001C
-2C030003 41820008
-48000030 38600001
-987B000D 48000024
-BA810008 800100B4
-382100B0 7C0803A6
-3D808037 618C6CEC
-7D8903A6 4E800420
-889B001C 1C84000C
-3884001D 887B0000
-1C63000C 386300DC
-7C611A14 7C9B2214
+38600000 987B000F
+88780000 2C030002
+41820024 2C030003
+41820010 2C030004
+41820034 48000038
+38600001 987B000D
+4800002C BA810008
+800100B4 382100B0
+7C0803A6 3D808037
+618C6CEC 7D8903A6
+4E800420 38600001
+987B000F 889B001D
+1C84000C 3884001E
+887B0000 1C63000C
+386300DC 7C611A14
+7C9B2214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+887B00E0 1C63000C
+386300E1 889B0000
+1C84000C 388400DC
+7C7B1A14 7C812214
 38A0000C 3D808000
 618C31F4 7D8903A6
-4E800421 887B00DF
-1C63000C 386300E0
-889B0000 1C84000C
-388400DC 7C7B1A14
-7C812214 38A0000C
-3D808000 618C31F4
-7D8903A6 4E800421
-887B00DF 38630001
-2C030007 41800008
-38600000 987B00DF
-887B001C 1C63000C
-3863001D 7C7B1A14
-38990006 38A0000C
-3D808000 618C31F4
-7D8903A6 4E800421
-889B001B 887B001C
-38630001 7C032000
+4E800421 887B00E0
+38630001 2C03000E
 41800008 38600000
-987B001C 887B0236
+987B00E0 887B001D
+1C63000C 3863001E
+7C7B1A14 3899000A
+38A0000C 3D808000
+618C31F4 7D8903A6
+4E800421 889B001C
+887B001D 38630001
+7C032000 41800008
+38600000 987B001D
+8B9B00DA 887B0387
 2C030000 40820018
-38600000 987B0247
-987B0248 987B0249
-48000284 3A800000
-38D40247 7C66D8AE
-2C030001 40820178
+38600000 987B0398
+987B0399 987B039A
+48000264 3A800000
+38D40398 7C66D8AE
+2C030001 4082016C
 1CD40004 38C60002
 7C66C02E 1CD40004
-38C6023B 7C86D82E
-7C641851 41800158
-7C761B78 38D40134
-7C66D8AE 38D40137
-7C86D8AE 7EC3B378
-1C63000C 3863000E
+38C6038C 7C86D82E
+7EC41851 4180014C
+80DB0904 7C043000
+41810010 7C032000
+418100AC 48000134
+1C76000C 38630012
 1CD40054 7C633214
-38D40134 7C86D8AE
-1C84000C 3884013A
-1CB40054 7C842A14
+38D40189 7C86D8AE
+1C84000C 3884018F
+1CB400A8 7C842A14
 7CD81A14 7CFB2214
 88660000 88870000
 546306FE 548406FE
-7C032000 408200BC
+7C032000 408200AC
 88660001 88870001
 5463067E 5484067E
-7C032000 408200A4
-80660002 80870002
 7C032000 40820094
+80660002 80870002
+7C032000 40820084
 38A00005 38A50001
 2C050008 40800028
 7C6530AE 7C8538AE
 2C03002A 4181000C
 2C04002A 4081FFE0
-7C032000 40820064
+7C032000 40820054
 4BFFFFD4 1CD40004
-38C6023B 7C66D82E
+38C6038C 7C66D82E
 38630001 7C66D92E
-38D40134 7C66D8AE
-38630001 2C030007
-41800008 3863FFF9
-7C66D9AE 38D40134
-7C66D8AE 38D40137
-7C86D8AE 38D40134
-7C66D8AE 38D40137
+38D40189 7C66D8AE
+38630001 2C03000E
+41800008 3863FFF2
+7C66D9AE 38D40189
+7C66D8AE 38D4018C
 7C86D8AE 7C041800
-4082FEC0 48000040
-1CD40004 38C6023B
-7C66D82E 38600001
-987B00D9 987B00DA
-935B00DB BA810008
-800100B4 382100B0
-7C0803A6 3D808037
-618C6CEC 7D8903A6
-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
+4082FED0 48000044
+3B800001 4800003C
+38600001 987B00DA
+987B00DB 935B00DC
+3B5A0001 935B0003
+BA810008 800100B4
+382100B0 7C0803A6
+3D808037 618C6CEC
+7D8903A6 4E800420
 3A940001 2C140003
-4180FFAC 907B0237
-3A800000 38D40247
+4180FE80 39600000
+3A800000 82BB0904
+38D40398 7C86D8AE
+2C040001 40820028
+1CD40004 38C6038C
+7C86D82E 2C0B0000
+4182000C 7C04A800
+40800008 7C952378
+39600001 3A940001
+2C140003 4180FFC4
+92BB0388 92BB0911
+80D8000E 7C153000
+40810008 90DB0911
+2C1C0000 4082FF54
+3A800000 38D40398
 7C86D8AE 2C040001
-40820038 38D40134
-7C66D8AE 38D40137
-7C86D8AE 38D40134
-7C66D8AE 38D40137
+40820028 38D40189
+7C66D8AE 38D4018C
 7C86D8AE 7C041800
 40820010 38600000
-38D40247 7C66D9AE
+38D40398 7C66D9AE
 3A940001 2C140003
-4180FFB4 3A800000
-38D40247 7C86D8AE
+4180FFC4 3A800000
+38D40398 7C86D8AE
 2C040001 41820018
 3A940001 2C140003
 4180FFE8 38600000
-987B0236 3A800000
-3AA00000 887B0000
-7C151800 40820008
-3AB50001 1CD40004
-38C60002 7C66C02E
-7C7A1850 2C030000
-408000D4 887B001B
-38800054 7C632050
-7C1A1800 418000BC
-887B000C 2C030001
-418200B0 38D40137
+987B0387 3A800000
+3AA00000 3B800001
+887B0000 7C151800
+40820008 3AB50001
+1CD40004 38C60002
+7C66C02E 7C7A1850
+2C030000 408000D8
+887B001C 38800054
+7C632050 7C1A1800
+418000C0 887B000C
+2C030001 418200B4
+3B800000 38D4018C
 7EC6D8AE 1C76000C
-3863013A 1CB40054
+3863018F 1CB400A8
 7C632A14 1CD40054
-38C6000E 7C7B1A14
+38C60012 7C7B1A14
 7C983214 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
-38760001 2C030007
-41800008 3863FFF9
-38D40137 7C66D9AE
-38D40134 7C66D8AE
-38D40137 7C86D8AE
-38D40247 7C66D8AE
+38760001 2C03000E
+41800008 3863FFF2
+38D4018C 7C66D9AE
+38D40189 7C66D8AE
+38D4018C 7C86D8AE
+38D40398 7C66D8AE
 2C030001 4182003C
-1CD40004 38C6023B
+1CD40004 38C6038C
 7F46D92E 38600001
-38D40247 7C66D9AE
-38D40134 7EC6D9AE
-887B0236 2C030001
-41820010 935B0237
-38600001 987B0236
+38D40398 7C66D9AE
+38D40189 7EC6D9AE
+887B0387 2C030001
+41820010 935B0388
+38600001 987B0387
 38600000 1C63000C
-38A3000E 1CD40054
+38A30012 1CD40054
 7CA53214 1C75000C
 386300DC 7C611A14
 7C982A14 38A0000C
 3D808000 618C31F4
 7D8903A6 4E800421
 3A940001 3AB50001
-2C140003 4180FEC8
-48000080 807B00DB
-7C1A1800 40810024
-BA810008 800100B4
-382100B0 7C0803A6
-3D808037 618C6CEC
-7D8903A6 4E800420
-807B00DB 7C7A1850
-38630001 889B00DF
-7C632051 40800008
-38630007 1C63000C
-388300E0 887B0000
-1C63000C 386300DC
-7C611A14 7C9B2214
-38A0000C 3D808000
-618C31F4 7D8903A6
-4E800421 4BFFFE40
-3B5A0001 935B0003
-BA810008 800100B4
-382100B0 7C0803A6
-2C1E0000 00000000
+2C140003 4180FEC4
+2C1C0000 41820008
+935B0911 48000080
+807B00DC 7C1A1800
+40810024 BA810008
+800100B4 382100B0
+7C0803A6 3D808037
+618C6CEC 7D8903A6
+4E800420 807B00DC
+7C7A1850 38630001
+889B00E0 7C632051
+40800008 3863000E
+1C63000C 388300E1
+887B0000 1C63000C
+386300DC 7C611A14
+7C9B2214 38A0000C
+3D808000 618C31F4
+7D8903A6 4E800421
+4BFFFE2C 3B5A0001
+935B0003 BA810008
+800100B4 382100B0
+7C0803A6 2C1E0000
+60000000 00000000
 C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm
 38600080 3D808037
 618CF1E4 7D8903A6
@@ -1936,6 +1914,42 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 7FC3F378
 60000000 00000000
+C20D4C1C 00000005 #Online/Core/FreezeDeadUpFallPhysics/InitHitVelocity.asm
+901F2344 C01E0030
+D01F2348 C01E003C
+D01F234C 38600000
+907F0080 907F0084
+907F0088 00000000
+C20D4D68 0000000B #Online/Core/FreezeDeadUpFallPhysics/UpdateFallVelocity.asm
+C03E0034 C05E0038
+C07F2348 FC630828
+FC401050 FC031040
+41810008 FC601090
+D07F2348 C03F2360
+C05F2348 EC21102A
+D03F2360 C03F234C
+C05F2364 EC21102A
+D03F2364 3D80800D
+618C4D84 7D8903A6
+4E800420 00000000
+C2080E80 00000011 #Online/Core/FreezeDeadUpFallPhysics/UpdateModelPos.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808003 618C10B8
+7D8903A6 4E800421
+3D808036 618C9808
+7D8903A6 4E800421
+389E2350 38A10080
+3D808034 618C2AA8
+7D8903A6 4E800421
+80610080 907F0038
+80610084 907F003C
+80610088 907F0040
+BA810008 800100B4
+382100B0 7C0803A6
+3D808008 618C0EE4
+7D8903A6 4E800420
+60000000 00000000
 04019260 48000034 #Online/Core/Hacks/ForceNoDiskCrash.asm
 C2376304 0000000B #Online/Core/Hacks/ForceNoVideoAssert.asm
 48000031 7C6802A6
@@ -1963,18 +1977,19 @@ C23A63A8 0000000C #Online/Core/Hacks/LoadPremadeTextDataFromDolphin.asm
 7C0803A6 38600000
 986DAFEC 00000000
 04321D70 38600000 #Online/Core/Hacks/PreventCharacterCrowdChants.asm
-C2019608 0000000E #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
+C2019608 0000000F #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
 9421FFF8 3C608048
 80639D30 5463443E
-2C030208 40820050
+2C030208 40820058
 3C608047 60639D64
 80630000 2C030000
-4082003C 3C608037
-60635E00 2C000003
-4082002C 80ADB61C
-886500D9 2C030000
+40820044 80ADB61C
+38600000 9865000F
+3C608037 60635E00
+2C000003 40820028
+886500DA 2C030000
 4182001C 38600001
-986507B7 3D808001
+98650908 3D808001
 618C9618 7D8903A6
 4E800420 38600000
 60000000 00000000
@@ -1993,11 +2008,11 @@ C238D224 00000018 #Online/Core/Sound/AssignSoundInstanceId.asm
 40820090 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BDF0252 8B9E0000
+3BDF03A3 8B9E0000
 3C608048 80639D60
-809F07A1 7C032000
+809F08F2 7C032000
 41810028 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -2015,12 +2030,12 @@ C2088224 0000001D #Online/Core/Sound/NoDestroyVoice.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0252 57DE043E
+3BBF03A3 57DE043E
 8B9D0000 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C032000 41810088
 3C608048 80639D60
-809F07A1 7C632050
+809F08F2 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -2045,12 +2060,12 @@ C20882B0 0000001D #Online/Core/Sound/NoDestroyVoice2.asm
 408200CC 7C0802A6
 90010004 9421FF50
 BE810008 83EDB61C
-3BBF0252 57DE043E
+3BBF03A3 57DE043E
 8B9D0000 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C032000 41810088
 3C608048 80639D60
-809F07A1 7C632050
+809F08F2 7C632050
 38630001 8B9D0000
 7F83E051 40800008
 3B9C0007 1C7C00C2
@@ -2077,13 +2092,13 @@ C238D0B0 0000002A #Online/Core/Sound/PreventDuplicateSounds.asm
 2C030000 40820120
 7C0802A6 90010004
 9421FF50 BE810008
-83EDB61C 3BDF0252
+83EDB61C 3BDF03A3
 3BA00000 3B400000
 56FB043E 8B9E0000
 3C608048 80639D60
-809F07A1 7C032000
+809F08F2 7C032000
 41810070 3C608048
-80639D60 809F07A1
+80639D60 809F08F2
 7C632050 38630001
 8B9E0000 7F83E051
 40800008 3B9C0007
@@ -2112,6 +2127,17 @@ A0650000 7C1B1800
 800100B4 382100B0
 7C0803A6 2C1A0000
 60000000 00000000
+C216BE28 0000000A #Online/Core/Teams/PreventDeadStranding.asm
+2C030000 41820040
+3C808048 80849D30
+5484443E 2C040208
+4082002C 888DAFA0
+2C040003 40820020
+808DB61C 8884000D
+2C040001 41820008
+4800000C 38600000
+48000004 2C030000
+60000000 00000000
 C2266BC4 00000006 #Online/Menus/CSS/DisableLRSTART.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -2135,14 +2161,14 @@ C2260310 00000008 #Online/Menus/CSS/FetchMatchInfo.asm
 618C5610 7D8903A6
 4E800421 38000000
 60000000 00000000
-C2263258 00000163 #Online/Menus/CSS/HandleInputsOnCSS.asm
+C2263258 00000168 #Online/Menus/CSS/HandleInputsOnCSS.asm
 41A20014 3D808026
 618C3334 7D8903A6
 4E800420 7C0802A6
 90010004 9421FF50
 BE810008 3C608048
 80639D30 5463443E
-2C030008 40820ACC
+2C030008 40820AF8
 7CFB3B78 3F008000
 63185614 83180000
 83580000 3B800000
@@ -2160,73 +2186,73 @@ BE810008 3C608048
 38600000 48000008
 38600003 3D808002
 618C4030 7D8903A6
-4E800421 887A0000
-2C030000 40810020
-2C030003 40810084
-2C030004 41820088
-2C030005 418201E4
-480009F8 88780014
-2C030000 408209EC
-576004E7 418209E4
-3C608048 80639D60
-2C030000 418209D4
-3860FFFF 986DAFC9
-38600000 986DAFCA
-886DB657 2C030000
-418209B8 886DAFA0
-2C030001 41820010
-2C030002 40800014
-48000000 3860FFFE
-48000359 48000994
-48000381 4800098C
-576006F7 408203BD
-48000980 3D80801A
-618C3680 7D8903A6
-4E800421 548006F7
-41820024 88780013
-38630001 98780013
-2C030030 40810014
-9B980013 48000385
-48000948 9B980013
-887A0001 2C030000
-408200EC 576004E7
-4082002C 886DAFA0
-2C030002 418000D8
-886DAFC9 2C030000
-408200CC 886DAFCA
-2C030001 408200C0
-48000004 886DB657
-2C030000 418200B0
-3C608048 80639D60
-2C030000 418200A0
+4E800421 480004C9
+887A0000 2C030000
+40810020 2C030003
+40810084 2C030004
+41820088 2C030005
+418201E0 48000A20
+88780014 2C030000
+40820A14 576004E7
+41820A0C 3C608048
+80639D60 2C030000
+418209FC 3860FFFF
+986DAFC9 38600000
+986DAFCA 886DB657
+2C030000 418209E0
 886DAFA0 2C030001
 41820010 2C030002
 40800014 48000000
-3860FFFE 4800016D
-4800007C 886DAFC9
-2C030000 4182001C
-2C030001 41820008
-48000000 3860FFFF
-48000149 48000058
-886DAFCA 2C030000
-41820018 806D8840
-38630598 A063001E
-48000129 48000038
-888DAFA0 2C040003
-38600000 40820008
-38600001 808DB610
-98640018 38600001
-986DB656 480000F9
-7C6802A6 906DAFE8
-48000850 480002F9
+3860FFFE 48000355
+480009BC 4800037D
+480009B4 576006F7
+408203B9 480009A8
+3D80801A 618C3680
+7D8903A6 4E800421
+548006F7 41820024
+88780013 38630001
+98780013 2C030030
+40810014 9B980013
+48000381 48000970
+9B980013 887A0001
+2C030000 408200EC
+576004E7 4082002C
+886DAFA0 2C030002
+418000D8 886DAFC9
+2C030000 408200CC
+886DAFCA 2C030001
+408200C0 48000004
+886DB657 2C030000
+418200B0 3C608048
+80639D60 2C030000
+418200A0 886DAFA0
+2C030001 41820010
+2C030002 40800014
+48000000 3860FFFE
+48000169 4800007C
+886DAFC9 2C030000
+4182001C 2C030001
+41820008 48000000
+3860FFFF 48000145
+48000058 886DAFCA
+2C030000 41820018
+806D8840 38630598
+A063001E 48000125
+48000038 888DAFA0
+2C040003 38600000
+40820008 38600001
+808DB610 98640018
+38600001 986DB656
+480000F5 7C6802A6
+906DAFE8 48000878
 887A0001 889A0002
-7C632039 4182083C
+7C632039 41820868
 BA810008 800100B4
 382100B0 7C0803A6
 3D808026 618C3264
 7D8903A6 4E800420
 576006F7 4082024D
-48000810 7C0802A6
+4800083C 7C0802A6
 90010004 9421FF50
 BE810008 38600014
 3D808037 618CF1E4
@@ -2349,18 +2375,18 @@ BA810008 800100B4
 4E800020 7C6E1B78
 7C0802A6 90010004
 9421FF50 BE810008
-480003F1 7DE802A6
+48000419 7DE802A6
 38600002 3D808002
 618C4030 7D8903A6
 4E800421 7DC37378
-98780014 3860000A
+98780014 3860000B
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C771B78 3880000A
+7C771B78 3880000B
 3D808000 618CC160
 7D8903A6 4E800421
 7DC37378 98770000
-7F03C378 90770006
+7F03C378 90770007
 38600004 38800005
 38A00080 3D808039
 618C01F0 7D8903A6
@@ -2396,20 +2422,22 @@ D0230038 D043003C
 7C0802A6 90010004
 9421FF50 BE810008
 820E002C 82EE0028
-8A300000 8A500001
-82700002 82B00006
-A2D50015 38600000
-B0750015 2C130000
-40820184 38600090
-7C721B78 98700001
-48000249 7DE802A6
+8A300000 8A500002
+82700003 82B00007
+A2D50015 83550000
+38600000 B0750015
+88700001 2C030000
+40820234 2C130000
+40820194 38600090
+7C721B78 98700002
+48000261 7DE802A6
 7E238B78 3D808000
 618C56AC 7D8903A6
 4E800421 7C741B78
 38600000 38800000
 3D80803A 618C6754
 7D8903A6 4E800421
-7C731B78 92700002
+7C731B78 92700003
 38600001 38800000
 C02F0000 C04F0004
 98730049 9893004A
@@ -2417,9 +2445,11 @@ D0330008 D0530024
 D0530028 C04F0008
 886DAFE0 2C030000
 41820008 C04F000C
-7E639B78 388F0034
+388F0034 887A0000
+2C030004 41820008
+388F0038 7E639B78
 38A00000 38CF0030
-38EF0038 39140004
+38EF003C 39140004
 C02F001C C06F0018
 3D808000 618C56B4
 7D8903A6 4E800421
@@ -2448,24 +2478,25 @@ C04F0014 7E639B78
 7D8903A6 4E800421
 7C6B1B78 386A0004
 7C0B1800 4082FF48
-480000C4 88750018
+480000CC 88750018
 2C030000 41820010
-88700001 2C03008A
-41810068 2C160200
-40820008 48000070
-2C160000 41820054
+88700002 2C03008A
+41810070 2C160200
+40820008 48000078
+2C160000 4182005C
 88750018 2C030003
-40800034 88750017
-2C030005 40800028
-38600000 98700001
+4080003C 88750017
+2C030005 40800030
+38600000 98700002
 7E238B78 7EC4B378
 38A00004 7C632830
-7C632214 4BFFFBD1
+7C632214 4BFFFBB1
+38600001 98700001
 4800005C 38600003
 3D808002 618C4030
 7D8903A6 4E800421
 2C120000 41820010
-3A52FFFF 9A500001
+3A52FFFF 9A500002
 48000034 38600000
 98750014 7DC37378
 3D808039 618C0228
@@ -2482,508 +2513,21 @@ C3DA8000 429E0000
 3EE66666 41C80000
 C1A00000 C20C0000
 C1840000 FFFFFFFF
-FFEA2FFF 43686174
-3A202573 00000000
-BA810008 800100B4
-382100B0 7C0803A6
-3D808026 618C3334
-7D8903A6 4E800420
-BA810008 800100B4
-382100B0 7C0803A6
-60000000 00000000
+FFEA2FFF C9C387FF
+43686174 3A202573
+00000000 BA810008
+800100B4 382100B0
+7C0803A6 3D808026
+618C3334 7D8903A6
+4E800420 BA810008
+800100B4 382100B0
+7C0803A6 00000000
 C21A3F9C 00000005 #Online/Menus/CSS/IncreaseTextHeap.asm
 3C608048 80639D30
 5463443E 2C030008
 4082000C 38604800
 48000008 38602400
 60000000 00000000
-C2264534 000001E6 #Online/Menus/CSS/InitCSS.asm
-3C608048 80639D30
-5463443E 2C030008
-40820F18 48000208
-4E800021 00000000
-3DCCCCCD 404CCCCD
-413CCCCD 3F4CCCCD
-C1600000 41C00000
-00000000 41F00000
-42480000 C2320000
-C1EC0000 C1BA0000
-40A00000 3D23D70A
-428C0000 41B80000
-3F000000 42B40000
-42500000 42960000
-42C40000 42500000
-428C0000 42B00000
-42D40000 3ECCCCCD
-43048000 43188000
-C3760000 C3020000
-C2480000 3EE66666
-33FF2FFF 3CBCFFFF
-8E9196FF FFFFFFFF
-FF0000FF 00556E72
-616E6B65 64004469
-72656374 0052616E
-6B656400 5465616D
-73002573 204D6F64
-65005365 6C656374
-20796F75 72206368
-61726163 74657200
-43686172 61637465
-72207365 6C656374
-65640050 72657373
-20535441 52542074
-6F202573 006C6F63
-6B20696E 00656E74
-65722063 6F646500
-73656172 63680073
-656C6563 74207374
-61676500 4C6F636B
-65642069 6E005365
-61726368 696E6720
-666F7220 25730043
-6F6E6E65 6374696E
-6720746F 20257300
-57616974 696E6720
-6F6E2025 73006F70
-706F6E65 6E74002D
-2D2F2F2D 2D2F2F2D
-2D2F2F2D 2D2F2F30
-30004572 726F7200
-506C6179 696E673A
-00557365 20442D50
-61642074 6F204368
-61740050 72657373
-205A2074 6F202573
-00486F6C 64205A20
-746F2025 73006469
-73636F6E 6E656374
-0063616E 63656C00
-636C6561 72206572
-726F7200 817B0081
-7E00817C 00736C70
-4353532E 64617400
-736C7043 53530000
-4E800021 C2E00000
-41A00000 00000000
-3DCCCCCD 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFDED
-7FA802A6 3C60804D
-606350D8 3C800200
-60840801 90830000
-888DAFA0 2C040002
-38800001 41800008
-38800002 4BFFFFAD
-7C6802A6 3D808000
-618C5618 7D8903A6
-4E800421 4E800021
-38600004 38800005
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 7C761B78
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C781B78
-38760000 38800004
-3CA08037 60A5F1B0
-38D80000 3D808039
-618C0B68 7D8903A6
-4E800421 38760000
-480002C1 7C8802A6
-38A00004 3D808038
-618CFD54 7D8903A6
-4E800421 3860001C
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7F1B78 3880001C
-3D808000 618CC160
-7D8903A6 4E800421
-3C608000 60635614
-93E30000 38600340
-3D808037 618CF1E4
-7D8903A6 4E800421
-907F0000 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7C1B78
-939F0008 38800001
-989C0049 38800000
-989C004A C03D0000
-D03C0008 C03D0004
-D03C0024 D03C0028
-7F83E378 389D0090
-38A00000 C03D0044
-C05D003C C07D0040
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 C07D004C
-4800012D C07D0050
-48000125 C07D0054
-4800011D 7F83E378
-389D008C 38A00000
-C03D0068 C05D003C
-C07D006C 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7F83E378 389D008C
-38A00000 C03D0068
-C05D003C C07D0070
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 7F83E378
-389D008C 38A00000
-C03D0044 C05D0078
-C07D0074 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7F83E378 389D0090
-38A00000 C03D0044
-C05D007C C07D0074
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 C07D0058
-480000C9 C07D005C
-480000C1 C07D0060
-480000B9 C07D0064
-480000B1 4BFFFB7D
-7E8802A6 387401D9
-3D808001 618C6BE0
-7D8903A6 4E800421
-389401E4 3D808038
-618C0358 7D8903A6
-4E800421 907F0004
-BA810008 800100B4
-382100B0 7C0803A6
-48000A48 7EA802A6
-FDA01890 7F83E378
-389D0090 38A00000
-C03D0068 C05D0048
-38FD0098 3D808000
-618C56B4 7D8903A6
-4E800421 7F83E378
-389D0090 38A00000
-C03D0080 C05D003C
-FC606890 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7EA803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-7F83E378 389D0094
-38A00000 C03D0068
-C05D003C 38FD0098
-3D808000 618C56B4
-7D8903A6 4E800421
-7C7B1B78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-4E800021 7C0802A6
-90010004 9421FF50
-BE810008 8363002C
-4BFFFA69 7FA802A6
-3F808000 639C5614
-839C0000 83DC0000
-835C0008 38FD0163
-3CC0804A 60C60740
-38800000 38A00000
-7C66222E 7C672B2E
-38840003 38A50002
-2C050012 4180FFEC
-806DB620 38810080
-38A00024 38C0FFFF
-3D808001 618C1E24
-7D8903A6 4E800421
-80610080 3D808036
-618CF644 7D8903A6
-4E800421 80610080
-38800000 80BC0004
-80A50008 38C00000
-3D808036 618CFA10
-7D8903A6 4E800421
-C022AEC4 886DAFA0
-2C030003 40820008
-C022AEC8 80610080
-3D808036 618CF934
-7D8903A6 4E800421
-80610080 3D808037
-618C0780 7D8903A6
-4E800421 887E0000
-2C030004 41810054
-38800000 38BD00B6
-886DAFA0 2C030001
-41820020 2C030002
-41820020 2C030000
-41820020 2C030003
-41820020 48000024
-38DD0099 48000020
-38DD00A2 48000018
-38DD00A9 48000010
-38DD00B0 48000008
-38BD0176 4800081D
-887E000A 2C030000
-4182001C 3B1E0015
-7C791B78 887C0018
-38630001 987C0018
-48000014 887E000B
-2C030000 418201BC
-7C791B78 887C0019
-2C030009 40810010
-38600000 987C0019
-418201A0 386000B7
-3880007F 38A00040
-3D808002 618C37A8
-7D8903A6 4E800421
-887C0017 38630001
-987C0017 3860000D
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C771B78 3880001C
-3D808000 618CC160
-7D8903A6 4E800421
-38600014 38800000
-98770000 98970001
-7F23CB78 98770002
-887C0019 98770003
-38630001 987C0019
-887E000C 98770008
-7F83E378 90770009
-38600004 38800005
-38A00080 3D808039
-618C01F0 7D8903A6
-4E800421 7C761B78
-807C0004 80630004
-80630000 3D808037
-618C0E44 7D8903A6
-4E800421 7C651B78
-7EC3B378 888DC1A9
-3D808039 618C0A70
-7D8903A6 4E800421
-7EC3B378 3C808039
-60841070 38A00003
-38C00080 3D808039
-618C069C 7D8903A6
-4E800421 80760028
-809C0004 80840004
-38A00000 3D808016
-618C895C 7D8903A6
-4E800421 80760028
-C022AE28 3D808036
-618CF8BC 7D8903A6
-4E800421 886DAFE0
-2C030000 41820010
-C03D0014 80760028
-D0230038 7EC3B378
-38800004 3CA08037
-60A5F1B0 7EE6BB78
-3D808039 618C0B68
-7D8903A6 4E800421
-7EC3B378 480003E1
-7C8802A6 38A00004
-3D808038 618CFD54
-7D8903A6 4E800421
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BD017C
-38800009 48000615
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BE00B0
-3880000A 480005F5
-887E0000 2C030004
-4182000C 38BD0098
-48000008 38BD0185
-38800008 480005D5
-887E0000 2C030004
-41820034 2C030005
-41820020 2C030000
-4181000C 38BD0098
-48000024 38BD0197
-38DD01BD 48000018
-38BD0197 38DD01C4
-4800000C 38BD01A5
-38DD01B2 38800007
-48000589 3B600001
-7F64DB78 38BD0098
-48000579 3B7B0002
-2C1B0005 4081FFEC
-3880000C 38600000
-7C7C21AE 38840001
-2C04000E 4081FFF4
-3B60000B 7F64DB78
-38BD0098 48000545
-3B7B0001 2C1B000E
-4081FFEC 887E0000
-2C030005 408200A8
-3B60000B 3B200000
-3B000000 3AE00000
-3ADE0117 7EB6C8AE
-56A00631 41820010
-3B390002 3B180001
-48000018 2C150020
-40820008 7F37CB78
-3B390001 3B180001
-2C150000 41820018
-2C18001E 41810008
-4800002C 38800000
-7C96B9AE 7F64DB78
-7EC5B378 480004C5
-3B7B0001 7ED6BA14
-3AD60001 3B200000
-3B000000 2C150000
-41820020 387E0208
-7C96CA14 7C041800
-40800010 2C1B000E
-41810008 4BFFFF78
-4800014C 3B600001
-886DB657 7F64DB78
-2C030000 40820018
-38BD00BE 4800046D
-38600001 987C000C
-48000124 38BD00D4
-48000459 3B7B0002
-38600002 987C000C
-887E0001 7F64DB78
-2C030000 40820080
-886DAFA0 2C030002
-41800034 887E0000
-2C030004 40820028
-886DAFC9 2C030000
-4082001C 886DAFCA
-2C030000 40820010
-38BD00E7 38DD0113
-48000034 38BD00E7
-38DD00F9 887E0000
-2C030004 41820020
-38BD00E7 38DD010C
-886DAFA0 2C030002
-4180000C 38BD00E7
-38DD0101 480003CD
-38600001 987C000D
-48000084 38BD0120
-480003B9 3B7B0002
-38600002 987C000D
-887E0000 7F64DB78
-2C030004 4182004C
-2C030003 41820024
-88ADAFA0 2C050001
-38BD012A 38DD015A
-41820038 38BD012A
-38DD0163 4800002C
-88ADAFA0 2C050001
-38BD013B 38DD015A
-41820018 38BD013B
-38DD0163 4800000C
-38BD014C 38DD015A
-48000349 38600001
-987C000E 3B20000C
-3B600002 7C7CC8AE
-2C030001 40820044
-A07C000F 3880000F
-7C632396 1C630003
-386301D0 7CBD1A14
-7F64DB78 4800030D
-7F43D378 7F64DB78
-38BD0088 3D80803A
-618C74F0 7D8903A6
-4E800421 48000044
-2C030002 40820030
-7F64DB78 38BD01D6
-480002D9 7F43D378
-7F64DB78 38BD0084
-3D80803A 618C74F0
-7D8903A6 4E800421
-48000010 7F64DB78
-38BD0098 480002AD
-3B7B0002 3B390001
-2C19000E 4081FF68
-A07C000F 38630001
-2C03001E 41800008
-38600000 B07C000F
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-7C6E1B78 7C0802A6
-90010004 9421FF50
-BE810008 4BFFF365
-7FA802A6 820E002C
-8A300000 8A500001
-8A700002 8A900003
-82B00004 8AF00008
-83900009 81EE0028
-81EF0010 7DE37B78
-3D808037 618C0928
-7D8903A6 4E800421
-2C150000 408200CC
-7E83A378 3D808000
-618C55F4 7D8903A6
-4E800421 C05D0018
-C07D0008 EC6100F2
-EC421828 D04F003C
-2C120000 4182009C
-3A2000AA 9A300000
-3A400001 9A500001
-7C962378 7E83A378
-3D808000 618C55F4
-7D8903A6 4E800421
-C05D0030 C07D0008
-EC6100F2 EC42182A
-FDE01090 806DC2DC
-38800003 9883000E
-C03D002C 886DAFE0
-2C030000 41820008
-C03D0028 38770001
-7E649B78 38A00002
-38C00000 C07D0034
-C09D0038 3D808000
-618C56B4 7D8903A6
-4E800421 90700004
-806DC2DC 38800001
-9883000E 48000004
-887C0017 2C030006
-41800028 887C0019
-7C03A000 4080000C
-2C140009 408100B4
-887C0019 7C741850
-2C030006 418100A4
-2C110000 4082001C
-2C120000 4182FF2C
-2C120001 41820018
-2C120002 41820084
-3A31FFFF 9A300000
-480000D4 3A400002
-9A500001 3A200014
-9A300000 806E0028
-809C0004 80840004
-38A00001 3D808016
-618C895C 7D8903A6
-4E800421 806E0028
-C022AE28 3D808036
-618CF8BC 7D8903A6
-4E800421 8075005C
-3D808037 618CF1B0
-7D8903A6 4E800421
-7EA3AB78 3D80803A
-618C5CC4 7D8903A6
-4E800421 48000060
-7DC37378 3D808039
-618C0228 7D8903A6
-4E800421 809C0000
-88840003 7C172000
-40820010 887C0018
-3863FFFF 987C0018
-887C0017 3863FFFF
-987C0017 887C0019
-7E84A378 38840001
-7C032000 41820008
-4800000C 38600000
-987C0019 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7EA802A6 7F43D378
-3D80803A 618C70A0
-7D8903A6 4E800421
-7EA803A6 4E800020
-80CDB638 00000000
 C22652F0 0000007C #Online/Menus/CSS/InitSheikSelector.asm
 3C608048 80639D30
 5463443E 2C030008
@@ -3109,190 +2653,482 @@ C05F0040 FC011040
 7C0803A6 4E800020
 38600000 38980000
 60000000 00000000
-C22652F4 000000B8 #Online/Menus/CSS/InitTeamToggleButton.asm
+C2264534 000001DC #Online/Menus/CSS/LoadCSSText.asm
 3C608048 80639D30
 5463443E 2C030008
-40820590 888DAFA0
-2C040003 40820584
-4800002C 4E800021
-C0200000 C0A00000
-C1BC0000 C18C0000
-00000000 3F800000
-C19C0000 C0400000
+40820EC4 480001F8
+4E800021 00000000
+3DCCCCCD 404CCCCD
+413CCCCD 3F4CCCCD
+C1600000 41C00000
+00000000 41F00000
+42480000 C2320000
+C1EC0000 C1BA0000
+40A00000 3D23D70A
+428C0000 41B80000
+3F000000 42B40000
+42500000 42960000
+42C40000 42500000
+428C0000 42B00000
+42D40000 3ECCCCCD
+43048000 43188000
+C3760000 C3020000
+C2480000 3EE66666
+33FF2FFF 3CBCFFFF
+8E9196FF FFFFFFFF
+FF0000FF 00556E72
+616E6B65 64004469
+72656374 0052616E
+6B656400 5465616D
+73002573 204D6F64
+65005365 6C656374
+20796F75 72206368
+61726163 74657200
+43686172 61637465
+72207365 6C656374
+65640050 72657373
+20535441 52542074
+6F202573 006C6F63
+6B20696E 00656E74
+65722063 6F646500
+73656172 63680073
+656C6563 74207374
+61676500 4C6F636B
+65642069 6E005365
+61726368 696E6720
+666F7220 25730043
+6F6E6E65 6374696E
+6720746F 20257300
+57616974 696E6720
+6F6E2025 73006F70
+706F6E65 6E74002D
+2D2F2F2D 2D2F2F2D
+2D2F2F2D 2D2F2F30
+30004572 726F7200
+506C6179 696E673A
+00557365 20442D50
+61642074 6F204368
+61740050 72657373
+205A2074 6F202573
+00486F6C 64205A20
+746F2025 73006469
+73636F6E 6E656374
+0063616E 63656C00
+636C6561 72206572
+726F7200 817B0081
+7E00817C 00000000
+4E800021 C2E00000
+41A00000 00000000
 3DCCCCCD 7C0802A6
 90010004 9421FF50
-BE810008 3FC08000
-63DE5614 83DE0000
-4BFFFFBD 7FE802A6
-C3FF0010 C3DF0014
-38600004 3D808037
-618CF1E4 7D8903A6
-4E800421 7C771B78
-38800004 3D808000
-618CC160 7D8903A6
-4E800421 7FC3F378
-90770006 38600004
+BE810008 4BFFFDFD
+7FA802A6 3C60804D
+606350D8 3C800200
+60840801 90830000
+888DAFA0 2C040002
+38800001 41800008
+38800002 4BFFFFAD
+7C6802A6 3D808000
+618C5618 7D8903A6
+4E800421 38A00000
+4E800021 38600004
 38800005 38A00080
 3D808039 618C01F0
 7D8903A6 4E800421
-7C741B78 806DB638
-80630030 80630008
-38800000 8063000C
-38840001 2C040007
-4180FFF4 80630008
-3D808037 618C0E44
+7C761B78 38600004
+3D808037 618CF1E4
 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
+7C781B78 38760000
 38800004 3CA08037
-60A5F1B0 7EE6BB78
+60A5F1B0 38D80000
 3D808039 618C0B68
 7D8903A6 4E800421
-7E83A378 480000CD
+38760000 48000261
 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
+3FE08000 63FF5614
+83FF0000 38600000
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C7C1B78
+939F0008 38800001
+989C0049 38800000
+989C004A C03D0000
+D03C0008 C03D0004
+D03C0024 D03C0028
+7F83E378 389D0090
+38A00000 C03D0044
+C05D003C C07D0040
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 C07D004C
+480000F9 C07D0050
+480000F1 C07D0054
+480000E9 7F83E378
+389D008C 38A00000
+C03D0068 C05D003C
+C07D006C 38FD0098
+3D808000 618C56B4
 7D8903A6 4E800421
-80630004 80630008
-FC20F890 3D808036
-618C3C2C 7D8903A6
-4E800421 BA810008
+7F83E378 389D008C
+38A00000 C03D0068
+C05D003C C07D0070
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7F83E378
+389D008C 38A00000
+C03D0044 C05D0078
+C07D0074 38FD0098
+3D808000 618C56B4
+7D8903A6 4E800421
+7F83E378 389D0090
+38A00000 C03D0044
+C05D007C C07D0074
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 C07D0058
+480000AD C07D005C
+480000A5 C07D0060
+4800009D C07D0064
+48000095 BA810008
 800100B4 382100B0
-7C0803A6 480002E4
-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
+7C0803A6 48000A78
 7C0802A6 90010004
 9421FF50 BE810008
-808DB610 886DB650
-1C630024 7F841A14
-887C0070 7C7B1B78
-3D808000 618C56B8
-7D8903A6 4E800421
-7C651B78 38600000
-1C630024 3C80803F
-60840A48 7C832214
-886403C2 1C63001C
-7C832A14 8B4400DD
-889E001A 38840001
-2C040004 41800008
-38800001 989E001A
-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 48000099
-B8610008 80010104
-38210100 7C0803A6
-7F23CB78 7F64DB78
-3D808000 618C56B0
-7D8903A6 4E800421
-7C781B78 886DB657
-2C030000 4182004C
-9B1C0073 3CA0803F
-60A50E09 9B050000
-9B1E001B 38600000
-7F44D378 7F05C378
-38C00000 3D808000
-618C56BC 7D8903A6
-4E800421 38600002
-3D808002 618C4030
+FDA01890 7F83E378
+389D0090 38A00000
+C03D0068 C05D0048
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7F83E378
+389D0090 38A00000
+C03D0080 C05D003C
+FC606890 38FD0098
+3D808000 618C56B4
 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
+BE810008 7F83E378
+389D0094 38A00000
+C03D0068 C05D003C
+38FD0098 3D808000
+618C56B4 7D8903A6
+4E800421 7C7B1B78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+7C0802A6 90010004
+9421FF50 BE810008
+8363002C 4BFFFAD5
+7FA802A6 3F808000
+639C5614 839C0000
+83DC0000 835C0008
+38FD0163 3CC0804A
+60C60740 38800000
+38A00000 7C66222E
+7C672B2E 38840003
+38A50002 2C050012
+4180FFEC 806DB620
+38810080 38A00024
+38C0FFFF 3D808001
+618C1E24 7D8903A6
+4E800421 80610080
+3D808036 618CF644
+7D8903A6 4E800421
+80610080 38800000
+80BC0004 80A50008
+38C00000 3D808036
+618CFA10 7D8903A6
+4E800421 C022AEC4
+886DAFA0 2C030003
+40820008 C022AEC8
+80610080 3D808036
+618CF934 7D8903A6
+4E800421 80610080
+3D808037 618C0780
+7D8903A6 4E800421
+38800000 38BD00B6
+887E0000 2C030004
+4181004C 886DAFA0
+2C030001 41820020
+2C030002 41820020
+2C030000 41820020
+2C030003 41820020
+48000024 38DD0099
+48000020 38DD00A2
+48000018 38DD00A9
+48000010 38DD00B0
+48000008 38BD0176
+4800081D 887E000A
+2C030000 4182001C
+3B1E0015 7C791B78
+887C0018 38630001
+987C0018 48000014
+887E000B 2C030000
+418201BC 7C791B78
+887C0019 2C030009
+40810010 38600000
+987C0019 418201A0
+386000B7 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 887C0017
+38630001 987C0017
+3860000D 3D808037
+618CF1E4 7D8903A6
+4E800421 7C771B78
+3880001C 3D808000
+618CC160 7D8903A6
+4E800421 38600014
+38800000 98770000
+98970001 7F23CB78
+98770002 887C0019
+98770003 38630001
+987C0019 887E000C
+98770008 7F83E378
+90770009 38600004
+38800005 38A00080
+3D808039 618C01F0
+7D8903A6 4E800421
+7C761B78 807C0004
+80630004 80630000
+3D808037 618C0E44
+7D8903A6 4E800421
+7C651B78 7EC3B378
+888DC1A9 3D808039
+618C0A70 7D8903A6
+4E800421 7EC3B378
+3C808039 60841070
+38A00003 38C00080
+3D808039 618C069C
+7D8903A6 4E800421
+80760028 809C0004
+80840004 38A00000
+3D808016 618C895C
+7D8903A6 4E800421
+80760028 C022AE28
+3D808036 618CF8BC
+7D8903A6 4E800421
+886DAFE0 2C030000
+41820010 C03D0014
+80760028 D0230038
+7EC3B378 38800004
+3CA08037 60A5F1B0
+7EE6BB78 3D808039
+618C0B68 7D8903A6
+4E800421 7EC3B378
+480003E1 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BD017C 38800009
+48000615 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BE00B0 3880000A
+480005F5 887E0000
+2C030004 4182000C
+38BD0098 48000008
+38BD0185 38800008
+480005D5 887E0000
+2C030004 41820034
+2C030005 41820020
+2C030000 4181000C
+38BD0098 48000024
+38BD0197 38DD01BD
+48000018 38BD0197
+38DD01C4 4800000C
+38BD01A5 38DD01B2
+38800007 48000589
+3B600001 7F64DB78
+38BD0098 48000579
+3B7B0002 2C1B0005
+4081FFEC 3880000C
+38600000 7C7C21AE
+38840001 2C04000E
+4081FFF4 3B60000B
+7F64DB78 38BD0098
+48000545 3B7B0001
+2C1B000E 4081FFEC
+887E0000 2C030005
+408200A8 3B60000B
+3B200000 3B000000
+3AE00000 3ADE018B
+7EB6C8AE 56A00631
+41820010 3B390002
+3B180001 48000018
+2C150020 40820008
+7F37CB78 3B390001
+3B180001 2C150000
+41820018 2C18001E
+41810008 4800002C
+38800000 7C96B9AE
+7F64DB78 7EC5B378
+480004C5 3B7B0001
+7ED6BA14 3AD60001
+3B200000 3B000000
+2C150000 41820020
+387E027C 7C96CA14
+7C041800 40800010
+2C1B000E 41810008
+4BFFFF78 4800014C
+3B600001 886DB657
+7F64DB78 2C030000
+40820018 38BD00BE
+4800046D 38600001
+987C000C 48000124
+38BD00D4 48000459
+3B7B0002 38600002
+987C000C 887E0001
+7F64DB78 2C030000
+40820080 886DAFA0
+2C030002 41800034
+887E0000 2C030004
+40820028 886DAFC9
+2C030000 4082001C
+886DAFCA 2C030000
+40820010 38BD00E7
+38DD0113 48000034
+38BD00E7 38DD00F9
+887E0000 2C030004
+41820020 38BD00E7
+38DD010C 886DAFA0
+2C030002 4180000C
+38BD00E7 38DD0101
+480003CD 38600001
+987C000D 48000084
+38BD0120 480003B9
+3B7B0002 38600002
+987C000D 887E0000
+7F64DB78 2C030004
+4182004C 2C030003
+41820024 88ADAFA0
+2C050001 38BD012A
+38DD015A 41820038
+38BD012A 38DD0163
+4800002C 88ADAFA0
+2C050001 38BD013B
+38DD015A 41820018
+38BD013B 38DD0163
+4800000C 38BD014C
+38DD015A 48000349
+38600001 987C000E
+3B20000C 3B600002
+7C7CC8AE 2C030001
+40820044 A07C000F
+3880000F 7C632396
+1C630003 386301D0
+7CBD1A14 7F64DB78
+4800030D 7F43D378
+7F64DB78 38BD0088
+3D80803A 618C74F0
+7D8903A6 4E800421
+48000044 2C030002
+40820030 7F64DB78
+38BD01D6 480002D9
+7F43D378 7F64DB78
+38BD0084 3D80803A
+618C74F0 7D8903A6
+4E800421 48000010
+7F64DB78 38BD0098
+480002AD 3B7B0002
+3B390001 2C19000E
+4081FF68 A07C000F
+38630001 2C03001E
+41800008 38600000
+B07C000F BA810008
 800100B4 382100B0
 7C0803A6 4E800020
-38600000 38980000
-3D80803A 618C6754
+4E800021 7C6E1B78
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFF3D1 7FA802A6
+820E002C 8A300000
+8A500001 8A700002
+8A900003 82B00004
+8AF00008 83900009
+81EE0028 81EF0010
+7DE37B78 3D808037
+618C0928 7D8903A6
+4E800421 2C150000
+408200CC 7E83A378
+3D808000 618C55F4
 7D8903A6 4E800421
+C05D0018 C07D0008
+EC6100F2 EC421828
+D04F003C 2C120000
+4182009C 3A2000AA
+9A300000 3A400001
+9A500001 7C962378
+7E83A378 3D808000
+618C55F4 7D8903A6
+4E800421 C05D0030
+C07D0008 EC6100F2
+EC42182A FDE01090
+806DC2DC 38800003
+9883000E C03D002C
+886DAFE0 2C030000
+41820008 C03D0028
+38770001 7E649B78
+38A00002 38C00000
+C07D0034 C09D0038
+3D808000 618C56B4
+7D8903A6 4E800421
+90700004 806DC2DC
+38800001 9883000E
+48000004 887C0017
+2C03000D 41800028
+887C0019 7C03A000
+4080000C 2C140009
+408100B4 887C0019
+7C741850 2C03000D
+418100A4 2C110000
+4082001C 2C120000
+4182FF2C 2C120001
+41820018 2C120002
+41820084 3A31FFFF
+9A300000 480000D4
+3A400002 9A500001
+3A200014 9A300000
+806E0028 809C0004
+80840004 38A00001
+3D808016 618C895C
+7D8903A6 4E800421
+806E0028 C022AE28
+3D808036 618CF8BC
+7D8903A6 4E800421
+8075005C 3D808037
+618CF1B0 7D8903A6
+4E800421 7EA3AB78
+3D80803A 618C5CC4
+7D8903A6 4E800421
+48000060 7DC37378
+3D808039 618C0228
+7D8903A6 4E800421
+809C0000 88840003
+7C172000 40820010
+887C0018 3863FFFF
+987C0018 887C0017
+3863FFFF 987C0017
+887C0019 7E84A378
+38840001 7C032000
+41820008 4800000C
+38600000 987C0019
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7F43D378
+3D80803A 618C70A0
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 80CDB638
 60000000 00000000
 C2262004 0000000B #Online/Menus/CSS/PreventAPressCharUnselect.asm
 3C608048 80639D30
@@ -3318,52 +3154,97 @@ C22620AC 0000000B #Online/Menus/CSS/PreventBPressCharUnselect.asm
 618C2154 7D8903A6
 4E800420 88FF0004
 60000000 00000000
-C22600A8 0000000C #Online/Menus/CSS/PreventColorChange.asm
+C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm
 3C608048 80639D30
 5463443E 2C030008
-40820048 3C608000
-60635614 80630000
-8863001A 2C030000
-40820020 3C608000
-60635614 80630000
-80630000 88630001
-2C030000 41820014
-3D808026 618C028C
-7D8903A6 4E800420
-3C60803F 00000000
-C2264110 00000016 #Online/Menus/CSS/SkipReturnToCssSound.asm
-7C030378 7C0802A6
+4082003C 886DAFA0
+2C030003 41820020
+3C608000 60635614
+80630000 80630000
+88630001 2C030000
+41820014 3D808026
+618C028C 7D8903A6
+4E800420 3C60803F
+60000000 00000000
+C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm
+4800002C 4E800021
+C2E00000 41A00000
+00000000 3DCCCCCD
+736C7043 53532E64
+61740073 6C704353
+53000000 900DB638
+3C608048 80639D30
+5463443E 2C030008
+40820100 7C0802A6
 90010004 9421FF50
-BE810008 7C7F1B78
+BE810008 4BFFFFB1
+7FC802A6 3D808000
+618C5618 7D8903A6
+4E800421 7C6802A6
+39830014 7D8903A6
+4E800421 3860001C
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7F1B78 3880001C
+3D808000 618CC160
+7D8903A6 4E800421
+3C608000 60635614
+93E30000 386003B4
+3D808037 618CF1E4
+7D8903A6 4E800421
+907F0000 886DAFA0
+2C030003 40820030
+3C608026 606352F4
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 88630008
+987F001A 387E0010
+3D808001 618C6BE0
+7D8903A6 4E800421
+389E001B 3D808038
+618C0358 7D8903A6
+4E800421 907F0004
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
+C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm
+7C0802A6 90010004
+9421FF00 BC610008
 886DAFA3 2C030000
-40820044 38600000
+40820038 38600000
 3D808000 618C5610
 7D8903A6 4E800421
-8BC30000 3D808037
+8BC30001 3D808037
 618CF1B0 7D8903A6
-4E800421 2C1E0004
-40820044 886DAFC9
-2C030000 41820010
-48000034 38600000
-986DAFA3 7FE3FB78
-BA810008 800100B4
-382100B0 7C0803A6
-7C601B78 3D808026
-618C41A8 7D8903A6
-4E800420 7FE3FB78
-BA810008 800100B4
-382100B0 7C0803A6
-54601838 00000000
-C2262478 00000016 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
+4E800421 2C1E0000
+40820060 4800007C
+38600000 986DAFA3
+3C608023 6063CCA4
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E3000C
+807F0006 3D808037
+618CF1B0 7D8903A6
+4E800421 7FE3FB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+B8610008 80010104
+38210100 7C0803A6
+3D808026 618C41A8
+7D8903A6 4E800420
+B8610008 80010104
+38210100 7C0803A6
+80630020 00000000
+C2262478 00000014 #Online/Menus/CSS/Teams/AnimateCursorPort.asm
 7C0802A6 90010004
 9421FF50 BE810008
 3FC08000 63DE5614
 83DE0000 3C608048
 80639D30 5463443E
-2C030008 40820054
+2C030008 40820044
 888DAFA0 2C040003
-40820048 807E0000
-88630001 2C030000
 40820038 8BFE001A
 2C1F0003 41820008
 3BFFFFFF 88CDB650
@@ -3391,6 +3272,189 @@ C2262768 0000000D #Online/Menus/CSS/Teams/AnimateToken.asm
 BA810008 800100B4
 382100B0 7C0803A6
 387C0000 00000000
+C22652F4 000000B6 #Online/Menus/CSS/Teams/InitTeamToggleButton.asm
+48000030 4E800021
+01C02000 00C0A000
+00C1BC00 00C18C00
+00000000 003F8000
+00C19C00 00C04000
+003DCCCC CD000000
+3C608048 80639D30
+5463443E 2C030008
+40820550 888DAFA0
+2C040003 40820544
+7C0802A6 90010004
+9421FF50 BE810008
+3FC08000 63DE5614
+83DE0000 4BFFFF99
+7FE802A6 C3FF0011
+C3DF0015 38600004
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C771B78 38800004
+3D808000 618CC160
+7D8903A6 4E800421
+7FC3F378 90770007
+38600004 38800005
+38A00080 3D808039
+618C01F0 7D8903A6
+4E800421 7C741B78
+806DB638 80630030
+80630008 38800000
+8063000C 38840001
+2C040007 4180FFF4
+80630008 3D808037
+618C0E44 7D8903A6
+4E800421 7C751B78
+7EA3AB78 809F0019
+90830038 809F001D
+9083003C 809F0021
+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
+480000B5 7C8802A6
+38A00004 3D808038
+618CFD54 7D8903A6
+4E800421 480001F9
+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
+4BFFFD15 7FE802A6
+3BA00000 3C80804A
+60840BC0 80840000
+C024000C C0440010
+C07F0001 C09F0005
+C0BF0009 C0DF000D
+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 3D808000
+618C56B8 7D8903A6
+4E800421 7C651B78
+38600000 1C630024
+3C80803F 60840A48
+7C832214 886403C2
+1C63001C 7C832A14
+8B4400DD 889E001A
+38840001 2C040004
+41800008 38800001
+989E001A 989F0000
+4800002D 38600002
+3D808002 618C4030
+7D8903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 808DB610
+886DB650 1C630024
+7F841A14 887C0070
+7C7B1B78 8B3E001A
+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 7F23CB78
+48000075 7F23CB78
+7F64DB78 3D808000
+618C56B0 7D8903A6
+4E800421 7C781B78
+886DB657 2C030000
+4182FF30 9B1C0073
+3CA0803F 60A50E09
+9B050000 9B1E001B
+38600000 7F44D378
+7F05C378 38C00000
+3D808000 618C56BC
+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
+60000000 00000000
 C2260C28 0000001C #Online/Menus/CSS/Teams/PreventColorResetCharHover.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3451,6 +3515,31 @@ C2260B90 0000001A #Online/Menus/CSS/Teams/PreventColorResetRandomChar.asm
 800100B4 382100B0
 7C0803A6 38000000
 60000000 00000000
+C2260C88 00000018 #Online/Menus/CSS/Teams/PreventWrongCSPOnCharSelect.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C9D2378 7C7B1B78
+3FE08000 63FF5614
+83FF0000 3C608048
+80639D30 5463443E
+2C030008 40820068
+888DAFA0 2C040003
+4082005C 8BDF001A
+7FC3F378 7FA4EB78
+3D808000 618C56B0
+7D8903A6 4E800421
+7C7C1B78 80ADB610
+9B850073 3CA0803F
+60A50E09 9B850000
+38600000 7FA4EB78
+7F85E378 38C00000
+3D808000 618C56BC
+7D8903A6 4E800421
+48000004 7FA4EB78
+7F63DB78 BA810008
+800100B4 382100B0
+7C0803A6 98830070
+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
@@ -3567,9 +3656,10 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm
 40820010 38800058
 48000008 7FE4FB78
 60000000 00000000
-C223E994 0000002A #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
+0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm
+C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
 886DAFA3 2C030000
-41820140 38600001
+41820128 38600001
 986DAFCB 48000004
 7C0802A6 90010004
 9421FF50 BE810008
@@ -3586,10 +3676,7 @@ C223E994 0000002A #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm
 38600020 3D808037
 618CF1E4 7D8903A6
 4E800421 8099000C
-90640006 38600001
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7B1B78 38600004
+90640006 38600004
 38800005 38A00080
 3D808039 618C01F0
 7D8903A6 4E800421
@@ -3675,6 +3762,21 @@ BA810008 800100B4
 3D808023 618CCC80
 7D8903A6 4E800420
 38000000 00000000
+C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm
+886DAFA3 2C030000
+41820054 3C608023
+6063CCA4 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+8083000C 88A40004
+2C050008 4080000C
+38A50001 98A40004
+38830008 7C8903A6
+38600003 4E800421
+48000014 3D808023
+618CCE4C 7D8903A6
+4E800421 00000000
 C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm
 886DAFA3 2C030000
 41820054 3C608023
@@ -3796,7 +3898,7 @@ BE810008 3C60804D
 39400008 3D80803A
 618C611C 7D8903A6
 4E800421 7C7F1B78
-83CDB61C 93FE07B8
+83CDB61C 93FE0909
 4BFFFE69 7F8802A6
 38600000 3D808000
 618C5610 7D8903A6
@@ -3811,7 +3913,7 @@ D03D0008 C03C0004
 D03D0024 D03D0028
 C03C0008 C05C000C
 7FA3EB78 389C0048
-88BE001B 3D80803A
+88BE001C 3D80803A
 618C6B98 7D8903A6
 4E800421 7FA3EB78
 38800000 C03C0010
@@ -3977,7 +4079,7 @@ C22299F0 00000019 #Online/Menus/TitleMenu/HandleOnlineLockedOptions.asm
 618C99F4 7D8903A6
 4E800420 38600001
 60000000 00000000
-C222E93C 00000028 #Online/Menus/TitleMenu/OnMenuLoad.asm
+C222E93C 00000029 #Online/Menus/TitleMenu/OnMenuLoad.asm
 48000020 4E800021
 C34C0000 C31D0000
 41880000 3D75C28F
@@ -3988,36 +4090,37 @@ C34C0000 C31D0000
 38800001 3D808000
 618C5618 7D8903A6
 4E800421 7FC802A6
-4E800021 4BFFFFC5
-7FA802A6 887D0000
-2C030000 41820074
-3D808002 618C6F2C
+38A00001 4E800021
+4BFFFFC1 7FA802A6
+887D0000 2C030000
+41820074 3D808002
+618C6F2C 7D8903A6
+4E800421 38600002
+38A00000 38C00008
+3D808002 618C702C
 7D8903A6 4E800421
-38600002 38A00000
-38C00008 3D808002
-618C702C 7D8903A6
-4E800421 3D808002
-618C7168 7D8903A6
-4E800421 3D808002
-618C7648 7D8903A6
-4E800421 38607535
-3880007F 38A00040
-3D808002 618C37A8
+3D808002 618C7168
 7D8903A6 4E800421
-38600000 987D0000
-38600001 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7C1B78
-386000BA 987C0000
-7F83E378 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7F83E378
-3D808037 618CF1B0
+3D808002 618C7648
 7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-B9C10408 00000000
+38607535 3880007F
+38A00040 3D808002
+618C37A8 7D8903A6
+4E800421 38600000
+987D0000 38600001
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7C1B78 386000BA
+987C0000 7F83E378
+38800001 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1B0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 B9C10408
+60000000 00000000
 C21B1040 00000165 #Online/Menus/TitleMenu/OnMenuPrep.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -4392,10 +4495,10 @@ C21B3668 00000005 #Online/Menus/VSScreen/AllowP2ColorDuplicate.asm
 41820014 3D808017
 618CBEC8 7D8903A6
 4E800421 00000000
-C2186EC4 00000077 #Online/Menus/VSScreen/InitVsSplash.asm
+C2186EC4 0000007D #Online/Menus/VSScreen/InitVsSplash.asm
 3C608048 80639D30
 5463443E 2C030408
-4082039C 48000060
+408203D0 48000060
 4E800021 00000000
 3F800000 3F000000
 3F19999A F15959FF
@@ -4426,92 +4529,98 @@ BE810008 38600000
 989E004A C03F0000
 D03E0008 C03F0004
 D03E0024 D03E0028
-887D0210 2C030001
+887D0284 2C030001
 41820038 387F0010
 389F0052 38BD0034
 38C00000 C03F001C
-4800010D 387F0014
+48000141 387F0014
 389F0055 38BD0053
 38C00000 C03F0020
-480000F5 48000038
-807D000D 480001E9
+48000129 48000038
+807D000D 4800021D
 387F0010 389F0044
-C03F001C 480000D9
-807D0011 480001D1
+C03F001C 4800010D
+807D0011 48000205
 387F0014 389F004B
-C03F0020 480000C1
+C03F0020 480000F5
 48000004 38600000
-38800000 C03F0024
-C05F002C C07F0030
-C09F0034 C0BF0038
-3D80803A 618C5ACC
+38800000 3D80803A
+618C6754 7D8903A6
+4E800421 7C7E1B78
+C03F0024 D03E0000
+C03F002C D03E0004
+C03F0030 D03E0008
+C03F0034 D03E000C
+C03F0038 D03E0010
+C03F0004 D03E0024
+D03E0028 38800001
+989E004A 989E0049
+C03F0000 D03E0008
+7FC3F378 A09D028A
+3D808000 618C5690
 7D8903A6 4E800421
-7C7E1B78 C03F0004
-D03E0024 D03E0028
-38800001 989E004A
-989E0049 C03F0000
-D03E0008 3CA0803B
-60A57808 A0DD0216
-38600000 1C830002
-7C85222E 7C043000
-41820014 38630001
-2C03001D 4180FFE8
-38600000 3C80803E
-6084D488 7C841A14
-8884005C 7FC3F378
-3D80803A 618C6368
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4800017C 7C0802A6
-90010004 9421FF50
-BE810008 FFE00890
-7C761B78 7C942378
-7CB92B78 7CDA3378
-7CF83B78 7D174378
-93210008 9301000C
-92E10010 C3DF0028
-C07F0040 7F43D378
-3D808000 618C55F4
-7D8903A6 4E800421
-EC630072 EFDE1828
-7FC3F378 389F0018
-7EC4B378 38A00000
-7E87A378 C03F0008
-FC40F890 FC60F090
-3D808000 618C56B4
-7D8903A6 4E800421
-39C00008 39E00000
-7C6E0A14 80E30000
-2C0F0000 4182000C
-C07F003C EFFF182A
-C09F0040 EFDE202A
-7FC3F378 389F0018
-38A00000 C03F000C
-FC40F890 FC60F090
-3D808000 618C56B4
-7D8903A6 4E800421
-39CE0004 39EF0001
-7C0FD000 4180FFAC
-BA810008 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
-60000000 00000000
+2C030001 41820058
+3CA0803B 60A57808
+A0DD028A 38600000
+1C830002 7C85222E
+7C043000 41820014
+38630001 2C03001D
+4180FFE8 38600000
+3C80803E 6084D488
+7C841A14 8884005C
+7FC3F378 3D80803A
+618C6368 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4800017C
+7C0802A6 90010004
+9421FF50 BE810008
+FFE00890 7C761B78
+7C942378 7CB92B78
+7CDA3378 7CF83B78
+7D174378 93210008
+9301000C 92E10010
+C3DF0028 C07F0040
+7F43D378 3D808000
+618C55F4 7D8903A6
+4E800421 EC630072
+EFDE1828 7FC3F378
+389F0018 7EC4B378
+38A00000 7E87A378
+C03F0008 FC40F890
+FC60F090 3D808000
+618C56B4 7D8903A6
+4E800421 39C00008
+39E00000 7C6E0A14
+80E30000 2C0F0000
+4182000C C07F003C
+EFFF182A C09F0040
+EFDE202A 7FC3F378
+389F0018 38A00000
+C03F000C FC40F890
+FC60F090 3D808000
+618C56B4 7D8903A6
+4E800421 39CE0004
+39EF0001 7C0FD000
+4180FFAC BA810008
+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 00000000
 C2184DE4 00000010 #Online/Menus/VSScreen/PlayOpponentCharAnnouncer.asm
 3D808048 818C9D30
 558C443E 2C0C0408
@@ -4521,7 +4630,7 @@ BE810008 38600000
 3D808000 618C5610
 7D8903A6 4E800421
 7C7F1B78 887F0004
-1C630024 389F0268
+1C630024 389F02DC
 7FC418AE 7FE3FB78
 3D808037 618CF1B0
 7D8903A6 4E800421
@@ -4592,18 +4701,18 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 3D80801B 618C136C
 7D8903A6 4E800420
 38600001 00000000
-C21A45B8 0000016E #Online/Slippi Online Scene/main.asm
+C21A45B8 0000017A #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF50
 BE810008 3C80803E
-6084DC1C 48000215
+6084DC1C 48000245
 7C6802A6 38630000
 90640008 38600000
 986DAFA3 986DAFC8
 986DAFEC 986DAFE0
-38600008 4800016D
+38600008 4800019D
 7C8802A6 4800002D
-48000B04 80830000
+48000B64 80830000
 5485467A 2C050048
 40820014 548401BA
 7C840734 7C841A14
@@ -4613,7 +4722,7 @@ BE810008 3C80803E
 7C7F1B78 7C9E2378
 3C80803D 6084AD30
 48000081 7C6802A6
-90640004 480000D5
+90640004 48000105
 7C6802A6 90640008
 38600001 98640000
 3C60803D 6063ACA4
@@ -4634,10 +4743,16 @@ BE810008 3C808045
 6084ABF0 886DAEF8
 98640006 3D808000
 618C56B8 7D8903A6
-4E800421 7C641B78
-3860000F 1C63001C
-7C832214 38600013
-986400DD BA810008
+4E800421 7C741B78
+3D808000 618C5698
+7D8903A6 4E800421
+7C751B78 3AC00000
+48000024 887400DD
+2C030012 40820010
+38600013 987400DD
+48000014 3AD60001
+3A94001C 7C16A800
+4180FFDC BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 4E800021 7C0802A6
@@ -4660,7 +4775,7 @@ BE810008 38600012
 00000000 00000000
 05000000 00000000
 00000000 04030000
-48000411 48000731
+48000411 4800074D
 20000000 80490880
 804D68D0 FF000000
 4E800021 81940000
@@ -4697,7 +4812,7 @@ BE810008 38600012
 4182001C 2C030000
 40820000 886DAFCA
 2C030000 41820020
-48000004 4800063D
+48000004 48000659
 3C808047 60849D30
 38600005 98640005
 48000018 3C808047
@@ -4725,7 +4840,7 @@ BE810008 3D80801B
 7D8903A6 4E800421
 7C7E1B78 887E0001
 889E0002 7C032000
-4082001C 4800055D
+4082001C 48000579
 3C808047 60849D30
 38600005 98640005
 4800001C 38600000
@@ -4741,7 +4856,7 @@ BE810008 3D80801B
 38600000 3D808000
 618C5610 7D8903A6
 4E800421 7C7F1B78
-887F0003 480005B5
+887F0003 480005E5
 986DAFC9 886DAFA0
 2C030003 40820020
 887F0003 38800001
@@ -4749,14 +4864,14 @@ BE810008 3D80801B
 38800000 988DAFC9
 4800003C 3A800000
 3AA00000 7E83A378
-48000579 2C030000
+480005A9 2C030000
 41820008 3AB50001
 3A940001 2C140004
 4180FFE4 2C150001
 4182000C 38600000
 986DAFC9 3E808047
 62949DA4 887F0003
-48000541 2C030000
+48000571 2C030000
 41820018 38600001
 98740000 38600000
 9874005D 48000014
@@ -4817,9 +4932,9 @@ FF2121EE 0000EE00
 98640008 887F0087
 9864000E 38600000
 9864FFFF 9864FFFB
-887E0210 2C030000
+887E0284 2C030000
 418200F4 887E0003
-1C630024 38630271
+1C630024 386302E5
 7F7E18AE 38600002
 98640002 38600001
 9864FFFB 98640006
@@ -4853,7 +4968,7 @@ FF2121EE 0000EE00
 90640014 887F0063
 98640018 887F0084
 9064001C 887F0087
-98640020 887E0210
+98640020 887E0284
 2C030000 41820024
 887F00A8 90640024
 887F00AB 98640028
@@ -4871,54 +4986,60 @@ A07F000E 9064000C
 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
+7EB50214 3D808000
+618C569C 7D8903A6
+4E800421 88950060
+7C840774 7C041800
+41820028 38600000
+3D808000 618C56A0
 7D8903A6 4E800421
-3C80803B 6084B6B0
-1C630003 7C6320AE
 3D808000 618C56A8
 7D8903A6 4E800421
-3D808002 618C7168
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 3C808047
-60849D30 38600003
-98640005 BA810008
+3A940001 2C140006
+3AB50024 4180FFB0
+A07F000E 3D808022
+618C519C 7D8903A6
+4E800421 7C641B78
+38600001 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3D808002
+618C7168 7D8903A6
+4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-38600000 3D808000
-618C5610 7D8903A6
-4E800421 7C7F1B78
-83CD8840 3BDE0598
-7FC3F378 389F0208
-38A00138 3D808000
-618C31F4 7D8903A6
+3C808047 60849D30
+38600003 98640005
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 38600000
+3D808000 618C5610
+7D8903A6 4E800421
+7C7F1B78 83CD8840
+3BDE0598 7FC3F378
+389F027C 38A00138
+3D808000 618C31F4
+7D8903A6 4E800421
+7FC3F378 3D808000
+618C5694 7D8903A6
 4E800421 3D808017
 618CEB30 7D8903A6
-4E800421 889F0268
-98830000 889F026B
+4E800421 889F02DC
+98830000 889F02DF
 98830001 38800000
 98830002 38800003
 98830005 38800078
 98830004 3C80803D
 6084DEC8 8084000C
-887F028C 98640002
+887F0300 98640002
 38602121 B0640003
 3C808049 60840880
-887F028F 98640016
+887F0303 98640016
 7FE3FB78 3D808037
 618CF1B0 7D8903A6
 4E800421 BA810008
@@ -4959,6 +5080,7 @@ BA810008 800100B4
 800100B4 382100B0
 7C0803A6 38600028
 987E0000 00000000
+04005694 4E800020 #Online/Static/AdjustNullCharID.asm
 C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -4978,14 +5100,14 @@ C20056BC 00000012 #Online/Static/CSSUpdateCSP.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
-C20056AC 0000002E #Online/Static/ChatMessages.asm
+C20056AC 0000002F #Online/Static/ChatMessages.asm
 7CA802A6 2C030008
 4182001C 2C030004
 41820020 2C030002
 41820024 2C030001
 41820028 48000075
 7C6802A6 48000024
-480000F9 7C6802A6
+480000FD 7C6802A6
 48000018 480000C9
 7C6802A6 4800000C
 4800007D 7C6802A6
@@ -5012,22 +5134,29 @@ C20056AC 0000002E #Online/Static/ChatMessages.asm
 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 00000000
+0A060504 52656163
+74696F6E 7300736F
+72727900 6D792062
+006C6F6C 00776F77
+00000000 4E800021
+05090817 4D697363
+00676F74 74612067
+6F006F6E 65207365
+63006C65 74277320
+706C6179 20616761
+696E206C 61746572
+00626164 20636F6E
+6E656374 696F6E00
+60000000 00000000
+C2005690 00000002 #Online/Static/CheckAltStageName.asm
+38600000 4E800020
+60000000 00000000
 C20056B8 00000002 #Online/Static/GetCSSIconData.asm
 3C60803F 60630A48
 4E800020 00000000
+C2005698 00000002 #Online/Static/GetCSSIconNum.asm
+38600019 4E800020
+60000000 00000000
 C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5046,11 +5175,19 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20055F4 00000007 #Online/Static/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 2C030000 40820018
-38600340 3D808037
+386003B4 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7F1B78
 386000B3 987F0000
@@ -5058,23 +5195,87 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 7FE3FB78
-38800340 38A00000
+388003B4 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
 7FE3FB78 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
-C200560C 00000016 #Online/Static/LoadState.asm
+C20056A4 00000022 #Online/Static/LoadPremadeText.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+3B800004 7F83E378
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7D1B78 7F84E378
+3D808000 618CC160
+7D8903A6 4E800421
+386000E1 48000055
+839D0000 7FA3EB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7D1B78
+386000E2 4800001D
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+987D0000 9BFD0001
+9BDD0002 7FA3EB78
+38800003 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7FA3EB78 7F84E378
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+C200560C 00000033 #Online/Static/LoadState.asm
 7C0802A6 90010004
 9421FF50 BE810008
 7C7B1B78 7C982378
 7CBA2B78 88DA0000
+3AC00000 3AD60001
+2C160007 408100DC
+48000044 4E800021
+4C6F6164 20737461
+74652072 65717565
+73746564 20666F72
+20667261 6D652025
+64206275 74206672
+616D6520 77617320
+6E6F7420 666F756E
+642E0000 7C0802A6
+90010004 9421FF00
+BC610008 7F05C378
+60000000 60000000
+60000000 60000000
+60000000 806DAFC4
+38630003 4BFFFF91
+7C8802A6 4CC63242
+3D808032 618C3CF4
+7D8903A6 4E800421
+806DAFC4 388000D0
+98830000 38800000
+98830001 38800001
+98830002 38800080
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 B8610008
+80010104 38210100
+7C0803A6 48000000
 38C6FFFF 2C060000
 40800008 38C60007
 1C660004 38630002
 7F3A1A14 80790000
-7C03C000 4082FFDC
+7C03C000 4082FEF8
 3D808034 618C7364
 7D8903A6 4E800421
 7C771B78 386000B2
@@ -5088,11 +5289,14 @@ 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
+C20055EC 00000008 #Online/Static/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
 60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
@@ -5117,11 +5321,101 @@ C2005608 00000016 #Online/Static/SaveState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
-C2005618 00000094 #Online/Static/UserDisplayFunctions.asm
+C20056B4 00000059 #Online/Static/SubtextFunctions.asm
+2C050002 418201F8
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF202890
+FF403090 2C180001
+418000FC 39E00004
+FC20B090 FC40B890
+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 FC40A890
+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 FC20B090
+FC40B890 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+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 7C0802A6
+90010004 9421FF50
+BE810008 7C7D1B78
+7C9C2378 7CDB3378
+FEC00890 FEE01090
+FF001890 FEA02090
+4800008D 7F4802A6
+38600000 7F64DB78
+C01A0000 FC20B090
+FC40B890 FC60C090
+C09A0004 C0BA0008
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C751B78 2C1C0000
+41820010 38600001
+986DAFEC 7F86E378
+7EA3AB78 7FA4EB78
+FC00A890 D0030024
+D0030028 3D80803A
+618C6368 7D8903A6
+4E800421 7EA3AB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+41100000 44160000
+41A00000 00000000
+C2005618 00000095 #Online/Static/UserDisplayFunctions.asm
 4E800021 4800004C
-480001DC 480002F0
-48000350 480003C8
-48000424 4E800021
+480001E0 480002F4
+48000354 480003CC
+48000428 4E800021
 00000000 41A00000
 41C80000 8E9196FF
 FFFFFFFF 3ECCCCCD
@@ -5131,142 +5425,143 @@ FFFFFFFF 3ECCCCCD
 7C0802A6 90010004
 9421FF50 BE810008
 7C791B78 7C9B2378
-7CBA2B78 480003D1
-4BFFFFAD 7FE802A6
-83DF0000 83BE0000
-C0390000 D03E000A
-C0590004 D05E000E
-9B7E0009 38600000
-38800000 3D80803A
-618C6754 7D8903A6
-4E800421 7C7C1B78
-939E0005 38800001
-989C0049 38800000
-989C004A C0390008
-D03C0008 C039000C
-D03C0024 D03C0028
-38600001 48000059
-C03F0004 480000F1
-38600000 48000049
-C03F0008 480000E1
-38600001 48000039
-C03F0004 480000D1
-38600000 48000029
-480000D5 886DAFA1
-987E0004 7FA3EB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7A1B78
-C03E000A C05E000E
-7F83E378 389F001C
-3D80803A 618C6B98
-7D8903A6 4E800421
-7C781B78 C03F0018
-2C1A0000 41820008
-C03F0014 FC400890
-7F83E378 7F04C378
-3D80803A 618C7548
-7D8903A6 4E800421
-38BF0010 2C1A0000
-41820008 38BF000C
-7F83E378 7F04C378
-3D80803A 618C74F0
-7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 C05E000E
-EC42082A D05E000E
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFE29
+2C050000 41820008
+480003D1 4BFFFFA9
 7FE802A6 83DF0000
-83BE0000 839E0005
-48000159 3B600000
-7F83E378 7F64DB78
-38BF001C 3D80803A
-618C70A0 7D8903A6
-4E800421 3B7B0001
-2C1B0004 4180FFDC
-887D0000 2C030001
-408200A8 3C608047
-60639D30 88630000
-2C030001 40820018
-3C60804A 606304F0
-88630000 2C030008
-40820080 7F83E378
-38800000 38BF001D
+83BE0000 C0390000
+D03E000A C0590004
+D05E000E 9B7E0009
+38600000 38800000
+3D80803A 618C6754
+7D8903A6 4E800421
+7C7C1B78 939E0005
+38800001 989C0049
+38800000 989C004A
+C0390008 D03C0008
+C039000C D03C0024
+D03C0028 38600001
+48000059 C03F0004
+480000F1 38600000
+48000049 C03F0008
+480000E1 38600001
+48000039 C03F0004
+480000D1 38600000
+48000029 480000D5
+886DAFA1 987E0004
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+7C7A1B78 C03E000A
+C05E000E 7F83E378
+389F001C 3D80803A
+618C6B98 7D8903A6
+4E800421 7C781B78
+C03F0018 2C1A0000
+41820008 C03F0014
+FC400890 7F83E378
+7F04C378 3D80803A
+618C7548 7D8903A6
+4E800421 38BF0010
+2C1A0000 41820008
+38BF000C 7F83E378
+7F04C378 3D80803A
+618C74F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+C05E000E EC42082A
+D05E000E 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFFE25 7FE802A6
+83DF0000 83BE0000
+839E0005 48000159
+3B600000 7F83E378
+7F64DB78 38BF001C
 3D80803A 618C70A0
 7D8903A6 4E800421
-7F83E378 38800001
-38BD0001 3D80803A
-618C70A0 7D8903A6
-4E800421 887E0009
-2C030002 4082003C
-7F83E378 38800002
-38BF0022 3D80803A
+3B7B0001 2C1B0004
+4180FFDC 887D0000
+2C030001 408200A8
+3C608047 60639D30
+88630000 2C030001
+40820018 3C60804A
+606304F0 88630000
+2C030008 40820080
+7F83E378 38800000
+38BF001D 3D80803A
 618C70A0 7D8903A6
 4E800421 7F83E378
-38800003 38BD0020
+38800001 38BD0001
 3D80803A 618C70A0
 7D8903A6 4E800421
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFD11
-7FE802A6 83DF0000
-889E0004 886DAFA1
-7C041800 987E0004
-41820024 38600001
-3D808002 618C4030
+887E0009 2C030002
+4082003C 7F83E378
+38800002 38BF0022
+3D80803A 618C70A0
 7D8903A6 4E800421
-806DB614 7C6903A6
+7F83E378 38800003
+38BD0020 3D80803A
+618C70A0 7D8903A6
 4E800421 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 7C0802A6 90010004
 9421FF50 BE810008
-4BFFFCAD 7FE802A6
-83DF0000 83BE0000
-386000B9 987D0000
-7FA3EB78 38800001
-38A00001 3D808000
-618C55F0 7D8903A6
-4E800421 7FA3EB78
-3880002A 38A00000
+4BFFFD0D 7FE802A6
+83DF0000 889E0004
+886DAFA1 7C041800
+987E0004 41820024
+38600001 3D808002
+618C4030 7D8903A6
+4E800421 806DB614
+7C6903A6 4E800421
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 4BFFFCA9
+7FE802A6 83DF0000
+83BE0000 386000B9
+987D0000 7FA3EB78
+38800001 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-889D0000 988DAFA1
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 3CA0803E
-60A5AE68 88A508F4
-38800000 38600008
-3D808022 618C9938
-7D8903A6 4E800421
-2C030001 41820010
-38840001 7C042800
-4180FFDC 7C832378
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 4BFFFBD1
-7FE802A6 38600012
+7FA3EB78 3880002A
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 889D0000
+988DAFA1 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+3CA0803E 60A5AE68
+88A508F4 38800000
+38600008 3D808022
+618C9938 7D8903A6
+4E800421 2C030001
+41820010 38840001
+7C042800 4180FFDC
+7C832378 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+4BFFFBCD 7FE802A6
+38600012 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+907F0000 3860002A
 3D808037 618CF1E4
 7D8903A6 4E800421
-7C7E1B78 907F0000
-3860002A 3D808037
-618CF1E4 7D8903A6
-4E800421 907E0000
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 00000000
-043775B8 A0190000 #Online/Logging/LogInputOnCopy.asm
+907E0000 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
+043775B0 7C600775 #Online/Logging/LogInputOnCopy.asm
 041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
 0401985C 3C60804C
 04019860 91231F5C
@@ -5299,6 +5594,51 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 8001001C 38210018
 7C0803A6 4E800020
 BB010028 00000000
+C200569C 00000002 #Common/CompatibilityHooks/GetFighterNum.asm
+38600021 4E800020
+60000000 00000000
+C20056A0 00000007 #Common/CompatibilityHooks/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
+C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
+C20AC5B8 00000002 #Common/NanaDeterminism/NanaDeterminism.asm
+7C7D1B78 3BC00000
+60000000 00000000
+C21D24FC 00000018 #Common/PSCameraIndependentMonitor/PSCameraIndependentMonitor.asm
+48000018 4E800021
+C2F00000 42F00000
+42A00000 C1A00000
+7C0802A6 90010004
+9421FF50 BE810008
+7C7E1B78 4BFFFFD9
+7FA802A6 807E002C
+A86300EE 3D808003
+618C4110 7D8903A6
+4E800421 83E3002C
+7FC3F378 3D80801D
+618C32D0 7D8903A6
+4E800421 C05F00B0
+C03D0000 FC020840
+41800034 C03D0004
+FC020840 41810028
+C05F00B4 C03D0008
+FC020840 41810018
+C03D000C FC020840
+4180000C 38600001
+48000008 38600000
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
 
 $Recommended: Normal Lag Reduction [Hannes Mann]
 *Reduces input lag
@@ -5494,10 +5834,19 @@ $Optional: Disable Screen Shake [Achilles1515]
 *Will not cause desyncs when playing online
 04030E44 4E800020
 
-$Optional: Center Align 2P HUD [UnclePunch]
+$Optional: Center Align 2P HUD [UnclePunch, Fizzi]
 *When playing online, character %'s will always be centered ------------------------- 
 *Will not cause desyncs when playing online
-0416E9AC 38600002
+C216E9AC 00000009 #External/Force2PCenterHud/Force2PCenterHud.asm
+887F0061 2C030003
+41820030 887F0085
+2C030003 41820024
+887F00A9 2C030003
+40820018 887F00CD
+2C030003 4082000C
+38600002 4800000C
+887F0000 5463F77E
+60000000 00000000
 
 $Optional: Flash Red on Failed L-Cancel [Achilles1515, Fizzi]
 *When playing online, this will only affect your character --------------------------- 
@@ -5525,3 +5874,61 @@ C208D690 00000009 #External/FlashRedFailedLCancel/TriggerColor.asm
 88A5067F 2C050007
 4180000C 39E000D4
 99E30564 00000000
+
+$Optional: Show Friendly Player Indicators [Fizzi, UnclePunch]
+*When playing online, nametag YOU will show above your character. A heart will always be shown over your teammate. Helpful for colorblind players to keep track of the players.
+*Will not cause desyncs when playing online
+C20355B4 00000008 #Online/Optional/IndicateLocalPlayer/ForceLocalPlayerTag.asm
+3C608048 80639D30
+5463443E 2C030208
+40820028 806DB61C
+88630000 7C03F800
+40820018 38600000
+3D808003 618C55CC
+7D8903A6 4E800420
+1C9F0E90 00000000
+C22FD1EC 0000000E #Online/Optional/IndicateLocalPlayer/SetLocalPlayerTag.asm
+48000010 4E800021
+8278826E 82740000
+3C608048 80639D30
+5463443E 2C030208
+40820020 806DB61C
+88630000 7C03D800
+40820010 4BFFFFD1
+7C6802A6 4800002C
+7F63DB78 3D808003
+618C556C 7D8903A6
+4E800421 5463063E
+3D808023 618C754C
+7D8903A6 4E800421
+60000000 00000000
+C22FC9E4 0000001D #Online/Optional/ShowAllyIndicator/ShowAllyIndicator.asm
+3B840000 7C0802A6
+90010004 9421FF50
+BE810008 7C7E1B78
+3C608048 80639D30
+5463443E 2C030208
+408200A4 3D808016
+618CB168 7D8903A6
+4E800421 2C030000
+4182008C 806DB61C
+88630000 7C03F000
+4182007C 3D808003
+618C3370 7D8903A6
+4E800421 7C7D1B78
+7FC3F378 3D808003
+618C3370 7D8903A6
+4E800421 7C03E800
+4082004C 1C7E000E
+3C808046 6084B6A0
+7CA32214 8865003C
+60630010 9865003C
+1C7D0004 7C63FA14
+C0230064 BA810008
+800100B4 382100B0
+7C0803A6 3D80802F
+618CCA84 7D8903A6
+4E800420 7FC3F378
+BA810008 800100B4
+382100B0 7C0803A6
+60000000 00000000
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
index dea9f48a3f..0daa0fcf6c 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
@@ -107,8 +107,8 @@ std::string ConvertConnectCodeForGame(const std::string& input)
   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
+  // fixed length + full width (two byte) hashtag +1, null terminator +1
+  connectCode.resize(CONNECT_CODE_LENGTH + 2);
   return connectCode;
 }
 
@@ -296,6 +296,7 @@ void CEXISlippi::updateMetadataFields(u8* payload, u32 length)
   characterUsage[playerIndex][internalCharacterId] += 1;
 }
 
+// SLIPPITODO: Maybe support names from regular netplay again
 std::unordered_map<u8, std::string> CEXISlippi::getNetplayNames()
 {
   std::unordered_map<u8, std::string> names;
@@ -319,8 +320,8 @@ std::vector<u8> CEXISlippi::generateMetadata()
   std::vector<char> dateTimeBuf(dateTimeStrLength);
   strftime(&dateTimeBuf[0], dateTimeStrLength, "%FT%TZ", gmtime(&gameStartTime));
   dateTimeBuf.pop_back();  // Removes the \0 from the back of string
-  metadata.insert(metadata.end(),
-                  {'U', 7, 's', 't', 'a', 'r', 't', 'A', 't', 'S', 'U', (u8)dateTimeBuf.size()});
+  metadata.insert(metadata.end(), {'U', 7, 's', 't', 'a', 'r', 't', 'A', 't', 'S', 'U',
+                                   static_cast<u8>(dateTimeBuf.size())});
   metadata.insert(metadata.end(), dateTimeBuf.begin(), dateTimeBuf.end());
 
   // Add game duration
@@ -340,7 +341,7 @@ std::vector<u8> CEXISlippi::generateMetadata()
 
     metadata.push_back('U');
     std::string playerIndexStr = std::to_string(playerIndex);
-    metadata.push_back((u8)playerIndexStr.length());
+    metadata.push_back(static_cast<u8>(playerIndexStr.length()));
     metadata.insert(metadata.end(), playerIndexStr.begin(), playerIndexStr.end());
     metadata.push_back('{');
 
@@ -352,7 +353,7 @@ std::vector<u8> CEXISlippi::generateMetadata()
       auto playerName = playerNames[playerIndex];
       // Add netplay element for this player name
       metadata.insert(metadata.end(), {'U', 7, 'n', 'e', 't', 'p', 'l', 'a', 'y', 'S', 'U'});
-      metadata.push_back((u8)playerName.length());
+      metadata.push_back(static_cast<u8>(playerName.length()));
       metadata.insert(metadata.end(), playerName.begin(), playerName.end());
     }
 
@@ -361,7 +362,7 @@ std::vector<u8> CEXISlippi::generateMetadata()
       auto connectCode = slippi_connect_codes[playerIndex];
       // Add connection code element for this player name
       metadata.insert(metadata.end(), {'U', 4, 'c', 'o', 'd', 'e', 'S', 'U'});
-      metadata.push_back((u8)connectCode.length());
+      metadata.push_back(static_cast<u8>(connectCode.length()));
       metadata.insert(metadata.end(), connectCode.begin(), connectCode.end());
     }
 
@@ -374,7 +375,7 @@ std::vector<u8> CEXISlippi::generateMetadata()
     {
       metadata.push_back('U');
       std::string internalCharIdStr = std::to_string(it2->first);
-      metadata.push_back((u8)internalCharIdStr.length());
+      metadata.push_back(static_cast<u8>(internalCharIdStr.length()));
       metadata.insert(metadata.end(), internalCharIdStr.begin(), internalCharIdStr.end());
 
       metadata.push_back('l');
@@ -450,7 +451,7 @@ void CEXISlippi::writeToFile(std::unique_ptr<WriteMessage> msg)
   }
 
   u8* payload = &msg->data[0];
-  u32 length = (u32)msg->data.size();
+  u32 length = static_cast<u32>(msg->data.size());
   std::string fileOption = msg->operation;
 
   std::vector<u8> dataToWrite;
@@ -557,7 +558,7 @@ void CEXISlippi::createNewFile()
   }
 
   // First, ensure that the root Slippi replay directory is created
-  File::CreateFullPath(dirpath + "/");
+  File::CreateFullPath(dirpath + DIR_SEP);
 
   // Now we have a dir such as /home/Replays but we need to make one such
   // as /home/Replays/2020-06 if month categorization is enabled
@@ -749,7 +750,7 @@ void CEXISlippi::prepareGameInfo(u8* payload)
 
   // Return the size of the gecko code list
   prepareGeckoList();
-  appendWordToBuffer(&m_read_queue, (u32)geckoList.size());
+  appendWordToBuffer(&m_read_queue, static_cast<u32>(geckoList.size()));
 
   // Initialize frame sequence index value for reading rollbacks
   frameSeqIdx = 0;
@@ -1128,8 +1129,8 @@ void CEXISlippi::prepareGeckoList()
                // (https://smashboards.com/threads/color-overlays-for-iasa-frames.401474/post-19120928)
   };
 
-  std::unordered_map<u32, bool> blacklist;
-  blacklist.insert(static_deny_list.begin(), static_deny_list.end());
+  std::unordered_map<u32, bool> deny_list;
+  deny_list.insert(static_deny_list.begin(), static_deny_list.end());
 
   auto replayCommSettings = g_replayComm->getSettings();
   if (replayCommSettings.rollbackDisplayMethod == "off")
@@ -1137,8 +1138,8 @@ void CEXISlippi::prepareGeckoList()
     // Some codes should only be blacklisted when not displaying rollbacks, these are codes
     // that are required for things to not break when using Slippi savestates. Perhaps this
     // should be handled by actually applying these codes in the playback ASM instead? not sure
-    blacklist[0x8038add0] = true;  // Online/Core/PreventFileAlarms/PreventMusicAlarm.asm
-    blacklist[0x80023FFC] = true;  // Online/Core/PreventFileAlarms/MuteMusic.asm
+    deny_list[0x8038add0] = true;  // Online/Core/PreventFileAlarms/PreventMusicAlarm.asm
+    deny_list[0x80023FFC] = true;  // Online/Core/PreventFileAlarms/MuteMusic.asm
   }
 
   geckoList.clear();
@@ -1179,8 +1180,8 @@ void CEXISlippi::prepareGeckoList()
     {
       u32 byteLen =
           source[idx + 4] << 24 | source[idx + 5] << 16 | source[idx + 6] << 8 | source[idx + 7];
-      codeOffset =
-          8 + ((byteLen + 7) & 0xFFFFFFF8);  // Round up to next 8 bytes and add the first 8 bytes
+      // Round up to next 8 bytes and add the first 8 bytes
+      codeOffset = 8 + ((byteLen + 7) & 0xFFFFFFF8);
       break;
     }
     }
@@ -1188,7 +1189,7 @@ void CEXISlippi::prepareGeckoList()
     idx += codeOffset;
 
     // If this address is blacklisted, we don't add it to what we will send to game
-    if (blacklist.count(address))
+    if (deny_list.count(address))
       continue;
 
     INFO_LOG(SLIPPI, "Codetype [%x] Inserting section: %d - %d (%x, %d)", codeType,
@@ -1380,8 +1381,8 @@ void CEXISlippi::prepareFrameData(u8* payload)
 
     if (requestResultCode == FRAME_RESP_TERMINATE)
     {
-      ERROR_LOG(EXPANSIONINTERFACE, "Game should terminate on frame %d [%X]", frameIndex,
-                frameIndex);
+      ERROR_LOG_FMT(EXPANSIONINTERFACE, "Game should terminate on frame {} [{}]", frameIndex,
+                    frameIndex);
     }
 
     return;
@@ -1402,8 +1403,8 @@ void CEXISlippi::prepareFrameData(u8* payload)
   // Keep track of last FFW frame, used for soft FFW's
   if (shouldFFW)
   {
-    WARN_LOG(SLIPPI, "[Frame %d] FFW frame, behind by: %d frames.", frameIndex,
-             g_playbackStatus->lastFrame - frameIndex);
+    WARN_LOG_FMT(SLIPPI, "[Frame {}] FFW frame, behind by: {} frames.", frameIndex,
+                 g_playbackStatus->lastFrame - frameIndex);
     g_playbackStatus->lastFFWFrame = frameIndex;
   }
 
@@ -1666,8 +1667,9 @@ bool CEXISlippi::shouldSkipOnlineFrame(s32 frame, s32 finalizedFrame)
       framesToSkip =
           framesToSkip > maxSkipFrames ? maxSkipFrames : framesToSkip;  // Only skip 5 frames max
 
-      WARN_LOG(SLIPPI_ONLINE, "Halting on frame %d due to time sync. Offset: %d us. Frames: %d...",
-               frame, offsetUs, framesToSkip);
+      WARN_LOG_FMT(SLIPPI_ONLINE,
+                   "Halting on frame {} due to time sync. Offset: {} us. Frames: {}...", frame,
+                   offsetUs, framesToSkip);
     }
   }
 
@@ -1770,9 +1772,9 @@ bool CEXISlippi::shouldAdvanceOnlineFrame(s32 frame)
       framesToAdvance = ((-offsetUs - t1) / frameTime) + 1;
       framesToAdvance = framesToAdvance > maxAdvFrames ? maxAdvFrames : framesToAdvance;
 
-      WARN_LOG(SLIPPI_ONLINE,
-               "Advancing on frame %d due to time sync. Offset: %d us. Frames: %d...", frame,
-               offsetUs, framesToAdvance);
+      WARN_LOG_FMT(SLIPPI_ONLINE,
+                   "Advancing on frame {} due to time sync. Offset: {} us. Frames: {}...", frame,
+                   offsetUs, framesToAdvance);
     }
   }
 
@@ -1905,13 +1907,13 @@ void CEXISlippi::prepareOpponentInputs(s32 frame, bool shouldSkip)
 
 void CEXISlippi::handleCaptureSavestate(u8* payload)
 {
+#ifndef IS_PLAYBACK
   if (isDisconnected())
     return;
+#endif
 
   s32 frame = payload[0] << 24 | payload[1] << 16 | payload[2] << 8 | payload[3];
 
-  u64 startTime = Common::Timer::GetTimeUs();
-
   // Grab an available savestate
   std::unique_ptr<SlippiSavestate> ss;
   if (!availableSavestates.empty())
@@ -1937,9 +1939,9 @@ void CEXISlippi::handleCaptureSavestate(u8* payload)
   ss->Capture();
   activeSavestates[frame] = std::move(ss);
 
-  u32 timeDiff = (u32)(Common::Timer::GetTimeUs() - startTime);
-  INFO_LOG(SLIPPI_ONLINE, "SLIPPI ONLINE: Captured savestate for frame %d in: %f ms", frame,
-           ((double)timeDiff) / 1000);
+  // u32 timeDiff = (u32)(Common::Timer::GetTimeUs() - startTime);
+  // INFO_LOG(SLIPPI_ONLINE, "SLIPPI ONLINE: Captured savestate for frame %d in: %f ms", frame,
+  //          ((double)timeDiff) / 1000);
 }
 
 void CEXISlippi::handleLoadSavestate(u8* payload)
@@ -1950,12 +1952,10 @@ void CEXISlippi::handleLoadSavestate(u8* payload)
   if (!activeSavestates.count(frame))
   {
     // This savestate does not exist... uhhh? What do we do?
-    ERROR_LOG(SLIPPI_ONLINE, "SLIPPI ONLINE: Savestate for frame %d does not exist.", frame);
+    ERROR_LOG_FMT(SLIPPI_ONLINE, "SLIPPI ONLINE: Savestate for frame {} does not exist.", frame);
     return;
   }
 
-  u64 startTime = Common::Timer::GetTimeUs();
-
   // Fetch preservation blocks
   std::vector<SlippiSavestate::PreserveBlock> blocks;
 
@@ -1980,9 +1980,9 @@ void CEXISlippi::handleLoadSavestate(u8* payload)
 
   activeSavestates.clear();
 
-  u32 timeDiff = (u32)(Common::Timer::GetTimeUs() - startTime);
-  INFO_LOG(SLIPPI_ONLINE, "SLIPPI ONLINE: Loaded savestate for frame %d in: %f ms", frame,
-           ((double)timeDiff) / 1000);
+  // u32 timeDiff = (u32)(Common::Timer::GetTimeUs() - startTime);
+  // INFO_LOG(SLIPPI_ONLINE, "SLIPPI ONLINE: Loaded savestate for frame %d in: %f ms", frame,
+  //          ((double)timeDiff) / 1000);
 }
 
 void CEXISlippi::startFindMatch(u8* payload)
@@ -2053,7 +2053,7 @@ void CEXISlippi::startFindMatch(u8* payload)
     // Initialize enet
     auto res = enet_initialize();
     if (res < 0)
-      ERROR_LOG(SLIPPI_ONLINE, "Failed to initialize enet res: %d", res);
+      ERROR_LOG_FMT(SLIPPI_ONLINE, "Failed to initialize enet res: {}", res);
 
     isEnetInitialized = true;
   }
@@ -2071,8 +2071,7 @@ bool CEXISlippi::doesTagMatchInput(u8* input, u8 inputLen, std::string tag)
   for (int i = 0; i < inputLen; i++)
   {
     // ERROR_LOG(SLIPPI_ONLINE, "Entered: %X%X. History: %X%X", input[i * 3], input[i * 3 + 1],
-    // (u8)jisTag[i * 2],
-    //          (u8)jisTag[i * 2 + 1]);
+    // (u8)jisTag[i * 2], (u8)jisTag[i * 2 + 1]);
     if (input[i * 3] != (u8)jisTag[i * 2] || input[i * 3 + 1] != (u8)jisTag[i * 2 + 1])
     {
       isMatch = false;
@@ -2113,7 +2112,7 @@ void CEXISlippi::handleNameEntryLoad(u8* payload)
 
   // Scroll to next tag that
   std::string tagAtIndex = "1";
-  while (curIndex >= 0 && curIndex < (u32)codeHistory->length())
+  while (curIndex >= 0 && curIndex < static_cast<u32>(codeHistory->length()))
   {
     tagAtIndex = codeHistory->get(curIndex);
 
@@ -2124,8 +2123,9 @@ void CEXISlippi::handleNameEntryLoad(u8* payload)
     curIndex = scrollDirection == 2 ? curIndex - 1 : curIndex + 1;
   }
 
-  INFO_LOG(SLIPPI_ONLINE, "Idx: %d, InitIdx: %d, Scroll: %d. Len: %d", curIndex, initialIndex,
-           scrollDirection, inputLen);
+  // INFO_LOG_FMT(SLIPPI_ONLINE, "Idx: {}, InitIdx: {}, Scroll: {}. Len: {}", curIndex,
+  // initialIndex,
+  //          scrollDirection, inputLen);
 
   tagAtIndex = codeHistory->get(curIndex);
   if (tagAtIndex == "1")
@@ -2141,7 +2141,7 @@ void CEXISlippi::handleNameEntryLoad(u8* payload)
     }
   }
 
-  INFO_LOG(SLIPPI_ONLINE, "Retrieved tag: %s", tagAtIndex.c_str());
+  INFO_LOG_FMT(SLIPPI_ONLINE, "Retrieved tag: {}", tagAtIndex.c_str());
   std::string jisCode;
   m_read_queue.clear();
 
@@ -2172,7 +2172,8 @@ void CEXISlippi::handleNameEntryLoad(u8* payload)
     m_read_queue.push_back(0x0);
   }
 
-  INFO_LOG(SLIPPI_ONLINE, "New Idx: %d. Jis Code length: %d", curIndex, (u8)(jisCode.length() / 2));
+  INFO_LOG_FMT(SLIPPI_ONLINE, "New Idx: {}. Jis Code length: {}", curIndex,
+               static_cast<u8>(jisCode.length() / 2));
 
   // Write length of tag
   m_read_queue.push_back(static_cast<u8>(jisCode.length() / 2));
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.cpp b/Source/Core/Core/Slippi/SlippiNetplay.cpp
index 7f11b23de6..a0abb833f3 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.cpp
+++ b/Source/Core/Core/Slippi/SlippiNetplay.cpp
@@ -265,12 +265,12 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
     s64 frameDiffOffsetUs = 16683 * (timing.frame - frame);
     s64 timeOffsetUs = opponentSendTimeUs - timing.timeUs + frameDiffOffsetUs;
 
-    INFO_LOG_FMT(SLIPPI_ONLINE, "[Offset] Opp Frame: {}, My Frame: {}. Time offset: {}", frame,
-                 timing.frame, timeOffsetUs);
+    // INFO_LOG_FMT(SLIPPI_ONLINE, "[Offset] Opp Frame: {}, My Frame: {}. Time offset: {}", frame,
+    //              timing.frame, timeOffsetUs);
 
     // Add this offset to circular buffer for use later
     if (frameOffsetData[pIdx].buf.size() < SLIPPI_ONLINE_LOCKSTEP_INTERVAL)
-      frameOffsetData[pIdx].buf.push_back((s32)timeOffsetUs);
+      frameOffsetData[pIdx].buf.push_back(static_cast<s32>(timeOffsetUs));
     else
       frameOffsetData[pIdx].buf[frameOffsetData[pIdx].idx] = (s32)timeOffsetUs;
 
@@ -321,8 +321,8 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
     spac << (NetPlay::MessageId)NetPlay::NP_MSG_SLIPPI_PAD_ACK;
     spac << frame;
     spac << m_player_idx;
-    INFO_LOG_FMT(SLIPPI_ONLINE, "Sending ack packet for frame {} (player {}) to peer at {}:{}",
-                 frame, packetPlayerPort, peer->address.host, peer->address.port);
+    // INFO_LOG_FMT(SLIPPI_ONLINE, "Sending ack packet for frame {} (player {}) to peer at {}:{}",
+    //              frame, packetPlayerPort, peer->address.host, peer->address.port);
 
     ENetPacket* epac =
         enet_packet_create(spac.getData(), spac.getDataSize(), ENET_PACKET_FLAG_UNSEQUENCED);
@@ -355,8 +355,9 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
       break;
     }
 
-    INFO_LOG_FMT(SLIPPI_ONLINE, "Received ack packet from player {}({}) [{}]...", packetPlayerPort,
-                 pIdx, frame);
+    // INFO_LOG_FMT(SLIPPI_ONLINE, "Received ack packet from player {}({}) [{}]...",
+    // packetPlayerPort,
+    //              pIdx, frame);
 
     lastFrameAcked[pIdx] = frame > lastFrameAcked[pIdx] ? frame : lastFrameAcked[pIdx];