aboutsummaryrefslogtreecommitdiff
path: root/entity/bunny.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'entity/bunny.gbasm')
-rw-r--r--entity/bunny.gbasm5
1 files changed, 5 insertions, 0 deletions
diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm
index c9bd141..4b9bba7 100644
--- a/entity/bunny.gbasm
+++ b/entity/bunny.gbasm
@@ -72,12 +72,17 @@ Move_Bunny:
SET 3, A
LD $mem_map_loading_flags, A
+ LD A, $mem_button_action
+ BIT 1, A
+ JR NZ, =.Start_action_or_movement.cancel_movement
+
LD A, D
CALL =Get_Position_After_Move
CALL =Is_Collisionable
CALL =Carve_Entity_Collision_Map
CP $00
JR Z, =.Start_action_or_movement.not_collision
+ .Start_action_or_movement.cancel_movement:
RES 3, D
LD A, $mem_map_loading_flags