aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui.gbasm8
-rw-r--r--modes/dungeon.gbasm6
2 files changed, 13 insertions, 1 deletions
diff --git a/gui.gbasm b/gui.gbasm
index 423c081..4a0025f 100644
--- a/gui.gbasm
+++ b/gui.gbasm
@@ -388,13 +388,21 @@ Dialogue_Arrow_Animation:
LD A, $mem_current_mode
CP $enum_dungeon_dialogue_mode
JR Z, =.dialogue
+ CP $enum_dead_mode
+ JR Z, =.dead
+ .not_dialogue:
LD A, $18
LD ($9d05), A
LD A, $14
LD ($9d06), A
RET
+ .dead:
+ LD A, $mem_sound_flags
+ BIT 0, A
+ JR NZ, =.not_dialogue
+
.dialogue:
LD A, $mem_loop_frame_timer
AND $7f
diff --git a/modes/dungeon.gbasm b/modes/dungeon.gbasm
index 86fea59..0386a5f 100644
--- a/modes/dungeon.gbasm
+++ b/modes/dungeon.gbasm
@@ -72,7 +72,11 @@ Update_Animation_Steps:
CALL =Update_VBlank_Handler
LD HL, $dialogue_first_line
- LD BC, $36
+ LD BC, $12
+ CALL =bzero
+
+ LD HL, $dialogue_third_line
+ LD BC, $12
CALL =bzero
LD HL, $dialogue_first_line