From 1d0c54e913321bd84d61ebd8ece601aad25aee9c Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Fri, 14 Nov 2025 20:38:30 -0500 Subject: [PATCH] Fix wrong BGM entry names --- include/tables/sequence_table.h | 4 ++-- src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 6 +++--- tools/assets/extract/oot64_data/audio_ids.py | 4 ++-- tools/csdis.py | 4 ++-- tools/extract_audio.py | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/tables/sequence_table.h b/include/tables/sequence_table.h index 70ccfcbae1..7c11c6ad81 100644 --- a/include/tables/sequence_table.h +++ b/include/tables/sequence_table.h @@ -114,7 +114,7 @@ DEFINE_SEQUENCE (Sequence_90, NA_BGM_OWL, MEDIUM_CART, CA DEFINE_SEQUENCE (Sequence_91, NA_BGM_SHADOW_TEMPLE, MEDIUM_CART, CACHE_LOAD_TEMPORARY, SEQ_FLAG_ENEMY ) // shadow_temple DEFINE_SEQUENCE (Sequence_92, NA_BGM_WATER_TEMPLE, MEDIUM_CART, CACHE_LOAD_TEMPORARY, SEQ_FLAG_ENEMY ) // water_temple DEFINE_SEQUENCE (Sequence_93, NA_BGM_BRIDGE_TO_GANONS, MEDIUM_CART, CACHE_LOAD_PERSISTENT, SEQ_FLAG_FANFARE ) // bridge_to_ganons -DEFINE_SEQUENCE (Sequence_94, NA_BGM_OCARINA_OF_TIME, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // ocarina_of_time +DEFINE_SEQUENCE (Sequence_94, NA_BGM_SEAL_OF_SAGES, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // seal_of_sages DEFINE_SEQUENCE (Sequence_95, NA_BGM_GERUDO_VALLEY, MEDIUM_CART, CACHE_LOAD_TEMPORARY, SEQ_FLAG_RESUME | SEQ_FLAG_ENEMY ) // gerudo_valley DEFINE_SEQUENCE (Sequence_96, NA_BGM_POTION_SHOP, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // potion_shop DEFINE_SEQUENCE (Sequence_97, NA_BGM_KOTAKE_KOUME, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // kotake_koume @@ -122,7 +122,7 @@ DEFINE_SEQUENCE (Sequence_98, NA_BGM_ESCAPE, MEDIUM_CART, CA DEFINE_SEQUENCE (Sequence_99, NA_BGM_UNDERGROUND, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // underground DEFINE_SEQUENCE (Sequence_100, NA_BGM_GANONDORF_BOSS, MEDIUM_CART, CACHE_LOAD_TEMPORARY, SEQ_FLAG_NO_AMBIENCE ) // ganondorf_boss DEFINE_SEQUENCE (Sequence_101, NA_BGM_GANON_BOSS, MEDIUM_CART, CACHE_LOAD_TEMPORARY, SEQ_FLAG_NO_AMBIENCE ) // ganon_boss -DEFINE_SEQUENCE (Sequence_102, NA_BGM_END_DEMO, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // end_demo +DEFINE_SEQUENCE (Sequence_102, NA_BGM_OCARINA_OF_TIME, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // ocarina_of_time DEFINE_SEQUENCE (Sequence_103, NA_BGM_STAFF_1, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // staff_1 DEFINE_SEQUENCE (Sequence_104, NA_BGM_STAFF_2, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // staff_2 DEFINE_SEQUENCE (Sequence_105, NA_BGM_STAFF_3, MEDIUM_CART, CACHE_LOAD_TEMPORARY, 0 ) // staff_3 diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 3c983d700f..4b3135ed97 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -151,8 +151,8 @@ static u16 sBgmList[] = { NA_BGM_WATER_TEMPLE, NA_BGM_BRIDGE_TO_GANONS, NA_BGM_CUTSCENE_EFFECTS, - NA_BGM_OCARINA_OF_TIME, - NA_BGM_OCARINA_OF_TIME, + NA_BGM_SEAL_OF_SAGES, + NA_BGM_SEAL_OF_SAGES, NA_BGM_GERUDO_VALLEY, NA_BGM_POTION_SHOP, NA_BGM_KOTAKE_KOUME, @@ -161,7 +161,7 @@ static u16 sBgmList[] = { NA_BGM_UNDERGROUND, NA_BGM_GANONDORF_BOSS, NA_BGM_GANON_BOSS, - NA_BGM_END_DEMO, + NA_BGM_OCARINA_OF_TIME, }; #endif diff --git a/tools/assets/extract/oot64_data/audio_ids.py b/tools/assets/extract/oot64_data/audio_ids.py index 8bcf2b60b8..2ef0431192 100644 --- a/tools/assets/extract/oot64_data/audio_ids.py +++ b/tools/assets/extract/oot64_data/audio_ids.py @@ -95,7 +95,7 @@ SEQ_IDS = { 0x5B: "NA_BGM_SHADOW_TEMPLE", 0x5C: "NA_BGM_WATER_TEMPLE", 0x5D: "NA_BGM_BRIDGE_TO_GANONS", - 0x5E: "NA_BGM_OCARINA_OF_TIME", + 0x5E: "NA_BGM_SEAL_OF_SAGES", 0x5F: "NA_BGM_GERUDO_VALLEY", 0x60: "NA_BGM_POTION_SHOP", 0x61: "NA_BGM_KOTAKE_KOUME", @@ -103,7 +103,7 @@ SEQ_IDS = { 0x63: "NA_BGM_UNDERGROUND", 0x64: "NA_BGM_GANONDORF_BOSS", 0x65: "NA_BGM_GANON_BOSS", - 0x66: "NA_BGM_END_DEMO", + 0x66: "NA_BGM_OCARINA_OF_TIME", 0x67: "NA_BGM_STAFF_1", 0x68: "NA_BGM_STAFF_2", 0x69: "NA_BGM_STAFF_3", diff --git a/tools/csdis.py b/tools/csdis.py index d4baec1398..6e796fcc7c 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -285,7 +285,7 @@ sequence_ids = { 0x5B: "NA_BGM_SHADOW_TEMPLE", 0x5C: "NA_BGM_WATER_TEMPLE", 0x5D: "NA_BGM_BRIDGE_TO_GANONS", - 0x5E: "NA_BGM_OCARINA_OF_TIME", + 0x5E: "NA_BGM_SEAL_OF_SAGES", 0x5F: "NA_BGM_GERUDO_VALLEY", 0x60: "NA_BGM_POTION_SHOP", 0x61: "NA_BGM_KOTAKE_KOUME", @@ -293,7 +293,7 @@ sequence_ids = { 0x63: "NA_BGM_UNDERGROUND", 0x64: "NA_BGM_GANONDORF_BOSS", 0x65: "NA_BGM_GANON_BOSS", - 0x66: "NA_BGM_END_DEMO", + 0x66: "NA_BGM_OCARINA_OF_TIME", 0x67: "NA_BGM_STAFF_1", 0x68: "NA_BGM_STAFF_2", 0x69: "NA_BGM_STAFF_3", diff --git a/tools/extract_audio.py b/tools/extract_audio.py index c67d7b1650..0d9c81b9b1 100644 --- a/tools/extract_audio.py +++ b/tools/extract_audio.py @@ -131,7 +131,7 @@ if __name__ == '__main__': "NA_BGM_SHADOW_TEMPLE", "NA_BGM_WATER_TEMPLE", "NA_BGM_BRIDGE_TO_GANONS", - "NA_BGM_OCARINA_OF_TIME", + "NA_BGM_SEAL_OF_SAGES", "NA_BGM_GERUDO_VALLEY", "NA_BGM_POTION_SHOP", "NA_BGM_KOTAKE_KOUME", @@ -139,7 +139,7 @@ if __name__ == '__main__': "NA_BGM_UNDERGROUND", "NA_BGM_GANONDORF_BOSS", "NA_BGM_GANON_BOSS", - "NA_BGM_END_DEMO", + "NA_BGM_OCARINA_OF_TIME", "NA_BGM_STAFF_1", "NA_BGM_STAFF_2", "NA_BGM_STAFF_3",