diff options
| -rw-r--r-- | entity/bug.gbasm | 4 | ||||
| -rw-r--r-- | entity/bunny.gbasm | 24 | ||||
| -rw-r--r-- | entity/cat.gbasm | 4 | ||||
| -rw-r--r-- | entity/fimsh.gbasm | 4 | ||||
| -rw-r--r-- | entity/fox.gbasm | 4 | ||||
| -rw-r--r-- | entity/frog.gbasm | 4 | ||||
| -rw-r--r-- | entity/mouse.gbasm | 4 | ||||
| -rw-r--r-- | entity/penguin.gbasm | 4 |
8 files changed, 26 insertions, 26 deletions
diff --git a/entity/bug.gbasm b/entity/bug.gbasm index 989122e..fd6bc83 100644 --- a/entity/bug.gbasm +++ b/entity/bug.gbasm @@ -25,12 +25,12 @@ Bug_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Mouse_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - LD A, $mem_moving_animation_step CP $00 JR NZ, =.attack_end diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index 8870dcc..72d6631 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -9,6 +9,18 @@ Move_Bunny: LD A, $00 LD $mem_bunny_status_tile, A + .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: + .Finish_unfreeze: LD A, $mem_moving_animation_step CP $00 @@ -216,18 +228,6 @@ 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: - .Delayed_Attack: LD A, $mem_moving_animation_step CP $08 diff --git a/entity/cat.gbasm b/entity/cat.gbasm index 13f7be3..a46338a 100644 --- a/entity/cat.gbasm +++ b/entity/cat.gbasm @@ -42,12 +42,12 @@ Cat_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Cat_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - .ENTITY_TRY_ATTACK =Check_player_next_to =Basic_Enemy_Attack =.attack_end CALL =Walking .attack_end: diff --git a/entity/fimsh.gbasm b/entity/fimsh.gbasm index e5f6190..4fe205b 100644 --- a/entity/fimsh.gbasm +++ b/entity/fimsh.gbasm @@ -22,12 +22,12 @@ Fimsh_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Fimsh_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - CALL =Entity_End_movement .Skip_Turn: diff --git a/entity/fox.gbasm b/entity/fox.gbasm index 4d5bd02..9f1e9da 100644 --- a/entity/fox.gbasm +++ b/entity/fox.gbasm @@ -42,12 +42,12 @@ Fox_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Fox_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - .ENTITY_TRY_ATTACK =Laser_sight_check =Laser_Prepare_Attack =.attack_end .ENTITY_TRY_ATTACK =Check_player_next_to =Basic_Enemy_Attack =.attack_end CALL =Walking diff --git a/entity/frog.gbasm b/entity/frog.gbasm index 268e473..bf65150 100644 --- a/entity/frog.gbasm +++ b/entity/frog.gbasm @@ -33,12 +33,12 @@ Frog_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Frog_Drops .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - .ENTITY_TRY_ATTACK =Grab_sight_check =Grab_Enemy_Attack =.attack_end .ENTITY_TRY_ATTACK =Check_player_next_to =Basic_Enemy_Attack =.attack_end CALL =Walking diff --git a/entity/mouse.gbasm b/entity/mouse.gbasm index f87bb88..6ea8b1d 100644 --- a/entity/mouse.gbasm +++ b/entity/mouse.gbasm @@ -25,12 +25,12 @@ Mouse_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Mouse_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - .ENTITY_TRY_ATTACK =Check_player_next_to =Basic_Enemy_Attack =.attack_end CALL =Walking BIT 3, D diff --git a/entity/penguin.gbasm b/entity/penguin.gbasm index 3b58586..9a9ed7c 100644 --- a/entity/penguin.gbasm +++ b/entity/penguin.gbasm @@ -42,12 +42,12 @@ Penguin_Turn: LD A, (HL+) LD D, A + .RESET_BLINKING_MODE + .ENTITY_HEALTH_CHECK =.Skip_turn =Penguin_Drop .ENTITY_FREEZE_SHIVER =.Skip_turn .ENTITY_STATUS_SKIP_TURN =.Skip_turn - .RESET_BLINKING_MODE - LD A, $mem_moving_animation_step CP $00 JR NZ, =.attack_end |