diff options
| author | PokefanMarcel <166040321+PokefanMarcel@users.noreply.github.com> | 2026-04-15 19:02:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-15 12:02:35 -0500 |
| commit | 3c814341c81307b3193a9ea890ff3a197b09b4e3 (patch) | |
| tree | ad5d88978270ae8a93ac442e2f36cb115b1c586f | |
| parent | Change text label `_SilphCo8FSilphWorkerMSilphIsFinishedText` (#578) (diff) | |
| download | pokeyellow-3c814341c81307b3193a9ea890ff3a197b09b4e3.tar.gz pokeyellow-3c814341c81307b3193a9ea890ff3a197b09b4e3.tar.xz pokeyellow-3c814341c81307b3193a9ea890ff3a197b09b4e3.zip | |
Relabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580)
| -rw-r--r-- | audio.asm | 2 | ||||
| -rw-r--r-- | audio/headers/sfxheaders2.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/trainer_appeared.asm (renamed from audio/sfx/silph_scope.asm) | 2 | ||||
| -rw-r--r-- | constants/music_constants.asm | 6 | ||||
| -rw-r--r-- | data/moves/sfx.asm | 2 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -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" 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 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index e72e88d9..7c3651db 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -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 diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index f1466ac1..59f4cb2c 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -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 diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 810d3fb9..9e954877 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -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 |