event: removed event.s

diff --git a/src/event.s b/src/event.s
deleted file mode 100644 (file)
index 63f3034..0000000
--- a/src/event.s
+++ /dev/null
@@ -1,7 +0,0 @@
-       ; runs the event
-       ; for the tile the player 
-       ; is currently standing on
-       ; if the current even ptr is NULL
-       ; no event will be executed
-event_exec:
-       ret

diff --git a/src/main.s b/src/main.s
index acd9f5429f41046f1b301c10ded14ecfa8cff750..f63d46f38215a2ddf3fed834d5e073596c9d85da 100644 (file)
--- a/src/main.s
+++ b/src/main.s
@@ -67,7 +67,6 @@ main:
 #include "mainmenu.s"
 #include "tiles.s"
 #include "levels.s"
-#include "event.s"
 
 #include "tiles.inc"
 #include "text.s"

diff --git a/src/player.s b/src/player.s
index 9600faf5d37cd85cf08c42b82d80e5c514b308e1..8d97d6f3c5361b1c4d2de4124e4714e6d6771f70 100644 (file)
--- a/src/player.s
+++ b/src/player.s
@@ -13,8 +13,6 @@ player_init:
        ; updates the special player actor
 player_update: 
        ; call scroll_center_player
-       
-       call event_exec
 
        call player_inputs
        call player_handle_move