thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove last few red audio variables

Browse source
This commit is contained in:
dannye 2021-03-29 00:42:28 -05:00
parent c1278c478e
commit 3508dc8e1d
28 changed files with 114 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/battle/animations.asm
View file

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

8
engine/battle/common_text.asm
View file

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

12
engine/battle/core.asm
View file

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

2
engine/events/hidden_objects/bills_house_pc.asm
View file

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

6
engine/events/pokecenter.asm
View file

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

5
engine/items/item_effects.asm
View file

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

12
engine/link/cable_club.asm
View file

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

4
engine/movie/evolution.asm
View file

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

8
engine/movie/intro.asm
View file

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

6
engine/movie/oak_speech/oak_speech.asm
View file

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

8
engine/movie/title.asm
View file

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

16
engine/overworld/auto_movement.asm
View file

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

22
engine/overworld/healing_machine.asm
View file

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