From b04c85f5316b58a60b5ae161e9bbf3a20cf1b084 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Tue, 4 Mar 2025 18:27:00 +0900
Subject: Fix out of VBlank on dialogue open (most of the time) + object remove

---
 main.gbasm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'main.gbasm')

diff --git a/main.gbasm b/main.gbasm
index 24090ca..177a6db 100644
--- a/main.gbasm
+++ b/main.gbasm
@@ -154,6 +154,7 @@ New_Dungeon:
 	.SET_WINDOW_LCDC_E
 	.ENABLE_TOP_BAR
 	.ENABLE_VBLANK_INTERRUPTS
+	.HBLANK_WAIT
 	EI
 	Wait_for_Interrupt.loop:
 	HALT
@@ -161,6 +162,7 @@ New_Dungeon:
 	JP =Wait_for_Interrupt.loop
 
 VBLANK_Entrypoint:
+	DBG
 	.SET_WINDOW_LCDC_E
 	.ENABLE_TOP_BAR
 
@@ -185,13 +187,22 @@ VBLANK_Entrypoint:
 		LD A, $mem_bunny_mana
 		CALL =Print_8bit
 
-		CALL =Display_Prepared_Block
+		CALL =Display_Prepared_Blocks
 		CALL =Display_Object
 	Skip_VBlank_Dungeon_Update:
 
 	CALL =Copy_Dialogue_Buffer
 	CALL =Display_dialogue_cursor
 
+	LD A, $reg_lcd_status
+	AND $03
+	CP $01
+	JR Z, =.skip_stop
+		; STOP
+	.skip_stop:
+	LD $dbg_var A
+
+	DBG
 	; LYC
 	LD A, $0a
 	LD $reg_lyc, A
@@ -200,6 +211,7 @@ VBLANK_Entrypoint:
 	EI
 
 	CALL =Pad_Button_Check
+	CALL =Load_Additional_Block
 
 	LD A, $mem_current_mode
 	CP $enum_dungeon_mode
@@ -210,10 +222,6 @@ VBLANK_Entrypoint:
 		CALL =Respawn_Entities
 		CALL =Prepare_Scrolling_Map
 
-	LD A, $mem_current_mode
-	LD B, A
-	LD A, $mem_animation_wait_frames
-
 	Skip_Dungeon_Update:
 	LD A, $mem_current_mode
 
-- 
cgit v1.2.3-70-g09d2