diff --git a/Pokemon RPG/Assets/Scenes/New Scene.unity b/Pokemon RPG/Assets/Scenes/New Scene.unity index 72667bc0..47cb39bf 100644 --- a/Pokemon RPG/Assets/Scenes/New Scene.unity +++ b/Pokemon RPG/Assets/Scenes/New Scene.unity @@ -6525,6 +6525,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 5 + solidObjectsLayer: + serializedVersion: 2 + m_Bits: 256 --- !u!212 &741721365 SpriteRenderer: m_ObjectHideFlags: 0 @@ -6583,7 +6586,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741721363} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 3.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Pokemon RPG/Assets/Scripts/PlayerController.cs b/Pokemon RPG/Assets/Scripts/PlayerController.cs index 43f05eb4..ffa0a748 100644 --- a/Pokemon RPG/Assets/Scripts/PlayerController.cs +++ b/Pokemon RPG/Assets/Scripts/PlayerController.cs @@ -57,7 +57,7 @@ IEnumerator Move(Vector3 targetPos) { // Do something over a period of time (IEn } private bool IsWalkable(Vector3 targetPos) { // Check if the tile position is walkable - if (Physics2D.OverlapCircle(targetPos, 0.3f, SolidObjects, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter + if (Physics2D.OverlapCircle(targetPos, 0.3f, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter { return false; } diff --git a/Pokemon RPG/Assets/Tiles/tilesets.meta b/Pokemon RPG/Assets/Tiles/tilesets.meta new file mode 100644 index 00000000..4f941a6a --- /dev/null +++ b/Pokemon RPG/Assets/Tiles/tilesets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f3d203412b475f48b694d7136b1662a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Pokemon RPG/Library/CurrentLayout-default.dwlt b/Pokemon RPG/Library/CurrentLayout-default.dwlt index 45c76b40..a815ce21 100644 --- a/Pokemon RPG/Library/CurrentLayout-default.dwlt +++ b/Pokemon RPG/Library/CurrentLayout-default.dwlt @@ -17,7 +17,7 @@ MonoBehaviour: x: 0 y: 43 width: 1920 - height: 1037 + height: 997 m_ShowMode: 4 m_Title: m_RootView: {fileID: 6} @@ -43,11 +43,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 987 - m_MinSize: {x: 683, y: 494} + height: 947 + m_MinSize: {x: 648, y: 494} m_MaxSize: {x: 14004, y: 14044} vertical: 0 - controlID: 57 + controlID: 63 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -66,15 +66,15 @@ MonoBehaviour: x: 1531 y: 0 width: 389 - height: 987 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + height: 947 + m_MinSize: {x: 242, y: 222} + m_MaxSize: {x: 4002, y: 4022} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 16} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,9 +93,9 @@ MonoBehaviour: x: 0 y: 0 width: 379 - height: 597 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 573 + m_MinSize: {x: 202, y: 222} + m_MaxSize: {x: 4002, y: 4022} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 597 + y: 573 width: 1531 - height: 390 + height: 374 m_MinSize: {x: 232, y: 272} m_MaxSize: {x: 10002, y: 10022} m_ActualView: {fileID: 15} @@ -127,7 +127,7 @@ MonoBehaviour: - {fileID: 15} - {fileID: 20} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -149,8 +149,8 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 1037 - m_MinSize: {x: 950, y: 300} + height: 997 + m_MinSize: {x: 950, y: 544} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &7 MonoBehaviour: @@ -190,7 +190,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1017 + y: 977 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -215,11 +215,11 @@ MonoBehaviour: x: 0 y: 0 width: 1531 - height: 987 + height: 947 m_MinSize: {x: 406, y: 494} m_MaxSize: {x: 10002, y: 14044} vertical: 1 - controlID: 58 + controlID: 64 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,11 +240,11 @@ MonoBehaviour: x: 0 y: 0 width: 1531 - height: 597 + height: 573 m_MinSize: {x: 406, y: 222} m_MaxSize: {x: 8006, y: 4022} vertical: 0 - controlID: 59 + controlID: 65 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -263,17 +263,17 @@ MonoBehaviour: x: 379 y: 0 width: 1152 - height: 597 + height: 573 m_MinSize: {x: 204, y: 222} m_MaxSize: {x: 4004, y: 4022} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 18} - {fileID: 19} - {fileID: 14} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 3 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -297,7 +297,7 @@ MonoBehaviour: x: 1531 y: 73 width: 387 - height: 968 + height: 928 m_ViewDataDictionary: {fileID: 0} m_PreviewResizer: m_CachedPref: 50 @@ -329,20 +329,54 @@ MonoBehaviour: x: 379 y: 73 width: 1150 - height: 578 + height: 554 m_ViewDataDictionary: {fileID: 0} m_ViewTransforms: m_KeySerializationHelper: - {fileID: -6760587221765420880, guid: 912693e140e9f9d47988074309678877, type: 2} + - {fileID: 4227312118620687421, guid: 912693e140e9f9d47988074309678877, type: 2} + - {fileID: 6686060602327346230, guid: 912693e140e9f9d47988074309678877, type: 2} m_ValueSerializationHelper: - e00: 0.86915785 e01: 0 e02: 0 - e03: -101.507904 + e03: -172.50797 e10: 0 e11: 0.86915785 e12: 0 - e13: 81.23923 + e13: 11.2392235 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.44370535 + e01: 0 + e02: 0 + e03: 311.44235 + e10: 0 + e11: 0.44370535 + e12: 0 + e13: 262.53888 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 65.25 + e10: 0 + e11: 1 + e12: 0 + e13: 147 e20: 0 e21: 0 e22: 1 @@ -385,7 +419,7 @@ MonoBehaviour: m_MaxSize: {x: 2048, y: 2048} m_TitleContent: m_Text: Asset Store - m_Image: {fileID: 357073275683767465, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -411,15 +445,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 670 + y: 646 width: 1531 - height: 371 + height: 355 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -434,20 +468,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Animations m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Animations m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\Git\Unity-Intro\Pokemon RPG + m_LastProjectPath: D:\github desktop files\Unity-Intro\Pokemon RPG m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 743f0000 - m_LastClickedID: 16244 - m_ExpandedIDs: 00000000402d00007e2f000000ca9a3b + m_SelectedIDs: 28560000 + m_LastClickedID: 22056 + m_ExpandedIDs: 000000006e550000ea55000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -475,7 +509,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000402d0000 + m_ExpandedIDs: 000000006e550000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -503,7 +537,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300009e300000 + m_ExpandedInstanceIDs: c62300009e300000bc380000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -547,7 +581,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -555,7 +589,7 @@ MonoBehaviour: x: 1531 y: 73 width: 387 - height: 968 + height: 928 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 m_ObjectsLockedBeforeSerialization: [] @@ -585,7 +619,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -593,14 +627,14 @@ MonoBehaviour: x: 0 y: 73 width: 379 - height: 578 + height: 554 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3a450000 - m_LastClickedID: 17722 - m_ExpandedIDs: 72fbffff4c450000 + m_SelectedIDs: 92420000 + m_LastClickedID: 0 + m_ExpandedIDs: 6ac1ffff6c5a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -640,7 +674,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -648,7 +682,7 @@ MonoBehaviour: x: 379 y: 73 width: 1150 - height: 578 + height: 554 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: f67edba36b6a4874f8173a004ba6b375 @@ -739,7 +773,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -747,7 +781,7 @@ MonoBehaviour: x: 379 y: 73 width: 1150 - height: 578 + height: 554 m_ViewDataDictionary: {fileID: 0} m_VSyncEnabled: 0 m_MaximizeOnPlay: 0 @@ -762,8 +796,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -575 m_HBaseRangeMax: 575 - m_VBaseRangeMin: -280.5 - m_VBaseRangeMax: 280.5 + m_VBaseRangeMin: -268.5 + m_VBaseRangeMax: 268.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -772,7 +806,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -782,9 +816,9 @@ MonoBehaviour: x: 0 y: 17 width: 1150 - height: 561 + height: 537 m_Scale: {x: 1, y: 1} - m_Translation: {x: 575, y: 280.5} + m_Translation: {x: 575, y: 268.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -792,14 +826,14 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -575 - y: -280.5 + y: -268.5 width: 1150 - height: 561 + height: 537 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 1150, y: 578} + m_LastWindowPixelSize: {x: 1150, y: 554} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -820,13 +854,13 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: 111653112392082826, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 718 - width: 1366 - height: 308 + x: 0 + y: 646 + width: 1531 + height: 355 m_ViewDataDictionary: {fileID: 0} diff --git a/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.dll b/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.dll index b4a8e36e..2f5d9b73 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.pdb index 6faff8cd..54bfaebf 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/Pokemon RPG/Library/ScriptAssemblies/BuiltinAssemblies.stamp new file mode 100644 index 00000000..62fa6b5b --- /dev/null +++ b/Pokemon RPG/Library/ScriptAssemblies/BuiltinAssemblies.stamp @@ -0,0 +1 @@ +08d77ed24742b300.08d77edd26cc2600 \ No newline at end of file diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll index 030e25fc..cacb1fb4 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll index 5d855c07..1aef35de 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index 7be7253d..e9f8c185 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb b/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb index b84f7fce..c32e88a6 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.dll index afc80464..63cfe44a 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.pdb b/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.pdb index 073e354a..5caf1bf8 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Unity.Rider.Editor.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index 8c98fce6..87914fd5 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb index 31ec90fe..5da7f737 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.dll index a74d0549..befc4cf3 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.pdb b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.pdb index 49cfc567..b5ddb5bb 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Unity.TextMeshPro.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index 911cd0cc..088c300e 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.dll index 9b017592..39cd0e51 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index b3e632d5..8f7c4bbf 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb b/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb index bc460470..04e9e185 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb and b/Pokemon RPG/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index 61905962..81368730 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb index 7e16946f..5664b8c9 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb and b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.UI.dll b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.UI.dll index 823a7a4f..ff273aee 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.UI.dll and b/Pokemon RPG/Library/ScriptAssemblies/UnityEditor.UI.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.dll b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.dll index b1d1fe3d..07d3e0d3 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb index f4e813ed..4cab2878 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb and b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb differ diff --git a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.UI.dll b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.UI.dll index cc562dca..f703edb1 100644 Binary files a/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.UI.dll and b/Pokemon RPG/Library/ScriptAssemblies/UnityEngine.UI.dll differ diff --git a/Pokemon RPG/Library/assetDatabase3 b/Pokemon RPG/Library/assetDatabase3 index 931688f5..c1022b62 100644 Binary files a/Pokemon RPG/Library/assetDatabase3 and b/Pokemon RPG/Library/assetDatabase3 differ diff --git a/Pokemon RPG/Library/expandedItems b/Pokemon RPG/Library/expandedItems index 461943cd..f6053613 100644 Binary files a/Pokemon RPG/Library/expandedItems and b/Pokemon RPG/Library/expandedItems differ diff --git a/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a b/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a new file mode 100644 index 00000000..e6669adf Binary files /dev/null and b/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a differ diff --git a/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a.info b/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a.info new file mode 100644 index 00000000..285af63f Binary files /dev/null and b/Pokemon RPG/Library/metadata/0f/0f3d203412b475f48b694d7136b1662a.info differ diff --git a/Pokemon RPG/Library/metadata/f2/f272b9a7dadece54c9427ac7b0385ecd b/Pokemon RPG/Library/metadata/f2/f272b9a7dadece54c9427ac7b0385ecd index 626eb87c..9b7821ab 100644 Binary files a/Pokemon RPG/Library/metadata/f2/f272b9a7dadece54c9427ac7b0385ecd and b/Pokemon RPG/Library/metadata/f2/f272b9a7dadece54c9427ac7b0385ecd differ