also use a pre-calculated table for the movement speed limits

Makefile

@@ -31,7 +31,8 @@ OBJS := $(SRCS:%.c=$(BUILD_DIR)/%.o)
 GIT := $(BUILD_DIR)/$(DATA_DIR)/git.c
 OBJS += $(GIT:%.c=%.o)
 
-GEN_SRCS := $(BUILD_DIR)/$(DATA_DIR)/speed_table.c
+GEN_SRCS := $(BUILD_DIR)/$(DATA_DIR)/table_speed_shot.c
+GEN_SRCS += $(BUILD_DIR)/$(DATA_DIR)/table_speed_move.c
 OBJS += $(GEN_SRCS:%.c=%.o)
 
 IMAGES := $(wildcard $(DATA_DIR)/*.png)
@@ -103,10 +104,15 @@ $(GIT): $(DATA_DIR)/git.c
 	@echo Generating $@ from $<
 	@sed 's|GIT_VERSION|$(shell git describe --abbrev=7 --dirty --always --tags)|g' $< > $@
 
-$(GEN_SRCS): util/gen_angles.py
+$(BUILD_DIR)/$(DATA_DIR)/table_speed_shot.c $(BUILD_DIR)/$(DATA_DIR)/table_speed_shot.h: util/gen_angles.py Makefile
 	@mkdir -p $(@D)
 	@echo Generating $@
-	@util/gen_angles.py -n speed_table -d $(BUILD_DIR)/$(DATA_DIR) -s 16 -w 2 -f 0 -m 42 -t int8_t
+	@util/gen_angles.py -n table_speed_shot -d $(BUILD_DIR)/$(DATA_DIR) -s 16 -w 2 -f 0 -m 42 -t int8_t
+
+$(BUILD_DIR)/$(DATA_DIR)/table_speed_move.c $(BUILD_DIR)/$(DATA_DIR)/table_speed_move.h: util/gen_angles.py Makefile
+	@mkdir -p $(@D)
+	@echo Generating $@
+	@util/gen_angles.py -n table_speed_move -d $(BUILD_DIR)/$(DATA_DIR) -s 16 -w 2 -f 0 -m 23 -t int8_t
 
 usage: $(BUILD_DIR)/$(BIN)
 	@echo Analyzing $<
@@ -132,12 +138,12 @@ flash: $(BIN)
 	@echo Flashing $<
 	@$(FLASHER) $(FLASHFLAGS) $<
 
-$(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.wav util/cvtsample.py
+$(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.wav util/cvtsample.py Makefile
 	@mkdir -p $(@D)
 	@echo Converting sound $<
 	@util/cvtsample.py $< "(None)" GBDK $(BUILD_DIR)/$(DATA_DIR)
 
-$(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
+$(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png Makefile
 	@mkdir -p $(@D)
 	$(eval SPRFLAG = $(shell echo "$<" | sed -n 's/.*_spr\([0-9]\+\).*/\-sw \1 \-sh \1/p'))
 	$(eval FNTFLAG = $(shell echo "$<" | sed -n 's/.*_fnt\([0-9]\+\).*/\-sw \1 \-sh \1/p'))
@@ -161,23 +167,23 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 		$(PNGA) $< -o $@ -spr8x8                                                        \
 	)))))
 
-$(BUILD_DIR)/%.o: %.c $(ASSETS)
+$(BUILD_DIR)/%.o: %.c $(ASSETS) Makefile
 	@mkdir -p $(@D)
 	@echo Compiling Code $<
 	$(eval BAFLAG = $(shell echo "$<" | sed -n 's/.*\.ba\([0-9]\+\).*/\-Wf-ba\1/p'))
 	@$(LCC) $(LCCFLAGS) $(BAFLAG) -c -o $@ $<
 
-$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(ASSETS)
+$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(ASSETS) Makefile
 	@mkdir -p $(@D)
 	@echo Compiling Asset $<
 	@$(LCC) $(LCCFLAGS) -c -o $@ $<
 
-$(BUILD_DIR)/%.o: %.s $(ASSETS)
+$(BUILD_DIR)/%.o: %.s $(ASSETS) Makefile
 	@mkdir -p $(@D)
 	@echo Assembling $<
 	@$(LCC) $(LCCFLAGS) -c -o $@ $<
 
-$(BUILD_DIR)/$(BIN): $(OBJS) $(GIT)
+$(BUILD_DIR)/$(BIN): $(OBJS) $(GIT) Makefile
 	@echo Linking $@
 	@$(LCC) $(LCCFLAGS) -o $@ $(OBJS)
 

src/game.c

@@ -33,7 +33,8 @@
 #include "sample.h"
 #include "window.h"
 #include "multiplayer.h"
-#include "speed_table.h"
+#include "table_speed_shot.h"
+#include "table_speed_move.h"
 #include "game.h"
 
 #define BAR_OFFSET_X (4 - 80)
@@ -172,251 +173,62 @@ void game_set_mp_shot(struct mp_shot_state *state) NONBANKED {
     // TODO add shot
 }
 
-void handle_acceleration(void) BANKED {
-    switch (rot) {
-        case ROT_0:
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC) spd_y = -SPEED_MAX_ACC;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
-
-        case ROT_22_5:
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_D_HI) spd_y = -SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_D_LO) spd_x = SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
-
-        case ROT_45:
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y = -SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_DIAG) spd_x = SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
-
-        case ROT_67_5:
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_D_LO) spd_y = -SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_D_HI) spd_x = SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
+static void get_max_spd(int16_t *max_spd_x, int16_t *max_spd_y) NONBANKED {
+    START_ROM_BANK(BANK(table_speed_move)) {
+        *max_spd_x = table_speed_move[(rot * table_speed_move_WIDTH) + 0];
+        *max_spd_y = -table_speed_move[(rot * table_speed_move_WIDTH) + 1];
+    } END_ROM_BANK;
+}
 
-        case ROT_90:
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
+static void handle_acceleration(void) BANKED {
+    int16_t max_spd_x;
+    int16_t max_spd_y;
+    get_max_spd(&max_spd_x, &max_spd_y);
 
-        case ROT_112_5:
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_D_HI) spd_x = SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_D_LO) spd_y = SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
+    if (conf_get()->debug_flags & DBG_FAST) {
+        if (max_spd_x > 0) {
+            max_spd_x = SPEED_MAX_DBG;
+        } else if (max_spd_x < 0) {
+            max_spd_x = -SPEED_MAX_DBG;
+        }
 
-        case ROT_135:
-            spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_DIAG) spd_x = SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_DIAG) spd_y = SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
+        if (max_spd_y > 0) {
+            max_spd_y = SPEED_MAX_DBG;
+        } else if (max_spd_y < 0) {
+            max_spd_y = -SPEED_MAX_DBG;
+        }
+    }
 
-        case ROT_157_5:
+    if (max_spd_x != 0) {
+        if (max_spd_x > 0) {
             spd_x += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x > SPEED_MAX_ACC_D_LO) spd_x = SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_D_HI) spd_y = SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
+            if (spd_x > max_spd_x) {
+                spd_x = max_spd_x;
             }
-            acc |= ACC_Y;
-            break;
-
-        case ROT_180:
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
-
-        case ROT_202_5:
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_D_HI) spd_y = SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
+        } else {
             spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_D_LO) spd_x = -SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
+            if (spd_x < max_spd_x) {
+                spd_x = max_spd_x;
             }
-            acc |= ACC_X;
-            break;
+        }
 
-        case ROT_225:
-            spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_DIAG) spd_y = SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x = -SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
+        acc |= ACC_X;
+    }
 
-        case ROT_247_5:
+    if (max_spd_y != 0) {
+        if (max_spd_y > 0) {
             spd_y += SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y > SPEED_MAX_ACC_D_LO) spd_y = SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_D_HI) spd_x = -SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
+            if (spd_y > max_spd_y) {
+                spd_y = max_spd_y;
             }
-            acc |= ACC_X;
-            break;
-
-        case ROT_270:
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            break;
-
-        case ROT_292_5:
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_D_HI) spd_x = -SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_D_LO) spd_y = -SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
-
-        case ROT_315:
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x = -SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
+        } else {
             spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y = -SPEED_MAX_ACC_DIAG;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
+            if (spd_y < max_spd_y) {
+                spd_y = max_spd_y;
             }
-            acc |= ACC_Y;
-            break;
+        }
 
-        case ROT_337_5:
-            spd_x -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_x < -SPEED_MAX_ACC_D_LO) spd_x = -SPEED_MAX_ACC_D_LO;
-            } else {
-                if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_X;
-            spd_y -= SPEED_INC;
-            if (!(conf_get()->debug_flags & DBG_FAST)) {
-                if (spd_y < -SPEED_MAX_ACC_D_HI) spd_y = -SPEED_MAX_ACC_D_HI;
-            } else {
-                if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
-            }
-            acc |= ACC_Y;
-            break;
+        acc |= ACC_Y;
     }
 }
 
@@ -518,9 +330,9 @@ int32_t game(enum GAME_MODE mode) NONBANKED {
         if (key_pressed(J_B)) {
             int16_t shot_spd_x;
             int16_t shot_spd_y;
-            START_ROM_BANK(BANK(speed_table)) {
-                shot_spd_x = spd_x + speed_table[(rot * speed_table_WIDTH) + 0];
-                shot_spd_y = spd_y - speed_table[(rot * speed_table_WIDTH) + 1];
+            START_ROM_BANK(BANK(table_speed_shot)) {
+                shot_spd_x = spd_x + table_speed_shot[(rot * table_speed_shot_WIDTH) + 0];
+                shot_spd_y = spd_y - table_speed_shot[(rot * table_speed_shot_WIDTH) + 1];
             } END_ROM_BANK;
 
             // TODO ugly hard-coded offsets?!

src/main.c

@@ -40,7 +40,7 @@
 #include "window.h"
 #include "gbprinter.h"
 #include "multiplayer.h"
-#include "speed_table.h"
+#include "table_speed_shot.h"
 #include "main.h"
 
 uint8_t debug_menu_index = 0;
@@ -260,10 +260,10 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
     switch (anim_state) {
         case 1:
             if (anim_frame == 0) {
-                START_ROM_BANK(BANK(speed_table)) {
+                START_ROM_BANK(BANK(table_speed_shot)) {
                     obj_add(SPR_SHOT, SHIP_OFF, -42,
-                            speed_table[(ROT_90 * speed_table_WIDTH) + 0],
-                            -speed_table[(ROT_90 * speed_table_WIDTH) + 1]);
+                            table_speed_shot[(ROT_90 * table_speed_shot_WIDTH) + 0],
+                            -table_speed_shot[(ROT_90 * table_speed_shot_WIDTH) + 1]);
                 } END_ROM_BANK;
                 sample_play(SFX_SHOT);
             }
@@ -295,10 +295,10 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
 
         case 7:
             if (anim_frame == 0) {
-                START_ROM_BANK(BANK(speed_table)) {
+                START_ROM_BANK(BANK(table_speed_shot)) {
                     obj_add(SPR_SHOT, -SHIP_OFF, -42,
-                            speed_table[(ROT_270 * speed_table_WIDTH) + 0],
-                            -speed_table[(ROT_270 * speed_table_WIDTH) + 1]);
+                            table_speed_shot[(ROT_270 * table_speed_shot_WIDTH) + 0],
+                            -table_speed_shot[(ROT_270 * table_speed_shot_WIDTH) + 1]);
                 } END_ROM_BANK;
                 sample_play(SFX_SHOT);
             }