projects
/
gbrg
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
efbaf08
)
defs: fixed player rt macros
author
Lukas Krickl
<lukas@krickl.dev>
Mon, 11 Aug 2025 15:54:38 +0000
(17:54 +0200)
committer
Lukas Krickl
<lukas@krickl.dev>
Mon, 11 Aug 2025 15:54:38 +0000
(17:54 +0200)
src/defs.s
patch
|
blob
|
history
src/macros.inc
patch
|
blob
|
history
diff --git
a/src/defs.s
b/src/defs.s
index a282bc93db4b70e61eb4aa3941984296a2e89c7c..fa236356c3b52c54fc639fae7c6f32b90195ab92 100644
(file)
--- a/
src/defs.s
+++ b/
src/defs.s
@@
-165,14
+165,14
@@
; actor runtime values
- ; last collision with actor
- ; set during unit_collision_woth_any_other
-.de act_rt_collided_with, 2
; last collision flags
.de act_rt_collision_cf, 1
; last collision tile position
.de act_rt_collision_pos_y, 1
.de act_rt_collision_pos_x, 1
+ ; last collision with actor
+ ; set during unit_collision_woth_any_other
+.de act_rt_collided_with, 2
; sub-tile drawing vars
; during this animation the actor is already technically in its new
diff --git
a/src/macros.inc
b/src/macros.inc
index 03a62c547ed176f7eff83f8a47879e00ca91472a..e3c25809dfc94ef47619d77f3136c16bfb6d77e5 100644
(file)
--- a/
src/macros.inc
+++ b/
src/macros.inc
@@
-182,7
+182,9
@@
.db $3 ; y pos
.db $4 ; x pos
.db $5 ; p0
-
+
+ ; act rt collision cf, pos y, pos x
+ .db 0, 0, 0
; act_rt_collided_with
dw 0
.db 0 ; act_rt_sub_tile