diff options
| -rw-r--r-- | attacks/hop.gbasm | 1 | ||||
| -rw-r--r-- | definitions.gbasm | 1 | ||||
| -rw-r--r-- | entity/actions.gbasm | 10 | ||||
| -rw-r--r-- | entity/display.gbasm | 1 | ||||
| -rw-r--r-- | gui.gbasm | 4 |
5 files changed, 16 insertions, 1 deletions
diff --git a/attacks/hop.gbasm b/attacks/hop.gbasm index fdbf7f0..11f6095 100644 --- a/attacks/hop.gbasm +++ b/attacks/hop.gbasm @@ -161,6 +161,7 @@ Hop_Attack: .ADD_A_TO_DIRECTION_BC LD A, B LD B, C + LD C, A CALL =Is_Collisionable CALL =Carve_Entity_Collision_Map CP $00 diff --git a/definitions.gbasm b/definitions.gbasm index 0eb0a94..d122f42 100644 --- a/definitions.gbasm +++ b/definitions.gbasm @@ -66,6 +66,7 @@ .DEFINE enum_dungeon_menu_mode $01 .DEFINE enum_dungeon_dialogue_mode $02 .DEFINE enum_loading_mode $03 +.DEFINE enum_dead_mode $04 .DEFINE mem_menu_cursor_position ($c016) .DEFINE mem_last_button_direction ($c017) diff --git a/entity/actions.gbasm b/entity/actions.gbasm index 1416304..6d8befa 100644 --- a/entity/actions.gbasm +++ b/entity/actions.gbasm @@ -70,12 +70,22 @@ Update_Animation_Steps: Update_Animation_Steps.update_mode: + LD A, $mem_bunny_health + CP $00 + JR Z =Update_Animation_Steps.Dead_mode + LD A, $mem_requested_mode LD $mem_current_mode, A Update_Animation_Steps.end: RET + Update_Animation_Steps.Dead_mode: + + LD A, $enum_dead_mode + LD $mem_current_mode, A + RET + Turn_Jump_table: ; 00 RET diff --git a/entity/display.gbasm b/entity/display.gbasm index 8b5f110..934d02f 100644 --- a/entity/display.gbasm +++ b/entity/display.gbasm @@ -226,7 +226,6 @@ Display_Entity: CPL INC A Display_Entity.Shaking_Animation.skip_invert: - DBG ADD B LD B, A Display_Entity.Shaking_Animation.end: @@ -168,6 +168,10 @@ Check_dialogue_action: RET Check_Open_Menu_button: + LD A, $mem_current_mode + CP $enum_dungeon_mode + RET NZ + LD A, $mem_last_button_action AND $08 LD B, A |