From 62701690d1c7b95b639d63d0cb9cd6ebeb9ac876 Mon Sep 17 00:00:00 2001 From: Astatin Date: Thu, 13 Mar 2025 19:08:09 +0900 Subject: Adding multi-step dialogue --- main.gbasm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main.gbasm') diff --git a/main.gbasm b/main.gbasm index 254cd7a..e22d5bb 100644 --- a/main.gbasm +++ b/main.gbasm @@ -209,6 +209,7 @@ VBLANK_Entrypoint: CALL =Display_Object Skip_VBlank_Dungeon_Update: + CALL =Dialogue_Arrow_Animation CALL =Copy_Dialogue_Buffer CALL =Display_dialogue_cursor @@ -247,9 +248,9 @@ VBLANK_Entrypoint: CALL =Display_Animation_List CALL =Display_Entities - LD A, $mem_loop_rng_timer + LD A, $mem_loop_frame_timer INC A - LD $mem_loop_rng_timer, A + LD $mem_loop_frame_timer, A .ENABLE_VBLANK_INTERRUPTS RET @@ -309,6 +310,7 @@ STAT_Entrypoint: .INCLUDE "map/generation.gbasm" .INCLUDE "map/objects.gbasm" .INCLUDE "gui.gbasm" +.INCLUDE "dialogues/utils.gbasm" .INCLUDE "entity/utils.gbasm" .INCLUDE "entity/init.gbasm" .INCLUDE "entity/bunny.gbasm" @@ -324,4 +326,5 @@ STAT_Entrypoint: .INCLUDE "playerattacks.gbasm" .INCLUDE "enemiesattacks.gbasm" .INCLUDE "tileset.gbasm" -.INCLUDE "dialogues.gbasm" +.INCLUDE "text.gbasm" +.INCLUDE "dialogues/dialogues.gbasm" -- cgit v1.2.3-70-g09d2