From b38fd62a1e30eb3a3b16c563ff39caf483a1202c Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 7 Jun 2025 16:48:22 +0200 Subject: [PATCH] Two more --- include/toBeSorted/actor_info.h | 4 ++-- src/toBeSorted/actor_info.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/toBeSorted/actor_info.h b/include/toBeSorted/actor_info.h index 053a400c..415a7303 100644 --- a/include/toBeSorted/actor_info.h +++ b/include/toBeSorted/actor_info.h @@ -11,9 +11,9 @@ enum SoundSourceType_e { SND_SOURCE_BLADE = 3, SND_SOURCE_SHIELD = 4, SND_SOURCE_WHIP = 5, - + SND_SOURCE_BOOMERANG = 6, SND_SOURCE_ARROW = 7, - + SND_SOURCE_BOMB = 8, SND_SOURCE_HOOKSHOT = 9, SND_SOURCE_BULLET = 29, diff --git a/src/toBeSorted/actor_info.cpp b/src/toBeSorted/actor_info.cpp index 3d45f9d6..961d30ba 100644 --- a/src/toBeSorted/actor_info.cpp +++ b/src/toBeSorted/actor_info.cpp @@ -5,7 +5,6 @@ #include - #pragma push #pragma readonly_strings on // sorted alphabetically to facilitate binary search @@ -146,9 +145,9 @@ static const ActorInfo sInfos[] = { {"BltObsT", fProfile::TAG_BELT_OBSTACLE, fProfile::TAG_BELT_OBSTACLE, 0xFFFF, 59, 0}, {"BlwCoal", fProfile::OBJ_BLOW_COAL, fProfile::OBJ_BLOW_COAL, 0xFFFF, SND_SOURCE_OBJECT, 0}, { "Boat", fProfile::OBJ_BOAT, fProfile::OBJ_BOAT, 0xFFFF, SND_SOURCE_OBJECT, 0}, - { "Bomb", fProfile::BOMB, fProfile::BOMB, 0xFFFF, 8, 0}, + { "Bomb", fProfile::BOMB, fProfile::BOMB, 0xFFFF, SND_SOURCE_BOMB, 0}, { "Bombf", fProfile::BOMBF, fProfile::BOMBF, 0xFFFF, SND_SOURCE_OBJECT, 0}, - { "Boom", fProfile::BOOMERANG, fProfile::BOOMERANG, 0xFFFF, 6, 0}, + { "Boom", fProfile::BOOMERANG, fProfile::BOOMERANG, 0xFFFF, SND_SOURCE_BOOMERANG, 0}, {"BoxCage", fProfile::OBJ_BOXCAGE_F300, fProfile::OBJ_BOXCAGE_F300, 0xFFFF, SND_SOURCE_OBJECT, 0}, { "BrdMob", fProfile::BIRD_MOB, fProfile::BIRD_MOB, 0xFFFF, 0xFF, 0}, { "BrgBn", fProfile::OBJ_BRIDGE_BONE, fProfile::OBJ_BRIDGE_BONE, 0xFFFF, SND_SOURCE_OBJECT, 0},