diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
index 7edd7f82..1336fa3a 100644
--- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
@@ -22,7 +22,7 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol
 
 [node name="Polygon2D" type="Polygon2D" parent="FloatingInventory"]
 color = Color( 0.156863, 0.0627451, 0, 1 )
-polygon = PoolVector2Array( -3, 578, 1279, 578, 1279, 752, -3, 757 )
+polygon = PoolVector2Array( -3, 578, 1280, 578, 1280, 752, -3, 757 )
 
 [node name="panel" type="TextureRect" parent="FloatingInventory"]
 anchor_left = 1.0
diff --git a/gymkhana/characters/mark/mark.esc b/gymkhana/characters/mark/mark.esc
deleted file mode 100644
index 5638a54a..00000000
--- a/gymkhana/characters/mark/mark.esc
+++ /dev/null
@@ -1,3 +0,0 @@
-:look
-
-say player "That's a-me, Mark-io."
diff --git a/gymkhana/characters/mark/mark.tscn b/gymkhana/characters/mark/mark.tscn
deleted file mode 100644
index 2fd29fb5..00000000
--- a/gymkhana/characters/mark/mark.tscn
+++ /dev/null
@@ -1,556 +0,0 @@
-[gd_scene load_steps=85 format=2]
-
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1]
-[ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2]
-[ext_resource path="res://game/characters/mark/png/markjester.png" type="Texture" id=3]
-[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4]
-[ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5]
-[ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6]
-[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7]
-[ext_resource path="res://gymkhana/characters/mark/mark_animations.tres" type="Resource" id=8]
-[ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9]
-
-[sub_resource type="AtlasTexture" id=18]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=67]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=4]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 120, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=66]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 120, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=11]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=69]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=17]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 96, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=70]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 96, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=27]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=65]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=5]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 72, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=68]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 72, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=1]
-flags = 4
-atlas = ExtResource( 2 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=2]
-flags = 4
-atlas = ExtResource( 2 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=3]
-flags = 4
-atlas = ExtResource( 2 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=56]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=57]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=58]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=59]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 432, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=60]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 456, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=61]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 480, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=28]
-flags = 4
-atlas = ExtResource( 5 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=29]
-flags = 4
-atlas = ExtResource( 5 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=30]
-flags = 4
-atlas = ExtResource( 5 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=62]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 72, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=63]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 96, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=64]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 120, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=48]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 312, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=49]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 336, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=50]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 360, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=51]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 384, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=52]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 408, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=6]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=7]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=8]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=9]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 72, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=10]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 96, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=38]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 144, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=39]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 168, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=40]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 192, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=41]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 216, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=42]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 240, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=12]
-flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=13]
-flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=33]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 264, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=34]
-flags = 4
-atlas = ExtResource( 9 )
-region = Rect2( 288, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=19]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 144, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=20]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 168, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=21]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 192, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=53]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 144, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=54]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 168, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=55]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 192, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=71]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 408, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=72]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 432, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=73]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 456, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=74]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 480, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=75]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 504, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=22]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 216, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=23]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 240, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=24]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 264, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=25]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 288, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=26]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 312, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=43]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 216, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=44]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 240, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=45]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 264, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=46]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 288, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=47]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 312, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=14]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 336, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=15]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 360, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=16]
-flags = 4
-atlas = ExtResource( 4 )
-region = Rect2( 384, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=35]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 336, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=36]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 360, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=37]
-flags = 4
-atlas = ExtResource( 3 )
-region = Rect2( 384, 0, 24, 70 )
-
-[sub_resource type="SpriteFrames" id=31]
-animations = [ {
-"frames": [ SubResource( 18 ) ],
-"loop": true,
-"name": "idle_down",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 67 ) ],
-"loop": true,
-"name": "idle_down_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 4 ) ],
-"loop": true,
-"name": "idle_down_left",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 66 ) ],
-"loop": true,
-"name": "idle_down_left_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 11 ) ],
-"loop": true,
-"name": "idle_down_right",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 69 ) ],
-"loop": true,
-"name": "idle_down_right_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 17 ) ],
-"loop": true,
-"name": "idle_left",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 70 ) ],
-"loop": true,
-"name": "idle_left_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 27 ) ],
-"loop": true,
-"name": "idle_right",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 65 ) ],
-"loop": true,
-"name": "idle_right_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 5 ) ],
-"loop": true,
-"name": "idle_up",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 68 ) ],
-"loop": true,
-"name": "idle_up_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ],
-"loop": true,
-"name": "speak_down",
-"speed": 6.0
-}, {
-"frames": [ SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ],
-"loop": true,
-"name": "speak_down_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 59 ), SubResource( 60 ), SubResource( 61 ) ],
-"loop": true,
-"name": "speak_down_left_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
-"loop": true,
-"name": "speak_down_right",
-"speed": 6.0
-}, {
-"frames": [ SubResource( 62 ), SubResource( 63 ), SubResource( 64 ) ],
-"loop": true,
-"name": "speak_down_right_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 48 ), SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ) ],
-"loop": true,
-"name": "speak_left_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
-"loop": true,
-"name": "speak_right",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ) ],
-"loop": true,
-"name": "speak_right_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ],
-"loop": true,
-"name": "speak_up",
-"speed": 3.0
-}, {
-"frames": [ SubResource( 33 ), SubResource( 34 ) ],
-"loop": true,
-"name": "speak_up_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ],
-"loop": true,
-"name": "walk_down",
-"speed": 6.0
-}, {
-"frames": [ SubResource( 53 ), SubResource( 54 ), SubResource( 55 ), SubResource( 54 ) ],
-"loop": true,
-"name": "walk_down_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 71 ), SubResource( 72 ), SubResource( 73 ), SubResource( 74 ), SubResource( 75 ) ],
-"loop": true,
-"name": "walk_left_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ],
-"loop": true,
-"name": "walk_right",
-"speed": 6.0
-}, {
-"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ) ],
-"loop": true,
-"name": "walk_right_jester",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ],
-"loop": true,
-"name": "walk_up",
-"speed": 6.0
-}, {
-"frames": [ SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 36 ) ],
-"loop": true,
-"name": "walk_up_jester",
-"speed": 5.0
-} ]
-
-[sub_resource type="CapsuleShape2D" id=32]
-radius = 38.2347
-height = 217.78
-
-[node name="mark" type="Area2D"]
-pause_mode = 1
-script = ExtResource( 1 )
-global_id = "player"
-esc_script = "res://gymkhana/characters/mark/mark.esc"
-is_movable = true
-default_action = "look"
-combine_when_selected_action_is_in = [  ]
-dialog_color = Color( 1, 1, 1, 1 )
-animations = ExtResource( 8 )
-
-[node name="sprite" type="AnimatedSprite" parent="."]
-position = Vector2( 0, -137.938 )
-scale = Vector2( 4, 4 )
-frames = SubResource( 31 )
-animation = "idle_down"
-
-[node name="collision" type="CollisionShape2D" parent="."]
-position = Vector2( 0.455139, -138.362 )
-shape = SubResource( 32 )
-
-[node name="debug" type="Label" parent="."]
-margin_right = 40.0
-margin_bottom = 14.0
-
-[node name="dialog_position" type="Position2D" parent="."]
-position = Vector2( 0, -320 )
diff --git a/gymkhana/characters/mark/mark_animations.tres b/gymkhana/characters/mark/mark_animations.tres
deleted file mode 100644
index d466d0d5..00000000
--- a/gymkhana/characters/mark/mark_animations.tres
+++ /dev/null
@@ -1,172 +0,0 @@
-[gd_resource type="Resource" load_steps=36 format=2]
-
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3]
-
-[sub_resource type="Resource" id=1]
-script = ExtResource( 2 )
-angle_start = 340
-angle_size = 40
-
-[sub_resource type="Resource" id=2]
-script = ExtResource( 2 )
-angle_start = 20
-angle_size = 50
-
-[sub_resource type="Resource" id=3]
-script = ExtResource( 2 )
-angle_start = 70
-angle_size = 40
-
-[sub_resource type="Resource" id=4]
-script = ExtResource( 2 )
-angle_start = 110
-angle_size = 50
-
-[sub_resource type="Resource" id=5]
-script = ExtResource( 2 )
-angle_start = 160
-angle_size = 40
-
-[sub_resource type="Resource" id=6]
-script = ExtResource( 2 )
-angle_start = 200
-angle_size = 50
-
-[sub_resource type="Resource" id=7]
-script = ExtResource( 2 )
-angle_start = 250
-angle_size = 40
-
-[sub_resource type="Resource" id=8]
-script = ExtResource( 2 )
-angle_start = 290
-angle_size = 50
-
-[sub_resource type="Resource" id=9]
-script = ExtResource( 3 )
-animation = "walk_up"
-mirrored = false
-
-[sub_resource type="Resource" id=10]
-script = ExtResource( 3 )
-animation = "walk_up"
-mirrored = false
-
-[sub_resource type="Resource" id=11]
-script = ExtResource( 3 )
-animation = "walk_right"
-mirrored = false
-
-[sub_resource type="Resource" id=12]
-script = ExtResource( 3 )
-animation = "walk_down"
-mirrored = false
-
-[sub_resource type="Resource" id=13]
-script = ExtResource( 3 )
-animation = "walk_down"
-mirrored = false
-
-[sub_resource type="Resource" id=14]
-script = ExtResource( 3 )
-animation = "walk_down"
-mirrored = false
-
-[sub_resource type="Resource" id=15]
-script = ExtResource( 3 )
-animation = "walk_right"
-mirrored = true
-
-[sub_resource type="Resource" id=16]
-script = ExtResource( 3 )
-animation = "walk_up"
-mirrored = false
-
-[sub_resource type="Resource" id=17]
-script = ExtResource( 3 )
-animation = "idle_up"
-mirrored = false
-
-[sub_resource type="Resource" id=18]
-script = ExtResource( 3 )
-animation = "idle_up"
-mirrored = false
-
-[sub_resource type="Resource" id=19]
-script = ExtResource( 3 )
-animation = "idle_right"
-mirrored = false
-
-[sub_resource type="Resource" id=20]
-script = ExtResource( 3 )
-animation = "idle_down_right"
-mirrored = false
-
-[sub_resource type="Resource" id=21]
-script = ExtResource( 3 )
-animation = "idle_down"
-mirrored = false
-
-[sub_resource type="Resource" id=22]
-script = ExtResource( 3 )
-animation = "idle_down_left"
-mirrored = false
-
-[sub_resource type="Resource" id=23]
-script = ExtResource( 3 )
-animation = "idle_left"
-mirrored = false
-
-[sub_resource type="Resource" id=24]
-script = ExtResource( 3 )
-animation = "idle_up"
-mirrored = false
-
-[sub_resource type="Resource" id=25]
-script = ExtResource( 3 )
-animation = "speak_up"
-mirrored = false
-
-[sub_resource type="Resource" id=26]
-script = ExtResource( 3 )
-animation = "speak_up"
-mirrored = false
-
-[sub_resource type="Resource" id=27]
-script = ExtResource( 3 )
-animation = "speak_right"
-mirrored = false
-
-[sub_resource type="Resource" id=28]
-script = ExtResource( 3 )
-animation = "speak_down"
-mirrored = false
-
-[sub_resource type="Resource" id=29]
-script = ExtResource( 3 )
-animation = "speak_down"
-mirrored = false
-
-[sub_resource type="Resource" id=30]
-script = ExtResource( 3 )
-animation = "speak_down"
-mirrored = false
-
-[sub_resource type="Resource" id=31]
-script = ExtResource( 3 )
-animation = "speak_right"
-mirrored = true
-
-[sub_resource type="Resource" id=32]
-script = ExtResource( 3 )
-animation = "speak_up"
-mirrored = false
-
-[resource]
-script = ExtResource( 1 )
-dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ]
-directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ]
-idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ]
-speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ]
diff --git a/gymkhana/characters/mark/mark_animations_jester.tres b/gymkhana/characters/mark/mark_animations_jester.tres
deleted file mode 100644
index d2fd3bcc..00000000
--- a/gymkhana/characters/mark/mark_animations_jester.tres
+++ /dev/null
@@ -1,172 +0,0 @@
-[gd_resource type="Resource" load_steps=36 format=2]
-
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3]
-
-[sub_resource type="Resource" id=1]
-script = ExtResource( 2 )
-angle_start = 340
-angle_size = 40
-
-[sub_resource type="Resource" id=2]
-script = ExtResource( 2 )
-angle_start = 20
-angle_size = 50
-
-[sub_resource type="Resource" id=3]
-script = ExtResource( 2 )
-angle_start = 70
-angle_size = 40
-
-[sub_resource type="Resource" id=4]
-script = ExtResource( 2 )
-angle_start = 110
-angle_size = 50
-
-[sub_resource type="Resource" id=5]
-script = ExtResource( 2 )
-angle_start = 160
-angle_size = 40
-
-[sub_resource type="Resource" id=6]
-script = ExtResource( 2 )
-angle_start = 200
-angle_size = 50
-
-[sub_resource type="Resource" id=7]
-script = ExtResource( 2 )
-angle_start = 250
-angle_size = 40
-
-[sub_resource type="Resource" id=8]
-script = ExtResource( 2 )
-angle_start = 290
-angle_size = 50
-
-[sub_resource type="Resource" id=9]
-script = ExtResource( 3 )
-animation = "walk_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=10]
-script = ExtResource( 3 )
-animation = "walk_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=11]
-script = ExtResource( 3 )
-animation = "walk_right_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=12]
-script = ExtResource( 3 )
-animation = "walk_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=13]
-script = ExtResource( 3 )
-animation = "walk_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=14]
-script = ExtResource( 3 )
-animation = "walk_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=15]
-script = ExtResource( 3 )
-animation = "walk_left_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=16]
-script = ExtResource( 3 )
-animation = "walk_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=17]
-script = ExtResource( 3 )
-animation = "idle_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=18]
-script = ExtResource( 3 )
-animation = "idle_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=19]
-script = ExtResource( 3 )
-animation = "idle_right_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=20]
-script = ExtResource( 3 )
-animation = "idle_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=21]
-script = ExtResource( 3 )
-animation = "idle_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=22]
-script = ExtResource( 3 )
-animation = "idle_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=23]
-script = ExtResource( 3 )
-animation = "idle_left_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=24]
-script = ExtResource( 3 )
-animation = "idle_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=25]
-script = ExtResource( 3 )
-animation = "speak_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=26]
-script = ExtResource( 3 )
-animation = "speak_up_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=27]
-script = ExtResource( 3 )
-animation = "speak_right_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=28]
-script = ExtResource( 3 )
-animation = "speak_down_right_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=29]
-script = ExtResource( 3 )
-animation = "speak_down_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=30]
-script = ExtResource( 3 )
-animation = "speak_down_left_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=31]
-script = ExtResource( 3 )
-animation = "speak_left_jester"
-mirrored = false
-
-[sub_resource type="Resource" id=32]
-script = ExtResource( 3 )
-animation = "speak_up_jester"
-mirrored = false
-
-[resource]
-script = ExtResource( 1 )
-dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ]
-directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ]
-idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ]
-speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ]
diff --git a/gymkhana/characters/mark/mark_talk.tscn b/gymkhana/characters/mark/mark_talk.tscn
deleted file mode 100644
index 60465e05..00000000
--- a/gymkhana/characters/mark/mark_talk.tscn
+++ /dev/null
@@ -1,39 +0,0 @@
-[gd_scene load_steps=8 format=2]
-
-[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1]
-
-[sub_resource type="AtlasTexture" id=1]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 0, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=2]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 24, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=3]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 48, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=4]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 72, 0, 24, 70 )
-
-[sub_resource type="AtlasTexture" id=5]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 96, 0, 24, 70 )
-
-[sub_resource type="SpriteFrames" id=6]
-animations = [ {
-"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
-"loop": true,
-"name": "default",
-"speed": 5.0
-} ]
-
-[node name="AnimatedSprite" type="AnimatedSprite"]
-frames = SubResource( 6 )
diff --git a/gymkhana/characters/mark/mark_think.tscn b/gymkhana/characters/mark/mark_think.tscn
deleted file mode 100644
index b4680dc6..00000000
--- a/gymkhana/characters/mark/mark_think.tscn
+++ /dev/null
@@ -1,66 +0,0 @@
-[gd_scene load_steps=12 format=2]
-
-[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
-[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2]
-
-[sub_resource type="AtlasTexture" id=1]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 0, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=2]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 189, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=3]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 162, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=4]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 135, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=5]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 108, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=6]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 81, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=7]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 54, 0, 27, 27 )
-
-[sub_resource type="AtlasTexture" id=8]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 27, 0, 27, 27 )
-
-[sub_resource type="SpriteFrames" id=9]
-animations = [ {
-"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ],
-"loop": true,
-"name": "default",
-"speed": 8.0
-} ]
-
-[node name="Node2D" type="Node2D"]
-
-[node name="MarkThinking" type="Sprite" parent="."]
-position = Vector2( -48, 0 )
-scale = Vector2( 4, 4 )
-texture = ExtResource( 2 )
-
-[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
-position = Vector2( 54, 0 )
-scale = Vector2( 4, 4 )
-frames = SubResource( 9 )
-frame = 7
-playing = true
diff --git a/gymkhana/characters/mark/png/mark.png b/gymkhana/characters/mark/png/mark.png
deleted file mode 100644
index 91cacd24..00000000
Binary files a/gymkhana/characters/mark/png/mark.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_talk_down.png b/gymkhana/characters/mark/png/mark_talk_down.png
deleted file mode 100644
index 85a7ba2f..00000000
Binary files a/gymkhana/characters/mark/png/mark_talk_down.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_talk_down_right.png b/gymkhana/characters/mark/png/mark_talk_down_right.png
deleted file mode 100644
index 820a4531..00000000
Binary files a/gymkhana/characters/mark/png/mark_talk_down_right.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_talk_right.png b/gymkhana/characters/mark/png/mark_talk_right.png
deleted file mode 100644
index 15937f21..00000000
Binary files a/gymkhana/characters/mark/png/mark_talk_right.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_talk_up.png b/gymkhana/characters/mark/png/mark_talk_up.png
deleted file mode 100644
index 1d85e560..00000000
Binary files a/gymkhana/characters/mark/png/mark_talk_up.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_talk_up_right.png b/gymkhana/characters/mark/png/mark_talk_up_right.png
deleted file mode 100644
index a21e4b5b..00000000
Binary files a/gymkhana/characters/mark/png/mark_talk_up_right.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_thinking.png b/gymkhana/characters/mark/png/mark_thinking.png
deleted file mode 100644
index 05d53f1d..00000000
Binary files a/gymkhana/characters/mark/png/mark_thinking.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/mark_thinking_question.png b/gymkhana/characters/mark/png/mark_thinking_question.png
deleted file mode 100644
index 55fe47d2..00000000
Binary files a/gymkhana/characters/mark/png/mark_thinking_question.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/markjester.png b/gymkhana/characters/mark/png/markjester.png
deleted file mode 100644
index 4aaa672d..00000000
Binary files a/gymkhana/characters/mark/png/markjester.png and /dev/null differ
diff --git a/gymkhana/characters/mark/png/markjester_talk.png b/gymkhana/characters/mark/png/markjester_talk.png
deleted file mode 100644
index 2833bc84..00000000
Binary files a/gymkhana/characters/mark/png/markjester_talk.png and /dev/null differ
diff --git a/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg b/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg
deleted file mode 100644
index 163cc564..00000000
Binary files a/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg and /dev/null differ
diff --git a/gymkhana/characters/oier/oier.esc b/gymkhana/characters/oier/oier.esc
index 0d252281..e69de29b 100644
--- a/gymkhana/characters/oier/oier.esc
+++ b/gymkhana/characters/oier/oier.esc
@@ -1,3 +0,0 @@
-:look
-
-say OierPlayer "Jelouu!!🎉"
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
index 4430b772..a290c488 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
@@ -29,3 +29,12 @@ set_active turno_cocina_olla_llena true [turno_cocina_economica_con_olla]
 set_active turno_cocina_olla_llena false [!turno_cocina_economica_con_olla]
 set_active turno_cocina_economica true [!turno_cocina_economica_con_olla]
 set_active turno_cocina_economica false [turno_cocina_economica_con_olla]
+  
+
+:ready
+> [!cocina_intro_played]
+  set_global cocina_intro_played true
+  accept_input SKIP
+  set_angle player 180
+  say player "Debo hacer algo de comer"
+  accept_input ALL
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
index ccb930e7..54d75190 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
@@ -123,7 +123,7 @@ z_index = 4096
 texture = ExtResource( 9 )
 
 [node name="new_game_start_location" type="Position2D" parent="."]
-position = Vector2( 1326, 519 )
+position = Vector2( 718, 509 )
 script = ExtResource( 5 )
 global_id = "new_game_start_location"
 is_start_location = true
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
index 7748f7e3..3defde5e 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
@@ -15,19 +15,18 @@ anim eneko_smoking idle
   set_angle player 180
   stop
 teleport player new_game_start_location
-set_angle player 180
+set_angle player 90
   
 
 :ready
-> [!cutscene_played]
-  set_global cutscene_played true
+> [!cocina_delante_intro_played]
+  set_global cocina_delante_intro_played true
   accept_input SKIP
   stop_snd
   play_video res://gymkhana/videos/turno_cocina/intro.ogv
-  # set_gui_visible false
-  # walk_block player puerta_cocina_start
-  # set_angle player 90
-	queue_event eneko_smoking intro_dialog
+	queue_event eneko_smoking intro_dialog intro_dialog_channel true
   set_gui_visible true
+  walk_block player puerta_cocina_start
+	queue_event cocina_delante_puerta_cocina action1
   accept_input ALL
   play_snd res://gymkhana/sounds/music_loop.ogg _music