From 9bdce0aa0daf5bf25f21e2bc6863312f01f55376 Mon Sep 17 00:00:00 2001 From: Astatin Date: Tue, 8 Oct 2024 15:35:46 +0900 Subject: Fix foxe's movements --- entity/bunny.gbasm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'entity/bunny.gbasm') diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index 0460433..c9a55c2 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -12,7 +12,12 @@ Move_Bunny: SET 3, A LD D, A + LD A, $mem_map_loading_flags + SET 3, A + LD $mem_map_loading_flags, A + PUSH BC + LD A, D CALL =Get_Position_After_Move LD A, C CALL =Is_Collisionable @@ -21,24 +26,26 @@ Move_Bunny: CP $00 JR Z, =Start_action_or_movement.not_collision RES 3, D + + LD A, $mem_map_loading_flags + RES 3, A + LD $mem_map_loading_flags, A + Start_action_or_movement.not_collision: LD A, D LD $mem_bunny_direction, A - JR =Start_action_or_movement.test_end - + JR =Start_action_or_movement.end Start_action_or_movement.test_action: LD A, $mem_button_action BIT 0, A JR Z, =Start_action_or_movement.end LD A, $mem_bunny_direction - AND $0f + AND $07 OR $10 LD $mem_bunny_direction, A - Start_action_or_movement.test_end: - LD A, $mem_map_loading_flags SET 3, A LD $mem_map_loading_flags, A @@ -76,7 +83,6 @@ Move_Bunny: LD A, $mem_bunny_direction BIT 3, A JR Z, =End_movement.end - AND $07 LD $mem_bunny_direction, A LD D, A -- cgit v1.2.3-70-g09d2