diff options
| author | Astatin <[email protected]> | 2025-01-10 14:17:59 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-01-10 14:17:59 +0900 |
| commit | 6554352f32cd4ea48b7f39eebdbfcf3b77232fe3 (patch) | |
| tree | 698f1ae461318d7233bd69bbf6b5dc7a57a602e6 | |
| parent | 4bc4cac95f5cab356b2d2a6c07d68f1a7b7a4e92 (diff) | |
Emptying dialogue buffer on close dialogue
| -rw-r--r-- | attacks.gbasm | 3 | ||||
| -rw-r--r-- | attacks/earcoptr.gbasm | 3 | ||||
| -rw-r--r-- | attacks/freeze.gbasm | 3 | ||||
| -rw-r--r-- | attacks/heal.gbasm | 3 | ||||
| -rw-r--r-- | attacks/hop.gbasm | 3 | ||||
| -rw-r--r-- | entity/actions.gbasm | 3 | ||||
| -rw-r--r-- | entity/init.gbasm | 2 | ||||
| -rw-r--r-- | gui.gbasm | 17 | ||||
| -rw-r--r-- | main.gbasm | 2 |
9 files changed, 22 insertions, 17 deletions
diff --git a/attacks.gbasm b/attacks.gbasm index eb46184..779ce16 100644 --- a/attacks.gbasm +++ b/attacks.gbasm @@ -62,8 +62,7 @@ Canceled_Attack: LD A, $enum_loading_mode LD $mem_requested_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE LD A, $mem_map_loading_flags SET 3, A diff --git a/attacks/earcoptr.gbasm b/attacks/earcoptr.gbasm index baa08b9..7e74802 100644 --- a/attacks/earcoptr.gbasm +++ b/attacks/earcoptr.gbasm @@ -90,6 +90,5 @@ Earcoptr_Attack: LD A, $enum_loading_mode LD $mem_requested_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE RET diff --git a/attacks/freeze.gbasm b/attacks/freeze.gbasm index c4bb392..fa83d03 100644 --- a/attacks/freeze.gbasm +++ b/attacks/freeze.gbasm @@ -109,6 +109,5 @@ Freeze_Attack: LD A, $enum_loading_mode LD $mem_requested_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE RET diff --git a/attacks/heal.gbasm b/attacks/heal.gbasm index 81de6a1..4aacc23 100644 --- a/attacks/heal.gbasm +++ b/attacks/heal.gbasm @@ -21,8 +21,7 @@ Heal_Attack: LD $mem_requested_mode, A LD $mem_current_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE LD A, $mem_map_loading_flags SET 3, A diff --git a/attacks/hop.gbasm b/attacks/hop.gbasm index e8bde55..1b3d93b 100644 --- a/attacks/hop.gbasm +++ b/attacks/hop.gbasm @@ -181,8 +181,7 @@ Hop_Attack: LD A, $enum_loading_mode LD $mem_requested_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE RET diff --git a/entity/actions.gbasm b/entity/actions.gbasm index a8045dd..0b1073e 100644 --- a/entity/actions.gbasm +++ b/entity/actions.gbasm @@ -85,8 +85,7 @@ Update_Animation_Steps: LD A, $enum_dead_mode LD $mem_current_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE RET diff --git a/entity/init.gbasm b/entity/init.gbasm index 953e45e..ab6cb8f 100644 --- a/entity/init.gbasm +++ b/entity/init.gbasm @@ -178,7 +178,6 @@ Initialize_Enemy: ; HL => pointer to entity struct ADD E LD E, A LD A, (DE) - DBG SLA A SLA A SLA A @@ -192,7 +191,6 @@ Initialize_Enemy: ; HL => pointer to entity struct ; Turn LD A, (BC) LD (HL+), A - DBG INC BC @@ -1,3 +1,16 @@ +.MACRODEF CLOSE_DIALOGUE + LD A, $04 + LD $mem_display_flag, A + + LD HL, $dialogue_first_line + LD BC, $12 + CALL =bzero + + LD HL, $dialogue_third_line + LD BC, $12 + CALL =bzero +.END + Copy_Dialogue_Buffer: LD A, $mem_display_flag BIT 2, A @@ -70,8 +83,8 @@ Exit_Menu: LD A, $enum_dungeon_mode LD $mem_requested_mode, A - LD A, $00 - LD $mem_display_flag, A + .CLOSE_DIALOGUE + RET Display_dialogue_cursor: @@ -235,6 +235,7 @@ STAT_Entrypoint: .INCLUDE "map/loading.gbasm" .INCLUDE "map/generation.gbasm" .INCLUDE "map/objects.gbasm" +.INCLUDE "gui.gbasm" .INCLUDE "entity/utils.gbasm" .INCLUDE "entity/init.gbasm" .INCLUDE "entity/bunny.gbasm" @@ -244,6 +245,5 @@ STAT_Entrypoint: .INCLUDE "entity/list.gbasm" .INCLUDE "animation.gbasm" .INCLUDE "attacks.gbasm" -.INCLUDE "gui.gbasm" .INCLUDE "tileset.gbasm" .INCLUDE "dialogues.gbasm" |