Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
29a5ad6c2b
17855
assets/songs/json/pokemon.json
Normal file
17855
assets/songs/json/pokemon.json
Normal file
File diff suppressed because it is too large
Load Diff
BIN
assets/sounds/snes_synth/snes_synth_048.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_048.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_049.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_049.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_050.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_050.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_051.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_051.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_052.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_052.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_053.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_053.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_054.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_054.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_055.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_055.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_056.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_056.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_057.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_057.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_058.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_058.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_059.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_059.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_060.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_060.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_061.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_061.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_062.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_062.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_063.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_063.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_064.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_064.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_065.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_065.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_066.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_066.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_067.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_067.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_068.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_068.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_069.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_069.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_070.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_070.wav
Normal file
Binary file not shown.
BIN
assets/sounds/snes_synth/snes_synth_071.wav
Normal file
BIN
assets/sounds/snes_synth/snes_synth_071.wav
Normal file
Binary file not shown.
@ -76,7 +76,7 @@ const Color INSTRUMENT_COLORS[MAX_INSTRUMENT_TYPES] = {
|
||||
};
|
||||
|
||||
const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_COUNT] {
|
||||
{ // Instrument 0
|
||||
{ // Instrument 0 - Bass
|
||||
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_026.wav", "assets/sounds/genesis_bass/genesis_bass_027.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_028.wav", "assets/sounds/genesis_bass/genesis_bass_029.wav",
|
||||
@ -90,19 +90,19 @@ const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_
|
||||
"assets/sounds/genesis_bass/genesis_bass_044.wav", "assets/sounds/genesis_bass/genesis_bass_045.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav"
|
||||
},
|
||||
{ // Instrument 1
|
||||
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_026.wav", "assets/sounds/genesis_bass/genesis_bass_027.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_028.wav", "assets/sounds/genesis_bass/genesis_bass_029.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_030.wav", "assets/sounds/genesis_bass/genesis_bass_031.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_032.wav", "assets/sounds/genesis_bass/genesis_bass_033.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_034.wav", "assets/sounds/genesis_bass/genesis_bass_035.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_036.wav", "assets/sounds/genesis_bass/genesis_bass_037.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_038.wav", "assets/sounds/genesis_bass/genesis_bass_039.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_040.wav", "assets/sounds/genesis_bass/genesis_bass_041.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_042.wav", "assets/sounds/genesis_bass/genesis_bass_043.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_044.wav", "assets/sounds/genesis_bass/genesis_bass_045.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav"
|
||||
{ // Instrument 1 - Synth
|
||||
"assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_050.wav", "assets/sounds/snes_synth/snes_synth_051.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_052.wav", "assets/sounds/snes_synth/snes_synth_053.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_054.wav", "assets/sounds/snes_synth/snes_synth_055.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_056.wav", "assets/sounds/snes_synth/snes_synth_057.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_058.wav", "assets/sounds/snes_synth/snes_synth_059.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_060.wav", "assets/sounds/snes_synth/snes_synth_061.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_062.wav", "assets/sounds/snes_synth/snes_synth_063.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_064.wav", "assets/sounds/snes_synth/snes_synth_065.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_066.wav", "assets/sounds/snes_synth/snes_synth_067.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_068.wav", "assets/sounds/snes_synth/snes_synth_069.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav"
|
||||
},
|
||||
{ // Instrument 2
|
||||
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav",
|
||||
@ -119,18 +119,18 @@ const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_
|
||||
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav"
|
||||
},
|
||||
{ // Instrument 3
|
||||
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_026.wav", "assets/sounds/genesis_bass/genesis_bass_027.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_028.wav", "assets/sounds/genesis_bass/genesis_bass_029.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_030.wav", "assets/sounds/genesis_bass/genesis_bass_031.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_032.wav", "assets/sounds/genesis_bass/genesis_bass_033.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_034.wav", "assets/sounds/genesis_bass/genesis_bass_035.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_036.wav", "assets/sounds/genesis_bass/genesis_bass_037.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_038.wav", "assets/sounds/genesis_bass/genesis_bass_039.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_040.wav", "assets/sounds/genesis_bass/genesis_bass_041.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_042.wav", "assets/sounds/genesis_bass/genesis_bass_043.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_044.wav", "assets/sounds/genesis_bass/genesis_bass_045.wav",
|
||||
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav"
|
||||
"assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_050.wav", "assets/sounds/snes_synth/snes_synth_051.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_052.wav", "assets/sounds/snes_synth/snes_synth_053.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_054.wav", "assets/sounds/snes_synth/snes_synth_055.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_056.wav", "assets/sounds/snes_synth/snes_synth_057.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_058.wav", "assets/sounds/snes_synth/snes_synth_059.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_060.wav", "assets/sounds/snes_synth/snes_synth_061.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_062.wav", "assets/sounds/snes_synth/snes_synth_063.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_064.wav", "assets/sounds/snes_synth/snes_synth_065.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_066.wav", "assets/sounds/snes_synth/snes_synth_067.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_068.wav", "assets/sounds/snes_synth/snes_synth_069.wav",
|
||||
"assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav"
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user