projects
/
gbrg
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e235b4f
)
player -> tile collision from top
author
Lukas Krickl
<lukas@krickl.dev>
Sat, 19 Oct 2024 04:31:16 +0000
(06:31 +0200)
committer
Lukas Krickl
<lukas@krickl.dev>
Sat, 19 Oct 2024 04:31:16 +0000
(06:31 +0200)
src/collision.s
patch
|
blob
|
history
src/map.s
patch
|
blob
|
history
diff --git
a/src/collision.s
b/src/collision.s
index 375043c2f7311b281496d731d6e79634eadd937e..7afc9857b221f31e05d00ce5145ba9ddb680b3d6 100644
(file)
--- a/
src/collision.s
+++ b/
src/collision.s
@@
-23,7
+23,7
@@
#endmacro
collision_player_top:
- col_head
1
+ col_head
2
; center left
col_point 0, 0
; center right
diff --git
a/src/map.s
b/src/map.s
index f21c1eaee3eea2832bcf9efef353d74047f8f46f..16a6146ff140de26b09171fa6992d4bf7b0be805 100644
(file)
--- a/
src/map.s
+++ b/
src/map.s
@@
-157,7
+157,7
@@
base_room:
.db TCORNBOL, TWALLD1, TWALLD1, TWALLD1, TDOORDL, TDOORDR, TWALLD1, TWALLD1, TWALLD1, TCORNBOR
; tile flags for the room
base_room_flags:
-.db RF_WALL,
0, 0, 0, 0, 0, 0, 0, 0, 0
+.db RF_WALL,
RF_WALL, RF_WALL, RF_WALL, 0, 0, RF_WALL, RF_WALL, RF_WALL, RF_WALL
.db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
.db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
.db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0