aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2026-04-15 12:05:52 -0500
committerdannye <33dannye@gmail.com>2026-04-15 12:05:52 -0500
commitbfa7170107eea23b89febb60bfb2ce39173bf2e1 (patch)
tree9796ec9b20b065c8935f54ef4f7cbf1d5a821ecc /audio
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentRelabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580) (diff)
downloadpokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.gz
pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.xz
pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'audio')
-rw-r--r--audio/headers/sfxheaders2.asm4
-rw-r--r--audio/sfx/trainer_appeared.asm (renamed from audio/sfx/silph_scope.asm)2
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 1ccbf265..f33304ca 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -587,6 +587,6 @@ SFX_Battle_36::
channel 6, SFX_Battle_36_Ch6
channel 8, SFX_Battle_36_Ch8
-SFX_Silph_Scope::
+SFX_Trainer_Appeared::
channel_count 1
- channel 5, SFX_Silph_Scope_Ch5
+ channel 5, SFX_Trainer_Appeared_Ch5
diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/trainer_appeared.asm
index 4a565740..3301a57f 100644
--- a/audio/sfx/silph_scope.asm
+++ b/audio/sfx/trainer_appeared.asm
@@ -1,4 +1,4 @@
-SFX_Silph_Scope_Ch5:
+SFX_Trainer_Appeared_Ch5:
duty_cycle 0
square_note 0, 13, 2, 1792
square_note 0, 13, 2, 1856