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

---
 map/objects.gbasm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'map/objects.gbasm')

diff --git a/map/objects.gbasm b/map/objects.gbasm
index 5bedeee..b1a43fe 100644
--- a/map/objects.gbasm
+++ b/map/objects.gbasm
@@ -212,6 +212,9 @@ Restore_EP_Action:
 	RET
 
 Display_Object:
+	LD A, $mem_display_flag
+	BIT 5, A
+	RET NZ
 	LD HL, $mem_object_list
 	LD A, $mem_object_load_counter
 	INC A
@@ -296,8 +299,12 @@ Display_Object:
 
 	Display_Objects.Nothing:
 	LD A, D
-	CALL =Load_Block
-	CALL =Display_Prepared_Block
+	LD $mem_additional_loading_block_x, A
+	LD A, B
+	LD $mem_additional_loading_block_y, A
+	LD A, $mem_display_flag
+	SET 6, A
+	LD $mem_display_flag, A
 	RET
 
 Load_Objects:
-- 
cgit v1.2.3-70-g09d2