aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-02-25 16:54:34 +0900
committerAstatin <[email protected]>2025-02-25 16:54:34 +0900
commitb21954eb05d9285ed7542a1f42ed755a147782a8 (patch)
tree935794c0eb59ff484d4e9c3a9849d588fbd5919b /entity
parent18d7d064daf704193f8dff6b2ef3ae68b7fc3aac (diff)
Fix initialization and flickering issues
Diffstat (limited to 'entity')
-rw-r--r--entity/bunny.gbasm19
-rw-r--r--entity/display.gbasm5
2 files changed, 12 insertions, 12 deletions
diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm
index f8e07ac..d2b9148 100644
--- a/entity/bunny.gbasm
+++ b/entity/bunny.gbasm
@@ -52,9 +52,6 @@ Move_Bunny:
SET 3, A
LD $mem_map_loading_flags, A
- LD A, $mem_bunny_flags
- RES 3, A
- LD $mem_bunny_flags, A
RET
.no_skip:
@@ -76,10 +73,6 @@ Move_Bunny:
SET 3, A
LD $mem_map_loading_flags, A
- LD A, $mem_bunny_flags
- RES 3, A
- LD $mem_bunny_flags, A
-
LD A, $mem_button_action
BIT 1, A
JR NZ, =.Start_action_or_movement.cancel_movement
@@ -130,6 +123,18 @@ Move_Bunny:
LD $mem_map_loading_flags, A
.Start_action_or_movement.end:
+ .Reset_Blinking_flag:
+ LD A, $mem_map_loading_flags
+ BIT 3, A
+ JR Z, =.Reset_Blinking_flag.end
+ LD A, $mem_moving_animation_step
+ CP $00
+ JR NZ, =.Reset_Blinking_flag.end
+ LD A, $mem_bunny_flags
+ RES 3, A
+ LD $mem_bunny_flags, A
+ .Reset_Blinking_flag.end:
+
.Scroll_viewport:
LD A, $mem_map_loading_flags
BIT 3, A
diff --git a/entity/display.gbasm b/entity/display.gbasm
index 75b1e29..b73d393 100644
--- a/entity/display.gbasm
+++ b/entity/display.gbasm
@@ -111,11 +111,6 @@ Display_Entity:
JR Z, =.Blinking_Animation.end
LD A, $mem_blinking_animation_counter
- PUSH DE
- LD E, A
- LD A, $mem_loading_step
- XOR E
- POP DE
AND $02
CP $02
JP Z, =.skip