diff --git a/DataSpec/CMakeLists.txt b/DataSpec/CMakeLists.txt index 95d64378b..0e69fa653 100644 --- a/DataSpec/CMakeLists.txt +++ b/DataSpec/CMakeLists.txt @@ -57,6 +57,7 @@ add_library(RetroDataSpec SpecMP1.cpp ${DNAMP1_SOURCES} ${ScriptObjectsMP1_SOURCES} + ${DNAMP1_SFX_SOURCES} SpecMP2.cpp ${DNAMP2_SOURCES} SpecMP3.cpp diff --git a/DataSpec/DNACommon/DeafBabe.cpp b/DataSpec/DNACommon/DeafBabe.cpp index 1988a2cf3..eb08ea1ca 100644 --- a/DataSpec/DNACommon/DeafBabe.cpp +++ b/DataSpec/DNACommon/DeafBabe.cpp @@ -170,7 +170,7 @@ void DeafBabeBuildFromBlender(DEAFBABE& db, const hecl::blender::ColMesh& colMes dbMat.setSurfaceDirt(mat.surfaceDirt); dbMat.setSurfaceLava(mat.surfaceLava); dbMat.setSurfaceSPMetal(mat.surfaceSPMetal); - dbMat.setSurfaceStoneRock(mat.surfaceStoneRock); + dbMat.setSurfaceLavaStone(mat.surfaceLavaStone); dbMat.setSurfaceSnow(mat.surfaceSnow); dbMat.setSurfaceMudSlow(mat.surfaceMudSlow); dbMat.setSurfaceFabric(mat.surfaceFabric); diff --git a/DataSpec/DNACommon/PAK.cpp b/DataSpec/DNACommon/PAK.cpp index 790dcac1a..d5ab71a05 100644 --- a/DataSpec/DNACommon/PAK.cpp +++ b/DataSpec/DNACommon/PAK.cpp @@ -372,7 +372,7 @@ hecl::ProjectPath PAKRouter::getWorking(const EntryType* entry) cons { if (!entry) return hecl::ProjectPath(); - return getWorking(entry, BRIDGETYPE::LookupExtractor(*m_pak.get(), *entry)); + return getWorking(entry, BRIDGETYPE::LookupExtractor(*m_node.get(), *m_pak.get(), *entry)); } template @@ -440,6 +440,7 @@ hecl::ProjectPath PAKRouter::getCooked(const IDType& id, bool silenc template hecl::SystemString PAKRouter::getResourceRelativePath(const EntryType& a, const IDType& b) const { + const nod::Node* node = m_node.get(); const PAKType* pak = m_pak.get(); if (!pak) LogDNACommon.report(logvisor::Fatal, @@ -447,11 +448,11 @@ hecl::SystemString PAKRouter::getResourceRelativePath(const EntryTyp const typename BRIDGETYPE::PAKType::Entry* be = lookupEntry(b); if (!be) return hecl::SystemString(); - hecl::ProjectPath aPath = getWorking(&a, BRIDGETYPE::LookupExtractor(*pak, a)); + hecl::ProjectPath aPath = getWorking(&a, BRIDGETYPE::LookupExtractor(*node, *pak, a)); hecl::SystemString ret; for (int i=0 ; i::getBestEntryName(const EntryType& entry, bool } bool named; - name = pak.bestEntryName(entry, named); + name = pak.bestEntryName(bridge.getNode(), entry, named); if (named) return name; } @@ -508,7 +509,7 @@ std::string PAKRouter::getBestEntryName(const IDType& entry, bool st } bool named; - name = pak.bestEntryName(*e, named); + name = pak.bestEntryName(bridge.getNode(), *e, named); if (named) return name; } @@ -528,7 +529,7 @@ bool PAKRouter::extractResources(const BRIDGETYPE& pakBridge, bool f for (const auto& item : m_pak->m_firstEntries) { const auto* entryPtr = m_pak->lookupEntry(item); - ResExtractor extractor = BRIDGETYPE::LookupExtractor(*m_pak.get(), *entryPtr); + ResExtractor extractor = BRIDGETYPE::LookupExtractor(*m_node.get(), *m_pak.get(), *entryPtr); if (extractor.weight != w) continue; diff --git a/DataSpec/DNAMP1/AGSC.cpp b/DataSpec/DNAMP1/AGSC.cpp index 28365224d..98053f14c 100644 --- a/DataSpec/DNAMP1/AGSC.cpp +++ b/DataSpec/DNAMP1/AGSC.cpp @@ -1,101 +1,247 @@ #include "AGSC.hpp" +#include "amuse/AudioGroup.hpp" +#include "amuse/AudioGroupData.hpp" + +extern "C" const uint8_t Atomic_H[]; +extern "C" const uint8_t BetaBeetle_H[]; +extern "C" const uint8_t Bird_H[]; +extern "C" const uint8_t BloodFlower_H[]; +extern "C" const uint8_t Burrower_H[]; +extern "C" const uint8_t ChozoGhost_H[]; +extern "C" const uint8_t ChubbWeed_H[]; +extern "C" const uint8_t CineBoots_H[]; +extern "C" const uint8_t CineGeneral_H[]; +extern "C" const uint8_t CineGun_H[]; +extern "C" const uint8_t CineMorphball_H[]; +extern "C" const uint8_t CineSuit_H[]; +extern "C" const uint8_t CineVisor_H[]; +extern "C" const uint8_t Crater_H[]; +extern "C" const uint8_t Crystallite_H[]; +extern "C" const uint8_t Drones_H[]; +extern "C" const uint8_t EliteSpacePirate_H[]; +extern "C" const uint8_t FireFlea_H[]; +extern "C" const uint8_t Flaaghra_H[]; +extern "C" const uint8_t FlickerBat_H[]; +extern "C" const uint8_t FlyingPirate_H[]; +extern "C" const uint8_t FrontEnd_H[]; +extern "C" const uint8_t GagantuanBeatle_H[]; +extern "C" const uint8_t Gnats_H[]; +extern "C" const uint8_t Gryzbee_H[]; +extern "C" const uint8_t IceCrack_H[]; +extern "C" const uint8_t IceWorld_H[]; +extern "C" const uint8_t InjuredPirates_H[]; +extern "C" const uint8_t IntroBoss_H[]; +extern "C" const uint8_t IntroWorld_H[]; +extern "C" const uint8_t JellyZap_H[]; +extern "C" const uint8_t LavaWorld_H[]; +extern "C" const uint8_t Magdolite_H[]; +extern "C" const uint8_t Metaree_H[]; +extern "C" const uint8_t MetroidPrime_H[]; +extern "C" const uint8_t Metroid_H[]; +extern "C" const uint8_t MinesWorld_H[]; +extern "C" const uint8_t MiscSamus_H[]; +extern "C" const uint8_t Misc_H[]; +extern "C" const uint8_t OmegaPirate_H[]; +extern "C" const uint8_t OverWorld_H[]; +extern "C" const uint8_t Parasite_H[]; +extern "C" const uint8_t PhazonGun_H[]; +extern "C" const uint8_t Phazon_H[]; +extern "C" const uint8_t PuddleSpore_H[]; +extern "C" const uint8_t PuddleToad_H[]; +extern "C" const uint8_t Puffer_H[]; +extern "C" const uint8_t ReactorDoor_H[]; +extern "C" const uint8_t Ridley_H[]; +extern "C" const uint8_t Ripper_H[]; +extern "C" const uint8_t RuinsWorld_H[]; +extern "C" const uint8_t SamusShip_H[]; +extern "C" const uint8_t Scarab_H[]; +extern "C" const uint8_t Seedling_H[]; +extern "C" const uint8_t SheeGoth_H[]; +extern "C" const uint8_t SnakeWeed_H[]; +extern "C" const uint8_t Sova_H[]; +extern "C" const uint8_t SpacePirate_H[]; +extern "C" const uint8_t SpankWeed_H[]; +extern "C" const uint8_t Thardus_H[]; +extern "C" const uint8_t TheEnd_H[]; +extern "C" const uint8_t Torobyte_H[]; +extern "C" const uint8_t Triclops_H[]; +extern "C" const uint8_t Turret_H[]; +extern "C" const uint8_t UI_H[]; +extern "C" const uint8_t WarWasp_H[]; +extern "C" const uint8_t Weapons_H[]; +extern "C" const uint8_t ZZZ_H[]; +extern "C" const uint8_t Zoomer_H[]; +extern "C" const uint8_t lumigek_H[]; +extern "C" const uint8_t test_H[]; namespace DataSpec::DNAMP1 { using namespace std::literals; -bool AGSC::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath) +static const std::pair Headers[] = { + {"Atomic"sv, Atomic_H}, + {"BetaBeetle"sv, BetaBeetle_H}, + {"Bird"sv, Bird_H}, + {"BloodFlower"sv, BloodFlower_H}, + {"Burrower"sv, Burrower_H}, + {"ChozoGhost"sv, ChozoGhost_H}, + {"ChubbWeed"sv, ChubbWeed_H}, + {"CineBoots"sv, CineBoots_H}, + {"CineGeneral"sv, CineGeneral_H}, + {"CineGun"sv, CineGun_H}, + {"CineMorphball"sv, CineMorphball_H}, + {"CineSuit"sv, CineSuit_H}, + {"CineVisor"sv, CineVisor_H}, + {"Crater"sv, Crater_H}, + {"Crystallite"sv, Crystallite_H}, + {"Drones"sv, Drones_H}, + {"EliteSpacePirate"sv, EliteSpacePirate_H}, + {"FireFlea"sv, FireFlea_H}, + {"Flaaghra"sv, Flaaghra_H}, + {"FlickerBat"sv, FlickerBat_H}, + {"FlyingPirate"sv, FlyingPirate_H}, + {"FrontEnd"sv, FrontEnd_H}, + {"GagantuanBeatle"sv, GagantuanBeatle_H}, + {"Gnats"sv, Gnats_H}, + {"Gryzbee"sv, Gryzbee_H}, + {"IceCrack"sv, IceCrack_H}, + {"IceWorld"sv, IceWorld_H}, + {"InjuredPirates"sv, InjuredPirates_H}, + {"IntroBoss"sv, IntroBoss_H}, + {"IntroWorld"sv, IntroWorld_H}, + {"JellyZap"sv, JellyZap_H}, + {"LavaWorld"sv, LavaWorld_H}, + {"Magdolite"sv, Magdolite_H}, + {"Metaree"sv, Metaree_H}, + {"MetroidPrime"sv, MetroidPrime_H}, + {"Metroid"sv, Metroid_H}, + {"MinesWorld"sv, MinesWorld_H}, + {"MiscSamus"sv, MiscSamus_H}, + {"Misc"sv, Misc_H}, + {"OmegaPirate"sv, OmegaPirate_H}, + {"OverWorld"sv, OverWorld_H}, + {"Parasite"sv, Parasite_H}, + {"PhazonGun"sv, PhazonGun_H}, + {"Phazon"sv, Phazon_H}, + {"PuddleSpore"sv, PuddleSpore_H}, + {"PuddleToad"sv, PuddleToad_H}, + {"Puffer"sv, Puffer_H}, + {"ReactorDoor"sv, ReactorDoor_H}, + {"Ridley"sv, Ridley_H}, + {"Ripper"sv, Ripper_H}, + {"RuinsWorld"sv, RuinsWorld_H}, + {"SamusShip"sv, SamusShip_H}, + {"Scarab"sv, Scarab_H}, + {"Seedling"sv, Seedling_H}, + {"SheeGoth"sv, SheeGoth_H}, + {"SnakeWeed"sv, SnakeWeed_H}, + {"Sova"sv, Sova_H}, + {"SpacePirate"sv, SpacePirate_H}, + {"SpankWeed"sv, SpankWeed_H}, + {"Thardus"sv, Thardus_H}, + {"TheEnd"sv, TheEnd_H}, + {"Torobyte"sv, Torobyte_H}, + {"Triclops"sv, Triclops_H}, + {"Turret"sv, Turret_H}, + {"UI"sv, UI_H}, + {"WarWasp"sv, WarWasp_H}, + {"Weapons"sv, Weapons_H}, + {"ZZZ"sv, ZZZ_H}, + {"Zoomer"sv, Zoomer_H}, + {"lumigek"sv, lumigek_H}, + {"test"sv, test_H} +}; + +bool AGSC::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& dir) +{ + dir.makeDirChain(true); + Header head; head.read(rs); + uint32_t poolLen = rs.readUint32Big(); + auto pool = rs.readUBytes(poolLen); + + uint32_t projLen = rs.readUint32Big(); + auto proj = rs.readUBytes(projLen); + + uint32_t sampLen = rs.readUint32Big(); + auto samp = rs.readUBytes(sampLen); + + uint32_t sdirLen = rs.readUint32Big(); + auto sdir = rs.readUBytes(sdirLen); + + amuse::AudioGroupData data(proj.get(), projLen, pool.get(), poolLen, + sdir.get(), sdirLen, samp.get(), sampLen, amuse::GCNDataTag{}); + + /* Load into amuse representation */ + amuse::ProjectDatabase projDb; + projDb.setIdDatabases(); + amuse::AudioGroupDatabase group(data); + group.setGroupPath(dir.getAbsolutePath()); + + /* Extract samples */ + group.getSdir().extractAllCompressed(dir.getAbsolutePath(), data.getSamp()); + + /* Import C headers */ + auto lastComp = dir.getLastComponentUTF8(); + auto search = std::lower_bound(std::cbegin(Headers), std::cend(Headers), lastComp, + [](const auto& a, const auto& b) { return a.first < b; }); + if (search != std::cend(Headers) && search->first == lastComp) + group.importCHeader((char*)search->second); + + /* Write out project/pool */ { - hecl::ProjectPath poolPath = outPath.getWithExtension(_S(".pool"), true); - uint32_t poolLen = rs.readUint32Big(); - athena::io::FileWriter w(poolPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(poolLen).get(), poolLen); + auto projd = group.getProj().toYAML(); + athena::io::FileWriter fo(hecl::ProjectPath(dir, _S("!project.yaml")).getAbsolutePath()); + if (fo.hasError()) + return false; + fo.writeUBytes(projd.data(), projd.size()); } { - hecl::ProjectPath projPath = outPath.getWithExtension(_S(".proj"), true); - uint32_t projLen = rs.readUint32Big(); - athena::io::FileWriter w(projPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(projLen).get(), projLen); - } - - { - hecl::ProjectPath sampPath = outPath.getWithExtension(_S(".samp"), true); - uint32_t sampLen = rs.readUint32Big(); - athena::io::FileWriter w(sampPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(sampLen).get(), sampLen); - } - - { - hecl::ProjectPath sdirPath = outPath.getWithExtension(_S(".sdir"), true); - uint32_t sdirLen = rs.readUint32Big(); - athena::io::FileWriter w(sdirPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(sdirLen).get(), sdirLen); + auto poold = group.getPool().toYAML(); + athena::io::FileWriter fo(hecl::ProjectPath(dir, _S("!pool.yaml")).getAbsolutePath()); + if (fo.hasError()) + return false; + fo.writeUBytes(poold.data(), poold.size()); } return true; } -bool AGSC::Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPath) +bool AGSC::Cook(const hecl::ProjectPath& dir, const hecl::ProjectPath& outPath) { athena::io::FileWriter w(outPath.getAbsolutePath()); if (w.hasError()) return false; - hecl::ProjectPath woExt = inPath.getWithExtension(nullptr, true); - std::string lastComp = std::string(woExt.getLastComponentUTF8()); - if (hecl::StringUtils::EndsWith(lastComp, "_AGSC")) - lastComp.assign(lastComp.cbegin(), lastComp.cend() - 5); - Header head; head.audioDir = "Audio/"sv; - head.groupName = lastComp; + head.groupName = dir.getLastComponentUTF8(); head.write(w); - { - hecl::ProjectPath poolPath = inPath.getWithExtension(_S(".pool"), true); - athena::io::FileReader r(poolPath.getAbsolutePath()); - if (r.hasError()) - return false; - uint32_t poolLen = r.length(); - w.writeUint32Big(poolLen); - w.writeBytes(r.readBytes(poolLen).get(), poolLen); - } + amuse::ProjectDatabase projDb; + projDb.setIdDatabases(); + amuse::AudioGroupDatabase group(dir.getAbsolutePath()); - { - hecl::ProjectPath projPath = inPath.getWithExtension(_S(".proj"), true); - athena::io::FileReader r(projPath.getAbsolutePath()); - if (r.hasError()) - return false; - uint32_t projLen = r.length(); - w.writeUint32Big(projLen); - w.writeBytes(r.readBytes(projLen).get(), projLen); - } + auto proj = group.getProj().toGCNData(group.getPool(), group.getSdir()); + auto pool = group.getPool().toData(); + auto sdirSamp = group.getSdir().toGCNData(group); - { - hecl::ProjectPath sampPath = inPath.getWithExtension(_S(".samp"), true); - athena::io::FileReader r(sampPath.getAbsolutePath()); - if (r.hasError()) - return false; - uint32_t sampLen = r.length(); - w.writeUint32Big(sampLen); - w.writeBytes(r.readBytes(sampLen).get(), sampLen); - } + w.writeUint32Big(pool.size()); + w.writeUBytes(pool.data(), pool.size()); - { - hecl::ProjectPath sdirPath = inPath.getWithExtension(_S(".sdir"), true); - athena::io::FileReader r(sdirPath.getAbsolutePath()); - if (r.hasError()) - return false; - uint32_t sdirLen = r.length(); - w.writeUint32Big(sdirLen); - w.writeBytes(r.readBytes(sdirLen).get(), sdirLen); - } + w.writeUint32Big(proj.size()); + w.writeUBytes(proj.data(), proj.size()); + + w.writeUint32Big(sdirSamp.second.size()); + w.writeUBytes(sdirSamp.second.data(), sdirSamp.second.size()); + + w.writeUint32Big(sdirSamp.first.size()); + w.writeUBytes(sdirSamp.first.data(), sdirSamp.first.size()); return true; } diff --git a/DataSpec/DNAMP1/AGSC.hpp b/DataSpec/DNAMP1/AGSC.hpp index d4305ad61..0e37d1d51 100644 --- a/DataSpec/DNAMP1/AGSC.hpp +++ b/DataSpec/DNAMP1/AGSC.hpp @@ -9,13 +9,13 @@ namespace DataSpec::DNAMP1 class AGSC { +public: struct Header : BigDNA { AT_DECL_DNA String<-1> audioDir; String<-1> groupName; }; -public: static bool Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath); static bool Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPath); }; diff --git a/DataSpec/DNAMP1/CMakeLists.txt b/DataSpec/DNAMP1/CMakeLists.txt index a5efe23c8..14bb2b26d 100644 --- a/DataSpec/DNAMP1/CMakeLists.txt +++ b/DataSpec/DNAMP1/CMakeLists.txt @@ -1,4 +1,5 @@ include(DNAMP1/ScriptObjects/CMakeLists.txt) +include(DNAMP1/SFX/CMakeLists.txt) make_dnalist(liblist DNAMP1 PAK diff --git a/DataSpec/DNAMP1/CSNG.cpp b/DataSpec/DNAMP1/CSNG.cpp index 5a23b749a..2e79c8c69 100644 --- a/DataSpec/DNAMP1/CSNG.cpp +++ b/DataSpec/DNAMP1/CSNG.cpp @@ -37,6 +37,21 @@ bool CSNG::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath) w.writeUBytes(midi.data(), midi.size()); } + /* Update !songs.yaml for Amuse editor */ + hecl::ProjectPath audGrp(outPath.getParentPath().getParentPath(), _S("AudioGrp")); + audGrp.makeDirChain(true); + hecl::ProjectPath songsPath(audGrp, _S("!songs.yaml")); + std::experimental::optional r; + if (songsPath.isFile()) + r.emplace(songsPath.getAbsolutePath()); + athena::io::YAMLDocWriter ydw("amuse::Songs", r ? &*r : nullptr); + r = std::experimental::nullopt; + char id[16]; + snprintf(id, 16, "%04X", head.midiSetupId); + ydw.writeString(id, hecl::Format("../MidiData/%s", midPath.getLastComponentUTF8().data())); + athena::io::FileWriter w(songsPath.getAbsolutePath()); + ydw.finish(&w); + return true; } diff --git a/DataSpec/DNAMP1/DNAMP1.cpp b/DataSpec/DNAMP1/DNAMP1.cpp index 7351b149f..88c0e406c 100644 --- a/DataSpec/DNAMP1/DNAMP1.cpp +++ b/DataSpec/DNAMP1/DNAMP1.cpp @@ -115,7 +115,7 @@ void PAKBridge::build() mlvl.read(rs); } bool named; - std::string bestName = m_pak.bestEntryName(entry, named); + std::string bestName = m_pak.bestEntryName(m_node, entry, named); level.name = hecl::SystemStringConv(bestName).sys_str(); level.areas.reserve(mlvl.areaCount); unsigned layerIdx = 0; @@ -357,7 +357,7 @@ void PAKBridge::addMAPATransforms(PAKRouter& pakRouter, } } -ResExtractor PAKBridge::LookupExtractor(const PAK& pak, const PAK::Entry& entry) +ResExtractor PAKBridge::LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry) { switch (entry.type) { @@ -408,7 +408,7 @@ ResExtractor PAKBridge::LookupExtractor(const PAK& pak, const PAK::En case SBIG('DGRP'): return {DNADGRP::ExtractDGRP, {_S(".yaml")}}; case SBIG('AGSC'): - return {AGSC::Extract, {_S(".pool"), _S(".proj"), _S(".samp"), _S(".sdir")}}; + return {AGSC::Extract, {}}; case SBIG('CSNG'): return {CSNG::Extract, {_S(".mid"), _S(".yaml")}}; case SBIG('ATBL'): @@ -417,7 +417,7 @@ ResExtractor PAKBridge::LookupExtractor(const PAK& pak, const PAK::En case SBIG('DUMB'): { bool named; - std::string name = pak.bestEntryName(entry, named); + std::string name = pak.bestEntryName(pakNode, entry, named); if (named) { if (!name.compare("PlayerRes")) diff --git a/DataSpec/DNAMP1/DNAMP1.hpp b/DataSpec/DNAMP1/DNAMP1.hpp index 49c64c525..fb4860b6a 100644 --- a/DataSpec/DNAMP1/DNAMP1.hpp +++ b/DataSpec/DNAMP1/DNAMP1.hpp @@ -23,7 +23,7 @@ public: PAKBridge(const nod::Node& node, bool doExtract=true); void build(); - static ResExtractor LookupExtractor(const PAK& pak, const PAK::Entry& entry); + static ResExtractor LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry); std::string_view getName() const {return m_node.getName();} hecl::SystemStringView getLevelString() const {return m_levelString;} using PAKType = PAK; diff --git a/DataSpec/DNAMP1/DeafBabe.cpp b/DataSpec/DNAMP1/DeafBabe.cpp index a05838550..aecaa43ea 100644 --- a/DataSpec/DNAMP1/DeafBabe.cpp +++ b/DataSpec/DNAMP1/DeafBabe.cpp @@ -45,7 +45,7 @@ void DeafBabe::BlenderInit(hecl::blender::PyOutStream& os) "bpy.types.Material.retro_surface_phazon = bpy.props.BoolProperty(name='Retro Surface: Phazon')\n" "bpy.types.Material.retro_surface_dirt = bpy.props.BoolProperty(name='Retro Surface: Rock')\n" "bpy.types.Material.retro_surface_lava = bpy.props.BoolProperty(name='Retro Surface: Lava')\n" - "bpy.types.Material.retro_surface_stone_rock = bpy.props.BoolProperty(name='Retro Surface: Stone/Rock')\n" + "bpy.types.Material.retro_surface_lava_stone = bpy.props.BoolProperty(name='Retro Surface: Lava Stone')\n" "bpy.types.Material.retro_surface_snow = bpy.props.BoolProperty(name='Retro Surface: Snow')\n" "bpy.types.Material.retro_surface_mud_slow = bpy.props.BoolProperty(name='Retro Surface: Mud (Slow)')\n" "bpy.types.Material.retro_half_pipe = bpy.props.BoolProperty(name='Retro: Half Pipe (H)')\n" @@ -202,7 +202,7 @@ void DeafBabe::BlenderInit(hecl::blender::PyOutStream& os) " mat.retro_surface_phazon = ((data >> 7) & 1)\n" " mat.retro_surface_dirt = ((data >> 8) & 1)\n" " mat.retro_surface_lava = ((data >> 9) & 1)\n" - " mat.retro_surface_stone_rock = ((data >> 10) & 1)\n" + " mat.retro_surface_lava_stone = ((data >> 10) & 1)\n" " mat.retro_surface_snow = ((data >> 11) & 1)\n" " mat.retro_surface_mud_slow = ((data >> 12) & 1)\n" " mat.retro_half_pipe = ((data >> 13) & 1)\n" diff --git a/DataSpec/DNAMP1/DeafBabe.hpp b/DataSpec/DNAMP1/DeafBabe.hpp index 9f7163267..c427ec407 100644 --- a/DataSpec/DNAMP1/DeafBabe.hpp +++ b/DataSpec/DNAMP1/DeafBabe.hpp @@ -36,7 +36,7 @@ struct DeafBabe : BigDNA bool surfaceLava() const {return (material >> 9) & 1; } void setSurfaceLava(bool v) { material &= ~(1ull << 9); material |= (v << 9); } bool surfaceStoneRock() const { return (material >> 10) & 1; } - void setSurfaceStoneRock(bool v) { material &= ~(1ull << 10); material |= (v << 10); } + void setSurfaceLavaStone(bool v) { material &= ~(1ull << 10); material |= (v << 10); } bool surfaceSnow() const { return (material >> 11) & 1; } void setSurfaceSnow(bool v) { material &= ~(1ull << 11); material |= (v << 11); } bool surfaceMudSlow() const { return (material >> 12) & 1; } diff --git a/DataSpec/DNAMP1/PAK.cpp b/DataSpec/DNAMP1/PAK.cpp index f1a165a2d..3f9791b76 100644 --- a/DataSpec/DNAMP1/PAK.cpp +++ b/DataSpec/DNAMP1/PAK.cpp @@ -2,6 +2,7 @@ #include #include "DNAMP1.hpp" #include "PAK.hpp" +#include "AGSC.hpp" namespace DataSpec::DNAMP1 { @@ -181,8 +182,19 @@ const PAK::Entry* PAK::lookupEntry(std::string_view name) const return nullptr; } -std::string PAK::bestEntryName(const Entry& entry, bool& named) const +std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const { + std::unordered_map::const_iterator search; + if (entry.type == FOURCC('AGSC') && (search = m_entries.find(entry.id)) != m_entries.cend()) + { + /* Use internal AGSC name for entry */ + auto rs = search->second.beginReadStream(pakNode); + AGSC::Header header; + header.read(rs); + named = true; + return header.groupName; + } + /* Prefer named entries first */ for (const NameEntry& nentry : m_nameEntries) if (nentry.id == entry.id) diff --git a/DataSpec/DNAMP1/PAK.hpp b/DataSpec/DNAMP1/PAK.hpp index 998e8f61d..6bf9ae305 100644 --- a/DataSpec/DNAMP1/PAK.hpp +++ b/DataSpec/DNAMP1/PAK.hpp @@ -53,7 +53,7 @@ struct PAK : BigDNA const Entry* lookupEntry(const UniqueID32& id) const; const Entry* lookupEntry(std::string_view name) const; - std::string bestEntryName(const Entry& entry, bool& named) const; + std::string bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const; bool mreaHasDupeResources(const UniqueID32& id) const { return m_dupeMREAs.find(id) != m_dupeMREAs.cend(); } diff --git a/DataSpec/DNAMP1/SFX/Atomic.h b/DataSpec/DNAMP1/SFX/Atomic.h new file mode 100644 index 000000000..24924ce77 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Atomic.h @@ -0,0 +1,31 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Atomic + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0001 1 + + +#define SFXelu_a_elec_lp_00 42 +#define SFXat2_b_fly_lp_00 43 +#define SFXatm_b_fly_lp_00 44 +#define SFXatm_b_fly_lp_01 45 +#define SFXatm_a_bombdrp_00 46 +#define SFXsfx002F 47 +#define SFXsfx0030 48 +#define SFXsfx0031 49 +#define SFXsfx0032 50 +#define SFXsfx0033 51 +#define SFXsfx0034 52 +#define SFXsfx0035 53 +#define SFXsfx0036 54 +#define SFXsfx0037 55 +#define SFXsfx0038 56 +#define SFXsfx0039 57 +#define SFXsfx003A 58 +#define SFXsfx003B 59 + + diff --git a/DataSpec/DNAMP1/SFX/BetaBeetle.h b/DataSpec/DNAMP1/SFX/BetaBeetle.h new file mode 100644 index 000000000..7f4a3a5ff --- /dev/null +++ b/DataSpec/DNAMP1/SFX/BetaBeetle.h @@ -0,0 +1,45 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: BetaBeetle + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0002 2 + + +#define SFXsfx003C 60 +#define SFXsfx003D 61 +#define SFXsfx003E 62 +#define SFXsfx003F 63 +#define SFXsfx0040 64 +#define SFXsfx0041 65 +#define SFXsfx0042 66 +#define SFXsfx0043 67 +#define SFXsfx0044 68 +#define SFXsfx0045 69 +#define SFXsfx0046 70 +#define SFXsfx0047 71 +#define SFXsfx0048 72 +#define SFXsfx0049 73 +#define SFXsfx004A 74 +#define SFXsfx004B 75 +#define SFXsfx004C 76 +#define SFXsfx004D 77 +#define SFXsfx004E 78 +#define SFXsfx004F 79 +#define SFXsfx0050 80 +#define SFXsfx0051 81 +#define SFXsfx0052 82 +#define SFXsfx0053 83 +#define SFXsfx0054 84 +#define SFXsfx0055 85 +#define SFXsfx0056 86 +#define SFXsfx0057 87 +#define SFXsfx0058 88 +#define SFXsfx0059 89 +#define SFXsfx005A 90 +#define SFXsfx005B 91 + + diff --git a/DataSpec/DNAMP1/SFX/Bird.h b/DataSpec/DNAMP1/SFX/Bird.h new file mode 100644 index 000000000..ecc140ffa --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Bird.h @@ -0,0 +1,20 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Bird + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0003 3 + + +#define SFXsfx005C 92 +#define SFXsfx005D 93 +#define SFXsfx005E 94 +#define SFXsfx005F 95 +#define SFXsfx0060 96 +#define SFXsfx0061 97 +#define SFXsfx0062 98 + + diff --git a/DataSpec/DNAMP1/SFX/BloodFlower.h b/DataSpec/DNAMP1/SFX/BloodFlower.h new file mode 100644 index 000000000..ddb50da2b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/BloodFlower.h @@ -0,0 +1,34 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: BloodFlower + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0004 4 + + +#define SFXblf_a_btmspit_00 99 +#define SFXblf_a_bulb_00 100 +#define SFXsfx0065 101 +#define SFXsfx0066 102 +#define SFXsfx0067 103 +#define SFXblf_b_active_00 104 +#define SFXblf_b_active_01 105 +#define SFXsfx006A 106 +#define SFXblf_b_breathe_00 107 +#define SFXsfx006C 108 +#define SFXsfx006D 109 +#define SFXsfx006E 110 +#define SFXsfx006F 111 +#define SFXblf_r_death_00 112 +#define SFXblf_r_death_01 113 +#define SFXblf_r_impact_00 114 +#define SFXfir_x_crispfire6voice_lp_00 115 +#define SFXsfx0074 116 +#define SFXsfx0075 117 +#define SFXsfx0076 118 +#define SFXsfx0077 119 + + diff --git a/DataSpec/DNAMP1/SFX/Burrower.h b/DataSpec/DNAMP1/SFX/Burrower.h new file mode 100644 index 000000000..e9719e4fe --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Burrower.h @@ -0,0 +1,33 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Burrower + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0005 5 + + +#define SFXbur_a_attack_00 120 +#define SFXbur_b_burrow_lp_00 121 +#define SFXbur_b_idle_00 122 +#define SFXbur_b_idle_01 123 +#define SFXbur_b_walk_00 124 +#define SFXbur_b_walk_01 125 +#define SFXbur_b_walk_02 126 +#define SFXbur_r_death_00 127 +#define SFXsfx0080 128 +#define SFXsfx0081 129 +#define SFXsfx0082 130 +#define SFXsfx0083 131 +#define SFXsfx0084 132 +#define SFXsfx0085 133 +#define SFXsfx0086 134 +#define SFXsfx0087 135 +#define SFXsfx0088 136 +#define SFXsfx0089 137 +#define SFXsfx008A 138 +#define SFXsfx008B 139 + + diff --git a/DataSpec/DNAMP1/SFX/CMakeLists.txt b/DataSpec/DNAMP1/SFX/CMakeLists.txt new file mode 100644 index 000000000..0b9421ee4 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CMakeLists.txt @@ -0,0 +1,77 @@ +unset(DNAMP1_SFX_SOURCES) +macro(add_sfx_header HEADER SYMBOL) + bintoc("DNAMP1/SFX/${SYMBOL}.cpp" "DNAMP1/SFX/${HEADER}" "${SYMBOL}") + list(APPEND DNAMP1_SFX_SOURCES "DNAMP1/SFX/${SYMBOL}.cpp") +endmacro(add_sfx_header) + +add_sfx_header(Atomic.h Atomic_H) +add_sfx_header(BetaBeetle.h BetaBeetle_H) +add_sfx_header(Bird.h Bird_H) +add_sfx_header(BloodFlower.h BloodFlower_H) +add_sfx_header(Burrower.h Burrower_H) +add_sfx_header(ChozoGhost.h ChozoGhost_H) +add_sfx_header(ChubbWeed.h ChubbWeed_H) +add_sfx_header(CineBoots.h CineBoots_H) +add_sfx_header(CineGeneral.h CineGeneral_H) +add_sfx_header(CineGun.h CineGun_H) +add_sfx_header(CineMorphball.h CineMorphball_H) +add_sfx_header(CineSuit.h CineSuit_H) +add_sfx_header(CineVisor.h CineVisor_H) +add_sfx_header(Crater.h Crater_H) +add_sfx_header(Crystallite.h Crystallite_H) +add_sfx_header(Drones.h Drones_H) +add_sfx_header(EliteSpacePirate.h EliteSpacePirate_H) +add_sfx_header(FireFlea.h FireFlea_H) +add_sfx_header(Flaaghra.h Flaaghra_H) +add_sfx_header(FlickerBat.h FlickerBat_H) +add_sfx_header(FlyingPirate.h FlyingPirate_H) +add_sfx_header(FrontEnd.h FrontEnd_H) +add_sfx_header(GagantuanBeatle.h GagantuanBeatle_H) +add_sfx_header(Gnats.h Gnats_H) +add_sfx_header(Gryzbee.h Gryzbee_H) +add_sfx_header(IceCrack.h IceCrack_H) +add_sfx_header(IceWorld.h IceWorld_H) +add_sfx_header(InjuredPirates.h InjuredPirates_H) +add_sfx_header(IntroBoss.h IntroBoss_H) +add_sfx_header(IntroWorld.h IntroWorld_H) +add_sfx_header(JellyZap.h JellyZap_H) +add_sfx_header(LavaWorld.h LavaWorld_H) +add_sfx_header(Magdolite.h Magdolite_H) +add_sfx_header(Metaree.h Metaree_H) +add_sfx_header(MetroidPrime.h MetroidPrime_H) +add_sfx_header(Metroid.h Metroid_H) +add_sfx_header(MinesWorld.h MinesWorld_H) +add_sfx_header(MiscSamus.h MiscSamus_H) +add_sfx_header(Misc.h Misc_H) +add_sfx_header(OmegaPirate.h OmegaPirate_H) +add_sfx_header(OverWorld.h OverWorld_H) +add_sfx_header(Parasite.h Parasite_H) +add_sfx_header(PhazonGun.h PhazonGun_H) +add_sfx_header(Phazon.h Phazon_H) +add_sfx_header(PuddleSpore.h PuddleSpore_H) +add_sfx_header(PuddleToad.h PuddleToad_H) +add_sfx_header(Puffer.h Puffer_H) +add_sfx_header(ReactorDoor.h ReactorDoor_H) +add_sfx_header(Ridley.h Ridley_H) +add_sfx_header(Ripper.h Ripper_H) +add_sfx_header(RuinsWorld.h RuinsWorld_H) +add_sfx_header(SamusShip.h SamusShip_H) +add_sfx_header(Scarab.h Scarab_H) +add_sfx_header(Seedling.h Seedling_H) +add_sfx_header(SheeGoth.h SheeGoth_H) +add_sfx_header(SnakeWeed.h SnakeWeed_H) +add_sfx_header(Sova.h Sova_H) +add_sfx_header(SpacePirate.h SpacePirate_H) +add_sfx_header(SpankWeed.h SpankWeed_H) +add_sfx_header(Thardus.h Thardus_H) +add_sfx_header(TheEnd.h TheEnd_H) +add_sfx_header(Torobyte.h Torobyte_H) +add_sfx_header(Triclops.h Triclops_H) +add_sfx_header(Turret.h Turret_H) +add_sfx_header(UI.h UI_H) +add_sfx_header(WarWasp.h WarWasp_H) +add_sfx_header(Weapons.h Weapons_H) +add_sfx_header(ZZZ.h ZZZ_H) +add_sfx_header(Zoomer.h Zoomer_H) +add_sfx_header(lumigek.h lumigek_H) +add_sfx_header(test.h test_H) diff --git a/DataSpec/DNAMP1/SFX/ChozoGhost.h b/DataSpec/DNAMP1/SFX/ChozoGhost.h new file mode 100644 index 000000000..54c1f93c2 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/ChozoGhost.h @@ -0,0 +1,65 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: ChozoGhost + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0006 6 + + +#define SFXchg_a_dball_00 140 +#define SFXchg_a_dcharge_00 141 +#define SFXchg_a_dfire_00 142 +#define SFXsfx008F 143 +#define SFXsfx0090 144 +#define SFXsfx0091 145 +#define SFXsfx0092 146 +#define SFXsfx0093 147 +#define SFXsfx0094 148 +#define SFXchg_a_pball_00 149 +#define SFXchg_a_pfire_00 150 +#define SFXsfx0097 151 +#define SFXsfx0098 152 +#define SFXsfx0099 153 +#define SFXsfx009A 154 +#define SFXchg_b_fadein_00 155 +#define SFXsfx009C 156 +#define SFXchg_b_float_00 157 +#define SFXchg_b_growl_00 158 +#define SFXchg_b_jump_00 159 +#define SFXsfx00A0 160 +#define SFXsfx00A1 161 +#define SFXsfx00A2 162 +#define SFXsfx00A3 163 +#define SFXsfx00A4 164 +#define SFXchg_r_death_00 165 +#define SFXchg_r_hit_00 166 +#define SFXchg_a_pcharge_00 167 +#define SFXsfx00A8 168 +#define SFXsfx00A9 169 +#define SFXchg_b_growl_01 170 +#define SFXchg_b_scrape_00 171 +#define SFXchg_r_death_01 172 +#define SFXsfx00AD 173 +#define SFXchg_b_growl_03 174 +#define SFXchg_b_growl_04 175 +#define SFXsfx00B0 176 +#define SFXchg_b_voxalert_00 177 +#define SFXsfx00B2 178 +#define SFXchg_b_warpin_00 179 +#define SFXsfx00B4 180 +#define SFXsfx00B5 181 +#define SFXsfx00B6 182 +#define SFXsfx00B7 183 +#define SFXsfx00B8 184 +#define SFXsfx00B9 185 +#define SFXsfx00BA 186 +#define SFXsfx00BB 187 +#define SFXsfx00BC 188 +#define SFXsfx00BD 189 +#define SFXsfx00BE 190 +#define SFXsfx00BF 191 + + diff --git a/DataSpec/DNAMP1/SFX/ChubbWeed.h b/DataSpec/DNAMP1/SFX/ChubbWeed.h new file mode 100644 index 000000000..11a943595 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/ChubbWeed.h @@ -0,0 +1,20 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: ChubbWeed + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0007 7 + + +#define SFXchb_r_scream_00 192 +#define SFXchb_r_alert_00_lp 193 +#define SFXsfx00C2 194 +#define SFXsfx00C3 195 +#define SFXsfx00C4 196 +#define SFXsfx00C5 197 +#define SFXsfx00C6 198 + + diff --git a/DataSpec/DNAMP1/SFX/CineBoots.h b/DataSpec/DNAMP1/SFX/CineBoots.h new file mode 100644 index 000000000..25f9aaef9 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineBoots.h @@ -0,0 +1,33 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineBoots + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003B 59 + + +#define SFXci7_x_jump_00 2972 +#define SFXsja_c_electric_lp_00 2973 +#define SFXsfx0B9E 2974 +#define SFXsfx0B9F 2975 +#define SFXsfx0BA0 2976 +#define SFXsfx0BA1 2977 +#define SFXsfx0BA2 2978 +#define SFXsfx0BA3 2979 +#define SFXsfx0BA4 2980 +#define SFXsfx0BA5 2981 +#define SFXsfx0BA6 2982 +#define SFXsfx0BA7 2983 +#define SFXsfx0BA8 2984 +#define SFXsfx0BA9 2985 +#define SFXsfx0BAA 2986 +#define SFXsfx0BAB 2987 +#define SFXsfx0BAC 2988 +#define SFXsfx0BAD 2989 +#define SFXsfx0BAE 2990 +#define SFXsfx0BAF 2991 + + diff --git a/DataSpec/DNAMP1/SFX/CineGeneral.h b/DataSpec/DNAMP1/SFX/CineGeneral.h new file mode 100644 index 000000000..832cd4eac --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineGeneral.h @@ -0,0 +1,54 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineGeneral + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003C 60 + + +#define SFXsfx0BB0 2992 +#define SFXsfx0BB1 2993 +#define SFXci5_x_mapdown_00 2994 +#define SFXci5_x_mapload_lp_00 2995 +#define SFXci5_x_mapspin_lp_00 2996 +#define SFXci5_x_mapup_00 2997 +#define SFXepr_b_grenup_00 2998 +#define SFXpi2_x_missile_00 2999 +#define SFXpi2_x_healthsm_00 3000 +#define SFXpi2_x_smissile_00 3001 +#define SFXsfx0BBA 3002 +#define SFXsfx0BBB 3003 +#define SFXsfx0BBC 3004 +#define SFXsfx0BBD 3005 +#define SFXci9_x_nrg_lp_00 3006 +#define SFXsfx0BBF 3007 +#define SFXci9_x_insert_00 3008 +#define SFXsfx0BC1 3009 +#define SFXsfx0BC2 3010 +#define SFXsfx0BC3 3011 +#define SFXsfx0BC4 3012 +#define SFXsfx0BC5 3013 +#define SFXsfx0BC6 3014 +#define SFXsfx0BC7 3015 +#define SFXsfx0BC8 3016 +#define SFXsfx0BC9 3017 +#define SFXsfx0BCA 3018 +#define SFXsfx0BCB 3019 +#define SFXsfx0BCC 3020 +#define SFXsfx0BCD 3021 +#define SFXsfx0BCE 3022 +#define SFXsfx0BCF 3023 +#define SFXsfx0BD0 3024 +#define SFXsfx0BD1 3025 +#define SFXsfx0BD2 3026 +#define SFXsfx0BD3 3027 +#define SFXsfx0BD4 3028 +#define SFXsfx0BD5 3029 +#define SFXsfx0BD6 3030 +#define SFXsfx0BD7 3031 +#define SFXsfx0BD8 3032 + + diff --git a/DataSpec/DNAMP1/SFX/CineGun.h b/DataSpec/DNAMP1/SFX/CineGun.h new file mode 100644 index 000000000..7535d08b9 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineGun.h @@ -0,0 +1,27 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineGun + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003E 62 + + +#define SFXsfx0BE5 3045 +#define SFXci3_x_clank_00 3046 +#define SFXci4_x_clank_00 3047 +#define SFXsfx0BE8 3048 +#define SFXci3_c_ridiclaw_00 3049 +#define SFXsfx0BEA 3050 +#define SFXsfx0BEB 3051 +#define SFXsfx0BEC 3052 +#define SFXsfx0BED 3053 +#define SFXsfx0BEE 3054 +#define SFXsfx0BEF 3055 +#define SFXsfx0BF0 3056 +#define SFXsfx0BF1 3057 +#define SFXsfx0BF2 3058 + + diff --git a/DataSpec/DNAMP1/SFX/CineMorphball.h b/DataSpec/DNAMP1/SFX/CineMorphball.h new file mode 100644 index 000000000..58ab4a907 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineMorphball.h @@ -0,0 +1,23 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineMorphball + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003F 63 + + +#define SFXsfx0BF3 3059 +#define SFXsfx0BF4 3060 +#define SFXsfx0BF5 3061 +#define SFXsfx0BF6 3062 +#define SFXsfx0BF7 3063 +#define SFXsfx0BF8 3064 +#define SFXsfx0BF9 3065 +#define SFXsfx0BFA 3066 +#define SFXsfx0BFB 3067 +#define SFXsfx0BFC 3068 + + diff --git a/DataSpec/DNAMP1/SFX/CineSuit.h b/DataSpec/DNAMP1/SFX/CineSuit.h new file mode 100644 index 000000000..a119ce5f3 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineSuit.h @@ -0,0 +1,38 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineSuit + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0040 64 + + +#define SFXci2_x_energy_lp_00 3069 +#define SFXci2_x_energy_lp_01 3070 +#define SFXsfx0BFF 3071 +#define SFXsfx0C00 3072 +#define SFXci2_x_jump_00 3073 +#define SFXsfx0C02 3074 +#define SFXci2_x_lights_lp_00 3075 +#define SFXci2_x_pad_lp_00 3076 +#define SFXsfx0C05 3077 +#define SFXsfx0C06 3078 +#define SFXci3_x_energy_02 3079 +#define SFXsfx0C08 3080 +#define SFXsfx0C09 3081 +#define SFXci3_x_whoosh_00 3082 +#define SFXsfx0C0B 3083 +#define SFXsfx0C0C 3084 +#define SFXsfx0C0D 3085 +#define SFXsfx0C0E 3086 +#define SFXsfx0C0F 3087 +#define SFXsfx0C10 3088 +#define SFXsfx0C11 3089 +#define SFXsfx0C12 3090 +#define SFXsfx0C13 3091 +#define SFXsfx0C14 3092 +#define SFXsfx0C15 3093 + + diff --git a/DataSpec/DNAMP1/SFX/CineVisor.h b/DataSpec/DNAMP1/SFX/CineVisor.h new file mode 100644 index 000000000..7a8ed6b5b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/CineVisor.h @@ -0,0 +1,25 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: CineVisor + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003D 61 + + +#define SFXcin_x_visor_00 3033 +#define SFXsfx0BDA 3034 +#define SFXsfx0BDB 3035 +#define SFXsfx0BDC 3036 +#define SFXsfx0BDD 3037 +#define SFXsfx0BDE 3038 +#define SFXsfx0BDF 3039 +#define SFXsfx0BE0 3040 +#define SFXsfx0BE1 3041 +#define SFXsfx0BE2 3042 +#define SFXsfx0BE3 3043 +#define SFXsfx0BE4 3044 + + diff --git a/DataSpec/DNAMP1/SFX/Crater.h b/DataSpec/DNAMP1/SFX/Crater.h new file mode 100644 index 000000000..995d6c104 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Crater.h @@ -0,0 +1,43 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Crater + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002C 44 + + +#define SFXsfx0764 1892 +#define SFXsfx0765 1893 +#define SFXsfx0766 1894 +#define SFXsfx0767 1895 +#define SFXsfx0768 1896 +#define SFXsfx0769 1897 +#define SFXsfx076A 1898 +#define SFXsfx076B 1899 +#define SFXsfx076C 1900 +#define SFXsfx076D 1901 +#define SFXsfx076E 1902 +#define SFXsfx076F 1903 +#define SFXsfx0770 1904 +#define SFXsfx0771 1905 +#define SFXsfx0772 1906 +#define SFXsfx0773 1907 +#define SFXsfx0774 1908 +#define SFXsfx0775 1909 +#define SFXsfx0776 1910 +#define SFXsfx0777 1911 +#define SFXsfx0778 1912 +#define SFXsfx0779 1913 +#define SFXsfx077A 1914 +#define SFXsfx077B 1915 +#define SFXsfx077C 1916 +#define SFXsfx077D 1917 +#define SFXsfx077E 1918 +#define SFXsfx077F 1919 +#define SFXsfx0780 1920 +#define SFXsfx0781 1921 + + diff --git a/DataSpec/DNAMP1/SFX/Crystallite.h b/DataSpec/DNAMP1/SFX/Crystallite.h new file mode 100644 index 000000000..2fd9ff9af --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Crystallite.h @@ -0,0 +1,23 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Crystallite + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0008 8 + + +#define SFXcry_b_idle_00 199 +#define SFXsfx00C8 200 +#define SFXsfx00C9 201 +#define SFXsfx00CA 202 +#define SFXsfx00CB 203 +#define SFXsfx00CC 204 +#define SFXsfx00CD 205 +#define SFXsfx00CE 206 +#define SFXsfx00CF 207 +#define SFXsfx00D0 208 + + diff --git a/DataSpec/DNAMP1/SFX/Drones.h b/DataSpec/DNAMP1/SFX/Drones.h new file mode 100644 index 000000000..e23b56fde --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Drones.h @@ -0,0 +1,73 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Drones + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0009 9 + + +#define SFXepr_a_shockhit_00 209 +#define SFXsfx00D2 210 +#define SFXdrn_b_burst_00 211 +#define SFXsfx00D4 212 +#define SFXsfx00D5 213 +#define SFXsfx00D6 214 +#define SFXsfx00D7 215 +#define SFXdrn_b_patrol_lp_00 216 +#define SFXdrn_b_henshin_00 217 +#define SFXdrn_b_rocket_lp_00 218 +#define SFXdrn_b_rocket_lp_01 219 +#define SFXdrn_b_rocket_lp_02 220 +#define SFXsfx00DD 221 +#define SFXdrn_r_death_00 222 +#define SFXsfx00DF 223 +#define SFXsfx00E0 224 +#define SFXdrn_r_impact_00 225 +#define SFXsfx00E2 226 +#define SFXdrn_a_blast_00 227 +#define SFXsfx00E4 228 +#define SFXdrn_r_death_lp_00 229 +#define SFXsfx00E6 230 +#define SFXdrn_b_alert_00 231 +#define SFXsfx00E8 232 +#define SFXdrn_a_laser_00 233 +#define SFXsfx00EA 234 +#define SFXsfx00EB 235 +#define SFXsfx00EC 236 +#define SFXsfx00ED 237 +#define SFXdrn_r_impact_01 238 +#define SFXsfx00EF 239 +#define SFXdrn_a_blast_01 240 +#define SFXsfx00F1 241 +#define SFXsfx00F2 242 +#define SFXdrn_b_henshin_01 243 +#define SFXdrn_b_talk_00 244 +#define SFXsfx00F5 245 +#define SFXdrn_r_death_lp_01 246 +#define SFXdrn_a_charge_00 247 +#define SFXdrn_b_beep_03 248 +#define SFXsfx00F9 249 +#define SFXdrn_r_empblast_01 250 +#define SFXsfx00FB 251 +#define SFXsfx00FC 252 +#define SFXdrn_b_patrolun_lp_00 253 +#define SFXdrn_a_laserun_00 254 +#define SFXopr_a_shockhit_00 255 +#define SFXsfx0100 256 +#define SFXsfx0101 257 +#define SFXsfx0102 258 +#define SFXsfx0103 259 +#define SFXsfx0104 260 +#define SFXsfx0105 261 +#define SFXsfx0106 262 +#define SFXsfx0107 263 +#define SFXsfx0108 264 +#define SFXsfx0109 265 +#define SFXsfx010A 266 +#define SFXsfx010B 267 +#define SFXsfx010C 268 + + diff --git a/DataSpec/DNAMP1/SFX/EliteSpacePirate.h b/DataSpec/DNAMP1/SFX/EliteSpacePirate.h new file mode 100644 index 000000000..76d878d5e --- /dev/null +++ b/DataSpec/DNAMP1/SFX/EliteSpacePirate.h @@ -0,0 +1,67 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: EliteSpacePirate + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000A 10 + + +#define SFXepr_a_grenade_00 269 +#define SFXsfx010E 270 +#define SFXsfx010F 271 +#define SFXepr_b_hitglass_00 272 +#define SFXepr_a_swoosh_00 273 +#define SFXepr_b_run_00 274 +#define SFXepr_b_run_01 275 +#define SFXepr_a_shokwave_00 276 +#define SFXsfx0115 277 +#define SFXepr_a_attack_00 278 +#define SFXepr_a_attack_01 279 +#define SFXepr_b_land_00 280 +#define SFXepr_b_alert_00 281 +#define SFXepr_b_walk_00 282 +#define SFXepr_b_walk_01 283 +#define SFXepr_b_alert_01 284 +#define SFXepr_b_absorb_lp_00 285 +#define SFXepr_b_idle_00 286 +#define SFXepr_b_idle_01 287 +#define SFXepr_a_hitgrnd_00 288 +#define SFXepr_b_walklite_00 289 +#define SFXepr_b_walklite_01 290 +#define SFXepr_r_pissed_00 291 +#define SFXsfx0124 292 +#define SFXsfx0125 293 +#define SFXepr_a_swoosh_01 294 +#define SFXepr_b_taunt_00 295 +#define SFXopr_a_swoosh_00 296 +#define SFXopr_a_swoosh_01 297 +#define SFXepr_b_blokvox_00 298 +#define SFXsfx012B 299 +#define SFXopr_a_shokwave_00 300 +#define SFXsfx012D 301 +#define SFXopr_b_absorb_lp_00 302 +#define SFXsfx012F 303 +#define SFXsfx0130 304 +#define SFXsfx0131 305 +#define SFXsfx0132 306 +#define SFXsfx0133 307 +#define SFXsfx0134 308 +#define SFXsfx0135 309 +#define SFXsfx0136 310 +#define SFXsfx0137 311 +#define SFXsfx0138 312 +#define SFXsfx0139 313 +#define SFXsfx013A 314 +#define SFXsfx013B 315 +#define SFXsfx013C 316 +#define SFXsfx013D 317 +#define SFXsfx013E 318 +#define SFXsfx013F 319 +#define SFXsfx0140 320 +#define SFXsfx0141 321 +#define SFXsfx0142 322 + + diff --git a/DataSpec/DNAMP1/SFX/FireFlea.h b/DataSpec/DNAMP1/SFX/FireFlea.h new file mode 100644 index 000000000..16e3737ac --- /dev/null +++ b/DataSpec/DNAMP1/SFX/FireFlea.h @@ -0,0 +1,26 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: FireFlea + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000B 11 + + +#define SFXfif_b_idle_lp_00 323 +#define SFXsfx0144 324 +#define SFXfif_b_light_00 325 +#define SFXfif_r_death_00 326 +#define SFXfif_r_death_01 327 +#define SFXfif_r_explode_00 328 +#define SFXfif_r_impact_00 329 +#define SFXsfx014A 330 +#define SFXsfx014B 331 +#define SFXsfx014C 332 +#define SFXsfx014D 333 +#define SFXsfx014E 334 +#define SFXsfx014F 335 + + diff --git a/DataSpec/DNAMP1/SFX/Flaaghra.h b/DataSpec/DNAMP1/SFX/Flaaghra.h new file mode 100644 index 000000000..4607e0f88 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Flaaghra.h @@ -0,0 +1,94 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Flaaghra + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0034 52 + + +#define SFXfla_a_hitgrnd_00 2600 +#define SFXfla_a_swoosh_00 2601 +#define SFXfla_a_swoosh_01 2602 +#define SFXfla_a_voxattak_00 2603 +#define SFXfla_a_voxattak_01 2604 +#define SFXfla_b_grow_00 2605 +#define SFXfla_b_idle_00 2606 +#define SFXsfx0A2F 2607 +#define SFXfla_b_voxangry_00 2608 +#define SFXfla_b_voxangry_01 2609 +#define SFXfla_r_death_00 2610 +#define SFXfla_r_death_01 2611 +#define SFXfla_r_death_02 2612 +#define SFXsfx0A35 2613 +#define SFXfla_r_faint_01 2614 +#define SFXfla_r_pain_00 2615 +#define SFXsfx0A38 2616 +#define SFXfla_a_shoot_00 2617 +#define SFXfla_a_spit_00 2618 +#define SFXfla_a_spit_01 2619 +#define SFXsfx0A3C 2620 +#define SFXsfx0A3D 2621 +#define SFXfla_a_charge_00 2622 +#define SFXsfx0A3F 2623 +#define SFXsfx0A40 2624 +#define SFXfla_b_idlesm_00 2625 +#define SFXfla_a_chargevox_00 2626 +#define SFXsfx0A43 2627 +#define SFXsfx0A44 2628 +#define SFXsfx0A45 2629 +#define SFXfla_a_shootvox_00 2630 +#define SFXsfx0A47 2631 +#define SFXsfx0A48 2632 +#define SFXsfx0A49 2633 +#define SFXsfx0A4A 2634 +#define SFXsfx0A4B 2635 +#define SFXfla_a_spitvox_00 2636 +#define SFXfla_a_spitvox_01 2637 +#define SFXsfx0A4E 2638 +#define SFXsfx0A4F 2639 +#define SFXsfx0A50 2640 +#define SFXsfx0A51 2641 +#define SFXsfx0A52 2642 +#define SFXfla_a_sporevox_01 2643 +#define SFXfla_a_hitgrnd_01 2644 +#define SFXsfx0A55 2645 +#define SFXfla_r_landgrnd_00 2646 +#define SFXsfx0A57 2647 +#define SFXsfx0A58 2648 +#define SFXfla_b_grow_01 2649 +#define SFXfla_b_rise_lp_00 2650 +#define SFXsfx0A5B 2651 +#define SFXfla_b_dizzy_00 2652 +#define SFXsfx0A5D 2653 +#define SFXsfx0A5E 2654 +#define SFXfla_r_painsh_00 2655 +#define SFXsfx0A60 2656 +#define SFXfla_b_humor_00 2657 +#define SFXfla_r_painbig_00 2658 +#define SFXfla_b_dizzyout_00 2659 +#define SFXfla_b_faintout_00 2660 +#define SFXsfx0A65 2661 +#define SFXfla_b_dizzy_lp_01 2662 +#define SFXsfx0A67 2663 +#define SFXsfx0A68 2664 +#define SFXsfx0A69 2665 +#define SFXsfx0A6A 2666 +#define SFXfla_b_voxshrnk_00 2667 +#define SFXsfx0A6C 2668 +#define SFXsfx0A6D 2669 +#define SFXfla_b_voxshrnk_03 2670 +#define SFXsfx0A6F 2671 +#define SFXsfx0A70 2672 +#define SFXsfx0A71 2673 +#define SFXsfx0A72 2674 +#define SFXsfx0A73 2675 +#define SFXsfx0A74 2676 +#define SFXsfx0A75 2677 +#define SFXsfx0A76 2678 +#define SFXsfx0A77 2679 +#define SFXsfx0A78 2680 + + diff --git a/DataSpec/DNAMP1/SFX/FlickerBat.h b/DataSpec/DNAMP1/SFX/FlickerBat.h new file mode 100644 index 000000000..ba498cc7b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/FlickerBat.h @@ -0,0 +1,25 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: FlickerBat + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000C 12 + + +#define SFXflk_b_flicker_00 336 +#define SFXflk_b_talk_00 337 +#define SFXflk_b_talk_01 338 +#define SFXsfx0153 339 +#define SFXsfx0154 340 +#define SFXflk_r_impact_00 341 +#define SFXsfx0156 342 +#define SFXsfx0157 343 +#define SFXsfx0158 344 +#define SFXsfx0159 345 +#define SFXsfx015A 346 +#define SFXsfx015B 347 + + diff --git a/DataSpec/DNAMP1/SFX/FlyingPirate.h b/DataSpec/DNAMP1/SFX/FlyingPirate.h new file mode 100644 index 000000000..9856b52a3 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/FlyingPirate.h @@ -0,0 +1,72 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: FlyingPirate + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000D 13 + + +#define SFXsfx015C 348 +#define SFXfpr_a_chaff_00 349 +#define SFXsfx015E 350 +#define SFXupr_a_mislfire_00 351 +#define SFXsfx0160 352 +#define SFXsfx0161 353 +#define SFXfpr_a_mislfire_00 354 +#define SFXfpr_b_thrust_01 355 +#define SFXsfx0164 356 +#define SFXfpr_b_engine_lp_00 357 +#define SFXfpr_b_engine_lp_01 358 +#define SFXfpr_b_engine_lp_02 359 +#define SFXfpr_b_voxangry_02 360 +#define SFXfpr_b_thrust_00 361 +#define SFXsfx016A 362 +#define SFXfpr_r_die_00 363 +#define SFXfpr_b_intruder_00 364 +#define SFXfpr_b_voxalert_00 365 +#define SFXfpr_a_mislload_00 366 +#define SFXfpr_b_voxangry_00 367 +#define SFXsfx0170 368 +#define SFXfpr_r_impact_00 369 +#define SFXsfx0172 370 +#define SFXsfx0173 371 +#define SFXsfx0174 372 +#define SFXfpr_b_engidle_lp_00 373 +#define SFXsfx0176 374 +#define SFXfpr_b_blastoff_lp_00 375 +#define SFXfpr_b_blastoff_01 376 +#define SFXupr_a_mislload_00 377 +#define SFXupr_b_engidle_lp_00 378 +#define SFXupr_b_engine_lp_00 379 +#define SFXupr_b_engine_lp_01 380 +#define SFXupr_b_engine_lp_02 381 +#define SFXsfx017E 382 +#define SFXsfx017F 383 +#define SFXupr_b_voxalert_00 384 +#define SFXsfx0181 385 +#define SFXupr_b_voxangry_00 386 +#define SFXsfx0183 387 +#define SFXupr_b_voxangry_02 388 +#define SFXupr_r_die_00 389 +#define SFXupr_r_impact_00 390 +#define SFXsfx0187 391 +#define SFXsfx0188 392 +#define SFXsfx0189 393 +#define SFXsfx018A 394 +#define SFXsfx018B 395 +#define SFXsfx018C 396 +#define SFXsfx018D 397 +#define SFXsfx018E 398 +#define SFXsfx018F 399 +#define SFXsfx0190 400 +#define SFXsfx0191 401 +#define SFXsfx0192 402 +#define SFXsfx0193 403 +#define SFXsfx0194 404 +#define SFXsfx0195 405 +#define SFXsfx0196 406 + + diff --git a/DataSpec/DNAMP1/SFX/FrontEnd.h b/DataSpec/DNAMP1/SFX/FrontEnd.h new file mode 100644 index 000000000..99c424c10 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/FrontEnd.h @@ -0,0 +1,51 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: FrontEnd + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0026 38 + + +#define SFXfnt_transfore_00L 1090 +#define SFXfnt_advance_R 1091 +#define SFXsfx0444 1092 +#define SFXfnt_selection_change 1093 +#define SFXfnt_back 1094 +#define SFXfnt_enum_change 1095 +#define SFXfnt_advance_L 1096 +#define SFXfnt_transfore_00R 1097 +#define SFXfnt_transfore_01L 1098 +#define SFXfnt_transfore_01R 1099 +#define SFXfnt_transfore_02L 1100 +#define SFXfnt_transfore_02R 1101 +#define SFXfnt_transback_00L 1102 +#define SFXfnt_transback_00R 1103 +#define SFXfnt_transback_01L 1104 +#define SFXfnt_transback_01R 1105 +#define SFXfnt_transback_02L 1106 +#define SFXfnt_transback_02R 1107 +#define SFXfnt_tofusion_L 1108 +#define SFXfnt_tofusion_R 1109 +#define SFXfnt_fromfusion_L 1110 +#define SFXfnt_fromfusion_R 1111 +#define SFXsfx0458 1112 +#define SFXsfx0459 1113 +#define SFXsfx045A 1114 +#define SFXsfx045B 1115 +#define SFXsfx045C 1116 +#define SFXsfx045D 1117 +#define SFXsfx045E 1118 +#define SFXsfx045F 1119 +#define SFXsfx0460 1120 +#define SFXsfx0461 1121 +#define SFXsfx0462 1122 +#define SFXsfx0463 1123 +#define SFXsfx0464 1124 +#define SFXsfx0465 1125 +#define SFXsfx0466 1126 +#define SFXsfx0467 1127 + + diff --git a/DataSpec/DNAMP1/SFX/GagantuanBeatle.h b/DataSpec/DNAMP1/SFX/GagantuanBeatle.h new file mode 100644 index 000000000..b501decdc --- /dev/null +++ b/DataSpec/DNAMP1/SFX/GagantuanBeatle.h @@ -0,0 +1,65 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: GagantuanBeatle + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000E 14 + + +#define SFXgab_r_hitlight_01 407 +#define SFXga2_b_digexplod_00 408 +#define SFXga2_b_digscream_00 409 +#define SFXga2_b_idle_01 410 +#define SFXga2_b_scrapedirt_00 411 +#define SFXgab_b_walkdirt_02 412 +#define SFXgab_b_rundirt_00 413 +#define SFXgab_b_rundirt_01 414 +#define SFXsfx019F 415 +#define SFXgab_a_attack_00 416 +#define SFXgab_a_attack_01 417 +#define SFXgab_b_idle_03 418 +#define SFXgab_b_digexplod_00 419 +#define SFXfla_b_scrapedirt_00 420 +#define SFXgab_b_idle_02 421 +#define SFXgab_b_idle_00 422 +#define SFXgab_b_idle_01 423 +#define SFXgab_b_walkdirt_00 424 +#define SFXgab_b_walkdirt_01 425 +#define SFXgab_r_collide_00 426 +#define SFXsfx01AB 427 +#define SFXgab_r_death_01 428 +#define SFXgab_r_detect_00 429 +#define SFXgab_r_hitlight_00 430 +#define SFXgab_b_digscream_00 431 +#define SFXgab_b_scrapedirt_00 432 +#define SFXga2_b_dig_lp_00 433 +#define SFXga2_b_rundirt_00 434 +#define SFXgab_b_dig_lp_00 435 +#define SFXga2_b_rundirt_01 436 +#define SFXga2_b_rundirt_02 437 +#define SFXga2_b_walkdirt_00 438 +#define SFXga2_b_walkdirt_01 439 +#define SFXga2_b_walkdirt_02 440 +#define SFXga2_r_collide_00 441 +#define SFXga2_a_attack_00 442 +#define SFXsfx01BB 443 +#define SFXsfx01BC 444 +#define SFXsfx01BD 445 +#define SFXsfx01BE 446 +#define SFXsfx01BF 447 +#define SFXsfx01C0 448 +#define SFXsfx01C1 449 +#define SFXsfx01C2 450 +#define SFXsfx01C3 451 +#define SFXsfx01C4 452 +#define SFXsfx01C5 453 +#define SFXsfx01C6 454 +#define SFXsfx01C7 455 +#define SFXsfx01C8 456 +#define SFXsfx01C9 457 +#define SFXsfx01CA 458 + + diff --git a/DataSpec/DNAMP1/SFX/Gnats.h b/DataSpec/DNAMP1/SFX/Gnats.h new file mode 100644 index 000000000..ec6c6a258 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Gnats.h @@ -0,0 +1,20 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Gnats + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup000F 15 + + +#define SFXsfx01CB 459 +#define SFXsfx01CC 460 +#define SFXsfx01CD 461 +#define SFXsfx01CE 462 +#define SFXsfx01CF 463 +#define SFXsfx01D0 464 +#define SFXsfx01D1 465 + + diff --git a/DataSpec/DNAMP1/SFX/Gryzbee.h b/DataSpec/DNAMP1/SFX/Gryzbee.h new file mode 100644 index 000000000..664aa1c18 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Gryzbee.h @@ -0,0 +1,25 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Gryzbee + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0010 16 + + +#define SFXgrz_b_idle_00 466 +#define SFXsfx01D3 467 +#define SFXsfx01D4 468 +#define SFXsfx01D5 469 +#define SFXsfx01D6 470 +#define SFXsfx01D7 471 +#define SFXsfx01D8 472 +#define SFXsfx01D9 473 +#define SFXsfx01DA 474 +#define SFXsfx01DB 475 +#define SFXsfx01DC 476 +#define SFXsfx01DD 477 + + diff --git a/DataSpec/DNAMP1/SFX/IceCrack.h b/DataSpec/DNAMP1/SFX/IceCrack.h new file mode 100644 index 000000000..fe4a5129e --- /dev/null +++ b/DataSpec/DNAMP1/SFX/IceCrack.h @@ -0,0 +1,33 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: IceCrack + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0043 67 + + +#define SFXsfx0C31 3121 +#define SFXsfx0C32 3122 +#define SFXsfx0C33 3123 +#define SFXsfx0C34 3124 +#define SFXsfx0C35 3125 +#define SFXsfx0C36 3126 +#define SFXcrk_break_subsequent 3127 +#define SFXcrk_break_initial 3128 +#define SFXcrk_break_final 3129 +#define SFXsfx0C3A 3130 +#define SFXsfx0C3B 3131 +#define SFXsfx0C3C 3132 +#define SFXsfx0C3D 3133 +#define SFXsfx0C3E 3134 +#define SFXsfx0C3F 3135 +#define SFXsfx0C40 3136 +#define SFXsfx0C41 3137 +#define SFXsfx0C42 3138 +#define SFXsfx0C43 3139 +#define SFXsfx0C44 3140 + + diff --git a/DataSpec/DNAMP1/SFX/IceWorld.h b/DataSpec/DNAMP1/SFX/IceWorld.h new file mode 100644 index 000000000..6bf538ffb --- /dev/null +++ b/DataSpec/DNAMP1/SFX/IceWorld.h @@ -0,0 +1,133 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: IceWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002D 45 + + +#define SFXice_x_gateopen_lp_00 1922 +#define SFXice_x_gatestop_00 1923 +#define SFXsfx0784 1924 +#define SFXice_x_towercrk_00 1925 +#define SFXice_ballroll_ice 1926 +#define SFXice_ballroll_snow 1927 +#define SFXsfx0788 1928 +#define SFXice_x_towerlnd_00 1929 +#define SFXsfx078A 1930 +#define SFXice_x_towerlnd_01 1931 +#define SFXice_x_towercrk_01 1932 +#define SFXice_x_towercrk_02 1933 +#define SFXsfx078E 1934 +#define SFXsfx078F 1935 +#define SFXsfx0790 1936 +#define SFXsfx0791 1937 +#define SFXsfx0792 1938 +#define SFXsfx0793 1939 +#define SFXsfx0794 1940 +#define SFXsfx0795 1941 +#define SFXsfx0796 1942 +#define SFXsfx0797 1943 +#define SFXsfx0798 1944 +#define SFXsfx0799 1945 +#define SFXsfx079A 1946 +#define SFXsfx079B 1947 +#define SFXsfx079C 1948 +#define SFXsfx079D 1949 +#define SFXsfx079E 1950 +#define SFXsfx079F 1951 +#define SFXsfx07A0 1952 +#define SFXsfx07A1 1953 +#define SFXsfx07A2 1954 +#define SFXsfx07A3 1955 +#define SFXsfx07A4 1956 +#define SFXsfx07A5 1957 +#define SFXsfx07A6 1958 +#define SFXsfx07A7 1959 +#define SFXsfx07A8 1960 +#define SFXsfx07A9 1961 +#define SFXsfx07AA 1962 +#define SFXsfx07AB 1963 +#define SFXsfx07AC 1964 +#define SFXsfx07AD 1965 +#define SFXsfx07AE 1966 +#define SFXsfx07AF 1967 +#define SFXtha_b_rockup_lp_00 1968 +#define SFXsfx07B1 1969 +#define SFXsfx07B2 1970 +#define SFXice_x_ridflap_00 1971 +#define SFXsfx07B4 1972 +#define SFXsfx07B5 1973 +#define SFXsfx07B6 1974 +#define SFXice_x_pump_00 1975 +#define SFXsfx07B8 1976 +#define SFXsfx07B9 1977 +#define SFXsfx07BA 1978 +#define SFXsfx07BB 1979 +#define SFXsfx07BC 1980 +#define SFXsfx07BD 1981 +#define SFXice_x_piston_00 1982 +#define SFXice_x_piston_lp_00 1983 +#define SFXsfx07C0 1984 +#define SFXsfx07C1 1985 +#define SFXsfx07C2 1986 +#define SFXsfx07C3 1987 +#define SFXsfx07C4 1988 +#define SFXsfx07C5 1989 +#define SFXsfx07C6 1990 +#define SFXsfx07C7 1991 +#define SFXsfx07C8 1992 +#define SFXsfx07C9 1993 +#define SFXtha_b_debris_00 1994 +#define SFXtha_b_debris_01 1995 +#define SFXsfx07CC 1996 +#define SFXsfx07CD 1997 +#define SFXsfx07CE 1998 +#define SFXsfx07CF 1999 +#define SFXsfx07D0 2000 +#define SFXsfx07D1 2001 +#define SFXsfx07D2 2002 +#define SFXsfx07D3 2003 +#define SFXsfx07D4 2004 +#define SFXsfx07D5 2005 +#define SFXsfx07D6 2006 +#define SFXsfx07D7 2007 +#define SFXsfx07D8 2008 +#define SFXsfx07D9 2009 +#define SFXsfx07DA 2010 +#define SFXsfx07DB 2011 +#define SFXsfx07DC 2012 +#define SFXsfx07DD 2013 +#define SFXsfx07DE 2014 +#define SFXsfx07DF 2015 +#define SFXsfx07E0 2016 +#define SFXsfx07E1 2017 +#define SFXsfx07E2 2018 +#define SFXsfx07E3 2019 +#define SFXsfx07E4 2020 +#define SFXsfx07E5 2021 +#define SFXsfx07E6 2022 +#define SFXsfx07E7 2023 +#define SFXsfx07E8 2024 +#define SFXsfx07E9 2025 +#define SFXsfx07EA 2026 +#define SFXsfx07EB 2027 +#define SFXsfx07EC 2028 +#define SFXsfx07ED 2029 +#define SFXsfx07EE 2030 +#define SFXsfx07EF 2031 +#define SFXsfx07F0 2032 +#define SFXsfx07F1 2033 +#define SFXsfx07F2 2034 +#define SFXsfx07F3 2035 +#define SFXsfx07F4 2036 +#define SFXsfx07F5 2037 +#define SFXsfx07F6 2038 +#define SFXsfx07F7 2039 +#define SFXsfx07F8 2040 +#define SFXsfx07F9 2041 + + diff --git a/DataSpec/DNAMP1/SFX/InjuredPirates.h b/DataSpec/DNAMP1/SFX/InjuredPirates.h new file mode 100644 index 000000000..76c15d97c --- /dev/null +++ b/DataSpec/DNAMP1/SFX/InjuredPirates.h @@ -0,0 +1,43 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: InjuredPirates + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0011 17 + + +#define SFXsfx01DE 478 +#define SFXsfx01DF 479 +#define SFXspr_b_exhale_00 480 +#define SFXsfx01E1 481 +#define SFXspr_b_moan_00 482 +#define SFXsfx01E3 483 +#define SFXsfx01E4 484 +#define SFXsfx01E5 485 +#define SFXsfx01E6 486 +#define SFXsfx01E7 487 +#define SFXsfx01E8 488 +#define SFXsfx01E9 489 +#define SFXsfx01EA 490 +#define SFXsfx01EB 491 +#define SFXsfx01EC 492 +#define SFXsfx01ED 493 +#define SFXsfx01EE 494 +#define SFXsfx01EF 495 +#define SFXsfx01F0 496 +#define SFXsfx01F1 497 +#define SFXsfx01F2 498 +#define SFXsfx01F3 499 +#define SFXsfx01F4 500 +#define SFXsfx01F5 501 +#define SFXsfx01F6 502 +#define SFXsfx01F7 503 +#define SFXsfx01F8 504 +#define SFXsfx01F9 505 +#define SFXsfx01FA 506 +#define SFXsfx01FB 507 + + diff --git a/DataSpec/DNAMP1/SFX/IntroBoss.h b/DataSpec/DNAMP1/SFX/IntroBoss.h new file mode 100644 index 000000000..d167c7a00 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/IntroBoss.h @@ -0,0 +1,55 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: IntroBoss + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0000 0 + + +#define SFXsfx0000 0 +#define SFXsfx0001 1 +#define SFXsfx0002 2 +#define SFXpaq_a_spit_lp_00 3 +#define SFXpaq_b_squawk_00 4 +#define SFXpaq_b_creak_00 5 +#define SFXpaq_b_creak_01 6 +#define SFXpaq_b_growl_00 7 +#define SFXpaq_b_growl_01 8 +#define SFXpaq_b_land_00 9 +#define SFXpaq_b_roar_00 10 +#define SFXpaq_b_roar_01 11 +#define SFXsfx000C 12 +#define SFXpaq_b_walk_00 13 +#define SFXpaq_b_walk_01 14 +#define SFXpaq_r_impact_00 15 +#define SFXpaq_r_impact_01 16 +#define SFXpaq_r_ldeath_00 17 +#define SFXpaq_r_sdeath_01 18 +#define SFXpaq_b_swish_00 19 +#define SFXsfx0014 20 +#define SFXsfx0015 21 +#define SFXsfx0016 22 +#define SFXpaq_b_land_01 23 +#define SFXpaq_b_run_00 24 +#define SFXpaq_b_run_01 25 +#define SFXsfx001A 26 +#define SFXsfx001B 27 +#define SFXsfx001C 28 +#define SFXsfx001D 29 +#define SFXsfx001E 30 +#define SFXsfx001F 31 +#define SFXsfx0020 32 +#define SFXsfx0021 33 +#define SFXsfx0022 34 +#define SFXsfx0023 35 +#define SFXsfx0024 36 +#define SFXsfx0025 37 +#define SFXsfx0026 38 +#define SFXsfx0027 39 +#define SFXsfx0028 40 +#define SFXsfx0029 41 + + diff --git a/DataSpec/DNAMP1/SFX/IntroWorld.h b/DataSpec/DNAMP1/SFX/IntroWorld.h new file mode 100644 index 000000000..0f0884e72 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/IntroWorld.h @@ -0,0 +1,152 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: IntroWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002E 46 + + +#define SFXsfx07FA 2042 +#define SFXsfx07FB 2043 +#define SFXsfx07FC 2044 +#define SFXsfx07FD 2045 +#define SFXsfx07FE 2046 +#define SFXint_c_suitsprk_lp_01 2047 +#define SFXsfx0800 2048 +#define SFXsfx0801 2049 +#define SFXsfx0802 2050 +#define SFXsfx0803 2051 +#define SFXsfx0804 2052 +#define SFXsfx0805 2053 +#define SFXsfx0806 2054 +#define SFXsfx0807 2055 +#define SFXsfx0808 2056 +#define SFXsfx0809 2057 +#define SFXsfx080A 2058 +#define SFXsfx080B 2059 +#define SFXsfx080C 2060 +#define SFXsfx080D 2061 +#define SFXsfx080E 2062 +#define SFXsfx080F 2063 +#define SFXsfx0810 2064 +#define SFXsfx0811 2065 +#define SFXsfx0812 2066 +#define SFXsfx0813 2067 +#define SFXsfx0814 2068 +#define SFXsfx0815 2069 +#define SFXsfx0816 2070 +#define SFXsfx0817 2071 +#define SFXsfx0818 2072 +#define SFXsfx0819 2073 +#define SFXsfx081A 2074 +#define SFXsfx081B 2075 +#define SFXsfx081C 2076 +#define SFXsfx081D 2077 +#define SFXsfx081E 2078 +#define SFXsfx081F 2079 +#define SFXsfx0820 2080 +#define SFXsfx0821 2081 +#define SFXsfx0822 2082 +#define SFXsfx0823 2083 +#define SFXsfx0824 2084 +#define SFXsfx0825 2085 +#define SFXsfx0826 2086 +#define SFXsfx0827 2087 +#define SFXsfx0828 2088 +#define SFXsfx0829 2089 +#define SFXsfx082A 2090 +#define SFXsfx082B 2091 +#define SFXsfx082C 2092 +#define SFXsfx082D 2093 +#define SFXsfx082E 2094 +#define SFXsfx082F 2095 +#define SFXsfx0830 2096 +#define SFXsfx0831 2097 +#define SFXsfx0832 2098 +#define SFXsfx0833 2099 +#define SFXsfx0834 2100 +#define SFXsfx0835 2101 +#define SFXsfx0836 2102 +#define SFXsfx0837 2103 +#define SFXsfx0838 2104 +#define SFXsfx0839 2105 +#define SFXsfx083A 2106 +#define SFXsfx083B 2107 +#define SFXsfx083C 2108 +#define SFXint_x_frtdoor_00 2109 +#define SFXint_x_frtdoor_01 2110 +#define SFXsfx083F 2111 +#define SFXsfx0840 2112 +#define SFXsfx0841 2113 +#define SFXsfx0842 2114 +#define SFXsfx0843 2115 +#define SFXsfx0844 2116 +#define SFXsfx0845 2117 +#define SFXsfx0846 2118 +#define SFXsfx0847 2119 +#define SFXsfx0848 2120 +#define SFXsfx0849 2121 +#define SFXsfx084A 2122 +#define SFXsfx084B 2123 +#define SFXsfx084C 2124 +#define SFXsfx084D 2125 +#define SFXint_c_suitbrst_01 2126 +#define SFXsfx084F 2127 +#define SFXsfx0850 2128 +#define SFXsfx0851 2129 +#define SFXint_c_shipthst_00 2130 +#define SFXsfx0853 2131 +#define SFXsfx0854 2132 +#define SFXsfx0855 2133 +#define SFXsfx0856 2134 +#define SFXsfx0857 2135 +#define SFXsfx0858 2136 +#define SFXsfx0859 2137 +#define SFXsfx085A 2138 +#define SFXsfx085B 2139 +#define SFXsfx085C 2140 +#define SFXsfx085D 2141 +#define SFXsfx085E 2142 +#define SFXsfx085F 2143 +#define SFXsfx0860 2144 +#define SFXsfx0861 2145 +#define SFXsfx0862 2146 +#define SFXsfx0863 2147 +#define SFXsfx0864 2148 +#define SFXsfx0865 2149 +#define SFXsfx0866 2150 +#define SFXsfx0867 2151 +#define SFXsfx0868 2152 +#define SFXsfx0869 2153 +#define SFXsfx086A 2154 +#define SFXsfx086B 2155 +#define SFXsfx086C 2156 +#define SFXsfx086D 2157 +#define SFXsfx086E 2158 +#define SFXsfx086F 2159 +#define SFXsfx0870 2160 +#define SFXint_x_clampstp_00 2161 +#define SFXint_x_clamp_00 2162 +#define SFXint_x_clamp_01 2163 +#define SFXsfx0874 2164 +#define SFXsfx0875 2165 +#define SFXsfx0876 2166 +#define SFXsfx0877 2167 +#define SFXsfx0878 2168 +#define SFXsfx0879 2169 +#define SFXsfx087A 2170 +#define SFXsfx087B 2171 +#define SFXsfx087C 2172 +#define SFXsfx087D 2173 +#define SFXsfx087E 2174 +#define SFXsfx087F 2175 +#define SFXsfx0880 2176 +#define SFXsfx0881 2177 +#define SFXsfx0882 2178 +#define SFXsfx0883 2179 +#define SFXsfx0884 2180 + + diff --git a/DataSpec/DNAMP1/SFX/JellyZap.h b/DataSpec/DNAMP1/SFX/JellyZap.h new file mode 100644 index 000000000..0a417f082 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/JellyZap.h @@ -0,0 +1,23 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: JellyZap + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0012 18 + + +#define SFXjzp_a_shock_00 508 +#define SFXjzp_a_suck_lp_00 509 +#define SFXjzp_b_bubbles_00 510 +#define SFXjzp_b_growl_00 511 +#define SFXsfx0200 512 +#define SFXsfx0201 513 +#define SFXsfx0202 514 +#define SFXsfx0203 515 +#define SFXsfx0204 516 +#define SFXsfx0205 517 + + diff --git a/DataSpec/DNAMP1/SFX/LavaWorld.h b/DataSpec/DNAMP1/SFX/LavaWorld.h new file mode 100644 index 000000000..16d3394fd --- /dev/null +++ b/DataSpec/DNAMP1/SFX/LavaWorld.h @@ -0,0 +1,116 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: LavaWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002F 47 + + +#define SFXsfx0885 2181 +#define SFXsfx0886 2182 +#define SFXlav_wlklava_00 2183 +#define SFXlav_wlklava_01 2184 +#define SFXsfx0889 2185 +#define SFXlav_ballroll_lava 2186 +#define SFXsfx088B 2187 +#define SFXsfx088C 2188 +#define SFXsfx088D 2189 +#define SFXlav_landlava_00 2190 +#define SFXsfx088F 2191 +#define SFXsfx0890 2192 +#define SFXsfx0891 2193 +#define SFXsfx0892 2194 +#define SFXsfx0893 2195 +#define SFXsfx0894 2196 +#define SFXsfx0895 2197 +#define SFXsfx0896 2198 +#define SFXsfx0897 2199 +#define SFXsfx0898 2200 +#define SFXsfx0899 2201 +#define SFXsfx089A 2202 +#define SFXsfx089B 2203 +#define SFXsfx089C 2204 +#define SFXsfx089D 2205 +#define SFXsfx089E 2206 +#define SFXsfx089F 2207 +#define SFXsfx08A0 2208 +#define SFXsfx08A1 2209 +#define SFXsfx08A2 2210 +#define SFXsfx08A3 2211 +#define SFXsfx08A4 2212 +#define SFXsfx08A5 2213 +#define SFXsfx08A6 2214 +#define SFXsfx08A7 2215 +#define SFXlav_x_piston_lp_00 2216 +#define SFXsfx08A9 2217 +#define SFXlav_x_piststop_00 2218 +#define SFXlav_x_piststop_01 2219 +#define SFXsfx08AC 2220 +#define SFXsfx08AD 2221 +#define SFXswp_x_03bridgestop_00 2222 +#define SFXsfx08AF 2223 +#define SFXsfx08B0 2224 +#define SFXsfx08B1 2225 +#define SFXsfx08B2 2226 +#define SFXsfx08B3 2227 +#define SFXsfx08B4 2228 +#define SFXsfx08B5 2229 +#define SFXsfx08B6 2230 +#define SFXsfx08B7 2231 +#define SFXsfx08B8 2232 +#define SFXsfx08B9 2233 +#define SFXsfx08BA 2234 +#define SFXsfx08BB 2235 +#define SFXsfx08BC 2236 +#define SFXsfx08BD 2237 +#define SFXsfx08BE 2238 +#define SFXmag_b_rise_00 2239 +#define SFXsfx08C0 2240 +#define SFXsfx08C1 2241 +#define SFXsfx08C2 2242 +#define SFXsfx08C3 2243 +#define SFXsfx08C4 2244 +#define SFXsfx08C5 2245 +#define SFXsfx08C6 2246 +#define SFXsfx08C7 2247 +#define SFXsfx08C8 2248 +#define SFXsfx08C9 2249 +#define SFXsfx08CA 2250 +#define SFXsfx08CB 2251 +#define SFXsfx08CC 2252 +#define SFXlav_x_gateup_lp_00 2253 +#define SFXsfx08CE 2254 +#define SFXlav_x_refrig_00 2255 +#define SFXlav_x_gatestop_00 2256 +#define SFXsfx08D1 2257 +#define SFXsfx08D2 2258 +#define SFXsfx08D3 2259 +#define SFXsfx08D4 2260 +#define SFXsfx08D5 2261 +#define SFXsfx08D6 2262 +#define SFXlav_landlava_02 2263 +#define SFXsfx08D8 2264 +#define SFXsfx08D9 2265 +#define SFXsfx08DA 2266 +#define SFXsfx08DB 2267 +#define SFXsfx08DC 2268 +#define SFXsfx08DD 2269 +#define SFXsfx08DE 2270 +#define SFXsfx08DF 2271 +#define SFXsfx08E0 2272 +#define SFXsfx08E1 2273 +#define SFXsfx08E2 2274 +#define SFXsfx08E3 2275 +#define SFXsfx08E4 2276 +#define SFXsfx08E5 2277 +#define SFXsfx08E6 2278 +#define SFXsfx08E7 2279 +#define SFXsfx08E8 2280 +#define SFXsfx08E9 2281 +#define SFXsfx08EA 2282 +#define SFXsfx08EB 2283 + + diff --git a/DataSpec/DNAMP1/SFX/Magdolite.h b/DataSpec/DNAMP1/SFX/Magdolite.h new file mode 100644 index 000000000..6be8459f0 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Magdolite.h @@ -0,0 +1,43 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Magdolite + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0013 19 + + +#define SFXmag_b_alert_00 518 +#define SFXmag_b_idle_00 519 +#define SFXsfx0208 520 +#define SFXmag_r_pain_00 521 +#define SFXmag_a_bite_00 522 +#define SFXmag_r_death_00 523 +#define SFXmag_a_breath_00 524 +#define SFXmag_a_flame_lp_00 525 +#define SFXmag_r_yelp_00 526 +#define SFXsfx020F 527 +#define SFXsfx0210 528 +#define SFXsfx0211 529 +#define SFXsfx0212 530 +#define SFXsfx0213 531 +#define SFXsfx0214 532 +#define SFXsfx0215 533 +#define SFXsfx0216 534 +#define SFXsfx0217 535 +#define SFXsfx0218 536 +#define SFXsfx0219 537 +#define SFXsfx021A 538 +#define SFXsfx021B 539 +#define SFXsfx021C 540 +#define SFXsfx021D 541 +#define SFXsfx021E 542 +#define SFXsfx021F 543 +#define SFXsfx0220 544 +#define SFXsfx0221 545 +#define SFXsfx0222 546 +#define SFXsfx0223 547 + + diff --git a/DataSpec/DNAMP1/SFX/Metaree.h b/DataSpec/DNAMP1/SFX/Metaree.h new file mode 100644 index 000000000..f086fda7e --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Metaree.h @@ -0,0 +1,24 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Metaree + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0014 20 + + +#define SFXmtr_a_scream_00 548 +#define SFXsfx0225 549 +#define SFXmtr_b_spin_lp_06 550 +#define SFXmtr_b_spin_lp_07 551 +#define SFXsfx0228 552 +#define SFXsfx0229 553 +#define SFXsfx022A 554 +#define SFXsfx022B 555 +#define SFXsfx022C 556 +#define SFXsfx022D 557 +#define SFXsfx022E 558 + + diff --git a/DataSpec/DNAMP1/SFX/Metroid.h b/DataSpec/DNAMP1/SFX/Metroid.h new file mode 100644 index 000000000..f37d066a8 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Metroid.h @@ -0,0 +1,78 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Metroid + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0015 21 + + +#define SFXsfx022F 559 +#define SFXsfx0230 560 +#define SFXmtd_a_facehug_02 561 +#define SFXmtd_a_swoosh_00 562 +#define SFXmtd_a_swoosh_01 563 +#define SFXmtd_a_thunk_00 564 +#define SFXmtd_b_fadein_00 565 +#define SFXmtd_b_fadeout_00 566 +#define SFXmtd_b_float_lp_00 567 +#define SFXmtd_b_float_lp_01 568 +#define SFXmtd_b_idle_00 569 +#define SFXmtd_b_idle_01 570 +#define SFXsfx023B 571 +#define SFXsfx023C 572 +#define SFXsfx023D 573 +#define SFXsfx023E 574 +#define SFXsfx023F 575 +#define SFXmtd_b_squish_00 576 +#define SFXmtd_b_squish_01 577 +#define SFXsfx0242 578 +#define SFXmtd_b_voxangry_00 579 +#define SFXsfx0244 580 +#define SFXsfx0245 581 +#define SFXmtd_r_impact_00 582 +#define SFXsfx0247 583 +#define SFXsfx0248 584 +#define SFXmt2_a_facehug_02 585 +#define SFXsfx024A 586 +#define SFXsfx024B 587 +#define SFXsfx024C 588 +#define SFXsfx024D 589 +#define SFXmt2_b_float_lp_00 590 +#define SFXmt2_b_float_lp_01 591 +#define SFXsfx0250 592 +#define SFXsfx0251 593 +#define SFXsfx0252 594 +#define SFXmt2_b_idle_02 595 +#define SFXsfx0254 596 +#define SFXsfx0255 597 +#define SFXmt2_b_leech_lp_00 598 +#define SFXsfx0257 599 +#define SFXsfx0258 600 +#define SFXmt2_b_voxangry_00 601 +#define SFXmt2_b_voxangry_01 602 +#define SFXsfx025B 603 +#define SFXmt2_r_impact_00 604 +#define SFXmtd_b_grow_00 605 +#define SFXmtd_b_suck_lp_00 606 +#define SFXmtd_r_death_00 607 +#define SFXmt2_b_float_lp_02 608 +#define SFXsfx0261 609 +#define SFXmtd_b_voxcalm_00 610 +#define SFXsfx0263 611 +#define SFXsfx0264 612 +#define SFXsfx0265 613 +#define SFXsfx0266 614 +#define SFXsfx0267 615 +#define SFXsfx0268 616 +#define SFXsfx0269 617 +#define SFXsfx026A 618 +#define SFXsfx026B 619 +#define SFXsfx026C 620 +#define SFXsfx026D 621 +#define SFXsfx026E 622 +#define SFXsfx026F 623 + + diff --git a/DataSpec/DNAMP1/SFX/MetroidPrime.h b/DataSpec/DNAMP1/SFX/MetroidPrime.h new file mode 100644 index 000000000..f16443259 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/MetroidPrime.h @@ -0,0 +1,94 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: MetroidPrime + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup003A 58 + + +#define SFXmtb_b_voxtaunt_00 2891 +#define SFXsfx0B4C 2892 +#define SFXmtb_a_claw_00 2893 +#define SFXmtb_a_swoosh 2894 +#define SFXmtb_b_voxattak_00 2895 +#define SFXmtb_b_walk_00 2896 +#define SFXmtb_b_walk_01 2897 +#define SFXmtb_b_walk_02 2898 +#define SFXmtb_b_voxidle_00 2899 +#define SFXsfx0B54 2900 +#define SFXmtb_r_painbig_00 2901 +#define SFXmtb_r_painsm_00 2902 +#define SFXmtb_b_voxattak_01 2903 +#define SFXmtb_a_icewave_lp_00 2904 +#define SFXsfx0B59 2905 +#define SFXsfx0B5A 2906 +#define SFXmtb_b_voxangry_00 2907 +#define SFXmtb_b_voxangry_01 2908 +#define SFXmtb_a_flame_lp_00 2909 +#define SFXmtb_a_mirv_00 2910 +#define SFXsfx0B5F 2911 +#define SFXsfx0B60 2912 +#define SFXmth_b_dash_00 2913 +#define SFXmth_c_painbig_00 2914 +#define SFXmth_b_voxcall_00 2915 +#define SFXmth_b_voxidle_00 2916 +#define SFXmth_b_voxidle_01 2917 +#define SFXmth_b_voxtaunt_00 2918 +#define SFXsfx0B67 2919 +#define SFXmtb_a_hitwall_00 2920 +#define SFXmth_c_painsm_00 2921 +#define SFXsfx0B6A 2922 +#define SFXsfx0B6B 2923 +#define SFXmtb_a_flameup_lp_00 2924 +#define SFXsfx0B6D 2925 +#define SFXsfx0B6E 2926 +#define SFXsfx0B6F 2927 +#define SFXsfx0B70 2928 +#define SFXsfx0B71 2929 +#define SFXmth_b_emerge_00 2930 +#define SFXsfx0B73 2931 +#define SFXmth_b_voxattak_01 2932 +#define SFXsfx0B75 2933 +#define SFXmth_b_float_lp_00 2934 +#define SFXsfx0B77 2935 +#define SFXmth_a_blast_lp_00 2936 +#define SFXsfx0B79 2937 +#define SFXsfx0B7A 2938 +#define SFXsfx0B7B 2939 +#define SFXmth_a_blasthit_00 2940 +#define SFXsfx0B7D 2941 +#define SFXsfx0B7E 2942 +#define SFXmtb_c_cinemove_00 2943 +#define SFXsfx0B80 2944 +#define SFXmtb_c_land_00 2945 +#define SFXmtb_c_wakeup_00 2946 +#define SFXsfx0B83 2947 +#define SFXsfx0B84 2948 +#define SFXsfx0B85 2949 +#define SFXsfx0B86 2950 +#define SFXsfx0B87 2951 +#define SFXmtb_a_tractor_lp_00 2952 +#define SFXmth_a_swing_00 2953 +#define SFXsfx0B8A 2954 +#define SFXsfx0B8B 2955 +#define SFXsfx0B8C 2956 +#define SFXsfx0B8D 2957 +#define SFXsfx0B8E 2958 +#define SFXmtb_b_land_00 2959 +#define SFXmth_c_blur_00 2960 +#define SFXsfx0B91 2961 +#define SFXsfx0B92 2962 +#define SFXsfx0B93 2963 +#define SFXsfx0B94 2964 +#define SFXsfx0B95 2965 +#define SFXsfx0B96 2966 +#define SFXmtb_a_nrgchg_00 2967 +#define SFXsfx0B98 2968 +#define SFXmtb_a_nrgfire_lp_00 2969 +#define SFXsfx0B9A 2970 +#define SFXsfx0B9B 2971 + + diff --git a/DataSpec/DNAMP1/SFX/MinesWorld.h b/DataSpec/DNAMP1/SFX/MinesWorld.h new file mode 100644 index 000000000..3c19f6bd8 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/MinesWorld.h @@ -0,0 +1,94 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: MinesWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0030 48 + + +#define SFXsfx08EC 2284 +#define SFXsfx08ED 2285 +#define SFXsfx08EE 2286 +#define SFXsfx08EF 2287 +#define SFXsfx08F0 2288 +#define SFXsfx08F1 2289 +#define SFXmin_x_cranestop_00 2290 +#define SFXsfx08F3 2291 +#define SFXmin_x_piston_00 2292 +#define SFXsfx08F5 2293 +#define SFXsfx08F6 2294 +#define SFXsfx08F7 2295 +#define SFXsfx08F8 2296 +#define SFXmin_x_crane_lp_00 2297 +#define SFXsfx08FA 2298 +#define SFXsfx08FB 2299 +#define SFXsfx08FC 2300 +#define SFXsfx08FD 2301 +#define SFXsfx08FE 2302 +#define SFXsfx08FF 2303 +#define SFXsfx0900 2304 +#define SFXsfx0901 2305 +#define SFXsfx0902 2306 +#define SFXopr_c_land_00 2307 +#define SFXsfx0904 2308 +#define SFXsfx0905 2309 +#define SFXsfx0906 2310 +#define SFXsfx0907 2311 +#define SFXsfx0908 2312 +#define SFXmin_x_gears_lp_01 2313 +#define SFXsfx090A 2314 +#define SFXsfx090B 2315 +#define SFXsfx090C 2316 +#define SFXsfx090D 2317 +#define SFXsfx090E 2318 +#define SFXsfx090F 2319 +#define SFXsfx0910 2320 +#define SFXsfx0911 2321 +#define SFXsfx0912 2322 +#define SFXsfx0913 2323 +#define SFXsfx0914 2324 +#define SFXsfx0915 2325 +#define SFXsfx0916 2326 +#define SFXmin_x_turbine_lp_00 2327 +#define SFXsfx0918 2328 +#define SFXsfx0919 2329 +#define SFXsfx091A 2330 +#define SFXsfx091B 2331 +#define SFXsfx091C 2332 +#define SFXsfx091D 2333 +#define SFXsfx091E 2334 +#define SFXsfx091F 2335 +#define SFXsfx0920 2336 +#define SFXsfx0921 2337 +#define SFXsfx0922 2338 +#define SFXsfx0923 2339 +#define SFXsfx0924 2340 +#define SFXsfx0925 2341 +#define SFXsfx0926 2342 +#define SFXsfx0927 2343 +#define SFXsfx0928 2344 +#define SFXsfx0929 2345 +#define SFXsfx092A 2346 +#define SFXsfx092B 2347 +#define SFXsfx092C 2348 +#define SFXsfx092D 2349 +#define SFXsfx092E 2350 +#define SFXsfx092F 2351 +#define SFXsfx0930 2352 +#define SFXsfx0931 2353 +#define SFXsfx0932 2354 +#define SFXsfx0933 2355 +#define SFXsfx0934 2356 +#define SFXsfx0935 2357 +#define SFXsfx0936 2358 +#define SFXsfx0937 2359 +#define SFXsfx0938 2360 +#define SFXsfx0939 2361 +#define SFXsfx093A 2362 +#define SFXsfx093B 2363 +#define SFXsfx093C 2364 + + diff --git a/DataSpec/DNAMP1/SFX/Misc.h b/DataSpec/DNAMP1/SFX/Misc.h new file mode 100644 index 000000000..1d6a9608f --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Misc.h @@ -0,0 +1,260 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Misc + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0027 39 + + +#define SFXdor_x_close_00 1128 +#define SFXdor_x_open_00 1129 +#define SFXsfx046A 1130 +#define SFXpik_x_idle_00 1131 +#define SFXsfx046C 1132 +#define SFXamb_x_rumble_lp_00 1133 +#define SFXsfx046E 1134 +#define SFXpik_x_morphamb_lp_00 1135 +#define SFXpik_x_powerup_00 1136 +#define SFXsfx0471 1137 +#define SFXsfx0472 1138 +#define SFXsfx0473 1139 +#define SFXsfx0474 1140 +#define SFXamb_x_splash_02 1141 +#define SFXsfx0476 1142 +#define SFXsfx0477 1143 +#define SFXsfx0478 1144 +#define SFXsfx0479 1145 +#define SFXsfx047A 1146 +#define SFXpik_x_elevamb_lp_00 1147 +#define SFXsfx047C 1148 +#define SFXsfx047D 1149 +#define SFXsfx047E 1150 +#define SFXeff_x_fire_lp_00 1151 +#define SFXsfx0480 1152 +#define SFXsfx0481 1153 +#define SFXci2_x_eletric_00 1154 +#define SFXci3_x_electric_lp_00 1155 +#define SFXmac_x_fire_lp_00 1156 +#define SFXsfx0485 1157 +#define SFXci4_x_electric_lp_00 1158 +#define SFXsfx0487 1159 +#define SFXsfx0488 1160 +#define SFXsfx0489 1161 +#define SFXsfx048A 1162 +#define SFXsfx048B 1163 +#define SFXdrn_b_smoke_lp_00 1164 +#define SFXga2_r_explode_00 1165 +#define SFXsfx048E 1166 +#define SFXsfx048F 1167 +#define SFXsfx0490 1168 +#define SFXsfx0491 1169 +#define SFXmag_r_explode_00 1170 +#define SFXsfx0493 1171 +#define SFXsfx0494 1172 +#define SFXsfx0495 1173 +#define SFXsfx0496 1174 +#define SFXsfx0497 1175 +#define SFXeff_x_icebrk_00 1176 +#define SFXeff_x_icebrk_01 1177 +#define SFXsfx049A 1178 +#define SFXsfx049B 1179 +#define SFXsfx049C 1180 +#define SFXsfx049D 1181 +#define SFXsfx049E 1182 +#define SFXsfx049F 1183 +#define SFXsfx04A0 1184 +#define SFXsfx04A1 1185 +#define SFXmac_x_fireup_00 1186 +#define SFXsfx04A3 1187 +#define SFXsfx04A4 1188 +#define SFXsfx04A5 1189 +#define SFXsfx04A6 1190 +#define SFXsfx04A7 1191 +#define SFXsfx04A8 1192 +#define SFXsfx04A9 1193 +#define SFXsfx04AA 1194 +#define SFXsfx04AB 1195 +#define SFXsfx04AC 1196 +#define SFXeff_x_electro_lp_00 1197 +#define SFXeff_x_electro_lp_01 1198 +#define SFXsfx04AF 1199 +#define SFXsfx04B0 1200 +#define SFXsfx04B1 1201 +#define SFXsfx04B2 1202 +#define SFXsfx04B3 1203 +#define SFXsfx04B4 1204 +#define SFXsfx04B5 1205 +#define SFXsfx04B6 1206 +#define SFXsfx04B7 1207 +#define SFXsfx04B8 1208 +#define SFXsfx04B9 1209 +#define SFXsfx04BA 1210 +#define SFXsfx04BB 1211 +#define SFXsfx04BC 1212 +#define SFXsfx04BD 1213 +#define SFXsfx04BE 1214 +#define SFXsfx04BF 1215 +#define SFXsfx04C0 1216 +#define SFXsfx04C1 1217 +#define SFXsfx04C2 1218 +#define SFXocu_b_gas_lp_00 1219 +#define SFXsfx04C4 1220 +#define SFXsfx04C5 1221 +#define SFXsfx04C6 1222 +#define SFXtha_a_electric_00 1223 +#define SFXsfx04C8 1224 +#define SFXdrn_r_empelec_00 1225 +#define SFXeff_x_frozen_00 1226 +#define SFXeff_x_frozen_01 1227 +#define SFXsfx04CC 1228 +#define SFXsfx04CD 1229 +#define SFXsfx04CE 1230 +#define SFXsfx04CF 1231 +#define SFXsfx04D0 1232 +#define SFXsfx04D1 1233 +#define SFXepr_b_elec_lp_00 1234 +#define SFXsfx04D3 1235 +#define SFXsfx04D4 1236 +#define SFXsfx04D5 1237 +#define SFXsfx04D6 1238 +#define SFXsfx04D7 1239 +#define SFXamb_x_gatestop_00 1240 +#define SFXsfx04D9 1241 +#define SFXsfx04DA 1242 +#define SFXsfx04DB 1243 +#define SFXsfx04DC 1244 +#define SFXsfx04DD 1245 +#define SFXsfx04DE 1246 +#define SFXsfx04DF 1247 +#define SFXsfx04E0 1248 +#define SFXsfx04E1 1249 +#define SFXsfx04E2 1250 +#define SFXsfx04E3 1251 +#define SFXsfx04E4 1252 +#define SFXsfx04E5 1253 +#define SFXsfx04E6 1254 +#define SFXsfx04E7 1255 +#define SFXsfx04E8 1256 +#define SFXsfx04E9 1257 +#define SFXsfx04EA 1258 +#define SFXsfx04EB 1259 +#define SFXsfx04EC 1260 +#define SFXsfx04ED 1261 +#define SFXsfx04EE 1262 +#define SFXsfx04EF 1263 +#define SFXsfx04F0 1264 +#define SFXsfx04F1 1265 +#define SFXsfx04F2 1266 +#define SFXsfx04F3 1267 +#define SFXsfx04F4 1268 +#define SFXamb_x_gateup_00 1269 +#define SFXsfx04F6 1270 +#define SFXsfx04F7 1271 +#define SFXsfx04F8 1272 +#define SFXsfx04F9 1273 +#define SFXsfx04FA 1274 +#define SFXrid_r_explode_00 1275 +#define SFXsfx04FC 1276 +#define SFXsfx04FD 1277 +#define SFXsfx04FE 1278 +#define SFXsfx04FF 1279 +#define SFXsfx0500 1280 +#define SFXsfx0501 1281 +#define SFXsfx0502 1282 +#define SFXsfx0503 1283 +#define SFXsfx0504 1284 +#define SFXsfx0505 1285 +#define SFXamb_x_steamsml_lp_00 1286 +#define SFXsfx0507 1287 +#define SFXsfx0508 1288 +#define SFXsfx0509 1289 +#define SFXamb_c_suitlose_lp_00 1290 +#define SFXsfx050B 1291 +#define SFXsfx050C 1292 +#define SFXsfx050D 1293 +#define SFXsfx050E 1294 +#define SFXsfx050F 1295 +#define SFXsfx0510 1296 +#define SFXsfx0511 1297 +#define SFXsfx0512 1298 +#define SFXsfx0513 1299 +#define SFXsfx0514 1300 +#define SFXsfx0515 1301 +#define SFXsfx0516 1302 +#define SFXsfx0517 1303 +#define SFXsfx0518 1304 +#define SFXsfx0519 1305 +#define SFXsfx051A 1306 +#define SFXsfx051B 1307 +#define SFXsfx051C 1308 +#define SFXsfx051D 1309 +#define SFXsfx051E 1310 +#define SFXsfx051F 1311 +#define SFXsfx0520 1312 +#define SFXsfx0521 1313 +#define SFXsfx0522 1314 +#define SFXsfx0523 1315 +#define SFXsfx0524 1316 +#define SFXsfx0525 1317 +#define SFXsfx0526 1318 +#define SFXsfx0527 1319 +#define SFXsfx0528 1320 +#define SFXsfx0529 1321 +#define SFXsfx052A 1322 +#define SFXsfx052B 1323 +#define SFXrid_c_elec_lp_00 1324 +#define SFXsfx052D 1325 +#define SFXsfx052E 1326 +#define SFXsfx052F 1327 +#define SFXsfx0530 1328 +#define SFXsfx0531 1329 +#define SFXsfx0532 1330 +#define SFXsfx0533 1331 +#define SFXsfx0534 1332 +#define SFXsfx0535 1333 +#define SFXsfx0536 1334 +#define SFXsfx0537 1335 +#define SFXsfx0538 1336 +#define SFXsfx0539 1337 +#define SFXsfx053A 1338 +#define SFXsfx053B 1339 +#define SFXsfx053C 1340 +#define SFXsfx053D 1341 +#define SFXsfx053E 1342 +#define SFXsfx053F 1343 +#define SFXsfx0540 1344 +#define SFXsfx0541 1345 +#define SFXsfx0542 1346 +#define SFXsfx0543 1347 +#define SFXsfx0544 1348 +#define SFXsfx0545 1349 +#define SFXsfx0546 1350 +#define SFXsfx0547 1351 +#define SFXsfx0548 1352 +#define SFXsfx0549 1353 +#define SFXsfx054A 1354 +#define SFXsfx054B 1355 +#define SFXsfx054C 1356 +#define SFXsfx054D 1357 +#define SFXsfx054E 1358 +#define SFXsfx054F 1359 +#define SFXsfx0550 1360 +#define SFXsfx0551 1361 +#define SFXsfx0552 1362 +#define SFXsfx0553 1363 +#define SFXsfx0554 1364 +#define SFXsfx0555 1365 +#define SFXsfx0556 1366 +#define SFXsfx0557 1367 +#define SFXsfx0558 1368 +#define SFXsfx0559 1369 +#define SFXsfx055A 1370 +#define SFXsfx055B 1371 +#define SFXsfx055C 1372 +#define SFXsfx055D 1373 +#define SFXsfx055E 1374 + + diff --git a/DataSpec/DNAMP1/SFX/MiscSamus.h b/DataSpec/DNAMP1/SFX/MiscSamus.h new file mode 100644 index 000000000..f0aa51439 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/MiscSamus.h @@ -0,0 +1,272 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: MiscSamus + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0029 41 + + +#define SFXsam_wlkstone_00 1465 +#define SFXsam_wlkstone_01 1466 +#define SFXsam_suit_damage 1467 +#define SFXsam_ball_jump 1468 +#define SFXsam_b_highland_00 1469 +#define SFXsam_b_jump_00 1470 +#define SFXsam_firstjump 1471 +#define SFXsam_landdirt_00 1472 +#define SFXsfx05C1 1473 +#define SFXsfx05C2 1474 +#define SFXsam_ballland_stone 1475 +#define SFXsam_ball_boost 1476 +#define SFXsam_ball_charge_lp 1477 +#define SFXsam_b_morphin_00 1478 +#define SFXsam_b_morphout_00 1479 +#define SFXsam_ballroll_dirt 1480 +#define SFXsfx05C9 1481 +#define SFXsfx05CA 1482 +#define SFXsfx05CB 1483 +#define SFXsam_wlkwater_00 1484 +#define SFXsam_wlkwater_01 1485 +#define SFXsam_damage_poison_lp 1486 +#define SFXsfx05CF 1487 +#define SFXsfx05D0 1488 +#define SFXsam_vox_damage 1489 +#define SFXsam_landmetl_00 1490 +#define SFXsam_ball_damage 1491 +#define SFXsam_b_movearm_00 1492 +#define SFXsam_wlkgrate_00 1493 +#define SFXsam_wlkgrate_01 1494 +#define SFXsam_wlkmetal_00 1495 +#define SFXsam_wlkmetal_01 1496 +#define SFXsam_wlkdirt_00 1497 +#define SFXsam_ballland_grate 1498 +#define SFXsam_wlkdirt_01 1499 +#define SFXsam_ballroll_grate 1500 +#define SFXsam_ballroll_metal 1501 +#define SFXsam_ballroll_stone 1502 +#define SFXsfx05DF 1503 +#define SFXsam_ballland_metal 1504 +#define SFXsam_b_movearm_01 1505 +#define SFXsfx05E2 1506 +#define SFXsam_landgrate_00 1507 +#define SFXsam_landstone_00 1508 +#define SFXsfx05E5 1509 +#define SFXsfx05E6 1510 +#define SFXsam_vox_damage15 1511 +#define SFXsam_vox_damage30 1512 +#define SFXsam_ball_damage15 1513 +#define SFXsam_ball_damage30 1514 +#define SFXsfx05EB 1515 +#define SFXsam_death 1516 +#define SFXsfx05ED 1517 +#define SFXsfx05EE 1518 +#define SFXsam_b_landmetl_01 1519 +#define SFXsfx05F0 1520 +#define SFXsfx05F1 1521 +#define SFXsfx05F2 1522 +#define SFXsam_spider_lp 1523 +#define SFXsfx05F4 1524 +#define SFXsam_ball_wallhit 1525 +#define SFXsam_grapple_fire 1526 +#define SFXsam_grapple_lp 1527 +#define SFXsam_grapple_swoosh 1528 +#define SFXsam_wlkwood_00 1529 +#define SFXsam_wlkwood_01 1530 +#define SFXsam_landwood_00 1531 +#define SFXsam_b_movefla_00 1532 +#define SFXsam_ballland_wood 1533 +#define SFXsam_ballroll_wood 1534 +#define SFXsfx05FF 1535 +#define SFXsfx0600 1536 +#define SFXsfx0601 1537 +#define SFXsfx0602 1538 +#define SFXsfx0603 1539 +#define SFXsfx0604 1540 +#define SFXsam_b_jumpcine_00 1541 +#define SFXsam_landphazon_00 1542 +#define SFXsfx0607 1543 +#define SFXsfx0608 1544 +#define SFXsam_ballland_phazon 1545 +#define SFXsfx060A 1546 +#define SFXsam_ballroll_phazon 1547 +#define SFXsam_b_voxland_00 1548 +#define SFXsfx060D 1549 +#define SFXsam_voxland_02 1550 +#define SFXsfx060F 1551 +#define SFXsfx0610 1552 +#define SFXsam_wlkphazon_00 1553 +#define SFXsam_wlkphazon_01 1554 +#define SFXpds_b_water_03 1555 +#define SFXsam_b_butpress_00 1556 +#define SFXsam_b_butpress_01 1557 +#define SFXsam_b_panlclos_00 1558 +#define SFXsam_b_panlopen_00 1559 +#define SFXsam_dash 1560 +#define SFXsam_b_move_00 1561 +#define SFXsam_b_move_01 1562 +#define SFXsam_b_voxjump_00 1563 +#define SFXsfx061C 1564 +#define SFXsfx061D 1565 +#define SFXsfx061E 1566 +#define SFXsam_b_wlkmetal_02 1567 +#define SFXsam_b_wlkmetal_03 1568 +#define SFXsam_landgrass_00 1569 +#define SFXsam_b_wlkgrass_00 1570 +#define SFXsam_b_wlkgrass_01 1571 +#define SFXsam_b_spin_lp_00 1572 +#define SFXsam_b_landorg_00 1573 +#define SFXsfx0626 1574 +#define SFXsam_ballland_org 1575 +#define SFXsam_ballroll_org 1576 +#define SFXsam_b_wlkorg_00 1577 +#define SFXsam_b_wlkorg_01 1578 +#define SFXsam_landmud_00 1579 +#define SFXsam_ballland_grass 1580 +#define SFXsam_ballland_mud 1581 +#define SFXsfx062E 1582 +#define SFXsam_ballroll_grass 1583 +#define SFXsam_ballroll_mud 1584 +#define SFXsam_wlkmud_00 1585 +#define SFXsam_wlkmud_01 1586 +#define SFXsam_b_landcine_01 1587 +#define SFXsfx0634 1588 +#define SFXsfx0635 1589 +#define SFXsfx0636 1590 +#define SFXsam_vox_exhausted 1591 +#define SFXsam_landsnow_00 1592 +#define SFXsam_b_landsnow_01 1593 +#define SFXsam_wlksnow_00 1594 +#define SFXsam_wlksnow_01 1595 +#define SFXsam_b_wlksnow_02 1596 +#define SFXsam_b_wlksnow_03 1597 +#define SFXsfx063E 1598 +#define SFXsfx063F 1599 +#define SFXsam_b_landcine_00 1600 +#define SFXgab_b_wlksnow_00 1601 +#define SFXgab_b_wlksnow_01 1602 +#define SFXsfx0643 1603 +#define SFXsam_r_hithelm_00 1604 +#define SFXsfx0645 1605 +#define SFXsfx0646 1606 +#define SFXsam_landgrass_02 1607 +#define SFXsam_landgrate_02 1608 +#define SFXsfx0649 1609 +#define SFXsfx064A 1610 +#define SFXsam_b_landmetl_02 1611 +#define SFXsam_landmud_02 1612 +#define SFXsam_landorg_02 1613 +#define SFXsam_landphazon_02 1614 +#define SFXsam_landdirt_02 1615 +#define SFXsam_landsnow_02 1616 +#define SFXsam_landstone_02 1617 +#define SFXsam_landwood_02 1618 +#define SFXsam_wlkice_00 1619 +#define SFXsam_wlkice_01 1620 +#define SFXsfx0655 1621 +#define SFXsfx0656 1622 +#define SFXsam_b_landgras_01 1623 +#define SFXsam_landice_00 1624 +#define SFXsfx0659 1625 +#define SFXsam_landice_02 1626 +#define SFXsam_ballland_ice 1627 +#define SFXsam_ballland_snow 1628 +#define SFXpar_b_wlksnow_00 1629 +#define SFXpar_b_wlksnow_01 1630 +#define SFXsfx065F 1631 +#define SFXsfx0660 1632 +#define SFXsam_vox_damage_poison 1633 +#define SFXsfx0662 1634 +#define SFXsfx0663 1635 +#define SFXsam_c_suithit_00 1636 +#define SFXsam_c_suithit_01 1637 +#define SFXsam_c_suithitv_00 1638 +#define SFXsam_c_suitmov1_00 1639 +#define SFXsam_r_phazhit_lp_00 1640 +#define SFXsam_c_suitfall_00 1641 +#define SFXsam_c_suitfall_01 1642 +#define SFXsam_c_suitmov2_00 1643 +#define SFXsam_c_suitmov2_01 1644 +#define SFXsfx066D 1645 +#define SFXsfx066E 1646 +#define SFXfpr_b_land_00 1647 +#define SFXfpr_b_land_01 1648 +#define SFXsfx0671 1649 +#define SFXspr_b_land_00 1650 +#define SFXspr_b_land_01 1651 +#define SFXsfx0674 1652 +#define SFXsam_vox_damage_phazon 1653 +#define SFXsfx0676 1654 +#define SFXsfx0677 1655 +#define SFXsam_vox_damage_heat 1656 +#define SFXsfx0679 1657 +#define SFXsfx067A 1658 +#define SFXsfx067B 1659 +#define SFXsam_b_wlkstone_02 1660 +#define SFXsam_b_wlkstone_03 1661 +#define SFXsam_b_wlkdirt_02 1662 +#define SFXsam_b_wlkdirt_03 1663 +#define SFXsam_b_move_02 1664 +#define SFXsam_b_move_03 1665 +#define SFXsfx0682 1666 +#define SFXsam_c_mpwlkorg_00 1667 +#define SFXsam_c_mpwlkorg_01 1668 +#define SFXci7_x_spin_lp_00 1669 +#define SFXsfx0686 1670 +#define SFXsam_c_butpress_00 1671 +#define SFXsam_c_butpress_01 1672 +#define SFXsam_c_intrmove_02 1673 +#define SFXsam_c_intrmove_03 1674 +#define SFXsam_c_intrspin_lp_00 1675 +#define SFXsam_c_iwlkmetal_02 1676 +#define SFXsam_c_iwlkmetal_03 1677 +#define SFXsam_c_movearm_00 1678 +#define SFXsam_c_movearm_01 1679 +#define SFXsam_c_moveend_00 1680 +#define SFXsam_c_moveend_01 1681 +#define SFXsam_c_spinend_lp_00 1682 +#define SFXsfx0693 1683 +#define SFXsam_landlavastone_00 1684 +#define SFXsfx0695 1685 +#define SFXsam_landlavastone_02 1686 +#define SFXsam_ballland_lava 1687 +#define SFXsam_ballroll_lavastone 1688 +#define SFXsam_wlklavastone_00 1689 +#define SFXsam_wlklavastone_01 1690 +#define SFXsfx069B 1691 +#define SFXsfx069C 1692 +#define SFXsfx069D 1693 +#define SFXsfx069E 1694 +#define SFXsfx069F 1695 +#define SFXsfx06A0 1696 +#define SFXsfx06A1 1697 +#define SFXsfx06A2 1698 +#define SFXsfx06A3 1699 +#define SFXsfx06A4 1700 +#define SFXsfx06A5 1701 +#define SFXsfx06A6 1702 +#define SFXsfx06A7 1703 +#define SFXsfx06A8 1704 +#define SFXsfx06A9 1705 +#define SFXsfx06AA 1706 +#define SFXsfx06AB 1707 +#define SFXsfx06AC 1708 +#define SFXsfx06AD 1709 +#define SFXsfx06AE 1710 +#define SFXsfx06AF 1711 +#define SFXsfx06B0 1712 +#define SFXsfx06B1 1713 +#define SFXsfx06B2 1714 +#define SFXsfx06B3 1715 +#define SFXsfx06B4 1716 +#define SFXsfx06B5 1717 +#define SFXsfx06B6 1718 +#define SFXsfx06B7 1719 +#define SFXsfx06B8 1720 +#define SFXsfx06B9 1721 +#define SFXsfx06BA 1722 +#define SFXsfx06BB 1723 + + diff --git a/DataSpec/DNAMP1/SFX/OmegaPirate.h b/DataSpec/DNAMP1/SFX/OmegaPirate.h new file mode 100644 index 000000000..ec5f018d1 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/OmegaPirate.h @@ -0,0 +1,73 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: OmegaPirate + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0039 57 + + +#define SFXsfx0B0F 2831 +#define SFXsfx0B10 2832 +#define SFXopr_b_voxcall_00 2833 +#define SFXopr_b_voxcall_01 2834 +#define SFXopr_b_voxlaugh_00 2835 +#define SFXopr_r_moan_00 2836 +#define SFXsfx0B15 2837 +#define SFXsfx0B16 2838 +#define SFXopr_b_run_01 2839 +#define SFXsfx0B18 2840 +#define SFXopr_b_voxalert_00 2841 +#define SFXopr_b_voxalert_01 2842 +#define SFXopr_b_voxattak_00 2843 +#define SFXopr_b_voxattak_01 2844 +#define SFXopr_b_voxblok_00 2845 +#define SFXopr_b_voxidle_00 2846 +#define SFXopr_b_voxidle_01 2847 +#define SFXopr_b_voxpiss_00 2848 +#define SFXopr_b_voxtaunt_00 2849 +#define SFXopr_b_walklite_00 2850 +#define SFXopr_b_walklite_01 2851 +#define SFXopr_b_walk_00 2852 +#define SFXopr_b_walk_01 2853 +#define SFXopr_b_healnrg_lp_00 2854 +#define SFXsfx0B27 2855 +#define SFXsfx0B28 2856 +#define SFXsfx0B29 2857 +#define SFXopr_r_pain_00 2858 +#define SFXopr_r_pain_01 2859 +#define SFXsfx0B2C 2860 +#define SFXopr_b_invis_00 2861 +#define SFXopr_b_voxready_00 2862 +#define SFXsfx0B2F 2863 +#define SFXsfx0B30 2864 +#define SFXopr_r_pain_02 2865 +#define SFXsfx0B32 2866 +#define SFXopr_a_grenchrg_00 2867 +#define SFXsfx0B34 2868 +#define SFXopr_a_grenade_00 2869 +#define SFXsfx0B36 2870 +#define SFXsfx0B37 2871 +#define SFXsfx0B38 2872 +#define SFXsfx0B39 2873 +#define SFXsfx0B3A 2874 +#define SFXsfx0B3B 2875 +#define SFXsfx0B3C 2876 +#define SFXsfx0B3D 2877 +#define SFXopr_r_death_01 2878 +#define SFXsfx0B3F 2879 +#define SFXopr_c_samswoosh_00 2880 +#define SFXsfx0B41 2881 +#define SFXsfx0B42 2882 +#define SFXsfx0B43 2883 +#define SFXsfx0B44 2884 +#define SFXsfx0B45 2885 +#define SFXsfx0B46 2886 +#define SFXsfx0B47 2887 +#define SFXsfx0B48 2888 +#define SFXsfx0B49 2889 +#define SFXsfx0B4A 2890 + + diff --git a/DataSpec/DNAMP1/SFX/OverWorld.h b/DataSpec/DNAMP1/SFX/OverWorld.h new file mode 100644 index 000000000..dd2ba94bd --- /dev/null +++ b/DataSpec/DNAMP1/SFX/OverWorld.h @@ -0,0 +1,85 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: OverWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0033 51 + + +#define SFXsfx09E0 2528 +#define SFXsfx09E1 2529 +#define SFXsfx09E2 2530 +#define SFXsfx09E3 2531 +#define SFXsfx09E4 2532 +#define SFXsfx09E5 2533 +#define SFXsfx09E6 2534 +#define SFXsfx09E7 2535 +#define SFXsfx09E8 2536 +#define SFXsfx09E9 2537 +#define SFXsfx09EA 2538 +#define SFXsfx09EB 2539 +#define SFXsfx09EC 2540 +#define SFXsfx09ED 2541 +#define SFXsfx09EE 2542 +#define SFXsfx09EF 2543 +#define SFXsfx09F0 2544 +#define SFXsfx09F1 2545 +#define SFXcrb_b_hiss_00 2546 +#define SFXcrb_b_idle_00 2547 +#define SFXsfx09F4 2548 +#define SFXsfx09F5 2549 +#define SFXsfx09F6 2550 +#define SFXsfx09F7 2551 +#define SFXsfx09F8 2552 +#define SFXove_x_spinbars_lp 2553 +#define SFXsfx09FA 2554 +#define SFXsfx09FB 2555 +#define SFXsfx09FC 2556 +#define SFXsfx09FD 2557 +#define SFXsfx09FE 2558 +#define SFXsfx09FF 2559 +#define SFXsfx0A00 2560 +#define SFXsfx0A01 2561 +#define SFXsfx0A02 2562 +#define SFXsfx0A03 2563 +#define SFXsfx0A04 2564 +#define SFXsfx0A05 2565 +#define SFXsfx0A06 2566 +#define SFXsfx0A07 2567 +#define SFXsfx0A08 2568 +#define SFXsfx0A09 2569 +#define SFXsfx0A0A 2570 +#define SFXsfx0A0B 2571 +#define SFXsfx0A0C 2572 +#define SFXsfx0A0D 2573 +#define SFXsfx0A0E 2574 +#define SFXsfx0A0F 2575 +#define SFXsfx0A10 2576 +#define SFXsfx0A11 2577 +#define SFXsfx0A12 2578 +#define SFXsfx0A13 2579 +#define SFXsfx0A14 2580 +#define SFXlbm_c_beam_lp_01 2581 +#define SFXsfx0A16 2582 +#define SFXsfx0A17 2583 +#define SFXsfx0A18 2584 +#define SFXsfx0A19 2585 +#define SFXsfx0A1A 2586 +#define SFXsfx0A1B 2587 +#define SFXsfx0A1C 2588 +#define SFXsfx0A1D 2589 +#define SFXsfx0A1E 2590 +#define SFXsfx0A1F 2591 +#define SFXsfx0A20 2592 +#define SFXsfx0A21 2593 +#define SFXsfx0A22 2594 +#define SFXsfx0A23 2595 +#define SFXsfx0A24 2596 +#define SFXsfx0A25 2597 +#define SFXsfx0A26 2598 +#define SFXsfx0A27 2599 + + diff --git a/DataSpec/DNAMP1/SFX/Parasite.h b/DataSpec/DNAMP1/SFX/Parasite.h new file mode 100644 index 000000000..73187bdc1 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Parasite.h @@ -0,0 +1,37 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Parasite + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0016 22 + + +#define SFXpar_a_voxangry_00 624 +#define SFXsfx0271 625 +#define SFXsfx0272 626 +#define SFXsfx0273 627 +#define SFXsfx0274 628 +#define SFXpar_b_idle_02 629 +#define SFXpar_b_munch_00 630 +#define SFXsfx0277 631 +#define SFXpar_b_run_00 632 +#define SFXpar_b_run_01 633 +#define SFXsfx027A 634 +#define SFXpar_b_walk_00 635 +#define SFXpar_b_walk_01 636 +#define SFXsfx027D 637 +#define SFXpar_b_idlelone_02 638 +#define SFXpar_r_impact_00 639 +#define SFXsfx0280 640 +#define SFXsfx0281 641 +#define SFXsfx0282 642 +#define SFXsfx0283 643 +#define SFXsfx0284 644 +#define SFXsfx0285 645 +#define SFXsfx0286 646 +#define SFXsfx0287 647 + + diff --git a/DataSpec/DNAMP1/SFX/Phazon.h b/DataSpec/DNAMP1/SFX/Phazon.h new file mode 100644 index 000000000..5ef08f9d4 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Phazon.h @@ -0,0 +1,20 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Phazon + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0042 66 + + +#define SFXphz_damage_lp 3114 +#define SFXsfx0C2B 3115 +#define SFXsfx0C2C 3116 +#define SFXsfx0C2D 3117 +#define SFXsfx0C2E 3118 +#define SFXsfx0C2F 3119 +#define SFXsfx0C30 3120 + + diff --git a/DataSpec/DNAMP1/SFX/PhazonGun.h b/DataSpec/DNAMP1/SFX/PhazonGun.h new file mode 100644 index 000000000..fb57fa227 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/PhazonGun.h @@ -0,0 +1,15 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: PhazonGun + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0044 68 + + +#define SFXphg_charge_lp 3141 +#define SFXsfx0C46 3142 + + diff --git a/DataSpec/DNAMP1/SFX/PuddleSpore.h b/DataSpec/DNAMP1/SFX/PuddleSpore.h new file mode 100644 index 000000000..4c7783a42 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/PuddleSpore.h @@ -0,0 +1,40 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: PuddleSpore + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0017 23 + + +#define SFXsfx0288 648 +#define SFXpds_a_voxactive_00 649 +#define SFXpds_b_bubbles_00 650 +#define SFXpds_b_open_00 651 +#define SFXpds_b_slam_00 652 +#define SFXpds_b_voxopen_lp_00 653 +#define SFXpds_b_voxslam_00 654 +#define SFXpds_b_water_00 655 +#define SFXpds_b_water_01 656 +#define SFXpds_lava_damage_lp 657 +#define SFXsfx0292 658 +#define SFXpds_r_voxpain_02 659 +#define SFXsfx0294 660 +#define SFXsfx0295 661 +#define SFXsfx0296 662 +#define SFXsfx0297 663 +#define SFXsfx0298 664 +#define SFXsfx0299 665 +#define SFXsfx029A 666 +#define SFXsfx029B 667 +#define SFXsfx029C 668 +#define SFXsfx029D 669 +#define SFXsfx029E 670 +#define SFXsfx029F 671 +#define SFXsfx02A0 672 +#define SFXsfx02A1 673 +#define SFXsfx02A2 674 + + diff --git a/DataSpec/DNAMP1/SFX/PuddleToad.h b/DataSpec/DNAMP1/SFX/PuddleToad.h new file mode 100644 index 000000000..59a8bc477 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/PuddleToad.h @@ -0,0 +1,42 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: PuddleToad + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0018 24 + + +#define SFXpud_a_suckin_00 675 +#define SFXpud_a_spitout_00 676 +#define SFXsfx02A5 677 +#define SFXpud_b_close_00 678 +#define SFXpud_b_splat_00 679 +#define SFXsfx02A8 680 +#define SFXsfx02A9 681 +#define SFXsfx02AA 682 +#define SFXpud_b_voxclose_00 683 +#define SFXpud_a_suckin_lp_01 684 +#define SFXsfx02AD 685 +#define SFXsfx02AE 686 +#define SFXpud_b_growl_00 687 +#define SFXpud_b_squish_lp_00 688 +#define SFXsfx02B1 689 +#define SFXsfx02B2 690 +#define SFXsfx02B3 691 +#define SFXsfx02B4 692 +#define SFXsfx02B5 693 +#define SFXsfx02B6 694 +#define SFXsfx02B7 695 +#define SFXsfx02B8 696 +#define SFXsfx02B9 697 +#define SFXsfx02BA 698 +#define SFXsfx02BB 699 +#define SFXsfx02BC 700 +#define SFXsfx02BD 701 +#define SFXsfx02BE 702 +#define SFXsfx02BF 703 + + diff --git a/DataSpec/DNAMP1/SFX/Puffer.h b/DataSpec/DNAMP1/SFX/Puffer.h new file mode 100644 index 000000000..4b1b37875 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Puffer.h @@ -0,0 +1,20 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Puffer + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0019 25 + + +#define SFXpuf_b_fly_lp_00 704 +#define SFXsfx02C1 705 +#define SFXsfx02C2 706 +#define SFXsfx02C3 707 +#define SFXsfx02C4 708 +#define SFXsfx02C5 709 +#define SFXsfx02C6 710 + + diff --git a/DataSpec/DNAMP1/SFX/ReactorDoor.h b/DataSpec/DNAMP1/SFX/ReactorDoor.h new file mode 100644 index 000000000..1491b8b23 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/ReactorDoor.h @@ -0,0 +1,26 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: ReactorDoor + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0031 49 + + +#define SFXdor_x_close_01 2365 +#define SFXdor_x_open_01 2366 +#define SFXsfx093F 2367 +#define SFXint_x_reacdoor_01 2368 +#define SFXint_x_reacdoor_02 2369 +#define SFXint_x_reacdoor_03 2370 +#define SFXint_x_reacdoor_04 2371 +#define SFXint_x_reacdoor_lp_00 2372 +#define SFXsfx0945 2373 +#define SFXsfx0946 2374 +#define SFXsfx0947 2375 +#define SFXsfx0948 2376 +#define SFXsfx0949 2377 + + diff --git a/DataSpec/DNAMP1/SFX/Ridley.h b/DataSpec/DNAMP1/SFX/Ridley.h new file mode 100644 index 000000000..b37c178d9 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Ridley.h @@ -0,0 +1,73 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Ridley + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0038 56 + + +#define SFXrid_a_flamerake_00 2771 +#define SFXrid_a_flame_lp_00 2772 +#define SFXsfx0AD5 2773 +#define SFXrid_b_flap_00 2774 +#define SFXrid_b_land_00 2775 +#define SFXrid_b_passby_00 2776 +#define SFXrid_b_popup_00 2777 +#define SFXrid_b_voxangry_00 2778 +#define SFXrid_b_voxangry_01 2779 +#define SFXrid_b_voxattack_00 2780 +#define SFXrid_b_voxattack_01 2781 +#define SFXrid_b_voxidle_00 2782 +#define SFXsfx0ADF 2783 +#define SFXrid_b_voxtaunt_00 2784 +#define SFXrid_b_voxtaunt_01 2785 +#define SFXrid_b_walk_00 2786 +#define SFXrid_b_walk_01 2787 +#define SFXsfx0AE4 2788 +#define SFXrid_b_walksm_00 2789 +#define SFXrid_b_walksm_01 2790 +#define SFXrid_r_chestexp_00 2791 +#define SFXrid_r_death_00 2792 +#define SFXrid_r_painbig_00 2793 +#define SFXrid_r_pain_00 2794 +#define SFXsfx0AEB 2795 +#define SFXrid_a_chestglo_00 2796 +#define SFXrid_a_claw_00 2797 +#define SFXsfx0AEE 2798 +#define SFXrid_a_mirv_00 2799 +#define SFXsfx0AF0 2800 +#define SFXrid_a_tail_00 2801 +#define SFXsfx0AF2 2802 +#define SFXsfx0AF3 2803 +#define SFXsfx0AF4 2804 +#define SFXrid_r_pain_lp_00 2805 +#define SFXsfx0AF6 2806 +#define SFXsfx0AF7 2807 +#define SFXsfx0AF8 2808 +#define SFXrid_c_smallexp_00 2809 +#define SFXrid_c_painbig_00 2810 +#define SFXsfx0AFB 2811 +#define SFXsfx0AFC 2812 +#define SFXsfx0AFD 2813 +#define SFXsfx0AFE 2814 +#define SFXsfx0AFF 2815 +#define SFXsfx0B00 2816 +#define SFXsfx0B01 2817 +#define SFXsfx0B02 2818 +#define SFXsfx0B03 2819 +#define SFXsfx0B04 2820 +#define SFXsfx0B05 2821 +#define SFXsfx0B06 2822 +#define SFXsfx0B07 2823 +#define SFXsfx0B08 2824 +#define SFXsfx0B09 2825 +#define SFXsfx0B0A 2826 +#define SFXsfx0B0B 2827 +#define SFXsfx0B0C 2828 +#define SFXsfx0B0D 2829 +#define SFXsfx0B0E 2830 + + diff --git a/DataSpec/DNAMP1/SFX/Ripper.h b/DataSpec/DNAMP1/SFX/Ripper.h new file mode 100644 index 000000000..916835307 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Ripper.h @@ -0,0 +1,23 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Ripper + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001A 26 + + +#define SFXrip_b_float_lp_00 711 +#define SFXrip_b_scream_00 712 +#define SFXsfx02C9 713 +#define SFXsfx02CA 714 +#define SFXrip_r_impact_00 715 +#define SFXsfx02CC 716 +#define SFXsfx02CD 717 +#define SFXsfx02CE 718 +#define SFXsfx02CF 719 +#define SFXsfx02D0 720 + + diff --git a/DataSpec/DNAMP1/SFX/RuinsWorld.h b/DataSpec/DNAMP1/SFX/RuinsWorld.h new file mode 100644 index 000000000..d14b23ecb --- /dev/null +++ b/DataSpec/DNAMP1/SFX/RuinsWorld.h @@ -0,0 +1,163 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: RuinsWorld + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0032 50 + + +#define SFXsfx094A 2378 +#define SFXsfx094B 2379 +#define SFXsfx094C 2380 +#define SFXsfx094D 2381 +#define SFXeye_b_blink_00 2382 +#define SFXeye_b_impact_00 2383 +#define SFXsfx0950 2384 +#define SFXsfx0951 2385 +#define SFXsfx0952 2386 +#define SFXsfx0953 2387 +#define SFXsfx0954 2388 +#define SFXsfx0955 2389 +#define SFXsfx0956 2390 +#define SFXsfx0957 2391 +#define SFXsfx0958 2392 +#define SFXsfx0959 2393 +#define SFXsfx095A 2394 +#define SFXrui_x_leaves_00 2395 +#define SFXsfx095C 2396 +#define SFXsfx095D 2397 +#define SFXsfx095E 2398 +#define SFXsfx095F 2399 +#define SFXsfx0960 2400 +#define SFXmac_x_stop_00 2401 +#define SFXsfx0962 2402 +#define SFXsfx0963 2403 +#define SFXsfx0964 2404 +#define SFXsfx0965 2405 +#define SFXsfx0966 2406 +#define SFXsfx0967 2407 +#define SFXsfx0968 2408 +#define SFXsfx0969 2409 +#define SFXsfx096A 2410 +#define SFXsfx096B 2411 +#define SFXsfx096C 2412 +#define SFXsfx096D 2413 +#define SFXsfx096E 2414 +#define SFXsfx096F 2415 +#define SFXenc_x_genmove_lp_00 2416 +#define SFXsfx0971 2417 +#define SFXsfx0972 2418 +#define SFXsfx0973 2419 +#define SFXsfx0974 2420 +#define SFXhiv_x_fall_lp_00 2421 +#define SFXsfx0976 2422 +#define SFXsfx0977 2423 +#define SFXhiv_x_open_00 2424 +#define SFXsfx0979 2425 +#define SFXhiv_x_rotate_00 2426 +#define SFXhiv_x_stop_00 2427 +#define SFXsfx097C 2428 +#define SFXsfx097D 2429 +#define SFXrui_x_mapmove_lp_01 2430 +#define SFXsfx097F 2431 +#define SFXsfx0980 2432 +#define SFXsfx0981 2433 +#define SFXsfx0982 2434 +#define SFXsfx0983 2435 +#define SFXhiv_x_closered_lp_00 2436 +#define SFXhiv_x_openred_lp_00 2437 +#define SFXsfx0986 2438 +#define SFXsfx0987 2439 +#define SFXchz_b_balldrop_00 2440 +#define SFXchz_b_balldrop_01 2441 +#define SFXchz_b_release_00 2442 +#define SFXchz_x_down_lp_00 2443 +#define SFXsfx098C 2444 +#define SFXsfx098D 2445 +#define SFXsfx098E 2446 +#define SFXsfx098F 2447 +#define SFXsfx0990 2448 +#define SFXsfx0991 2449 +#define SFXsfx0992 2450 +#define SFXsfx0993 2451 +#define SFXsfx0994 2452 +#define SFXsfx0995 2453 +#define SFXsfx0996 2454 +#define SFXsfx0997 2455 +#define SFXsfx0998 2456 +#define SFXrui_x_mirstop_00 2457 +#define SFXsfx099A 2458 +#define SFXrui_x_slotstop_00 2459 +#define SFXfla_b_bulbopen_00 2460 +#define SFXsfx099D 2461 +#define SFXsfx099E 2462 +#define SFXsfx099F 2463 +#define SFXsfx09A0 2464 +#define SFXsfx09A1 2465 +#define SFXsfx09A2 2466 +#define SFXsfx09A3 2467 +#define SFXsfx09A4 2468 +#define SFXrui_x_flamarmr_00 2469 +#define SFXrui_x_flamarmr_01 2470 +#define SFXrui_x_flamarm_00 2471 +#define SFXrui_x_flamarm_01 2472 +#define SFXrui_x_flamarm_02 2473 +#define SFXrui_x_flamrise_00 2474 +#define SFXrui_x_flamrise_lp_00 2475 +#define SFXrui_x_flamhead_00 2476 +#define SFXrui_x_flamhead_lp_00 2477 +#define SFXrui_x_flamhead_lp_01 2478 +#define SFXsfx09AF 2479 +#define SFXsfx09B0 2480 +#define SFXsfx09B1 2481 +#define SFXsfx09B2 2482 +#define SFXsfx09B3 2483 +#define SFXsfx09B4 2484 +#define SFXsfx09B5 2485 +#define SFXsfx09B6 2486 +#define SFXsfx09B7 2487 +#define SFXsfx09B8 2488 +#define SFXrui_x_mapmove_lp_00 2489 +#define SFXsfx09BA 2490 +#define SFXrui_x_maparm_00 2491 +#define SFXrui_x_mapcover_00 2492 +#define SFXsfx09BD 2493 +#define SFXsfx09BE 2494 +#define SFXsfx09BF 2495 +#define SFXsfx09C0 2496 +#define SFXsfx09C1 2497 +#define SFXsfx09C2 2498 +#define SFXsfx09C3 2499 +#define SFXsfx09C4 2500 +#define SFXmac_x_changed_00 2501 +#define SFXsfx09C6 2502 +#define SFXrui_x_mapstop_00 2503 +#define SFXsfx09C8 2504 +#define SFXrui_x_gatedown_lp_00 2505 +#define SFXsfx09CA 2506 +#define SFXrui_x_gatestop_00 2507 +#define SFXrui_x_gateturn_lp_00 2508 +#define SFXsfx09CD 2509 +#define SFXrui_x_halftrk_00 2510 +#define SFXrui_x_halftrk_lp_00 2511 +#define SFXsfx09D0 2512 +#define SFXsfx09D1 2513 +#define SFXsfx09D2 2514 +#define SFXsfx09D3 2515 +#define SFXdob_x_moveup_lp_00 2516 +#define SFXsfx09D5 2517 +#define SFXsfx09D6 2518 +#define SFXsfx09D7 2519 +#define SFXsfx09D8 2520 +#define SFXsfx09D9 2521 +#define SFXsfx09DA 2522 +#define SFXsfx09DB 2523 +#define SFXsfx09DC 2524 +#define SFXsfx09DD 2525 +#define SFXsfx09DE 2526 +#define SFXsfx09DF 2527 + + diff --git a/DataSpec/DNAMP1/SFX/SFX.h b/DataSpec/DNAMP1/SFX/SFX.h new file mode 100644 index 000000000..4bf0e640b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SFX.h @@ -0,0 +1,77 @@ +#ifndef DNAMP1_SFX_H +#define DNAMP1_SFX_H + +#include "Atomic.h" +#include "BetaBeetle.h" +#include "Bird.h" +#include "BloodFlower.h" +#include "Burrower.h" +#include "ChozoGhost.h" +#include "ChubbWeed.h" +#include "CineBoots.h" +#include "CineGeneral.h" +#include "CineGun.h" +#include "CineMorphball.h" +#include "CineSuit.h" +#include "CineVisor.h" +#include "Crater.h" +#include "Crystallite.h" +#include "Drones.h" +#include "EliteSpacePirate.h" +#include "FireFlea.h" +#include "Flaaghra.h" +#include "FlickerBat.h" +#include "FlyingPirate.h" +#include "FrontEnd.h" +#include "GagantuanBeatle.h" +#include "Gnats.h" +#include "Gryzbee.h" +#include "IceCrack.h" +#include "IceWorld.h" +#include "InjuredPirates.h" +#include "IntroBoss.h" +#include "IntroWorld.h" +#include "JellyZap.h" +#include "LavaWorld.h" +#include "Magdolite.h" +#include "Metaree.h" +#include "MetroidPrime.h" +#include "Metroid.h" +#include "MinesWorld.h" +#include "MiscSamus.h" +#include "Misc.h" +#include "OmegaPirate.h" +#include "OverWorld.h" +#include "Parasite.h" +#include "PhazonGun.h" +#include "Phazon.h" +#include "PuddleSpore.h" +#include "PuddleToad.h" +#include "Puffer.h" +#include "ReactorDoor.h" +#include "Ridley.h" +#include "Ripper.h" +#include "RuinsWorld.h" +#include "SFX.h" +#include "SamusShip.h" +#include "Scarab.h" +#include "Seedling.h" +#include "SheeGoth.h" +#include "SnakeWeed.h" +#include "Sova.h" +#include "SpacePirate.h" +#include "SpankWeed.h" +#include "Thardus.h" +#include "TheEnd.h" +#include "Torobyte.h" +#include "Triclops.h" +#include "Turret.h" +#include "UI.h" +#include "WarWasp.h" +#include "Weapons.h" +#include "ZZZ.h" +#include "Zoomer.h" +#include "lumigek.h" +#include "test.h" + +#endif // DNAMP1_SFX_H diff --git a/DataSpec/DNAMP1/SFX/SamusShip.h b/DataSpec/DNAMP1/SFX/SamusShip.h new file mode 100644 index 000000000..4789c3d3a --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SamusShip.h @@ -0,0 +1,45 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: SamusShip + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002A 42 + + +#define SFXsas_x_dooropen_00 1724 +#define SFXsas_x_dooropen_01 1725 +#define SFXsas_x_dooropen_02 1726 +#define SFXsas_x_dooropen_03 1727 +#define SFXsas_x_dooropen_04 1728 +#define SFXsas_x_dooropen_05 1729 +#define SFXsfx06C2 1730 +#define SFXsas_x_platrise_lp_01 1731 +#define SFXsas_x_thrusmov_00 1732 +#define SFXsfx06C5 1733 +#define SFXsas_x_thrusmov_02 1734 +#define SFXsas_x_thrusmov_03 1735 +#define SFXsas_x_hover_lp_00 1736 +#define SFXsas_x_thrusfir_lp_01 1737 +#define SFXsas_x_hover_lp_01 1738 +#define SFXsfx06CB 1739 +#define SFXsas_x_thrusfir_lp_04 1740 +#define SFXsfx06CD 1741 +#define SFXsfx06CE 1742 +#define SFXsfx06CF 1743 +#define SFXsfx06D0 1744 +#define SFXsfx06D1 1745 +#define SFXsfx06D2 1746 +#define SFXsfx06D3 1747 +#define SFXsfx06D4 1748 +#define SFXsfx06D5 1749 +#define SFXsfx06D6 1750 +#define SFXsfx06D7 1751 +#define SFXsfx06D8 1752 +#define SFXsfx06D9 1753 +#define SFXsfx06DA 1754 +#define SFXsfx06DB 1755 + + diff --git a/DataSpec/DNAMP1/SFX/Scarab.h b/DataSpec/DNAMP1/SFX/Scarab.h new file mode 100644 index 000000000..65e08fe61 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Scarab.h @@ -0,0 +1,21 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Scarab + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001B 27 + + +#define SFXsfx02D1 721 +#define SFXsfx02D2 722 +#define SFXsfx02D3 723 +#define SFXsfx02D4 724 +#define SFXsfx02D5 725 +#define SFXsfx02D6 726 +#define SFXsfx02D7 727 +#define SFXsfx02D8 728 + + diff --git a/DataSpec/DNAMP1/SFX/Seedling.h b/DataSpec/DNAMP1/SFX/Seedling.h new file mode 100644 index 000000000..2ce6d4d3a --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Seedling.h @@ -0,0 +1,33 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Seedling + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001C 28 + + +#define SFXsed_a_spine_00 729 +#define SFXsed_b_idle_lp_00 730 +#define SFXsfx02DB 731 +#define SFXsfx02DC 732 +#define SFXsed_b_alert_00 733 +#define SFXsfx02DE 734 +#define SFXsfx02DF 735 +#define SFXsfx02E0 736 +#define SFXsfx02E1 737 +#define SFXsfx02E2 738 +#define SFXsfx02E3 739 +#define SFXsfx02E4 740 +#define SFXsfx02E5 741 +#define SFXsfx02E6 742 +#define SFXsfx02E7 743 +#define SFXsfx02E8 744 +#define SFXsfx02E9 745 +#define SFXsfx02EA 746 +#define SFXsfx02EB 747 +#define SFXsfx02EC 748 + + diff --git a/DataSpec/DNAMP1/SFX/SheeGoth.h b/DataSpec/DNAMP1/SFX/SheeGoth.h new file mode 100644 index 000000000..40c230851 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SheeGoth.h @@ -0,0 +1,70 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: SheeGoth + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001D 29 + + +#define SFXshe_a_fireball_00 749 +#define SFXshe_b_shake_lp_00 750 +#define SFXsfx02EF 751 +#define SFXshe_a_flame_lp_00 752 +#define SFXshe_a_snap_00 753 +#define SFXshe_a_snap_01 754 +#define SFXshe_a_stomp_00 755 +#define SFXshe_a_stomp_01 756 +#define SFXshe_a_voxangry_00 757 +#define SFXshe_a_voxangry_01 758 +#define SFXshe_a_voxangry_03 759 +#define SFXshe_a_voxangry_04 760 +#define SFXsh2_a_voxangry_00 761 +#define SFXsfx02FA 762 +#define SFXsfx02FB 763 +#define SFXshe_b_idle_02 764 +#define SFXsh2_a_voxangry_01 765 +#define SFXshe_b_land_00 766 +#define SFXsh2_a_flame_lp_00 767 +#define SFXshe_b_roar_00 768 +#define SFXsh2_a_snap_00 769 +#define SFXsh2_a_voxangry_03 770 +#define SFXsh2_a_snap_01 771 +#define SFXshe_b_walk_00 772 +#define SFXshe_b_walk_01 773 +#define SFXshe_r_death_00 774 +#define SFXshe_r_death_01 775 +#define SFXshe_r_pain_00 776 +#define SFXsfx0309 777 +#define SFXsh2_a_voxangry_04 778 +#define SFXsfx030B 779 +#define SFXsfx030C 780 +#define SFXsh2_b_idle_02 781 +#define SFXsh2_b_land_00 782 +#define SFXsh2_b_roar_00 783 +#define SFXsh2_b_shake_lp_00 784 +#define SFXsh2_b_walk_00 785 +#define SFXsh2_b_walk_01 786 +#define SFXsh2_r_death_00 787 +#define SFXsh2_r_death_01 788 +#define SFXsh2_r_pain_00 789 +#define SFXsfx0316 790 +#define SFXsfx0317 791 +#define SFXsh2_b_run_00 792 +#define SFXsh2_b_run_01 793 +#define SFXsfx031A 794 +#define SFXsfx031B 795 +#define SFXsfx031C 796 +#define SFXsfx031D 797 +#define SFXsfx031E 798 +#define SFXsfx031F 799 +#define SFXsfx0320 800 +#define SFXsfx0321 801 +#define SFXsfx0322 802 +#define SFXsfx0323 803 +#define SFXsfx0324 804 +#define SFXsfx0325 805 + + diff --git a/DataSpec/DNAMP1/SFX/SnakeWeed.h b/DataSpec/DNAMP1/SFX/SnakeWeed.h new file mode 100644 index 000000000..db1718a9b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SnakeWeed.h @@ -0,0 +1,19 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: SnakeWeed + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001E 30 + + +#define SFXsfx0326 806 +#define SFXsnk_b_in_00 807 +#define SFXsnk_b_out_00 808 +#define SFXsfx0329 809 +#define SFXsfx032A 810 +#define SFXsfx032B 811 + + diff --git a/DataSpec/DNAMP1/SFX/Sova.h b/DataSpec/DNAMP1/SFX/Sova.h new file mode 100644 index 000000000..58b51e269 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Sova.h @@ -0,0 +1,32 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Sova + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup001F 31 + + +#define SFXfpr_b_walk_00 812 +#define SFXfpr_b_walk_01 813 +#define SFXspr_a_gun_00 814 +#define SFXsfx032F 815 +#define SFXsfx0330 816 +#define SFXspr_b_walk_00 817 +#define SFXspr_b_walk_01 818 +#define SFXspr_b_walk_02 819 +#define SFXspr_b_walk_03 820 +#define SFXsfx0335 821 +#define SFXsfx0336 822 +#define SFXsfx0337 823 +#define SFXsfx0338 824 +#define SFXsfx0339 825 +#define SFXsfx033A 826 +#define SFXsfx033B 827 +#define SFXsfx033C 828 +#define SFXsfx033D 829 +#define SFXsfx033E 830 + + diff --git a/DataSpec/DNAMP1/SFX/SpacePirate.h b/DataSpec/DNAMP1/SFX/SpacePirate.h new file mode 100644 index 000000000..bf0ae14ec --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SpacePirate.h @@ -0,0 +1,97 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: SpacePirate + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0020 32 + + +#define SFXsfx033F 831 +#define SFXepr_b_swordin_00 832 +#define SFXepr_b_swordout_00 833 +#define SFXopr_c_movement_00 834 +#define SFXsfx0343 835 +#define SFXsfx0344 836 +#define SFXsfx0345 837 +#define SFXsfx0346 838 +#define SFXsfx0347 839 +#define SFXspr_b_movement_00 840 +#define SFXspr_b_movement_01 841 +#define SFXsfx034A 842 +#define SFXsfx034B 843 +#define SFXsfx034C 844 +#define SFXsfx034D 845 +#define SFXspr_b_voxalert_01 846 +#define SFXsfx034F 847 +#define SFXsfx0350 848 +#define SFXsfx0351 849 +#define SFXsfx0352 850 +#define SFXsfx0353 851 +#define SFXsfx0354 852 +#define SFXsfx0355 853 +#define SFXsfx0356 854 +#define SFXspr_r_impact_02 855 +#define SFXopr_b_swordin_00 856 +#define SFXsfx0359 857 +#define SFXsfx035A 858 +#define SFXsfx035B 859 +#define SFXspr_b_idle_02 860 +#define SFXspr_b_intruder_00 861 +#define SFXsfx035E 862 +#define SFXsfx035F 863 +#define SFXsfx0360 864 +#define SFXsfx0361 865 +#define SFXopr_b_swordout_00 866 +#define SFXspr_r_himpact_00 867 +#define SFXsfx0364 868 +#define SFXspr_b_jump_00 869 +#define SFXsfx0366 870 +#define SFXsfx0367 871 +#define SFXsfx0368 872 +#define SFXspr_b_voxangry_02 873 +#define SFXsfx036A 874 +#define SFXsfx036B 875 +#define SFXsfx036C 876 +#define SFXsfx036D 877 +#define SFXsfx036E 878 +#define SFXsfx036F 879 +#define SFXsfx0370 880 +#define SFXsfx0371 881 +#define SFXsfx0372 882 +#define SFXsfx0373 883 +#define SFXepr_b_movement_00 884 +#define SFXepr_b_movement_01 885 +#define SFXsfx0376 886 +#define SFXsfx0377 887 +#define SFXsfx0378 888 +#define SFXsfx0379 889 +#define SFXsfx037A 890 +#define SFXsfx037B 891 +#define SFXepr_r_die_00 892 +#define SFXsfx037D 893 +#define SFXepr_r_pain_00 894 +#define SFXsfx037F 895 +#define SFXsfx0380 896 +#define SFXsfx0381 897 +#define SFXsfx0382 898 +#define SFXsfx0383 899 +#define SFXsfx0384 900 +#define SFXsfx0385 901 +#define SFXsfx0386 902 +#define SFXsfx0387 903 +#define SFXsfx0388 904 +#define SFXsfx0389 905 +#define SFXsfx038A 906 +#define SFXsfx038B 907 +#define SFXsfx038C 908 +#define SFXsfx038D 909 +#define SFXsfx038E 910 +#define SFXsfx038F 911 +#define SFXsfx0390 912 +#define SFXsfx0391 913 +#define SFXsfx0392 914 + + diff --git a/DataSpec/DNAMP1/SFX/SpankWeed.h b/DataSpec/DNAMP1/SFX/SpankWeed.h new file mode 100644 index 000000000..03b66f52b --- /dev/null +++ b/DataSpec/DNAMP1/SFX/SpankWeed.h @@ -0,0 +1,58 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: SpankWeed + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0021 33 + + +#define SFXspw_a_spank_00 915 +#define SFXsfx0394 916 +#define SFXspw_b_out_00 917 +#define SFXspw_b_swish_02 918 +#define SFXspw_b_swoosh_00 919 +#define SFXsfx0398 920 +#define SFXspw_r_impact_00 921 +#define SFXsfx039A 922 +#define SFXfla_a_tentatak_00 923 +#define SFXsfx039C 924 +#define SFXsfx039D 925 +#define SFXsfx039E 926 +#define SFXsfx039F 927 +#define SFXsfx03A0 928 +#define SFXsfx03A1 929 +#define SFXsfx03A2 930 +#define SFXfla_b_tentmove_01 931 +#define SFXfla_b_tentslid_00 932 +#define SFXfla_b_tentslid_01 933 +#define SFXsfx03A6 934 +#define SFXsfx03A7 935 +#define SFXsfx03A8 936 +#define SFXsfx03A9 937 +#define SFXsfx03AA 938 +#define SFXsfx03AB 939 +#define SFXsfx03AC 940 +#define SFXsfx03AD 941 +#define SFXsfx03AE 942 +#define SFXsfx03AF 943 +#define SFXsfx03B0 944 +#define SFXsfx03B1 945 +#define SFXsfx03B2 946 +#define SFXsfx03B3 947 +#define SFXsfx03B4 948 +#define SFXsfx03B5 949 +#define SFXsfx03B6 950 +#define SFXsfx03B7 951 +#define SFXsfx03B8 952 +#define SFXsfx03B9 953 +#define SFXsfx03BA 954 +#define SFXsfx03BB 955 +#define SFXsfx03BC 956 +#define SFXsfx03BD 957 +#define SFXsfx03BE 958 +#define SFXsfx03BF 959 + + diff --git a/DataSpec/DNAMP1/SFX/Thardus.h b/DataSpec/DNAMP1/SFX/Thardus.h new file mode 100644 index 000000000..933354e18 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Thardus.h @@ -0,0 +1,81 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Thardus + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0037 55 + + +#define SFXtha_b_voxangry_02 2703 +#define SFXtha_b_move_00 2704 +#define SFXsfx0A91 2705 +#define SFXtha_b_rocks_00 2706 +#define SFXtha_a_stoneup_lp_00 2707 +#define SFXtha_a_swoosh_00 2708 +#define SFXsfx0A95 2709 +#define SFXtha_a_voxattak_00 2710 +#define SFXtha_a_voxattak_01 2711 +#define SFXtha_b_henshin_lp_00 2712 +#define SFXtha_b_hitgrnd_00 2713 +#define SFXtha_b_hitgrnd_01 2714 +#define SFXtha_b_hitgrnd_02 2715 +#define SFXtha_b_charge_00 2716 +#define SFXtha_a_thunder_00 2717 +#define SFXtha_b_rocks_lp_00 2718 +#define SFXsfx0A9F 2719 +#define SFXtha_b_roll_lp_00 2720 +#define SFXsfx0AA1 2721 +#define SFXtha_b_voxangry_00 2722 +#define SFXtha_b_voxangry_01 2723 +#define SFXtha_b_walk_00 2724 +#define SFXtha_b_walk_01 2725 +#define SFXsfx0AA6 2726 +#define SFXtha_r_pain_00 2727 +#define SFXtha_b_boulder_00 2728 +#define SFXtha_b_boulder_01 2729 +#define SFXsfx0AAA 2730 +#define SFXtha_b_henshin_00 2731 +#define SFXtha_b_henshin_01 2732 +#define SFXsfx0AAD 2733 +#define SFXtha_a_icewave_lp_00 2734 +#define SFXtha_b_chant_00 2735 +#define SFXtha_b_enraged_00 2736 +#define SFXtha_b_charge_01 2737 +#define SFXtha_b_charge_02 2738 +#define SFXtha_b_walk_02 2739 +#define SFXtha_b_walk_03 2740 +#define SFXtha_a_thunder_01 2741 +#define SFXsfx0AB6 2742 +#define SFXsfx0AB7 2743 +#define SFXsfx0AB8 2744 +#define SFXtha_a_icestorm_lp_02 2745 +#define SFXsfx0ABA 2746 +#define SFXsfx0ABB 2747 +#define SFXsfx0ABC 2748 +#define SFXtha_b_idle_00 2749 +#define SFXsfx0ABE 2750 +#define SFXsfx0ABF 2751 +#define SFXsfx0AC0 2752 +#define SFXtha_b_charge_03 2753 +#define SFXtha_r_smpain_00 2754 +#define SFXsfx0AC3 2755 +#define SFXtha_r_pissed_00 2756 +#define SFXsfx0AC5 2757 +#define SFXsfx0AC6 2758 +#define SFXsfx0AC7 2759 +#define SFXsfx0AC8 2760 +#define SFXsfx0AC9 2761 +#define SFXsfx0ACA 2762 +#define SFXsfx0ACB 2763 +#define SFXsfx0ACC 2764 +#define SFXsfx0ACD 2765 +#define SFXsfx0ACE 2766 +#define SFXsfx0ACF 2767 +#define SFXsfx0AD0 2768 +#define SFXsfx0AD1 2769 +#define SFXsfx0AD2 2770 + + diff --git a/DataSpec/DNAMP1/SFX/TheEnd.h b/DataSpec/DNAMP1/SFX/TheEnd.h new file mode 100644 index 000000000..e2775ae70 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/TheEnd.h @@ -0,0 +1,31 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: TheEnd + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0046 70 + + +#define SFXsfx0C4D 3149 +#define SFXsh2_a_fireball_lp_00 3150 +#define SFXshe_a_fireball_lp_00 3151 +#define SFXend_c_shipthst_00 3152 +#define SFXsfx0C51 3153 +#define SFXsfx0C52 3154 +#define SFXsfx0C53 3155 +#define SFXsfx0C54 3156 +#define SFXsfx0C55 3157 +#define SFXsfx0C56 3158 +#define SFXsfx0C57 3159 +#define SFXsfx0C58 3160 +#define SFXsfx0C59 3161 +#define SFXsfx0C5A 3162 +#define SFXsfx0C5B 3163 +#define SFXsfx0C5C 3164 +#define SFXsfx0C5D 3165 +#define SFXsfx0C5E 3166 + + diff --git a/DataSpec/DNAMP1/SFX/Torobyte.h b/DataSpec/DNAMP1/SFX/Torobyte.h new file mode 100644 index 000000000..5a3083290 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Torobyte.h @@ -0,0 +1,32 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Torobyte + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0023 35 + + +#define SFXocu_b_idle_00 981 +#define SFXsfx03D6 982 +#define SFXocu_b_blink_00 983 +#define SFXsfx03D8 984 +#define SFXbat_r_voxdeath_00 985 +#define SFXsfx03DA 986 +#define SFXsfx03DB 987 +#define SFXsfx03DC 988 +#define SFXsfx03DD 989 +#define SFXsfx03DE 990 +#define SFXsfx03DF 991 +#define SFXsfx03E0 992 +#define SFXsfx03E1 993 +#define SFXsfx03E2 994 +#define SFXsfx03E3 995 +#define SFXsfx03E4 996 +#define SFXsfx03E5 997 +#define SFXsfx03E6 998 +#define SFXsfx03E7 999 + + diff --git a/DataSpec/DNAMP1/SFX/Triclops.h b/DataSpec/DNAMP1/SFX/Triclops.h new file mode 100644 index 000000000..c76c8c5cf --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Triclops.h @@ -0,0 +1,34 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Triclops + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0022 34 + + +#define SFXtri_a_attack_00 960 +#define SFXtri_a_attract_00 961 +#define SFXtri_b_idle_00 962 +#define SFXsfx03C3 963 +#define SFXtri_b_walk_00 964 +#define SFXsfx03C5 965 +#define SFXsfx03C6 966 +#define SFXtri_r_impact_00 967 +#define SFXtri_r_impact_01 968 +#define SFXtri_b_run_00 969 +#define SFXsfx03CA 970 +#define SFXsfx03CB 971 +#define SFXsfx03CC 972 +#define SFXsfx03CD 973 +#define SFXsfx03CE 974 +#define SFXsfx03CF 975 +#define SFXsfx03D0 976 +#define SFXsfx03D1 977 +#define SFXsfx03D2 978 +#define SFXsfx03D3 979 +#define SFXsfx03D4 980 + + diff --git a/DataSpec/DNAMP1/SFX/Turret.h b/DataSpec/DNAMP1/SFX/Turret.h new file mode 100644 index 000000000..f365b59df --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Turret.h @@ -0,0 +1,40 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Turret + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0024 36 + + +#define SFXsfx03E8 1000 +#define SFXtur_a_laser_00 1001 +#define SFXsfx03EA 1002 +#define SFXsfx03EB 1003 +#define SFXsfx03EC 1004 +#define SFXsfx03ED 1005 +#define SFXsfx03EE 1006 +#define SFXsfx03EF 1007 +#define SFXtur_b_lower_00 1008 +#define SFXsfx03F1 1009 +#define SFXsfx03F2 1010 +#define SFXtur_b_raise_lp_00 1011 +#define SFXtur_b_stop_00 1012 +#define SFXsfx03F5 1013 +#define SFXtur_b_sweep_lp_00 1014 +#define SFXsfx03F7 1015 +#define SFXsfx03F8 1016 +#define SFXsfx03F9 1017 +#define SFXsfx03FA 1018 +#define SFXtur_r_powrdown_lp_00 1019 +#define SFXsfx03FC 1020 +#define SFXsfx03FD 1021 +#define SFXsfx03FE 1022 +#define SFXsfx03FF 1023 +#define SFXsfx0400 1024 +#define SFXsfx0401 1025 +#define SFXsfx0402 1026 + + diff --git a/DataSpec/DNAMP1/SFX/UI.h b/DataSpec/DNAMP1/SFX/UI.h new file mode 100644 index 000000000..0a7e9538c --- /dev/null +++ b/DataSpec/DNAMP1/SFX/UI.h @@ -0,0 +1,103 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: UI + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0028 40 + + +#define SFXui_map_rotate 1375 +#define SFXui_map_zoom 1376 +#define SFXui_lockon_poi 1377 +#define SFXui_into_map_screen 1378 +#define SFXsfx0563 1379 +#define SFXui_outof_map_screen 1380 +#define SFXsfx0565 1381 +#define SFXui_outof_visor 1382 +#define SFXui_into_visor 1383 +#define SFXui_visor_xray_lp 1384 +#define SFXui_damage_lp 1385 +#define SFXui_show_local_beacon 1386 +#define SFXui_show_remote_beacon 1387 +#define SFXui_visor_thermal_lp 1388 +#define SFXsfx056D 1389 +#define SFXui_outof_freelook 1390 +#define SFXsfx056F 1391 +#define SFXui_into_freelook 1392 +#define SFXui_lockon_grapple 1393 +#define SFXui_freelook_move_lp 1394 +#define SFXui_select_visor 1395 +#define SFXui_threat_warning 1396 +#define SFXui_missile_warning 1397 +#define SFXui_select_beam 1398 +#define SFXui_threat_damage 1399 +#define SFXui_hud_shutdown 1400 +#define SFXui_hud_reboot 1401 +#define SFXui_static_hi 1402 +#define SFXui_static_lo 1403 +#define SFXui_visor_scan_lp 1404 +#define SFXui_energy_low 1405 +#define SFXui_map_pan 1406 +#define SFXui_scanning_lp 1407 +#define SFXsfx0580 1408 +#define SFXui_outof_scan_window 1409 +#define SFXsfx0582 1410 +#define SFXui_into_scan_window 1411 +#define SFXsfx0584 1412 +#define SFXsfx0585 1413 +#define SFXui_scan_pane_reveal 1414 +#define SFXui_into_hud_message 1415 +#define SFXui_outof_hud_message 1416 +#define SFXui_scan_complete 1417 +#define SFXui_hud_memo_type 1418 +#define SFXsfx058B 1419 +#define SFXsfx058C 1420 +#define SFXui_message_screen_key 1421 +#define SFXui_options_quit_accept 1422 +#define SFXui_options_quit_reject 1423 +#define SFXui_quit_change 1424 +#define SFXui_new_scan_complete 1425 +#define SFXui_map_to_universe 1426 +#define SFXui_map_from_universe 1427 +#define SFXsfx0594 1428 +#define SFXsfx0595 1429 +#define SFXsfx0596 1430 +#define SFXui_table_change_mode 1431 +#define SFXui_advance 1432 +#define SFXui_pause_screen_change 1433 +#define SFXui_pause_screen_exit 1434 +#define SFXui_pause_screen_enter 1435 +#define SFXui_table_selection_change 1436 +#define SFXui_option_enum_change 1437 +#define SFXsfx059E 1438 +#define SFXui_scan_next_page 1439 +#define SFXui_samus_doll_enter 1440 +#define SFXui_samus_doll_exit 1441 +#define SFXui_hud_memo_a_pulse 1442 +#define SFXui_show_hint_memo 1443 +#define SFXui_pause_screen_next_page 1444 +#define SFXsfx05A5 1445 +#define SFXui_map_screen_key2 1446 +#define SFXsfx05A7 1447 +#define SFXsfx05A8 1448 +#define SFXui_hide_hint_memo 1449 +#define SFXsfx05AA 1450 +#define SFXui_options_slider_change_lp 1451 +#define SFXui_map_screen_key1 1452 +#define SFXui_map_screen_key0 1453 +#define SFXsfx05AE 1454 +#define SFXsfx05AF 1455 +#define SFXsfx05B0 1456 +#define SFXsfx05B1 1457 +#define SFXui_frontend_options_slider_change_lp 1458 +#define SFXui_frontend_save_back 1459 +#define SFXui_frontend_save_confirm 1460 +#define SFXui_frontend_save_move 1461 +#define SFXsfx05B6 1462 +#define SFXsfx05B7 1463 +#define SFXsfx05B8 1464 + + diff --git a/DataSpec/DNAMP1/SFX/WarWasp.h b/DataSpec/DNAMP1/SFX/WarWasp.h new file mode 100644 index 000000000..95e758a76 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/WarWasp.h @@ -0,0 +1,76 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: WarWasp + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0025 37 + + +#define SFXwar_b_idle_lp_00 1027 +#define SFXwa2_a_stinger_00 1028 +#define SFXwa2_b_idle_lp_00 1029 +#define SFXwa2_r_diescream_00 1030 +#define SFXwa2_r_hitlight_00 1031 +#define SFXwa2_r_wingbuzz_00 1032 +#define SFXwar_r_diescream_00 1033 +#define SFXwar_r_diescream_01 1034 +#define SFXwar_r_diescream_02 1035 +#define SFXwar_r_diescream_03 1036 +#define SFXwar_r_hitdirt_00 1037 +#define SFXwar_r_hitdirt_01 1038 +#define SFXwar_r_hitlight_00 1039 +#define SFXwar_r_hitlight_01 1040 +#define SFXwar_r_wingbuzz_00 1041 +#define SFXwar_r_wingbuzz_01 1042 +#define SFXwar_r_wingbuzz_02 1043 +#define SFXwar_r_wingbuzz_03 1044 +#define SFXsfx0415 1045 +#define SFXwa2_r_wingbuzz_01 1046 +#define SFXwar_a_stab_00 1047 +#define SFXwar_b_noise_00 1048 +#define SFXwar_b_noise_01 1049 +#define SFXwa3_a_stab_00 1050 +#define SFXwa3_a_stab_01 1051 +#define SFXwa2_b_noise_00 1052 +#define SFXwa2_b_noise_01 1053 +#define SFXwar_a_stab_01 1054 +#define SFXwar_a_stinger_00 1055 +#define SFXwar_r_wingbuzz_04 1056 +#define SFXsfx0421 1057 +#define SFXsfx0422 1058 +#define SFXwa2_b_agitated_lp_00 1059 +#define SFXsfx0424 1060 +#define SFXwa2_b_noise_02 1061 +#define SFXwar_b_agitated_lp_00 1062 +#define SFXwa3_a_voxattak_00 1063 +#define SFXwar_b_noise_02 1064 +#define SFXwa3_b_agitated_lp_00 1065 +#define SFXwa3_b_idle_lp_00 1066 +#define SFXsfx042B 1067 +#define SFXwa3_b_noise_00 1068 +#define SFXsfx042D 1069 +#define SFXwa3_b_noise_02 1070 +#define SFXwa3_r_hitlight_00 1071 +#define SFXwa3_r_wingbuzz_00 1072 +#define SFXglo_b_fly_lp_00 1073 +#define SFXwa3_r_wingbuzz_02 1074 +#define SFXsfx0433 1075 +#define SFXsfx0434 1076 +#define SFXsfx0435 1077 +#define SFXsfx0436 1078 +#define SFXsfx0437 1079 +#define SFXsfx0438 1080 +#define SFXsfx0439 1081 +#define SFXsfx043A 1082 +#define SFXsfx043B 1083 +#define SFXsfx043C 1084 +#define SFXsfx043D 1085 +#define SFXsfx043E 1086 +#define SFXsfx043F 1087 +#define SFXsfx0440 1088 +#define SFXsfx0441 1089 + + diff --git a/DataSpec/DNAMP1/SFX/Weapons.h b/DataSpec/DNAMP1/SFX/Weapons.h new file mode 100644 index 000000000..203692015 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Weapons.h @@ -0,0 +1,149 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Weapons + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup002B 43 + + +#define SFXsfx06DC 1756 +#define SFXsfx06DD 1757 +#define SFXsfx06DE 1758 +#define SFXwpn_chargeup_ice 1759 +#define SFXsfx06E0 1760 +#define SFXsfx06E1 1761 +#define SFXwpn_combo_xfer 1762 +#define SFXwpn_empty_action 1763 +#define SFXsfx06E4 1764 +#define SFXsfx06E5 1765 +#define SFXwpn_chargeup_power 1766 +#define SFXwpn_fire_power_charged 1767 +#define SFXwpn_fire_missile 1768 +#define SFXwpn_reload_missile 1769 +#define SFXwpn_fire_power_normal 1770 +#define SFXsfx06EB 1771 +#define SFXsfx06EC 1772 +#define SFXsfx06ED 1773 +#define SFXwpn_morph_out_wipe 1774 +#define SFXwpn_morph_in_wipe_done 1775 +#define SFXwpn_fire_ice_charged 1776 +#define SFXsfx06F1 1777 +#define SFXsfx06F2 1778 +#define SFXsfx06F3 1779 +#define SFXsfx06F4 1780 +#define SFXwpn_invalid_action 1781 +#define SFXsfx06F6 1782 +#define SFXsfx06F7 1783 +#define SFXsfx06F8 1784 +#define SFXsfx06F9 1785 +#define SFXsfx06FA 1786 +#define SFXsfx06FB 1787 +#define SFXsfx06FC 1788 +#define SFXsfx06FD 1789 +#define SFXsfx06FE 1790 +#define SFXsfx06FF 1791 +#define SFXsfx0700 1792 +#define SFXsfx0701 1793 +#define SFXsfx0702 1794 +#define SFXsfx0703 1795 +#define SFXsfx0704 1796 +#define SFXwpn_fire_ice_normal 1797 +#define SFXsfx0706 1798 +#define SFXsfx0707 1799 +#define SFXsfx0708 1800 +#define SFXwpn_fire_wave_normal 1801 +#define SFXsfx070A 1802 +#define SFXwpn_fire_plasma_normal 1803 +#define SFXsfx070C 1804 +#define SFXwpn_fire_phazon_normal 1805 +#define SFXsfx070E 1806 +#define SFXsfx070F 1807 +#define SFXsfx0710 1808 +#define SFXsfx0711 1809 +#define SFXsfx0712 1810 +#define SFXsfx0713 1811 +#define SFXsfx0714 1812 +#define SFXsfx0715 1813 +#define SFXsfx0716 1814 +#define SFXsfx0717 1815 +#define SFXsfx0718 1816 +#define SFXsfx0719 1817 +#define SFXsfx071A 1818 +#define SFXsfx071B 1819 +#define SFXsfx071C 1820 +#define SFXwpn_into_beam_ice 1821 +#define SFXwpn_from_beam_ice 1822 +#define SFXwpn_to_missile_power 1823 +#define SFXwpn_from_missile_power 1824 +#define SFXwpn_into_beam_plasma 1825 +#define SFXwpn_from_beam_plasma 1826 +#define SFXwpn_into_beam_wave 1827 +#define SFXwpn_from_beam_wave 1828 +#define SFXwpn_to_missile_ice 1829 +#define SFXsfx0726 1830 +#define SFXsfx0727 1831 +#define SFXsfx0728 1832 +#define SFXsfx0729 1833 +#define SFXsfx072A 1834 +#define SFXsfx072B 1835 +#define SFXsfx072C 1836 +#define SFXsfx072D 1837 +#define SFXsfx072E 1838 +#define SFXwpn_chargeup_plasma 1839 +#define SFXwpn_fire_plasma_charged 1840 +#define SFXsfx0731 1841 +#define SFXwpn_combo_flamethrower 1842 +#define SFXsfx0733 1843 +#define SFXwpn_chargeup_wave 1844 +#define SFXwpn_fire_wave_charged 1845 +#define SFXsfx0736 1846 +#define SFXwpn_combo_wavebuster 1847 +#define SFXsfx0738 1848 +#define SFXwpn_from_missile_ice 1849 +#define SFXwpn_to_missile_wave 1850 +#define SFXwpn_from_missile_wave 1851 +#define SFXwpn_to_missile_plasma 1852 +#define SFXwpn_from_missile_plasma 1853 +#define SFXsfx073E 1854 +#define SFXsfx073F 1855 +#define SFXsfx0740 1856 +#define SFXsfx0741 1857 +#define SFXsfx0742 1858 +#define SFXsfx0743 1859 +#define SFXsfx0744 1860 +#define SFXsfx0745 1861 +#define SFXsfx0746 1862 +#define SFXsfx0747 1863 +#define SFXsfx0748 1864 +#define SFXsfx0749 1865 +#define SFXsfx074A 1866 +#define SFXsfx074B 1867 +#define SFXsfx074C 1868 +#define SFXsfx074D 1869 +#define SFXsfx074E 1870 +#define SFXsfx074F 1871 +#define SFXsfx0750 1872 +#define SFXsfx0751 1873 +#define SFXsfx0752 1874 +#define SFXsfx0753 1875 +#define SFXsfx0754 1876 +#define SFXsfx0755 1877 +#define SFXsfx0756 1878 +#define SFXsfx0757 1879 +#define SFXsfx0758 1880 +#define SFXsfx0759 1881 +#define SFXsfx075A 1882 +#define SFXsfx075B 1883 +#define SFXsfx075C 1884 +#define SFXsfx075D 1885 +#define SFXsfx075E 1886 +#define SFXsfx075F 1887 +#define SFXsfx0760 1888 +#define SFXsfx0761 1889 +#define SFXsfx0762 1890 +#define SFXsfx0763 1891 + + diff --git a/DataSpec/DNAMP1/SFX/ZZZ.h b/DataSpec/DNAMP1/SFX/ZZZ.h new file mode 100644 index 000000000..b4c1ec23f --- /dev/null +++ b/DataSpec/DNAMP1/SFX/ZZZ.h @@ -0,0 +1,33 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: ZZZ + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0041 65 + + +#define SFXsfx0C16 3094 +#define SFXsfx0C17 3095 +#define SFXsfx0C18 3096 +#define SFXsfx0C19 3097 +#define SFXsfx0C1A 3098 +#define SFXsfx0C1B 3099 +#define SFXsfx0C1C 3100 +#define SFXsfx0C1D 3101 +#define SFXsfx0C1E 3102 +#define SFXsfx0C1F 3103 +#define SFXsfx0C20 3104 +#define SFXsfx0C21 3105 +#define SFXsfx0C22 3106 +#define SFXsfx0C23 3107 +#define SFXsfx0C24 3108 +#define SFXsfx0C25 3109 +#define SFXsfx0C26 3110 +#define SFXsfx0C27 3111 +#define SFXsfx0C28 3112 +#define SFXsfx0C29 3113 + + diff --git a/DataSpec/DNAMP1/SFX/Zoomer.h b/DataSpec/DNAMP1/SFX/Zoomer.h new file mode 100644 index 000000000..4529a65bf --- /dev/null +++ b/DataSpec/DNAMP1/SFX/Zoomer.h @@ -0,0 +1,35 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: Zoomer + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0036 54 + + +#define SFXzom_b_idle_00 2681 +#define SFXsfx0A7A 2682 +#define SFXsfx0A7B 2683 +#define SFXsfx0A7C 2684 +#define SFXsfx0A7D 2685 +#define SFXgem_b_idle_00 2686 +#define SFXsfx0A7F 2687 +#define SFXsfx0A80 2688 +#define SFXsfx0A81 2689 +#define SFXsfx0A82 2690 +#define SFXsfx0A83 2691 +#define SFXsfx0A84 2692 +#define SFXsfx0A85 2693 +#define SFXsfx0A86 2694 +#define SFXsfx0A87 2695 +#define SFXsfx0A88 2696 +#define SFXsfx0A89 2697 +#define SFXsfx0A8A 2698 +#define SFXsfx0A8B 2699 +#define SFXsfx0A8C 2700 +#define SFXsfx0A8D 2701 +#define SFXsfx0A8E 2702 + + diff --git a/DataSpec/DNAMP1/SFX/lumigek.h b/DataSpec/DNAMP1/SFX/lumigek.h new file mode 100644 index 000000000..e63b6f893 --- /dev/null +++ b/DataSpec/DNAMP1/SFX/lumigek.h @@ -0,0 +1,19 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: lumigek + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0045 69 + + +#define SFXlum_b_idle_00 3143 +#define SFXsfx0C48 3144 +#define SFXsfx0C49 3145 +#define SFXsfx0C4A 3146 +#define SFXsfx0C4B 3147 +#define SFXsfx0C4C 3148 + + diff --git a/DataSpec/DNAMP1/SFX/test.h b/DataSpec/DNAMP1/SFX/test.h new file mode 100644 index 000000000..15c659dca --- /dev/null +++ b/DataSpec/DNAMP1/SFX/test.h @@ -0,0 +1,17 @@ +/* Auto-generated Amuse Defines + * + * Project: Audio + * Subproject: test + * Date: Sat Sep 1 12:32:04 2018 + */ + + +#define GRPgroup0035 53 + + +#define SNGIntro_Cinema 0 +#define SNGMain_Plaza 1 +#define SNGIntro_Exit 2 +#define SNGEndGame 3 + + diff --git a/DataSpec/DNAMP2/AGSC.cpp b/DataSpec/DNAMP2/AGSC.cpp index b00351459..7ccdf51f4 100644 --- a/DataSpec/DNAMP2/AGSC.cpp +++ b/DataSpec/DNAMP2/AGSC.cpp @@ -1,92 +1,82 @@ #include "AGSC.hpp" +#include "amuse/AudioGroup.hpp" +#include "amuse/AudioGroupData.hpp" namespace DataSpec::DNAMP2 { -bool AGSC::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath) +bool AGSC::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& dir) { + dir.makeDirChain(true); + Header head; head.read(rs); + auto pool = rs.readUBytes(head.poolSz); + auto proj = rs.readUBytes(head.projSz); + auto sdir = rs.readUBytes(head.sdirSz); + auto samp = rs.readUBytes(head.sampSz); + + amuse::AudioGroupData data(proj.get(), head.projSz, pool.get(), head.poolSz, + sdir.get(), head.sdirSz, samp.get(), head.sampSz, amuse::GCNDataTag{}); + + /* Load into amuse representation */ + amuse::ProjectDatabase projDb; + projDb.setIdDatabases(); + amuse::AudioGroupDatabase group(data); + group.setGroupPath(dir.getAbsolutePath()); + + /* Extract samples */ + group.getSdir().extractAllCompressed(dir.getAbsolutePath(), data.getSamp()); + + /* Write out project/pool */ { - hecl::ProjectPath poolPath = outPath.getWithExtension(_S(".pool"), true); - athena::io::FileWriter w(poolPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(head.poolSz).get(), head.poolSz); + auto projd = group.getProj().toYAML(); + athena::io::FileWriter fo(hecl::ProjectPath(dir, _S("!project.yaml")).getAbsolutePath()); + if (fo.hasError()) + return false; + fo.writeUBytes(projd.data(), projd.size()); } { - hecl::ProjectPath projPath = outPath.getWithExtension(_S(".proj"), true); - athena::io::FileWriter w(projPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(head.projSz).get(), head.projSz); - } - - { - hecl::ProjectPath sdirPath = outPath.getWithExtension(_S(".sdir"), true); - athena::io::FileWriter w(sdirPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(head.sdirSz).get(), head.sdirSz); - } - - { - hecl::ProjectPath sampPath = outPath.getWithExtension(_S(".samp"), true); - athena::io::FileWriter w(sampPath.getAbsolutePath()); - w.writeBytes(rs.readBytes(head.sampSz).get(), head.sampSz); + auto poold = group.getPool().toYAML(); + athena::io::FileWriter fo(hecl::ProjectPath(dir, _S("!pool.yaml")).getAbsolutePath()); + if (fo.hasError()) + return false; + fo.writeUBytes(poold.data(), poold.size()); } return true; } -bool AGSC::Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPath) +bool AGSC::Cook(const hecl::ProjectPath& dir, const hecl::ProjectPath& outPath) { athena::io::FileWriter w(outPath.getAbsolutePath()); if (w.hasError()) return false; - hecl::ProjectPath woExt = inPath.getWithExtension(nullptr, true); - std::string lastComp = std::string(woExt.getLastComponentUTF8()); - if (hecl::StringUtils::EndsWith(lastComp, "_AGSC")) - lastComp.assign(lastComp.cbegin(), lastComp.cend() - 5); + amuse::ProjectDatabase projDb; + projDb.setIdDatabases(); + amuse::AudioGroupDatabase group(dir.getAbsolutePath()); - hecl::ProjectPath poolPath = inPath.getWithExtension(_S(".pool"), true); - athena::io::FileReader poolR(poolPath.getAbsolutePath()); - if (poolR.hasError()) - return false; - uint32_t poolLen = poolR.length(); - - hecl::ProjectPath projPath = inPath.getWithExtension(_S(".proj"), true); - athena::io::FileReader projR(projPath.getAbsolutePath()); - if (projR.hasError()) - return false; - uint32_t projLen = projR.length(); - - hecl::ProjectPath sdirPath = inPath.getWithExtension(_S(".sdir"), true); - athena::io::FileReader sdirR(sdirPath.getAbsolutePath()); - if (sdirR.hasError()) - return false; - uint32_t sdirLen = sdirR.length(); - - hecl::ProjectPath sampPath = inPath.getWithExtension(_S(".samp"), true); - athena::io::FileReader sampR(sampPath.getAbsolutePath()); - if (sampR.hasError()) - return false; - uint32_t sampLen = sampR.length(); - - projR.seek(4, athena::SeekOrigin::Begin); - uint16_t groupId = projR.readUint16Big(); - projR.seek(0, athena::SeekOrigin::Begin); + auto proj = group.getProj().toGCNData(group.getPool(), group.getSdir()); + auto pool = group.getPool().toData(); + auto sdirSamp = group.getSdir().toGCNData(group); Header head; - head.groupName = lastComp; - head.groupId = groupId; - head.poolSz = poolLen; - head.projSz = projLen; - head.sdirSz = sdirLen; - head.sampSz = sampLen; + head.groupName = dir.getLastComponentUTF8(); + for (const auto& p : group.getProj().sfxGroups()) + head.groupId = p.first.id; + head.poolSz = pool.size(); + head.projSz = proj.size(); + head.sdirSz = sdirSamp.first.size(); + head.sampSz = sdirSamp.second.size(); head.write(w); - w.writeBytes(poolR.readBytes(poolLen).get(), poolLen); - w.writeBytes(projR.readBytes(projLen).get(), projLen); - w.writeBytes(sdirR.readBytes(sdirLen).get(), sdirLen); - w.writeBytes(sampR.readBytes(sampLen).get(), sampLen); + w.writeUBytes(pool.data(), pool.size()); + w.writeUBytes(proj.data(), proj.size()); + w.writeUBytes(sdirSamp.first.data(), sdirSamp.first.size()); + w.writeUBytes(sdirSamp.second.data(), sdirSamp.second.size()); return true; } diff --git a/DataSpec/DNAMP2/AGSC.hpp b/DataSpec/DNAMP2/AGSC.hpp index e1a4e149c..357a578b4 100644 --- a/DataSpec/DNAMP2/AGSC.hpp +++ b/DataSpec/DNAMP2/AGSC.hpp @@ -9,6 +9,7 @@ namespace DataSpec::DNAMP2 class AGSC { +public: struct Header : BigDNA { AT_DECL_DNA @@ -20,7 +21,6 @@ class AGSC Value sdirSz = 0; Value sampSz = 0; }; -public: static bool Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath); static bool Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPath); }; diff --git a/DataSpec/DNAMP2/ANCS.hpp b/DataSpec/DNAMP2/ANCS.hpp index 2fc218fda..b539baaf8 100644 --- a/DataSpec/DNAMP2/ANCS.hpp +++ b/DataSpec/DNAMP2/ANCS.hpp @@ -221,7 +221,7 @@ struct ANCS : BigDNA PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool force, hecl::blender::Token& btok, std::function fileChanged) diff --git a/DataSpec/DNAMP2/CMDL.cpp b/DataSpec/DNAMP2/CMDL.cpp index 3b7dc3c98..3ab6aed08 100644 --- a/DataSpec/DNAMP2/CMDL.cpp +++ b/DataSpec/DNAMP2/CMDL.cpp @@ -8,7 +8,7 @@ bool CMDL::Extract(const SpecBase& dataSpec, PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool, hecl::blender::Token& btok, std::function) diff --git a/DataSpec/DNAMP2/CMDL.hpp b/DataSpec/DNAMP2/CMDL.hpp index 283023854..c671f3059 100644 --- a/DataSpec/DNAMP2/CMDL.hpp +++ b/DataSpec/DNAMP2/CMDL.hpp @@ -17,7 +17,7 @@ struct CMDL PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool, hecl::blender::Token& btok, std::function); diff --git a/DataSpec/DNAMP2/CMakeLists.txt b/DataSpec/DNAMP2/CMakeLists.txt index 6d49317cf..f761e2578 100644 --- a/DataSpec/DNAMP2/CMakeLists.txt +++ b/DataSpec/DNAMP2/CMakeLists.txt @@ -13,6 +13,7 @@ make_dnalist(liblist DNAMP2 set(DNAMP2_SOURCES DNAMP2.hpp DNAMP2.cpp DeafBabe.cpp + PAK.cpp ANIM.cpp AGSC.cpp CINF.cpp diff --git a/DataSpec/DNAMP2/DNAMP2.cpp b/DataSpec/DNAMP2/DNAMP2.cpp index cec4d2212..9c3f83992 100644 --- a/DataSpec/DNAMP2/DNAMP2.cpp +++ b/DataSpec/DNAMP2/DNAMP2.cpp @@ -42,13 +42,13 @@ PAKBridge::PAKBridge(const nod::Node& node, /* Append Level String */ for (const auto& entry : m_pak.m_entries) { - const DNAMP1::PAK::Entry& e = entry.second; + const DNAMP2::PAK::Entry& e = entry.second; if (e.type == FOURCC('MLVL')) { PAKEntryReadStream rs = e.beginReadStream(m_node); MLVL mlvl; mlvl.read(rs); - const DNAMP1::PAK::Entry* nameEnt = m_pak.lookupEntry(mlvl.worldNameId); + const DNAMP2::PAK::Entry* nameEnt = m_pak.lookupEntry(mlvl.worldNameId); if (nameEnt) { PAKEntryReadStream rs = nameEnt->beginReadStream(m_node); @@ -76,7 +76,7 @@ void PAKBridge::build() /* First pass: build per-area/per-layer dependency map */ for (const auto& entry : m_pak.m_entries) { - const DNAMP1::PAK::Entry& e = entry.second; + const DNAMP2::PAK::Entry& e = entry.second; if (e.type == FOURCC('MLVL')) { Level& level = m_levelDeps[e.id]; @@ -87,13 +87,13 @@ void PAKBridge::build() mlvl.read(rs); } bool named; - std::string bestName = m_pak.bestEntryName(e, named); + std::string bestName = m_pak.bestEntryName(m_node, e, named); level.name = hecl::SystemStringConv(bestName).sys_str(); level.areas.reserve(mlvl.areaCount); unsigned layerIdx = 0; /* Make MAPW available to lookup MAPAs */ - const DNAMP1::PAK::Entry* worldMapEnt = m_pak.lookupEntry(mlvl.worldMap); + const DNAMP2::PAK::Entry* worldMapEnt = m_pak.lookupEntry(mlvl.worldMap); std::vector mapw; if (worldMapEnt) { @@ -111,7 +111,7 @@ void PAKBridge::build() { Level::Area& areaDeps = level.areas[area.areaMREAId]; MLVL::LayerFlags& layerFlags = mlvl.layerFlags[ai]; - const DNAMP1::PAK::Entry* areaNameEnt = m_pak.lookupEntry(area.areaNameId); + const DNAMP2::PAK::Entry* areaNameEnt = m_pak.lookupEntry(area.areaNameId); if (areaNameEnt) { STRG areaName; @@ -173,7 +173,7 @@ void PAKBridge::addCMDLRigPairs(PAKRouter& pakRouter, std::unordered_map>& addTo, std::unordered_map>& cskrCinfToAncs) const { - for (const std::pair& entry : m_pak.m_entries) + for (const std::pair& entry : m_pak.m_entries) { if (entry.second.type == FOURCC('ANCS')) { @@ -201,7 +201,7 @@ void PAKBridge::addMAPATransforms(PAKRouter& pakRouter, std::unordered_map& addTo, std::unordered_map& pathOverrides) const { - for (const std::pair& entry : m_pak.m_entries) + for (const std::pair& entry : m_pak.m_entries) { if (entry.second.type == FOURCC('MLVL')) { @@ -225,7 +225,7 @@ void PAKBridge::addMAPATransforms(PAKRouter& pakRouter, if (mlvl.worldMap) { const nod::Node* mapNode; - const DNAMP1::PAK::Entry* mapEntry = pakRouter.lookupEntry(mlvl.worldMap, &mapNode); + const DNAMP2::PAK::Entry* mapEntry = pakRouter.lookupEntry(mlvl.worldMap, &mapNode); if (mapEntry) { PAKEntryReadStream rs = mapEntry->beginReadStream(*mapNode); @@ -252,7 +252,8 @@ void PAKBridge::addMAPATransforms(PAKRouter& pakRouter, } } -ResExtractor PAKBridge::LookupExtractor(const DNAMP1::PAK& pak, const DNAMP1::PAK::Entry& entry) +ResExtractor PAKBridge::LookupExtractor(const nod::Node& pakNode, const DNAMP2::PAK& pak, + const DNAMP2::PAK::Entry& entry) { switch (entry.type) { @@ -285,7 +286,7 @@ ResExtractor PAKBridge::LookupExtractor(const DNAMP1::PAK& pak, const case SBIG('DGRP'): return {DNADGRP::ExtractDGRP, {_S(".yaml")}}; case SBIG('AGSC'): - return {AGSC::Extract, {_S(".pool"), _S(".proj"), _S(".samp"), _S(".sdir")}}; + return {AGSC::Extract, {}}; case SBIG('CSNG'): return {DNAMP1::CSNG::Extract, {_S(".mid"), _S(".yaml")}}; case SBIG('ATBL'): diff --git a/DataSpec/DNAMP2/DNAMP2.hpp b/DataSpec/DNAMP2/DNAMP2.hpp index 384267922..a88d2d786 100644 --- a/DataSpec/DNAMP2/DNAMP2.hpp +++ b/DataSpec/DNAMP2/DNAMP2.hpp @@ -2,7 +2,7 @@ #define __DNAMP2_HPP__ #include "DataSpec/DNACommon/DNACommon.hpp" -#include "../DNAMP1/PAK.hpp" +#include "PAK.hpp" namespace DataSpec::DNAMP2 { @@ -13,7 +13,7 @@ extern logvisor::Module Log; class PAKBridge { const nod::Node& m_node; - DNAMP1::PAK m_pak; + DNAMP2::PAK m_pak; public: bool m_doExtract; using Level = DataSpec::Level; @@ -22,11 +22,12 @@ public: PAKBridge(const nod::Node& node, bool doExtract=true); void build(); - static ResExtractor LookupExtractor(const DNAMP1::PAK& pak, const DNAMP1::PAK::Entry& entry); + static ResExtractor LookupExtractor(const nod::Node& pakNode, + const DNAMP2::PAK& pak, const DNAMP2::PAK::Entry& entry); std::string_view getName() const {return m_node.getName();} hecl::SystemStringView getLevelString() const {return m_levelString;} - using PAKType = DNAMP1::PAK; + using PAKType = DNAMP2::PAK; const PAKType& getPAK() const {return m_pak;} const nod::Node& getNode() const {return m_node;} diff --git a/DataSpec/DNAMP2/DeafBabe.hpp b/DataSpec/DNAMP2/DeafBabe.hpp index f363ec53f..124bea066 100644 --- a/DataSpec/DNAMP2/DeafBabe.hpp +++ b/DataSpec/DNAMP2/DeafBabe.hpp @@ -96,7 +96,7 @@ struct DeafBabe : BigDNA bool surfaceMud() const { return false; } void setSurfaceMud(bool v) {} bool surfaceStoneRock() const { return false; } - void setSurfaceStoneRock(bool v) {} + void setSurfaceLavaStone(bool v) {} bool solid() const { return false; } void setSolid(bool v) {} bool noPlatformCollision() const { return false; } diff --git a/DataSpec/DNAMP2/MAPA.hpp b/DataSpec/DNAMP2/MAPA.hpp index f1af137cf..92cbc28d8 100644 --- a/DataSpec/DNAMP2/MAPA.hpp +++ b/DataSpec/DNAMP2/MAPA.hpp @@ -13,7 +13,7 @@ struct MAPA : DNAMAPA::MAPA PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool force, hecl::blender::Token& btok, std::function fileChanged) diff --git a/DataSpec/DNAMP2/MAPU.hpp b/DataSpec/DNAMP2/MAPU.hpp index 0b15c5e09..8a3fe59b8 100644 --- a/DataSpec/DNAMP2/MAPU.hpp +++ b/DataSpec/DNAMP2/MAPU.hpp @@ -16,7 +16,7 @@ struct MAPU : DNAMAPU::MAPU PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool force, hecl::blender::Token& btok, std::function fileChanged) diff --git a/DataSpec/DNAMP2/MLVL.hpp b/DataSpec/DNAMP2/MLVL.hpp index 6fd4d6abd..095a1f89f 100644 --- a/DataSpec/DNAMP2/MLVL.hpp +++ b/DataSpec/DNAMP2/MLVL.hpp @@ -96,7 +96,7 @@ struct MLVL : BigDNA PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool force, hecl::blender::Token& btok, std::function fileChanged) diff --git a/DataSpec/DNAMP2/MREA.cpp b/DataSpec/DNAMP2/MREA.cpp index baf4a5d97..7a095e22e 100644 --- a/DataSpec/DNAMP2/MREA.cpp +++ b/DataSpec/DNAMP2/MREA.cpp @@ -164,7 +164,7 @@ bool MREA::Extract(const SpecBase& dataSpec, PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool force, hecl::blender::Token& btok, std::function) diff --git a/DataSpec/DNAMP2/MREA.hpp b/DataSpec/DNAMP2/MREA.hpp index 291a34f9f..bb8d32ae3 100644 --- a/DataSpec/DNAMP2/MREA.hpp +++ b/DataSpec/DNAMP2/MREA.hpp @@ -119,7 +119,7 @@ struct MREA PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, - const DNAMP1::PAK::Entry& entry, + const DNAMP2::PAK::Entry& entry, bool, hecl::blender::Token& btok, std::function); diff --git a/DataSpec/DNAMP2/PAK.cpp b/DataSpec/DNAMP2/PAK.cpp new file mode 100644 index 000000000..0d792fe74 --- /dev/null +++ b/DataSpec/DNAMP2/PAK.cpp @@ -0,0 +1,23 @@ +#include "PAK.hpp" +#include "AGSC.hpp" + +namespace DataSpec::DNAMP2 +{ + +std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const +{ + std::unordered_map::const_iterator search; + if (entry.type == FOURCC('AGSC') && (search = m_entries.find(entry.id)) != m_entries.cend()) + { + /* Use internal AGSC name for entry */ + auto rs = search->second.beginReadStream(pakNode); + AGSC::Header header; + header.read(rs); + named = true; + return header.groupName; + } + + return DNAMP1::PAK::bestEntryName(pakNode, entry, named); +} + +} diff --git a/DataSpec/DNAMP2/PAK.hpp b/DataSpec/DNAMP2/PAK.hpp index 53e461ac6..586dc8e7c 100644 --- a/DataSpec/DNAMP2/PAK.hpp +++ b/DataSpec/DNAMP2/PAK.hpp @@ -3,11 +3,15 @@ #include "../DNAMP1/PAK.hpp" -namespace urde::DNAMP2 +namespace DataSpec::DNAMP2 { /* Same PAK format as MP1 */ -using PAK = DNAMP1::PAK; +struct PAK : DNAMP1::PAK +{ + using DNAMP1::PAK::PAK; + std::string bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const; +}; } diff --git a/DataSpec/DNAMP3/DNAMP3.cpp b/DataSpec/DNAMP3/DNAMP3.cpp index 32dae2bd5..2f7daf783 100644 --- a/DataSpec/DNAMP3/DNAMP3.cpp +++ b/DataSpec/DNAMP3/DNAMP3.cpp @@ -92,7 +92,7 @@ void PAKBridge::build() mlvl.read(rs); } bool named; - std::string bestName = m_pak.bestEntryName(entry, named); + std::string bestName = m_pak.bestEntryName(m_node, entry, named); level.name = hecl::SystemStringConv(bestName).sys_str(); level.areas.reserve(mlvl.areaCount); unsigned layerIdx = 0; @@ -260,7 +260,7 @@ void PAKBridge::addMAPATransforms(PAKRouter& pakRouter, } } -ResExtractor PAKBridge::LookupExtractor(const PAK& pak, const PAK::Entry& entry) +ResExtractor PAKBridge::LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry) { switch (entry.type) { diff --git a/DataSpec/DNAMP3/DNAMP3.hpp b/DataSpec/DNAMP3/DNAMP3.hpp index 0a911a8fd..85455002e 100644 --- a/DataSpec/DNAMP3/DNAMP3.hpp +++ b/DataSpec/DNAMP3/DNAMP3.hpp @@ -22,7 +22,7 @@ public: PAKBridge(const nod::Node& node, bool doExtract=true); void build(); - static ResExtractor LookupExtractor(const PAK& pak, const PAK::Entry& entry); + static ResExtractor LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry); std::string_view getName() const {return m_node.getName();} hecl::SystemStringView getLevelString() const {return m_levelString;} diff --git a/DataSpec/DNAMP3/PAK.cpp b/DataSpec/DNAMP3/PAK.cpp index 41402a91a..1513323bb 100644 --- a/DataSpec/DNAMP3/PAK.cpp +++ b/DataSpec/DNAMP3/PAK.cpp @@ -243,7 +243,7 @@ const PAK::Entry* PAK::lookupEntry(std::string_view name) const return nullptr; } -std::string PAK::bestEntryName(const Entry& entry, bool& named) const +std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const { /* Prefer named entries first */ for (const NameEntry& nentry : m_nameEntries) diff --git a/DataSpec/DNAMP3/PAK.hpp b/DataSpec/DNAMP3/PAK.hpp index 29965b4e2..6eb4f97a8 100644 --- a/DataSpec/DNAMP3/PAK.hpp +++ b/DataSpec/DNAMP3/PAK.hpp @@ -64,7 +64,7 @@ struct PAK : BigDNA const Entry* lookupEntry(const UniqueID64& id) const; const Entry* lookupEntry(std::string_view name) const; - std::string bestEntryName(const Entry& entry, bool& named) const; + std::string bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const; bool mreaHasDupeResources(const UniqueID64& id) const { return m_dupeMREAs.find(id) != m_dupeMREAs.cend(); } diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp index e55448003..25f607a51 100644 --- a/DataSpec/SpecBase.cpp +++ b/DataSpec/SpecBase.cpp @@ -173,6 +173,7 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector& listOut hecl::ProjectPath childPath(path, ent.m_name); if (ent.m_isDir) { + if (hecl::ProjectPath(childPath, _S("!project.yaml")).isFile() && + hecl::ProjectPath(childPath, _S("!pool.yaml")).isFile()) + { + /* Handle AudioGroup case */ + if (urde::SObjectTag tag = tagFromPath(childPath, btok)) + { + if (addedTags.find(tag) != addedTags.end()) + continue; + addedTags.insert(tag); + listOut.push_back(tag); + } + continue; + } + recursiveBuildResourceList(listOut, addedTags, childPath, btok); } else @@ -1068,7 +1071,7 @@ void SpecBase::readCatalog(const hecl::ProjectPath& catalogPath, else if (node.m_seqChildren.size() == 1) path = hecl::ProjectPath(m_project.getProjectWorkingPath(), node.m_seqChildren[0]->m_scalarString); } - if (!path.isFileOrGlob()) + if (path.isNone()) continue; urde::SObjectTag pathTag = tagFromPath(path, m_backgroundBlender); if (pathTag) @@ -1242,12 +1245,6 @@ bool SpecBase::addFileToIndex(const hecl::ProjectPath& path, DumpCacheAdd(pathTag, subPath); #endif } - else if (pathTag.type == SBIG('AGSC')) - { - /* Transform tag to glob */ - pathTag = {SBIG('AGSC'), asGlob.hash().val32()}; - useGlob = true; - } /* Cache in-memory */ const hecl::ProjectPath& usePath = useGlob ? asGlob : path; @@ -1280,7 +1277,21 @@ void SpecBase::backgroundIndexRecursiveProc(const hecl::ProjectPath& dir, hecl::ProjectPath path(dir, ent.m_name); if (ent.m_isDir) - backgroundIndexRecursiveProc(path, cacheWriter, nameWriter, level + 1); + { + /* Index AGSC here */ + if (hecl::ProjectPath(path, "!project.yaml").isFile() && + hecl::ProjectPath(path, "!pool.yaml").isFile()) + { + urde::SObjectTag pathTag(SBIG('AGSC'), path.hash().val32()); + m_tagToPath[pathTag] = path; + m_pathToTag[path.hash()] = pathTag; + WriteTag(cacheWriter, pathTag, path); + } + else + { + backgroundIndexRecursiveProc(path, cacheWriter, nameWriter, level + 1); + } + } else { if (!path.isFile()) diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index 69128f326..6cf1d363d 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -390,7 +390,7 @@ struct SpecMP1 : SpecBase outPath.makeDir(); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); hecl::ProjectPath mp1OutPath(outPath, m_standalone ? _S("files") : _S("files/MP1")); - mp1OutPath.makeDir(); + mp1OutPath.makeDirChain(true); /* Extract non-pak files */ progress.startNewLine(); @@ -548,17 +548,6 @@ struct SpecMP1 : SpecBase return {SBIG('ANIM'), path.hash().val32()}; else if (const hecl::SystemChar* ext = path.getLastComponentExt().data()) { - if (ext[0] == _S('*') || !hecl::StrCmp(ext, _S("proj"))) - { - if (path.getWithExtension(_S(".proj"), true).isFile() && - path.getWithExtension(_S(".pool"), true).isFile() && - path.getWithExtension(_S(".sdir"), true).isFile() && - path.getWithExtension(_S(".samp"), true).isFile()) - { - hecl::ProjectPath glob = path.getWithExtension(_S(".*"), true); - return {SBIG('AGSC'), glob.hash().val32()}; - } - } if (ext[0] == _S('*') || !hecl::StrCmp(ext, _S("mid"))) { if (path.getWithExtension(_S(".mid"), true).isFile() && @@ -570,6 +559,13 @@ struct SpecMP1 : SpecBase } } + if (path.getPathType() == hecl::ProjectPath::Type::Directory) + { + if (hecl::ProjectPath(path, _S("!project.yaml")).isFile() && + hecl::ProjectPath(path, _S("!pool.yaml")).isFile()) + return {SBIG('AGSC'), path.hash().val32()}; + } + hecl::ProjectPath asBlend; if (path.getPathType() == hecl::ProjectPath::Type::Glob) asBlend = path.getWithExtension(_S(".blend"), true); diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index 97cd3676b..909d545c6 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -54,7 +54,7 @@ struct OriginalIDs std::unordered_set addedIDs; std::vector originalIDs; - pakRouter.enumerateResources([&](const DNAMP1::PAK::Entry* ent) { + pakRouter.enumerateResources([&](const DNAMP2::PAK::Entry* ent) { if (ent->type == FOURCC('MLVL') || ent->type == FOURCC('SCAN') || ent->type == FOURCC('MREA') || @@ -353,7 +353,8 @@ struct SpecMP2 : SpecBase outPath.makeDir(); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); hecl::ProjectPath mp2OutPath(outPath, m_standalone ? _S("files") : _S("files/MP2")); - mp2OutPath.makeDir(); + mp2OutPath.makeDirChain(true); + progress.startNewLine(); progress.print(_S("MP2 Root"), _S(""), 0.0); int prog = 0; diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index 039edd33b..27ae1db42 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -475,7 +475,8 @@ struct SpecMP3 : SpecBase outPath.makeDir(); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); hecl::ProjectPath mp3OutPath(outPath, m_standalone ? _S("files") : _S("files/MP3")); - mp3OutPath.makeDir(); + mp3OutPath.makeDirChain(true); + currentTarget = _S("MP3 Root"); progress.print(currentTarget.c_str(), _S(""), 0.0); prog = 0; @@ -536,7 +537,8 @@ struct SpecMP3 : SpecBase outPath.makeDir(); disc.getDataPartition()->extractSysFiles(outPath.getAbsolutePath(), ctx); hecl::ProjectPath feOutPath(outPath, m_standalone ? _S("files") : _S("files/fe")); - feOutPath.makeDir(); + feOutPath.makeDirChain(true); + currentTarget = _S("fe Root"); progress.print(currentTarget.c_str(), _S(""), 0.0); prog = 0; diff --git a/Runtime/Audio/CSfxManager.hpp b/Runtime/Audio/CSfxManager.hpp index 29f948101..1bdb189e3 100644 --- a/Runtime/Audio/CSfxManager.hpp +++ b/Runtime/Audio/CSfxManager.hpp @@ -5,6 +5,7 @@ #include "../RetroTypes.hpp" #include "zeus/CVector3f.hpp" #include "CAudioSys.hpp" +#include "DNAMP1/SFX/SFX.h" namespace urde { diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp index 0f2332338..f9f26f2b2 100644 --- a/Runtime/AutoMapper/CAutoMapper.cpp +++ b/Runtime/AutoMapper/CAutoMapper.cpp @@ -299,9 +299,9 @@ void CAutoMapper::UpdateHintNavigation(float dt, const CStateManager& mgr) if (!oldProcessing) { if (xa0_curAreaId == mgr.GetNextAreaId() && x24_world == mgr.GetWorld()) - CSfxManager::SfxStart(1386, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_show_local_beacon, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else - CSfxManager::SfxStart(1387, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_show_remote_beacon, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } nextStep.x4_float = std::max(0.f, nextStep.x4_float - dt); for (SAutoMapperHintLocation& loc : x1f8_hintLocations) @@ -386,7 +386,7 @@ void CAutoMapper::BeginMapperStateTransition(EAutoMapperState state, const CStat } else if (x1bc_state == EAutoMapperState::MapScreen && state == EAutoMapperState::MapScreenUniverse) { - CSfxManager::SfxStart(1426, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_map_to_universe, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); xa8_renderStates[1] = BuildMapScreenUniverseRenderState(mgr, xa8_renderStates[0].x8_camOrientation, xa0_curAreaId); TransformRenderStatesWorldToUniverse(); @@ -394,7 +394,7 @@ void CAutoMapper::BeginMapperStateTransition(EAutoMapperState state, const CStat } else if (x1bc_state == EAutoMapperState::MapScreenUniverse && state == EAutoMapperState::MapScreen) { - CSfxManager::SfxStart(1427, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_map_from_universe, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); xa8_renderStates[1] = BuildMapScreenWorldRenderState(mgr, xa8_renderStates[0].x8_camOrientation, xa0_curAreaId, x1e0_hintSteps.size()); TransformRenderStateWorldToUniverse(xa8_renderStates[1]); @@ -809,7 +809,7 @@ void CAutoMapper::SetShouldPanningSoundBePlaying(bool b) if (b) { if (!x1cc_panningSfx) - x1cc_panningSfx = CSfxManager::SfxStart(1406, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x1cc_panningSfx = CSfxManager::SfxStart(SFXui_map_pan, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -823,7 +823,7 @@ void CAutoMapper::SetShouldZoomingSoundBePlaying(bool b) if (b) { if (!x1d4_zoomingSfx) - x1d4_zoomingSfx = CSfxManager::SfxStart(1376, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x1d4_zoomingSfx = CSfxManager::SfxStart(SFXui_map_zoom, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -837,7 +837,7 @@ void CAutoMapper::SetShouldRotatingSoundBePlaying(bool b) if (b) { if (!x1d0_rotatingSfx) - x1d0_rotatingSfx = CSfxManager::SfxStart(1375, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x1d0_rotatingSfx = CSfxManager::SfxStart(SFXui_map_rotate, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -1170,15 +1170,15 @@ void CAutoMapper::ProcessControllerInput(const CFinalInput& input, CStateManager { case 0: sysOpts.SetAutoMapperKeyState(1); - CSfxManager::SfxStart(1452, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_map_screen_key1, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); break; case 1: sysOpts.SetAutoMapperKeyState(2); - CSfxManager::SfxStart(1446, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_map_screen_key2, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); break; case 2: sysOpts.SetAutoMapperKeyState(0); - CSfxManager::SfxStart(1453, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_map_screen_key0, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); break; default: break; } diff --git a/Runtime/CGameOptions.cpp b/Runtime/CGameOptions.cpp index 457a74227..d42ed6ff7 100644 --- a/Runtime/CGameOptions.cpp +++ b/Runtime/CGameOptions.cpp @@ -464,12 +464,12 @@ void CGameOptions::TryRestoreDefaults(const CFinalInput& input, int category, if (frontend) { - CSfxManager::SfxStart(1096, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); - CSfxManager::SfxStart(1091, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_R, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { - CSfxManager::SfxStart(1432, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_advance, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } CGameOptions& gameOptions = g_GameState->GameOptions(); diff --git a/Runtime/Camera/CCameraManager.cpp b/Runtime/Camera/CCameraManager.cpp index 9f0e5199f..6c0e84d71 100644 --- a/Runtime/Camera/CCameraManager.cpp +++ b/Runtime/Camera/CCameraManager.cpp @@ -71,10 +71,10 @@ int CCameraManager::AddCameraShaker(const CCameraShakeData& data, bool sfx) zeus::clamp(100.f, std::max(data.GetMaxAMComponent(), data.GetMaxFMComponent()) * 9.f + 100.f, 127.f); CSfxHandle sfxHandle; if (data.xc0_flags & 0x1) - sfxHandle = CSfxManager::AddEmitter(1133, data.xc4_sfxPos, zeus::CVector3f::skZero, + sfxHandle = CSfxManager::AddEmitter(SFXamb_x_rumble_lp_00, data.xc4_sfxPos, zeus::CVector3f::skZero, vol / 127.f, false, false, 0x7f, kInvalidAreaId); else - sfxHandle = CSfxManager::SfxStart(1133, vol / 127.f, 0.f, false, 0x7f, false, kInvalidAreaId); + sfxHandle = CSfxManager::SfxStart(SFXamb_x_rumble_lp_00, vol / 127.f, 0.f, false, 0x7f, false, kInvalidAreaId); sfxHandle->SetTimeRemaining(data.x0_duration); } return x2c_lastShakeId; diff --git a/Runtime/Collision/CMaterialList.hpp b/Runtime/Collision/CMaterialList.hpp index 078fcdaf8..5a035add1 100644 --- a/Runtime/Collision/CMaterialList.hpp +++ b/Runtime/Collision/CMaterialList.hpp @@ -17,7 +17,7 @@ enum class EMaterialTypes Phazon = 7, Dirt = 8, Lava = 9, - Ten = 10, + LavaStone = 10, Snow = 11, MudSlow = 12, HalfPipe = 13, diff --git a/Runtime/GuiSys/CCompoundTargetReticle.cpp b/Runtime/GuiSys/CCompoundTargetReticle.cpp index 0ba1e5fe1..710a4f65d 100644 --- a/Runtime/GuiSys/CCompoundTargetReticle.cpp +++ b/Runtime/GuiSys/CCompoundTargetReticle.cpp @@ -329,9 +329,9 @@ void CCompoundTargetReticle::UpdateCurrLockOnGroup(float dt, const CStateManager if (targetId != kInvalidUniqueId) { if (TCastToConstPtr point = mgr.GetObjectById(targetId)) - CSfxManager::SfxStart(1393, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_lockon_grapple, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else - CSfxManager::SfxStart(1377, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_lockon_poi, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } if (targetId == kInvalidUniqueId) diff --git a/Runtime/GuiSys/CHudEnergyInterface.cpp b/Runtime/GuiSys/CHudEnergyInterface.cpp index 7cb3c71e0..551d96751 100644 --- a/Runtime/GuiSys/CHudEnergyInterface.cpp +++ b/Runtime/GuiSys/CHudEnergyInterface.cpp @@ -138,7 +138,7 @@ void CHudEnergyInterface::SetEnergyLow(bool energyLow) x28_textpane_energywarning->TextSupport().SetText(string); if (energyLow) - CSfxManager::SfxStart(1405, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_energy_low, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x1c_27_energyLow = energyLow; } diff --git a/Runtime/GuiSys/CHudMissileInterface.cpp b/Runtime/GuiSys/CHudMissileInterface.cpp index 77236dbf0..40581409e 100644 --- a/Runtime/GuiSys/CHudMissileInterface.cpp +++ b/Runtime/GuiSys/CHudMissileInterface.cpp @@ -189,12 +189,12 @@ void CHudMissileInterface::Update(float dt, const CStateManager& mgr) if (x44_latestStatus == EInventoryStatus::Normal && curStatus == EInventoryStatus::Warning) { - CSfxManager::SfxStart(1397, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_missile_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x48_missileWarningPulse = g_tweakGui->GetMissileWarningPulseTime(); } else if (curStatus == EInventoryStatus::Depleted) { - CSfxManager::SfxStart(1397, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_missile_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x48_missileWarningPulse = g_tweakGui->GetMissileWarningPulseTime(); } diff --git a/Runtime/GuiSys/CHudThreatInterface.cpp b/Runtime/GuiSys/CHudThreatInterface.cpp index ff696f1dc..127b2b8d1 100644 --- a/Runtime/GuiSys/CHudThreatInterface.cpp +++ b/Runtime/GuiSys/CHudThreatInterface.cpp @@ -197,9 +197,9 @@ void CHudThreatInterface::Update(float dt) x68_textpane_threatwarning->TextSupport().SetText(string); if (x4c_threatStatus == EThreatStatus::Normal && newStatus == EThreatStatus::Warning) - CSfxManager::SfxStart(1396, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_threat_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else if (newStatus == EThreatStatus::Damage) - CSfxManager::SfxStart(1399, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_threat_damage, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x4c_threatStatus = newStatus; } @@ -213,7 +213,7 @@ void CHudThreatInterface::Update(float dt) xc_damagePulse = (0.5f - x8_damagePulseTimer) / 0.25f; if (x4c_threatStatus == EThreatStatus::Damage && x8_damagePulseTimer < oldX8) - CSfxManager::SfxStart(1399, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_threat_damage, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); if (x68_textpane_threatwarning) { diff --git a/Runtime/GuiSys/CHudVisorBeamMenu.cpp b/Runtime/GuiSys/CHudVisorBeamMenu.cpp index 17a0bbffd..1599383c8 100644 --- a/Runtime/GuiSys/CHudVisorBeamMenu.cpp +++ b/Runtime/GuiSys/CHudVisorBeamMenu.cpp @@ -48,7 +48,7 @@ static const int MenuStringIdx[2][4] = static const u16 SelectionSfxs[] = { - 1395, 1398 + SFXui_select_visor, SFXui_select_beam }; CHudVisorBeamMenu::CHudVisorBeamMenu(CGuiFrame& baseHud, EHudVisorBeamMenu type, diff --git a/Runtime/GuiSys/CScanDisplay.cpp b/Runtime/GuiSys/CScanDisplay.cpp index a896933aa..230ea825b 100644 --- a/Runtime/GuiSys/CScanDisplay.cpp +++ b/Runtime/GuiSys/CScanDisplay.cpp @@ -100,7 +100,7 @@ void CScanDisplay::ProcessInput(const CFinalInput& input) else { xc_state = EScanState::ViewingScan; - CSfxManager::SfxStart(1439, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_scan_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } } @@ -118,7 +118,7 @@ void CScanDisplay::ProcessInput(const CFinalInput& input) } if (x1ac_pageCounter != oldCounter) { - CSfxManager::SfxStart(1439, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_scan_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); if (x1ac_pageCounter == 0) { xa8_message->SetIsVisible(true); @@ -342,7 +342,7 @@ void CScanDisplay::Update(float dt, float scanningTime) { xc_state = EScanState::ViewingScan; x1b0_aPulse = x1a4_xAlpha = 1.f; - CSfxManager::SfxStart(1417, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_scan_complete, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { @@ -352,7 +352,7 @@ void CScanDisplay::Update(float dt, float scanningTime) g_MainStringTable->GetString(x14_scannableInfo->GetCategory() + 30) + g_MainStringTable->GetString(30)); SetScanMessageTypeEffect(xa8_message, true); - CSfxManager::SfxStart(1425, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_new_scan_complete, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } if (x194_scanStr->GetStringCount() > 2) @@ -399,7 +399,7 @@ void CScanDisplay::Update(float dt, float scanningTime) if (tmp == 0.f) { dot.SetDotState(CDataDot::EDotState::Done); - CSfxManager::SfxStart(1414, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_scan_pane_reveal, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x170_paneStates[i].first = g_tweakGui->GetScanPaneFadeOutTime() + g_tweakGui->GetScanPaneFadeInTime(); } break; diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index 533fa6405..a23bdfbb5 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -34,16 +34,16 @@ static const float FE2_VOL = 0.7421875f; /* L/R Stereo transition cues */ static const u16 FETransitionBackSFX[3][2] = { - {1090, 1097}, - {1098, 1099}, - {1100, 1101} + {SFXfnt_transfore_00L, SFXfnt_transfore_00R}, + {SFXfnt_transfore_01L, SFXfnt_transfore_01R}, + {SFXfnt_transfore_02L, SFXfnt_transfore_02R} }; static const u16 FETransitionForwardSFX[3][2] = { - {1102, 1103}, - {1104, 1105}, - {1106, 1107} + {SFXfnt_transback_00L, SFXfnt_transback_00R}, + {SFXfnt_transback_01L, SFXfnt_transback_01R}, + {SFXfnt_transback_02L, SFXfnt_transback_02R} }; struct FEMovie @@ -69,8 +69,8 @@ SObjectTag g_DefaultWorldTag = {FOURCC('MLVL'), 0x158efe17}; void CFrontEndUI::PlayAdvanceSfx() { - CSfxManager::SfxStart(1096, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); - CSfxManager::SfxStart(1091, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_R, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } CFrontEndUI::SNewFileSelectFrame::SNewFileSelectFrame(CSaveGameScreen* sui, u32 rnd, CFrontEndUITouchBar& touchBar) @@ -586,13 +586,13 @@ void CFrontEndUI::SNewFileSelectFrame::DoPopupCancel(CGuiTableGroup* caller) { if (x8_subMenu == ESubMenu::EraseGamePopup) { - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x8_subMenu = ESubMenu::EraseGame; x10d_needsEraseToggle = true; } else { - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x8_subMenu = ESubMenu::Root; x10e_needsNewToggle = true; } @@ -641,7 +641,7 @@ void CFrontEndUI::SNewFileSelectFrame::DoFileMenuCancel(CGuiTableGroup* caller) { if (x8_subMenu == ESubMenu::EraseGame) { - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ResetFrame(); } } @@ -649,7 +649,7 @@ void CFrontEndUI::SNewFileSelectFrame::DoFileMenuCancel(CGuiTableGroup* caller) void CFrontEndUI::SNewFileSelectFrame::DoSelectionChange(CGuiTableGroup* caller, int oldSel) { HandleActiveChange(caller); - CSfxManager::SfxStart(1093, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } void CFrontEndUI::SNewFileSelectFrame::DoFileMenuAdvance(CGuiTableGroup* caller) @@ -884,7 +884,7 @@ CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::ProcessUserInput(const CFinalInpu EUIType prevUi = PrevLinkUI[int(x0_uiType)]; if (prevUi == EUIType::Empty) break; - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); SetUIText(prevUi); } break; @@ -902,13 +902,13 @@ CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::ProcessUserInput(const CFinalInpu } else { - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); SetUIText(EUIType::LinkFailed); } } else if (x4_gbaSupport->GetPhase() == CGBASupport::EPhase::Failed) { - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); SetUIText(EUIType::LinkFailed); } break; @@ -1178,12 +1178,12 @@ void CFrontEndUI::SFusionBonusFrame::DoSelectionChange(CGuiTableGroup* caller, i { if (caller == x28_tablegroup_options) { - CSfxManager::SfxStart(1093, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ResetCompletionFlags(); } else { - CSfxManager::SfxStart(1095, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_enum_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); bool fusionActive = x2c_tablegroup_fusionsuit->GetUserSelection() == 1; g_GameState->SystemOptions().SetPlayerFusionSuitActive(fusionActive); g_GameState->GetPlayerState()->SetIsFusionEnabled(fusionActive); @@ -1213,7 +1213,7 @@ void CFrontEndUI::SFusionBonusFrame::DoAdvance(CGuiTableGroup* caller) else { x3a_mpNotComplete = true; - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } break; case 0: @@ -1226,7 +1226,7 @@ void CFrontEndUI::SFusionBonusFrame::DoAdvance(CGuiTableGroup* caller) else if (g_GameState->SystemOptions().GetPlayerBeatFusion() || m_gbaOverride) { //x8_action = EAction::None; - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x8_action = EAction::PlayNESMetroid; } else @@ -1385,7 +1385,7 @@ void CFrontEndUI::SFrontEndFrame::DoCancel(CGuiTableGroup* caller) void CFrontEndUI::SFrontEndFrame::DoSelectionChange(CGuiTableGroup* caller, int oldSel) { - CSfxManager::SfxStart(1093, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); HandleActiveChange(caller); } @@ -1623,7 +1623,7 @@ void CFrontEndUI::SOptionsFrontEndFrame::DoMenuCancel(CGuiTableGroup* caller) x28_tablegroup_rightmenu->SetIsActive(false); x28_tablegroup_rightmenu->SetUserSelection(0); SetTableColors(x28_tablegroup_rightmenu); - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } @@ -1633,12 +1633,12 @@ void CFrontEndUI::SOptionsFrontEndFrame::DoMenuSelectionChange(CGuiTableGroup* c if (x24_tablegroup_leftmenu == caller) { SetRightUIText(); - CSfxManager::SfxStart(1093, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else if (x28_tablegroup_rightmenu == caller) { HandleRightSelectionChange(); - CSfxManager::SfxStart(1093, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else if (x2c_tablegroup_double == caller || x30_tablegroup_triple == caller) { @@ -1650,7 +1650,7 @@ void CFrontEndUI::SOptionsFrontEndFrame::DoMenuSelectionChange(CGuiTableGroup* c const SGameOption& option = optionCategory.second[rightSel]; CGameOptions::SetOption(option.option, caller->GetUserSelection()); m_touchBarValueDirty = true; - CSfxManager::SfxStart(1095, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_enum_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); if (option.option == EGameOption::Rumble && caller->GetUserSelection() > 0) { @@ -1670,8 +1670,8 @@ void CFrontEndUI::SOptionsFrontEndFrame::DoLeftMenuAdvance(CGuiTableGroup* calle x28_tablegroup_rightmenu->SetUserSelection(0); x24_tablegroup_leftmenu->SetIsActive(false); x28_tablegroup_rightmenu->SetIsActive(true); - CSfxManager::SfxStart(1096, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); - CSfxManager::SfxStart(1091, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_advance_R, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } @@ -1860,7 +1860,7 @@ bool CFrontEndUI::SOptionsFrontEndFrame::ProcessUserInput(const CFinalInput& inp if (input.PB() && x24_tablegroup_leftmenu->GetIsActive()) { x134_25_exitOptions = true; - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { @@ -1942,7 +1942,7 @@ bool CFrontEndUI::SOptionsFrontEndFrame::ProcessUserInput(const CFinalInput& inp if (tbAction == CGameOptionsTouchBar::EAction::Back) { x134_25_exitOptions = true; - CSfxManager::SfxStart(1094, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_back, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { @@ -1970,7 +1970,8 @@ void CFrontEndUI::SOptionsFrontEndFrame::Update(float dt, CSaveGameScreen* sui) { if (isSliding) { - x3c_sliderSfx = CSfxManager::SfxStart(1458, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + x3c_sliderSfx = CSfxManager::SfxStart(SFXui_frontend_options_slider_change_lp, + 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { @@ -2098,8 +2099,8 @@ void CFrontEndUI::StartStateTransition(EScreen screen) { SetCurrentMovie(EMenuMovie::FileSelectGBA); SetFadeBlackTimer(xcc_curMoviePtr->GetTotalSeconds()); - CSfxManager::SfxStart(1108, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); - CSfxManager::SfxStart(1109, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_tofusion_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_tofusion_R, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } break; case EScreen::FusionBonus: @@ -2112,8 +2113,8 @@ void CFrontEndUI::StartStateTransition(EScreen screen) { SetCurrentMovie(EMenuMovie::GBAFileSelectA); SetFadeBlackTimer(xcc_curMoviePtr->GetTotalSeconds()); - CSfxManager::SfxStart(1110, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); - CSfxManager::SfxStart(1111, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_fromfusion_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXfnt_fromfusion_R, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } default: break; } diff --git a/Runtime/MP1/CInGameGuiManager.cpp b/Runtime/MP1/CInGameGuiManager.cpp index b6869bb0c..33e250ea1 100644 --- a/Runtime/MP1/CInGameGuiManager.cpp +++ b/Runtime/MP1/CInGameGuiManager.cpp @@ -426,9 +426,9 @@ void CInGameGuiManager::Update(CStateManager& stateMgr, float dt, CArchitectureQ if (std::fabs(stateMgr.GetPlayer().GetVisorStaticAlpha() - x1f4_visorStaticAlpha) < 0.5f) { if (x1f4_visorStaticAlpha == 0.f) - CSfxManager::SfxStart(1401, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_hud_reboot, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else if (x1f4_visorStaticAlpha == 1.f) - CSfxManager::SfxStart(1400, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_hud_shutdown, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } } diff --git a/Runtime/MP1/CInventoryScreen.cpp b/Runtime/MP1/CInventoryScreen.cpp index 8baa4009c..b92763bc2 100644 --- a/Runtime/MP1/CInventoryScreen.cpp +++ b/Runtime/MP1/CInventoryScreen.cpp @@ -194,7 +194,7 @@ void CInventoryScreen::ProcessControllerInput(const CFinalInput& input) newPage = std::min(oldPage + 1, totalCount - 1); x174_textpane_body->TextSupport().SetPage(newPage); if (oldPage != newPage) - CSfxManager::SfxStart(1444, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x198_28_pulseTextArrowTop = newPage > 0; x198_29_pulseTextArrowBottom = !lastPage; } diff --git a/Runtime/MP1/CLogBookScreen.cpp b/Runtime/MP1/CLogBookScreen.cpp index 34c53b873..f710c6680 100644 --- a/Runtime/MP1/CLogBookScreen.cpp +++ b/Runtime/MP1/CLogBookScreen.cpp @@ -369,7 +369,7 @@ void CLogBookScreen::ProcessControllerInput(const CFinalInput& input) newPage = std::min(oldPage + 1, pageCount - 1); x174_textpane_body->TextSupport().SetPage(newPage); if (oldPage != newPage) - CSfxManager::SfxStart(1444, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x198_28_pulseTextArrowTop = newPage > 0; x198_29_pulseTextArrowBottom = !lastPage; } diff --git a/Runtime/MP1/CMessageScreen.cpp b/Runtime/MP1/CMessageScreen.cpp index b61b07289..651bbb8cb 100644 --- a/Runtime/MP1/CMessageScreen.cpp +++ b/Runtime/MP1/CMessageScreen.cpp @@ -43,7 +43,7 @@ void CMessageScreen::ProcessControllerInput(const CFinalInput& input) x1c_textpane_message->TextSupport().SetTypeWriteEffectOptions(false, 0.1f, 30.f); x1c_textpane_message->TextSupport().SetText(x0_msg->GetString(x6c_page)); - CSfxManager::SfxStart(1421, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_message_screen_key, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x74_delayTime = 0.8f; } diff --git a/Runtime/MP1/COptionsScreen.cpp b/Runtime/MP1/COptionsScreen.cpp index db05322fe..522841288 100644 --- a/Runtime/MP1/COptionsScreen.cpp +++ b/Runtime/MP1/COptionsScreen.cpp @@ -95,7 +95,7 @@ void COptionsScreen::OnEnumChanged(CGuiTableGroup* caller, int oldSel) } CPauseScreenBase::UpdateSideTable(caller); - CSfxManager::SfxStart(1437, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_option_enum_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } bool COptionsScreen::InputDisabled() const @@ -113,7 +113,8 @@ void COptionsScreen::Update(float dt, CRandom16& rand, CArchitectureQueue& archQ { if (x18c_slidergroup_slider->GetState() != CGuiSliderGroup::EState::None) { - x1a4_sliderSfx = CSfxManager::SfxStart(1451, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + x1a4_sliderSfx = CSfxManager::SfxStart(SFXui_options_slider_change_lp, + 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { @@ -146,11 +147,11 @@ void COptionsScreen::Update(float dt, CRandom16& rand, CArchitectureQueue& archQ { archQueue.Push(MakeMsg::CreateQuitGameplay(EArchMsgTarget::Game)); CSfxManager::SetChannel(CSfxManager::ESfxChannels::Default); - CSfxManager::SfxStart(1422, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_options_quit_accept, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else if (action == EQuitAction::No) { - CSfxManager::SfxStart(1423, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_options_quit_reject, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x19c_quitGame.reset(); } } diff --git a/Runtime/MP1/CPauseScreen.cpp b/Runtime/MP1/CPauseScreen.cpp index 4e3173df5..615286368 100644 --- a/Runtime/MP1/CPauseScreen.cpp +++ b/Runtime/MP1/CPauseScreen.cpp @@ -25,7 +25,7 @@ CPauseScreen::CPauseScreen(ESubScreen subscreen, x58_frmePauseScreenBufSz = g_ResFactory->ResourceSize(frmeTag); x5c_frmePauseScreenBuf.reset(new u8[x58_frmePauseScreenBufSz]); x60_loadTok = g_ResFactory->LoadResourceAsync(frmeTag, x5c_frmePauseScreenBuf.get()); - CSfxManager::SfxStart(1435, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_enter, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x7c_screens.resize(2); } @@ -197,19 +197,19 @@ void CPauseScreen::ProcessControllerInput(const CStateManager& mgr, const CFinal if (input.PStart() || (input.PB() && bExits) || (x7c_screens[x78_activeIdx] && x7c_screens[x78_activeIdx]->ShouldExitPauseScreen())) { - CSfxManager::SfxStart(1434, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_exit, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); StartTransition(0.5f, mgr, ESubScreen::ToGame, 2); } else { if (ControlMapper::GetPressInput(ControlMapper::ECommands::PreviousPauseScreen, input)) { - CSfxManager::SfxStart(1433, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); StartTransition(0.5f, mgr, GetPreviousSubscreen(x8_curSubscreen), invalid ? 2 : 0); } else if (ControlMapper::GetPressInput(ControlMapper::ECommands::NextPauseScreen, input)) { - CSfxManager::SfxStart(1433, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_pause_screen_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); StartTransition(0.5f, mgr, GetNextSubscreen(x8_curSubscreen), invalid ? 2 : 1); } } diff --git a/Runtime/MP1/CPauseScreenBase.cpp b/Runtime/MP1/CPauseScreenBase.cpp index c2c6ade49..f8849bb12 100644 --- a/Runtime/MP1/CPauseScreenBase.cpp +++ b/Runtime/MP1/CPauseScreenBase.cpp @@ -199,7 +199,7 @@ void CPauseScreenBase::ChangeMode(EMode mode) x84_tablegroup_rightlog->SetIsActive(false); break; case EMode::TextScroll: - CSfxManager::SfxStart(1431, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_table_change_mode, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); break; default: break; } @@ -210,7 +210,7 @@ void CPauseScreenBase::ChangeMode(EMode mode) { case EMode::LeftTable: if (oldMode == EMode::RightTable) - CSfxManager::SfxStart(1431, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_table_change_mode, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x6c_basewidget_leftlog->SetColor(color); x70_tablegroup_leftlog->SetIsActive(true); UpdateSideTable(x70_tablegroup_leftlog); @@ -346,7 +346,7 @@ void CPauseScreenBase::SetRightTableSelection(int oldSel, int newSel) int oldRightSel = x1c_rightSel; x1c_rightSel = zeus::clamp(0, x1c_rightSel + (newSel - oldSel), int(GetRightTableCount()) - 1); if (oldRightSel != x1c_rightSel) - CSfxManager::SfxStart(1436, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_table_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); if (x1c_rightSel < x18_firstViewRightSel) x18_firstViewRightSel = x1c_rightSel; @@ -364,7 +364,7 @@ void CPauseScreenBase::OnLeftTableAdvance(CGuiTableGroup* caller) { ChangeMode(EMode::RightTable); x198_25_handledInput = true; - CSfxManager::SfxStart(1432, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_advance, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } @@ -373,7 +373,7 @@ void CPauseScreenBase::OnRightTableAdvance(CGuiTableGroup* caller) if (ShouldRightTableAdvance() && !x198_25_handledInput) { ChangeMode(EMode::TextScroll); - CSfxManager::SfxStart(1432, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_advance, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } @@ -382,7 +382,7 @@ void CPauseScreenBase::OnTableSelectionChange(CGuiTableGroup* caller, int oldSel UpdateSideTable(caller); if (x70_tablegroup_leftlog == caller) { - CSfxManager::SfxStart(1436, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_table_selection_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); UpdateRightTable(); } else diff --git a/Runtime/MP1/CPauseScreenBlur.cpp b/Runtime/MP1/CPauseScreenBlur.cpp index a25305826..9839cd00c 100644 --- a/Runtime/MP1/CPauseScreenBlur.cpp +++ b/Runtime/MP1/CPauseScreenBlur.cpp @@ -43,9 +43,9 @@ void CPauseScreenBlur::SetState(EState state) { CSfxManager::SetChannel(CSfxManager::ESfxChannels::PauseScreen); if (state == EState::HUDMessage) - CSfxManager::SfxStart(1415, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_hud_message, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else if (state == EState::MapScreen) - CSfxManager::SfxStart(1378, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_map_screen, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x18_blurAmt = FLT_EPSILON; } @@ -53,9 +53,9 @@ void CPauseScreenBlur::SetState(EState state) { CSfxManager::SetChannel(CSfxManager::ESfxChannels::Game); if (x10_prevState == EState::HUDMessage) - CSfxManager::SfxStart(1416, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_hud_message, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else if (x10_prevState == EState::MapScreen) - CSfxManager::SfxStart(1380, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_map_screen, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x18_blurAmt = -1.f; } diff --git a/Runtime/MP1/CPlayerVisor.cpp b/Runtime/MP1/CPlayerVisor.cpp index c7888c6ca..b86d77834 100644 --- a/Runtime/MP1/CPlayerVisor.cpp +++ b/Runtime/MP1/CPlayerVisor.cpp @@ -227,7 +227,7 @@ void CPlayerVisor::UpdateScanWindow(float dt, const CStateManager& mgr) if (mgr.GetPlayer().GetScanningState() == CPlayer::EPlayerScanState::Scanning) { if (!x60_scanningLoopSfx) - x60_scanningLoopSfx = CSfxManager::SfxStart(1407, x24_visorSfxVol, 0.f, + x60_scanningLoopSfx = CSfxManager::SfxStart(SFXui_scanning_lp, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); } else @@ -265,7 +265,7 @@ void CPlayerVisor::UpdateScanWindow(float dt, const CStateManager& mgr) (desiredState == EScanWindowState::Scan) ? g_tweakGui->GetScanSidesEndTime() - x3c_windowInterpTimer : 0.f; x3c_windowInterpTimer = x38_windowInterpDuration; if (desiredState == EScanWindowState::Scan) - CSfxManager::SfxStart(1411, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_scan_window, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); } break; case EScanWindowState::Scan: @@ -280,7 +280,7 @@ void CPlayerVisor::UpdateScanWindow(float dt, const CStateManager& mgr) (desiredState == EScanWindowState::Idle) ? g_tweakGui->GetScanSidesEndTime() - x3c_windowInterpTimer : 0.f; x3c_windowInterpTimer = x38_windowInterpDuration; if (mgr.GetPlayerState()->GetVisorTransitionFactor() == 1.f) - CSfxManager::SfxStart(1409, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_scan_window, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); } break; default: break; @@ -532,7 +532,7 @@ void CPlayerVisor::FinishTransitionIn() case CPlayerState::EPlayerVisor::XRay: x90_xrayBlur.SetBlur(EBlurType::Xray, 36.f, 0.f); if (!x5c_visorLoopSfx) - x5c_visorLoopSfx = CSfxManager::SfxStart(1384, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); + x5c_visorLoopSfx = CSfxManager::SfxStart(SFXui_visor_xray_lp, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); break; case CPlayerState::EPlayerVisor::Scan: { @@ -541,12 +541,12 @@ void CPlayerVisor::FinishTransitionIn() x2c_scanDimInterp); x64_scanDim.SetFilter(EFilterType::Multiply, EFilterShape::Fullscreen, 0.f, dimColor, -1); if (!x5c_visorLoopSfx) - x5c_visorLoopSfx = CSfxManager::SfxStart(1404, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); + x5c_visorLoopSfx = CSfxManager::SfxStart(SFXui_visor_scan_lp, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); break; } case CPlayerState::EPlayerVisor::Thermal: if (!x5c_visorLoopSfx) - x5c_visorLoopSfx = CSfxManager::SfxStart(1388, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); + x5c_visorLoopSfx = CSfxManager::SfxStart(SFXui_visor_thermal_lp, x24_visorSfxVol, 0.f, false, 0x7f, true, kInvalidAreaId); break; default: break; } @@ -560,14 +560,14 @@ void CPlayerVisor::BeginTransitionIn(const CStateManager&) x90_xrayBlur.SetBlur(EBlurType::Xray, 0.f, 0.f); //xc4_vpScaleX = 0.9f; //xc8_vpScaleY = 0.9f; - CSfxManager::SfxStart(1383, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); break; case CPlayerState::EPlayerVisor::Scan: - CSfxManager::SfxStart(1383, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); x64_scanDim.SetFilter(EFilterType::Multiply, EFilterShape::Fullscreen, 0.f, zeus::CColor::skWhite, -1); break; case CPlayerState::EPlayerVisor::Thermal: - CSfxManager::SfxStart(1383, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); break; default: break; } @@ -605,7 +605,7 @@ void CPlayerVisor::BeginTransitionOut() switch (x1c_curVisor) { case CPlayerState::EPlayerVisor::XRay: - CSfxManager::SfxStart(1382, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); break; case CPlayerState::EPlayerVisor::Scan: if (x60_scanningLoopSfx) @@ -613,10 +613,10 @@ void CPlayerVisor::BeginTransitionOut() CSfxManager::SfxStop(x60_scanningLoopSfx); x60_scanningLoopSfx.reset(); } - CSfxManager::SfxStart(1382, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); break; case CPlayerState::EPlayerVisor::Thermal: - CSfxManager::SfxStart(1382, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_visor, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); break; default: break; } diff --git a/Runtime/MP1/CQuitGameScreen.cpp b/Runtime/MP1/CQuitGameScreen.cpp index e9d5643e9..f78ca0e81 100644 --- a/Runtime/MP1/CQuitGameScreen.cpp +++ b/Runtime/MP1/CQuitGameScreen.cpp @@ -61,7 +61,7 @@ void CQuitGameScreen::FinishedLoading() void CQuitGameScreen::DoSelectionChange(CGuiTableGroup* caller, int oldSel) { SetColors(); - CSfxManager::SfxStart(1424, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_quit_change, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } void CQuitGameScreen::DoAdvance(CGuiTableGroup* caller) @@ -69,13 +69,13 @@ void CQuitGameScreen::DoAdvance(CGuiTableGroup* caller) if (caller->GetUserSelection() == 0) { /* Yes */ - CSfxManager::SfxStart(1432, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_advance, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x18_action = EQuitAction::Yes; } else { /* No */ - CSfxManager::SfxStart(1431, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_table_change_mode, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x18_action = EQuitAction::No; } } diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp index 733bb0c8f..172050f81 100644 --- a/Runtime/MP1/CSamusDoll.cpp +++ b/Runtime/MP1/CSamusDoll.cpp @@ -672,7 +672,7 @@ void CSamusDoll::SetRotationSfxPlaying(bool playing) { if (x268_rotateSfx) return; - x268_rotateSfx = CSfxManager::SfxStart(1375, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x268_rotateSfx = CSfxManager::SfxStart(SFXui_map_rotate, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -687,7 +687,7 @@ void CSamusDoll::SetOffsetSfxPlaying(bool playing) { if (x264_offsetSfx) return; - x264_offsetSfx = CSfxManager::SfxStart(1406, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x264_offsetSfx = CSfxManager::SfxStart(SFXui_map_pan, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -702,7 +702,7 @@ void CSamusDoll::SetZoomSfxPlaying(bool playing) { if (x26c_zoomSfx) return; - x26c_zoomSfx = CSfxManager::SfxStart(1376, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); + x26c_zoomSfx = CSfxManager::SfxStart(SFXui_map_zoom, 1.f, 0.f, false, 0x7f, true, kInvalidAreaId); } else { @@ -783,14 +783,14 @@ void CSamusDoll::BeginViewInterpolate(bool zoomIn) { if (xc4_viewInterp == 0.f) { - CSfxManager::SfxStart(1440, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_samus_doll_enter, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } else { SetOffsetSfxPlaying(false); SetZoomSfxPlaying(false); SetRotationSfxPlaying(false); - CSfxManager::SfxStart(1441, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_samus_doll_exit, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } xc4_viewInterp = zoomIn ? FLT_EPSILON : (-1.f + FLT_EPSILON); diff --git a/Runtime/MP1/CSamusHud.cpp b/Runtime/MP1/CSamusHud.cpp index 8f3697c69..6735c9d48 100644 --- a/Runtime/MP1/CSamusHud.cpp +++ b/Runtime/MP1/CSamusHud.cpp @@ -435,9 +435,9 @@ void CSamusHud::UpdateFreeLook(float dt, const CStateManager& mgr) if (x2e0_24_inFreeLook != inFreeLook) { if (inFreeLook) - CSfxManager::SfxStart(1392, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_into_freelook, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); else - CSfxManager::SfxStart(1390, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_outof_freelook, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); x2e0_24_inFreeLook = inFreeLook; } @@ -477,7 +477,7 @@ void CSamusHud::UpdateFreeLook(float dt, const CStateManager& mgr) if (x574_lookDeltaDot < deltaFrames) { if (!x564_freeLookSfx) - x564_freeLookSfx = CSfxManager::SfxStart(1394, 1.f, 0.f, true, 0x7f, true, kInvalidAreaId); + x564_freeLookSfx = CSfxManager::SfxStart(SFXui_freelook_move_lp, 1.f, 0.f, true, 0x7f, true, kInvalidAreaId); } else { @@ -663,7 +663,7 @@ void CSamusHud::UpdateEnergyLow(float dt, const CStateManager& mgr) x580_energyLowPulse = (0.5f - x57c_energyLowTimer) / 0.25f; if (!cineCam && x2e0_27_energyLow && x57c_energyLowTimer < oldTimer) - CSfxManager::SfxStart(1405, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_energy_low, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } void CSamusHud::ApplyClassicLag(const zeus::CUnitVector3f& lookDir, zeus::CQuaternion& rot, @@ -1115,8 +1115,8 @@ void CSamusHud::UpdateStaticInterference(float dt, const CStateManager& mgr) else x510_staticInterp = std::max(intf, x510_staticInterp - dt); - UpdateStaticSfx(x508_staticSfxHi, x514_staticCycleTimerHi, 1402, dt, oldStaticInterp, 0.1f); - UpdateStaticSfx(x50c_staticSfxLo, x518_staticCycleTimerLo, 1403, dt, oldStaticInterp, 0.5f); + UpdateStaticSfx(x508_staticSfxHi, x514_staticCycleTimerHi, SFXui_static_hi, dt, oldStaticInterp, 0.1f); + UpdateStaticSfx(x50c_staticSfxLo, x518_staticCycleTimerLo, SFXui_static_lo, dt, oldStaticInterp, 0.5f); if (x510_staticInterp > 0.f) { @@ -1186,7 +1186,7 @@ void CSamusHud::ShowDamage(const zeus::CVector3f& position, float dam, float pre x3f4_damageFilterAmt = x3f0_damageFilterAmtInit; if (!x3a4_damageSfx) { - x3a4_damageSfx = CSfxManager::AddEmitter(1385, player.GetTranslation(), player.GetTransform().basis[1], + x3a4_damageSfx = CSfxManager::AddEmitter(SFXui_damage_lp, player.GetTranslation(), player.GetTransform().basis[1], 0.f, false, true, 0xff, kInvalidAreaId); } if (fpCam) @@ -1364,7 +1364,7 @@ void CSamusHud::Update(float dt, const CStateManager& mgr, if (!mgr.GetCameraManager()->IsInCinematicCamera() && oldAPulse < 0.f && x584_abuttonPulse >= 0.f && x598_base_basewidget_message->GetIsVisible() && (x558_messageTextTime == 0.f || x558_messageTextTime >= 1.f)) { - CSfxManager::SfxStart(1442, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_hud_memo_a_pulse, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } float allTextAlpha; @@ -1436,7 +1436,7 @@ void CSamusHud::Update(float dt, const CStateManager& mgr, { x55c_lastSfxChars = nextSfxChars; if (!x598_base_basewidget_message->GetIsVisible() || textScale == 1.f) - CSfxManager::SfxStart(1418, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_hud_memo_type, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } if (mgr.GetEscapeSequenceTimer() > 0.f) @@ -1790,7 +1790,7 @@ void CSamusHud::SetMessage(std::u16string_view text, const CHUDMemoParms& info) x558_messageTextTime = 1.f; if (!info.IsHintMemo() || !isWidgetVisible) return; - CSfxManager::SfxStart(1449, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_hide_hint_memo, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); return; } x598_base_basewidget_message->SetColor(zeus::CColor::skWhite); @@ -1821,7 +1821,7 @@ void CSamusHud::SetMessage(std::u16string_view text, const CHUDMemoParms& info) { if (!isWidgetVisible) { - CSfxManager::SfxStart(1443, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXui_show_hint_memo, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } else diff --git a/Runtime/MP1/CSaveGameScreen.cpp b/Runtime/MP1/CSaveGameScreen.cpp index 3bf32f4cf..8c3c816c9 100644 --- a/Runtime/MP1/CSaveGameScreen.cpp +++ b/Runtime/MP1/CSaveGameScreen.cpp @@ -676,9 +676,9 @@ CSaveGameScreen::CSaveGameScreen(ESaveContext saveCtx, u64 serial) if (saveCtx == ESaveContext::InGame) { - x84_navConfirmSfx = 1432; - x88_navMoveSfx = 1436; - x8c_navBackSfx = 1431; + x84_navConfirmSfx = SFXui_advance; + x88_navMoveSfx = SFXui_table_selection_change; + x8c_navBackSfx = SFXui_table_change_mode; } x93_inGame = bool(saveCtx); diff --git a/Runtime/MP1/CSaveGameScreen.hpp b/Runtime/MP1/CSaveGameScreen.hpp index 41714eb45..774b02761 100644 --- a/Runtime/MP1/CSaveGameScreen.hpp +++ b/Runtime/MP1/CSaveGameScreen.hpp @@ -83,9 +83,9 @@ private: std::unique_ptr x6c_cardDriver; std::vector> x70_saveWorlds; CIOWin::EMessageReturn x80_iowRet = CIOWin::EMessageReturn::Normal; - u32 x84_navConfirmSfx = 1460; - u32 x88_navMoveSfx = 1461; - u32 x8c_navBackSfx = 1459; + u32 x84_navConfirmSfx = SFXui_frontend_save_confirm; + u32 x88_navMoveSfx = SFXui_frontend_save_move; + u32 x8c_navBackSfx = SFXui_frontend_save_back; bool x90_needsDriverReset = false; bool x91_uiTextDirty = false; bool x92_savingDisabled = false; diff --git a/Runtime/Weapon/CAuxWeapon.cpp b/Runtime/Weapon/CAuxWeapon.cpp index 6b76ccab3..199f2d3b1 100644 --- a/Runtime/Weapon/CAuxWeapon.cpp +++ b/Runtime/Weapon/CAuxWeapon.cpp @@ -254,7 +254,7 @@ void CAuxWeapon::CreateFlameThrower(const zeus::CTransform& xf, CStateManager& m ft->Think(dt, mgr); ft->StartFiring(xf, mgr); x24_muzzleFxGen = std::make_unique(xc_flameMuzzle); - x7c_comboSfx = NWeaponTypes::play_sfx(1842, false, true, 0.165f); + x7c_comboSfx = NWeaponTypes::play_sfx(SFXwpn_combo_flamethrower, false, true, 0.165f); mgr.GetCameraManager()->AddCameraShaker(skHardShake, false); mgr.GetPlayerState()->SetFiringComboBeam(true); x74_firingBeamId = CPlayerState::EBeamId::Plasma; @@ -285,7 +285,7 @@ void CAuxWeapon::CreateWaveBusterBeam(EProjectileAttrib attribs, TUniqueId homin kInvalidAreaId, x6c_playerId, homingTarget, attribs); mgr.AddObject(wb); x24_muzzleFxGen = std::make_unique(x18_busterMuzzle); - x7c_comboSfx = NWeaponTypes::play_sfx(1847, false, true, 0.165f); + x7c_comboSfx = NWeaponTypes::play_sfx(SFXwpn_combo_wavebuster, false, true, 0.165f); mgr.GetCameraManager()->AddCameraShaker(CCameraShakeData::skChargedShotCameraShakeData, false); mgr.GetPlayerState()->SetFiringComboBeam(true); x74_firingBeamId = CPlayerState::EBeamId::Wave; @@ -299,7 +299,7 @@ void CAuxWeapon::LaunchMissile(float dt, bool underwater, bool charged, CPlayerS { const SShotParam& info = charged ? g_tweakPlayerGun->GetComboShotInfo(int(currentBeam)) : g_tweakPlayerGun->GetMissileInfo(); - u16 sfxId = charged ? skSoundId[int(currentBeam)] : u16(1768); + u16 sfxId = charged ? skSoundId[int(currentBeam)] : u16(SFXwpn_fire_missile); CEnergyProjectile* proj = new CEnergyProjectile(true, charged ? x28_combos[int(currentBeam)] : x0_missile, charged ? EWeaponType::Power : EWeaponType::Missile, xf, EMaterialTypes::Player, CGunWeapon::GetShotDamageInfo(info, mgr), mgr.AllocateUniqueId(), kInvalidAreaId, x6c_playerId, homingId, diff --git a/Runtime/Weapon/CGrappleArm.cpp b/Runtime/Weapon/CGrappleArm.cpp index e0e8acffd..59ae1ab81 100644 --- a/Runtime/Weapon/CGrappleArm.cpp +++ b/Runtime/Weapon/CGrappleArm.cpp @@ -207,7 +207,7 @@ void CGrappleArm::GrappleBeamDisconnected() void CGrappleArm::GrappleBeamConnected() { if (!x32c_grappleLoopSfx) - x32c_grappleLoopSfx = NWeaponTypes::play_sfx(1527, false, true, -0.15f); + x32c_grappleLoopSfx = NWeaponTypes::play_sfx(SFXsam_grapple_lp, false, true, -0.15f); } void CGrappleArm::RenderGrappleBeam(const CStateManager& mgr, const zeus::CVector3f& pos) @@ -282,7 +282,7 @@ void CGrappleArm::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, x348_zAmplitude = g_GrappleBeamZWaveAmplitude; x398_grappleHitGen->SetParticleEmission(false); x394_grappleClawGen->SetParticleEmission(true); - NWeaponTypes::play_sfx(1526, false, false, -0.15f); + NWeaponTypes::play_sfx(SFXsam_grapple_fire, false, false, -0.15f); mgr.GetRumbleManager().Rumble(mgr, ERumbleFxId::PlayerGrappleFire, 1.f, ERumblePriority::Three); break; default: @@ -434,7 +434,7 @@ void CGrappleArm::UpdateSwingAction(float grappleSwingT, float dt, CStateManager { if (!CSfxManager::IsPlaying(x330_swooshSfx)) { - x330_swooshSfx = NWeaponTypes::play_sfx(1528, false, false, -0.15f); + x330_swooshSfx = NWeaponTypes::play_sfx(SFXsam_grapple_swoosh, false, false, -0.15f); if (x3b0_rumbleHandle != -1) mgr.GetRumbleManager().StopRumble(x3b0_rumbleHandle); x3b0_rumbleHandle = mgr.GetRumbleManager().Rumble(mgr, ERumbleFxId::PlayerGrappleSwoosh, 1.f, ERumblePriority::Three); diff --git a/Runtime/Weapon/CIceBeam.cpp b/Runtime/Weapon/CIceBeam.cpp index c292cddc5..2a590777b 100644 --- a/Runtime/Weapon/CIceBeam.cpp +++ b/Runtime/Weapon/CIceBeam.cpp @@ -70,7 +70,7 @@ void CIceBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, c CGunWeapon::UpdateGunFx(shotSmoke, dt, mgr, xf); } -static const u16 kSoundId[] = { 1797, 1776 }; +static const u16 kSoundId[] = { SFXwpn_fire_ice_normal, SFXwpn_fire_ice_charged }; void CIceBeam::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) diff --git a/Runtime/Weapon/CPhazonBeam.cpp b/Runtime/Weapon/CPhazonBeam.cpp index 56b90390e..a087df4f7 100644 --- a/Runtime/Weapon/CPhazonBeam.cpp +++ b/Runtime/Weapon/CPhazonBeam.cpp @@ -88,7 +88,7 @@ void CPhazonBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr CGunWeapon::UpdateGunFx(shotSmoke, dt, mgr, xf); } -static const u16 kSoundId[] = { 1805, 1767 }; +static const u16 kSoundId[] = { SFXwpn_fire_phazon_normal, SFXwpn_fire_power_charged }; void CPhazonBeam::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) diff --git a/Runtime/Weapon/CPlasmaBeam.cpp b/Runtime/Weapon/CPlasmaBeam.cpp index 9990ab6df..f6cf4d56c 100644 --- a/Runtime/Weapon/CPlasmaBeam.cpp +++ b/Runtime/Weapon/CPlasmaBeam.cpp @@ -69,7 +69,7 @@ void CPlasmaBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr } static const CCameraShakeData CameraShaker = { 0.125f, 0.25f }; -static const u16 kSoundId[] = { 1803, 1840 }; +static const u16 kSoundId[] = { SFXwpn_fire_plasma_normal, SFXwpn_fire_plasma_charged }; void CPlasmaBeam::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) diff --git a/Runtime/Weapon/CPlayerGun.cpp b/Runtime/Weapon/CPlayerGun.cpp index 10b871ad6..a297fb12b 100644 --- a/Runtime/Weapon/CPlayerGun.cpp +++ b/Runtime/Weapon/CPlayerGun.cpp @@ -528,7 +528,7 @@ void CPlayerGun::HandleBeamChange(const CFinalInput& input, CStateManager& mgr) if (ExitMissile()) { if (!CSfxManager::IsPlaying(x2e4_invalidSfx)) - x2e4_invalidSfx = NWeaponTypes::play_sfx(1763, x834_27_underwater, false, 0.165f); + x2e4_invalidSfx = NWeaponTypes::play_sfx(SFXwpn_empty_action, x834_27_underwater, false, 0.165f); } else { @@ -580,15 +580,18 @@ void CPlayerGun::ResetBeamParams(CStateManager& mgr, const CPlayerState& playerS x6e0_rightHandModel.AnimationData()->SetAnimation(parms, false); Reset(mgr, false); if (playSelectionSfx) - CSfxManager::SfxStart(1774, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXwpn_morph_out_wipe, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); x2ec_lastFireButtonStates &= ~0x1; x320_currentAuxBeam = x310_currentBeam; x833_30_canShowAuxMuzzleEffect = true; } -static const u16 skFromMissileSound[] = { 1824, 1849, 1851, 1853 }; -static const u16 skFromBeamSound[] = { 0, 1822, 1828, 1826 }; -static const u16 skToMissileSound[] = { 1823, 1829, 1850, 1852 }; +static const u16 skFromMissileSound[] = { SFXwpn_from_missile_power, SFXwpn_from_missile_ice, + SFXwpn_from_missile_wave, SFXwpn_from_missile_plasma }; +static const u16 skFromBeamSound[] = { SFXsfx0000, SFXwpn_from_beam_ice, + SFXwpn_from_beam_wave, SFXwpn_from_beam_plasma }; +static const u16 skToMissileSound[] = { SFXwpn_to_missile_power, SFXwpn_to_missile_ice, + SFXwpn_to_missile_wave, SFXwpn_to_missile_plasma }; void CPlayerGun::PlayAnim(NWeaponTypes::EGunAnimType type, bool loop) { @@ -603,7 +606,7 @@ void CPlayerGun::PlayAnim(NWeaponTypes::EGunAnimType type, bool loop) sfx = skFromMissileSound[int(x310_currentBeam)]; break; case NWeaponTypes::EGunAnimType::MissileReload: - sfx = 1769; + sfx = SFXwpn_reload_missile; break; case NWeaponTypes::EGunAnimType::FromBeam: sfx = skFromBeamSound[int(x310_currentBeam)]; @@ -1060,7 +1063,8 @@ void CPlayerGun::CGunMorph::StartWipe(EDir dir) x24_24_morphing = true; } -static const u16 skIntoBeamSound[] = { 0, 1821, 1827, 1825 }; +static const u16 skIntoBeamSound[] = { SFXsfx0000, SFXwpn_into_beam_ice, + SFXwpn_into_beam_wave, SFXwpn_into_beam_plasma }; void CPlayerGun::ProcessGunMorph(float dt, CStateManager& mgr) { @@ -1098,7 +1102,7 @@ void CPlayerGun::ProcessGunMorph(float dt, CStateManager& mgr) switch (x678_morph.Update(0.2f, 1.292392f, dt)) { case CGunMorph::EMorphEvent::InWipeDone: - CSfxManager::SfxStart(1775, 1.f, 0.f, true, 0x74, false, kInvalidAreaId); + CSfxManager::SfxStart(SFXwpn_morph_in_wipe_done, 1.f, 0.f, true, 0x74, false, kInvalidAreaId); break; case CGunMorph::EMorphEvent::OutWipeDone: if (x730_outgoingBeam != nullptr && x72c_currentBeam != x730_outgoingBeam) @@ -1138,7 +1142,7 @@ void CPlayerGun::SetPhazonBeamFeedback(bool active) CSfxManager::SfxStop(x2e8_phazonBeamSfx); x2e8_phazonBeamSfx.reset(); if (active) - x2e8_phazonBeamSfx = NWeaponTypes::play_sfx(3141, x834_27_underwater, false, 0.165f); + x2e8_phazonBeamSfx = NWeaponTypes::play_sfx(SFXphg_charge_lp, x834_27_underwater, false, 0.165f); } void CPlayerGun::StartPhazonBeamTransition(bool active, CStateManager& mgr, CPlayerState& playerState) @@ -1249,7 +1253,8 @@ static constexpr float kChargeFxStart = 1.f / CPlayerState::GetMissileComboCharg static constexpr float kChargeAnimStart = 0.25f / CPlayerState::GetMissileComboChargeFactor(); static constexpr float kChargeStart = 0.025f / CPlayerState::GetMissileComboChargeFactor(); -static const u16 skBeamChargeUpSound[] = { 1766, 1759, 1844, 1839 }; +static const u16 skBeamChargeUpSound[] = { SFXwpn_chargeup_power, SFXwpn_chargeup_ice, + SFXwpn_chargeup_wave, SFXwpn_chargeup_plasma }; void CPlayerGun::UpdateChargeState(float dt, CStateManager& mgr) { @@ -1480,7 +1485,7 @@ static const CPlayerState::EItemType skItemArr[] = CPlayerState::EItemType::Missiles }; -static const u16 skItemEmptySound[] = { 0, 1763 }; +static const u16 skItemEmptySound[] = { SFXsfx0000, SFXwpn_empty_action }; void CPlayerGun::FireSecondary(float dt, CStateManager& mgr) { @@ -1490,7 +1495,7 @@ void CPlayerGun::FireSecondary(float dt, CStateManager& mgr) if (x835_25_inPhazonBeam || x318_comboAmmoIdx == 0 || !mgr.GetPlayerState()->HasPowerUp(skItemArr[x318_comboAmmoIdx]) || (x2f8_stateFlags & 0x4) != 0x4) { - NWeaponTypes::play_sfx(1781, x834_27_underwater, false, 0.165f); + NWeaponTypes::play_sfx(SFXwpn_invalid_action, x834_27_underwater, false, 0.165f); return; } @@ -1585,13 +1590,13 @@ void CPlayerGun::ActivateCombo(CStateManager& mgr) } x72c_currentBeam->EnableCharge(true); StopChargeSound(mgr); - NWeaponTypes::play_sfx(1762, x834_27_underwater, false, 0.165f); + NWeaponTypes::play_sfx(SFXwpn_combo_xfer, x834_27_underwater, false, 0.165f); x32c_chargePhase = EChargePhase::ComboXfer; } } else { - NWeaponTypes::play_sfx(1781, x834_27_underwater, false, 0.165f); + NWeaponTypes::play_sfx(SFXwpn_invalid_action, x834_27_underwater, false, 0.165f); } } @@ -1767,7 +1772,7 @@ void CPlayerGun::UpdateWeaponFire(float dt, const CPlayerState& playerState, CSt else { if (!CSfxManager::IsPlaying(x2e4_invalidSfx)) - x2e4_invalidSfx = NWeaponTypes::play_sfx(1781, x834_27_underwater, false, 0.165f); + x2e4_invalidSfx = NWeaponTypes::play_sfx(SFXwpn_invalid_action, x834_27_underwater, false, 0.165f); else x2e4_invalidSfx.reset(); } diff --git a/Runtime/Weapon/CPowerBeam.cpp b/Runtime/Weapon/CPowerBeam.cpp index e77995104..ead6de88c 100644 --- a/Runtime/Weapon/CPowerBeam.cpp +++ b/Runtime/Weapon/CPowerBeam.cpp @@ -81,7 +81,7 @@ void CPowerBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, CGunWeapon::UpdateGunFx(shotSmoke, dt, mgr, xf); } -static const u16 skSoundId[] = { 1770, 1767 }; +static const u16 skSoundId[] = { SFXwpn_fire_power_normal, SFXwpn_fire_power_charged }; void CPowerBeam::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) diff --git a/Runtime/Weapon/CWaveBeam.cpp b/Runtime/Weapon/CWaveBeam.cpp index 84158c449..92ae5e67d 100644 --- a/Runtime/Weapon/CWaveBeam.cpp +++ b/Runtime/Weapon/CWaveBeam.cpp @@ -62,7 +62,7 @@ void CWaveBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, } static const float skShotAnglePitch = 120.f; -static const u16 kSoundId[] = { 1801, 1845 }; +static const u16 kSoundId[] = { SFXwpn_fire_wave_normal, SFXwpn_fire_wave_charged }; void CWaveBeam::Fire(bool underwater, float dt, EChargeState chargeState, const zeus::CTransform& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) diff --git a/Runtime/Weapon/WeaponCommon.hpp b/Runtime/Weapon/WeaponCommon.hpp index 0069086c6..6bef273f5 100644 --- a/Runtime/Weapon/WeaponCommon.hpp +++ b/Runtime/Weapon/WeaponCommon.hpp @@ -29,7 +29,7 @@ enum class EWeaponType AI = 9, PoisonWater = 10, Lava = 11, - Hot = 12, + Heat = 12, Unused1 = 13, OrangePhazon = 14 }; diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp index 62310d385..9f9ac9fc1 100644 --- a/Runtime/World/CMorphBall.cpp +++ b/Runtime/World/CMorphBall.cpp @@ -270,20 +270,58 @@ void CMorphBall::RenderToShadowTex(CStateManager& mgr) static const u16 skBallRollSfx[] = { - 0xFFFF, 0x05DE, 0x05DD, 0x062F, 0x0786, - 0xFFFF, 0x05DC, 0x060B, 0x05C8, 0x088A, - 0x0698, 0x0787, 0x0630, 0xFFFF, 0x0628, - 0x05DD, 0x05DD, 0x05C8, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0x05FE, 0x0628 + 0xFFFF, + SFXsam_ballroll_stone, + SFXsam_ballroll_metal, + SFXsam_ballroll_grass, + SFXice_ballroll_ice, + 0xFFFF, + SFXsam_ballroll_grate, + SFXsam_ballroll_phazon, + SFXsam_ballroll_dirt, + SFXlav_ballroll_lava, + SFXsam_ballroll_lavastone, + SFXice_ballroll_snow, + SFXsam_ballroll_mud, + 0xFFFF, + SFXsam_ballroll_org, + SFXsam_ballroll_metal, + SFXsam_ballroll_metal, + SFXsam_ballroll_dirt, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_ballroll_wood, + SFXsam_ballroll_org }; static const u16 skBallLandSfx[] = { - 0xFFFF, 0x05C3, 0x05E0, 0x062C, 0x065B, - 0xFFFF, 0x05DA, 0x0609, 0x05C0, 0x0697, - 0x0697, 0x065C, 0x062D, 0xFFFF, 0x0627, - 0x05E0, 0x05E0, 0x05C0, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0x05FD, 0x0627 + 0xFFFF, + SFXsam_ballland_stone, + SFXsam_ballland_metal, + SFXsam_ballland_grass, + SFXsam_ballland_ice, + 0xFFFF, + SFXsam_ballland_grate, + SFXsam_ballland_phazon, + SFXsam_landdirt_00, + SFXsam_ballland_lava, + SFXsam_ballland_lava, + SFXsam_ballland_snow, + SFXsam_ballland_mud, + 0xFFFF, + SFXsam_ballland_org, + SFXsam_ballland_metal, + SFXsam_ballland_metal, + SFXsam_landdirt_00, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_ballland_wood, + SFXsam_ballland_org }; void CMorphBall::SelectMorphBallSounds(const CMaterialList& mat) @@ -362,7 +400,7 @@ void CMorphBall::UpdateMorphBallSounds(float dt) if (!x1e30_spiderSfxHandle) { x1e30_spiderSfxHandle = - CSfxManager::AddEmitter(1523, x0_player.GetTranslation(), zeus::CVector3f::skZero, + CSfxManager::AddEmitter(SFXsam_spider_lp, x0_player.GetTranslation(), zeus::CVector3f::skZero, true, true, 0xc8, kInvalidAreaId); x0_player.ApplySubmergedPitchBend(x1e30_spiderSfxHandle); } @@ -1359,7 +1397,8 @@ void CMorphBall::ComputeBoostBallMovement(const CFinalInput& input, CStateManage CAnimPlaybackParms parms(1, -1, 1.f, true); x58_ballModel->AnimationData()->SetAnimation(parms, false); x1e20_ballAnimIdx = 1; - x1e24_boostSfxHandle = CSfxManager::SfxStart(1477, 1.f, 0.f, true, 0x7f, true, kInvalidAreaId); + x1e24_boostSfxHandle = CSfxManager::SfxStart(SFXsam_ball_charge_lp, + 1.f, 0.f, true, 0x7f, true, kInvalidAreaId); } x1de8_boostChargeTime += dt; if (x1de8_boostChargeTime > g_tweakBall->GetBoostBallMaxChargeTime()) @@ -1375,7 +1414,7 @@ void CMorphBall::ComputeBoostBallMovement(const CFinalInput& input, CStateManage CSfxManager::RemoveEmitter(x1e24_boostSfxHandle); if (x1de8_boostChargeTime >= g_tweakBall->GetBoostBallMinChargeTime()) { - CSfxManager::AddEmitter(1476, x0_player.GetTranslation(), zeus::CVector3f::skZero, + CSfxManager::AddEmitter(SFXsam_ball_boost, x0_player.GetTranslation(), zeus::CVector3f::skZero, true, false, 0xb4, kInvalidAreaId); } } @@ -2092,7 +2131,7 @@ void CMorphBall::CollidedWith(TUniqueId id, const CCollisionInfoList& list, CSta if (hitWall && !CSfxManager::IsPlaying(x1e28_wallHitSfxHandle)) { - x1e28_wallHitSfxHandle = CSfxManager::AddEmitter(1525, x0_player.GetTranslation(), + x1e28_wallHitSfxHandle = CSfxManager::AddEmitter(SFXsam_ball_wallhit, x0_player.GetTranslation(), zeus::CVector3f::skZero, true, false, 0x7f, kInvalidAreaId); x0_player.ApplySubmergedPitchBend(x1e28_wallHitSfxHandle); diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp index e0fbefd16..5944e6748 100644 --- a/Runtime/World/CPlayer.cpp +++ b/Runtime/World/CPlayer.cpp @@ -570,7 +570,7 @@ void CPlayer::Update(float dt, CStateManager& mgr) CStreamAudioManager::StopAll(); if (x2f8_morphBallState == EPlayerMorphBallState::Unmorphed) { - CSfxHandle hnd = CSfxManager::SfxStart(1516, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_death, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } } @@ -583,7 +583,7 @@ void CPlayer::Update(float dt, CStateManager& mgr) xa00_deathPowerBomb = x490_gun->DropPowerBomb(mgr); if (x9f4_deathTime >= 4.f && prevDeathTime < 4.f) { - CSfxHandle hnd = CSfxManager::SfxStart(1516, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_death, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } } @@ -641,7 +641,7 @@ void CPlayer::Update(float dt, CStateManager& mgr) if (!mgr.GetCameraManager()->IsInCinematicCamera() && xa30_samusExhaustedVoiceTimer <= 0.f) { - StartSamusVoiceSfx(1591, 1.f, 7); + StartSamusVoiceSfx(SFXsam_vox_exhausted, 1.f, 7); xa30_samusExhaustedVoiceTimer = 4.f; } } @@ -982,37 +982,37 @@ void CPlayer::TakeDamage(bool significant, const zeus::CVector3f& location, { case EWeaponType::Phazon: case EWeaponType::OrangePhazon: - damageLoopSfx = 3114; - damageSamusVoiceSfx = 1653; + damageLoopSfx = SFXphz_damage_lp; + damageSamusVoiceSfx = SFXsam_vox_damage_phazon; break; case EWeaponType::PoisonWater: - damageLoopSfx = 1486; - damageSamusVoiceSfx = 1633; + damageLoopSfx = SFXsam_damage_poison_lp; + damageSamusVoiceSfx = SFXsam_vox_damage_poison; break; case EWeaponType::Lava: - damageLoopSfx = 657; - case EWeaponType::Hot: - damageSamusVoiceSfx = 1656; + damageLoopSfx = SFXpds_lava_damage_lp; + case EWeaponType::Heat: + damageSamusVoiceSfx = SFXsam_vox_damage_heat; break; default: if (x2f8_morphBallState == EPlayerMorphBallState::Unmorphed) { if (dam > 30.f) - damageSamusVoiceSfx = 1512; + damageSamusVoiceSfx = SFXsam_vox_damage30; else if (dam > 15.f) - damageSamusVoiceSfx = 1511; + damageSamusVoiceSfx = SFXsam_vox_damage15; else - damageSamusVoiceSfx = 1489; - suitDamageSfx = 1467; + damageSamusVoiceSfx = SFXsam_vox_damage; + suitDamageSfx = SFXsam_suit_damage; } else { if (dam > 30.f) - suitDamageSfx = 1514; + suitDamageSfx = SFXsam_ball_damage30; else if (dam > 15.f) - suitDamageSfx = 1513; + suitDamageSfx = SFXsam_ball_damage15; else - suitDamageSfx = 1491; + suitDamageSfx = SFXsam_ball_damage; } break; } @@ -2140,7 +2140,7 @@ void CPlayer::UnFreeze(CStateManager& stateMgr) CHUDBillboardEffect::GetScaleForPOV(stateMgr), zeus::CColor::skWhite, zeus::CVector3f::skOne, zeus::CVector3f::skZero); stateMgr.AddObject(effect); - CSfxHandle hnd = CSfxManager::SfxStart(3129, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXcrk_break_final, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } x768_morphball->Stop(); @@ -2215,13 +2215,13 @@ void CPlayer::UpdateFrozenState(const CFinalInput& input, CStateManager& mgr) if (x754_iceBreakJumps != 0) { /* Subsequent Breaks */ - CSfxHandle hnd = CSfxManager::SfxStart(3127, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXcrk_break_subsequent, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } else { /* Initial Break */ - CSfxHandle hnd = CSfxManager::SfxStart(3128, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXcrk_break_initial, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } x754_iceBreakJumps += 1; @@ -2764,16 +2764,58 @@ void CPlayer::PreThink(float dt, CStateManager& mgr) static const u16 skPlayerLandSfxSoft[] = { - 0xFFFF, 0x05E4, 0x05D2, 0x0621, 0x0658, 0xFFFF, 0x05E3, 0x0606, - 0x05C0, 0x088E, 0x0694, 0x0638, 0x062B, 0xFFFF, 0x0621, 0x05D2, - 0x05D2, 0x05C0, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x05FB, 0x0625 + 0xFFFF, + SFXsam_landstone_00, + SFXsam_landmetl_00, + SFXsam_landgrass_00, + SFXsam_landice_00, + 0xFFFF, + SFXsam_landgrate_00, + SFXsam_landphazon_00, + SFXsam_landdirt_00, + SFXlav_landlava_00, + SFXsam_landlavastone_00, + SFXsam_landsnow_00, + SFXsam_landmud_00, + 0xFFFF, + SFXsam_landgrass_00, + SFXsam_landmetl_00, + SFXsam_landmetl_00, + SFXsam_landdirt_00, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_landwood_00, + SFXsam_b_landorg_00 }; static const u16 skPlayerLandSfxHard[] = { - 0xFFFF, 0x0651, 0x064B, 0x0647, 0x065A, 0xFFFF, 0x0648, 0x064E, - 0x064F, 0x08D7, 0x0696, 0x0650, 0x064C, 0xFFFF, 0x0647, 0x064B, - 0x064B, 0x064F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0652, 0x064D + 0xFFFF, + SFXsam_landstone_02, + SFXsam_b_landmetl_02, + SFXsam_landgrass_02, + SFXsam_landice_02, + 0xFFFF, + SFXsam_landgrate_02, + SFXsam_landphazon_02, + SFXsam_landdirt_02, + SFXlav_landlava_02, + SFXsam_landlavastone_02, + SFXsam_landsnow_02, + SFXsam_landmud_02, + 0xFFFF, + SFXsam_landgrass_02, + SFXsam_b_landmetl_02, + SFXsam_b_landmetl_02, + SFXsam_landdirt_02, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_landwood_02, + SFXsam_landorg_02 }; void CPlayer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) @@ -2798,7 +2840,7 @@ void CPlayer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CState else { landSfx = GetMaterialSoundUnderPlayer(mgr, skPlayerLandSfxHard, 24, 0xffff); - StartSamusVoiceSfx(1550, 1.f, 5); + StartSamusVoiceSfx(SFXsam_voxland_02, 1.f, 5); x55c_damageAmt = 0.f; x560_prevDamageAmt = 10.f; x564_damageLocation = x34_transform.origin; @@ -2959,20 +3001,58 @@ void CPlayer::SetVisorSteam(float targetAlpha, float alphaInDur, float alphaOutD static const u16 skLeftStepSounds[] = { - 0xFFFF, 0x05B9, 0x05D7, 0x0622, 0x0653, - 0xFFFF, 0x05D5, 0x0611, 0x05D9, 0x0887, - 0x0699, 0x063A, 0x0631, 0xFFFF, 0x0629, - 0x05D7, 0x05D7, 0x05D9, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0x05F9, 0x0629 + 0xFFFF, + SFXsam_wlkstone_00, + SFXsam_wlkmetal_00, + SFXsam_b_wlkgrass_00, + SFXsam_wlkice_00, + 0xFFFF, + SFXsam_wlkgrate_00, + SFXsam_wlkphazon_00, + SFXsam_wlkdirt_00, + SFXlav_wlklava_00, + SFXsam_wlklavastone_00, + SFXsam_wlksnow_00, + SFXsam_wlkmud_00, + 0xFFFF, + SFXsam_b_wlkorg_00, + SFXsam_wlkmetal_00, + SFXsam_wlkmetal_00, + SFXsam_wlkdirt_00, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_wlkwood_00, + SFXsam_b_wlkorg_00 }; static const u16 skRightStepSounds[] = { - 0xFFFF, 0x05BA, 0x05D8, 0x0623, 0x0654, - 0xFFFF, 0x05D6, 0x0612, 0x05DB, 0x0888, - 0x069A, 0x063B, 0x0632, 0xFFFF, 0x062A, - 0x05D8, 0x05D8, 0x05DB, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0x05FA, 0x062A + 0xFFFF, + SFXsam_wlkstone_01, + SFXsam_wlkmetal_01, + SFXsam_b_wlkgrass_01, + SFXsam_wlkice_01, + 0xFFFF, + SFXsam_wlkgrate_01, + SFXsam_wlkphazon_01, + SFXsam_wlkdirt_01, + SFXlav_wlklava_01, + SFXsam_wlklavastone_01, + SFXsam_wlksnow_01, + SFXsam_wlkmud_01, + 0xFFFF, + SFXsam_b_wlkorg_01, + SFXsam_wlkmetal_01, + SFXsam_wlkmetal_01, + SFXsam_wlkdirt_01, + 0xFFFF, + 0xFFFF, + 0xFFFF, + 0xFFFF, + SFXsam_wlkwood_01, + SFXsam_b_wlkorg_01 }; void CPlayer::UpdateFootstepSounds(const CFinalInput& input, CStateManager& mgr, float dt) @@ -3033,12 +3113,12 @@ void CPlayer::UpdateFootstepSounds(const CFinalInput& input, CStateManager& mgr, { if (x790_footstepSfxSel == EFootstepSfx::Left) { - CSfxHandle hnd = CSfxManager::SfxStart(2183, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXlav_wlklava_00, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } else { - CSfxHandle hnd = CSfxManager::SfxStart(2184, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXlav_wlklava_01, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } } @@ -3046,12 +3126,12 @@ void CPlayer::UpdateFootstepSounds(const CFinalInput& input, CStateManager& mgr, { if (x790_footstepSfxSel == EFootstepSfx::Left) { - CSfxHandle hnd = CSfxManager::SfxStart(1484, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_wlkwater_00, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } else { - CSfxHandle hnd = CSfxManager::SfxStart(1485, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_wlkwater_01, sfxVol, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } } @@ -3337,7 +3417,7 @@ void CPlayer::UpdateMorphBallState(float dt, const CFinalInput& input, CStateMan } else { - CSfxHandle hnd = CSfxManager::SfxStart(1781, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXwpn_invalid_action, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } break; @@ -3353,7 +3433,7 @@ void CPlayer::UpdateMorphBallState(float dt, const CFinalInput& input, CStateMan } else { - CSfxHandle hnd = CSfxManager::SfxStart(1781, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXwpn_invalid_action, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } break; @@ -5528,7 +5608,7 @@ void CPlayer::BombJump(const zeus::CVector3f& pos, CStateManager& mgr) x9d4_bombJumpCheckDelayFrames = 2; } } - CSfxHandle hnd = CSfxManager::AddEmitter(1468, GetTranslation(), zeus::CVector3f::skZero, + CSfxHandle hnd = CSfxManager::AddEmitter(SFXsam_ball_jump, GetTranslation(), zeus::CVector3f::skZero, false, false, 0x7f, kInvalidAreaId); ApplySubmergedPitchBend(hnd); } @@ -5603,7 +5683,7 @@ void CPlayer::SetMoveState(EPlayerMovementState newState, CStateManager& mgr) case EPlayerMovementState::Jump: if (x258_movementState == EPlayerMovementState::StartingJump) { - CSfxHandle hnd = CSfxManager::SfxStart(1470, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_b_jump_00, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); mgr.GetRumbleManager().Rumble(mgr, ERumbleFxId::PlayerBump, 0.2015f, ERumblePriority::One); x288_startingJumpTimeout = g_tweakPlayer->GetAllowedDoubleJumpTime(); @@ -5612,7 +5692,7 @@ void CPlayer::SetMoveState(EPlayerMovementState newState, CStateManager& mgr) } else if (x258_movementState != EPlayerMovementState::Jump) { - CSfxHandle hnd = CSfxManager::SfxStart(1471, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + CSfxHandle hnd = CSfxManager::SfxStart(SFXsam_firstjump, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(hnd); x2a0_ = 0.01f; x288_startingJumpTimeout = g_tweakPlayer->GetAllowedJumpTime(); @@ -5950,7 +6030,7 @@ void CPlayer::ComputeDash(const CFinalInput& input, float dt, CStateManager& mgr if (!x9c5_28_slidingOnWall) { SetVelocityWR(vel); - x778_dashSfx = CSfxManager::SfxStart(1560, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); + x778_dashSfx = CSfxManager::SfxStart(SFXsam_dash, 1.f, 0.f, true, 0x7f, false, kInvalidAreaId); ApplySubmergedPitchBend(x778_dashSfx); mgr.GetRumbleManager().Rumble(mgr, ERumbleFxId::PlayerBump, 0.24375f, ERumblePriority::One); } diff --git a/Runtime/World/CWorldTransManager.cpp b/Runtime/World/CWorldTransManager.cpp index e4d248824..9cff88e3c 100644 --- a/Runtime/World/CWorldTransManager.cpp +++ b/Runtime/World/CWorldTransManager.cpp @@ -155,7 +155,7 @@ void CWorldTransManager::UpdateText(float dt) if (printed >= nextSfxInterval) { x3c_sfxInterval = nextSfxInterval; - //CSfxManager::SfxStart(1438, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); + //CSfxManager::SfxStart(SFXsfx059E, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); } } diff --git a/amuse b/amuse index 1884e0ca7..1312a5fa8 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 1884e0ca7afa8e4eb37db9ff99e14cc19e875405 +Subproject commit 1312a5fa86916f632bee793e6afe410b8ee956ab diff --git a/hecl b/hecl index e6fd690fc..3f36c1395 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit e6fd690fc181174d8d0b0341e3e45521fd19f80c +Subproject commit 3f36c1395f0f2b2514f7973d8b52de36f004c0c0