aboutsummaryrefslogtreecommitdiff
path: root/entity/collisions.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'entity/collisions.gbasm')
-rw-r--r--entity/collisions.gbasm18
1 files changed, 12 insertions, 6 deletions
diff --git a/entity/collisions.gbasm b/entity/collisions.gbasm
index 13120a6..d19bf08 100644
--- a/entity/collisions.gbasm
+++ b/entity/collisions.gbasm
@@ -1,9 +1,12 @@
-Carve_Entity_Collision_Map: ; X in C, Y in B
+Carve_Entity_Collision_Map: ; XY in BC
PUSH BC
PUSH HL
PUSH AF
- LD A, C
+ LD A, B
+ LD B, C
+ LD C, A
+
AND $e0
JR NZ, =Carve_Entity_Collision_Map.end
@@ -38,18 +41,21 @@ Carve_Entity_Collision_Map: ; X in C, Y in B
POP BC
RET
-Is_Collisionable: ; X in A, Y in B, Result A
+Is_Collisionable: ; XY in BC, Result A
PUSH BC
PUSH HL
+ LD A, B
CP $20
JR NC, =Is_Collisionable.Solid
- LD C, A
- LD A, B
+ LD A, C
CP $20
JR NC, =Is_Collisionable.Solid
- LD A, C
+
+ LD A, B
+ LD B, C
+ LD C, A
LD H, $00
CP $10