start working on 8-way movement

Makefile

@@ -37,6 +37,7 @@ PNGA := $(GBDK_HOME)/bin/png2asset
 ROMU := $(GBDK_HOME)/bin/romusage
 GB_EMU := gearboy
 SGB_EMU := sameboy
+FLASHER := flashgbx
 
 LCCFLAGS := -Wa-l -Wl-m -Wp-MMD -Wf--opt-code-speed
 LCCFLAGS += -I$(BUILD_DIR)/$(DATA_DIR)
@@ -53,13 +54,15 @@ else
 	BUILD_TYPE = Release
 endif
 
+FLASHFLAGS := --mode dmg --action flash-rom
+
 $(info BUILD_TYPE is $(BUILD_TYPE))
 
 # TODO this is not working. why?!
 #DEPS=$(OBJS:%.o=%.d)
 #-include $(DEPS)
 
-.PHONY: all run sgb_run clean compile_commands.json usage
+.PHONY: all run sgb_run flash clean compile_commands.json usage
 .PRECIOUS: $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h
 
 all: $(BIN)
@@ -85,6 +88,10 @@ sgb_run: $(BIN)
 	@echo Emulating $<
 	@$(SGB_EMU) $(BIN)
 
+flash: $(BIN)
+	@echo Flasing $<
+	$(FLASHER) $(FLASHFLAGS) $<
+
 $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	@mkdir -p $(@D)
 	$(if $(findstring _map,$<),                                                             \
@@ -99,13 +106,16 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	,$(if $(findstring _spr16,$<),                                                          \
 		@echo "Converting 16x16 sprite $<" &&                                           \
 		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -noflip                                  \
+	,$(if $(findstring _spr24,$<),                                                          \
+		@echo "Converting 24x24 sprite $<" &&                                           \
+		$(PNGA) $< -o $@ -spr8x8 -sw 24 -sh 24 -noflip                                  \
 	,$(if $(findstring _sgb,$<),                                                            \
 		@echo "Converting sgb border $<" &&                                             \
 		$(PNGA) $< -o $@ -map -bpp 4 -max_palettes 4 -pack_mode sgb -use_map_attributes \
 	,                                                                                       \
 		@echo "Converting tile $<" &&                                                   \
 		$(PNGA) $< -o $@ -spr8x8                                                        \
-	)))))
+	))))))
 
 $(BUILD_DIR)/%.o: %.c $(SPRITES)
 	@mkdir -p $(@D)

src/game.c

@@ -152,24 +152,60 @@ int32_t game(void) NONBANKED {
                     acc |= ACC_Y;
                     break;
 
+                case ROT_45:
+                    spd_y -= SPEED_INC;
+                    if (spd_y < -SPEED_MAX_ACC) spd_y = -SPEED_MAX_ACC;
+                    acc |= ACC_Y;
+                    spd_x += SPEED_INC;
+                    if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
+                    acc |= ACC_X;
+                    break;
+
                 case ROT_90:
                     spd_x += SPEED_INC;
                     if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
                     acc |= ACC_X;
                     break;
 
+                case ROT_135:
+                    spd_x += SPEED_INC;
+                    if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
+                    acc |= ACC_X;
+                    spd_y += SPEED_INC;
+                    if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
+                    acc |= ACC_Y;
+                    break;
+
                 case ROT_180:
                     spd_y += SPEED_INC;
                     if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
                     acc |= ACC_Y;
                     break;
 
+                case ROT_225:
+                    spd_y += SPEED_INC;
+                    if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
+                    acc |= ACC_Y;
+                    spd_x -= SPEED_INC;
+                    if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
+                    acc |= ACC_X;
+                    break;
+
                 case ROT_270:
                     spd_x -= SPEED_INC;
                     if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
                     acc |= ACC_X;
                     break;
 
+                case ROT_315:
+                    spd_x -= SPEED_INC;
+                    if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
+                    acc |= ACC_X;
+                    spd_y -= SPEED_INC;
+                    if (spd_y < -SPEED_MAX_ACC) spd_y = -SPEED_MAX_ACC;
+                    acc |= ACC_Y;
+                    break;
+
                 default:
                     break;
             }
@@ -224,18 +260,34 @@ int32_t game(void) NONBANKED {
                     ret = obj_add(SPR_SHOT, 0, -SHIP_OFF, spd_x, spd_y - SHOT_SPEED);
                     break;
 
+                case ROT_45:
+                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2, -SHIP_OFF / 2, spd_x + SHOT_SPEED, spd_y - SHOT_SPEED);
+                    break;
+
                 case ROT_90:
                     ret = obj_add(SPR_SHOT, SHIP_OFF, 0, spd_x + SHOT_SPEED, spd_y);
                     break;
 
+                case ROT_135:
+                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2, SHIP_OFF / 2, spd_x + SHOT_SPEED, spd_y + SHOT_SPEED);
+                    break;
+
                 case ROT_180:
                     ret = obj_add(SPR_SHOT, 0, SHIP_OFF, spd_x, spd_y + SHOT_SPEED);
                     break;
 
+                case ROT_225:
+                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2, SHIP_OFF / 2, spd_x - SHOT_SPEED, spd_y + SHOT_SPEED);
+                    break;
+
                 case ROT_270:
                     ret = obj_add(SPR_SHOT, -SHIP_OFF, 0, spd_x - SHOT_SPEED, spd_y);
                     break;
 
+                case ROT_315:
+                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2, -SHIP_OFF / 2, spd_x - SHOT_SPEED, spd_y - SHOT_SPEED);
+                    break;
+
                 default:
                     break;
             }

src/sprite_data.c

@@ -22,10 +22,7 @@
 
 #include "sprite_data.h"
 
-#include "rockshp_0.h"
-#include "rockshp_90.h"
-#include "thrust_0.h"
-#include "thrust_90.h"
+#include "rockshp_spr24.h"
 #include "light.h"
 #include "dark.h"
 #include "shoot.h"
@@ -40,49 +37,16 @@ const palette_color_t power_palettes[4] = {
 };
 
 struct sprites metasprites[SPRITE_COUNT] = {
-    { // SPR_SHIP_0
-        .ms = rockshp_0_metasprites,
-        .ms_n = ARR_LEN(rockshp_0_metasprites),
-        .ti = rockshp_0_tiles,
-        .pa = rockshp_0_palettes,
-        .pa_n = rockshp_0_PALETTE_COUNT,
+    { // SPR_SHIP
+        .ms = rockshp_spr24_metasprites,
+        .ms_n = ARR_LEN(rockshp_spr24_metasprites),
+        .ti = rockshp_spr24_tiles,
+        .pa = rockshp_spr24_palettes,
+        .pa_n = rockshp_spr24_PALETTE_COUNT,
         .pa_i = OAMF_CGB_PAL0,
-        .cnt = rockshp_0_TILE_COUNT,
+        .cnt = rockshp_spr24_TILE_COUNT,
         .off = TILE_NUM_START,
-        .bank = BANK(rockshp_0),
-    },
-    { // SPR_SHIP_90
-        .ms = rockshp_90_metasprites,
-        .ms_n = ARR_LEN(rockshp_90_metasprites),
-        .ti = rockshp_90_tiles,
-        .pa = NULL,
-        .pa_n = rockshp_90_PALETTE_COUNT,
-        .pa_i = OAMF_CGB_PAL0,
-        .cnt = rockshp_90_TILE_COUNT,
-        .off = TILE_NUM_START,
-        .bank = BANK(rockshp_90),
-    },
-    { // SPR_THRUST_0
-        .ms = thrust_0_metasprites,
-        .ms_n = ARR_LEN(thrust_0_metasprites),
-        .ti = thrust_0_tiles,
-        .pa = thrust_0_palettes,
-        .pa_n = thrust_0_PALETTE_COUNT,
-        .pa_i = OAMF_CGB_PAL1,
-        .cnt = thrust_0_TILE_COUNT,
-        .off = TILE_NUM_START,
-        .bank = BANK(thrust_0),
-    },
-    { // SPR_THRUST_90
-        .ms = thrust_90_metasprites,
-        .ms_n = ARR_LEN(thrust_90_metasprites),
-        .ti = thrust_90_tiles,
-        .pa = NULL,
-        .pa_n = thrust_90_PALETTE_COUNT,
-        .pa_i = OAMF_CGB_PAL1,
-        .cnt = thrust_90_TILE_COUNT,
-        .off = TILE_NUM_START,
-        .bank = BANK(thrust_90),
+        .bank = BANK(rockshp_spr24),
     },
     { // SPR_LIGHT
         .ms = light_metasprites,

src/sprites.c

@@ -109,31 +109,35 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip,
 void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater) NONBANKED {
     switch (rot) {
         case ROT_0:
-            spr_draw(SPR_SHIP_0, FLIP_NONE, 0, 0, 0, hiwater);
-            if (moving) {
-                spr_draw(SPR_THRUST_0, FLIP_NONE, 0, SHIP_OFF, 0, hiwater);
-            }
+            spr_draw(SPR_SHIP, FLIP_NONE, 0, 4, moving ? 1 : 0, hiwater);
+            break;
+
+        case ROT_45:
+            spr_draw(SPR_SHIP, FLIP_NONE, -4, 0, moving ? 3 : 2, hiwater);
             break;
 
         case ROT_90:
-            spr_draw(SPR_SHIP_90, FLIP_NONE, 0, 0, 0, hiwater);
-            if (moving) {
-                spr_draw(SPR_THRUST_90, FLIP_NONE, -SHIP_OFF, 0, 0, hiwater);
-            }
+            spr_draw(SPR_SHIP, FLIP_NONE, -4, 0, moving ? 5 : 4, hiwater);
+            break;
+
+        case ROT_135:
+            spr_draw(SPR_SHIP, FLIP_Y, -4, 0, moving ? 3 : 2, hiwater);
             break;
 
         case ROT_180:
-            spr_draw(SPR_SHIP_0, FLIP_Y, 0, 0, 0, hiwater);
-            if (moving) {
-                spr_draw(SPR_THRUST_0, FLIP_Y, 0, -SHIP_OFF, 0, hiwater);
-            }
+            spr_draw(SPR_SHIP, FLIP_Y, 0, -4, moving ? 1 : 0, hiwater);
+            break;
+
+        case ROT_225:
+            spr_draw(SPR_SHIP, FLIP_XY, 4, 0, moving ? 3 : 2, hiwater);
             break;
 
         case ROT_270:
-            spr_draw(SPR_SHIP_90, FLIP_X, 0, 0, 0, hiwater);
-            if (moving) {
-                spr_draw(SPR_THRUST_90, FLIP_X, SHIP_OFF, 0, 0, hiwater);
-            }
+            spr_draw(SPR_SHIP, FLIP_X, 4, 0, moving ? 5 : 4, hiwater);
+            break;
+
+        case ROT_315:
+            spr_draw(SPR_SHIP, FLIP_X, 4, 0, moving ? 3 : 2, hiwater);
             break;
 
         default:

src/sprites.h

@@ -26,10 +26,7 @@
 #define SHIP_OFF (8 + 4)
 
 enum SPRITES {
-    SPR_SHIP_0 = 0,
-    SPR_SHIP_90,
-    SPR_THRUST_0,
-    SPR_THRUST_90,
+    SPR_SHIP = 0,
     SPR_LIGHT,
     SPR_DARK,
     SPR_SHOT,
@@ -51,9 +48,13 @@ enum SPRITE_FLIP {
 
 enum SPRITE_ROT {
     ROT_0 = 0,
+    ROT_45,
     ROT_90,
+    ROT_135,
     ROT_180,
+    ROT_225,
     ROT_270,
+    ROT_315,
 
     ROT_INVALID
 };