actors: renamed demo actors

removed dialog entry from actor def

diff --git a/src/actortables.s b/src/actortables.s
index a4b668d28618e122249dfc1cf400a0d85a0472a5..3c70e1483543b2474b144c4686698630e034003b 100644 (file)
--- 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 9c4768183a341fcda79ab0abe46a89349d8618ea..8a63c0bb1c6eb46c346c9224dc64518686cba26b 100644 (file)
--- 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 43b33fd1c6665facfe4751fbb7aebfced55abcaa..29ed3815662130d52c70be2c445b70a5f0c13780 100644 (file)
--- 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 5ca6c0bf423e059f5a936bdd83e6e7e0f49a6cb6..876c9e99b73ab069a838e09c37bbe3d3a288fc31 100644 (file)
--- 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 b8bda52de5b8d7329a658a2b81f6e5c2efd33438..b71443d68d48b19874300b2e988d6d1ffd6d6174 100644 (file)
--- 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: