Remove last few red audio variables

2025-09-16 10:23:34 +12:00 · 2021-03-29 00:42:28 -05:00 · 2021-03-29 00:42:28 -05:00 · 3508dc8e1d
parent c1278c478e
commit 3508dc8e1d
28 changed files with 114 additions and 124 deletions
--- a/audio/play_battle_music.asm
+++ b/audio/play_battle_music.asm
@ -4,7 +4,7 @@ PlayBattleMusic::
 	ld [wLowHealthAlarm], a
 	ld [wMusicFade], a
 	dec a ; SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	call DelayFrame
 	ld c, 0 ; BANK(Music_GymLeaderBattle)
--- a/audio/pokedex_rating_sfx.asm
+++ b/audio/pokedex_rating_sfx.asm
@ -11,7 +11,7 @@ PlayPokedexRatingSfx::
 .gotSfxPointer
 	push bc
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySoundWaitForCurrent
 	pop bc
 	ld b, $0
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@ -2208,10 +2208,11 @@ GetMoveSound:
 ;	jr .done

 .NotCryMove
+; todo: fix sound modifiers
 	ld a, [hli]
-	ld [wFrequencyModifier], a
+;	ld [wFrequencyModifier], a
 	ld a, [hli]
-	ld [wTempoModifier], a
+;	ld [wTempoModifier], a
 .done
 	ld a, b
 	ret
@ -2636,8 +2637,9 @@ PlayApplyingAttackSound:
 	ld b, $1
 	ld c, GSSFX_NOT_VERY_EFFECTIVE ; SFX_NOT_VERY_EFFECTIVE
 .playSound
-	ld [wFrequencyModifier], a
+; todo: fix sound modifiers
+;	ld [wFrequencyModifier], a
 	ld a, b
-	ld [wTempoModifier], a
+;	ld [wTempoModifier], a
 	ld a, c
 	jp PlaySound
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@ -60,10 +60,10 @@ PrintBeginningBattleText:
 	call PrintText

 .playSFX
-	xor a
-	ld [wFrequencyModifier], a
-	ld a, $80
-	ld [wTempoModifier], a
+;	xor a
+;	ld [wFrequencyModifier], a
+;	ld a, $80
+;	ld [wTempoModifier], a
 	ld a, SFX_SILPH_SCOPE
 	call PlaySound
 	jp WaitForSoundToFinish
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@ -776,9 +776,9 @@ FaintEnemyPokemon:
 	ld a, [wIsInBattle]
 	dec a
 	jr z, .wild_win
-	xor a
-	ld [wFrequencyModifier], a
-	ld [wTempoModifier], a
+;	xor a
+;	ld [wFrequencyModifier], a
+;	ld [wTempoModifier], a
 	ld a, SFX_FAINT_FALL
 	call PlaySoundWaitForCurrent

@ -965,7 +965,7 @@ TrainerDefeatedText:
 PlayBattleVictoryMusic:
 	push af
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySoundWaitForCurrent
 	ld c, 0 ; BANK(Music_DefeatedTrainer)
 	pop af
@ -6899,8 +6899,8 @@ _LoadTrainerPic:
 ; unreferenced
 ResetCryModifiers:
 	xor a
-	ld [wFrequencyModifier], a
-	ld [wTempoModifier], a
+;	ld [wFrequencyModifier], a
+;	ld [wTempoModifier], a
 	jp PlaySound

 ; animates the mon "growing" out of the pokeball
--- a/engine/events/hidden_objects/bills_house_pc.asm
+++ b/engine/events/hidden_objects/bills_house_pc.asm
@ -53,7 +53,7 @@ BillsHouseInitiatedText::
 	text_promptbutton
 	text_asm
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 16
 	call DelayFrames
--- a/engine/events/pokecenter.asm
+++ b/engine/events/pokecenter.asm
@ -25,11 +25,11 @@ DisplayPokemonCenterDialogue_::
 	farcall AnimateHealingMachine ; do the healing machine animation
 	xor a
 	ld [wAudioFadeOutControl], a
-	ld a, [wAudioSavedROMBank]
-	ld [wAudioROMBank], a
+;	ld a, [wAudioSavedROMBank]
+;	ld [wAudioROMBank], a
 	ld a, [wMapMusicSoundID]
 	ld [wLastMusicSoundID], a
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	ld hl, PokemonFightingFitText
 	call PrintText
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@ -1808,7 +1808,10 @@ PlayedFluteHadEffectText:
 	ld a, SFX_POKEFLUTE
 	ld c, 0 ; BANK(SFX_Pokeflute)
 	call PlaySound
-	call WaitForSoundToFinish
+;.musicWaitLoop ; wait for music to finish playing
+;	ld a, [wChannelSoundIDs + Ch3]
+;	cp SFX_POKEFLUTE
+;	jr z, .musicWaitLoop
 	call PlayDefaultMusic ; start playing normal music again
 .done
 	jp TextScriptEnd ; end text
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@ -826,10 +826,10 @@ TradeCenter_Trade:
 	ld [wTradedEnemyMonSpecies], a
 	ld a, 10
 	ld [wAudioFadeOutControl], a
-	ld a, 0 ; BANK(Music_SafariZone)
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_SafariZone)
+;	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_SAFARI_ZONE
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	ld c, 100
 	call DelayFrames
@ -917,10 +917,10 @@ CableClub_Run:
 	ldh [hJoy5], a
 	ld a, 10
 	ld [wAudioFadeOutControl], a
-	ld a, 0 ; BANK(Music_Celadon)
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_Celadon)
+;	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_CELADON
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	jp PlayMusic

 EmptyFunc:
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@ -10,7 +10,7 @@ EvolveMon:
 	ld [wLowHealthAlarm], a
 ;	ld [wChannelSoundIDs + Ch5], a
 	dec a ; SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld a, $1
 	ldh [hAutoBGTransferEnabled], a
@ -68,7 +68,7 @@ EvolveMon:
 .done
 	ld [wWholeScreenPaletteMonSpecies], a
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld a, [wWholeScreenPaletteMonSpecies]
 	call PlayCry
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@ -330,11 +330,11 @@ PlayShootingStar:
 	ld c, 40
 	call DelayFrames
 .next
-	ld a, 0 ; BANK(Music_IntroBattle)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_IntroBattle)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_INTRO_BATTLE
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	call IntroClearMiddleOfScreen
 	call ClearSprites
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@ -128,9 +128,9 @@ OakSpeech:
 	call ResetPlayerSpriteData
 	ldh a, [hLoadedROMBank]
 	push af
-	ld a, 0 ; BANK(Music_PalletTown)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_PalletTown)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a

 	ld a, 10
 	call StopMusic
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@ -17,9 +17,9 @@ SetDefaultNamesBeforeTitlescreen::
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld a, 0 ; BANK(Music_TitleScreen)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_TitleScreen)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a

 DisplayTitleScreen:
 	call GBPalWhiteOut
@ -213,7 +213,7 @@ ENDC
 	call Delay3
 	call WaitForSoundToFinish
 	ld a, MUSIC_TITLE_SCREEN
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	xor a
 	ld [wUnusedCC5B], a
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
@ -162,11 +162,11 @@ PewterMuseumGuyMovementScriptPointerTable::
 	dw PewterMovementScript_Done

 PewterMovementScript_WalkToMuseum:
-	ld a, 0 ; BANK(Music_MuseumGuy)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_MuseumGuy)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_MUSEUM_GUY
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	ld a, [wSpriteIndex]
 	swap a
@ -218,11 +218,11 @@ PewterGymGuyMovementScriptPointerTable::
 	dw PewterMovementScript_Done

 PewterMovementScript_WalkToGym:
-	ld a, 0 ; BANK(Music_MuseumGuy)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_MuseumGuy)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_MUSEUM_GUY
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	ld a, [wSpriteIndex]
 	swap a
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@ -39,18 +39,18 @@ AnimateHealingMachine:
 	call DelayFrames
 	dec b
 	jr nz, .partyLoop
-	ld a, [wAudioROMBank]
-	cp $1f ; BANK("Audio Engine 3")
-	ld [wAudioSavedROMBank], a
-	jr nz, .next
-	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
-	call PlaySound
-	ld a, 0 ; BANK(Music_PkmnHealed)
-	ld [wAudioROMBank], a
-.next
+;	ld a, [wAudioROMBank]
+;	cp BANK("Audio Engine 3")
+;	ld [wAudioSavedROMBank], a
+;	jr nz, .next
+;	ld a, SFX_STOP_ALL_MUSIC
+;	ld [wNewSoundID], a
+;	call PlaySound
+;	ld a, 0 ; BANK(Music_PkmnHealed)
+;	ld [wAudioROMBank], a
+;.next
 	ld a, MUSIC_PKMN_HEALED
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	ld d, $28
 	call FlashSprite8Times
--- a/home/audio.asm
+++ b/home/audio.asm
@ -32,19 +32,19 @@ PlayDefaultMusicCommon::

 .next
 	ld b, a
-	ld a, d
-	and a ; should current music be faded out first?
-	ld a, 0 ; BANK(Music_BikeRiding)
-	jr nz, .next2
+;	ld a, d
+;	and a ; should current music be faded out first?
+;	ld a, 0 ; BANK(Music_BikeRiding)
+;	jr nz, .next2

 ; Only change the audio ROM bank if the current music isn't going to be faded
 ; out before the default music begins.
-	ld [wAudioROMBank], a
+;	ld [wAudioROMBank], a

-.next2
+;.next2
 ; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the
 ; current music (if the current music is faded out).
-	ld [wAudioSavedROMBank], a
+;	ld [wAudioSavedROMBank], a
 	jr .next3

 .walking
@ -69,7 +69,7 @@ PlayDefaultMusicCommon::

 	ld a, b
 	ld [wLastMusicSoundID], a
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	ld [wMusicFadeID], a
 	ret

--- a/home/init.asm
+++ b/home/init.asm
@ -97,9 +97,9 @@ rLCDC_DEFAULT EQU %11100011

 	predef LoadSGB

-	ld a, 0 ; BANK(SFX_Shooting_Star)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(SFX_Shooting_Star)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	ld a, $9c
 	ldh [hAutoBGTransferDest + 1], a
 	xor a
@ -126,12 +126,12 @@ ClearVram::


 StopAllSounds::
-	ld a, 0 ; BANK("Audio Engine 1")
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK("Audio Engine 1")
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	xor a
 	ld [wAudioFadeOutControl], a
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	ld [wLastMusicSoundID], a
 	dec a
 	jp PlaySound
--- a/home/trainers.asm
+++ b/home/trainers.asm
@ -409,9 +409,9 @@ PlayTrainerMusic::
 	ld [wAudioFadeOutControl], a
 	ld a, SFX_STOP_ALL_MUSIC
 	call PlaySound
-	ld a, 0 ; BANK(Music_MeetEvilTrainer)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
+;	ld a, 0 ; BANK(Music_MeetEvilTrainer)
+;	ld [wAudioROMBank], a
+;	ld [wAudioSavedROMBank], a
 	ld a, [wEngagedTrainerClass]
 	ld b, a
 	ld hl, EvilTrainerList
@ -436,7 +436,7 @@ PlayTrainerMusic::
 .maleTrainer
 	ld a, MUSIC_MEET_MALE_TRAINER
 .PlaySound
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	jp PlayMusic

 INCLUDE "data/trainers/encounter_types.asm"
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@ -69,7 +69,7 @@ ENDC
 	and a
 	jr z, .asm_19512
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 .asm_19512
 	ld c, 0 ; BANK(Music_MeetRival)
@ -176,7 +176,7 @@ CeruleanCityScript2:
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, $1
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@ -511,7 +511,7 @@ OaksLabScript15:
 	ldh [hJoyHeld], a
 	call EnableAutoTextBoxDrawing
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, $15
@ -612,7 +612,7 @@ OaksLabScript16:
 	call FillMemory
 	ld [hl], $ff
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, $1
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@ -27,7 +27,7 @@ ENDC
 	call ArePlayerCoordsInArray
 	ret nc
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
@ -81,7 +81,7 @@ PokemonTower2Script1:
 	ldh [hSpriteIndex], a
 	call MoveSprite
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, $2
--- a/scripts/RedsHouse1F.asm
+++ b/scripts/RedsHouse1F.asm
@ -29,7 +29,7 @@ MomHealPokemon:
 	call ReloadMapData
 	predef HealParty
 	ld a, MUSIC_PKMN_HEALED
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic

 	call WaitForSongToFinish
@ -39,7 +39,7 @@ MomHealPokemon:
 ;	jr z, .next

 	ld a, [wMapMusicSoundID]
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic
 	call GBFadeInFromWhite
 	ld hl, MomHealText2
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@ -89,7 +89,7 @@ Route22Script0:
 	and a
 	jr z, .asm_50f4e
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 .asm_50f4e
 	ld c, 0 ; BANK(Music_MeetRival)
@ -168,7 +168,7 @@ Route22Script2:
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, [wcf0d]
@ -242,11 +242,11 @@ Route22Script_5104e:
 	and a
 	jr z, .skipYVisibilityTesta
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 .skipYVisibilityTesta
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateTempo
 	ld a, $2
@ -327,7 +327,7 @@ Route22Script5:
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStartAndTempo
 	ld a, [wcf0d]
--- a/scripts/SSAnne2F.asm
+++ b/scripts/SSAnne2F.asm
@ -25,7 +25,7 @@ SSAnne2Script0:
 	call ArePlayerCoordsInArray
 	ret nc
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
@ -145,7 +145,7 @@ SSAnne2Script2:
 	ldh [hSpriteIndex], a
 	call MoveSprite
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld a, $3
--- a/scripts/SSAnneCaptainsRoom.asm
+++ b/scripts/SSAnneCaptainsRoom.asm
@ -44,18 +44,18 @@ SSAnne7Text1:
 SSAnne7RubText:
 	text_far _SSAnne7RubText
 	text_asm
-	ld a, [wAudioROMBank]
-	cp $1f ; BANK("Audio Engine 3")
-	ld [wAudioSavedROMBank], a
-	jr nz, .asm_61908
-	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
-	call PlaySound
-	ld a, 0 ; BANK(Music_PkmnHealed)
-	ld [wAudioROMBank], a
-.asm_61908
+;	ld a, [wAudioROMBank]
+;	cp BANK("Audio Engine 3")
+;	ld [wAudioSavedROMBank], a
+;	jr nz, .asm_61908
+;	ld a, SFX_STOP_ALL_MUSIC
+;	ld [wNewSoundID], a
+;	call PlaySound
+;	ld a, 0 ; BANK(Music_PkmnHealed)
+;	ld [wAudioROMBank], a
+;.asm_61908
 	ld a, MUSIC_PKMN_HEALED
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlayMusic

 	call WaitForSongToFinish
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@ -131,7 +131,7 @@ SilphCo7Script0:
 	ld a, PLAYER_DIR_DOWN
 	ld [wPlayerMovingDirection], a
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
@ -220,7 +220,7 @@ SilphCo7Script4:
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
 	ld de, MovementData_51d1d
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@ -40,7 +40,7 @@ VermilionDock_1db9b:
 	SetEventForceReuseHL EVENT_SS_ANNE_LEFT
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wJoyIgnore], a
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 0 ; BANK(Music_Surfing)
 	ld a, MUSIC_SURFING
--- a/wram.asm
+++ b/wram.asm
@ -8,23 +8,6 @@ INCLUDE "vram.asm"

 SECTION "WRAM", WRAM0

-wNewSoundID::
-	ds 1
-
-wAudioROMBank::
-	ds 1
-
-wAudioSavedROMBank::
-	ds 1
-
-wFrequencyModifier::
-	ds 1
-
-wTempoModifier::
-	ds 1
-
-wSFXDontWait:: ds 1
-
 ; crysaudio start

 ; nonzero if playing
@ -121,6 +104,8 @@ wCurSFX::
 ; id of sfx currently playing
 	db

+wSFXDontWait:: ds 1
+
 wAudioEnd::

 ; crysaudio end