summaryrefslogtreecommitdiff
path: root/tools/dump_audio.py
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-03-21 23:33:56 -0500
committerhuderlem <huderlem@gmail.com>2021-03-28 18:27:39 -0500
commit10499749cb68e2b6b26f830544e3c73f7dfbffe3 (patch)
tree452e57812185116671aa23483ca3e6f82f366917 /tools/dump_audio.py
parent01f713ccae2b43c236c984c09b7a05c8bf81c23d (diff)
Haunter and Gengar graveyard themes are not actually interleaved
Diffstat (limited to 'tools/dump_audio.py')
-rwxr-xr-xtools/dump_audio.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/dump_audio.py b/tools/dump_audio.py
index 2a7dba7..2f210bb 100755
--- a/tools/dump_audio.py
+++ b/tools/dump_audio.py
@@ -1092,6 +1092,8 @@ def dump_channel(start_address, sound_name, channel, prefix="", is_sfx=True, add
output += " {:x}".format(param)
if param == start_address:
label = "{}{}_Ch{}".format(prefix, sound_name, channel)
+ elif sound_name == "HaunterInTheGraveyard":
+ label = "{}{}_Ch{}".format(prefix, "GastlyInTheGraveyard", channel)
else:
label = "{}{}_branch_{:x}".format(prefix, sound_name, param)
if command_id == 0xfe and param >= start_address:
@@ -1104,7 +1106,8 @@ def dump_channel(start_address, sound_name, channel, prefix="", is_sfx=True, add
output += "\n"
blobs.append(make_blob(command_address, output, address, label))
if (command_id == 0xff or (is_infinite_loop(command_address) and
- not (is_infinite_loop(address) or rom[address] == 0xff))):
+ not (is_infinite_loop(address) or rom[address] == 0xff)) or
+ (command_id == 0xfe and sound_name == "HaunterInTheGraveyard")):
blobs.append(make_blob(address, "\n"))
break
for branch in branches: