defs: Added placeholder macros for unit inventory equipment and effects

diff --git a/src/defs.s b/src/defs.s
index b376e708927c3a66ce1cf3e5f21f6d1dceacd6dc..e697a62887d776f166e75f3c75b870c680867b8f 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -97,6 +97,9 @@
   ; st_def
   ; act_def
   ; act_stat_def
+  ; act_inventory_def or act_inventory_empty
+  ; act_equipment_def or act_equipment_empty
+  ; act_effects_def or act_effects_empty
   ; act_st_def
   ; act_def_draw
 .se 0

diff --git a/src/macros.inc b/src/macros.inc
index 8961abf072e1a2abcb641154ec2dd22d893beb5f..1435e88bea1853bbc3e6cd27ccdec322658bbfbf 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -195,6 +195,32 @@
   dw $4
 #endmacro
 
+  ; defines an actors inventory content
+#macro act_inventory_def
+#endmacro
+  
+  ; defines an empty inventory
+#macro act_inventory_empty
+  act_inventory_def
+#endmacro
+
+  ; defines an actor's equipment
+#macro act_equipment_def
+#endmacro
+
+  ; defines an empty equipment set
+#macro act_equipment_empty
+  act_equipment_def
+#endmacro
+
+  ; defines an actors current stats effects
+#macro act_effects_def
+#endmacro
+
+  ; defines an empty status effect table
+#macro act_effects_empty
+#endmacro
+
   ; loads NULL into a 16 bit register
   ; inputs:
   ;   $1: register

diff --git a/src/unit.s b/src/unit.s
index 7727d24da0ddef865e3f5402449a63004a201c6e..5fbc10e888c2f57050ee681accc8f4cf84d053e3 100644 (file)
--- a/src/unit.s
+++ b/src/unit.s
@@ -641,6 +641,9 @@ unit_demo_1:
   st_def 0x00, unit_demo_1_init, st_unit_idle
   act_def ACT_T_DEMO_1, 0, 2, 2, 0
   act_stat_def 1, 2, 3, 0, 0, 0, 4, 6 
+  act_inventory_empty
+  act_equipment_empty
+  act_effects_empty
   act_st_def NULL, NULL, st_unit_demo_1_update, st_unit_idle
   act_def_draw unit_draw, 0x84, 0
 
@@ -649,6 +652,9 @@ 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_def 1, 2, 3, 0, 0, 0, 1, 5  
+  act_inventory_empty
+  act_equipment_empty
+  act_effects_empty
   act_st_def NULL, NULL, st_unit_demo_1_update, st_unit_idle
   act_def_draw unit_draw, 0x84, 0
 
@@ -656,6 +662,9 @@ unit_demo_3:
   st_def 0x00, unit_demo_1_init, st_unit_idle
   act_def ACT_T_DEMO_1, 0, 4, 4, 0 
   act_stat_def 1, 2, 3, 0, 0, 0, 0, 5 
+  act_inventory_empty
+  act_equipment_empty
+  act_effects_empty
   act_st_def NULL, NULL, st_unit_demo_1_update, st_unit_idle
   act_def_draw unit_draw, 0x84, 0