Relabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580)
Some checks failed
CI / build (push) Has been cancelled
CI / build-macos (push) Has been cancelled

This commit is contained in:
PokefanMarcel
2026-04-15 19:02:35 +02:00
committed by GitHub
parent 9441f1aafe
commit 3c814341c8
6 changed files with 9 additions and 9 deletions

View File

@@ -148,7 +148,7 @@ INCLUDE "audio/sfx/start_menu_2.asm"
INCLUDE "audio/sfx/tink_2.asm"
INCLUDE "audio/sfx/heal_hp_2.asm"
INCLUDE "audio/sfx/heal_ailment_2.asm"
INCLUDE "audio/sfx/silph_scope.asm"
INCLUDE "audio/sfx/trainer_appeared.asm"
INCLUDE "audio/sfx/ball_toss.asm"
INCLUDE "audio/sfx/ball_poof.asm"
INCLUDE "audio/sfx/faint_thud.asm"

View File

@@ -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

View File

@@ -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

View File

@@ -224,9 +224,9 @@ DEF BATTLE_SFX_START EQUS "SFX_PECK"
music_const SFX_BATTLE_34, SFX_Battle_34
music_const SFX_BATTLE_35, SFX_Battle_35
music_const SFX_BATTLE_36, SFX_Battle_36
music_const SFX_SILPH_SCOPE, SFX_Silph_Scope
DEF BATTLE_SFX_END EQUS "SFX_SILPH_SCOPE + 1"
DEF MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
music_const SFX_TRAINER_APPEARED, SFX_Trainer_Appeared
DEF BATTLE_SFX_END EQUS "SFX_TRAINER_APPEARED + 1"
DEF MAX_SFX_ID_2 EQUS "SFX_TRAINER_APPEARED"
; AUDIO_3
music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge

View File

@@ -6,7 +6,7 @@ MoveSoundTable:
db SFX_DOUBLESLAP, $00, $80 ; DOUBLESLAP
db SFX_BATTLE_0B, $01, $80 ; COMET_PUNCH
db SFX_BATTLE_0D, $00, $40 ; MEGA_PUNCH
db SFX_SILPH_SCOPE, $00, $ff ; PAY_DAY
db SFX_TRAINER_APPEARED, $00, $ff ; PAY_DAY
db SFX_BATTLE_0D, $10, $60 ; FIRE_PUNCH
db SFX_BATTLE_0D, $20, $80 ; ICE_PUNCH
db SFX_BATTLE_0D, $00, $a0 ; THUNDERPUNCH

View File

@@ -64,7 +64,7 @@ PrintBeginningBattleText:
ld [wFrequencyModifier], a
ld a, $80
ld [wTempoModifier], a
ld a, SFX_SILPH_SCOPE
ld a, SFX_TRAINER_APPEARED
call PlaySound
jp WaitForSoundToFinish
.done