actor: Added equipment ptrs

diff --git a/src/defs.s b/src/defs.s
index 439e30a0a8ca8686f815cfed78f13b471e236874..5722c81dea0e8ee4274c4cac487f0094e8305ac5 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -189,9 +189,13 @@
 
   ; equipment 
   ; stores all items equiped
-  ; for all actors but players there are 4 eqipment slots
-  ; if the actor is type player a special 
-  ; equipment slot is used instead
+  ; for all actors there are 6 eqipment slots
+.de act_eq_head, 2
+.de act_eq_body, 2
+.de act_eq_hand1, 2
+.de act_eq_hand2, 2
+.de act_eq_ring1, 2
+.de act_eq_ring2, 2
 
   ; status effects
 .de act_effect, EFFECTS_MAX * effect_size 

diff --git a/src/macros.inc b/src/macros.inc
index f21796dd3fc6a5093a3496ee0cc14a0408a2587e..b5d379e819f68e89ad65b75ec1cc76a47f6ce538 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -243,12 +243,25 @@
 #endmacro
 
   ; defines an actor's equipment
+  ; inputs:
+  ;   $1: head
+  ;   $2: body
+  ;   $3: hand1
+  ;   $4: hand2
+  ;   $5: ring1
+  ;   $6: ring2
 #macro act_equipment_def
+  dw $1
+  dw $2
+  dw $3
+  dw $4
+  dw $5
+  dw $6
 #endmacro
 
   ; defines an empty equipment set
 #macro act_equipment_empty
-  act_equipment_def
+  act_equipment_def NULL, NULL, NULL, NULL, NULL, NULL
 #endmacro
 
   ; defines an actors current stats effects