aboutsummaryrefslogtreecommitdiff
path: root/gui.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-03-04 18:27:00 +0900
committerAstatin <[email protected]>2025-03-04 18:27:00 +0900
commitb04c85f5316b58a60b5ae161e9bbf3a20cf1b084 (patch)
tree04f42715a5cf7f6a08a742f6ef6b81e18249be36 /gui.gbasm
parentafc683fd953bee5b7c9bed2439492cc7c1f87a49 (diff)
Fix out of VBlank on dialogue open (most of the time) + object remove
Diffstat (limited to 'gui.gbasm')
-rw-r--r--gui.gbasm17
1 files changed, 11 insertions, 6 deletions
diff --git a/gui.gbasm b/gui.gbasm
index a22c0af..340783f 100644
--- a/gui.gbasm
+++ b/gui.gbasm
@@ -18,18 +18,20 @@ Copy_Dialogue_Buffer:
LD A, $mem_display_flag
BIT 2, A
- RET Z
+ JR Z, =Copy_Dialogue_Buffer_Part2
RES 2, A
+ SET 4, A
LD $mem_display_flag, A
LD HL, $9cb4
LD DE, $dialogue_first_line
LD C, $12
- CALL =tilemap_memcpy
+ JP =tilemap_memcpy
- ; LD HL, $9cd4
- ; LD DE, $dialogue_second_line
- ; LD C, $12
- ; CALL =tilemap_memcpy
+Copy_Dialogue_Buffer_Part2:
+ BIT 4, A
+ RET Z
+ RES 4, A
+ LD $mem_display_flag, A
LD HL, $9cf4
LD DE, $dialogue_third_line
@@ -300,6 +302,9 @@ Open_dialogue_on_dungeon_menu_mode:
CP $enum_dungeon_menu_mode
RET NZ
+ LD A, $mem_display_flag
+ BIT 0, A
+ RET NZ
LD A, $0d
LD $mem_display_flag, A