Updated ulas -i flag to -I

diff --git a/makefile b/makefile
index 74987712d3bbaa87a56a4d4e5336324d7ac1b8d8..e7df063b24b5876097cebcff80072462e15fcce3 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,10 +3,10 @@ TEST_NAME=test$(NAME)
 AS=ulas 
 
 bin:
-       $(AS) -v -o $(NAME).gb -l ${NAME}.lst -s $(NAME).mlb -S mlb -i ./src -i ./tiles src/main.s
+       $(AS) -v -o $(NAME).gb -l ${NAME}.lst -s $(NAME).mlb -S mlb -I ./src -I ./tiles src/main.s
 
 test:
-       $(AS) -v -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb -i ./src -i ./tiles src/main.s
+       $(AS) -v -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb -I ./src -I ./tiles src/main.s
 
 .PHONY: tiles
 tiles:

diff --git a/src/actor.s b/src/actor.s
index 67d49e61782090da83615c7a0c954c26638599d3..828101d7f9575a13a3372c6b75f7adb25e06c4c6 100644 (file)
--- a/src/actor.s
+++ b/src/actor.s
@@ -38,6 +38,11 @@ actor_update_rock:
   ld a, h
   ld [actor_soam_ptr], a
 
+
+  ; check player collision 
+  ; if collision occured 
+  ; set collision flag
+
   ret
 
   ; updates all active actors from