Merge branch 'master' into debug/bones

project-slippi · Apr 3, 2024 · 6006d42 · 6006d42
2 parents 17246ca + 7cd7e77
commit 6006d42
Show file tree

Hide file tree

Showing 8 changed files with 557 additions and 235 deletions.
diff --git 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": ""
   },
   {