add nicer game-over music. make more room in rom0 by banking obj functions. dont spawn stuff on top of player.

src/main.c

@@ -68,6 +68,7 @@ static void highscore(uint8_t is_black) NONBANKED {
     }
 
     while (1) {
+        snd_play();
         key_read();
 
         if (key_pressed(J_A) || key_pressed(J_B)) {
@@ -88,6 +89,7 @@ static void about_screen(void) NONBANKED {
     SHOW_WIN;
 
     while (1) {
+        snd_play();
         key_read();
 
         if (key_pressed(J_A) || key_pressed(J_B) || key_pressed(J_SELECT)) {
@@ -312,6 +314,7 @@ static uint16_t ask_name(int32_t score) NONBANKED {
     DISPLAY_ON;
     enable_interrupts();
 
+    snd_music_off();
     snd_gameover_music();
 
     char name[3] = { 'a', 'a', 'a' };
@@ -319,6 +322,7 @@ static uint16_t ask_name(int32_t score) NONBANKED {
     win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
 
     while (1) {
+        snd_play();
         key_read();
 
         if (key_pressed(J_LEFT)) {

src/obj.c

@@ -17,7 +17,6 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include <gbdk/platform.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -63,7 +62,7 @@
 #define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)
 
 #define DAMAGE_RANGE (14 << POS_SCALE_OBJS)
-#define DAMAGE_INC 5
+#define DAMAGE_INC 4
 
 #define HEALTH_RANGE (12 << POS_SCALE_OBJS)
 #define HEALTH_INC HEALTH_MAX
@@ -91,12 +90,12 @@ struct obj {
 static struct obj objs[MAX_OBJ];
 static uint8_t obj_cnt[SPRITE_COUNT];
 
-void obj_init(void) NONBANKED {
+void obj_init(void) BANKED {
     memset(objs, 0, sizeof(objs));
     memset(obj_cnt, 0, sizeof(obj_cnt));
 }
 
-static uint8_t is_too_close(int8_t x, int8_t y, uint8_t n, int8_t *x_c, int8_t *y_c) NONBANKED {
+static uint8_t is_too_close(int8_t x, int8_t y, uint8_t n, int8_t *x_c, int8_t *y_c) {
     for (uint8_t i = 0; i < n; i++) {
         int dst_x = abs(x_c[i] - x);
         int dst_y = abs(y_c[i] - y);
@@ -107,7 +106,7 @@ static uint8_t is_too_close(int8_t x, int8_t y, uint8_t n, int8_t *x_c, int8_t *
     return 0;
 }
 
-static void generate_coords(uint8_t n, int8_t *x_c, int8_t *y_c) NONBANKED {
+static void generate_coords(uint8_t n, int8_t *x_c, int8_t *y_c) {
     int8_t x = 0;
     int8_t y = 0;
 
@@ -120,35 +119,35 @@ static void generate_coords(uint8_t n, int8_t *x_c, int8_t *y_c) NONBANKED {
     y_c[n] = y;
 }
 
-void obj_spawn(void) NONBANKED {
-    int8_t x_coords[MAX_DARK + MAX_LIGHT + MAX_SHOT_DARK + MAX_SHOT_LIGHT];
-    int8_t y_coords[MAX_DARK + MAX_LIGHT + MAX_SHOT_DARK + MAX_SHOT_LIGHT];
+void obj_spawn(void) BANKED {
+    int8_t x_coords[MAX_DARK + MAX_LIGHT + MAX_SHOT_DARK + MAX_SHOT_LIGHT + 1];
+    int8_t y_coords[MAX_DARK + MAX_LIGHT + MAX_SHOT_DARK + MAX_SHOT_LIGHT + 1];
     memset(x_coords, 0, sizeof(x_coords));
     memset(y_coords, 0, sizeof(y_coords));
 
     for (uint8_t i = 0; i < MAX_DARK; i++) {
-        uint8_t n = i;
+        uint8_t n = i + 1;
         generate_coords(n, x_coords, y_coords);
         obj_add(SPR_DARK, x_coords[n], y_coords[n], 0, 0);
     }
     for (uint8_t i = 0; i < MAX_LIGHT; i++) {
-        uint8_t n = MAX_DARK + i;
+        uint8_t n = MAX_DARK + i + 1;
         generate_coords(n, x_coords, y_coords);
         obj_add(SPR_LIGHT, x_coords[n], y_coords[n], 0, 0);
     }
     for (uint8_t i = 0; i < MAX_SHOT_DARK; i++) {
-        uint8_t n = MAX_DARK + MAX_LIGHT + i;
+        uint8_t n = MAX_DARK + MAX_LIGHT + i + 1;
         generate_coords(n, x_coords, y_coords);
         obj_add(SPR_SHOT_DARK, x_coords[n], y_coords[n], 0, 0);
     }
     for (uint8_t i = 0; i < MAX_SHOT_LIGHT; i++) {
-        uint8_t n = MAX_DARK + MAX_LIGHT + MAX_SHOT_LIGHT + i;
+        uint8_t n = MAX_DARK + MAX_LIGHT + MAX_SHOT_LIGHT + i + 1;
         generate_coords(n, x_coords, y_coords);
         obj_add(SPR_SHOT_LIGHT, x_coords[n], y_coords[n], 0, 0);
     }
 }
 
-enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_t spd_x, int16_t spd_y) NONBANKED {
+enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_t spd_x, int16_t spd_y) BANKED {
     uint8_t obj_cnt = 0xFF;
     for (uint8_t i = 0; i < MAX_OBJ; i++) {
         if (!objs[i].active) {
@@ -172,7 +171,7 @@ enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_
     return OBJ_ADDED;
 }
 
-int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *hiwater) NONBANKED {
+int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *hiwater) BANKED {
     int16_t damage = 0;
 
     // initial speed

src/obj.h

@@ -20,7 +20,9 @@
 #ifndef __OBJ_H__
 #define __OBJ_H__
 
+#include <gbdk/platform.h>
 #include <stdint.h>
+
 #include "sprites.h"
 
 enum OBJ_STATE {
@@ -28,9 +30,9 @@ enum OBJ_STATE {
     OBJ_LIST_FULL,
 };
 
-void obj_init(void);
-void obj_spawn(void);
-enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_t spd_x, int16_t spd_y);
-int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *hiwater);
+void obj_init(void) BANKED;
+void obj_spawn(void) BANKED;
+enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_t spd_x, int16_t spd_y) BANKED;
+int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *hiwater) BANKED;
 
 #endif // __OBJ_H__

src/sound.c

@@ -79,15 +79,18 @@ void snd_music_off(void) BANKED {
     play_note(SILENCE);
 }
 
+static void play_current_note(void) NONBANKED {
+    START_ROM_BANK(bank);
+        play_note(music->notes[off]);
+    END_ROM_BANK();
+}
+
 void snd_menu_music(void) BANKED {
     music = &music_menu;
     bank = BANK(sound_menu);
     off = 0;
     last_t = timer_get();
-
-    START_ROM_BANK(bank);
-        play_note(music->notes[off]);
-    END_ROM_BANK();
+    play_current_note();
 }
 
 void snd_game_music(void) BANKED {
@@ -95,10 +98,7 @@ void snd_game_music(void) BANKED {
     bank = BANK(sound_game);
     off = 0;
     last_t = timer_get();
-
-    START_ROM_BANK(bank);
-    play_note(music->notes[off]);
-    END_ROM_BANK();
+    play_current_note();
 }
 
 void snd_gameover_music(void) BANKED {
@@ -106,10 +106,7 @@ void snd_gameover_music(void) BANKED {
     bank = BANK(sound_over);
     off = 0;
     last_t = timer_get();
-
-    START_ROM_BANK(bank);
-    play_note(music->notes[off]);
-    END_ROM_BANK();
+    play_current_note();
 }
 
 void snd_play(void) NONBANKED {

src/sound.h

@@ -29,7 +29,55 @@ enum notes {
     C3, Cd3, D3, Dd3, E3, F3, Fd3, G3, Gd3, A3, Ad3, B3, // 36 .. 47
     C4, Cd4, D4, Dd4, E4, F4, Fd4, G4, Gd4, A4, Ad4, B4, // 48 .. 59
     C5, Cd5, D5, Dd5, E5, F5, Fd5, G5, Gd5, A5, Ad5, B5, // 60 .. 71
-    SILENCE, END                                         // 72 .. 73
+    SILENCE, END,                                        // 72 .. 73
+    SIL = SILENCE,
+
+    Db0 = Cd0,
+    Eb0 = Dd0, Ed0 = F0,
+    Fb0 = E0,
+    Gb0 = Fd0,
+    Ab0 = Gd0,
+    Bb0 = Ad0,
+
+    Cb1 = B0,
+    Db1 = Cd1,
+    Eb1 = Dd1, Ed1 = F1,
+    Fb1 = E1,
+    Gb1 = Fd1,
+    Ab1 = Gd1,
+    Bb1 = Ad1,
+
+    Cb2 = B1,
+    Db2 = Cd2,
+    Eb2 = Dd2, Ed2 = F2,
+    Fb2 = E2,
+    Gb2 = Fd2,
+    Ab2 = Gd2,
+    Bb2 = Ad2,
+
+    Cb3 = B2,
+    Db3 = Cd3,
+    Eb3 = Dd3, Ed3 = F3,
+    Fb3 = E3,
+    Gb3 = Fd3,
+    Ab3 = Gd3,
+    Bb3 = Ad3,
+
+    Cb4 = B3,
+    Db4 = Cd4,
+    Eb4 = Dd4, Ed4 = F4,
+    Fb4 = E4,
+    Gb4 = Fd4,
+    Ab4 = Gd4,
+    Bb4 = Ad4,
+
+    Cb5 = B4,
+    Db5 = Cd5,
+    Eb5 = Dd5, Ed5 = F5,
+    Fb5 = E5,
+    Gb5 = Fd5,
+    Ab5 = Gd5,
+    Bb5 = Ad5,
 };
 
 struct music {

src/sound_over.c

@@ -29,16 +29,86 @@
 BANKREF(sound_over)
 
 const enum notes over_music[] = {
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
-    G3, G3, F3, F3, E3, E3, D3, D3,
-    G3, G3, F3, F3, E3, E3, D3, D3,
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
-    SILENCE, SILENCE, END
+    // fanfare
+    /*
+     C3,  C3,  C3,  C3, Ab2, Ab2, Bb2, Bb2,
+     C3,  C3, SIL, Bb2,  C3,  C3, SIL, SIL,
+    */
+
+    // repeat
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+     A4,  C5,  A4,  F4,  A4,  A4,  A4,  C5,
+     A4,  F4,  A4, Bb4,  C5, Bb4,  A4,  F4,
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+    Ab4,  C5, Ab4,  E4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  E4, Ab4, Bb4,  C5, Bb4, Ab4,  E4,
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+     A4,  C5,  A4,  F4,  A4,  A4,  A4,  C5,
+     A4,  F4,  A4, Bb4,  C5, Bb4,  A4,  F4,
+
+    Bb4, Db5, Bb4, Gb4, Bb4, Bb4, Bb4, Db5,
+    Bb4, Gb4, Bb4,  C5, Db5,  C5, Bb4, Gb4,
+
+    Bb4, Db5, Bb4, Gb4, Bb4, Bb4, Bb4, Db5,
+    Bb4, Gb4, Bb4,  C5, Db5,  C5, Bb4, Gb4,
+
+    Bb4,  D5, Bb4,  G4, Bb4, Bb4, Bb4, D5,
+    Bb4,  G4, Bb4,  C5,  D5,  C5, Bb4, G4,
+
+    Bb4,  D5, Bb4,  G4, Bb4, Bb4, Bb4, D5,
+    Bb4,  G4, Bb4,  C5,  D5,  C5, Bb4, G4,
+
+    // repeat
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+    A4,  C5,  A4,  F4,  A4,  A4,  A4,  C5,
+    A4,  F4,  A4, Bb4,  C5, Bb4,  A4,  F4,
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+    Ab4,  C5, Ab4,  E4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  E4, Ab4, Bb4,  C5, Bb4, Ab4,  E4,
+
+    Ab4,  C5, Ab4,  F4, Ab4, Ab4, Ab4,  C5,
+    Ab4,  F4, Ab4, Bb4,  C5, Bb4, Ab4,  F4,
+
+    A4,  C5,  A4,  F4,  A4,  A4,  A4,  C5,
+    A4,  F4,  A4, Bb4,  C5, Bb4,  A4,  F4,
+
+    Bb4, Db5, Bb4, Gb4, Bb4, Bb4, Bb4, Db5,
+    Bb4, Gb4, Bb4,  C5, Db5,  C5, Bb4, Gb4,
+
+    Bb4, Db5, Bb4, Gb4, Bb4, Bb4, Bb4, Db5,
+    Bb4, Gb4, Bb4,  C5, Db5,  C5, Bb4, Gb4,
+
+    Bb4,  D5, Bb4,  G4, Bb4, Bb4, Bb4, D5,
+    Bb4,  G4, Bb4,  C5,  D5,  C5, Bb4, G4,
+
+    Bb4, Dd5, Bb4,  G4, Bb4, Bb4, Bb4, D5,
+    Bb4,  G4, Bb4,  C5,  D5,  C5, Bb4, G4,
+
+    // end
+
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    END
 };
 
 const struct music music_over = {
     .notes = over_music,
-    .duration = 200,
+    .duration = 120,
 };