From 0f82287386fecf65ed18a19223455b55a187e4c5 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 7 Sep 2025 06:33:53 +0200 Subject: [PATCH] actors: renamed demo actors removed dialog entry from actor def --- src/actortables.s | 36 ++++++++++++++++++------------------ src/defs.s | 3 --- src/macros.inc | 2 -- src/player.s | 2 +- src/unit_demo.s | 24 ++++++++---------------- 5 files changed, 27 insertions(+), 40 deletions(-) diff --git a/src/actortables.s b/src/actortables.s index a4b668d..3c70e14 100644 --- a/src/actortables.s +++ b/src/actortables.s @@ -11,24 +11,24 @@ floor_1_actor_table: map_c_actor_table: .db 7 ; size -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_mage -dw unit_demo_mage -dw unit_demo_thief -dw unit_demo_thief -dw unit_demo_priest -dw unit_demo_priest -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior -dw unit_demo_warrior +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_hazmat +dw unit_demo_hazmat +dw unit_demo_dog +dw unit_demo_dog +dw unit_demo_dog +dw unit_demo_dog +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard +dw unit_demo_guard ; actor tables for each floor floor_actor_tables: diff --git a/src/defs.s b/src/defs.s index 9c47681..8a63c0b 100644 --- a/src/defs.s +++ b/src/defs.s @@ -241,9 +241,6 @@ .de act_oam_tile, 1 .de act_oam_flags, 1 - ; ptr to dialog options - ; if NULL do not execute any dialog -.de act_dialog_opts, 2 .de act_size, 0 ; actor save game data diff --git a/src/macros.inc b/src/macros.inc index 43b33fd..29ed381 100644 --- a/src/macros.inc +++ b/src/macros.inc @@ -159,12 +159,10 @@ ; $1: draw call ; $2: default tiles ; $3: default oam flags - ; $4: dialog options ptr #macro act_def_meta dw $1 .db $2 .db $3 - dw $4 #endmacro ; define an actor without state diff --git a/src/player.s b/src/player.s index 5ca6c0b..876c9e9 100644 --- a/src/player.s +++ b/src/player.s @@ -331,7 +331,7 @@ unit_player: act_stat_def1 1, 3, 1, 1 act_stat_def2 1, 1, 90, 1 act_st_def st_unit_player_update, st_unit_idle - act_def_meta player_draw, 0x8C, OAM_FPRIO, NULL + act_def_meta player_draw, 0x8C, OAM_FPRIO st_unit_player_update: st_def 0x00, unit_player_update, st_unit_player_update diff --git a/src/unit_demo.s b/src/unit_demo.s index b8bda52..b71443d 100644 --- a/src/unit_demo.s +++ b/src/unit_demo.s @@ -15,46 +15,38 @@ unit_demo_1_cpu_update_idle: ldnull bc ret -unit_demo_2: - st_def 0x00, unit_demo_1_init, st_unit_idle - act_def ACT_T_DEMO_1, 0, 3, 3, 0 - act_stat_def1 1, 1, 1, 1 - act_stat_def2 1, 1, 32, 1 - act_st_def st_unit_demo_1_cpu_update_idle, st_unit_idle - act_def_meta unit_draw, 0x88, OAM_FPRIO, NULL - -unit_demo_warrior: +unit_demo_guard: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 3, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def st_unit_demo_1_cpu_update, st_unit_idle - act_def_meta unit_draw, 0x88, OAM_FPRIO, NULL + act_def_meta unit_draw, 0x88, OAM_FPRIO -unit_demo_mage: +unit_demo_agent: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def st_unit_demo_1_cpu_update, st_unit_idle - act_def_meta unit_draw, 0x8C, OAM_FPRIO, NULL + act_def_meta unit_draw, 0x8C, OAM_FPRIO -unit_demo_thief: +unit_demo_dog: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 2, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def st_unit_demo_1_cpu_update, st_unit_idle - act_def_meta unit_draw, 0x90, OAM_FPRIO, NULL + act_def_meta unit_draw, 0x90, OAM_FPRIO -unit_demo_priest: +unit_demo_hazmat: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def st_unit_demo_1_cpu_update, st_unit_idle - act_def_meta unit_draw, 0x94, OAM_FPRIO, NULL + act_def_meta unit_draw, 0x94, OAM_FPRIO st_unit_demo_1_cpu_update: -- 2.30.2