diff --git a/lib/gamacon b/lib/gamacon
index c7deb5a..077ce25 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit c7deb5a95713d2c5da6efa07685322d908a86823
+Subproject commit 077ce25971e4fd7101f24bd5d5fe535bff2c43b1
diff --git a/prefabs/combat.gcmap b/prefabs/combat.gcmap
new file mode 100644
index 0000000..219fc38
--- /dev/null
+++ b/prefabs/combat.gcmap
@@ -0,0 +1,14 @@
+<gc_map >
+	<vertex_data>
+		<line>
+			<row height="0" />
+			<row height="0" />
+		</line>
+		<line>
+			<row height="0" />
+			<row height="0" />
+		</line>
+	</vertex_data>
+	<tiles_data>
+	</tiles_data>
+</gc_map>
diff --git a/prefabs/combat.gcprefab b/prefabs/combat.gcprefab
new file mode 100644
index 0000000..81e5dfe
--- /dev/null
+++ b/prefabs/combat.gcprefab
@@ -0,0 +1,36 @@
+<gc_scene>
+    <data>
+        <font src="assets/fonts/roboto.ttf" />
+        <sprite name="text_box" src="assets/ui/text_box.png" />
+        <sprite name="button_background" src="assets/ui/button_background.png" />
+    </data>
+    <gc_entities>
+        <gc_entity>
+            <transform_component>
+                <Position x="0" y="300" />
+                <Size x="100000000" y="100000000" />
+            </transform_component>
+            <vertex_component tilemap="prefabs/combat.gcmap" />
+        </gc_entity>
+
+        <gc_entity>
+            <dialog_holder x="0" y="0" tile_texture="dirt_top_1">
+                <??? line="Hello dirt block,\nI am the mighty cobble block.">
+                    <input text="Yes" click="super" />
+                    <input text="No" click="super" />
+                    <input text="Maybe" click="super" />
+                    <input text="Run away" click="super" />
+                </???>
+                <Cobble_block line="Can I do something\n for you?" />
+            </dialog_holder>
+        </gc_entity>
+
+        <gc_entity id="50">
+            <transform_component>
+                <Position x="0" y="300" />
+            </transform_component>
+            <map_linker x="0" y="0" />
+            <player_component />
+        </gc_entity>
+    </gc_entities>
+</gc_scene>
\ No newline at end of file
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 5ac8b16..49deb72 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -80,6 +80,7 @@
         <sprite name="water_top" src="assets/tiles/generic-rpg-tile-waterfall06.png" />
         <sprite name="water_top_right_left" src="assets/tiles/generic-rpg-tile-waterfall07.png" />
         <sprite name="water" src="assets/tiles/generic-rpg-plain-water.png" />
+
         <sprite name="panel" src="assets/ui/panel.png" />
 
         <tiles>
diff --git a/src/systems/dialog_methods.c b/src/systems/dialog_methods.c
index 8fd8033..f75b575 100644
--- a/src/systems/dialog_methods.c
+++ b/src/systems/dialog_methods.c
@@ -59,9 +59,10 @@ gc_entity *name)
     rend = GETCMP(text, renderer);
     if (!rend || rend->type != GC_TXTREND || !rend->data)
         return (true);
-    if (this->current_text)
-        ((gc_text *)rend->data)->text = this->current_text->text;
-    else
+    if (this->current_text) {
+        ((gc_text *) rend->data)->text = this->current_text->text;
+        this->current_input = &this->current_text->inputs[0];
+    } else
         ((gc_text *)rend->data)->text = NULL;
     this->current_line++;
     return (!this->current_text);
@@ -93,10 +94,10 @@ static bool handle_input(gc_engine *engine, struct dialog_manager *this)
 
 void run_input_func(struct dialog_manager *this, gc_engine *engine)
 {
-    prefab_destroy(engine->scene, this->input_id);
-    this->input_id = -1;
     if (this->current_input->callback)
         this->current_input->callback(engine, NULL, (gc_vector2){0, 0}, 0);
+    prefab_destroy(engine->scene, this->input_id);
+    this->input_id = -1;
 }
 
 void dialog_next(gc_engine *engine)
diff --git a/src/systems/map_movement_system.c b/src/systems/map_movement_system.c
index d4c85db..647e6aa 100644
--- a/src/systems/map_movement_system.c
+++ b/src/systems/map_movement_system.c
@@ -72,6 +72,7 @@ float dtime)
         return;
     map = GETCMP(maps->data, vertex_component);
     new_tile = get_tile_at(map, map_pos);
+    set_animation(entity, ctl);
     if (new_tile && !new_tile->solid && ctl->move_callback <= 0 \
 && new_tile != link->tile) {
         link->tile->entity = NULL;
@@ -79,7 +80,6 @@ float dtime)
         engine->trigger_event(engine, "entity_moved", entity, link->tile);
         ctl->move_callback = .2f;
     }
-    set_animation(entity, ctl);
     ctl->move_callback -= dtime;
 }