From 13c3336502879b2db9c0d8b154dc1984fdbf1a56 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Fri, 30 May 2025 14:51:32 +0200 Subject: [PATCH] defs: Added placeholder macros for unit inventory equipment and effects --- src/defs.s | 3 +++ src/macros.inc | 26 ++++++++++++++++++++++++++ src/unit.s | 9 +++++++++ 3 files changed, 38 insertions(+) diff --git a/src/defs.s b/src/defs.s index b376e70..e697a62 100644 --- 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 8961abf..1435e88 100644 --- 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 7727d24..5fbc10e 100644 --- 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 -- 2.30.2