unit: Added act_def macro

diff --git a/src/defs.s b/src/defs.s
index f822ac2073fb296b1c91c7790b5290bdab78cd23..db8778b683b67703bf6993e12a67c85dfd01c7f7 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -83,9 +83,6 @@
 .de act_moves, stat_size ; moves for each turn
 .de act_init, 1 ; initiative value
 
-.de act_melee, 2 ; melee weapon routine
-.de act_ranged, 2 ; ranged weapon routine
-
   ; custom parameter
 .de act_p0, 1
 .de act_size, 0

diff --git a/src/macros.inc b/src/macros.inc
index caa533a8bf699d3dfc7fc515b34e61f390426464..7858fa2baae6e3a632932b3a9d23287812f7d093 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -133,7 +133,27 @@
   dw $2
   dw $3
 #endmacro
-
+  
+  ; define an actor without state
+  ; to define an actor call 
+  ; st_def and act_def
+  ; inputs:
+  ;   $1 type
+  ;   $2 hp
+  ;   $3 atk
+  ;   $4 shiled
+  ;   $5 moves
+  ;   $6 initiative
+  ;   $7 custom p0 value
+#macro act_def
+  .db $1 ; type
+  .db $2, $2 ; hp hp max
+  .db $3, $3 ; atk atk max
+  .db $4, $4 ; shiled shield max
+  .db $5, $5 ; moves moves max
+  .db $6 ; initiative
+  .db $7 ; p0
+#endmacro
 
   ; loads NULL into a 16 bit register
   ; inputs:

diff --git a/src/unit.s b/src/unit.s
index 15d06c7b30cdbae454e0fa06563a693520a4a792..0662dd907f8135306f6bc2eb3e5a93fd17393f5b 100644 (file)
--- a/src/unit.s
+++ b/src/unit.s
@@ -40,3 +40,6 @@ units_update:
   ret
 
 
+unit_demo_1:
+  st_def 0xFF, st_null_fn, st_null
+  act_def ACT_T_NULL, 1, 1, 1, 1, 1, 0