aboutsummaryrefslogtreecommitdiff
path: root/entity/bunny.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2024-10-08 15:35:46 +0900
committerAstatin <astatin@redacted>2024-10-08 15:35:46 +0900
commit9bdce0aa0daf5bf25f21e2bc6863312f01f55376 (patch)
tree0d010281aacbb66a1e3eb46b147e9f880af7cf3d /entity/bunny.gbasm
parent9eab2451e369e56508d1a6b8380e772d74ce7c40 (diff)
Fix foxe's movements
Diffstat (limited to 'entity/bunny.gbasm')
-rw-r--r--entity/bunny.gbasm18
1 files changed, 12 insertions, 6 deletions
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