aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
Diffstat (limited to 'entity')
-rw-r--r--entity/bunny.gbasm21
1 files changed, 16 insertions, 5 deletions
diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm
index 40cd047..c9bd141 100644
--- a/entity/bunny.gbasm
+++ b/entity/bunny.gbasm
@@ -92,16 +92,11 @@ Move_Bunny:
BIT 3, D
JR Z, =.Start_action_or_movement.end
- PUSH BC
- LD A, $01
- .ADD_A_TO_DIRECTION_BC
LD A, B
LD $mem_bunny_predicted_x, A
LD A, C
LD $mem_bunny_predicted_y, A
- POP BC
-
JR =.Start_action_or_movement.end
.Start_action_or_movement.test_action:
@@ -241,6 +236,22 @@ Move_Bunny:
LD A, $mem_bunny_y
LD $mem_bunny_predicted_y, A
+ LD A, $mem_bunny_next_mana_regen
+ DEC A
+ AND $07
+ LD $mem_bunny_next_mana_regen, A
+ CP $00
+ JR NZ, =.End_movement.skip_mana_regen
+ LD A, $mem_bunny_mana
+ INC A
+ DAA
+ JR C, =.End_movement.skip_mana_regen
+ CP $30
+ JR NC, =.End_movement.skip_mana_regen
+ LD $mem_bunny_mana, A
+
+ .End_movement.skip_mana_regen:
+
.End_movement.end:
.Middle_movement_doublespeed_viewport_update: