diff --git a/Output/InjectionLists/list_netplay.json b/Output/InjectionLists/list_netplay.json
index 16ecdd7f..71b9f580 100644
--- a/Output/InjectionLists/list_netplay.json
+++ b/Output/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": ""
   },
   {
diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini
index c8980cf2..b366df71 100644
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/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
diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini
index f2cd8795..a306c554 100644
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/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
diff --git a/netplay.json b/netplay.json
index de99eee0..4eb35eb3 100644
--- a/netplay.json
+++ b/netplay.json
@@ -163,13 +163,13 @@
         },
         {
           "type": "injectFolder",
-          "sourceFolder": "External/UCF 0.8/Logic",
+          "sourceFolder": "External/UCF 0.84/UCF",
           "isRecursive": true,
-          "annotation": "UCF v0.8"
+          "annotation": "UCF v0.84"
         },
         {
           "type": "injectFolder",
-          "sourceFolder": "External/UCF 0.8/Indicator",
+          "sourceFolder": "External/UCF 0.84/Indicator",
           "isRecursive": true,
           "annotation": "UCF CSS Indicator"
         },