This commit is contained in:
robojumper
2025-06-07 19:21:10 +02:00
parent b38fd62a1e
commit 031102f74f
2 changed files with 28 additions and 8 deletions
+20
View File
@@ -5,8 +5,11 @@
// TODO: Expand when we figure out what the other entries have in common
enum SoundSourceType_e {
// 0-1: Player (0)
SND_SOURCE_PLAYER = 0,
SND_SOURCE_PLAYER_HEAD = 1,
// 2-9: Equipment (1)
SND_SOURCE_NET = 2,
SND_SOURCE_BLADE = 3,
SND_SOURCE_SHIELD = 4,
@@ -16,20 +19,37 @@ enum SoundSourceType_e {
SND_SOURCE_BOMB = 8,
SND_SOURCE_HOOKSHOT = 9,
// 10-31: Enemy? (2)
SND_SOURCE_BIGBOSS = 20,
SND_SOURCE_GIRAHUMU_3 = 24,
SND_SOURCE_BULLET = 29,
// 32-42: Object? (3)
SND_SOURCE_OBJECT = 32,
SND_SOURCE_BAMBOO = 34,
SND_SOURCE_ITEM = 35,
SND_SOURCE_TERRY_SHOP = 36,
SND_SOURCE_TIME_STONE = 37,
SND_SOURCE_CLEF = 38,
SND_SOURCE_SHUTTER = 39,
// 43-52: Npc (4)
SND_SOURCE_KENSEI = 44,
SND_SOURCE_PLAYER_BIRD = 45,
SND_SOURCE_INSECT = 49,
SND_SOURCE_NPC_NRM = 51,
SND_SOURCE_NPC_DRAGON = 52,
// 53: TagSound (5)
SND_SOURCE_TG_SOUND = 53,
// 54-57: Harp Related (6)
SND_SOURCE_OBJECT_WARP = 55,
SND_SOURCE_SW_HARP = 56,
// 58: ? (7)
// 59: ? (9)
};
/**
+8 -8
View File
@@ -95,19 +95,19 @@ static const ActorInfo sInfos[] = {
{"BBParts", fProfile::OBJ_BB_BROKEN_PARTS, fProfile::OBJ_BB_BROKEN_PARTS, 0xFFFF, 0xFF, 0},
{"BBQuake", fProfile::T_QUAKE, fProfile::T_QUAKE, 0xFFFF, SND_SOURCE_OBJECT, 0},
{ "BBbrg", fProfile::OBJ_BB_BRIDGE, fProfile::OBJ_BB_BRIDGE, 0xFFFF, 0xFF, 0},
{"BBigBo2", fProfile::B_BIGBOSS2, fProfile::B_BIGBOSS2, 53, 20, 0},
{"BBigBo3", fProfile::B_BIGBOSS3, fProfile::B_BIGBOSS3, 54, 20, 0},
{"BBigBo2", fProfile::B_BIGBOSS2, fProfile::B_BIGBOSS2, 53, SND_SOURCE_BIGBOSS, 0},
{"BBigBo3", fProfile::B_BIGBOSS3, fProfile::B_BIGBOSS3, 54, SND_SOURCE_BIGBOSS, 0},
{"BBigBoB", fProfile::B_BIGBOSS_BASE, fProfile::B_BIGBOSS_BASE, 0xFFFF, 0xFF, 0},
{"BBigBos", fProfile::B_BIGBOSS, fProfile::B_BIGBOSS, 52, 20, 0},
{"BBigBos", fProfile::B_BIGBOSS, fProfile::B_BIGBOSS, 52, SND_SOURCE_BIGBOSS, 0},
{"BBigShc", fProfile::B_BBSHWV, fProfile::B_BBSHWV, 0xFFFF, SND_SOURCE_OBJECT, 0},
{ "BBombf", fProfile::OBJ_BIGBOMB_FLOWER, fProfile::OBJ_BIGBOMB_FLOWER, 0xFFFF, SND_SOURCE_OBJECT, 0},
{"BDrD101", fProfile::OBJ_DOOR_BOSSD101, fProfile::OBJ_DOOR_BOSSD101, 0xFFFF, SND_SOURCE_OBJECT, 0},
{ "BGh", fProfile::B_GIRAHIMU, fProfile::B_GIRAHIMU, 49, 19, 0},
{ "BGh2", fProfile::B_GIRAHIMU2, fProfile::B_GIRAHIMU2, 50, 19, 0},
{ "BGh3B", fProfile::B_GIRAHIMU3_BASE, fProfile::B_GIRAHIMU3_BASE, 0xFFFF, 0xFF, 0},
{"BGh3Fst", fProfile::B_GIRAHIMU3_FIRST, fProfile::B_GIRAHIMU3_FIRST, 51, 24, 0},
{"BGh3Snd", fProfile::B_GIRAHIMU3_SECOND, fProfile::B_GIRAHIMU3_SECOND, 89, 24, 0},
{"BGh3Trd", fProfile::B_GIRAHIMU3_THIRD, fProfile::B_GIRAHIMU3_THIRD, 90, 24, 0},
{"BGh3Fst", fProfile::B_GIRAHIMU3_FIRST, fProfile::B_GIRAHIMU3_FIRST, 51, SND_SOURCE_GIRAHUMU_3, 0},
{"BGh3Snd", fProfile::B_GIRAHIMU3_SECOND, fProfile::B_GIRAHIMU3_SECOND, 89, SND_SOURCE_GIRAHUMU_3, 0},
{"BGh3Trd", fProfile::B_GIRAHIMU3_THIRD, fProfile::B_GIRAHIMU3_THIRD, 90, SND_SOURCE_GIRAHUMU_3, 0},
{ "BGhB", fProfile::B_GIRAHIMU_BASE, fProfile::B_GIRAHIMU_BASE, 0xFFFF, 0xFF, 0},
{ "BKr", fProfile::B_KR, fProfile::B_KR, 77, 22, 0},
{ "BKrA", fProfile::B_KRA, fProfile::B_KRA, 77, 15, 0},
@@ -115,7 +115,7 @@ static const ActorInfo sInfos[] = {
{"BLasBos", fProfile::B_LASTBOSS, fProfile::B_LASTBOSS, 0xFFFF, 19, 0},
{ "BMg", fProfile::B_MG, fProfile::B_MG, 10, 21, 0},
{ "BSpUp", fProfile::OBJ_BIRD_SP_UP, fProfile::OBJ_BIRD_SP_UP, 0xFFFF, SND_SOURCE_OBJECT, 0},
{ "Bamboo", fProfile::OBJ_BAMBOO, fProfile::OBJ_BAMBOO, 533, 34, 0},
{ "Bamboo", fProfile::OBJ_BAMBOO, fProfile::OBJ_BAMBOO, 533, SND_SOURCE_BAMBOO, 0},
{"BarPsTg", fProfile::TAG_BARREL_POS, fProfile::TAG_BARREL_POS, 0xFFFF, 0xFF, 0},
{ "Barrel", fProfile::OBJ_BARREL, fProfile::OBJ_BARREL, 0xFFFF, SND_SOURCE_OBJECT, 0},
{"BarrlTg", fProfile::TAG_BARREL, fProfile::TAG_BARREL, 0xFFFF, 0xFF, 0},
@@ -740,7 +740,7 @@ static const ActorInfo sInfos[] = {
{ "WFF102", fProfile::OBJ_WATERFALL_F102, fProfile::OBJ_WATERFALL_F102, 0xFFFF, 0xFF, 0},
{ "Warp", fProfile::TIME_AREA, fProfile::TIME_AREA, 0xFFFF, SND_SOURCE_OBJECT, 0},
{ "WarpH", fProfile::OBJ_WARP_HOLE, fProfile::OBJ_WARP_HOLE, 0xFFFF, SND_SOURCE_OBJECT, 0},
{"WarpObj", fProfile::OBJ_WARP, fProfile::OBJ_WARP, 547, 55, 0},
{"WarpObj", fProfile::OBJ_WARP, fProfile::OBJ_WARP, 547, SND_SOURCE_OBJECT_WARP, 0},
{"WaterSW", fProfile::OBJ_WATER_SWITCH, fProfile::OBJ_WATER_SWITCH, 526, SND_SOURCE_OBJECT, 0},
{"WaterSf", fProfile::OBJ_WATER_SURFACE, fProfile::OBJ_WATER_SURFACE, 0xFFFF, 0xFF, 0},
{"WaterSp", fProfile::OBJ_WATER_SPOUT, fProfile::OBJ_WATER_SPOUT, 0xFFFF, 0xFF, 0},