Move to layers

c844178f · Matthewit Dechatech · 18403213 · c844178f · c844178f · c844178f
Commit c844178f authored 9 years ago by Matthewit Dechatech
--- a/Chemical_Hill_Sonic_2.unity
+++ b/Chemical_Hill_Sonic_2.unity
--- a/External/Sonic 16-bit/Characters/S3K Sonic/Animations/S3K Sonic.controller
+++ b/External/Sonic 16-bit/Characters/S3K Sonic/Animations/S3K Sonic.controller
@@ -148,7 +148,7 @@ AnimatorController:
    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
-    m_Name: Move Sprites
+    m_Name: Normal Sprites
    m_StateMachine: {fileID: 110788418}
    m_Mask: {fileID: 0}
    m_Motions: []
@@ -160,7 +160,7 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: Interrupt Sprites
+    m_Name: Special Sprites
    m_StateMachine: {fileID: 110739538}
    m_Mask: {fileID: 0}
    m_Motions: []
@@ -251,7 +251,7 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
  OutParameter: Cycle Speed
--- !u!114 &11416510
+--- !u!114 &11409500
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
@@ -259,24 +259,35 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 44014b0440734b1429f58dfb63f649a6, type: 3}
+  m_Script: {fileID: 11500000, guid: a64833eeaef0ccf4680664bdce859a7e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  UnchangedValue: -1
-  GroundAcceleration: .84375
-  GroundDeceleration: 9
-  GroundFriction: .84375
-  GroundTopSpeed: 1.79999995
-  SlopeGravity: 1.5
-  AirAcceleration: 1.6875
-  AirGravity: 2.25
-  AirTopSpeed: 1.79999995
-  JumpSpeed: 2.0999999
-  JumpReleaseSpeed: 1.20000005
-  RollingFriction: .421875
-  RollingDeceleration: -1
-  RollingUphillGravity: .9375
-  RollingDownhillGravity: 3.75
+  Roll: {fileID: 0}
+  UnchangedValue: 0
+  WidthChange: 0
+  HeightChange: 0
+  UphillGravity: .9375
+  DownhillGravity: 3.75
+  Deceleration: 0
+  Friction: .421875
+--- !u!114 &11411000
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3226df353e46bda4898dc61391a0ea78, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Controller: {fileID: 0}
+  UnchangedValue: 0
+  GroundFriction: 1.6875
+  GravityDirection: 0
+  AirGravity: 7.85699987
+  AirDrag: 0
+  SlopeGravity: 4.5
 --- !u!114 &11418110
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -389,6 +400,38 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
  OutParameter: Cycle Speed
+--- !u!114 &11430818
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f9f3758b16e575e428fb4ac6250b6287, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GroundControl: {fileID: 0}
+  UnchangedValue: 0
+  Acceleration: 1.6875
+  Deceleration: 18
+  TopSpeed: 3.5999999
+  MinSlopeGravitySpeed: 0
+--- !u!114 &11445542
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c330ef3321ecec646acef22273e71f9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Jump: {fileID: 0}
+  UnchangedValue: 0
+  ActivateSpeed: 3.9000001
+  ReleaseSpeed: 2.4000001
 --- !u!114 &11452802
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -445,6 +488,21 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
  OutParameter: Cycle Speed
+--- !u!114 &11457712
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c330ef3321ecec646acef22273e71f9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Jump: {fileID: 0}
+  UnchangedValue: 0
+  ActivateSpeed: 2.0999999
+  ReleaseSpeed: 1.20000005
 --- !u!114 &11460208
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -473,6 +531,22 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
  OutParameter: Cycle Speed
+--- !u!114 &11463570
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed848169c026c8048a3c3c3f6eb33360, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AirControl: {fileID: 0}
+  UnchangedValue: 0
+  Acceleration: 3.375
+  Deceleration: 3.375
+  TopSpeed: 3.5999999
 --- !u!114 &11468146
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -485,7 +559,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Parameter: Corkscrew Progress
--- !u!114 &11482682
+--- !u!114 &11483968
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
@@ -493,24 +567,51 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 44014b0440734b1429f58dfb63f649a6, type: 3}
+  m_Script: {fileID: 11500000, guid: 3226df353e46bda4898dc61391a0ea78, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  UnchangedValue: -1
-  GroundAcceleration: 1.6875
-  GroundDeceleration: 18
-  GroundFriction: 1.6875
-  GroundTopSpeed: 3.5999999
-  SlopeGravity: 4.5
-  AirAcceleration: 3.375
-  AirGravity: 7.85699987
-  AirTopSpeed: 3.5999999
-  JumpSpeed: 3.9000001
-  JumpReleaseSpeed: 2.4000001
-  RollingFriction: .845099986
-  RollingDeceleration: 4.5
-  RollingUphillGravity: 2.8125
-  RollingDownhillGravity: 11.25
+  Controller: {fileID: 0}
+  UnchangedValue: 0
+  GroundFriction: .84375
+  GravityDirection: 0
+  AirGravity: 2.25
+  AirDrag: 0
+  SlopeGravity: 1.5
+--- !u!114 &11487074
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a64833eeaef0ccf4680664bdce859a7e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Roll: {fileID: 0}
+  UnchangedValue: 0
+  WidthChange: 0
+  HeightChange: 0
+  UphillGravity: 2.8125
+  DownhillGravity: 11.25
+  Deceleration: 4.5
+  Friction: .845099986
+--- !u!114 &11488184
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed848169c026c8048a3c3c3f6eb33360, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AirControl: {fileID: 0}
+  UnchangedValue: 0
+  Acceleration: 1.6875
+  Deceleration: 1.6875
+  TopSpeed: 1.79999995
 --- !u!114 &11488478
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -557,6 +658,23 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
  OutParameter: Cycle Speed
+--- !u!114 &11495940
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f9f3758b16e575e428fb4ac6250b6287, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GroundControl: {fileID: 0}
+  UnchangedValue: 0
+  Acceleration: .84375
+  Deceleration: 9
+  TopSpeed: 1.79999995
+  MinSlopeGravitySpeed: 0
 --- !u!1101 &110104584
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -1940,7 +2058,11 @@ AnimatorState:
  m_Transitions:
  - {fileID: 110118774}
  m_StateMachineBehaviours:
-  - {fileID: 11482682}
+  - {fileID: 11411000}
+  - {fileID: 11430818}
+  - {fileID: 11463570}
+  - {fileID: 11445542}
+  - {fileID: 11487074}
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
@@ -2161,7 +2283,11 @@ AnimatorState:
  m_Transitions:
  - {fileID: 110130508}
  m_StateMachineBehaviours:
-  - {fileID: 11416510}
+  - {fileID: 11483968}
+  - {fileID: 11495940}
+  - {fileID: 11488184}
+  - {fileID: 11457712}
+  - {fileID: 11409500}
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
@@ -2647,7 +2773,7 @@ AnimatorStateMachine:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  m_Name: Interrupt Sprites
+  m_Name: Special Sprites
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 110209810}
@@ -2808,7 +2934,7 @@ AnimatorStateMachine:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  m_Name: Move Sprites
+  m_Name: Normal Sprites
  m_ChildStates: []
  m_ChildStateMachines:
  - serializedVersion: 1

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Empty.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Empty.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 458042}
  - 212: {fileID: 21217780}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -30,7 +30,7 @@ GameObject:
  - 114: {fileID: 11459304}
  - 95: {fileID: 9524902}
  - 212: {fileID: 21227886}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S1 Empty
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 433282}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 489344}
  - 212: {fileID: 21296076}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -77,7 +77,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 416796}
  - 212: {fileID: 21202386}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 439406}
  - 212: {fileID: 21258214}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -159,7 +159,7 @@ Transform:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 126858}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 40.3300018, y: -3.43799996, z: 0}
+  m_LocalPosition: {x: 59.3983498, y: 5.65546894, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 433282}
@@ -313,7 +313,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -470,7 +469,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 126858}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Shield.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Shield.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 414458}
  - 212: {fileID: 21226230}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -25,7 +25,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 429672}
  - 212: {fileID: 21226846}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -41,7 +41,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 404810}
  - 212: {fileID: 21226094}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -63,7 +63,7 @@ GameObject:
  - 95: {fileID: 9515296}
  - 212: {fileID: 21246730}
  - 114: {fileID: 11404414}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S1 Shield
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 445464}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 453418}
  - 212: {fileID: 21220842}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -484,7 +484,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 163332}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Super Ring.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S1 Super Ring.prefab
@@ -15,7 +15,7 @@ GameObject:
  - 95: {fileID: 9522568}
  - 212: {fileID: 21205630}
  - 114: {fileID: 11415404}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S1 Super Ring
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -31,7 +31,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 490816}
  - 212: {fileID: 21261868}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -47,7 +47,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 445254}
  - 212: {fileID: 21291044}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -63,7 +63,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 457508}
  - 212: {fileID: 21206750}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -79,7 +79,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 422624}
  - 212: {fileID: 21245216}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 447248}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -271,7 +271,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -486,7 +485,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 102812}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Empty.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Empty.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 476248}
  - 212: {fileID: 21291596}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -30,7 +30,7 @@ GameObject:
  - 114: {fileID: 11418910}
  - 95: {fileID: 9539936}
  - 212: {fileID: 21227364}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S2 Empty
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 453248}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 438838}
  - 212: {fileID: 21279144}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -77,7 +77,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 488596}
  - 212: {fileID: 21278542}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 417904}
  - 212: {fileID: 21206274}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -483,6 +483,10 @@ Prefab:
      value: 
      objectReference: {fileID: 22100000, guid: 04f9d893540e56c49a65bb77a8279b0e,
        type: 2}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 162604}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Robotnik.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Robotnik.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 485708}
  - 212: {fileID: 21201860}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -31,7 +31,7 @@ GameObject:
  - 95: {fileID: 9554608}
  - 212: {fileID: 21249834}
  - 114: {fileID: 11439168}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S2 Robotnik
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -47,7 +47,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 435556}
  - 212: {fileID: 21211656}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -62,7 +62,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 436956}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 485826}
  - 212: {fileID: 21228816}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 467764}
  - 212: {fileID: 21273606}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -483,7 +483,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 120374}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Shield.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Shield.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 431752}
  - 212: {fileID: 21217118}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 411262}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -40,7 +40,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 442404}
  - 212: {fileID: 21220640}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -56,7 +56,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 411082}
  - 212: {fileID: 21240874}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  - 95: {fileID: 9540854}
  - 212: {fileID: 21293364}
  - 114: {fileID: 11458094}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S2 Shield
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 459400}
  - 212: {fileID: 21266660}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -490,6 +490,10 @@ Prefab:
      value: 
      objectReference: {fileID: 22100000, guid: 04f9d893540e56c49a65bb77a8279b0e,
        type: 2}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 176984}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Super Ring.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S2 Super Ring.prefab
@@ -8,7 +8,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 424114}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 420404}
  - 212: {fileID: 21273082}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -40,7 +40,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 440410}
  - 212: {fileID: 21223060}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -56,7 +56,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 462922}
  - 212: {fileID: 21221574}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  - 95: {fileID: 9520604}
  - 212: {fileID: 21256678}
  - 114: {fileID: 11459498}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S2 Super Ring
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 498684}
  - 212: {fileID: 21216142}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -329,7 +329,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -486,7 +485,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 165342}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Bubble Shield.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Bubble Shield.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 408792}
  - 212: {fileID: 21236146}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -30,7 +30,7 @@ GameObject:
  - 114: {fileID: 11445058}
  - 95: {fileID: 9502596}
  - 114: {fileID: 11430216}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Bubble Shield
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -46,7 +46,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 479382}
  - 212: {fileID: 21292956}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -62,7 +62,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 490812}
  - 212: {fileID: 21223226}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 495906}
  - 212: {fileID: 21247696}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 424608}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -269,7 +269,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -458,7 +457,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 102088}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Electric Shield.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Electric Shield.prefab
@@ -8,7 +8,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 464916}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 493690}
  - 212: {fileID: 21288454}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  - 114: {fileID: 11425522}
  - 95: {fileID: 9561212}
  - 114: {fileID: 11434064}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Electric Shield
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 461872}
  - 212: {fileID: 21216090}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -77,7 +77,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 496868}
  - 212: {fileID: 21234734}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 414928}
  - 212: {fileID: 21237696}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -255,7 +255,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -458,7 +457,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 169274}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Empty.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Empty.prefab
@@ -14,7 +14,7 @@ GameObject:
  - 114: {fileID: 11493166}
  - 95: {fileID: 9524650}
  - 212: {fileID: 21240060}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Empty
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -30,7 +30,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 416866}
  - 212: {fileID: 21268866}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -46,7 +46,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 413516}
  - 212: {fileID: 21258420}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 494084}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -77,7 +77,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 427162}
  - 212: {fileID: 21277962}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 469038}
  - 212: {fileID: 21261546}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -469,7 +469,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 107766}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Flame Shield.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Flame Shield.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 478104}
  - 212: {fileID: 21253948}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 412658}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  - 114: {fileID: 11434868}
  - 95: {fileID: 9509254}
  - 114: {fileID: 11445504}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Flame Shield
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 499702}
  - 212: {fileID: 21286848}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -77,7 +77,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 451036}
  - 212: {fileID: 21248182}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 484504}
  - 212: {fileID: 21223666}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -255,7 +255,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -458,7 +457,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 139586}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Robotnik.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Robotnik.prefab
@@ -15,7 +15,7 @@ GameObject:
  - 95: {fileID: 9590922}
  - 212: {fileID: 21258536}
  - 114: {fileID: 11469214}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Robotnik
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -31,7 +31,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 410294}
  - 212: {fileID: 21251824}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -47,7 +47,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 427002}
  - 212: {fileID: 21278984}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -62,7 +62,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 470982}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 431734}
  - 212: {fileID: 21259264}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 434952}
  - 212: {fileID: 21212294}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -483,7 +483,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 101966}

--- a/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Super Ring.prefab
+++ b/External/Sonic 16-bit/Common Objects/Item Boxes/S3K Super Ring.prefab
@@ -8,7 +8,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 480390}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 405196}
  - 212: {fileID: 21233840}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -46,7 +46,7 @@ GameObject:
  - 95: {fileID: 9512034}
  - 212: {fileID: 21244414}
  - 114: {fileID: 11466702}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: S3K Super Ring
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -62,7 +62,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 489718}
  - 212: {fileID: 21241418}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Powerup
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -78,7 +78,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 469116}
  - 212: {fileID: 21292572}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Static
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 476562}
  - 212: {fileID: 21271676}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Explosion
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -294,7 +294,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -486,7 +485,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 140868}

--- a/External/Sonic 16-bit/Set Pieces/Balloons/Blue Balloon.prefab
+++ b/External/Sonic 16-bit/Set Pieces/Balloons/Blue Balloon.prefab
@@ -8,7 +8,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 478324}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Container
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 481182}
  - 212: {fileID: 21268094}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  - 114: {fileID: 11480974}
  - 114: {fileID: 11442370}
  - 114: {fileID: 11432064}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Blue Balloon
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -131,6 +131,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6a721724f5ff5b640871f169d9c86d1f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 0}
+  Animator: {fileID: 0}
+  PlatformTrigger: {fileID: 0}
+  CollidingTrigger: 
+  CollidingBool: 
+  SurfaceTrigger: 
+  SurfaceBool: 
  Velocity: 3.5999999
 --- !u!114 &11442370
 MonoBehaviour:
@@ -159,7 +166,6 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
  OnSurfaceEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -229,7 +235,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -291,6 +296,10 @@ Prefab:
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 196296}

--- a/External/Sonic 16-bit/Set Pieces/Balloons/Dark Blue Balloon.prefab
+++ b/External/Sonic 16-bit/Set Pieces/Balloons/Dark Blue Balloon.prefab
@@ -8,7 +8,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 455852}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Container
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -29,7 +29,7 @@ GameObject:
  - 114: {fileID: 11485620}
  - 114: {fileID: 11449110}
  - 114: {fileID: 11400782}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Dark Blue Balloon
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 431756}
  - 212: {fileID: 21213518}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -131,6 +131,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6a721724f5ff5b640871f169d9c86d1f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 0}
+  Animator: {fileID: 0}
+  PlatformTrigger: {fileID: 0}
+  CollidingTrigger: 
+  CollidingBool: 
+  SurfaceTrigger: 
+  SurfaceBool: 
  Velocity: 3.5999999
 --- !u!114 &11417714
 MonoBehaviour:
@@ -170,7 +177,6 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
  OnSurfaceEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -229,7 +235,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -291,6 +296,10 @@ Prefab:
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 134508}

--- a/External/Sonic 16-bit/Set Pieces/Balloons/Red Balloon.prefab
+++ b/External/Sonic 16-bit/Set Pieces/Balloons/Red Balloon.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 483416}
  - 212: {fileID: 21284086}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -30,7 +30,7 @@ GameObject:
  - 114: {fileID: 11471456}
  - 114: {fileID: 11485716}
  - 114: {fileID: 11444054}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Red Balloon
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 474896}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Container
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -131,6 +131,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6a721724f5ff5b640871f169d9c86d1f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 0}
+  Animator: {fileID: 0}
+  PlatformTrigger: {fileID: 0}
+  CollidingTrigger: 
+  CollidingBool: 
+  SurfaceTrigger: 
+  SurfaceBool: 
  Velocity: 3.5999999
 --- !u!114 &11471456
 MonoBehaviour:
@@ -160,7 +167,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -208,7 +214,6 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
  OnSurfaceEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -291,6 +296,10 @@ Prefab:
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 160294}

--- a/External/Sonic 16-bit/Set Pieces/Balloons/Yellow Balloon.prefab
+++ b/External/Sonic 16-bit/Set Pieces/Balloons/Yellow Balloon.prefab
@@ -9,7 +9,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 436592}
  - 212: {fileID: 21246702}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -24,7 +24,7 @@ GameObject:
  serializedVersion: 4
  m_Component:
  - 4: {fileID: 409836}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Container
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -45,7 +45,7 @@ GameObject:
  - 114: {fileID: 11491122}
  - 114: {fileID: 11476904}
  - 114: {fileID: 11431962}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Yellow Balloon
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -131,6 +131,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6a721724f5ff5b640871f169d9c86d1f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 0}
+  Animator: {fileID: 0}
+  PlatformTrigger: {fileID: 0}
+  CollidingTrigger: 
+  CollidingBool: 
+  SurfaceTrigger: 
+  SurfaceBool: 
  Velocity: 3.5999999
 --- !u!114 &11476904
 MonoBehaviour:
@@ -159,7 +166,6 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
  OnSurfaceEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -229,7 +235,6 @@ MonoBehaviour:
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
  Collisions: []
-  AutoActivate: 0
  AllowReactivation: 1
  OnActivateEnter:
    m_PersistentCalls:
@@ -291,6 +296,10 @@ Prefab:
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 136684}

--- a/External/Sonic 16-bit/Set Pieces/Boost Pads/Boost Pad Left.prefab
+++ b/External/Sonic 16-bit/Set Pieces/Boost Pads/Boost Pad Left.prefab
@@ -10,7 +10,7 @@ GameObject:
  - 4: {fileID: 465800}
  - 61: {fileID: 6139802}
  - 114: {fileID: 11499188}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Solid Base
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -26,7 +26,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 438668}
  - 212: {fileID: 21296782}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Sprite
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -44,7 +44,7 @@ GameObject:
  - 61: {fileID: 6123168}
  - 114: {fileID: 11489522}
  - 114: {fileID: 11485036}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Boost Pad Collider
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -60,7 +60,7 @@ GameObject:
  m_Component:
  - 4: {fileID: 439596}
  - 95: {fileID: 9551976}
-  m_Layer: 0
+  m_Layer: 31
  m_Name: Boost Pad Left
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -172,6 +172,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5346506b0f0ed674197f36d56e79d473, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 0}
+  Animator: {fileID: 0}
+  AreaTrigger: {fileID: 0}
+  InsideTrigger: 
+  InsideBool: 
  Velocity: -7.19999981
  BoostBothWays: 0
 --- !u!114 &11489522
@@ -201,7 +206,7 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
+  AlwaysCollide: 1
  OnAreaEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -244,7 +249,6 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
      Culture=neutral, PublicKeyToken=null
-  IgnoreLayers: 1
  OnSurfaceEnter:
    m_PersistentCalls:
      m_Calls: []
@@ -307,7 +311,11 @@ Prefab:
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Layer
+      value: 31
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 175988}