move defines from header to the sources where they are used

src/game.c

@@ -32,17 +32,33 @@
 #include "main.h"
 #include "game.h"
 
+#define BAR_OFFSET_X (4 - 80)
+#define HEALTH_OFFSET_Y -16
+#define POWER_OFFSET_Y 16
+#define PAUSE_BLINK_FRAMES 32
+
+#define SPEED_INC 1
+#define SPEED_DEC 1
+
+#define SPEED_MAX_ACC 23
+#define SPEED_MAX_ACC_DIAG 16
+#define SPEED_MAX_IDLE 16
+
+#define POS_SCALE_BG 6
+#define POS_MASK_BG 0x3FFF
+
+#define POWER_MAX 0x1FF
+#define POWER_SHIFT 1
+
+#define POWER_INC 2
+#define POWER_DEC 4
+
 enum ACCELERATION {
     ACC_X = 1,
     ACC_Y = 2,
     ACC_R = 4,
 };
 
-#define BAR_OFFSET_X (4 - 80)
-#define HEALTH_OFFSET_Y -16
-#define POWER_OFFSET_Y 16
-#define PAUSE_BLINK_FRAMES 32
-
 static uint8_t pause_screen(void) NONBANKED {
     uint8_t n = 0;
 

src/game.h

@@ -22,26 +22,6 @@
 
 #include <stdint.h>
 
-#define SPEED_INC 1
-#define SPEED_DEC 1
-
-#define SPEED_MAX_ACC 23
-#define SPEED_MAX_ACC_DIAG 16
-#define SPEED_MAX_IDLE 16
-
-#define POS_SCALE_OBJS 5
-#define POS_OBJS_MAX (INT16_MAX >> (8 - POS_SCALE_OBJS))
-#define POS_OBJS_MIN (-(INT16_MAX >> (8 - POS_SCALE_OBJS)) - 1)
-
-#define POS_SCALE_BG 6
-#define POS_MASK_BG 0x3FFF
-
-#define POWER_MAX 0x1FF
-#define POWER_SHIFT 1
-
-#define POWER_INC 2
-#define POWER_DEC 4
-
 #define HEALTH_MAX 0x1FF
 #define HEALTH_SHIFT 1
 

src/obj.c

@@ -28,34 +28,37 @@
 #include "obj.h"
 
 /*
- * sprite budget: TODO
+ * sprite budget:
  *
  * fixed:
- * ship: 4 + 5
- * thruster: 1 - 1
- * health: 4
- * power: 4
- * --> 17 fixed
+ * status bars: 8
+ * ship: 5
+ * thruster: 1
+ * --> 14 fixed
  *
- * hardware tiles: 40 - 13 = 27 - 4 = 23
+ * hardware tiles: 40 - 14 = 26
  *
  * dynamic:
  * shot: 1
  * light: 4
  * dark: 4
  * --> 2x dark & 2x light = 16
- * --> 5x shot & 6x small = 11
- * --> 16 + 11 = 27
+ * --> 5x shot & 4x small = 9
+ * --> 16 + 9 = 25
  */
 #define MAX_DARK 2
 #define MAX_LIGHT 2
 #define MAX_SHOT 5
-#define MAX_SHOT_DARK 3
-#define MAX_SHOT_LIGHT 3
+#define MAX_SHOT_DARK 2
+#define MAX_SHOT_LIGHT 2
 #define MAX_OBJ ((4 * MAX_DARK) + (4 * MAX_LIGHT) + MAX_SHOT + MAX_SHOT_DARK + MAX_SHOT_LIGHT)
 
 #define MAX_TRAVEL 128
 
+#define POS_SCALE_OBJS 5
+#define POS_OBJS_MAX (INT16_MAX >> (8 - POS_SCALE_OBJS))
+#define POS_OBJS_MIN (-(INT16_MAX >> (8 - POS_SCALE_OBJS)) - 1)
+
 #define GRAVITY_RANGE (24 << POS_SCALE_OBJS)
 #define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)