aboutsummaryrefslogtreecommitdiff
path: root/map/objects.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 /map/objects.gbasm
parentafc683fd953bee5b7c9bed2439492cc7c1f87a49 (diff)
Fix out of VBlank on dialogue open (most of the time) + object remove
Diffstat (limited to 'map/objects.gbasm')
-rw-r--r--map/objects.gbasm11
1 files changed, 9 insertions, 2 deletions
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: