action: moved more functions to attack.s

diff --git a/src/action.s b/src/action.s
index 1cbd4bb48901b6c9e59be867bf03ec4336d69e34..3a2fc10e79c6fe63f92405205c2a794e483d2818 100644 (file)
--- 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 18acade949ef44d79229cc964e21fb740dc48d23..a5a03c8a4a20549e7831d61772dc42c73c513ce3 100644 (file)
--- 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