summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2021-05-10 17:03:01 +0200
committerBad Diode <bd@badd10de.dev>2021-05-10 17:03:01 +0200
commitd1a218be717ed8840df234c4eabf2a5505df20ea (patch)
treed51ddc4a3a9b33a6bb599480a45457e9d2ac3592
parentd998dbb87c940030ba7a65143864f816b26a3b37 (diff)
downloadgba-experiments-d1a218be717ed8840df234c4eabf2a5505df20ea.tar.gz
gba-experiments-d1a218be717ed8840df234c4eabf2a5505df20ea.zip
Fix warnings
Diffstat
-rw-r--r--src/bitmap.h2
-rw-r--r--src/common.h4
-rw-r--r--src/sequencer.c66
-rw-r--r--src/text.h2
4 files changed, 37 insertions, 37 deletions
diff --git a/src/bitmap.h b/src/bitmap.h
index c839900..135ab75 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -152,7 +152,7 @@ clear_screen_m4() {
152 } 152 }
153} 153}
154 154
155static void 155static inline void
156draw_fill_rect_m4(int x0, int y0, int x1, int y1, u8 col_index, vu16 *buffer) { 156draw_fill_rect_m4(int x0, int y0, int x1, int y1, u8 col_index, vu16 *buffer) {
157 int ix, iy; 157 int ix, iy;
158 for(iy = y0; iy < y1; iy++) { 158 for(iy = y0; iy < y1; iy++) {
diff --git a/src/common.h b/src/common.h
index cf263db..aeea1a6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -147,7 +147,7 @@ typedef Color Scanline[SCREEN_WIDTH];
147#define PAL_BUFFER_SPRITES ((u16*)(MEM_PAL + 0x200)) 147#define PAL_BUFFER_SPRITES ((u16*)(MEM_PAL + 0x200))
148#define PAL_BANK_BG ((Palette*) MEM_PAL) 148#define PAL_BANK_BG ((Palette*) MEM_PAL)
149#define PAL_BANK_SPRITES ((Palette*)(MEM_PAL + 0x200)) 149#define PAL_BANK_SPRITES ((Palette*)(MEM_PAL + 0x200))
150static u16 *backbuffer = ((vu16*)(MEM_VRAM + 0x0A000)); 150static vu16 *backbuffer = ((vu16*)(MEM_VRAM + 0x0A000));
151 151
152// 152//
153// Sprites. 153// Sprites.
@@ -655,7 +655,7 @@ typedef enum {
655 NOTE_C_8 655 NOTE_C_8
656} Note; 656} Note;
657 657
658static char * note_names[] = { 658const char * note_names[] = {
659 "C2", "C#2", "D2", "D#2", "E2", "F2", "F#2", "G2", "G#2", "A2", "A#2", "B2", 659 "C2", "C#2", "D2", "D#2", "E2", "F2", "F#2", "G2", "G#2", "A2", "A#2", "B2",
660 "C3", "C#3", "D3", "D#3", "E3", "F3", "F#3", "G3", "G#3", "A3", "A#3", "B3", 660 "C3", "C#3", "D3", "D#3", "E3", "F3", "F#3", "G3", "G#3", "A3", "A#3", "B3",
661 "C4", "C#4", "D4", "D#4", "E4", "F4", "F#4", "G4", "G#4", "A4", "A#4", "B4", 661 "C4", "C#4", "D4", "D#4", "E4", "F4", "F#4", "G4", "G#4", "A4", "A#4", "B4",
diff --git a/src/sequencer.c b/src/sequencer.c
index dfb2850..da2711e 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -302,41 +302,41 @@ typedef struct SeqTrigger {
302static SeqTrigger sequences[3][16] = { 302static SeqTrigger sequences[3][16] = {
303 // Synth 1 303 // Synth 1
304 { 304 {
305 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 305 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
306 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 306 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
307 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 307 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
308 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 308 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
309 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 309 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
310 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 310 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
311 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 311 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
312 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 312 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
313 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 313 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
314 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 314 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
315 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 315 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
316 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 316 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
317 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 317 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
318 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 318 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
319 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 319 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
320 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, 320 {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
321 }, 321 },
322 // Synth 2 322 // Synth 2
323 { 323 {
324 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 324 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
325 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 325 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
326 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 326 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
327 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 327 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
328 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 328 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
329 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 329 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
330 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 330 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
331 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 331 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
332 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 332 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
333 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 333 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
334 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 334 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
335 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 335 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
336 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 336 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
337 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 337 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
338 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 338 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
339 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, 339 {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0},
340 }, 340 },
341 // Synth 3 341 // Synth 3
342 { 342 {
@@ -1324,7 +1324,7 @@ handle_sequencer_input(void) {
1324 u8 byte_number = param_selection_loc >> 1; 1324 u8 byte_number = param_selection_loc >> 1;
1325 u8 byte = sequences[2][trig_selection_loc].wave_a[byte_number]; 1325 u8 byte = sequences[2][trig_selection_loc].wave_a[byte_number];
1326 if (odd) { 1326 if (odd) {
1327 byte = (~0xF & byte) | (byte + increment) & 0xF; 1327 byte = (~0xF & byte) | ((byte + increment) & 0xF);
1328 } else { 1328 } else {
1329 byte = (0xF & byte) | (((byte >> 4) + increment) & 0xF) << 4; 1329 byte = (0xF & byte) | (((byte >> 4) + increment) & 0xF) << 4;
1330 } 1330 }
diff --git a/src/text.h b/src/text.h
index 9aa3fdd..3665760 100644
--- a/src/text.h
+++ b/src/text.h
@@ -84,7 +84,7 @@ txt_putc_m3(char c) {
84 text_engine.cursor_x = 0; 84 text_engine.cursor_x = 0;
85 text_engine.cursor_y += text_engine.font.char_height; 85 text_engine.cursor_y += text_engine.font.char_height;
86 } else { 86 } else {
87 u8 idx = text_engine.font.char_map[c] * 2; 87 u8 idx = text_engine.font.char_map[(int)c] * 2;
88 u32 *packed_char = text_engine.font.data; 88 u32 *packed_char = text_engine.font.data;
89 packed_char += idx; 89 packed_char += idx;
90 Tile tile = {0}; 90 Tile tile = {0};
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-27 03:57:02 +0000