units: removed p1 units. All units are now kept in the same table

diff --git a/src/defs.s b/src/defs.s
index 8f01034f211bf917d39ef1af5e9d6ebe4942f5e1..5ee62a5731b5eb9db3c545290f516fdfe77a07f9 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -9,7 +9,7 @@
 
 #define NULL 0
 
-#define UNITS_MAX 8
+#define UNITS_MAX 12
 
 #define STACK_BEGIN 0xDFFF
 
@@ -36,8 +36,6 @@
   ; each unit can have up to 4 status effects
 #define EFFECTS_MAX 4
 
-#define PLAYERS 2
-
   ; draw flags
 .se 1
 .de DRAWF_UPDATE_UI, 1

diff --git a/src/unit.s b/src/unit.s
index 8033a52accf08dc0570b3333dd494ff626492473..fd956c2728bafcd0c5a2f9d15190ca13aa6fd7a2 100644 (file)
--- a/src/unit.s
+++ b/src/unit.s
@@ -538,7 +538,7 @@ unit_next_no_current:
   ld [unit_next_best_act_ptr+1], a
 
   ld hl, p0_units 
-  ld b, UNITS_MAX * PLAYERS 
+  ld b, UNITS_MAX
 
   ; same as unit_next:
   ; inputs:
@@ -640,7 +640,7 @@ unit_next_no_current:
   ; resets all moves
   ; of all actors in p0 and p1_unts
 unit_reset_all_moves:
-  ld b, UNITS_MAX * PLAYERS 
+  ld b, UNITS_MAX 
   ld hl, p0_units
 @loop:
     push hl 

diff --git a/src/update.s b/src/update.s
index c3f4253101e9ec4b7929fa5037373a5b620f048b..b877ea699700ce7731f04abb5a3e4761cc95e00d 100644 (file)
--- a/src/update.s
+++ b/src/update.s
@@ -18,8 +18,6 @@ update_game:
 
   ld hl, p0_units
   call units_update
-  ld hl, p1_units
-  call units_update
 
   ld a, [gameplay_flags]
   and a, GPF_UNIT_NEXT
@@ -34,8 +32,6 @@ update_unit_placement:
   
   ld hl, p0_units
   call units_update
-  ld hl, p1_units
-  call units_update
 
   ldnull bc
   ret

diff --git a/src/wram.s b/src/wram.s
index d5a2a98c9e64dd723b4a0f90956772495a9e0b16..23e0c54378e1cd132eb5be750408cb43e867cdc6 100644 (file)
--- a/src/wram.s
+++ b/src/wram.s
@@ -87,16 +87,8 @@ scroll_move_x: .adv 1
 scroll_y: .adv 1
 scroll_x: .adv 1
 
-  ; resources
-
-  ; initiative resource
-  ; allows deployment or special moves
-r_p0_init: .adv 1
-r_p1_init: .adv 1
-
 ; units for p0 and p1
 p0_units: .adv act_size * UNITS_MAX 
-p1_units: .adv act_size * UNITS_MAX 
 
 state_cells: .adv c_size * MAP_SIZE
 state_cells_end: