aboutsummaryrefslogtreecommitdiff
path: root/entity/collisions.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2024-10-29 16:12:03 +0900
committerAstatin <[email protected]>2024-10-29 16:12:03 +0900
commit96df60d319238dc7df53fe948e8a2593f1857be7 (patch)
tree9df94fd700f765e83cde3c997ab6e4a1d9d171de /entity/collisions.gbasm
parent7bcae43031d18c2b992581cb00358ae3d457d5c6 (diff)
Bunny can attack foxes
Diffstat (limited to 'entity/collisions.gbasm')
-rw-r--r--entity/collisions.gbasm7
1 files changed, 6 insertions, 1 deletions
diff --git a/entity/collisions.gbasm b/entity/collisions.gbasm
index 3edc701..1777ddb 100644
--- a/entity/collisions.gbasm
+++ b/entity/collisions.gbasm
@@ -92,7 +92,7 @@ Is_Collisionable: ; X in A, Y in B, Result A
Reset_Entities_Collision_Map:
LD A, $mem_moving_animation_step
- CP $02
+ CP $04
JR NZ, =Reset_Entities_Collision_Map.end
LD HL, $mem_entities_collisions
@@ -101,6 +101,10 @@ Reset_Entities_Collision_Map:
LD HL, $mem_entities_list
Reset_Entities_Collision_Map.loop:
+ LD A, (HL)
+ CP $00
+ JR Z, =Reset_Entities_Collision_Map.loop.next
+
INC L
INC L
INC L
@@ -109,6 +113,7 @@ Reset_Entities_Collision_Map:
CALL =Get_Position_After_Move
CALL =Carve_Entity_Collision_Map
+ Reset_Entities_Collision_Map.loop.next:
LD A, L
AND $f0
ADD $10