From: Lukas Krickl Date: Sun, 10 Nov 2024 19:04:08 +0000 (+0100) Subject: Updated ulas -i flag to -I X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=d7154c963ab04c2bea5ec0f644748db60b6563ff;p=gbrg%2F.git Updated ulas -i flag to -I --- diff --git a/makefile b/makefile index 7498771..e7df063 100644 --- 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 67d49e6..828101d 100644 --- 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