aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-03-07 15:01:07 +0900
committerAstatin <[email protected]>2025-03-07 15:01:07 +0900
commit3649b73eca599701db818dbbf470b1b17e660083 (patch)
treee2116939c2cfa66806cb039fb68ee236eef21658 /entity
parentb04c85f5316b58a60b5ae161e9bbf3a20cf1b084 (diff)
Fix walk on deleted objects + fix out of vblank on dialogue close and object draw
Diffstat (limited to 'entity')
-rw-r--r--entity/actions.gbasm10
1 files changed, 10 insertions, 0 deletions
diff --git a/entity/actions.gbasm b/entity/actions.gbasm
index 11951e6..7032766 100644
--- a/entity/actions.gbasm
+++ b/entity/actions.gbasm
@@ -81,6 +81,16 @@ Update_Animation_Steps:
.update_mode:
+ ; We need to make sure that the mode doesn't change to a mode with objects update while a dialogue box refresh is currently being done
+ LD A, $mem_current_mode
+ BIT 7, A
+ JR Z, =.set_current_mode
+ LD A, $mem_display_flag
+ AND 0b00010100
+ CP $00
+ JR NZ, =.end
+
+ .set_current_mode:
LD A, $mem_requested_mode
LD $mem_current_mode, A