thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45: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

4
scripts/CeruleanCity.asm
View file

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

4
scripts/OaksLab.asm
View file

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

4
scripts/PokemonTower2F.asm
View file

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

4
scripts/RedsHouse1F.asm
View file

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

10
scripts/Route22.asm
View file

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

4
scripts/SSAnne2F.asm
View file

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

22
scripts/SSAnneCaptainsRoom.asm
View file

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

4
scripts/SilphCo7F.asm
View file

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

2
scripts/VermilionDock.asm
View file

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