aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
Diffstat (limited to 'entity')
-rw-r--r--entity/questgoal.gbasm25
1 files changed, 21 insertions, 4 deletions
diff --git a/entity/questgoal.gbasm b/entity/questgoal.gbasm
index 17eecb8..8903e28 100644
--- a/entity/questgoal.gbasm
+++ b/entity/questgoal.gbasm
@@ -43,7 +43,21 @@ Open_Dialogue:
OR (HL)
LD (HL), A
- .START_SCRIPT =Demo_quest_bunny
+ LD A, L
+ AND $f0
+ OR $0b
+ LD L, A
+
+ LD A, (HL+)
+ DBG
+ LD $mem_dialogue_script_bank, A
+ LD A, (HL+)
+ DBG
+ LD ($mem_dialogue_script_program_counter), A
+ LD A, (HL)
+ DBG
+ LD ($mem_dialogue_script_program_counter+1), A
+ CALL =Dialogue_script_step
LD A, $00
LD $mem_bunny_animation, A
@@ -101,9 +115,12 @@ QuestGoal_Turn:
RET
Static_Human_Turn:
- LD A, $mem_map_loading_flags
- BIT 3, A
- RET Z
+ LD A, $mem_current_mode
+ CP $enum_dungeon_mode
+ RET NZ
+ LD A, $mem_requested_mode
+ CP $enum_dungeon_mode
+ RET NZ
INC HL
INC HL