From 39a1f32cf8cb8513cf99f4b4ad014406cd5475fa Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 7 Sep 2025 06:11:14 +0200 Subject: [PATCH] action: moved more functions to attack.s --- src/action.s | 25 ------------------------- src/attack.s | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/action.s b/src/action.s index 1cbd4bb..3a2fc10 100644 --- a/src/action.s +++ b/src/action.s @@ -35,31 +35,6 @@ unit_handle_assigned_action: ld c, a ret - ; picks a direction for an attack - ; inputs: - ; de: unit - ; returns: - ; bc: next action -unit_action_attack_pick_direction_init: - ; draw question to status line - ld hl, STR_ATTACK_DIRECTION - ld de, UI_STATUS_LINE - call puts - - call ui_request_redraw - - ldnull bc - ret - - ; reads player direction inputs to pick a direction - ; inputs: - ; de: unit - ; returns: - ; bc: next action -unit_action_attack_pick_direction: - ld bc, st_action_attack_damage_actor - jp unit_action_pick_direction - ; generic direction picker ; press B to abort ; press keyopad to pick direction diff --git a/src/attack.s b/src/attack.s index 18acade..a5a03c8 100644 --- a/src/attack.s +++ b/src/attack.s @@ -1,5 +1,30 @@ ; melee attack action + + ; picks a direction for an attack + ; inputs: + ; de: unit + ; returns: + ; bc: next action +unit_action_attack_pick_direction_init: + ; draw question to status line + ld hl, STR_ATTACK_DIRECTION + ld de, UI_STATUS_LINE + call puts + + call ui_request_redraw + + ldnull bc + ret + + ; reads player direction inputs to pick a direction + ; inputs: + ; de: unit + ; returns: + ; bc: next action +unit_action_attack_pick_direction: + ld bc, st_action_attack_damage_actor + jp unit_action_pick_direction ; performs an attack ; based on the units rt_action tmp value -- 2.30.2