From d4636454d8ffb4ae23d83466ce18608eef5e0ac8 Mon Sep 17 00:00:00 2001
From: Jas Laferriere <Fizzi36@gmail.com>
Date: Mon, 18 Dec 2023 15:49:31 -0500
Subject: [PATCH] chore: update ucf to 0.84

---
 Data/PlaybackGeckoCodes/GALE01r2.ini          | 520 +++++++++++++++++-
 Data/PlaybackGeckoCodes/GALJ01r2.ini          | 520 +++++++++++++++++-
 Data/Sys/GameSettings/GALE01r2.ini            | 370 +++++++++----
 Data/Sys/GameSettings/GALJ01r2.ini            | 370 +++++++++----
 .../InjectionLists/list_console_core.json     |   9 +-
 .../InjectionLists/list_netplay-old3.json     |  11 +
 .../Slippi/InjectionLists/list_netplay.json   |  80 ++-
 7 files changed, 1591 insertions(+), 289 deletions(-)
 create mode 100644 Data/Sys/Slippi/InjectionLists/list_netplay-old3.json

diff --git a/Data/PlaybackGeckoCodes/GALE01r2.ini b/Data/PlaybackGeckoCodes/GALE01r2.ini
index bad30343dd..99a333104d 100644
--- a/Data/PlaybackGeckoCodes/GALE01r2.ini
+++ b/Data/PlaybackGeckoCodes/GALE01r2.ini
@@ -10,6 +10,7 @@ FastDiscSpeed = True
 [Gecko_Enabled]
 $Required: General Codes
 $Required: Slippi Playback
+$Recommended: Slippi Recording
 $Optional: Show Player Names
 
 [Gecko]
@@ -126,7 +127,7 @@ $Required: Slippi Playback [Fizzi, UnclePunch, Achilles, tauKhan, Krohnos]
 C216E9E4 0000001D #Playback/Core/CleanDynamicGeckos.asm
 3BC30000 7C0802A6
 90010004 9421FF20
-BE8100B0 83CDB64C
+BE8100B0 83CDAFC0
 83BE0010 3B800000
 807D0000 2C030000
 41820018 3B9C0001
@@ -157,7 +158,7 @@ C216D298 00000016 #Playback/Core/FetchGameFrame.asm
 881F0008 2C000000
 408200A0 7C0802A6
 90010004 9421FF20
-BE8100B0 806DB64C
+BE8100B0 806DAFC0
 83630000 38600076
 987B0000 806DB654
 907B0001 7F63DB78
@@ -182,7 +183,7 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm
 8BBF000C 7FA3EB78
 3D808003 618C1724
 7D8903A6 4E800421
-7C7C1B78 832DB64C
+7C7C1B78 832DAFC0
 83790000 7FE3FB78
 3D808000 618C55F8
 7D8903A6 4E800421
@@ -250,13 +251,15 @@ C0230044 D0230030
 BA8100B0 800100E4
 382100E0 7C0803A6
 881F2219 00000000
-C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
+C216E748 0000009F #Playback/Core/RestoreGameInfo.asm
+3D808022 618C54B8
+7D8903A6 4E800421
 7C0802A6 90010004
 9421FF20 BE8100B0
 386005EC 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7C1B78
-938DB64C 388005EC
+938DAFC0 388005EC
 3D808000 618CC160
 7D8903A6 4E800421
 38600221 3D808037
@@ -347,7 +350,7 @@ C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
 7D8903A6 4E800421
 4800013C 4E800021
 2C050000 41820018
-80CDB64C 8066000C
+80CDAFC0 8066000C
 38630008 7C632A14
 9066000C 4E800020
 4E800021 2C050000
@@ -356,7 +359,7 @@ C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
 BE8100B0 7C9E2378
 7CBB2B78 80BE0000
 54A501FE 64BD8000
-834DB64C 833A0014
+834DAFC0 833A0014
 2C030004 41820014
 2C030006 41820014
 2C0300C2 41820014
@@ -399,7 +402,7 @@ BA8100B0 800100E4
 4800004C 4E800021
 7C0802A6 90010004
 9421FF20 BE8100B0
-806DB64C 83A30000
+806DAFC0 83A30000
 887D0002 2C030000
 41820010 807D0003
 3C80804D 90645F90
@@ -407,10 +410,9 @@ BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 BA8100B0
 800100E4 382100E0
-7C0803A6 3C608017
-60000000 00000000
+7C0803A6 00000000
 C216D304 00000009 #Playback/Core/RestoreLRAStart.asm
-806DB64C 80630000
+806DAFC0 80630000
 88630000 2C030002
 4082002C 3860FFFF
 38800007 3D808016
@@ -420,18 +422,18 @@ C216D304 00000009 #Playback/Core/RestoreLRAStart.asm
 4E800420 7FE3FB78
 60000000 00000000
 C216B9C0 00000012 #Playback/Core/RestoreStockSteal.asm
-80ADB64C 80A50004
+80ADAFC0 80A50004
 38800089 98850000
 808DB654 90850001
 98650005 7CA32B78
 38800006 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-806DB64C 80630004
+806DAFC0 80630004
 38800001 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
-806DB64C 80630004
+806DAFC0 80630004
 88630000 2C030000
 41820014 3D808016
 618CBA1C 7D8903A6
@@ -446,13 +448,13 @@ C21A501C 0000002A #Playback/Core/FastForward/FastForward.asm
 3D80801A 618C45E8
 7D8903A6 4E800421
 2C030002 41820018
-806DB64C 80630000
+806DAFC0 80630000
 88630000 2C030003
 41820024 38600001
 38800002 3D808002
 618C5064 7D8903A6
 4E800421 7C1AD800
-480000E0 806DB64C
+480000E0 806DAFC0
 80630000 88630001
 2C030001 4182001C
 38600000 38800000
@@ -673,7 +675,7 @@ C238D224 00000015 #Playback/Core/Sounds/AssignSoundInstanceId.asm
 2C03010E 40820090
 7C0802A6 90010004
 9421FF20 BE8100B0
-83EDB64C 3BDF001C
+83EDAFC0 3BDF001C
 8B9E0000 3C608048
 80639D60 809F056B
 7C032000 41810028
@@ -699,7 +701,7 @@ C21A5014 00000032 #Playback/Core/Sounds/HandleFrameSoundLog.asm
 9421FF20 BE8100B0
 3D808034 618C7364
 7D8903A6 4E800421
-7C7D1B78 83EDB64C
+7C7D1B78 83EDAFC0
 3BDF001C 8B9E0000
 3F008048 83189D60
 3B18FFFF 82FF056B
@@ -745,7 +747,7 @@ C2088224 0000001D #Playback/Core/Sounds/NoDestroyVoice.asm
 5463443E 2C03010E
 408200CC 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BBF001C 57DE043E
 8B9D0000 3C608048
 80639D60 809F056B
@@ -775,7 +777,7 @@ C20882B0 0000001D #Playback/Core/Sounds/NoDestroyVoice2.asm
 5463443E 2C03010E
 408200CC 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BBF001C 57DE043E
 8B9D0000 3C608048
 80639D60 809F056B
@@ -805,7 +807,7 @@ C238D0B0 00000027 #Playback/Core/Sounds/PreventDuplicateSounds.asm
 5463443E 2C03010E
 40820120 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BDF001C 3BA00000
 3B400000 56FB043E
 8B9E0000 3C608048
@@ -922,6 +924,480 @@ C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
 7C83612E 4E800020
 60000000 00000000
 
+$Recommended: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337, Krohnos]
+*Allows for outputting new replay data during playback.
+*Used to power spectator service and upgrading replay versions.
+040679BC 38802600 #Recording/ExtendPlayerBlock.asm
+C23219EC 0000001D #Recording/FlushFrameBuffer.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 418200A8
+806DB64C 83C30000
+83ADB650 7F9EEA14
+2C1D0000 41820090
+3860003C 987C0000
+806DB654 907C0001
+3C608048 80639D30
+5463443E 2C030208
+806DB654 4082003C
+80ADB61C 88850010
+2C040000 4082002C
+8885000F 2C040000
+40820020 80850909
+3884FF85 80E50916
+7C872050 7C041800
+40800008 7C832378
+907C0005 3BBD0009
+7FC3F378 7FA4EB78
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38600000
+906DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 8001001C
+60000000 00000000
+C216D884 00000030 #Recording/SendGameEnd.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820144
+3F208046 6339B6A0
+8B590008 2C1A0000
+41820130 830DB64C
+88780004 2C030000
+40820120 3C608048
+80639D30 5463443E
+2C030208 4082001C
+2C1A0002 40820014
+806DB61C 8863000F
+2C030000 418200F4
+83B80000 38600039
+987D0000 9B5D0001
+2C1A0007 4082000C
+88790001 48000008
+3860FFFF 987D0002
+3E808047 62949DA4
+7E83A378 3C808046
+6084B8EC 38A02278
+3D808000 618C31F4
+7D8903A6 4E800421
+3C808046 6084B6A0
+7E83A378 880424D0
+98030006 88040008
+98030004 3D808016
+618C6378 7D8903A6
+4E800421 3AA00000
+7EA3AB78 48000041
+38950003 7C64E9AE
+3AB50001 2C150003
+4081FFE8 7FA3EB78
+38800007 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+38600001 98780004
+48000030 3D808047
+618C9DA4 1D6300A8
+7D6B6214 886B0058
+2C030003 4182000C
+886B005E 48000008
+3860FFFF 4E800020
+BA8100B0 800100E4
+382100E0 7C0803A6
+819F2514 00000000
+C216E74C 0000010A #Recording/SendGameInfo.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820814
+38600005 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7B1B78
+936DB64C 38800005
+3D808000 618CC160
+7D8903A6 4E800421
+38600770 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+93DB0000 38600000
+906DB650 3C608000
+60635600 80630000
+38630008 38800000
+3D808000 618C55FC
+7D8903A6 4E800421
+7C7C1B78 38600035
+987E0000 3860001C
+987E0001 38600036
+987E0002 386002F8
+B07E0003 38600037
+987E0005 38600040
+B07E0006 38600038
+987E0008 38600054
+B07E0009 38600039
+987E000B 38600006
+B07E000C 3860003A
+987E000E 3860000C
+B07E000F 3860003B
+987E0011 3860002C
+B07E0012 3860003C
+987E0014 38600008
+B07E0015 3860003D
+987E0017 B39E0018
+38600010 987E001A
+38600204 B07E001B
+38600036 987E001D
+3C600310 60630000
+907E001E 387E0022
+7FE4FB78 38A00138
+3D808000 618C31F4
+7D8903A6 4E800421
+387E0062 3880001C
+3D808000 618CC160
+7D8903A6 4E800421
+387E0022 3AA30060
+3A800000 1ED40024
+7ED6AA14 88760001
+2C030000 40820034
+88760000 2C030012
+40820028 3C60804C
+606320BC 1C940044
+7C632214 80630000
+546005EF 4182000C
+38600013 98760000
+3A940001 2C140004
+4180FFB4 387E0022
+3AA30060 3A800000
+1ED40024 7ED6AA14
+88760001 2C030000
+4082002C 88760000
+3D808016 618C9238
+7D8903A6 4E800421
+88960003 7C041800
+4081000C 38600000
+98760003 3A940001
+2C140004 4180FFBC
+3C60804D 80635F90
+907E015A 3A82F228
+3AA00000 3ADE015E
+1EF50008 38600001
+7C76B92E 3AF70004
+7C76B92E 3AB50001
+2C150004 4180FFE4
+3A800000 3ABF0060
+3AFE017E 1F140010
+7F18BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820040
+8876000A 2C030078
+41820034 3D808023
+618C754C 7D8903A6
+4E800421 7C641B78
+7F03C378 38A00010
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+38800010 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FF88
+8862F234 987E01BE
+8862F23C 987E01BF
+3C608048 80639D30
+5463443E B07E01C0
+3B200000 3C608048
+80639D30 5463443E
+2C030208 4082017C
+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 3AFE023E
+3B5900CF 1C74000A
+7F03BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820028
+1C74000A 7C83D214
+7F03C378 38A0000A
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+3880000A 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
+3A800000 3ABF0060
+3AFE0266 3B5900F7
+1C74001D 7F03BA14
+1ED40024 7ED6AA14
+88760001 2C030000
+40820028 1C74001D
+7C83D214 7F03C378
+38A0001D 3D808000
+618C31F4 7D8903A6
+4E800421 4800001C
+7F03C378 3880001D
+3D808000 618CC160
+7D8903A6 4E800421
+3A940001 2C140004
+4180FFA0 4800001C
+387E01C2 38800118
+3D808000 618CC160
+7D8903A6 4E800421
+3D808000 618CADF4
+7D8903A6 4E800421
+987E02DA 2C190000
+41820044 387E02DB
+38990394 38A00033
+3D808000 618C31F4
+7D8903A6 4E800421
+3C60803D 6063AD40
+80630000 81830088
+A06C0001 907E030E
+886C0006 907E0312
+4800001C 387E02DB
+3880003B 3D808000
+618CC160 7D8903A6
+4E800421 2C190000
+41820018 7F23CB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7FC3F378 38800316
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38600205
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C751B78 3C608000
+60635600 80630000
+3AE30008 38600010
+98750000 3860003D
+98750203 38600200
+B0750201 38600000
+98750204 3AC00000
+7C76E050 2C030200
+41810010 B0750201
+38600001 98750204
+38750001 7EE4BB78
+7C84B214 A0B50201
+3D808000 618C31F4
+7D8903A6 4E800421
+7EA3AB78 38800205
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 3AD60200
+7C16E000 4180FFA4
+7EA3AB78 3D808037
+618CF1B0 7D8903A6
+4E800421 38600004
+38800007 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+48000021 7C8802A6
+38A00000 3D808038
+618CFD54 7D8903A6
+4E800421 48000070
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 806DB64C
+83A30000 838DB650
+7FBDE214 3860003A
+987D0000 806DB654
+907D0001 3C60804D
+80635F90 907D0005
+3C608048 80639D60
+907D0009 838DB650
+3B9C000D 938DB650
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 38600004
+38800007 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+48000021 7C8802A6
+38A0000F 3D808038
+618CFD54 7D8903A6
+4E800421 4800012C
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 806DB64C
+83E30000 83CDB650
+7FFFF214 3B600000
+806DC18C 83A30024
+2C1D0000 418200E0
+3B7B0001 2C1B000F
+418100D4 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
+A07C0DA8 B07F002B
+83CDB650 3BDE002D
+93CDB650 3BFF002D
+83BD0008 2C1D0000
+4082FF28 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+BA8100B0 800100E4
+382100E0 7C0803A6
+3C608017 00000000
+C206DA34 00000038 #Recording/SendGamePostFrame.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820180
+887F221F 546306F7
+40820174 8B7F000C
+806DB64C 83A30000
+838DB650 7FBDE214
+38600038 987D0000
+806DB654 907D0001
+9B7D0005 7FE3FB78
+3D808000 618C55F8
+7D8903A6 4E800421
+987D0006 807F0004
+987D0007 807F0010
+B07D0008 807F00B0
+907D000A 807F00B4
+907D000E 807F002C
+907D0012 807F1830
+907D0016 807F1998
+907D001A 807F208C
+987D001E A07F2090
+987D001F 807F18C4
+987D0020 7F63DB78
+3D808003 618C3BD8
+7D8903A6 4E800421
+987D0021 807F0894
+907D0022 887F2218
+987D0026 887F221A
+987D0027 887F221B
+987D0028 887F221C
+987D0029 887F221F
+987D002A 807F2340
+907D002B 807F00E0
+987D002F 807F083C
+B07D0030 887F1968
+809F0168 7C632050
+987D0032 887F25FF
+987D0033 807F1988
+2C030000 40820008
+807F198C 987D0034
+807F0080 907D0035
+807F0084 907D0039
+807F008C 907D003D
+807F0090 907D0041
+807F00EC 907D0045
+807F195C 907D0049
+807F0014 907D004D
+A07F18EC B07D0051
+A07F2088 B07D0053
+838DB650 3B9C0055
+938DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 8001001C
+60000000 00000000
+C206B0E0 0000002C #Recording/SendGamePreFrame.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820120
+8B7F000C 806DB64C
+83A30000 838DB650
+7FBDE214 38600037
+987D0000 806DB654
+907D0001 9B7D0005
+7FE3FB78 3D808000
+618C55F8 7D8903A6
+4E800421 987D0006
+3C60804D 80635F90
+907D0007 807F0010
+B07D000B 807F00B0
+907D000D 807F00B4
+907D0011 807F002C
+907D0015 807F0620
+907D0019 807F0624
+907D001D 807F0638
+907D0021 807F063C
+907D0025 807F0650
+907D0029 807F065C
+907D002D 3C60804C
+60631FAC 1C9B0044
+7C832214 A0640002
+B07D0031 80640030
+907D0033 80640034
+907D0037 3C608046
+6063B108 3C80804C
+60841F78 88840001
+3884FFFF 2C040000
+40A00008 38840005
+1C840030 7C632214
+1C9B000C 7C832214
+88640002 987D003B
+88640003 987D0040
+807F1830 907D003C
+838DB650 3B9C0041
+938DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 881F2219
+807F065C 00000000
+C2005604 0000000B #Recording/ShouldRecord.asm
+3C608048 80639D30
+5463443E 2C030202
+41820034 2C030302
+4182002C 2C030208
+41820024 2C03010F
+4182001C 2C030120
+41820014 2C03010E
+4182000C 38600000
+4800000C 38600001
+48000004 4E800020
+60000000 00000000
+C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
+7C050000 4080000C
+38E00001 48000008
+38E00002 8103002C
+98E825FF 7C050000
+60000000 00000000
+C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
+38600000 987E25FF
+807E00B0 00000000
+
 $Optional: Show Player Names [Fizzi, UnclePunch, Enzyme, jmlee337]
 *Show players' Slippi Online display names as HUD elements when available
 C216E9B4 0000009A #Playback/Show Player Names/InitInGame.asm
@@ -972,7 +1448,7 @@ C1C07AE1 3C6F34D7
 3D80803A 618C611C
 7D8903A6 4E800421
 7C7F1B78 4BFFFE91
-7F8802A6 834DB64C
+7F8802A6 834DAFC0
 3A800000 3EA0804A
 62B50FF0 7E83A378
 3D808003 618C241C
diff --git a/Data/PlaybackGeckoCodes/GALJ01r2.ini b/Data/PlaybackGeckoCodes/GALJ01r2.ini
index d3d3f783a5..99f39ae2f6 100644
--- a/Data/PlaybackGeckoCodes/GALJ01r2.ini
+++ b/Data/PlaybackGeckoCodes/GALJ01r2.ini
@@ -9,6 +9,7 @@ FastDiscSpeed = True
 [Gecko_Enabled]
 $Required: General Codes
 $Required: Slippi Playback
+$Recommended: Slippi Recording
 $Optional: Show Player Names
 
 [Gecko]
@@ -125,7 +126,7 @@ $Required: Slippi Playback [Fizzi, UnclePunch, Achilles, tauKhan, Krohnos]
 C216E9E4 0000001D #Playback/Core/CleanDynamicGeckos.asm
 3BC30000 7C0802A6
 90010004 9421FF20
-BE8100B0 83CDB64C
+BE8100B0 83CDAFC0
 83BE0010 3B800000
 807D0000 2C030000
 41820018 3B9C0001
@@ -156,7 +157,7 @@ C216D298 00000016 #Playback/Core/FetchGameFrame.asm
 881F0008 2C000000
 408200A0 7C0802A6
 90010004 9421FF20
-BE8100B0 806DB64C
+BE8100B0 806DAFC0
 83630000 38600076
 987B0000 806DB654
 907B0001 7F63DB78
@@ -181,7 +182,7 @@ C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm
 8BBF000C 7FA3EB78
 3D808003 618C1724
 7D8903A6 4E800421
-7C7C1B78 832DB64C
+7C7C1B78 832DAFC0
 83790000 7FE3FB78
 3D808000 618C55F8
 7D8903A6 4E800421
@@ -249,13 +250,15 @@ C0230044 D0230030
 BA8100B0 800100E4
 382100E0 7C0803A6
 881F2219 00000000
-C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
+C216E748 0000009F #Playback/Core/RestoreGameInfo.asm
+3D808022 618C54B8
+7D8903A6 4E800421
 7C0802A6 90010004
 9421FF20 BE8100B0
 386005EC 3D808037
 618CF1E4 7D8903A6
 4E800421 7C7C1B78
-938DB64C 388005EC
+938DAFC0 388005EC
 3D808000 618CC160
 7D8903A6 4E800421
 38600221 3D808037
@@ -346,7 +349,7 @@ C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
 7D8903A6 4E800421
 4800013C 4E800021
 2C050000 41820018
-80CDB64C 8066000C
+80CDAFC0 8066000C
 38630008 7C632A14
 9066000C 4E800020
 4E800021 2C050000
@@ -355,7 +358,7 @@ C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm
 BE8100B0 7C9E2378
 7CBB2B78 80BE0000
 54A501FE 64BD8000
-834DB64C 833A0014
+834DAFC0 833A0014
 2C030004 41820014
 2C030006 41820014
 2C0300C2 41820014
@@ -398,7 +401,7 @@ BA8100B0 800100E4
 4800004C 4E800021
 7C0802A6 90010004
 9421FF20 BE8100B0
-806DB64C 83A30000
+806DAFC0 83A30000
 887D0002 2C030000
 41820010 807D0003
 3C80804D 90645F90
@@ -406,10 +409,9 @@ BA8100B0 800100E4
 382100E0 7C0803A6
 4E800020 BA8100B0
 800100E4 382100E0
-7C0803A6 3C608017
-60000000 00000000
+7C0803A6 00000000
 C216D304 00000009 #Playback/Core/RestoreLRAStart.asm
-806DB64C 80630000
+806DAFC0 80630000
 88630000 2C030002
 4082002C 3860FFFF
 38800007 3D808016
@@ -419,18 +421,18 @@ C216D304 00000009 #Playback/Core/RestoreLRAStart.asm
 4E800420 7FE3FB78
 60000000 00000000
 C216B9C0 00000012 #Playback/Core/RestoreStockSteal.asm
-80ADB64C 80A50004
+80ADAFC0 80A50004
 38800089 98850000
 808DB654 90850001
 98650005 7CA32B78
 38800006 38A00001
 3D808000 618C55F0
 7D8903A6 4E800421
-806DB64C 80630004
+806DAFC0 80630004
 38800001 38A00000
 3D808000 618C55F0
 7D8903A6 4E800421
-806DB64C 80630004
+806DAFC0 80630004
 88630000 2C030000
 41820014 3D808016
 618CBA1C 7D8903A6
@@ -445,13 +447,13 @@ C21A501C 0000002A #Playback/Core/FastForward/FastForward.asm
 3D80801A 618C45E8
 7D8903A6 4E800421
 2C030002 41820018
-806DB64C 80630000
+806DAFC0 80630000
 88630000 2C030003
 41820024 38600001
 38800002 3D808002
 618C5064 7D8903A6
 4E800421 7C1AD800
-480000E0 806DB64C
+480000E0 806DAFC0
 80630000 88630001
 2C030001 4182001C
 38600000 38800000
@@ -672,7 +674,7 @@ C238D224 00000015 #Playback/Core/Sounds/AssignSoundInstanceId.asm
 2C03010E 40820090
 7C0802A6 90010004
 9421FF20 BE8100B0
-83EDB64C 3BDF001C
+83EDAFC0 3BDF001C
 8B9E0000 3C608048
 80639D60 809F056B
 7C032000 41810028
@@ -698,7 +700,7 @@ C21A5014 00000032 #Playback/Core/Sounds/HandleFrameSoundLog.asm
 9421FF20 BE8100B0
 3D808034 618C7364
 7D8903A6 4E800421
-7C7D1B78 83EDB64C
+7C7D1B78 83EDAFC0
 3BDF001C 8B9E0000
 3F008048 83189D60
 3B18FFFF 82FF056B
@@ -744,7 +746,7 @@ C2088224 0000001D #Playback/Core/Sounds/NoDestroyVoice.asm
 5463443E 2C03010E
 408200CC 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BBF001C 57DE043E
 8B9D0000 3C608048
 80639D60 809F056B
@@ -774,7 +776,7 @@ C20882B0 0000001D #Playback/Core/Sounds/NoDestroyVoice2.asm
 5463443E 2C03010E
 408200CC 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BBF001C 57DE043E
 8B9D0000 3C608048
 80639D60 809F056B
@@ -804,7 +806,7 @@ C238D0B0 00000027 #Playback/Core/Sounds/PreventDuplicateSounds.asm
 5463443E 2C03010E
 40820120 7C0802A6
 90010004 9421FF20
-BE8100B0 83EDB64C
+BE8100B0 83EDAFC0
 3BDF001C 3BA00000
 3B400000 56FB043E
 8B9E0000 3C608048
@@ -921,6 +923,480 @@ C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
 7C83612E 4E800020
 60000000 00000000
 
+$Recommended: Slippi Recording [Fizzi, Achilles, UnclePunch, Nikki, jmlee337, Krohnos]
+*Allows for outputting new replay data during playback.
+*Used to power spectator service and upgrading replay versions.
+040679BC 38802600 #Recording/ExtendPlayerBlock.asm
+C23219EC 0000001D #Recording/FlushFrameBuffer.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 418200A8
+806DB64C 83C30000
+83ADB650 7F9EEA14
+2C1D0000 41820090
+3860003C 987C0000
+806DB654 907C0001
+3C608048 80639D30
+5463443E 2C030208
+806DB654 4082003C
+80ADB61C 88850010
+2C040000 4082002C
+8885000F 2C040000
+40820020 80850909
+3884FF85 80E50916
+7C872050 7C041800
+40800008 7C832378
+907C0005 3BBD0009
+7FC3F378 7FA4EB78
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38600000
+906DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 8001001C
+60000000 00000000
+C216D884 00000030 #Recording/SendGameEnd.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820144
+3F208046 6339B6A0
+8B590008 2C1A0000
+41820130 830DB64C
+88780004 2C030000
+40820120 3C608048
+80639D30 5463443E
+2C030208 4082001C
+2C1A0002 40820014
+806DB61C 8863000F
+2C030000 418200F4
+83B80000 38600039
+987D0000 9B5D0001
+2C1A0007 4082000C
+88790001 48000008
+3860FFFF 987D0002
+3E808047 62949DA4
+7E83A378 3C808046
+6084B8EC 38A02278
+3D808000 618C31F4
+7D8903A6 4E800421
+3C808046 6084B6A0
+7E83A378 880424D0
+98030006 88040008
+98030004 3D808016
+618C6378 7D8903A6
+4E800421 3AA00000
+7EA3AB78 48000041
+38950003 7C64E9AE
+3AB50001 2C150003
+4081FFE8 7FA3EB78
+38800007 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+38600001 98780004
+48000030 3D808047
+618C9DA4 1D6300A8
+7D6B6214 886B0058
+2C030003 4182000C
+886B005E 48000008
+3860FFFF 4E800020
+BA8100B0 800100E4
+382100E0 7C0803A6
+819F2514 00000000
+C216E74C 0000010A #Recording/SendGameInfo.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820814
+38600005 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7B1B78
+936DB64C 38800005
+3D808000 618CC160
+7D8903A6 4E800421
+38600770 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7E1B78
+93DB0000 38600000
+906DB650 3C608000
+60635600 80630000
+38630008 38800000
+3D808000 618C55FC
+7D8903A6 4E800421
+7C7C1B78 38600035
+987E0000 3860001C
+987E0001 38600036
+987E0002 386002F8
+B07E0003 38600037
+987E0005 38600040
+B07E0006 38600038
+987E0008 38600054
+B07E0009 38600039
+987E000B 38600006
+B07E000C 3860003A
+987E000E 3860000C
+B07E000F 3860003B
+987E0011 3860002C
+B07E0012 3860003C
+987E0014 38600008
+B07E0015 3860003D
+987E0017 B39E0018
+38600010 987E001A
+38600204 B07E001B
+38600036 987E001D
+3C600310 60630000
+907E001E 387E0022
+7FE4FB78 38A00138
+3D808000 618C31F4
+7D8903A6 4E800421
+387E0062 3880001C
+3D808000 618CC160
+7D8903A6 4E800421
+387E0022 3AA30060
+3A800000 1ED40024
+7ED6AA14 88760001
+2C030000 40820034
+88760000 2C030012
+40820028 3C60804C
+606320BC 1C940044
+7C632214 80630000
+546005EF 4182000C
+38600013 98760000
+3A940001 2C140004
+4180FFB4 387E0022
+3AA30060 3A800000
+1ED40024 7ED6AA14
+88760001 2C030000
+4082002C 88760000
+3D808016 618C9238
+7D8903A6 4E800421
+88960003 7C041800
+4081000C 38600000
+98760003 3A940001
+2C140004 4180FFBC
+3C60804D 80635F90
+907E015A 3A82F228
+3AA00000 3ADE015E
+1EF50008 38600001
+7C76B92E 3AF70004
+7C76B92E 3AB50001
+2C150004 4180FFE4
+3A800000 3ABF0060
+3AFE017E 1F140010
+7F18BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820040
+8876000A 2C030078
+41820034 3D808023
+618C754C 7D8903A6
+4E800421 7C641B78
+7F03C378 38A00010
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+38800010 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FF88
+8862F234 987E01BE
+8862F23C 987E01BF
+3C608048 80639D30
+5463443E B07E01C0
+3B200000 3C608048
+80639D30 5463443E
+2C030208 4082017C
+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 3AFE023E
+3B5900CF 1C74000A
+7F03BA14 1ED40024
+7ED6AA14 88760001
+2C030000 40820028
+1C74000A 7C83D214
+7F03C378 38A0000A
+3D808000 618C31F4
+7D8903A6 4E800421
+4800001C 7F03C378
+3880000A 3D808000
+618CC160 7D8903A6
+4E800421 3A940001
+2C140004 4180FFA0
+3A800000 3ABF0060
+3AFE0266 3B5900F7
+1C74001D 7F03BA14
+1ED40024 7ED6AA14
+88760001 2C030000
+40820028 1C74001D
+7C83D214 7F03C378
+38A0001D 3D808000
+618C31F4 7D8903A6
+4E800421 4800001C
+7F03C378 3880001D
+3D808000 618CC160
+7D8903A6 4E800421
+3A940001 2C140004
+4180FFA0 4800001C
+387E01C2 38800118
+3D808000 618CC160
+7D8903A6 4E800421
+3D808000 618CADF4
+7D8903A6 4E800421
+987E02DA 2C190000
+41820044 387E02DB
+38990394 38A00033
+3D808000 618C31F4
+7D8903A6 4E800421
+3C60803D 6063AD40
+80630000 81830088
+A06C0001 907E030E
+886C0006 907E0312
+4800001C 387E02DB
+3880003B 3D808000
+618CC160 7D8903A6
+4E800421 2C190000
+41820018 7F23CB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7FC3F378 38800316
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 38600205
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C751B78 3C608000
+60635600 80630000
+3AE30008 38600010
+98750000 3860003D
+98750203 38600200
+B0750201 38600000
+98750204 3AC00000
+7C76E050 2C030200
+41810010 B0750201
+38600001 98750204
+38750001 7EE4BB78
+7C84B214 A0B50201
+3D808000 618C31F4
+7D8903A6 4E800421
+7EA3AB78 38800205
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 3AD60200
+7C16E000 4180FFA4
+7EA3AB78 3D808037
+618CF1B0 7D8903A6
+4E800421 38600004
+38800007 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+48000021 7C8802A6
+38A00000 3D808038
+618CFD54 7D8903A6
+4E800421 48000070
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 806DB64C
+83A30000 838DB650
+7FBDE214 3860003A
+987D0000 806DB654
+907D0001 3C60804D
+80635F90 907D0005
+3C608048 80639D60
+907D0009 838DB650
+3B9C000D 938DB650
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 38600004
+38800007 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+48000021 7C8802A6
+38A0000F 3D808038
+618CFD54 7D8903A6
+4E800421 4800012C
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 806DB64C
+83E30000 83CDB650
+7FFFF214 3B600000
+806DC18C 83A30024
+2C1D0000 418200E0
+3B7B0001 2C1B000F
+418100D4 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
+A07C0DA8 B07F002B
+83CDB650 3BDE002D
+93CDB650 3BFF002D
+83BD0008 2C1D0000
+4082FF28 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+BA8100B0 800100E4
+382100E0 7C0803A6
+3C608017 00000000
+C206DA34 00000038 #Recording/SendGamePostFrame.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820180
+887F221F 546306F7
+40820174 8B7F000C
+806DB64C 83A30000
+838DB650 7FBDE214
+38600038 987D0000
+806DB654 907D0001
+9B7D0005 7FE3FB78
+3D808000 618C55F8
+7D8903A6 4E800421
+987D0006 807F0004
+987D0007 807F0010
+B07D0008 807F00B0
+907D000A 807F00B4
+907D000E 807F002C
+907D0012 807F1830
+907D0016 807F1998
+907D001A 807F208C
+987D001E A07F2090
+987D001F 807F18C4
+987D0020 7F63DB78
+3D808003 618C3BD8
+7D8903A6 4E800421
+987D0021 807F0894
+907D0022 887F2218
+987D0026 887F221A
+987D0027 887F221B
+987D0028 887F221C
+987D0029 887F221F
+987D002A 807F2340
+907D002B 807F00E0
+987D002F 807F083C
+B07D0030 887F1968
+809F0168 7C632050
+987D0032 887F25FF
+987D0033 807F1988
+2C030000 40820008
+807F198C 987D0034
+807F0080 907D0035
+807F0084 907D0039
+807F008C 907D003D
+807F0090 907D0041
+807F00EC 907D0045
+807F195C 907D0049
+807F0014 907D004D
+A07F18EC B07D0051
+A07F2088 B07D0053
+838DB650 3B9C0055
+938DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 8001001C
+60000000 00000000
+C206B0E0 0000002C #Recording/SendGamePreFrame.asm
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808000 618C5604
+7D8903A6 4E800421
+2C030000 41820120
+8B7F000C 806DB64C
+83A30000 838DB650
+7FBDE214 38600037
+987D0000 806DB654
+907D0001 9B7D0005
+7FE3FB78 3D808000
+618C55F8 7D8903A6
+4E800421 987D0006
+3C60804D 80635F90
+907D0007 807F0010
+B07D000B 807F00B0
+907D000D 807F00B4
+907D0011 807F002C
+907D0015 807F0620
+907D0019 807F0624
+907D001D 807F0638
+907D0021 807F063C
+907D0025 807F0650
+907D0029 807F065C
+907D002D 3C60804C
+60631FAC 1C9B0044
+7C832214 A0640002
+B07D0031 80640030
+907D0033 80640034
+907D0037 3C608046
+6063B108 3C80804C
+60841F78 88840001
+3884FFFF 2C040000
+40A00008 38840005
+1C840030 7C632214
+1C9B000C 7C832214
+88640002 987D003B
+88640003 987D0040
+807F1830 907D003C
+838DB650 3B9C0041
+938DB650 BA8100B0
+800100E4 382100E0
+7C0803A6 881F2219
+807F065C 00000000
+C2005604 0000000B #Recording/ShouldRecord.asm
+3C608048 80639D30
+5463443E 2C030202
+41820034 2C030302
+4182002C 2C030208
+41820024 2C03010F
+4182001C 2C030120
+41820014 2C03010E
+4182000C 38600000
+4800000C 38600001
+48000004 4E800020
+60000000 00000000
+C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
+7C050000 4080000C
+38E00001 48000008
+38E00002 8103002C
+98E825FF 7C050000
+60000000 00000000
+C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
+38600000 987E25FF
+807E00B0 00000000
+
 $Optional: Show Player Names [Fizzi, UnclePunch, Enzyme, jmlee337]
 *Show players' Slippi Online display names as HUD elements when available
 C216E9B4 0000009A #Playback/Show Player Names/InitInGame.asm
@@ -971,7 +1447,7 @@ C1C07AE1 3C6F34D7
 3D80803A 618C611C
 7D8903A6 4E800421
 7C7F1B78 4BFFFE91
-7F8802A6 834DB64C
+7F8802A6 834DAFC0
 3A800000 3EA0804A
 62B50FF0 7E83A378
 3D808003 618C241C
diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini
index 62972ab173..b366df7163 100644
--- a/Data/Sys/GameSettings/GALE01r2.ini
+++ b/Data/Sys/GameSettings/GALE01r2.ini
@@ -233,114 +233,250 @@ FC0F0840 4081000C
 FC0F8840 41800010
 C21F0318 FE0F802A
 D21F0318 00000000
-C20C9A44 0000002B #External/UCF 0.8/Logic/UCF DB.asm
-D01F002C 7C0802A6
-90010004 9421FF20
-BE8100B0 48000121
-7FC802A6 C03F0894
-C05E0000 FC011040
-40820118 808DAEB4
-C03F0620 FC200A10
-C044003C FC011040
-41800100 887F0670
-2C030002 408000F4
-887F221F 54600739
-408200E8 3C60804C
-60631F78 8BA30001
-387DFFFE 889F0618
-4800008D 7C7C1B78
-7FA3EB78 889F0618
-4800007D 7C7C1850
-7C6319D6 2C0315F9
-408100B0 38000001
-901F2358 901F2340
-809F0004 2C04000A
-40A20098 887F000C
-38800001 3D808003
-618C418C 7D8903A6
+C20D65EC 00000010 #External/UCF 0.84/UCF/UCF DBOOC SquatRv Fix.asm
+4800003D 3F170A3D
+42A00000 38D1B717
+00000000 00000000
+FC200A10 C0440004
+C0640008 EC2118B8
+FC20081E D824000C
+80C40010 38C60002
+4E800020 C0040094
+7C8802A6 88C50670
+2C060001 4080002C
+C0250620 4BFFFFC5
+7C0631D6 C0250624
+4BFFFFB9 7CC631D6
+7C003214 2C001900
+40810008 C0040000
+60000000 00000000
+C20C9A44 00000020 #External/UCF 0.84/UCF/UCF Dashback.asm
+893F221F D01F002C
+71290008 408200F0
+815F0894 3D204000
+7C0A4800 408200E0
+C19F0620 812DAEB4
+EC000332 C189003C
+FC006000 418000C8
+893F0670 28090001
+418100BC 3D008007
+895F0618 3908AD10
+85280750 55293032
+7D293670 39290004
+7D294214 1D0A000C
+1D4A0006 7D094214
+89080008 7CEA4214
+3908FFFE 550807BE
+54E7083C 7D4A4214
+7CE938AE 554A083C
+7D2950AE 7CE70774
+7D290774 7D293850
+7D2949D6 2C0915F9
+40810054 9421FFF8
+39200001 38800001
+913F2340 913F2358
+3D208003 3929418C
+887F000C 7D2903A6
 4E800421 2C030000
-41820078 8083002C
-80841ECC C03F002C
-D0240018 C05E0004
-FC011040 4181000C
-38600080 48000008
-3860007F 98640006
-48000048 7C852378
-3863FFFF 2C030000
-40800008 38630005
-3C808046 6084B108
-1C630030 7C841A14
-1C65000C 7C841A14
-88640002 7C630774
-4E800020 4E800021
-40000000 00000000
-BA8100B0 800100E4
-382100E0 7C0803A6
+41820020 8123002C
+81491ECC 813F002C
+912A0018 55290FFE
+3929007F 992A0006
+38210008 00000000
+C206B460 00000054 #External/UCF 0.84/UCF/UCF Pad Buffer + 1.0 Cardinals.asm
+480000B1 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 BF1C0000
+38D1B717 42A00000
+3923004F 5529063E
+2809009E 4081002C
+38840006 5484063E
+2804000C 4D810020
+54630000 39200000
+6C633F80 91250004
+90650000 4E800020
+3924004F 5529063E
+2809009E 4C810020
+38630006 5463063E
+2803000C 4D810020
+54840000 39200000
+6C843F80 91250000
+90850004 4E800020
+9421FFC0 BF210024
+93810014 7F8802A6
+3D20800A 7FE3FB78
+39292040 7D2903A6
+4E800421 2C030000
+408201A0 3D20804C
+8BDF0618 39291F78
+7FFAFB78 89090001
+2C080000 3948FFFF
+40A20008 39400004
+1D4A0030 81290008
+1F7E000C 3BBC0000
+7D295214 1FDE0006
+7D09DA14 7D49D82E
+81280008 80E80004
+7D1DDA14 91210010
+89280008 91410008
+39290001 90E1000C
+552907BE 99280008
+5539063E 7D3E4A14
+5529083C 7D5D4B2E
+813A0004 2C090013
+40A20010 813A0010
+2C09015D 41A20034
+8881000B 38BA0620
+8861000A 7C840774
+7C630774 4BFFFEBD
+8881000D 8861000C
+38BA0638 7C840774
+7C630774 4BFFFEA5
+C01A0624 39400000
+C19C0030 FC006000
+418100C0 C19A0620
+FC000210 C15C0038
+39210018 FD806210
+C17C0034 EC005AB8
+ED8C5AB8 FC00001E
+FD80601E 7D804FAE
+3921001C 81010018
+7C004FAE 39080002
+8121001C 7D0841D6
+39290002 7D2949D6
+7D294214 2C091900
+40810068 7D3DDA14
+89490009 5549063E
+2C090000 40820050
+893A0671 28090001
+41A10048 3939FFFE
+7D1ECA14 552907BE
+5508083C 7FDE4A14
+7D1D4214 57DE083C
+89080001 7FDDF214
+893E0001 7D080774
+7D290774 7D294050
+7D2949D6 2C090790
+40810008 394A0001
+7FBDDA14 995D0009
+887F0678 83810014
+83210024 83410028
+8361002C 83A10034
+83C10038 38210040
 60000000 00000000
-C20998A4 00000026 #External/UCF 0.8/Logic/UCF SD.asm
-7C0802A6 90010004
-9421FF20 BE8100B0
-7C7E1B78 83FE002C
-480000DD 7FA802A6
-C03F063C 806DAEB4
-C0030314 FC010040
-408100E4 C03F0620
-48000071 D0210090
-C03F0624 48000065
-C0410090 EC4200B2
-EC210072 EC21102A
-C05D000C FC011040
-418000B4 889F0670
-2C040003 408100A8
-C01D0010 C03F0624
-FC000840 40800098
-BA8100B0 800100E4
-382100E0 7C0803A6
-8061001C 83E10014
-38210018 38630008
-7C6803A6 4E800020
-FC000A10 C03D0000
-EC000072 C03D0004
-EC000828 FC00001E
-D8010080 80610084
-38630002 3C004330
-C85D0014 6C638000
-90010080 90610084
-C8210080 EC011028
-C03D0000 EC200824
-4E800020 4E800021
-42A00000 37270000
-43300000 3F800000
-BF4CCCCD 43300000
-80000000 7FC3F378
-7FE4FB78 BA8100B0
-800100E4 382100E0
-7C0803A6 00000000
-C20908F4 00000017 #External/UCF 0.8/Logic/UCF Tumble.asm
-7C0802A6 90010004
-9421FF20 BE8100B0
+C208E54C 0000001D #External/UCF 0.84/UCF/UCF SDI.asm
+7C002800 418000DC
+89230673 28090001
+40810014 89230674
+3D406000 28090001
+418100BC C183062C
+3D406000 C0030628
+ED8C0332 EC00603A
+C18404B0 ED8C0332
+FC0C0000 40810098
+3D008007 89430618
+3908AD10 85280750
+55293032 7D293670
+39290004 7D294214
+1D0A000C 1D4A0006
+7D094214 89080008
+38E8FFFE 7D0A4214
+54E707BE 5508083C
+7D4A3A14 7CC94214
+554A083C 7D0940AE
+7CE95214 7D2950AE
+7D080774 89470001
+7D290774 7D294050
+89060001 7D4A0774
+7D2949D6 7D080774
+7D4A4050 7D4A51D6
+7D295214 3D406000
+2C090F04 40810008
+3D408000 7D580120
+60000000 00000000
+C209A0B8 0000000A #External/UCF 0.84/UCF/UCF Shield Drop Extended.asm
+4C401382 4182003C
+3D208007 89040618
+3929AD10 81490750
+1D08000C 39290754
+554A3032 7D4A3670
+7D295214 7D294214
+89290009 28090001
+4081000C 4C421242
+4800000C 4C421182
+60000000 00000000
+C20998A4 00000019 #External/UCF 0.84/UCF/UCF Shield Drop.asm
+4800003D BF4CCCCD
+42A00000 38D1B717
+00000000 00000000
+FC200A10 C0460004
+C0660008 EC2118B8
+FC20081E D826000C
+80E60010 38E70002
+4E800020 8083002C
+7CC802A6 80ADAEB4
+C004063C C0250314
+FC000840 40810070
+88040670 80E50320
+7C003800 41800060
+C0240624 C0060000
+FC010040 40810050
+8004083C 2C00FFFF
+41820044 80040840
+540005EF 41820038
+4BFFFF89 7C0739D6
+C0240620 4BFFFF7D
+7CE739D6 7C003A14
+2C001900 40810018
+80E1001C 38210018
+38E70008 7CE803A6
+4E800020 00000000
+C2093294 00000014 #External/UCF 0.84/UCF/UCF Shield SDI.asm
+7C030000 41800094
+89240673 3CC06000
+28090001 41810080
+C1840628 C00504B0
+FC0C0000 40800070
+3D008007 89440618
+3908AD10 85280750
+55293032 7D293670
+39290004 7D294214
+1D0A000C 1D4A0006
+7D094214 89080008
+7CEA4214 3908FFFE
+550807BE 54E7083C
+7D4A4214 7CE938AE
+554A083C 7D2950AE
+7CE70774 7D290774
+7D293850 7D2949D6
+2C090F04 40810008
+3CC08000 7CD80120
+60000000 00000000
+C20908F4 00000013 #External/UCF 0.84/UCF/UCF Tumble.asm
 2C030001 4082008C
-C03F0628 FC200A10
-806DAEB4 C0430210
-FC011040 40800074
-3F80804C 639C1F78
-8BDC0001 387EFFFE
-889F0618 48000029
-7C7D1B78 7FC3F378
-889F0618 48000019
-7C7D1850 7C6319D6
-388015F9 7C041800
-48000038 7C852378
-3863FFFF 2C030000
-40800008 38630005
-809C0008 1C630030
-7C841A14 1C65000C
-7C841A14 88640002
-7C630774 4E800020
-BA8100B0 800100E4
-382100E0 7C0803A6
+C19F0628 3D406000
+FD806210 FC0C0000
+40800074 3D008007
+895F0618 3908AD10
+85280750 55293032
+7D293670 39290004
+7D294214 1D0A000C
+1D4A0006 7D094214
+89080008 7CEA4214
+3908FFFE 550807BE
+54E7083C 7D4A4214
+7CE938AE 554A083C
+7D2950AE 7CE70774
+3D406000 7D290774
+7D293850 7D2949D6
+2C0915F9 40810008
+3D408000 7D580120
 60000000 00000000
-C22662D0 0000001A #External/UCF 0.8/Indicator/UCF Text.asm
+C22662D0 0000001B #External/UCF 0.84/Indicator/UCF Text.asm
 7C0802A6 90010004
 9421FF20 BE8100B0
 48000089 7FC802A6
@@ -359,14 +495,15 @@ C05E0004 3D80803A
 7FE3FB78 C03E0008
 C05E0008 3D80803A
 618C7548 7D8903A6
-4E800421 48000024
+4E800421 48000028
 4E800021 42180000
 C3898000 3EE66666
 3DCCCCCD 4E800021
-55434620 302E3800
-BA8100B0 800100E4
-382100E0 7C0803A6
-38980000 00000000
+55434620 302E3834
+00000000 BA8100B0
+800100E4 382100E0
+7C0803A6 38980000
+60000000 00000000
 C226325C 00000008 #External/DPad Down at CSS for Random Stage/DPad Down at CSS for Random Stage.asm
 3C808045 6084BF17
 54E0077B 4182001C
@@ -959,7 +1096,7 @@ A07F2088 B07D0053
 800100E4 382100E0
 7C0803A6 8001001C
 60000000 00000000
-C206B0DC 0000002C #Recording/SendGamePreFrame.asm
+C206B0E0 0000002C #Recording/SendGamePreFrame.asm
 7C0802A6 90010004
 9421FF20 BE8100B0
 3D808000 618C5604
@@ -1003,14 +1140,15 @@ B07D0031 80640030
 938DB650 BA8100B0
 800100E4 382100E0
 7C0803A6 881F2219
-60000000 00000000
-C2005604 0000000A #Recording/ShouldRecord.asm
+807F065C 00000000
+C2005604 0000000B #Recording/ShouldRecord.asm
 3C608048 80639D30
 5463443E 2C030202
-4182002C 2C030302
-41820024 2C030208
-4182001C 2C03010F
-41820014 2C030120
+41820034 2C030302
+4182002C 2C030208
+41820024 2C03010F
+4182001C 2C030120
+41820014 2C03010E
 4182000C 38600000
 4800000C 38600001
 48000004 4E800020
diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini
index d4f4dfa299..a306c55488 100644
--- a/Data/Sys/GameSettings/GALJ01r2.ini
+++ b/Data/Sys/GameSettings/GALJ01r2.ini
@@ -232,114 +232,250 @@ FC0F0840 4081000C
 FC0F8840 41800010
 C21F0318 FE0F802A
 D21F0318 00000000
-C20C9A44 0000002B #External/UCF 0.8/Logic/UCF DB.asm
-D01F002C 7C0802A6
-90010004 9421FF20
-BE8100B0 48000121
-7FC802A6 C03F0894
-C05E0000 FC011040
-40820118 808DAEB4
-C03F0620 FC200A10
-C044003C FC011040
-41800100 887F0670
-2C030002 408000F4
-887F221F 54600739
-408200E8 3C60804C
-60631F78 8BA30001
-387DFFFE 889F0618
-4800008D 7C7C1B78
-7FA3EB78 889F0618
-4800007D 7C7C1850
-7C6319D6 2C0315F9
-408100B0 38000001
-901F2358 901F2340
-809F0004 2C04000A
-40A20098 887F000C
-38800001 3D808003
-618C418C 7D8903A6
+C20D65EC 00000010 #External/UCF 0.84/UCF/UCF DBOOC SquatRv Fix.asm
+4800003D 3F170A3D
+42A00000 38D1B717
+00000000 00000000
+FC200A10 C0440004
+C0640008 EC2118B8
+FC20081E D824000C
+80C40010 38C60002
+4E800020 C0040094
+7C8802A6 88C50670
+2C060001 4080002C
+C0250620 4BFFFFC5
+7C0631D6 C0250624
+4BFFFFB9 7CC631D6
+7C003214 2C001900
+40810008 C0040000
+60000000 00000000
+C20C9A44 00000020 #External/UCF 0.84/UCF/UCF Dashback.asm
+893F221F D01F002C
+71290008 408200F0
+815F0894 3D204000
+7C0A4800 408200E0
+C19F0620 812DAEB4
+EC000332 C189003C
+FC006000 418000C8
+893F0670 28090001
+418100BC 3D008007
+895F0618 3908AD10
+85280750 55293032
+7D293670 39290004
+7D294214 1D0A000C
+1D4A0006 7D094214
+89080008 7CEA4214
+3908FFFE 550807BE
+54E7083C 7D4A4214
+7CE938AE 554A083C
+7D2950AE 7CE70774
+7D290774 7D293850
+7D2949D6 2C0915F9
+40810054 9421FFF8
+39200001 38800001
+913F2340 913F2358
+3D208003 3929418C
+887F000C 7D2903A6
 4E800421 2C030000
-41820078 8083002C
-80841ECC C03F002C
-D0240018 C05E0004
-FC011040 4181000C
-38600080 48000008
-3860007F 98640006
-48000048 7C852378
-3863FFFF 2C030000
-40800008 38630005
-3C808046 6084B108
-1C630030 7C841A14
-1C65000C 7C841A14
-88640002 7C630774
-4E800020 4E800021
-40000000 00000000
-BA8100B0 800100E4
-382100E0 7C0803A6
+41820020 8123002C
+81491ECC 813F002C
+912A0018 55290FFE
+3929007F 992A0006
+38210008 00000000
+C206B460 00000054 #External/UCF 0.84/UCF/UCF Pad Buffer + 1.0 Cardinals.asm
+480000B1 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 00000000
+00000000 BF1C0000
+38D1B717 42A00000
+3923004F 5529063E
+2809009E 4081002C
+38840006 5484063E
+2804000C 4D810020
+54630000 39200000
+6C633F80 91250004
+90650000 4E800020
+3924004F 5529063E
+2809009E 4C810020
+38630006 5463063E
+2803000C 4D810020
+54840000 39200000
+6C843F80 91250000
+90850004 4E800020
+9421FFC0 BF210024
+93810014 7F8802A6
+3D20800A 7FE3FB78
+39292040 7D2903A6
+4E800421 2C030000
+408201A0 3D20804C
+8BDF0618 39291F78
+7FFAFB78 89090001
+2C080000 3948FFFF
+40A20008 39400004
+1D4A0030 81290008
+1F7E000C 3BBC0000
+7D295214 1FDE0006
+7D09DA14 7D49D82E
+81280008 80E80004
+7D1DDA14 91210010
+89280008 91410008
+39290001 90E1000C
+552907BE 99280008
+5539063E 7D3E4A14
+5529083C 7D5D4B2E
+813A0004 2C090013
+40A20010 813A0010
+2C09015D 41A20034
+8881000B 38BA0620
+8861000A 7C840774
+7C630774 4BFFFEBD
+8881000D 8861000C
+38BA0638 7C840774
+7C630774 4BFFFEA5
+C01A0624 39400000
+C19C0030 FC006000
+418100C0 C19A0620
+FC000210 C15C0038
+39210018 FD806210
+C17C0034 EC005AB8
+ED8C5AB8 FC00001E
+FD80601E 7D804FAE
+3921001C 81010018
+7C004FAE 39080002
+8121001C 7D0841D6
+39290002 7D2949D6
+7D294214 2C091900
+40810068 7D3DDA14
+89490009 5549063E
+2C090000 40820050
+893A0671 28090001
+41A10048 3939FFFE
+7D1ECA14 552907BE
+5508083C 7FDE4A14
+7D1D4214 57DE083C
+89080001 7FDDF214
+893E0001 7D080774
+7D290774 7D294050
+7D2949D6 2C090790
+40810008 394A0001
+7FBDDA14 995D0009
+887F0678 83810014
+83210024 83410028
+8361002C 83A10034
+83C10038 38210040
 60000000 00000000
-C20998A4 00000026 #External/UCF 0.8/Logic/UCF SD.asm
-7C0802A6 90010004
-9421FF20 BE8100B0
-7C7E1B78 83FE002C
-480000DD 7FA802A6
-C03F063C 806DAEB4
-C0030314 FC010040
-408100E4 C03F0620
-48000071 D0210090
-C03F0624 48000065
-C0410090 EC4200B2
-EC210072 EC21102A
-C05D000C FC011040
-418000B4 889F0670
-2C040003 408100A8
-C01D0010 C03F0624
-FC000840 40800098
-BA8100B0 800100E4
-382100E0 7C0803A6
-8061001C 83E10014
-38210018 38630008
-7C6803A6 4E800020
-FC000A10 C03D0000
-EC000072 C03D0004
-EC000828 FC00001E
-D8010080 80610084
-38630002 3C004330
-C85D0014 6C638000
-90010080 90610084
-C8210080 EC011028
-C03D0000 EC200824
-4E800020 4E800021
-42A00000 37270000
-43300000 3F800000
-BF4CCCCD 43300000
-80000000 7FC3F378
-7FE4FB78 BA8100B0
-800100E4 382100E0
-7C0803A6 00000000
-C20908F4 00000017 #External/UCF 0.8/Logic/UCF Tumble.asm
-7C0802A6 90010004
-9421FF20 BE8100B0
+C208E54C 0000001D #External/UCF 0.84/UCF/UCF SDI.asm
+7C002800 418000DC
+89230673 28090001
+40810014 89230674
+3D406000 28090001
+418100BC C183062C
+3D406000 C0030628
+ED8C0332 EC00603A
+C18404B0 ED8C0332
+FC0C0000 40810098
+3D008007 89430618
+3908AD10 85280750
+55293032 7D293670
+39290004 7D294214
+1D0A000C 1D4A0006
+7D094214 89080008
+38E8FFFE 7D0A4214
+54E707BE 5508083C
+7D4A3A14 7CC94214
+554A083C 7D0940AE
+7CE95214 7D2950AE
+7D080774 89470001
+7D290774 7D294050
+89060001 7D4A0774
+7D2949D6 7D080774
+7D4A4050 7D4A51D6
+7D295214 3D406000
+2C090F04 40810008
+3D408000 7D580120
+60000000 00000000
+C209A0B8 0000000A #External/UCF 0.84/UCF/UCF Shield Drop Extended.asm
+4C401382 4182003C
+3D208007 89040618
+3929AD10 81490750
+1D08000C 39290754
+554A3032 7D4A3670
+7D295214 7D294214
+89290009 28090001
+4081000C 4C421242
+4800000C 4C421182
+60000000 00000000
+C20998A4 00000019 #External/UCF 0.84/UCF/UCF Shield Drop.asm
+4800003D BF4CCCCD
+42A00000 38D1B717
+00000000 00000000
+FC200A10 C0460004
+C0660008 EC2118B8
+FC20081E D826000C
+80E60010 38E70002
+4E800020 8083002C
+7CC802A6 80ADAEB4
+C004063C C0250314
+FC000840 40810070
+88040670 80E50320
+7C003800 41800060
+C0240624 C0060000
+FC010040 40810050
+8004083C 2C00FFFF
+41820044 80040840
+540005EF 41820038
+4BFFFF89 7C0739D6
+C0240620 4BFFFF7D
+7CE739D6 7C003A14
+2C001900 40810018
+80E1001C 38210018
+38E70008 7CE803A6
+4E800020 00000000
+C2093294 00000014 #External/UCF 0.84/UCF/UCF Shield SDI.asm
+7C030000 41800094
+89240673 3CC06000
+28090001 41810080
+C1840628 C00504B0
+FC0C0000 40800070
+3D008007 89440618
+3908AD10 85280750
+55293032 7D293670
+39290004 7D294214
+1D0A000C 1D4A0006
+7D094214 89080008
+7CEA4214 3908FFFE
+550807BE 54E7083C
+7D4A4214 7CE938AE
+554A083C 7D2950AE
+7CE70774 7D290774
+7D293850 7D2949D6
+2C090F04 40810008
+3CC08000 7CD80120
+60000000 00000000
+C20908F4 00000013 #External/UCF 0.84/UCF/UCF Tumble.asm
 2C030001 4082008C
-C03F0628 FC200A10
-806DAEB4 C0430210
-FC011040 40800074
-3F80804C 639C1F78
-8BDC0001 387EFFFE
-889F0618 48000029
-7C7D1B78 7FC3F378
-889F0618 48000019
-7C7D1850 7C6319D6
-388015F9 7C041800
-48000038 7C852378
-3863FFFF 2C030000
-40800008 38630005
-809C0008 1C630030
-7C841A14 1C65000C
-7C841A14 88640002
-7C630774 4E800020
-BA8100B0 800100E4
-382100E0 7C0803A6
+C19F0628 3D406000
+FD806210 FC0C0000
+40800074 3D008007
+895F0618 3908AD10
+85280750 55293032
+7D293670 39290004
+7D294214 1D0A000C
+1D4A0006 7D094214
+89080008 7CEA4214
+3908FFFE 550807BE
+54E7083C 7D4A4214
+7CE938AE 554A083C
+7D2950AE 7CE70774
+3D406000 7D290774
+7D293850 7D2949D6
+2C0915F9 40810008
+3D408000 7D580120
 60000000 00000000
-C22662D0 0000001A #External/UCF 0.8/Indicator/UCF Text.asm
+C22662D0 0000001B #External/UCF 0.84/Indicator/UCF Text.asm
 7C0802A6 90010004
 9421FF20 BE8100B0
 48000089 7FC802A6
@@ -358,14 +494,15 @@ C05E0004 3D80803A
 7FE3FB78 C03E0008
 C05E0008 3D80803A
 618C7548 7D8903A6
-4E800421 48000024
+4E800421 48000028
 4E800021 42180000
 C3898000 3EE66666
 3DCCCCCD 4E800021
-55434620 302E3800
-BA8100B0 800100E4
-382100E0 7C0803A6
-38980000 00000000
+55434620 302E3834
+00000000 BA8100B0
+800100E4 382100E0
+7C0803A6 38980000
+60000000 00000000
 C226325C 00000008 #External/DPad Down at CSS for Random Stage/DPad Down at CSS for Random Stage.asm
 3C808045 6084BF17
 54E0077B 4182001C
@@ -958,7 +1095,7 @@ A07F2088 B07D0053
 800100E4 382100E0
 7C0803A6 8001001C
 60000000 00000000
-C206B0DC 0000002C #Recording/SendGamePreFrame.asm
+C206B0E0 0000002C #Recording/SendGamePreFrame.asm
 7C0802A6 90010004
 9421FF20 BE8100B0
 3D808000 618C5604
@@ -1002,14 +1139,15 @@ B07D0031 80640030
 938DB650 BA8100B0
 800100E4 382100E0
 7C0803A6 881F2219
-60000000 00000000
-C2005604 0000000A #Recording/ShouldRecord.asm
+807F065C 00000000
+C2005604 0000000B #Recording/ShouldRecord.asm
 3C608048 80639D30
 5463443E 2C030202
-4182002C 2C030302
-41820024 2C030208
-4182001C 2C03010F
-41820014 2C030120
+41820034 2C030302
+4182002C 2C030208
+41820024 2C03010F
+4182001C 2C030120
+41820014 2C03010E
 4182000C 38600000
 4800000C 38600001
 48000004 4E800020
diff --git a/Data/Sys/Slippi/InjectionLists/list_console_core.json b/Data/Sys/Slippi/InjectionLists/list_console_core.json
index ba1abf0351..ab58b33e46 100644
--- a/Data/Sys/Slippi/InjectionLists/list_console_core.json
+++ b/Data/Sys/Slippi/InjectionLists/list_console_core.json
@@ -239,7 +239,7 @@
    "Tags": ""
   },
   {
-   "InjectionAddress": "8006B0DC",
+   "InjectionAddress": "8006B0E0",
    "Name": "Slippi Recording",
    "Codetype": "Auto",
    "Annotation": "Recording/SendGamePreFrame.asm",
@@ -266,6 +266,13 @@
    "Annotation": "Recording/GetLCancelStatus/ResetLCancelStatus.asm",
    "Tags": ""
   },
+  {
+   "InjectionAddress": "801A4CB4",
+   "Name": "Slippi Recording",
+   "Codetype": "Auto",
+   "Annotation": "Common/AllocBuffer.asm",
+   "Tags": ""
+  },
   {
    "InjectionAddress": "800055F8",
    "Name": "Slippi Recording",
diff --git a/Data/Sys/Slippi/InjectionLists/list_netplay-old3.json b/Data/Sys/Slippi/InjectionLists/list_netplay-old3.json
new file mode 100644
index 0000000000..d2c26dce45
--- /dev/null
+++ b/Data/Sys/Slippi/InjectionLists/list_netplay-old3.json
@@ -0,0 +1,11 @@
+{
+ "Details": [
+  {
+   "InjectionAddress": "8006B0DC",
+   "Name": "Required: Slippi Recording",
+   "Codetype": "Auto",
+   "Annotation": "Recording/SendGamePreFrame.asm",
+   "Tags": ""
+  }
+ ]
+}
\ No newline at end of file
diff --git a/Data/Sys/Slippi/InjectionLists/list_netplay.json b/Data/Sys/Slippi/InjectionLists/list_netplay.json
index 732af658ab..71b9f580ce 100644
--- a/Data/Sys/Slippi/InjectionLists/list_netplay.json
+++ b/Data/Sys/Slippi/InjectionLists/list_netplay.json
@@ -252,32 +252,67 @@
    "Annotation": "",
    "Tags": ""
   },
+  {
+   "InjectionAddress": "800D65EC",
+   "Name": "Required: General Codes",
+   "Codetype": "Auto",
+   "Annotation": "External/UCF 0.84/UCF/UCF DBOOC SquatRv Fix.asm",
+   "Tags": "[affects-gameplay]"
+  },
   {
    "InjectionAddress": "800C9A44",
    "Name": "Required: General Codes",
    "Codetype": "Auto",
-   "Annotation": "External/UCF 0.8/Logic/UCF DB.asm",
+   "Annotation": "External/UCF 0.84/UCF/UCF Dashback.asm",
+   "Tags": "[affects-gameplay]"
+  },
+  {
+   "InjectionAddress": "8006B460",
+   "Name": "Required: General Codes",
+   "Codetype": "Auto",
+   "Annotation": "External/UCF 0.84/UCF/UCF Pad Buffer + 1.0 Cardinals.asm",
+   "Tags": "[affects-gameplay]"
+  },
+  {
+   "InjectionAddress": "8008E54C",
+   "Name": "Required: General Codes",
+   "Codetype": "Auto",
+   "Annotation": "External/UCF 0.84/UCF/UCF SDI.asm",
+   "Tags": "[affects-gameplay]"
+  },
+  {
+   "InjectionAddress": "8009A0B8",
+   "Name": "Required: General Codes",
+   "Codetype": "Auto",
+   "Annotation": "External/UCF 0.84/UCF/UCF Shield Drop Extended.asm",
    "Tags": "[affects-gameplay]"
   },
   {
    "InjectionAddress": "800998A4",
    "Name": "Required: General Codes",
    "Codetype": "Auto",
-   "Annotation": "External/UCF 0.8/Logic/UCF SD.asm",
+   "Annotation": "External/UCF 0.84/UCF/UCF Shield Drop.asm",
+   "Tags": "[affects-gameplay]"
+  },
+  {
+   "InjectionAddress": "80093294",
+   "Name": "Required: General Codes",
+   "Codetype": "Auto",
+   "Annotation": "External/UCF 0.84/UCF/UCF Shield SDI.asm",
    "Tags": "[affects-gameplay]"
   },
   {
    "InjectionAddress": "800908F4",
    "Name": "Required: General Codes",
    "Codetype": "Auto",
-   "Annotation": "External/UCF 0.8/Logic/UCF Tumble.asm",
+   "Annotation": "External/UCF 0.84/UCF/UCF Tumble.asm",
    "Tags": "[affects-gameplay]"
   },
   {
    "InjectionAddress": "802662D0",
    "Name": "Required: General Codes",
    "Codetype": "Auto",
-   "Annotation": "External/UCF 0.8/Indicator/UCF Text.asm",
+   "Annotation": "External/UCF 0.84/Indicator/UCF Text.asm",
    "Tags": ""
   },
   {
@@ -435,7 +470,7 @@
    "Tags": ""
   },
   {
-   "InjectionAddress": "8006B0DC",
+   "InjectionAddress": "8006B0E0",
    "Name": "Required: Slippi Recording",
    "Codetype": "Auto",
    "Annotation": "Recording/SendGamePreFrame.asm",
@@ -462,6 +497,13 @@
    "Annotation": "Recording/GetLCancelStatus/ResetLCancelStatus.asm",
    "Tags": ""
   },
+  {
+   "InjectionAddress": "801A4CB4",
+   "Name": "Required: Slippi Recording",
+   "Codetype": "Auto",
+   "Annotation": "Common/AllocBuffer.asm",
+   "Tags": ""
+  },
   {
    "InjectionAddress": "800055F8",
    "Name": "Required: Slippi Recording",
@@ -651,13 +693,6 @@
    "Annotation": "Online/Core/TriggerSendInput.asm",
    "Tags": ""
   },
-  {
-   "InjectionAddress": "801A4CB4",
-   "Name": "Required: Slippi Online",
-   "Codetype": "Auto",
-   "Annotation": "Online/Core/EXIFileLoad/AllocBuffer.asm",
-   "Tags": ""
-  },
   {
    "InjectionAddress": "800163FC",
    "Name": "Required: Slippi Online",
@@ -728,6 +763,27 @@
    "Annotation": "Online/Core/Hacks/PreventPadAlarmDuringRollback.asm",
    "Tags": ""
   },
+  {
+   "InjectionAddress": "8038E910",
+   "Name": "Required: Slippi Online",
+   "Codetype": "Auto",
+   "Annotation": "Online/Core/Music/StartSong.asm",
+   "Tags": ""
+  },
+  {
+   "InjectionAddress": "800236EC",
+   "Name": "Required: Slippi Online",
+   "Codetype": "Auto",
+   "Annotation": "Online/Core/Music/Stop.asm",
+   "Tags": ""
+  },
+  {
+   "InjectionAddress": "800249F0",
+   "Name": "Required: Slippi Online",
+   "Codetype": "Auto",
+   "Annotation": "Online/Core/Music/VolumeChange.asm",
+   "Tags": ""
+  },
   {
    "InjectionAddress": "801D4578",
    "Name": "Required: Slippi Online",