diff options
| -rw-r--r-- | src/Companion.cpp | 50 | ||||
| -rw-r--r-- | src/audio/AudioManager.cpp | 27 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 2 | ||||
| -rw-r--r-- | src/audio/samples_table.h | 1371 | ||||
| -rw-r--r-- | src/factories/AudioHeaderFactory.cpp | 1 | ||||
| -rw-r--r-- | src/factories/BankFactory.cpp | 80 | ||||
| -rw-r--r-- | src/factories/BankFactory.h | 5 |
7 files changed, 109 insertions, 1427 deletions
diff --git a/src/Companion.cpp b/src/Companion.cpp index ae568ef..e7f259f 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -253,6 +253,7 @@ void Companion::Process() { SPDLOG_INFO("Hash: {}", this->gCartridge->GetHash()); SPDLOG_INFO("Assets: {}", path); + AudioManager::Instance = new AudioManager(); auto wrapper = this->gConfig.exporterType == ExportType::Binary ? new SWrapper(this->gConfig.outputPath) : nullptr; auto vWriter = LUS::BinaryWriter(); @@ -277,15 +278,52 @@ void Companion::Process() { for(auto asset = root.begin(); asset != root.end(); ++asset){ auto node = asset->second; + auto entryName = asset->first.as<std::string>(); - if(!asset->second["offset"]) { - continue; - } + // Parse horizontal assets + if(node["files"]){ + auto segment = node["segment"] ? node["segment"].as<uint8_t>() : -1; + const auto files = node["files"]; + for (const auto& file : files) { + auto assetNode = file.as<YAML::Node>(); + auto childName = assetNode["name"].as<std::string>(); + auto output = (this->gCurrentDirectory / entryName / childName).string(); + std::replace(output.begin(), output.end(), '\\', '/'); - auto output = (this->gCurrentDirectory / asset->first.as<std::string>()).string(); - std::replace(output.begin(), output.end(), '\\', '/'); + if(assetNode["type"]){ + const auto type = GetSafeNode<std::string>(assetNode, "type"); + if(type == "SAMPLE"){ + AudioManager::Instance->bind_sample(assetNode, output); + } + } + + if(!assetNode["offset"]) { + continue; + } - this->gAddrMap[this->gCurrentFile][node["offset"].as<uint32_t>()] = std::make_tuple(output, node); + if(segment != -1) { + assetNode["offset"] = (segment << 24) | assetNode["offset"].as<uint32_t>(); + } + + this->gAddrMap[this->gCurrentFile][assetNode["offset"].as<uint32_t>()] = std::make_tuple(output, assetNode); + } + } else { + auto output = (this->gCurrentDirectory / entryName).string(); + std::replace(output.begin(), output.end(), '\\', '/'); + + if(node["type"]){ + const auto type = GetSafeNode<std::string>(node, "type"); + if(type == "SAMPLE"){ + AudioManager::Instance->bind_sample(node, output); + } + } + + if(!node["offset"]) { + continue; + } + + this->gAddrMap[this->gCurrentFile][node["offset"].as<uint32_t>()] = std::make_tuple(output, node); + } } // Stupid hack because the iteration broke the assets diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 9120281..c4b612c 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -6,6 +6,8 @@ #include <filesystem> #include <cassert> #include <cstring> +#include <factories/BaseFactory.h> + #include "hj/zip.h" #include "hj/pyutils.h" #include "spdlog/spdlog.h" @@ -13,6 +15,7 @@ #include "spdlog/spdlog.h" std::unordered_map<std::string, uint32_t> name_table; +std::unordered_map<uint32_t, std::string> sample_table; AudioManager* AudioManager::Instance; std::vector<uint32_t> PyUtils::range(uint32_t start, uint32_t end) { @@ -606,14 +609,14 @@ void AudioManager::write_aifc(AudioBankSample* entry, LUS::BinaryWriter &out) { if(entry->loop.count != 0){ START_CUSTOM_SECTION("\x0bVADPCMLOOPS") uint16_t one = BSWAP16(1); - tmp.Write((char*) &one, 2); - tmp.Write((char*) &one, 2); - tmp.Write((uint32_t) entry->loop.start); - tmp.Write((uint32_t) entry->loop.end); - tmp.Write((int32_t) entry->loop.count); + tmp.Write(reinterpret_cast<char*>(&one), 2); + tmp.Write(reinterpret_cast<char*>(&one), 2); + tmp.Write(entry->loop.start); + tmp.Write(entry->loop.end); + tmp.Write(entry->loop.count); for(size_t i = 0; i < 16; i++){ int16_t loop = BSWAP16(entry->loop.state.value()[i]); - tmp.Write((char*) &loop, 2); + tmp.Write(reinterpret_cast<char*>(&loop), 2); } END_SECTION(); } @@ -624,6 +627,18 @@ void AudioManager::write_aifc(AudioBankSample* entry, LUS::BinaryWriter &out) { } +void AudioManager::bind_sample(YAML::Node& node, const std::string& path){ + auto id = GetSafeNode<uint32_t>(node, "id"); + sample_table[id] = path; +} + +std::string& AudioManager::get_sample(uint32_t id) { + if(!sample_table.contains(id)) { + throw std::runtime_error("Failed to find sample with id " + std::to_string(id)); + } + return sample_table[id]; +} + void AudioManager::create_aifc(int32_t index, LUS::BinaryWriter &out) { int32_t idx = -1; for(auto &sample_bank : this->loaded_tbl.banks){ diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index dfe662f..b5a9dcc 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -138,7 +138,9 @@ class AudioManager { public: static AudioManager* Instance; void initialize(std::vector<uint8_t>& buffer, YAML::Node& data); + void bind_sample(YAML::Node& node, const std::string& path); void create_aifc(int32_t index, LUS::BinaryWriter& writer); + std::string& get_sample(uint32_t id); AudioBankSample get_aifc(int32_t index); std::map<uint32_t, Bank> get_banks(); uint32_t get_index(AudioBankSample* bank); diff --git a/src/audio/samples_table.h b/src/audio/samples_table.h deleted file mode 100644 index 417450e..0000000 --- a/src/audio/samples_table.h +++ /dev/null @@ -1,1371 +0,0 @@ -#pragma once - -#if defined(_WIN32) -#define ALIGN_ASSET(x) __declspec(align(x)) -#else -#define ALIGN_ASSET(x) __attribute__((aligned (x))) -#endif - -#define dgUSSample00 "__OTR__sound/samples/sfx_1/00_twirl" -static const ALIGN_ASSET(2) char gUSSample00[] = dgUSSample00; - -#define dgUSSample01 "__OTR__sound/samples/sfx_1/01_brushing" -static const ALIGN_ASSET(2) char gUSSample01[] = dgUSSample01; - -#define dgUSSample02 "__OTR__sound/samples/sfx_1/02_hand_touch" -static const ALIGN_ASSET(2) char gUSSample02[] = dgUSSample02; - -#define dgUSSample03 "__OTR__sound/samples/sfx_1/03_yoshi" -static const ALIGN_ASSET(2) char gUSSample03[] = dgUSSample03; - -#define dgUSSample04 "__OTR__sound/samples/sfx_1/04_plop" -static const ALIGN_ASSET(2) char gUSSample04[] = dgUSSample04; - -#define dgUSSample05 "__OTR__sound/samples/sfx_1/05_heavy_landing" -static const ALIGN_ASSET(2) char gUSSample05[] = dgUSSample05; - -#define dgUSSample06 "__OTR__sound/samples/sfx_terrain/00_step_default" -static const ALIGN_ASSET(2) char gUSSample06[] = dgUSSample06; - -#define dgUSSample07 "__OTR__sound/samples/sfx_terrain/01_step_grass" -static const ALIGN_ASSET(2) char gUSSample07[] = dgUSSample07; - -#define dgUSSample08 "__OTR__sound/samples/sfx_terrain/02_step_stone" -static const ALIGN_ASSET(2) char gUSSample08[] = dgUSSample08; - -#define dgUSSample09 "__OTR__sound/samples/sfx_terrain/03_step_spooky" -static const ALIGN_ASSET(2) char gUSSample09[] = dgUSSample09; - -#define dgUSSample0A "__OTR__sound/samples/sfx_terrain/04_step_snow" -static const ALIGN_ASSET(2) char gUSSample0A[] = dgUSSample0A; - -#define dgUSSample0B "__OTR__sound/samples/sfx_terrain/05_step_ice" -static const ALIGN_ASSET(2) char gUSSample0B[] = dgUSSample0B; - -#define dgUSSample0C "__OTR__sound/samples/sfx_terrain/06_step_metal" -static const ALIGN_ASSET(2) char gUSSample0C[] = dgUSSample0C; - -#define dgUSSample0D "__OTR__sound/samples/sfx_terrain/07_step_sand" -static const ALIGN_ASSET(2) char gUSSample0D[] = dgUSSample0D; - -#define dgUSSample0E "__OTR__sound/samples/sfx_water/00_plunge" -static const ALIGN_ASSET(2) char gUSSample0E[] = dgUSSample0E; - -#define dgUSSample0F "__OTR__sound/samples/sfx_water/01_splash" -static const ALIGN_ASSET(2) char gUSSample0F[] = dgUSSample0F; - -#define dgUSSample10 "__OTR__sound/samples/sfx_water/02_swim" -static const ALIGN_ASSET(2) char gUSSample10[] = dgUSSample10; - -#define dgUSSample11 "__OTR__sound/samples/sfx_4/00" -static const ALIGN_ASSET(2) char gUSSample11[] = dgUSSample11; - -#define dgUSSample12 "__OTR__sound/samples/sfx_4/01" -static const ALIGN_ASSET(2) char gUSSample12[] = dgUSSample12; - -#define dgUSSample13 "__OTR__sound/samples/sfx_4/02" -static const ALIGN_ASSET(2) char gUSSample13[] = dgUSSample13; - -#define dgUSSample14 "__OTR__sound/samples/sfx_4/03" -static const ALIGN_ASSET(2) char gUSSample14[] = dgUSSample14; - -#define dgUSSample15 "__OTR__sound/samples/sfx_4/04" -static const ALIGN_ASSET(2) char gUSSample15[] = dgUSSample15; - -#define dgUSSample16 "__OTR__sound/samples/sfx_4/05" -static const ALIGN_ASSET(2) char gUSSample16[] = dgUSSample16; - -#define dgUSSample17 "__OTR__sound/samples/sfx_4/06" -static const ALIGN_ASSET(2) char gUSSample17[] = dgUSSample17; - -#define dgUSSample18 "__OTR__sound/samples/sfx_4/07" -static const ALIGN_ASSET(2) char gUSSample18[] = dgUSSample18; - -#define dgUSSample19 "__OTR__sound/samples/sfx_4/08" -static const ALIGN_ASSET(2) char gUSSample19[] = dgUSSample19; - -#define dgUSSample1A "__OTR__sound/samples/sfx_4/09" -static const ALIGN_ASSET(2) char gUSSample1A[] = dgUSSample1A; - -#define dgUSSample1B "__OTR__sound/samples/sfx_5/00" -static const ALIGN_ASSET(2) char gUSSample1B[] = dgUSSample1B; - -#define dgUSSample1C "__OTR__sound/samples/sfx_5/01" -static const ALIGN_ASSET(2) char gUSSample1C[] = dgUSSample1C; - -#define dgUSSample1D "__OTR__sound/samples/sfx_5/02" -static const ALIGN_ASSET(2) char gUSSample1D[] = dgUSSample1D; - -#define dgUSSample1E "__OTR__sound/samples/sfx_5/03" -static const ALIGN_ASSET(2) char gUSSample1E[] = dgUSSample1E; - -#define dgUSSample1F "__OTR__sound/samples/sfx_5/04" -static const ALIGN_ASSET(2) char gUSSample1F[] = dgUSSample1F; - -#define dgUSSample20 "__OTR__sound/samples/sfx_5/05" -static const ALIGN_ASSET(2) char gUSSample20[] = dgUSSample20; - -#define dgUSSample21 "__OTR__sound/samples/sfx_5/06" -static const ALIGN_ASSET(2) char gUSSample21[] = dgUSSample21; - -#define dgUSSample22 "__OTR__sound/samples/sfx_5/07" -static const ALIGN_ASSET(2) char gUSSample22[] = dgUSSample22; - -#define dgUSSample23 "__OTR__sound/samples/sfx_5/08" -static const ALIGN_ASSET(2) char gUSSample23[] = dgUSSample23; - -#define dgUSSample24 "__OTR__sound/samples/sfx_5/09" -static const ALIGN_ASSET(2) char gUSSample24[] = dgUSSample24; - -#define dgUSSample25 "__OTR__sound/samples/sfx_5/0A" -static const ALIGN_ASSET(2) char gUSSample25[] = dgUSSample25; - -#define dgUSSample26 "__OTR__sound/samples/sfx_5/0B" -static const ALIGN_ASSET(2) char gUSSample26[] = dgUSSample26; - -#define dgUSSample27 "__OTR__sound/samples/sfx_5/0C" -static const ALIGN_ASSET(2) char gUSSample27[] = dgUSSample27; - -#define dgUSSample28 "__OTR__sound/samples/sfx_5/0D" -static const ALIGN_ASSET(2) char gUSSample28[] = dgUSSample28; - -#define dgUSSample29 "__OTR__sound/samples/sfx_5/0E" -static const ALIGN_ASSET(2) char gUSSample29[] = dgUSSample29; - -#define dgUSSample2A "__OTR__sound/samples/sfx_5/0F" -static const ALIGN_ASSET(2) char gUSSample2A[] = dgUSSample2A; - -#define dgUSSample2B "__OTR__sound/samples/sfx_5/10" -static const ALIGN_ASSET(2) char gUSSample2B[] = dgUSSample2B; - -#define dgUSSample2C "__OTR__sound/samples/sfx_5/11" -static const ALIGN_ASSET(2) char gUSSample2C[] = dgUSSample2C; - -#define dgUSSample2D "__OTR__sound/samples/sfx_5/12" -static const ALIGN_ASSET(2) char gUSSample2D[] = dgUSSample2D; - -#define dgUSSample2E "__OTR__sound/samples/sfx_5/13" -static const ALIGN_ASSET(2) char gUSSample2E[] = dgUSSample2E; - -#define dgUSSample2F "__OTR__sound/samples/sfx_5/14" -static const ALIGN_ASSET(2) char gUSSample2F[] = dgUSSample2F; - -#define dgUSSample30 "__OTR__sound/samples/sfx_5/15" -static const ALIGN_ASSET(2) char gUSSample30[] = dgUSSample30; - -#define dgUSSample31 "__OTR__sound/samples/sfx_5/16" -static const ALIGN_ASSET(2) char gUSSample31[] = dgUSSample31; - -#define dgUSSample32 "__OTR__sound/samples/sfx_5/17" -static const ALIGN_ASSET(2) char gUSSample32[] = dgUSSample32; - -#define dgUSSample33 "__OTR__sound/samples/sfx_5/18" -static const ALIGN_ASSET(2) char gUSSample33[] = dgUSSample33; - -#define dgUSSample34 "__OTR__sound/samples/sfx_5/19" -static const ALIGN_ASSET(2) char gUSSample34[] = dgUSSample34; - -#define dgUSSample35 "__OTR__sound/samples/sfx_5/1A" -static const ALIGN_ASSET(2) char gUSSample35[] = dgUSSample35; - -#define dgUSSample36 "__OTR__sound/samples/sfx_5/1B" -static const ALIGN_ASSET(2) char gUSSample36[] = dgUSSample36; - -#define dgUSSample37 "__OTR__sound/samples/sfx_5/1C" -static const ALIGN_ASSET(2) char gUSSample37[] = dgUSSample37; - -#define dgUSSample38 "__OTR__sound/samples/sfx_6/00" -static const ALIGN_ASSET(2) char gUSSample38[] = dgUSSample38; - -#define dgUSSample39 "__OTR__sound/samples/sfx_6/01" -static const ALIGN_ASSET(2) char gUSSample39[] = dgUSSample39; - -#define dgUSSample3A "__OTR__sound/samples/sfx_6/02" -static const ALIGN_ASSET(2) char gUSSample3A[] = dgUSSample3A; - -#define dgUSSample3B "__OTR__sound/samples/sfx_6/03" -static const ALIGN_ASSET(2) char gUSSample3B[] = dgUSSample3B; - -#define dgUSSample3C "__OTR__sound/samples/sfx_6/04" -static const ALIGN_ASSET(2) char gUSSample3C[] = dgUSSample3C; - -#define dgUSSample3D "__OTR__sound/samples/sfx_6/05" -static const ALIGN_ASSET(2) char gUSSample3D[] = dgUSSample3D; - -#define dgUSSample3E "__OTR__sound/samples/sfx_6/06" -static const ALIGN_ASSET(2) char gUSSample3E[] = dgUSSample3E; - -#define dgUSSample3F "__OTR__sound/samples/sfx_6/07" -static const ALIGN_ASSET(2) char gUSSample3F[] = dgUSSample3F; - -#define dgUSSample40 "__OTR__sound/samples/sfx_6/08" -static const ALIGN_ASSET(2) char gUSSample40[] = dgUSSample40; - -#define dgUSSample41 "__OTR__sound/samples/sfx_6/09" -static const ALIGN_ASSET(2) char gUSSample41[] = dgUSSample41; - -#define dgUSSample42 "__OTR__sound/samples/sfx_6/0A" -static const ALIGN_ASSET(2) char gUSSample42[] = dgUSSample42; - -#define dgUSSample43 "__OTR__sound/samples/sfx_6/0B" -static const ALIGN_ASSET(2) char gUSSample43[] = dgUSSample43; - -#define dgUSSample44 "__OTR__sound/samples/sfx_6/0C" -static const ALIGN_ASSET(2) char gUSSample44[] = dgUSSample44; - -#define dgUSSample45 "__OTR__sound/samples/sfx_6/0D" -static const ALIGN_ASSET(2) char gUSSample45[] = dgUSSample45; - -#define dgUSSample46 "__OTR__sound/samples/sfx_7/00" -static const ALIGN_ASSET(2) char gUSSample46[] = dgUSSample46; - -#define dgUSSample47 "__OTR__sound/samples/sfx_7/01" -static const ALIGN_ASSET(2) char gUSSample47[] = dgUSSample47; - -#define dgUSSample48 "__OTR__sound/samples/sfx_7/02" -static const ALIGN_ASSET(2) char gUSSample48[] = dgUSSample48; - -#define dgUSSample49 "__OTR__sound/samples/sfx_7/03" -static const ALIGN_ASSET(2) char gUSSample49[] = dgUSSample49; - -#define dgUSSample4A "__OTR__sound/samples/sfx_7/04" -static const ALIGN_ASSET(2) char gUSSample4A[] = dgUSSample4A; - -#define dgUSSample4B "__OTR__sound/samples/sfx_7/05" -static const ALIGN_ASSET(2) char gUSSample4B[] = dgUSSample4B; - -#define dgUSSample4C "__OTR__sound/samples/sfx_7/06" -static const ALIGN_ASSET(2) char gUSSample4C[] = dgUSSample4C; - -#define dgUSSample4D "__OTR__sound/samples/sfx_7/07" -static const ALIGN_ASSET(2) char gUSSample4D[] = dgUSSample4D; - -#define dgUSSample4E "__OTR__sound/samples/sfx_7/08" -static const ALIGN_ASSET(2) char gUSSample4E[] = dgUSSample4E; - -#define dgUSSample4F "__OTR__sound/samples/sfx_7/09" -static const ALIGN_ASSET(2) char gUSSample4F[] = dgUSSample4F; - -#define dgUSSample50 "__OTR__sound/samples/sfx_7/0A" -static const ALIGN_ASSET(2) char gUSSample50[] = dgUSSample50; - -#define dgUSSample51 "__OTR__sound/samples/sfx_7/0B" -static const ALIGN_ASSET(2) char gUSSample51[] = dgUSSample51; - -#define dgUSSample52 "__OTR__sound/samples/sfx_7/0C" -static const ALIGN_ASSET(2) char gUSSample52[] = dgUSSample52; - -#define dgUSSample53 "__OTR__sound/samples/sfx_7/0D_chain_chomp_bark" -static const ALIGN_ASSET(2) char gUSSample53[] = dgUSSample53; - -#define dgUSSample54 "__OTR__sound/samples/sfx_mario/00_mario_jump_hoo" -static const ALIGN_ASSET(2) char gUSSample54[] = dgUSSample54; - -#define dgUSSample55 "__OTR__sound/samples/sfx_mario/01_mario_jump_wah" -static const ALIGN_ASSET(2) char gUSSample55[] = dgUSSample55; - -#define dgUSSample56 "__OTR__sound/samples/sfx_mario/02_mario_yah" -static const ALIGN_ASSET(2) char gUSSample56[] = dgUSSample56; - -#define dgUSSample57 "__OTR__sound/samples/sfx_mario/03_mario_haha" -static const ALIGN_ASSET(2) char gUSSample57[] = dgUSSample57; - -#define dgUSSample58 "__OTR__sound/samples/sfx_mario/04_mario_yahoo" -static const ALIGN_ASSET(2) char gUSSample58[] = dgUSSample58; - -#define dgUSSample59 "__OTR__sound/samples/sfx_mario/05_mario_uh" -static const ALIGN_ASSET(2) char gUSSample59[] = dgUSSample59; - -#define dgUSSample5A "__OTR__sound/samples/sfx_mario/06_mario_hrmm" -static const ALIGN_ASSET(2) char gUSSample5A[] = dgUSSample5A; - -#define dgUSSample5B "__OTR__sound/samples/sfx_mario/07_mario_wah2" -static const ALIGN_ASSET(2) char gUSSample5B[] = dgUSSample5B; - -#define dgUSSample5C "__OTR__sound/samples/sfx_mario/08_mario_whoa" -static const ALIGN_ASSET(2) char gUSSample5C[] = dgUSSample5C; - -#define dgUSSample5D "__OTR__sound/samples/sfx_mario/09_mario_eeuh" -static const ALIGN_ASSET(2) char gUSSample5D[] = dgUSSample5D; - -#define dgUSSample5E "__OTR__sound/samples/sfx_mario/0A_mario_attacked" -static const ALIGN_ASSET(2) char gUSSample5E[] = dgUSSample5E; - -#define dgUSSample5F "__OTR__sound/samples/sfx_mario/0B_mario_ooof" -static const ALIGN_ASSET(2) char gUSSample5F[] = dgUSSample5F; - -#define dgUSSample60 "__OTR__sound/samples/sfx_mario/0C_mario_here_we_go" -static const ALIGN_ASSET(2) char gUSSample60[] = dgUSSample60; - -#define dgUSSample61 "__OTR__sound/samples/sfx_mario/0D_mario_yawning" -static const ALIGN_ASSET(2) char gUSSample61[] = dgUSSample61; - -#define dgUSSample62 "__OTR__sound/samples/sfx_mario/0E_mario_snoring1" -static const ALIGN_ASSET(2) char gUSSample62[] = dgUSSample62; - -#define dgUSSample63 "__OTR__sound/samples/sfx_mario/0F_mario_snoring2" -static const ALIGN_ASSET(2) char gUSSample63[] = dgUSSample63; - -#define dgUSSample64 "__OTR__sound/samples/sfx_mario/10_mario_doh" -static const ALIGN_ASSET(2) char gUSSample64[] = dgUSSample64; - -#define dgUSSample65 "__OTR__sound/samples/sfx_mario/11_mario_game_over" -static const ALIGN_ASSET(2) char gUSSample65[] = dgUSSample65; - -#define dgUSSample66 "__OTR__sound/samples/sfx_mario/12_mario_hello" -static const ALIGN_ASSET(2) char gUSSample66[] = dgUSSample66; - -#define dgUSSample67 "__OTR__sound/samples/sfx_mario/13_mario_press_start_to_play" -static const ALIGN_ASSET(2) char gUSSample67[] = dgUSSample67; - -#define dgUSSample68 "__OTR__sound/samples/sfx_mario/14_mario_twirl_bounce" -static const ALIGN_ASSET(2) char gUSSample68[] = dgUSSample68; - -#define dgUSSample69 "__OTR__sound/samples/sfx_mario/15_mario_snoring3" -static const ALIGN_ASSET(2) char gUSSample69[] = dgUSSample69; - -#define dgUSSample6A "__OTR__sound/samples/sfx_mario/16_mario_so_longa_bowser" -static const ALIGN_ASSET(2) char gUSSample6A[] = dgUSSample6A; - -#define dgUSSample6B "__OTR__sound/samples/sfx_mario/17_mario_ima_tired" -static const ALIGN_ASSET(2) char gUSSample6B[] = dgUSSample6B; - -#define dgUSSample6C "__OTR__sound/samples/sfx_mario/18_mario_waha" -static const ALIGN_ASSET(2) char gUSSample6C[] = dgUSSample6C; - -#define dgUSSample6D "__OTR__sound/samples/sfx_mario/19_mario_yippee" -static const ALIGN_ASSET(2) char gUSSample6D[] = dgUSSample6D; - -#define dgUSSample6E "__OTR__sound/samples/sfx_mario/1A_mario_lets_a_go" -static const ALIGN_ASSET(2) char gUSSample6E[] = dgUSSample6E; - -#define dgUSSample6F "__OTR__sound/samples/sfx_9/00" -static const ALIGN_ASSET(2) char gUSSample6F[] = dgUSSample6F; - -#define dgUSSample70 "__OTR__sound/samples/sfx_9/01" -static const ALIGN_ASSET(2) char gUSSample70[] = dgUSSample70; - -#define dgUSSample71 "__OTR__sound/samples/sfx_9/02" -static const ALIGN_ASSET(2) char gUSSample71[] = dgUSSample71; - -#define dgUSSample72 "__OTR__sound/samples/sfx_9/03" -static const ALIGN_ASSET(2) char gUSSample72[] = dgUSSample72; - -#define dgUSSample73 "__OTR__sound/samples/sfx_9/04_camera_buzz" -static const ALIGN_ASSET(2) char gUSSample73[] = dgUSSample73; - -#define dgUSSample74 "__OTR__sound/samples/sfx_9/05_camera_shutter" -static const ALIGN_ASSET(2) char gUSSample74[] = dgUSSample74; - -#define dgUSSample75 "__OTR__sound/samples/sfx_9/06" -static const ALIGN_ASSET(2) char gUSSample75[] = dgUSSample75; - -#define dgUSSample76 "__OTR__sound/samples/sfx_mario_peach/00_mario_waaaooow" -static const ALIGN_ASSET(2) char gUSSample76[] = dgUSSample76; - -#define dgUSSample77 "__OTR__sound/samples/sfx_mario_peach/01_mario_hoohoo" -static const ALIGN_ASSET(2) char gUSSample77[] = dgUSSample77; - -#define dgUSSample78 "__OTR__sound/samples/sfx_mario_peach/02_mario_panting" -static const ALIGN_ASSET(2) char gUSSample78[] = dgUSSample78; - -#define dgUSSample79 "__OTR__sound/samples/sfx_mario_peach/03_mario_dying" -static const ALIGN_ASSET(2) char gUSSample79[] = dgUSSample79; - -#define dgUSSample7A "__OTR__sound/samples/sfx_mario_peach/04_mario_on_fire" -static const ALIGN_ASSET(2) char gUSSample7A[] = dgUSSample7A; - -#define dgUSSample7B "__OTR__sound/samples/sfx_mario_peach/05_mario_uh2" -static const ALIGN_ASSET(2) char gUSSample7B[] = dgUSSample7B; - -#define dgUSSample7C "__OTR__sound/samples/sfx_mario_peach/06_mario_coughing" -static const ALIGN_ASSET(2) char gUSSample7C[] = dgUSSample7C; - -#define dgUSSample7D "__OTR__sound/samples/sfx_mario_peach/07_mario_its_a_me_mario" -static const ALIGN_ASSET(2) char gUSSample7D[] = dgUSSample7D; - -#define dgUSSample7E "__OTR__sound/samples/sfx_mario_peach/08_mario_punch_yah" -static const ALIGN_ASSET(2) char gUSSample7E[] = dgUSSample7E; - -#define dgUSSample7F "__OTR__sound/samples/sfx_mario_peach/09_mario_punch_hoo" -static const ALIGN_ASSET(2) char gUSSample7F[] = dgUSSample7F; - -#define dgUSSample80 "__OTR__sound/samples/sfx_mario_peach/0A_mario_mama_mia" -static const ALIGN_ASSET(2) char gUSSample80[] = dgUSSample80; - -#define dgUSSample81 "__OTR__sound/samples/sfx_mario_peach/0B_mario_okey_dokey" -static const ALIGN_ASSET(2) char gUSSample81[] = dgUSSample81; - -#define dgUSSample82 "__OTR__sound/samples/sfx_mario_peach/0C_mario_drowning" -static const ALIGN_ASSET(2) char gUSSample82[] = dgUSSample82; - -#define dgUSSample83 "__OTR__sound/samples/sfx_mario_peach/0D_mario_thank_you_playing_my_game" -static const ALIGN_ASSET(2) char gUSSample83[] = dgUSSample83; - -#define dgUSSample84 "__OTR__sound/samples/sfx_mario_peach/0E_peach_dear_mario" -static const ALIGN_ASSET(2) char gUSSample84[] = dgUSSample84; - -#define dgUSSample85 "__OTR__sound/samples/sfx_mario_peach/0F_peach_mario" -static const ALIGN_ASSET(2) char gUSSample85[] = dgUSSample85; - -#define dgUSSample86 "__OTR__sound/samples/sfx_mario_peach/10_peach_power_of_the_stars" -static const ALIGN_ASSET(2) char gUSSample86[] = dgUSSample86; - -#define dgUSSample87 "__OTR__sound/samples/sfx_mario_peach/11_peach_thanks_to_you" -static const ALIGN_ASSET(2) char gUSSample87[] = dgUSSample87; - -#define dgUSSample88 "__OTR__sound/samples/sfx_mario_peach/12_peach_thank_you_mario" -static const ALIGN_ASSET(2) char gUSSample88[] = dgUSSample88; - -#define dgUSSample89 "__OTR__sound/samples/sfx_mario_peach/13_peach_something_special" -static const ALIGN_ASSET(2) char gUSSample89[] = dgUSSample89; - -#define dgUSSample8A "__OTR__sound/samples/sfx_mario_peach/14_peach_bake_a_cake" -static const ALIGN_ASSET(2) char gUSSample8A[] = dgUSSample8A; - -#define dgUSSample8B "__OTR__sound/samples/sfx_mario_peach/15_peach_for_mario" -static const ALIGN_ASSET(2) char gUSSample8B[] = dgUSSample8B; - -#define dgUSSample8C "__OTR__sound/samples/sfx_mario_peach/16_peach_mario2" -static const ALIGN_ASSET(2) char gUSSample8C[] = dgUSSample8C; - -#define dgUSSample8D "__OTR__sound/samples/instruments/00" -static const ALIGN_ASSET(2) char gUSSample8D[] = dgUSSample8D; - -#define dgUSSample8E "__OTR__sound/samples/instruments/01_banjo_1" -static const ALIGN_ASSET(2) char gUSSample8E[] = dgUSSample8E; - -#define dgUSSample8F "__OTR__sound/samples/instruments/02" -static const ALIGN_ASSET(2) char gUSSample8F[] = dgUSSample8F; - -#define dgUSSample90 "__OTR__sound/samples/instruments/03_human_whistle" -static const ALIGN_ASSET(2) char gUSSample90[] = dgUSSample90; - -#define dgUSSample91 "__OTR__sound/samples/instruments/04_bright_piano" -static const ALIGN_ASSET(2) char gUSSample91[] = dgUSSample91; - -#define dgUSSample92 "__OTR__sound/samples/instruments/05_acoustic_bass" -static const ALIGN_ASSET(2) char gUSSample92[] = dgUSSample92; - -#define dgUSSample93 "__OTR__sound/samples/instruments/06_kick_drum_1" -static const ALIGN_ASSET(2) char gUSSample93[] = dgUSSample93; - -#define dgUSSample94 "__OTR__sound/samples/instruments/07_rimshot" -static const ALIGN_ASSET(2) char gUSSample94[] = dgUSSample94; - -#define dgUSSample95 "__OTR__sound/samples/instruments/08" -static const ALIGN_ASSET(2) char gUSSample95[] = dgUSSample95; - -#define dgUSSample96 "__OTR__sound/samples/instruments/09" -static const ALIGN_ASSET(2) char gUSSample96[] = dgUSSample96; - -#define dgUSSample97 "__OTR__sound/samples/instruments/0A_tambourine" -static const ALIGN_ASSET(2) char gUSSample97[] = dgUSSample97; - -#define dgUSSample98 "__OTR__sound/samples/instruments/0B" -static const ALIGN_ASSET(2) char gUSSample98[] = dgUSSample98; - -#define dgUSSample99 "__OTR__sound/samples/instruments/0C_conga_stick" -static const ALIGN_ASSET(2) char gUSSample99[] = dgUSSample99; - -#define dgUSSample9A "__OTR__sound/samples/instruments/0D_clave" -static const ALIGN_ASSET(2) char gUSSample9A[] = dgUSSample9A; - -#define dgUSSample9B "__OTR__sound/samples/instruments/0E_hihat_closed" -static const ALIGN_ASSET(2) char gUSSample9B[] = dgUSSample9B; - -#define dgUSSample9C "__OTR__sound/samples/instruments/0F_hihat_open" -static const ALIGN_ASSET(2) char gUSSample9C[] = dgUSSample9C; - -#define dgUSSample9D "__OTR__sound/samples/instruments/10_cymbal_bell" -static const ALIGN_ASSET(2) char gUSSample9D[] = dgUSSample9D; - -#define dgUSSample9E "__OTR__sound/samples/instruments/11_splash_cymbal" -static const ALIGN_ASSET(2) char gUSSample9E[] = dgUSSample9E; - -#define dgUSSample9F "__OTR__sound/samples/instruments/12_snare_drum_1" -static const ALIGN_ASSET(2) char gUSSample9F[] = dgUSSample9F; - -#define dgUSSampleA0 "__OTR__sound/samples/instruments/13_snare_drum_2" -static const ALIGN_ASSET(2) char gUSSampleA0[] = dgUSSampleA0; - -#define dgUSSampleA1 "__OTR__sound/samples/instruments/14_strings_5" -static const ALIGN_ASSET(2) char gUSSampleA1[] = dgUSSampleA1; - -#define dgUSSampleA2 "__OTR__sound/samples/instruments/15_strings_4" -static const ALIGN_ASSET(2) char gUSSampleA2[] = dgUSSampleA2; - -#define dgUSSampleA3 "__OTR__sound/samples/instruments/16_french_horns" -static const ALIGN_ASSET(2) char gUSSampleA3[] = dgUSSampleA3; - -#define dgUSSampleA4 "__OTR__sound/samples/instruments/17_trumpet" -static const ALIGN_ASSET(2) char gUSSampleA4[] = dgUSSampleA4; - -#define dgUSSampleA5 "__OTR__sound/samples/instruments/18_timpani" -static const ALIGN_ASSET(2) char gUSSampleA5[] = dgUSSampleA5; - -#define dgUSSampleA6 "__OTR__sound/samples/instruments/19_brass" -static const ALIGN_ASSET(2) char gUSSampleA6[] = dgUSSampleA6; - -#define dgUSSampleA7 "__OTR__sound/samples/instruments/1A_slap_bass" -static const ALIGN_ASSET(2) char gUSSampleA7[] = dgUSSampleA7; - -#define dgUSSampleA8 "__OTR__sound/samples/instruments/1B_organ_2" -static const ALIGN_ASSET(2) char gUSSampleA8[] = dgUSSampleA8; - -#define dgUSSampleA9 "__OTR__sound/samples/instruments/1C" -static const ALIGN_ASSET(2) char gUSSampleA9[] = dgUSSampleA9; - -#define dgUSSampleAA "__OTR__sound/samples/instruments/1D" -static const ALIGN_ASSET(2) char gUSSampleAA[] = dgUSSampleAA; - -#define dgUSSampleAB "__OTR__sound/samples/instruments/1E_closed_triangle" -static const ALIGN_ASSET(2) char gUSSampleAB[] = dgUSSampleAB; - -#define dgUSSampleAC "__OTR__sound/samples/instruments/1F_open_triangle" -static const ALIGN_ASSET(2) char gUSSampleAC[] = dgUSSampleAC; - -#define dgUSSampleAD "__OTR__sound/samples/instruments/20_cabasa" -static const ALIGN_ASSET(2) char gUSSampleAD[] = dgUSSampleAD; - -#define dgUSSampleAE "__OTR__sound/samples/instruments/21_sine_bass" -static const ALIGN_ASSET(2) char gUSSampleAE[] = dgUSSampleAE; - -#define dgUSSampleAF "__OTR__sound/samples/instruments/22_boys_choir" -static const ALIGN_ASSET(2) char gUSSampleAF[] = dgUSSampleAF; - -#define dgUSSampleB0 "__OTR__sound/samples/instruments/23_strings_1" -static const ALIGN_ASSET(2) char gUSSampleB0[] = dgUSSampleB0; - -#define dgUSSampleB1 "__OTR__sound/samples/instruments/24_strings_2" -static const ALIGN_ASSET(2) char gUSSampleB1[] = dgUSSampleB1; - -#define dgUSSampleB2 "__OTR__sound/samples/instruments/25_strings_3" -static const ALIGN_ASSET(2) char gUSSampleB2[] = dgUSSampleB2; - -#define dgUSSampleB3 "__OTR__sound/samples/instruments/26_crystal_rhodes" -static const ALIGN_ASSET(2) char gUSSampleB3[] = dgUSSampleB3; - -#define dgUSSampleB4 "__OTR__sound/samples/instruments/27_harpsichord" -static const ALIGN_ASSET(2) char gUSSampleB4[] = dgUSSampleB4; - -#define dgUSSampleB5 "__OTR__sound/samples/instruments/28_sitar_1" -static const ALIGN_ASSET(2) char gUSSampleB5[] = dgUSSampleB5; - -#define dgUSSampleB6 "__OTR__sound/samples/instruments/29_orchestra_hit" -static const ALIGN_ASSET(2) char gUSSampleB6[] = dgUSSampleB6; - -#define dgUSSampleB7 "__OTR__sound/samples/instruments/2A" -static const ALIGN_ASSET(2) char gUSSampleB7[] = dgUSSampleB7; - -#define dgUSSampleB8 "__OTR__sound/samples/instruments/2B" -static const ALIGN_ASSET(2) char gUSSampleB8[] = dgUSSampleB8; - -#define dgUSSampleB9 "__OTR__sound/samples/instruments/2C" -static const ALIGN_ASSET(2) char gUSSampleB9[] = dgUSSampleB9; - -#define dgUSSampleBA "__OTR__sound/samples/instruments/2D_trombone" -static const ALIGN_ASSET(2) char gUSSampleBA[] = dgUSSampleBA; - -#define dgUSSampleBB "__OTR__sound/samples/instruments/2E_accordion" -static const ALIGN_ASSET(2) char gUSSampleBB[] = dgUSSampleBB; - -#define dgUSSampleBC "__OTR__sound/samples/instruments/2F_sleigh_bells" -static const ALIGN_ASSET(2) char gUSSampleBC[] = dgUSSampleBC; - -#define dgUSSampleBD "__OTR__sound/samples/instruments/30_rarefaction-lahna" -static const ALIGN_ASSET(2) char gUSSampleBD[] = dgUSSampleBD; - -#define dgUSSampleBE "__OTR__sound/samples/instruments/31_rarefaction-convolution" -static const ALIGN_ASSET(2) char gUSSampleBE[] = dgUSSampleBE; - -#define dgUSSampleBF "__OTR__sound/samples/instruments/32_metal_rimshot" -static const ALIGN_ASSET(2) char gUSSampleBF[] = dgUSSampleBF; - -#define dgUSSampleC0 "__OTR__sound/samples/instruments/33_kick_drum_2" -static const ALIGN_ASSET(2) char gUSSampleC0[] = dgUSSampleC0; - -#define dgUSSampleC1 "__OTR__sound/samples/instruments/34_alto_flute" -static const ALIGN_ASSET(2) char gUSSampleC1[] = dgUSSampleC1; - -#define dgUSSampleC2 "__OTR__sound/samples/instruments/35_gospel_organ" -static const ALIGN_ASSET(2) char gUSSampleC2[] = dgUSSampleC2; - -#define dgUSSampleC3 "__OTR__sound/samples/instruments/36_sawtooth_synth" -static const ALIGN_ASSET(2) char gUSSampleC3[] = dgUSSampleC3; - -#define dgUSSampleC4 "__OTR__sound/samples/instruments/37_square_synth" -static const ALIGN_ASSET(2) char gUSSampleC4[] = dgUSSampleC4; - -#define dgUSSampleC5 "__OTR__sound/samples/instruments/38_electric_kick_drum" -static const ALIGN_ASSET(2) char gUSSampleC5[] = dgUSSampleC5; - -#define dgUSSampleC6 "__OTR__sound/samples/instruments/39_sitar_2" -static const ALIGN_ASSET(2) char gUSSampleC6[] = dgUSSampleC6; - -#define dgUSSampleC7 "__OTR__sound/samples/instruments/3A_music_box" -static const ALIGN_ASSET(2) char gUSSampleC7[] = dgUSSampleC7; - -#define dgUSSampleC8 "__OTR__sound/samples/instruments/3B_banjo_2" -static const ALIGN_ASSET(2) char gUSSampleC8[] = dgUSSampleC8; - -#define dgUSSampleC9 "__OTR__sound/samples/instruments/3C_acoustic_guitar" -static const ALIGN_ASSET(2) char gUSSampleC9[] = dgUSSampleC9; - -#define dgUSSampleCA "__OTR__sound/samples/instruments/3D" -static const ALIGN_ASSET(2) char gUSSampleCA[] = dgUSSampleCA; - -#define dgUSSampleCB "__OTR__sound/samples/instruments/3E_monk_choir" -static const ALIGN_ASSET(2) char gUSSampleCB[] = dgUSSampleCB; - -#define dgUSSampleCC "__OTR__sound/samples/instruments/3F" -static const ALIGN_ASSET(2) char gUSSampleCC[] = dgUSSampleCC; - -#define dgUSSampleCD "__OTR__sound/samples/instruments/40_bell" -static const ALIGN_ASSET(2) char gUSSampleCD[] = dgUSSampleCD; - -#define dgUSSampleCE "__OTR__sound/samples/instruments/41_pan_flute" -static const ALIGN_ASSET(2) char gUSSampleCE[] = dgUSSampleCE; - -#define dgUSSampleCF "__OTR__sound/samples/instruments/42_vibraphone" -static const ALIGN_ASSET(2) char gUSSampleCF[] = dgUSSampleCF; - -#define dgUSSampleD0 "__OTR__sound/samples/instruments/43_harmonica" -static const ALIGN_ASSET(2) char gUSSampleD0[] = dgUSSampleD0; - -#define dgUSSampleD1 "__OTR__sound/samples/instruments/44_grand_piano" -static const ALIGN_ASSET(2) char gUSSampleD1[] = dgUSSampleD1; - -#define dgUSSampleD2 "__OTR__sound/samples/instruments/45_french_horns_lq" -static const ALIGN_ASSET(2) char gUSSampleD2[] = dgUSSampleD2; - -#define dgUSSampleD3 "__OTR__sound/samples/instruments/46_pizzicato_strings_1" -static const ALIGN_ASSET(2) char gUSSampleD3[] = dgUSSampleD3; - -#define dgUSSampleD4 "__OTR__sound/samples/instruments/47_pizzicato_strings_2" -static const ALIGN_ASSET(2) char gUSSampleD4[] = dgUSSampleD4; - -#define dgUSSampleD5 "__OTR__sound/samples/instruments/48_steel_drum" -static const ALIGN_ASSET(2) char gUSSampleD5[] = dgUSSampleD5; - -#define dgUSSampleD6 "__OTR__sound/samples/piranha_music_box/00_music_box" -static const ALIGN_ASSET(2) char gUSSampleD6[] = dgUSSampleD6; - -#define dgUSSampleD7 "__OTR__sound/samples/course_start/00_la" -static const ALIGN_ASSET(2) char gUSSampleD7[] = dgUSSampleD7; - -#define dgUSSampleD8 "__OTR__sound/samples/bowser_organ/00_organ_1" -static const ALIGN_ASSET(2) char gUSSampleD8[] = dgUSSampleD8; - -#define dgUSSampleD9 "__OTR__sound/samples/bowser_organ/01_organ_1_lq" -static const ALIGN_ASSET(2) char gUSSampleD9[] = dgUSSampleD9; - -#define dgUSSampleDA "__OTR__sound/samples/bowser_organ/02_boys_choir" -static const ALIGN_ASSET(2) char gUSSampleDA[] = dgUSSampleDA; - -static const char* gUSSampleTable[] = { - gUSSample00, gUSSample01, gUSSample02, gUSSample03, - gUSSample04, gUSSample05, gUSSample06, gUSSample07, - gUSSample08, gUSSample09, gUSSample0A, gUSSample0B, - gUSSample0C, gUSSample0D, gUSSample0E, gUSSample0F, - gUSSample10, gUSSample11, gUSSample12, gUSSample13, - gUSSample14, gUSSample15, gUSSample16, gUSSample17, - gUSSample18, gUSSample19, gUSSample1A, gUSSample1B, - gUSSample1C, gUSSample1D, gUSSample1E, gUSSample1F, - gUSSample20, gUSSample21, gUSSample22, gUSSample23, - gUSSample24, gUSSample25, gUSSample26, gUSSample27, - gUSSample28, gUSSample29, gUSSample2A, gUSSample2B, - gUSSample2C, gUSSample2D, gUSSample2E, gUSSample2F, - gUSSample30, gUSSample31, gUSSample32, gUSSample33, - gUSSample34, gUSSample35, gUSSample36, gUSSample37, - gUSSample38, gUSSample39, gUSSample3A, gUSSample3B, - gUSSample3C, gUSSample3D, gUSSample3E, gUSSample3F, - gUSSample40, gUSSample41, gUSSample42, gUSSample43, - gUSSample44, gUSSample45, gUSSample46, gUSSample47, - gUSSample48, gUSSample49, gUSSample4A, gUSSample4B, - gUSSample4C, gUSSample4D, gUSSample4E, gUSSample4F, - gUSSample50, gUSSample51, gUSSample52, gUSSample53, - gUSSample54, gUSSample55, gUSSample56, gUSSample57, - gUSSample58, gUSSample59, gUSSample5A, gUSSample5B, - gUSSample5C, gUSSample5D, gUSSample5E, gUSSample5F, - gUSSample60, gUSSample61, gUSSample62, gUSSample63, - gUSSample64, gUSSample65, gUSSample66, gUSSample67, - gUSSample68, gUSSample69, gUSSample6A, gUSSample6B, - gUSSample6C, gUSSample6D, gUSSample6E, gUSSample6F, - gUSSample70, gUSSample71, gUSSample72, gUSSample73, - gUSSample74, gUSSample75, gUSSample76, gUSSample77, - gUSSample78, gUSSample79, gUSSample7A, gUSSample7B, - gUSSample7C, gUSSample7D, gUSSample7E, gUSSample7F, - gUSSample80, gUSSample81, gUSSample82, gUSSample83, - gUSSample84, gUSSample85, gUSSample86, gUSSample87, - gUSSample88, gUSSample89, gUSSample8A, gUSSample8B, - gUSSample8C, gUSSample8D, gUSSample8E, gUSSample8F, - gUSSample90, gUSSample91, gUSSample92, gUSSample93, - gUSSample94, gUSSample95, gUSSample96, gUSSample97, - gUSSample98, gUSSample99, gUSSample9A, gUSSample9B, - gUSSample9C, gUSSample9D, gUSSample9E, gUSSample9F, - gUSSampleA0, gUSSampleA1, gUSSampleA2, gUSSampleA3, - gUSSampleA4, gUSSampleA5, gUSSampleA6, gUSSampleA7, - gUSSampleA8, gUSSampleA9, gUSSampleAA, gUSSampleAB, - gUSSampleAC, gUSSampleAD, gUSSampleAE, gUSSampleAF, - gUSSampleB0, gUSSampleB1, gUSSampleB2, gUSSampleB3, - gUSSampleB4, gUSSampleB5, gUSSampleB6, gUSSampleB7, - gUSSampleB8, gUSSampleB9, gUSSampleBA, gUSSampleBB, - gUSSampleBC, gUSSampleBD, gUSSampleBE, gUSSampleBF, - gUSSampleC0, gUSSampleC1, gUSSampleC2, gUSSampleC3, - gUSSampleC4, gUSSampleC5, gUSSampleC6, gUSSampleC7, - gUSSampleC8, gUSSampleC9, gUSSampleCA, gUSSampleCB, - gUSSampleCC, gUSSampleCD, gUSSampleCE, gUSSampleCF, - gUSSampleD0, gUSSampleD1, gUSSampleD2, gUSSampleD3, - gUSSampleD4, gUSSampleD5, gUSSampleD6, gUSSampleD7, - gUSSampleD8, gUSSampleD9, gUSSampleDA, -}; - -// Start JP - -#define dgJPSample00 "__OTR__sound/samples/sfx_1/00_twirl" -static const ALIGN_ASSET(2) char gJPSample00[] = dgJPSample00; - -#define dgJPSample01 "__OTR__sound/samples/sfx_1/01_brushing" -static const ALIGN_ASSET(2) char gJPSample01[] = dgJPSample01; - -#define dgJPSample02 "__OTR__sound/samples/sfx_1/02_hand_touch" -static const ALIGN_ASSET(2) char gJPSample02[] = dgJPSample02; - -#define dgJPSample03 "__OTR__sound/samples/sfx_1/03_yoshi" -static const ALIGN_ASSET(2) char gJPSample03[] = dgJPSample03; - -#define dgJPSample04 "__OTR__sound/samples/sfx_1/04_plop" -static const ALIGN_ASSET(2) char gJPSample04[] = dgJPSample04; - -#define dgJPSample05 "__OTR__sound/samples/sfx_1/05_heavy_landing" -static const ALIGN_ASSET(2) char gJPSample05[] = dgJPSample05; - -#define dgJPSample06 "__OTR__sound/samples/sfx_terrain/00_step_default" -static const ALIGN_ASSET(2) char gJPSample06[] = dgJPSample06; - -#define dgJPSample07 "__OTR__sound/samples/sfx_terrain/01_step_grass" -static const ALIGN_ASSET(2) char gJPSample07[] = dgJPSample07; - -#define dgJPSample08 "__OTR__sound/samples/sfx_terrain/02_step_stone" -static const ALIGN_ASSET(2) char gJPSample08[] = dgJPSample08; - -#define dgJPSample09 "__OTR__sound/samples/sfx_terrain/03_step_spooky" -static const ALIGN_ASSET(2) char gJPSample09[] = dgJPSample09; - -#define dgJPSample0A "__OTR__sound/samples/sfx_terrain/04_step_snow" -static const ALIGN_ASSET(2) char gJPSample0A[] = dgJPSample0A; - -#define dgJPSample0B "__OTR__sound/samples/sfx_terrain/05_step_ice" -static const ALIGN_ASSET(2) char gJPSample0B[] = dgJPSample0B; - -#define dgJPSample0C "__OTR__sound/samples/sfx_terrain/06_step_metal" -static const ALIGN_ASSET(2) char gJPSample0C[] = dgJPSample0C; - -#define dgJPSample0D "__OTR__sound/samples/sfx_terrain/07_step_sand" -static const ALIGN_ASSET(2) char gJPSample0D[] = dgJPSample0D; - -#define dgJPSample0E "__OTR__sound/samples/sfx_water/00_plunge" -static const ALIGN_ASSET(2) char gJPSample0E[] = dgJPSample0E; - -#define dgJPSample0F "__OTR__sound/samples/sfx_water/01_splash" -static const ALIGN_ASSET(2) char gJPSample0F[] = dgJPSample0F; - -#define dgJPSample10 "__OTR__sound/samples/sfx_water/02_swim" -static const ALIGN_ASSET(2) char gJPSample10[] = dgJPSample10; - -#define dgJPSample11 "__OTR__sound/samples/sfx_4/00" -static const ALIGN_ASSET(2) char gJPSample11[] = dgJPSample11; - -#define dgJPSample12 "__OTR__sound/samples/sfx_4/01" -static const ALIGN_ASSET(2) char gJPSample12[] = dgJPSample12; - -#define dgJPSample13 "__OTR__sound/samples/sfx_4/02" -static const ALIGN_ASSET(2) char gJPSample13[] = dgJPSample13; - -#define dgJPSample14 "__OTR__sound/samples/sfx_4/03" -static const ALIGN_ASSET(2) char gJPSample14[] = dgJPSample14; - -#define dgJPSample15 "__OTR__sound/samples/sfx_4/04" -static const ALIGN_ASSET(2) char gJPSample15[] = dgJPSample15; - -#define dgJPSample16 "__OTR__sound/samples/sfx_4/05" -static const ALIGN_ASSET(2) char gJPSample16[] = dgJPSample16; - -#define dgJPSample17 "__OTR__sound/samples/sfx_4/06" -static const ALIGN_ASSET(2) char gJPSample17[] = dgJPSample17; - -#define dgJPSample18 "__OTR__sound/samples/sfx_4/07" -static const ALIGN_ASSET(2) char gJPSample18[] = dgJPSample18; - -#define dgJPSample19 "__OTR__sound/samples/sfx_4/08" -static const ALIGN_ASSET(2) char gJPSample19[] = dgJPSample19; - -#define dgJPSample1A "__OTR__sound/samples/sfx_4/09" -static const ALIGN_ASSET(2) char gJPSample1A[] = dgJPSample1A; - -#define dgJPSample1B "__OTR__sound/samples/sfx_5/00" -static const ALIGN_ASSET(2) char gJPSample1B[] = dgJPSample1B; - -#define dgJPSample1C "__OTR__sound/samples/sfx_5/01" -static const ALIGN_ASSET(2) char gJPSample1C[] = dgJPSample1C; - -#define dgJPSample1D "__OTR__sound/samples/sfx_5/02" -static const ALIGN_ASSET(2) char gJPSample1D[] = dgJPSample1D; - -#define dgJPSample1E "__OTR__sound/samples/sfx_5/03" -static const ALIGN_ASSET(2) char gJPSample1E[] = dgJPSample1E; - -#define dgJPSample1F "__OTR__sound/samples/sfx_5/04" -static const ALIGN_ASSET(2) char gJPSample1F[] = dgJPSample1F; - -#define dgJPSample20 "__OTR__sound/samples/sfx_5/05" -static const ALIGN_ASSET(2) char gJPSample20[] = dgJPSample20; - -#define dgJPSample21 "__OTR__sound/samples/sfx_5/06" -static const ALIGN_ASSET(2) char gJPSample21[] = dgJPSample21; - -#define dgJPSample22 "__OTR__sound/samples/sfx_5/07" -static const ALIGN_ASSET(2) char gJPSample22[] = dgJPSample22; - -#define dgJPSample23 "__OTR__sound/samples/sfx_5/08" -static const ALIGN_ASSET(2) char gJPSample23[] = dgJPSample23; - -#define dgJPSample24 "__OTR__sound/samples/sfx_5/09" -static const ALIGN_ASSET(2) char gJPSample24[] = dgJPSample24; - -#define dgJPSample25 "__OTR__sound/samples/sfx_5/0A" -static const ALIGN_ASSET(2) char gJPSample25[] = dgJPSample25; - -#define dgJPSample26 "__OTR__sound/samples/sfx_5/0B" -static const ALIGN_ASSET(2) char gJPSample26[] = dgJPSample26; - -#define dgJPSample27 "__OTR__sound/samples/sfx_5/0C" -static const ALIGN_ASSET(2) char gJPSample27[] = dgJPSample27; - -#define dgJPSample28 "__OTR__sound/samples/sfx_5/0D" -static const ALIGN_ASSET(2) char gJPSample28[] = dgJPSample28; - -#define dgJPSample29 "__OTR__sound/samples/sfx_5/0E" -static const ALIGN_ASSET(2) char gJPSample29[] = dgJPSample29; - -#define dgJPSample2A "__OTR__sound/samples/sfx_5/0F" -static const ALIGN_ASSET(2) char gJPSample2A[] = dgJPSample2A; - -#define dgJPSample2B "__OTR__sound/samples/sfx_5/10" -static const ALIGN_ASSET(2) char gJPSample2B[] = dgJPSample2B; - -#define dgJPSample2C "__OTR__sound/samples/sfx_5/11" -static const ALIGN_ASSET(2) char gJPSample2C[] = dgJPSample2C; - -#define dgJPSample2D "__OTR__sound/samples/sfx_5/12" -static const ALIGN_ASSET(2) char gJPSample2D[] = dgJPSample2D; - -#define dgJPSample2E "__OTR__sound/samples/sfx_5/13" -static const ALIGN_ASSET(2) char gJPSample2E[] = dgJPSample2E; - -#define dgJPSample2F "__OTR__sound/samples/sfx_5/14" -static const ALIGN_ASSET(2) char gJPSample2F[] = dgJPSample2F; - -#define dgJPSample30 "__OTR__sound/samples/sfx_5/15" -static const ALIGN_ASSET(2) char gJPSample30[] = dgJPSample30; - -#define dgJPSample31 "__OTR__sound/samples/sfx_5/16" -static const ALIGN_ASSET(2) char gJPSample31[] = dgJPSample31; - -#define dgJPSample32 "__OTR__sound/samples/sfx_5/17" -static const ALIGN_ASSET(2) char gJPSample32[] = dgJPSample32; - -#define dgJPSample33 "__OTR__sound/samples/sfx_5/18" -static const ALIGN_ASSET(2) char gJPSample33[] = dgJPSample33; - -#define dgJPSample34 "__OTR__sound/samples/sfx_5/19" -static const ALIGN_ASSET(2) char gJPSample34[] = dgJPSample34; - -#define dgJPSample35 "__OTR__sound/samples/sfx_5/1A" -static const ALIGN_ASSET(2) char gJPSample35[] = dgJPSample35; - -#define dgJPSample36 "__OTR__sound/samples/sfx_5/1B" -static const ALIGN_ASSET(2) char gJPSample36[] = dgJPSample36; - -#define dgJPSample37 "__OTR__sound/samples/sfx_5/1C" -static const ALIGN_ASSET(2) char gJPSample37[] = dgJPSample37; - -#define dgJPSample38 "__OTR__sound/samples/sfx_6/00" -static const ALIGN_ASSET(2) char gJPSample38[] = dgJPSample38; - -#define dgJPSample39 "__OTR__sound/samples/sfx_6/01" -static const ALIGN_ASSET(2) char gJPSample39[] = dgJPSample39; - -#define dgJPSample3A "__OTR__sound/samples/sfx_6/02" -static const ALIGN_ASSET(2) char gJPSample3A[] = dgJPSample3A; - -#define dgJPSample3B "__OTR__sound/samples/sfx_6/03" -static const ALIGN_ASSET(2) char gJPSample3B[] = dgJPSample3B; - -#define dgJPSample3C "__OTR__sound/samples/sfx_6/04" -static const ALIGN_ASSET(2) char gJPSample3C[] = dgJPSample3C; - -#define dgJPSample3D "__OTR__sound/samples/sfx_6/05" -static const ALIGN_ASSET(2) char gJPSample3D[] = dgJPSample3D; - -#define dgJPSample3E "__OTR__sound/samples/sfx_6/06" -static const ALIGN_ASSET(2) char gJPSample3E[] = dgJPSample3E; - -#define dgJPSample3F "__OTR__sound/samples/sfx_6/07" -static const ALIGN_ASSET(2) char gJPSample3F[] = dgJPSample3F; - -#define dgJPSample40 "__OTR__sound/samples/sfx_6/08" -static const ALIGN_ASSET(2) char gJPSample40[] = dgJPSample40; - -#define dgJPSample41 "__OTR__sound/samples/sfx_6/09" -static const ALIGN_ASSET(2) char gJPSample41[] = dgJPSample41; - -#define dgJPSample42 "__OTR__sound/samples/sfx_6/0A" -static const ALIGN_ASSET(2) char gJPSample42[] = dgJPSample42; - -#define dgJPSample43 "__OTR__sound/samples/sfx_6/0B" -static const ALIGN_ASSET(2) char gJPSample43[] = dgJPSample43; - -#define dgJPSample44 "__OTR__sound/samples/sfx_6/0C" -static const ALIGN_ASSET(2) char gJPSample44[] = dgJPSample44; - -#define dgJPSample45 "__OTR__sound/samples/sfx_6/0D" -static const ALIGN_ASSET(2) char gJPSample45[] = dgJPSample45; - -#define dgJPSample46 "__OTR__sound/samples/sfx_7/00" -static const ALIGN_ASSET(2) char gJPSample46[] = dgJPSample46; - -#define dgJPSample47 "__OTR__sound/samples/sfx_7/01" -static const ALIGN_ASSET(2) char gJPSample47[] = dgJPSample47; - -#define dgJPSample48 "__OTR__sound/samples/sfx_7/02" -static const ALIGN_ASSET(2) char gJPSample48[] = dgJPSample48; - -#define dgJPSample49 "__OTR__sound/samples/sfx_7/03" -static const ALIGN_ASSET(2) char gJPSample49[] = dgJPSample49; - -#define dgJPSample4A "__OTR__sound/samples/sfx_7/04" -static const ALIGN_ASSET(2) char gJPSample4A[] = dgJPSample4A; - -#define dgJPSample4B "__OTR__sound/samples/sfx_7/05" -static const ALIGN_ASSET(2) char gJPSample4B[] = dgJPSample4B; - -#define dgJPSample4C "__OTR__sound/samples/sfx_7/06" -static const ALIGN_ASSET(2) char gJPSample4C[] = dgJPSample4C; - -#define dgJPSample4D "__OTR__sound/samples/sfx_7/07" -static const ALIGN_ASSET(2) char gJPSample4D[] = dgJPSample4D; - -#define dgJPSample4E "__OTR__sound/samples/sfx_7/08" -static const ALIGN_ASSET(2) char gJPSample4E[] = dgJPSample4E; - -#define dgJPSample4F "__OTR__sound/samples/sfx_7/09" -static const ALIGN_ASSET(2) char gJPSample4F[] = dgJPSample4F; - -#define dgJPSample50 "__OTR__sound/samples/sfx_7/0A" -static const ALIGN_ASSET(2) char gJPSample50[] = dgJPSample50; - -#define dgJPSample51 "__OTR__sound/samples/sfx_7/0B" -static const ALIGN_ASSET(2) char gJPSample51[] = dgJPSample51; - -#define dgJPSample52 "__OTR__sound/samples/sfx_7/0C" -static const ALIGN_ASSET(2) char gJPSample52[] = dgJPSample52; - -#define dgJPSample53 "__OTR__sound/samples/sfx_mario/00_mario_jump_hoo" -static const ALIGN_ASSET(2) char gJPSample53[] = dgJPSample53; - -#define dgJPSample54 "__OTR__sound/samples/sfx_mario/01_mario_jump_wah" -static const ALIGN_ASSET(2) char gJPSample54[] = dgJPSample54; - -#define dgJPSample55 "__OTR__sound/samples/sfx_mario/02_mario_yah" -static const ALIGN_ASSET(2) char gJPSample55[] = dgJPSample55; - -#define dgJPSample56 "__OTR__sound/samples/sfx_mario/03_mario_haha" -static const ALIGN_ASSET(2) char gJPSample56[] = dgJPSample56; - -#define dgJPSample57 "__OTR__sound/samples/sfx_mario/04_mario_yahoo" -static const ALIGN_ASSET(2) char gJPSample57[] = dgJPSample57; - -#define dgJPSample58 "__OTR__sound/samples/sfx_mario/05_mario_uh" -static const ALIGN_ASSET(2) char gJPSample58[] = dgJPSample58; - -#define dgJPSample59 "__OTR__sound/samples/sfx_mario/06_mario_hrmm" -static const ALIGN_ASSET(2) char gJPSample59[] = dgJPSample59; - -#define dgJPSample5A "__OTR__sound/samples/sfx_mario/07_mario_wah2" -static const ALIGN_ASSET(2) char gJPSample5A[] = dgJPSample5A; - -#define dgJPSample5B "__OTR__sound/samples/sfx_mario/08_mario_whoa" -static const ALIGN_ASSET(2) char gJPSample5B[] = dgJPSample5B; - -#define dgJPSample5C "__OTR__sound/samples/sfx_mario/09_mario_eeuh" -static const ALIGN_ASSET(2) char gJPSample5C[] = dgJPSample5C; - -#define dgJPSample5D "__OTR__sound/samples/sfx_mario/0A_mario_attacked" -static const ALIGN_ASSET(2) char gJPSample5D[] = dgJPSample5D; - -#define dgJPSample5E "__OTR__sound/samples/sfx_mario/0B_mario_ooof" -static const ALIGN_ASSET(2) char gJPSample5E[] = dgJPSample5E; - -#define dgJPSample5F "__OTR__sound/samples/sfx_mario/0C_mario_here_we_go" -static const ALIGN_ASSET(2) char gJPSample5F[] = dgJPSample5F; - -#define dgJPSample60 "__OTR__sound/samples/sfx_mario/0D_mario_yawning" -static const ALIGN_ASSET(2) char gJPSample60[] = dgJPSample60; - -#define dgJPSample61 "__OTR__sound/samples/sfx_mario/0E_mario_snoring1" -static const ALIGN_ASSET(2) char gJPSample61[] = dgJPSample61; - -#define dgJPSample62 "__OTR__sound/samples/sfx_mario/0F_mario_snoring2" -static const ALIGN_ASSET(2) char gJPSample62[] = dgJPSample62; - -#define dgJPSample63 "__OTR__sound/samples/sfx_9/00" -static const ALIGN_ASSET(2) char gJPSample63[] = dgJPSample63; - -#define dgJPSample64 "__OTR__sound/samples/sfx_9/01" -static const ALIGN_ASSET(2) char gJPSample64[] = dgJPSample64; - -#define dgJPSample65 "__OTR__sound/samples/sfx_9/02" -static const ALIGN_ASSET(2) char gJPSample65[] = dgJPSample65; - -#define dgJPSample66 "__OTR__sound/samples/sfx_9/03" -static const ALIGN_ASSET(2) char gJPSample66[] = dgJPSample66; - -#define dgJPSample67 "__OTR__sound/samples/sfx_9/04_camera_buzz" -static const ALIGN_ASSET(2) char gJPSample67[] = dgJPSample67; - -#define dgJPSample68 "__OTR__sound/samples/sfx_9/05_camera_shutter" -static const ALIGN_ASSET(2) char gJPSample68[] = dgJPSample68; - -#define dgJPSample69 "__OTR__sound/samples/sfx_9/06" -static const ALIGN_ASSET(2) char gJPSample69[] = dgJPSample69; - -#define dgJPSample6A "__OTR__sound/samples/sfx_mario_peach/00_mario_waaaooow" -static const ALIGN_ASSET(2) char gJPSample6A[] = dgJPSample6A; - -#define dgJPSample6B "__OTR__sound/samples/sfx_mario_peach/01_mario_hoohoo" -static const ALIGN_ASSET(2) char gJPSample6B[] = dgJPSample6B; - -#define dgJPSample6C "__OTR__sound/samples/sfx_mario_peach/02_mario_panting" -static const ALIGN_ASSET(2) char gJPSample6C[] = dgJPSample6C; - -#define dgJPSample6D "__OTR__sound/samples/sfx_mario_peach/03_mario_dying" -static const ALIGN_ASSET(2) char gJPSample6D[] = dgJPSample6D; - -#define dgJPSample6E "__OTR__sound/samples/sfx_mario_peach/04_mario_on_fire" -static const ALIGN_ASSET(2) char gJPSample6E[] = dgJPSample6E; - -#define dgJPSample6F "__OTR__sound/samples/sfx_mario_peach/05_mario_uh2" -static const ALIGN_ASSET(2) char gJPSample6F[] = dgJPSample6F; - -#define dgJPSample70 "__OTR__sound/samples/sfx_mario_peach/06_mario_coughing" -static const ALIGN_ASSET(2) char gJPSample70[] = dgJPSample70; - -#define dgJPSample71 "__OTR__sound/samples/sfx_mario_peach/07_mario_its_a_me_mario" -static const ALIGN_ASSET(2) char gJPSample71[] = dgJPSample71; - -#define dgJPSample72 "__OTR__sound/samples/sfx_mario_peach/08_mario_punch_yah" -static const ALIGN_ASSET(2) char gJPSample72[] = dgJPSample72; - -#define dgJPSample73 "__OTR__sound/samples/sfx_mario_peach/09_mario_punch_hoo" -static const ALIGN_ASSET(2) char gJPSample73[] = dgJPSample73; - -#define dgJPSample74 "__OTR__sound/samples/sfx_mario_peach/0A_mario_mama_mia" -static const ALIGN_ASSET(2) char gJPSample74[] = dgJPSample74; - -#define dgJPSample75 "__OTR__sound/samples/sfx_mario_peach/0B_mario_okey_dokey" -static const ALIGN_ASSET(2) char gJPSample75[] = dgJPSample75; - -#define dgJPSample76 "__OTR__sound/samples/sfx_mario_peach/0C_mario_drowning" -static const ALIGN_ASSET(2) char gJPSample76[] = dgJPSample76; - -#define dgJPSample77 "__OTR__sound/samples/sfx_mario_peach/0D_mario_thank_you_playing_my_game" -static const ALIGN_ASSET(2) char gJPSample77[] = dgJPSample77; - -#define dgJPSample78 "__OTR__sound/samples/instruments/00" -static const ALIGN_ASSET(2) char gJPSample78[] = dgJPSample78; - -#define dgJPSample79 "__OTR__sound/samples/instruments/01_banjo_1" -static const ALIGN_ASSET(2) char gJPSample79[] = dgJPSample79; - -#define dgJPSample7A "__OTR__sound/samples/instruments/02" -static const ALIGN_ASSET(2) char gJPSample7A[] = dgJPSample7A; - -#define dgJPSample7B "__OTR__sound/samples/instruments/03_human_whistle" -static const ALIGN_ASSET(2) char gJPSample7B[] = dgJPSample7B; - -#define dgJPSample7C "__OTR__sound/samples/instruments/04_bright_piano" -static const ALIGN_ASSET(2) char gJPSample7C[] = dgJPSample7C; - -#define dgJPSample7D "__OTR__sound/samples/instruments/05_acoustic_bass" -static const ALIGN_ASSET(2) char gJPSample7D[] = dgJPSample7D; - -#define dgJPSample7E "__OTR__sound/samples/instruments/06_kick_drum_1" -static const ALIGN_ASSET(2) char gJPSample7E[] = dgJPSample7E; - -#define dgJPSample7F "__OTR__sound/samples/instruments/07_rimshot" -static const ALIGN_ASSET(2) char gJPSample7F[] = dgJPSample7F; - -#define dgJPSample80 "__OTR__sound/samples/instruments/08" -static const ALIGN_ASSET(2) char gJPSample80[] = dgJPSample80; - -#define dgJPSample81 "__OTR__sound/samples/instruments/09" -static const ALIGN_ASSET(2) char gJPSample81[] = dgJPSample81; - -#define dgJPSample82 "__OTR__sound/samples/instruments/0A_tambourine" -static const ALIGN_ASSET(2) char gJPSample82[] = dgJPSample82; - -#define dgJPSample83 "__OTR__sound/samples/instruments/0B" -static const ALIGN_ASSET(2) char gJPSample83[] = dgJPSample83; - -#define dgJPSample84 "__OTR__sound/samples/instruments/0C_conga_stick" -static const ALIGN_ASSET(2) char gJPSample84[] = dgJPSample84; - -#define dgJPSample85 "__OTR__sound/samples/instruments/0D_clave" -static const ALIGN_ASSET(2) char gJPSample85[] = dgJPSample85; - -#define dgJPSample86 "__OTR__sound/samples/instruments/0E_hihat_closed" -static const ALIGN_ASSET(2) char gJPSample86[] = dgJPSample86; - -#define dgJPSample87 "__OTR__sound/samples/instruments/0F_hihat_open" -static const ALIGN_ASSET(2) char gJPSample87[] = dgJPSample87; - -#define dgJPSample88 "__OTR__sound/samples/instruments/10_cymbal_bell" -static const ALIGN_ASSET(2) char gJPSample88[] = dgJPSample88; - -#define dgJPSample89 "__OTR__sound/samples/instruments/11_splash_cymbal" -static const ALIGN_ASSET(2) char gJPSample89[] = dgJPSample89; - -#define dgJPSample8A "__OTR__sound/samples/instruments/12_snare_drum_1" -static const ALIGN_ASSET(2) char gJPSample8A[] = dgJPSample8A; - -#define dgJPSample8B "__OTR__sound/samples/instruments/13_snare_drum_2" -static const ALIGN_ASSET(2) char gJPSample8B[] = dgJPSample8B; - -#define dgJPSample8C "__OTR__sound/samples/instruments/14_strings_5" -static const ALIGN_ASSET(2) char gJPSample8C[] = dgJPSample8C; - -#define dgJPSample8D "__OTR__sound/samples/instruments/15_strings_4" -static const ALIGN_ASSET(2) char gJPSample8D[] = dgJPSample8D; - -#define dgJPSample8E "__OTR__sound/samples/instruments/16_french_horns" -static const ALIGN_ASSET(2) char gJPSample8E[] = dgJPSample8E; - -#define dgJPSample8F "__OTR__sound/samples/instruments/17_trumpet" -static const ALIGN_ASSET(2) char gJPSample8F[] = dgJPSample8F; - -#define dgJPSample90 "__OTR__sound/samples/instruments/18_timpani" -static const ALIGN_ASSET(2) char gJPSample90[] = dgJPSample90; - -#define dgJPSample91 "__OTR__sound/samples/instruments/19_brass" -static const ALIGN_ASSET(2) char gJPSample91[] = dgJPSample91; - -#define dgJPSample92 "__OTR__sound/samples/instruments/1A_slap_bass" -static const ALIGN_ASSET(2) char gJPSample92[] = dgJPSample92; - -#define dgJPSample93 "__OTR__sound/samples/instruments/1B_organ_2" -static const ALIGN_ASSET(2) char gJPSample93[] = dgJPSample93; - -#define dgJPSample94 "__OTR__sound/samples/instruments/1C" -static const ALIGN_ASSET(2) char gJPSample94[] = dgJPSample94; - -#define dgJPSample95 "__OTR__sound/samples/instruments/1D" -static const ALIGN_ASSET(2) char gJPSample95[] = dgJPSample95; - -#define dgJPSample96 "__OTR__sound/samples/instruments/1E_closed_triangle" -static const ALIGN_ASSET(2) char gJPSample96[] = dgJPSample96; - -#define dgJPSample97 "__OTR__sound/samples/instruments/1F_open_triangle" -static const ALIGN_ASSET(2) char gJPSample97[] = dgJPSample97; - -#define dgJPSample98 "__OTR__sound/samples/instruments/20_cabasa" -static const ALIGN_ASSET(2) char gJPSample98[] = dgJPSample98; - -#define dgJPSample99 "__OTR__sound/samples/instruments/21_sine_bass" -static const ALIGN_ASSET(2) char gJPSample99[] = dgJPSample99; - -#define dgJPSample9A "__OTR__sound/samples/instruments/22_boys_choir" -static const ALIGN_ASSET(2) char gJPSample9A[] = dgJPSample9A; - -#define dgJPSample9B "__OTR__sound/samples/instruments/23_strings_1" -static const ALIGN_ASSET(2) char gJPSample9B[] = dgJPSample9B; - -#define dgJPSample9C "__OTR__sound/samples/instruments/24_strings_2" -static const ALIGN_ASSET(2) char gJPSample9C[] = dgJPSample9C; - -#define dgJPSample9D "__OTR__sound/samples/instruments/25_strings_3" -static const ALIGN_ASSET(2) char gJPSample9D[] = dgJPSample9D; - -#define dgJPSample9E "__OTR__sound/samples/instruments/26_crystal_rhodes" -static const ALIGN_ASSET(2) char gJPSample9E[] = dgJPSample9E; - -#define dgJPSample9F "__OTR__sound/samples/instruments/27_harpsichord" -static const ALIGN_ASSET(2) char gJPSample9F[] = dgJPSample9F; - -#define dgJPSampleA0 "__OTR__sound/samples/instruments/28_sitar_1" -static const ALIGN_ASSET(2) char gJPSampleA0[] = dgJPSampleA0; - -#define dgJPSampleA1 "__OTR__sound/samples/instruments/29_orchestra_hit" -static const ALIGN_ASSET(2) char gJPSampleA1[] = dgJPSampleA1; - -#define dgJPSampleA2 "__OTR__sound/samples/instruments/2A" -static const ALIGN_ASSET(2) char gJPSampleA2[] = dgJPSampleA2; - -#define dgJPSampleA3 "__OTR__sound/samples/instruments/2B" -static const ALIGN_ASSET(2) char gJPSampleA3[] = dgJPSampleA3; - -#define dgJPSampleA4 "__OTR__sound/samples/instruments/2C" -static const ALIGN_ASSET(2) char gJPSampleA4[] = dgJPSampleA4; - -#define dgJPSampleA5 "__OTR__sound/samples/instruments/2D_trombone" -static const ALIGN_ASSET(2) char gJPSampleA5[] = dgJPSampleA5; - -#define dgJPSampleA6 "__OTR__sound/samples/instruments/2E_accordion" -static const ALIGN_ASSET(2) char gJPSampleA6[] = dgJPSampleA6; - -#define dgJPSampleA7 "__OTR__sound/samples/instruments/2F_sleigh_bells" -static const ALIGN_ASSET(2) char gJPSampleA7[] = dgJPSampleA7; - -#define dgJPSampleA8 "__OTR__sound/samples/instruments/30_rarefaction-lahna" -static const ALIGN_ASSET(2) char gJPSampleA8[] = dgJPSampleA8; - -#define dgJPSampleA9 "__OTR__sound/samples/instruments/31_rarefaction-convolution" -static const ALIGN_ASSET(2) char gJPSampleA9[] = dgJPSampleA9; - -#define dgJPSampleAA "__OTR__sound/samples/instruments/32_metal_rimshot" -static const ALIGN_ASSET(2) char gJPSampleAA[] = dgJPSampleAA; - -#define dgJPSampleAB "__OTR__sound/samples/instruments/33_kick_drum_2" -static const ALIGN_ASSET(2) char gJPSampleAB[] = dgJPSampleAB; - -#define dgJPSampleAC "__OTR__sound/samples/instruments/34_alto_flute" -static const ALIGN_ASSET(2) char gJPSampleAC[] = dgJPSampleAC; - -#define dgJPSampleAD "__OTR__sound/samples/instruments/35_gospel_organ" -static const ALIGN_ASSET(2) char gJPSampleAD[] = dgJPSampleAD; - -#define dgJPSampleAE "__OTR__sound/samples/instruments/36_sawtooth_synth" -static const ALIGN_ASSET(2) char gJPSampleAE[] = dgJPSampleAE; - -#define dgJPSampleAF "__OTR__sound/samples/instruments/37_square_synth" -static const ALIGN_ASSET(2) char gJPSampleAF[] = dgJPSampleAF; - -#define dgJPSampleB0 "__OTR__sound/samples/instruments/38_electric_kick_drum" -static const ALIGN_ASSET(2) char gJPSampleB0[] = dgJPSampleB0; - -#define dgJPSampleB1 "__OTR__sound/samples/instruments/39_sitar_2" -static const ALIGN_ASSET(2) char gJPSampleB1[] = dgJPSampleB1; - -#define dgJPSampleB2 "__OTR__sound/samples/instruments/3A_music_box" -static const ALIGN_ASSET(2) char gJPSampleB2[] = dgJPSampleB2; - -#define dgJPSampleB3 "__OTR__sound/samples/instruments/3B_banjo_2" -static const ALIGN_ASSET(2) char gJPSampleB3[] = dgJPSampleB3; - -#define dgJPSampleB4 "__OTR__sound/samples/instruments/3C_acoustic_guitar" -static const ALIGN_ASSET(2) char gJPSampleB4[] = dgJPSampleB4; - -#define dgJPSampleB5 "__OTR__sound/samples/instruments/3D" -static const ALIGN_ASSET(2) char gJPSampleB5[] = dgJPSampleB5; - -#define dgJPSampleB6 "__OTR__sound/samples/instruments/3E_monk_choir" -static const ALIGN_ASSET(2) char gJPSampleB6[] = dgJPSampleB6; - -#define dgJPSampleB7 "__OTR__sound/samples/instruments/3F" -static const ALIGN_ASSET(2) char gJPSampleB7[] = dgJPSampleB7; - -#define dgJPSampleB8 "__OTR__sound/samples/instruments/40_bell" -static const ALIGN_ASSET(2) char gJPSampleB8[] = dgJPSampleB8; - -#define dgJPSampleB9 "__OTR__sound/samples/instruments/41_pan_flute" -static const ALIGN_ASSET(2) char gJPSampleB9[] = dgJPSampleB9; - -#define dgJPSampleBA "__OTR__sound/samples/instruments/42_vibraphone" -static const ALIGN_ASSET(2) char gJPSampleBA[] = dgJPSampleBA; - -#define dgJPSampleBB "__OTR__sound/samples/instruments/43_harmonica" -static const ALIGN_ASSET(2) char gJPSampleBB[] = dgJPSampleBB; - -#define dgJPSampleBC "__OTR__sound/samples/instruments/44_grand_piano" -static const ALIGN_ASSET(2) char gJPSampleBC[] = dgJPSampleBC; - -#define dgJPSampleBD "__OTR__sound/samples/instruments/45_french_horns_lq" -static const ALIGN_ASSET(2) char gJPSampleBD[] = dgJPSampleBD; - -#define dgJPSampleBE "__OTR__sound/samples/instruments/46_pizzicato_strings_1" -static const ALIGN_ASSET(2) char gJPSampleBE[] = dgJPSampleBE; - -#define dgJPSampleBF "__OTR__sound/samples/instruments/47_pizzicato_strings_2" -static const ALIGN_ASSET(2) char gJPSampleBF[] = dgJPSampleBF; - -#define dgJPSampleC0 "__OTR__sound/samples/instruments/48_steel_drum" -static const ALIGN_ASSET(2) char gJPSampleC0[] = dgJPSampleC0; - -#define dgJPSampleC1 "__OTR__sound/samples/piranha_music_box/00_music_box" -static const ALIGN_ASSET(2) char gJPSampleC1[] = dgJPSampleC1; - -#define dgJPSampleC2 "__OTR__sound/samples/course_start/00_la" -static const ALIGN_ASSET(2) char gJPSampleC2[] = dgJPSampleC2; - -#define dgJPSampleC3 "__OTR__sound/samples/bowser_organ/00_organ_1" -static const ALIGN_ASSET(2) char gJPSampleC3[] = dgJPSampleC3; - -#define dgJPSampleC4 "__OTR__sound/samples/bowser_organ/01_organ_1_lq" -static const ALIGN_ASSET(2) char gJPSampleC4[] = dgJPSampleC4; - -#define dgJPSampleC5 "__OTR__sound/samples/bowser_organ/02_boys_choir" -static const ALIGN_ASSET(2) char gJPSampleC5[] = dgJPSampleC5; - -static const char* gJPSampleTable[] = { - gJPSample00, gJPSample01, gJPSample02, gJPSample03, - gJPSample04, gJPSample05, gJPSample06, gJPSample07, - gJPSample08, gJPSample09, gJPSample0A, gJPSample0B, - gJPSample0C, gJPSample0D, gJPSample0E, gJPSample0F, - gJPSample10, gJPSample11, gJPSample12, gJPSample13, - gJPSample14, gJPSample15, gJPSample16, gJPSample17, - gJPSample18, gJPSample19, gJPSample1A, gJPSample1B, - gJPSample1C, gJPSample1D, gJPSample1E, gJPSample1F, - gJPSample20, gJPSample21, gJPSample22, gJPSample23, - gJPSample24, gJPSample25, gJPSample26, gJPSample27, - gJPSample28, gJPSample29, gJPSample2A, gJPSample2B, - gJPSample2C, gJPSample2D, gJPSample2E, gJPSample2F, - gJPSample30, gJPSample31, gJPSample32, gJPSample33, - gJPSample34, gJPSample35, gJPSample36, gJPSample37, - gJPSample38, gJPSample39, gJPSample3A, gJPSample3B, - gJPSample3C, gJPSample3D, gJPSample3E, gJPSample3F, - gJPSample40, gJPSample41, gJPSample42, gJPSample43, - gJPSample44, gJPSample45, gJPSample46, gJPSample47, - gJPSample48, gJPSample49, gJPSample4A, gJPSample4B, - gJPSample4C, gJPSample4D, gJPSample4E, gJPSample4F, - gJPSample50, gJPSample51, gJPSample52, gJPSample53, - gJPSample54, gJPSample55, gJPSample56, gJPSample57, - gJPSample58, gJPSample59, gJPSample5A, gJPSample5B, - gJPSample5C, gJPSample5D, gJPSample5E, gJPSample5F, - gJPSample60, gJPSample61, gJPSample62, gJPSample63, - gJPSample64, gJPSample65, gJPSample66, gJPSample67, - gJPSample68, gJPSample69, gJPSample6A, gJPSample6B, - gJPSample6C, gJPSample6D, gJPSample6E, gJPSample6F, - gJPSample70, gJPSample71, gJPSample72, gJPSample73, - gJPSample74, gJPSample75, gJPSample76, gJPSample77, - gJPSample78, gJPSample79, gJPSample7A, gJPSample7B, - gJPSample7C, gJPSample7D, gJPSample7E, gJPSample7F, - gJPSample80, gJPSample81, gJPSample82, gJPSample83, - gJPSample84, gJPSample85, gJPSample86, gJPSample87, - gJPSample88, gJPSample89, gJPSample8A, gJPSample8B, - gJPSample8C, gJPSample8D, gJPSample8E, gJPSample8F, - gJPSample90, gJPSample91, gJPSample92, gJPSample93, - gJPSample94, gJPSample95, gJPSample96, gJPSample97, - gJPSample98, gJPSample99, gJPSample9A, gJPSample9B, - gJPSample9C, gJPSample9D, gJPSample9E, gJPSample9F, - gJPSampleA0, gJPSampleA1, gJPSampleA2, gJPSampleA3, - gJPSampleA4, gJPSampleA5, gJPSampleA6, gJPSampleA7, - gJPSampleA8, gJPSampleA9, gJPSampleAA, gJPSampleAB, - gJPSampleAC, gJPSampleAD, gJPSampleAE, gJPSampleAF, - gJPSampleB0, gJPSampleB1, gJPSampleB2, gJPSampleB3, - gJPSampleB4, gJPSampleB5, gJPSampleB6, gJPSampleB7, - gJPSampleB8, gJPSampleB9, gJPSampleBA, gJPSampleBB, - gJPSampleBC, gJPSampleBD, gJPSampleBE, gJPSampleBF, - gJPSampleC0, gJPSampleC1, gJPSampleC2, gJPSampleC3, - gJPSampleC4, gJPSampleC5 -}; diff --git a/src/factories/AudioHeaderFactory.cpp b/src/factories/AudioHeaderFactory.cpp index b33d057..d1cceb5 100644 --- a/src/factories/AudioHeaderFactory.cpp +++ b/src/factories/AudioHeaderFactory.cpp @@ -4,7 +4,6 @@ #include "audio/AudioManager.h" std::optional<std::shared_ptr<IParsedData>> AudioHeaderFactory::parse(std::vector<uint8_t>& buffer, YAML::Node& data) { - AudioManager::Instance = new AudioManager(); AudioManager::Instance->initialize(buffer, data); return std::nullopt; }
\ No newline at end of file diff --git a/src/factories/BankFactory.cpp b/src/factories/BankFactory.cpp index 7c8c2e8..5c057d7 100644 --- a/src/factories/BankFactory.cpp +++ b/src/factories/BankFactory.cpp @@ -1,6 +1,5 @@ #include "BankFactory.h" #include "Companion.h" -#include "audio/samples_table.h" void BankBinaryExporter::Export(std::ostream &write, std::shared_ptr<IParsedData> raw, std::string& entryName, YAML::Node &node, std::string* replacement ) { auto writer = LUS::BinaryWriter(); @@ -8,78 +7,78 @@ void BankBinaryExporter::Export(std::ostream &write, std::shared_ptr<IParsedData WriteHeader(writer, LUS::ResourceType::Bank, 0); writer.Write(bank->mBankId); - writer.Write((uint32_t) bank->mBank.insts.size()); + writer.Write(static_cast<uint32_t>(bank->mBank.insts.size())); for (auto& instrument : bank->mBank.insts) { - writer.Write((uint8_t) instrument.valid); + writer.Write(static_cast<uint8_t>(instrument.valid)); if(!instrument.valid) continue; - writer.Write((uint8_t) instrument.releaseRate); - writer.Write((uint8_t) instrument.normalRangeLo); - writer.Write((uint8_t) instrument.normalRangeHi); + writer.Write(instrument.releaseRate); + writer.Write(instrument.normalRangeLo); + writer.Write(instrument.normalRangeHi); - auto envelope = bank->mBank.envelopes[instrument.envelope]; - if(!envelope.entries.empty()){ - writer.Write((uint32_t) envelope.entries.size()); - for (auto& entry : envelope.entries) { - writer.Write((uint16_t) entry.delay); - writer.Write((uint16_t) entry.arg); + auto [name, entries] = bank->mBank.envelopes[instrument.envelope]; + if(!entries.empty()){ + writer.Write(static_cast<uint32_t>(entries.size())); + for (auto& [delay, arg] : entries) { + writer.Write(static_cast<uint16_t>(delay)); + writer.Write(static_cast<uint16_t>(arg)); } } else { - writer.Write((uint32_t) 0); + writer.Write(static_cast<uint32_t>(0)); } uint32_t soundFlags = 0; - bool hasLo = instrument.soundLo.has_value(); - bool hasMed = instrument.soundMed.has_value(); - bool hasHi = instrument.soundHi.has_value(); + const bool hasLo = instrument.soundLo.has_value(); + const bool hasMed = instrument.soundMed.has_value(); + const bool hasHi = instrument.soundHi.has_value(); if(hasLo){ - soundFlags |= (1 << 0); + soundFlags |= 1 << 0; } if(hasMed){ - soundFlags |= (1 << 1); + soundFlags |= 1 << 1; } if(hasHi){ - soundFlags |= (1 << 2); + soundFlags |= 1 << 2; } - writer.Write((uint32_t) soundFlags); + writer.Write(soundFlags); if(hasLo){ - auto value = instrument.soundLo.value(); - uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[value.offset]); - writer.Write(std::string(bank->mSampleTable[idx])); - writer.Write(value.tuning); + auto [offset, tuning] = instrument.soundLo.value(); + const uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[offset]); + writer.Write(AudioManager::Instance->get_sample(idx)); + writer.Write(tuning); } if(hasMed){ - auto value = instrument.soundMed.value(); - uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[value.offset]); - writer.Write(std::string(bank->mSampleTable[idx])); - writer.Write(value.tuning); + auto [offset, tuning] = instrument.soundMed.value(); + const uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[offset]); + writer.Write(AudioManager::Instance->get_sample(idx)); + writer.Write(tuning); } if(hasHi){ - auto value = instrument.soundHi.value(); - uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[value.offset]); - writer.Write(std::string(bank->mSampleTable[idx])); - writer.Write(value.tuning); + auto [offset, tuning] = instrument.soundHi.value(); + const uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[offset]); + writer.Write(AudioManager::Instance->get_sample(idx)); + writer.Write(tuning); } } - writer.Write((uint32_t) bank->mBank.drums.size()); + writer.Write(static_cast<uint32_t>(bank->mBank.drums.size())); for(auto &drum : bank->mBank.drums){ - writer.Write((uint8_t) drum.releaseRate); - writer.Write((uint8_t) drum.pan); + writer.Write(drum.releaseRate); + writer.Write(drum.pan); auto envelope = bank->mBank.envelopes[drum.envelope]; if(!envelope.entries.empty()){ - writer.Write((uint32_t) envelope.entries.size()); + writer.Write(static_cast<uint32_t>(envelope.entries.size())); for(auto &entry : envelope.entries){ writer.Write(entry.delay); writer.Write(entry.arg); } } else { - writer.Write((uint32_t) 0); + writer.Write(static_cast<uint32_t>(0)); } - uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[drum.sound.offset]); - std::string out = std::string(bank->mSampleTable[idx]); + const uint32_t idx = AudioManager::Instance->get_index(bank->mBank.samples[drum.sound.offset]); + const auto out = AudioManager::Instance->get_sample(idx); writer.Write(out); writer.Write(drum.sound.tuning); } @@ -95,6 +94,5 @@ std::optional<std::shared_ptr<IParsedData>> BankFactory::parse(std::vector<uint8 throw std::runtime_error("AudioManager not initialized"); } - auto gSampleTable = Companion::Instance->GetCartridge()->GetCountry() == N64::CountryCode::Japan ? gJPSampleTable : gUSSampleTable; - return std::make_shared<BankData>(banks[bankId], bankId, gSampleTable); + return std::make_shared<BankData>(banks[bankId], bankId); }
\ No newline at end of file diff --git a/src/factories/BankFactory.h b/src/factories/BankFactory.h index bdabe10..b5298de 100644 --- a/src/factories/BankFactory.h +++ b/src/factories/BankFactory.h @@ -1,5 +1,7 @@ #pragma once +#include <utility> + #include "BaseFactory.h" #include "audio/AudioManager.h" @@ -7,9 +9,8 @@ class BankData : public IParsedData { public: Bank mBank; uint32_t mBankId; - const char** mSampleTable; - BankData(Bank bank, uint32_t bankId, const char** sampleTable) : mBank(bank), mBankId(bankId), mSampleTable(sampleTable) {} + BankData(Bank bank, const uint32_t bankId) : mBank(std::move(bank)), mBankId(bankId) {} }; class BankBinaryExporter : public BaseExporter { |