diff options
author | Bad Diode <bd@badd10de.dev> | 2023-07-31 18:30:00 +0200 |
---|---|---|
committer | Bad Diode <bd@badd10de.dev> | 2023-07-31 18:30:00 +0200 |
commit | 0ec89c43671831ca491eadeca2cbfa52a53338d5 (patch) | |
tree | ff434ef11369321c49da7845f267222530adaa22 | |
parent | d3974d358b7e99484c70f5177b9640d5b1b46cd5 (diff) | |
download | stepper-0ec89c43671831ca491eadeca2cbfa52a53338d5.tar.gz stepper-0ec89c43671831ca491eadeca2cbfa52a53338d5.zip |
Add more waves to ch3 and make them flow better
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/assets.c | 13 | ||||
-rw-r--r-- | src/main.c | 12 |
3 files changed, 12 insertions, 15 deletions
@@ -27,7 +27,7 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS)) | |||
27 | INC_FLAGS += -I$(LIBGBA_SRC) | 27 | INC_FLAGS += -I$(LIBGBA_SRC) |
28 | 28 | ||
29 | # Output library names and executables. | 29 | # Output library names and executables. |
30 | TARGET := STEPPER-v1.6-dev-v3 | 30 | TARGET := STEPPER-v1.6-dev-rc |
31 | ELF := $(BUILD_DIR)/$(TARGET).elf | 31 | ELF := $(BUILD_DIR)/$(TARGET).elf |
32 | BIN := $(BUILD_DIR)/$(TARGET).gba | 32 | BIN := $(BUILD_DIR)/$(TARGET).gba |
33 | 33 | ||
diff --git a/src/assets.c b/src/assets.c index 2dfc89a..661d012 100644 --- a/src/assets.c +++ b/src/assets.c | |||
@@ -121,28 +121,21 @@ typedef u32 Wave[WAVE_VARS]; | |||
121 | static const Wave waves[][WAVE_VARS] = { | 121 | static const Wave waves[][WAVE_VARS] = { |
122 | { | 122 | { |
123 | {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, | 123 | {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, |
124 | {0xefcdab89, 0x98badcfe, 0x10325476, 0x67452301}, | ||
124 | {0xcadebc89, 0x87b9dcce, 0x02215376, 0x67230142}, | 125 | {0xcadebc89, 0x87b9dcce, 0x02215376, 0x67230142}, |
125 | {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, // triangle? | 126 | {0xa5ddbc89, 0x87badcad, 0x14214376, 0x46231184}, |
126 | {0xdbfede8b, 0x36013186, 0xdbfede8b, 0x36013186}, // don't love this | ||
127 | }, // Sine | 127 | }, // Sine |
128 | { | 128 | { |
129 | {0x33221100, 0x77665544, 0xbbaa9988, 0xffeeddcc}, | 129 | {0x33221100, 0x77665544, 0xbbaa9988, 0xffeeddcc}, |
130 | {0x33221100, 0x77665544, 0x56769888, 0xedcdab79}, | 130 | {0x33221100, 0x77665544, 0x56769888, 0xedcdab79}, |
131 | {0x52682401, 0xefbd7935, 0x894653c8, 0x6487a9ab}, | 131 | {0x52682401, 0xefbd7935, 0x894653c8, 0x6487a9ab}, |
132 | {0x67452301, 0xefcdab89, 0x67452301, 0xefcdab89}, | 132 | {0x72692501, 0xffce7935, 0x45231084, 0x52bc8967}, |
133 | // {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}, | ||
134 | // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, | ||
135 | // {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}, | ||
136 | }, // Saw | 133 | }, // Saw |
137 | { | 134 | { |
138 | {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}, | 135 | {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}, |
139 | {0xffff0000, 0xffffffff, 0x00000000, 0x00000000}, | 136 | {0xffff0000, 0xffffffff, 0x00000000, 0x00000000}, |
140 | {0x00000000, 0xffffffff, 0x00000000, 0x00000000}, | 137 | {0x00000000, 0xffffffff, 0x00000000, 0x00000000}, |
141 | {0x00000000, 0xffffffff, 0xffffffff, 0x0000ffff}, | 138 | {0x00000000, 0xffffffff, 0xffffffff, 0x0000ffff}, |
142 | {0xffffffff, 0xffffffff, 0x0000ffff, 0x00000000}, | ||
143 | // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, | ||
144 | // {0x67452301, 0xefcdab89, 0x67452301, 0xefcdab89}, | ||
145 | // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, | ||
146 | }, // Square | 139 | }, // Square |
147 | }; | 140 | }; |
148 | 141 | ||
@@ -38,12 +38,16 @@ WITH REGARD TO THIS SOFTWARE. | |||
38 | // - Add an envelope to ch3, would need to work with a timer in order to make | 38 | // - Add an envelope to ch3, would need to work with a timer in order to make |
39 | // it work I think. | 39 | // it work I think. |
40 | // - Sync via MIDI via arduinoboy or something similar. | 40 | // - Sync via MIDI via arduinoboy or something similar. |
41 | // - Per trig LFO? How would we go about this? There is at least one empty slot | ||
42 | // in all channels. LFO amount? LFO speed? Would need a dedicated page for | ||
43 | // configuring LFOs | ||
41 | // | 44 | // |
42 | // Bugfixes | 45 | // Bugfixes |
43 | // - Sound can get hung up sometimes, but I can't reproduce when this happens. | 46 | // + Sound can get hung up sometimes, but I can't reproduce when this happens. |
44 | // Not sure if this is an emulator thing or happens also in hardware. | 47 | // Not sure if this is an emulator thing or happens also in hardware. Seems |
45 | // - Cursor can stay in position instead of dissapering, again I can't | 48 | // to only happen on mGBA. After running for a time it just stops working, |
46 | // reproduce this right now, just happened randomly. Needs investigation. | 49 | // the sound returns after a while without issue. On `ares` or real hardware |
50 | // it works just fine. | ||
47 | // | 51 | // |
48 | 52 | ||
49 | #include "gba/gba.h" | 53 | #include "gba/gba.h" |