aboutsummaryrefslogtreecommitdiff
path: root/gui.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-01-07 19:29:17 +0900
committerAstatin <[email protected]>2025-01-07 19:30:12 +0900
commitadb2d9935253b0ea0e31b462f342aa7823697a7e (patch)
treeb17bff2c89f69bc2265b3abd09383b061cdde59c /gui.gbasm
parentba36a613da1ce2dd822429cff4bd994094010abe (diff)
Add support for multiple enemies loaded (up to 4 loaded at dungeon gen time)
Diffstat (limited to 'gui.gbasm')
-rw-r--r--gui.gbasm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gui.gbasm b/gui.gbasm
index 6bfaae0..f0a3d0c 100644
--- a/gui.gbasm
+++ b/gui.gbasm
@@ -142,8 +142,12 @@ Move_dialogue_cursor:
Check_dialogue_action:
LD A, $mem_current_mode
CP $enum_dungeon_menu_mode
+ JR Z, =.Check_exit
+
+ CP $enum_dungeon_dialogue_mode
RET NZ
+ .Check_exit:
LD A, $mem_last_button_action
LD B, A
LD A, $mem_button_action
@@ -154,6 +158,10 @@ Check_dialogue_action:
BIT 0, A
RET Z
+ LD A, $mem_current_mode
+ CP $enum_dungeon_menu_mode
+ RET NZ
+
LD HL, $dialogue_menu_choice1_routine
LD A, $mem_menu_cursor_position