Adjust shinecharge frames and canSpeedyJump reqs

Author: blkerby

region/norfair/west/Business Center.json

@@ -851,10 +851,10 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 90},
+        {"shineChargeFrames": 80},
         "HiJump",
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 6, "excessFrames": 0}}
+        {"shinespark": {"frames": 8, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -1343,10 +1343,16 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 80},
+        {"or": [
+          {"and": [
+            "canSpeedyJump",
+            {"shineChargeFrames": 70}
+          ]},
+          {"shineChargeFrames": 75}
+        ]},
         "HiJump",
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 10, "excessFrames": 0}}
+        {"shinespark": {"frames": 11, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {
@@ -1739,7 +1745,13 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 85},
+        {"or": [
+          {"and": [
+            "canSpeedyJump",
+            {"shineChargeFrames": 85}
+          ]},
+          {"shineChargeFrames": 90}
+        ]},
         "HiJump",
         "canShinechargeMovementComplex",
         {"shinespark": {"frames": 8, "excessFrames": 0}}