thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 07:44:47 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

commented audio code

Browse source
This commit is contained in:
YamaArashi 2015-08-08 22:32:44 -07:00
parent 40c1ecb437
commit 2b01815999
42 changed files with 1740 additions and 1515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
audio.asm
View file

@ -364,10 +364,10 @@ SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
PlayBattleMusic:: ; 0x90c6 PlayBattleMusic:: ; 0x90c6
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld [wLowHealthAlarm], a ld [wLowHealthAlarm], a
dec a dec a
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound ; stop music call PlaySound ; stop music
call DelayFrame call DelayFrame
ld c, BANK(Music_GymLeaderBattle) ld c, BANK(Music_GymLeaderBattle)
@ -406,7 +406,7 @@ Music_RivalAlternateStart:: ; 0x9b47
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic call PlayMusic
ld hl, wc006 ld hl, wChannelCommandPointers
ld de, Music_MeetRival_branch_b1a2 ld de, Music_MeetRival_branch_b1a2
call Audio1_OverwriteChannelPointer call Audio1_OverwriteChannelPointer
ld de, Music_MeetRival_branch_b21d ld de, Music_MeetRival_branch_b21d
@ -425,30 +425,30 @@ Music_RivalAlternateTempo:: ; 0x9b65
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic call PlayMusic
ld hl, wc006 ld hl, wChannelCommandPointers
ld de, Music_MeetRival_branch_b119 ld de, Music_MeetRival_branch_b119
jp Audio1_OverwriteChannelPointer jp Audio1_OverwriteChannelPointer
; applies both the alternate start and alternate tempo ; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo:: ; 0x9b75 Music_RivalAlternateStartAndTempo:: ; 0x9b75
call Music_RivalAlternateStart call Music_RivalAlternateStart
ld hl, wc006 ld hl, wChannelCommandPointers
ld de, Music_MeetRival_branch_b19b ld de, Music_MeetRival_branch_b19b
jp Audio1_OverwriteChannelPointer jp Audio1_OverwriteChannelPointer
; an alternate tempo for Cities1 which is used for the Hall of Fame room ; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo:: ; 0x9b81 Music_Cities1AlternateTempo:: ; 0x9b81
ld a, $a ld a, 10
ld [wcfc8], a ld [wAudioFadeOutCounterReloadValue], a
ld [wcfc9], a ld [wAudioFadeOutCounter], a
ld a, $ff ld a, $ff ; stop playing music after the fade-out is finished
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld c, 100 ld c, 100
call DelayFrames call DelayFrames ; wait for the fade-out to finish
ld c, BANK(Music_Cities1) ld c, BANK(Music_Cities1)
ld a, MUSIC_CITIES1 ld a, MUSIC_CITIES1
call PlayMusic call PlayMusic
ld hl, wc006 ld hl, wChannelCommandPointers
ld de, Music_Cities1_branch_aa6f ld de, Music_Cities1_branch_aa6f
jp Audio1_OverwriteChannelPointer jp Audio1_OverwriteChannelPointer
@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e)
.asm_2138a .asm_2138a
ld a, $86 ld a, $86
ld [wc02a], a ;disable sound channel? ld [wChannelSoundIDs + CH4], a ;disable sound channel?
ld a, [wLowHealthAlarm] ld a, [wLowHealthAlarm]
and $7f ;decrement alarm timer. and $7f ;decrement alarm timer.
dec a dec a
@ -491,7 +491,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e)
.disableAlarm .disableAlarm
xor a xor a
ld [wLowHealthAlarm], a ;disable alarm ld [wLowHealthAlarm], a ;disable alarm
ld [wc02a], a ;re-enable sound channel? ld [wChannelSoundIDs + CH4], a ;re-enable sound channel?
ld de, .toneDataSilence ld de, .toneDataSilence
jr .playTone jr .playTone
@ -542,7 +542,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306)
ld a, SFX_CAUGHT_MON ld a, SFX_CAUGHT_MON
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
; then immediately overwrtie the channel pointers ; then immediately overwrtie the channel pointers
ld hl, wc00e ld hl, wChannelCommandPointers + CH4 * 2
ld de, SFX_08_PokeFlute_Ch1 ld de, SFX_08_PokeFlute_Ch1
call Audio2_OverwriteChannelPointer call Audio2_OverwriteChannelPointer
ld de, SFX_08_PokeFlute_Ch2 ld de, SFX_08_PokeFlute_Ch2
@ -572,7 +572,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
.gotSfxPointer .gotSfxPointer
push bc push bc
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
pop bc pop bc
ld b, $0 ld b, $0

1295
audio/engine_1.asm
View file

File diff suppressed because it is too large Load diff

540
audio/engine_2.asm
View file

File diff suppressed because it is too large Load diff

532
audio/engine_3.asm
View file

File diff suppressed because it is too large Load diff

1
constants/hardware_constants.asm
View file

@ -107,4 +107,3 @@ rUNKNOWN5 EQU $ff75 ; (8Fh) - Bit 4-6 (Read/Write)
rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only) rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only)
rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only) rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only)
rIE EQU $ffff ; Interrupt Enable (R/W) rIE EQU $ffff ; Interrupt Enable (R/W)

39
constants/music_constants.asm
View file

@ -1,3 +1,42 @@
; HW sound channel register base addresses
HW_CH1_BASE EQU (rNR10 % $100)
HW_CH2_BASE EQU ((rNR21 % $100) - 1)
HW_CH3_BASE EQU (rNR30 % $100)
HW_CH4_BASE EQU ((rNR41 % $100) - 1)
; HW sound channel enable bit masks
HW_CH1_ENABLE_MASK EQU %00010001
HW_CH2_ENABLE_MASK EQU %00100010
HW_CH3_ENABLE_MASK EQU %01000100
HW_CH4_ENABLE_MASK EQU %10001000
; HW sound channel disable bit masks
HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff)
HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff)
HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff)
HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff)
REG_DUTY_SOUND_LEN EQU 1
REG_VOLUME_ENVELOPE EQU 2
REG_FREQUENCY_LO EQU 3
MAX_SFX_ID EQU $B9
CRY_SFX_START EQU $14
CRY_SFX_END EQU $86
; wChannelFlags1 constants
BIT_PERFECT_PITCH EQU 0 ; controlled by toggleperfectpitch command
BIT_CHANNEL_CALL EQU 1 ; if in channel call
BIT_NOISE_OR_SFX EQU 2 ; if channel is the music noise channel or an SFX channel
BIT_VIBRATO_DIRECTION EQU 3 ; if the pitch is above or below normal (cycles)
BIT_PITCH_BEND_ON EQU 4 ; if pitch bend is active
BIT_PITCH_BEND_DECREASING EQU 5 ; if the pitch bend frequency is decreasing (instead of increasing)
BIT_ROTATE_DUTY EQU 6 ; if rotating duty
; wChannelFlags2 constant (only has one flag)
BIT_EXECUTE_MUSIC EQU 0 ; if in execute music
; Song ids are calculated by address to save space. ; Song ids are calculated by address to save space.
music_const: MACRO music_const: MACRO

18
engine/battle/animations.asm
View file

@ -772,7 +772,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
dec b dec b
jr nz,.loop jr nz,.loop
ld a,%00001000 ld a,%00001000
ld [$ff10],a ; Channel 1 sweep register ld [rNR10],a ; Channel 1 sweep register
ret ret
.isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame
ld a,[W_SUBANIMCOUNTER] ld a,[W_SUBANIMCOUNTER]
@ -2335,19 +2335,19 @@ GetMoveSound: ; 7986f (1e:586f)
call GetCryData call GetCryData
ld b,a ld b,a
pop hl pop hl
ld a,[wc0f1] ld a,[wFrequencyModifier]
add [hl] add [hl]
ld [wc0f1],a ld [wFrequencyModifier],a
inc hl inc hl
ld a,[wc0f2] ld a,[wTempoModifier]
add [hl] add [hl]
ld [wc0f2],a ld [wTempoModifier],a
jr .done jr .done
.NotCryMove .NotCryMove
ld a,[hli] ld a,[hli]
ld [wc0f1],a ld [wFrequencyModifier],a
ld a,[hli] ld a,[hli]
ld [wc0f2],a ld [wTempoModifier],a
.done .done
ld a,b ld a,b
ret ret
@ -3029,8 +3029,8 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a)
ld b, $1 ld b, $1
ld c, SFX_NOT_VERY_EFFECTIVE ld c, SFX_NOT_VERY_EFFECTIVE
.playSound .playSound
ld [wc0f1], a ld [wFrequencyModifier], a
ld a, b ld a, b
ld [wc0f2], a ld [wTempoModifier], a
ld a, c ld a, c
jp PlaySound jp PlaySound

4
engine/battle/common_text.asm
View file

@ -61,9 +61,9 @@ PrintBeginningBattleText: ; 58d99 (16:4d99)
.playSFX .playSFX
xor a xor a
ld [wc0f1], a ld [wFrequencyModifier], a
ld a, $80 ld a, $80
ld [wc0f2], a ld [wTempoModifier], a
ld a, SFX_SILPH_SCOPE ld a, SFX_SILPH_SCOPE
call PlaySound call PlaySound
jp WaitForSoundToFinish jp WaitForSoundToFinish

16
engine/battle/core.asm
View file

@ -867,12 +867,12 @@ FaintEnemyPokemon: ; 0x3c567
dec a dec a
jr z, .wild_win jr z, .wild_win
xor a xor a
ld [wc0f1], a ld [wFrequencyModifier], a
ld [wc0f2], a ld [wTempoModifier], a
ld a, SFX_FAINT_FALL ld a, SFX_FAINT_FALL
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
.sfxwait .sfxwait
ld a, [wc02a] ld a, [wChannelSoundIDs + CH4]
cp SFX_FAINT_FALL cp SFX_FAINT_FALL
jr z, .sfxwait jr z, .sfxwait
ld a, SFX_FAINT_THUD ld a, SFX_FAINT_THUD
@ -952,7 +952,7 @@ EnemyMonFaintedText: ; 0x3c63e
EndLowHealthAlarm: ; 3c643 (f:4643) EndLowHealthAlarm: ; 3c643 (f:4643)
xor a xor a
ld [wLowHealthAlarm], a ;disable low health alarm ld [wLowHealthAlarm], a ;disable low health alarm
ld [wc02a], a ld [wChannelSoundIDs + CH4], a
inc a inc a
ld [wccf6], a ld [wccf6], a
ret ret
@ -1045,7 +1045,7 @@ TrainerDefeatedText: ; 3c6e9 (f:46e9)
PlayBattleVictoryMusic: ; 3c6ee (f:46ee) PlayBattleVictoryMusic: ; 3c6ee (f:46ee)
push af push af
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
ld c, BANK(Music_DefeatedTrainer) ld c, BANK(Music_DefeatedTrainer)
pop af pop af
@ -1944,7 +1944,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
ld [hl], $0 ld [hl], $0
ret z ret z
xor a xor a
ld [wc02a], a ld [wChannelSoundIDs + CH4], a
ret ret
.asm_3cde6 .asm_3cde6
ld hl, wLowHealthAlarm ld hl, wLowHealthAlarm
@ -6993,8 +6993,8 @@ _LoadTrainerPic: ; 3f04b (f:704b)
; unreferenced ; unreferenced
ResetCryModifiers: ; 3f069 (f:7069) ResetCryModifiers: ; 3f069 (f:7069)
xor a xor a
ld [wc0f1], a ld [wFrequencyModifier], a
ld [wc0f2], a ld [wTempoModifier], a
jp PlaySound jp PlaySound
; animates the mon "growing" out of the pokeball ; animates the mon "growing" out of the pokeball

2
engine/battle/end_of_battle.asm
View file

@ -46,7 +46,7 @@ EndOfBattle: ; 137aa (4:77aa)
.resetVariables .resetVariables
xor a xor a
ld [wLowHealthAlarm], a ;disable low health alarm ld [wLowHealthAlarm], a ;disable low health alarm
ld [wc02a], a ld [wChannelSoundIDs + CH4], a
ld [W_ISINBATTLE], a ld [W_ISINBATTLE], a
ld [W_BATTLETYPE], a ld [W_BATTLETYPE], a
ld [W_MOVEMISSED], a ld [W_MOVEMISSED], a

16
engine/cable_club.asm
View file

@ -824,12 +824,12 @@ TradeCenter_Trade:
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wTradedEnemyMonSpecies], a ld [wTradedEnemyMonSpecies], a
ld a, $a ld a, 10
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, $2 ld a, $2
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, MUSIC_SAFARI_ZONE ld a, MUSIC_SAFARI_ZONE
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, 100 ld c, 100
call DelayFrames call DelayFrames
@ -915,12 +915,12 @@ CableClub_Run: ; 5a5f (1:5a5f)
inc a ; LINK_STATE_IN_CABLE_CLUB inc a ; LINK_STATE_IN_CABLE_CLUB
ld [wLinkState], a ld [wLinkState], a
ld [$ffb5], a ld [$ffb5], a
ld a, $a ld a, 10
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, BANK(Music_Celadon) ld a, BANK(Music_Celadon)
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, MUSIC_CELADON ld a, MUSIC_CELADON
ld [wc0ee], a ld [wNewSoundID], a
jp PlaySound jp PlaySound
EmptyFunc3: ; 5aaf (1:5aaf) EmptyFunc3: ; 5aaf (1:5aaf)

6
engine/evolution.asm
View file

@ -8,9 +8,9 @@ EvolveMon: ; 7bde9 (1e:7de9)
push af push af
xor a xor a
ld [wLowHealthAlarm], a ld [wLowHealthAlarm], a
ld [wc02a], a ld [wChannelSoundIDs + CH4], a
dec a dec a
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
@ -68,7 +68,7 @@ EvolveMon: ; 7bde9 (1e:7de9)
.done .done
ld [wcf1d], a ld [wcf1d], a
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, [wcf1d] ld a, [wcf1d]
call PlayCry call PlayCry

8
engine/hall_of_fame.asm
View file

@ -280,9 +280,9 @@ HoFRecordMonInfo: ; 70404 (1c:4404)
jp CopyData jp CopyData
HoFFadeOutScreenAndMusic: ; 70423 (1c:4423) HoFFadeOutScreenAndMusic: ; 70423 (1c:4423)
ld a, $a ld a, 10
ld [wcfc8], a ld [wAudioFadeOutCounterReloadValue], a
ld [wcfc9], a ld [wAudioFadeOutCounter], a
ld a, $ff ld a, $ff
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
jp GBFadeOutToWhite jp GBFadeOutToWhite

6
engine/hidden_object_functions7.asm
View file

@ -63,14 +63,14 @@ SafariZoneGameStillGoing: ; 1e9ab (7:69ab)
SafariZoneGameOver: ; 1e9b0 (7:69b0) SafariZoneGameOver: ; 1e9b0 (7:69b0)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
dec a dec a
call PlaySound call PlaySound
ld c, BANK(SFX_Safari_Zone_PA) ld c, BANK(SFX_Safari_Zone_PA)
ld a, SFX_SAFARI_ZONE_PA ld a, SFX_SAFARI_ZONE_PA
call PlayMusic call PlayMusic
.asm_1e9c2 .asm_1e9c2
ld a, [wc02a] ld a, [wChannelSoundIDs + CH4]
cp $b9 cp $b9
jr nz, .asm_1e9c2 jr nz, .asm_1e9c2
ld a, TEXT_SAFARI_GAME_OVER ld a, TEXT_SAFARI_GAME_OVER
@ -374,7 +374,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
db $06 db $06
TX_ASM TX_ASM
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, 16 ld c, 16
call DelayFrames call DelayFrames

6
engine/intro.asm
View file

@ -325,10 +325,10 @@ PlayShootingStar: ; 4188a (10:588a)
call DelayFrames call DelayFrames
.next .next
ld a, BANK(Music_IntroBattle) ld a, BANK(Music_IntroBattle)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, MUSIC_INTRO_BATTLE ld a, MUSIC_INTRO_BATTLE
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
call IntroClearMiddleOfScreen call IntroClearMiddleOfScreen
call ClearSprites call ClearSprites

8
engine/items/items.asm
View file

@ -856,7 +856,7 @@ ItemUseMedicine: ; dabb (3:5abb)
.notFullHP ; if the pokemon's current HP doesn't equal its max HP .notFullHP ; if the pokemon's current HP doesn't equal its max HP
xor a xor a
ld [wLowHealthAlarm],a ;disable low health alarm ld [wLowHealthAlarm],a ;disable low health alarm
ld [wc02a],a ld [wChannelSoundIDs + CH4],a
push hl push hl
push de push de
ld bc,32 ld bc,32
@ -1643,7 +1643,7 @@ ItemUsePokeflute: ; e140 (3:6140)
call WaitForSoundToFinish ; wait for sound to end call WaitForSoundToFinish ; wait for sound to end
callba Music_PokeFluteInBattle ; play in-battle pokeflute music callba Music_PokeFluteInBattle ; play in-battle pokeflute music
.musicWaitLoop ; wait for music to finish playing .musicWaitLoop ; wait for music to finish playing
ld a,[wc02c] ld a,[wChannelSoundIDs + CH6]
and a ; music off? and a ; music off?
jr nz,.musicWaitLoop jr nz,.musicWaitLoop
.skipMusic .skipMusic
@ -1716,8 +1716,8 @@ PlayedFluteHadEffectText: ; e215 (3:6215)
ld c, BANK(SFX_Pokeflute) ld c, BANK(SFX_Pokeflute)
call PlayMusic call PlayMusic
.musicWaitLoop ; wait for music to finish playing .musicWaitLoop ; wait for music to finish playing
ld a,[wc028] ld a,[wChannelSoundIDs + CH2]
cp a,$b8 cp a, SFX_POKEFLUE
jr z,.musicWaitLoop jr z,.musicWaitLoop
call PlayDefaultMusic ; start playing normal music again call PlayDefaultMusic ; start playing normal music again
.done .done

4
engine/menu/pokedex.asm
View file

@ -397,7 +397,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
ld hl,wd72c ld hl,wd72c
set 1,[hl] set 1,[hl]
ld a,$33 ; 3/7 volume ld a,$33 ; 3/7 volume
ld [$ff24],a ld [rNR50],a
call GBPalWhiteOut ; zero all palettes call GBPalWhiteOut ; zero all palettes
call ClearScreen call ClearScreen
ld a,[wd11e] ; pokemon ID ld a,[wd11e] ; pokemon ID
@ -566,7 +566,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
ld hl,wd72c ld hl,wd72c
res 1,[hl] res 1,[hl]
ld a,$77 ; max volume ld a,$77 ; max volume
ld [$ff24],a ld [rNR50],a
ret ret
HeightWeightText: ; 40448 (10:4448) HeightWeightText: ; 40448 (10:4448)

4
engine/menu/status_screen.asm
View file

@ -80,7 +80,7 @@ StatusScreen: ; 12953 (4:6953)
ld hl, wd72c ld hl, wd72c
set 1, [hl] set 1, [hl]
ld a, $33 ld a, $33
ld [$ff24], a ; Reduce the volume ld [rNR50], a ; Reduce the volume
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call ClearScreen call ClearScreen
call UpdateSprites call UpdateSprites
@ -430,7 +430,7 @@ StatusScreen2: ; 12b57 (4:6b57)
ld hl, wd72c ld hl, wd72c
res 1, [hl] res 1, [hl]
ld a, $77 ld a, $77
ld [$ff24], a ld [rNR50], a
call GBPalWhiteOut call GBPalWhiteOut
jp ClearScreen jp ClearScreen

10
engine/oak_speech.asm
View file

@ -129,12 +129,12 @@ OakSpeech: ; 6115 (1:6115)
ld a,[H_LOADEDROMBANK] ld a,[H_LOADEDROMBANK]
push af push af
ld a, BANK(Music_PalletTown) ld a, BANK(Music_PalletTown)
ld [wc0ef],a ld [wAudioROMBank],a
ld [wc0f0],a ld [wAudioSavedROMBank],a
ld a,$A ld a, 10
ld [wMusicHeaderPointer],a ld [wAudioFadeOutControl],a
ld a,$FF ld a,$FF
ld [wc0ee],a ld [wNewSoundID],a
call PlaySound ; stop music call PlaySound ; stop music
pop af pop af
ld [H_LOADEDROMBANK],a ld [H_LOADEDROMBANK],a

2
engine/overworld/elevator.asm
View file

@ -33,7 +33,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
ld a, SFX_SAFARI_ZONE_PA ld a, SFX_SAFARI_ZONE_PA
call PlayMusic call PlayMusic
.musicLoop .musicLoop
ld a, [wc02a] ld a, [wChannelSoundIDs + CH4]
cp $b9 cp $b9
jr z, .musicLoop jr z, .musicLoop
call UpdateSprites call UpdateSprites

40
engine/overworld/healing_machine.asm
View file

@ -15,44 +15,44 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld hl, wOAMBuffer + $84 ld hl, wOAMBuffer + $84
ld de, PokeCenterOAMData ld de, PokeCenterOAMData
call CopyHealingMachineOAM call CopyHealingMachineOAM
ld a, $4 ld a, 4
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.asm_70464 .waitLoop
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
and a and a ; is fade-out finished?
jr nz, .asm_70464 jr nz, .waitLoop ; if not, check again
ld a, [wPartyCount] ld a, [wPartyCount]
ld b, a ld b, a
.asm_7046e .partyLoop
call CopyHealingMachineOAM call CopyHealingMachineOAM
ld a, SFX_HEALING_MACHINE ld a, SFX_HEALING_MACHINE
call PlaySound call PlaySound
ld c, 30 ld c, 30
call DelayFrames call DelayFrames
dec b dec b
jr nz, .asm_7046e jr nz, .partyLoop
ld a, [wc0ef] ld a, [wAudioROMBank]
cp BANK(Audio3_UpdateMusic) cp BANK(Audio3_UpdateMusic)
ld [wc0f0], a ld [wAudioSavedROMBank], a
jr nz, .asm_70495 jr nz, .next
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, BANK(Music_PkmnHealed) ld a, BANK(Music_PkmnHealed)
ld [wc0ef], a ld [wAudioROMBank], a
.asm_70495 .next
ld a, MUSIC_PKMN_HEALED ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld d, $28 ld d, $28
call FlashSprite8Times call FlashSprite8Times
.asm_704a2 .waitLoop2
ld a, [wc026] ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED cp MUSIC_PKMN_HEALED ; is the healed music still playing?
jr z, .asm_704a2 jr z, .waitLoop2 ; if so, check gain
ld c, 32 ld c, 32
call DelayFrames call DelayFrames
pop af pop af

12
engine/overworld/npc_movement.asm
View file

@ -163,10 +163,10 @@ PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510)
PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514)
ld a, BANK(Music_MuseumGuy) ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY ld a, MUSIC_MUSEUM_GUY
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
swap a swap a
@ -219,10 +219,10 @@ PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d)
PewterMovementScript_WalkToGym: ; 1a581 (6:6581) PewterMovementScript_WalkToGym: ; 1a581 (6:6581)
ld a, BANK(Music_MuseumGuy) ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY ld a, MUSIC_MUSEUM_GUY
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
swap a swap a

12
engine/overworld/pokecenter.asm
View file

@ -24,12 +24,12 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6)
predef HealParty predef HealParty
callba AnimateHealingMachine ; do the healing machine animation callba AnimateHealingMachine ; do the healing machine animation
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, [wc0f0] ld a, [wAudioSavedROMBank]
ld [wc0ef], a ld [wAudioROMBank], a
ld a, [wd35b] ld a, [wMapMusicSoundID]
ld [wcfca], a ld [wLastMusicSoundID], a
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld hl, PokemonFightingFitText ld hl, PokemonFightingFitText
call PrintText call PrintText

4
engine/slot_machine.asm
View file

@ -411,7 +411,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588)
call PrintText call PrintText
.done .done
xor a xor a
ld [wc002], a ld [wMuteAudioAndPauseMusic], a
ret ret
.rollWheel3DownByOneSymbol .rollWheel3DownByOneSymbol
call SlotMachine_AnimWheel3 call SlotMachine_AnimWheel3
@ -654,7 +654,7 @@ SlotMachine_PrintPayoutCoins: ; 3775f (d:775f)
SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b)
ld a, $1 ld a, $1
ld [wc002], a ld [wMuteAudioAndPauseMusic], a
call WaitForSoundToFinish call WaitForSoundToFinish
; Put 1 in the temp coins variable. This value is added to the player's coins ; Put 1 in the temp coins variable. This value is added to the player's coins

6
engine/titlescreen.asm
View file

@ -18,8 +18,8 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, BANK(Music_TitleScreen) ld a, BANK(Music_TitleScreen)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
DisplayTitleScreen: ; 42dd (1:42dd) DisplayTitleScreen: ; 42dd (1:42dd)
call GBPalWhiteOut call GBPalWhiteOut
@ -219,7 +219,7 @@ ENDC
call Delay3 call Delay3
call WaitForSoundToFinish call WaitForSoundToFinish
ld a, MUSIC_TITLE_SCREEN ld a, MUSIC_TITLE_SCREEN
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
xor a xor a
ld [wcc5b], a ld [wcc5b], a

52
home.asm
View file

@ -332,9 +332,9 @@ GetCryData:: ; 13d9 (0:13d9)
ld a, [hli] ld a, [hli]
ld b, a ; cry id ld b, a ; cry id
ld a, [hli] ld a, [hli]
ld [wc0f1], a ld [wFrequencyModifier], a
ld a, [hl] ld a, [hl]
ld [wc0f2], a ld [wTempoModifier], a
call BankswitchBack call BankswitchBack
; Cry headers have 3 channels, ; Cry headers have 3 channels,
@ -998,27 +998,27 @@ ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4)
xor a xor a
jp FillMemory jp FillMemory
Func_28cb:: ; 28cb (0:28cb) FadeOutAudio:: ; 28cb (0:28cb)
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
and a and a
jr nz, .asm_28dc jr nz, .asm_28dc
ld a, [wd72c] ld a, [wd72c]
bit 1, a bit 1, a
ret nz ret nz
ld a, $77 ld a, $77
ld [$ff24], a ld [rNR50], a
ret ret
.asm_28dc .asm_28dc
ld a, [wcfc9] ld a, [wAudioFadeOutCounter]
and a and a
jr z, .asm_28e7 jr z, .counterReachedZero
dec a dec a
ld [wcfc9], a ld [wAudioFadeOutCounter], a
ret ret
.asm_28e7 .counterReachedZero
ld a, [wcfc8] ld a, [wAudioFadeOutCounterReloadValue]
ld [wcfc9], a ld [wAudioFadeOutCounter], a
ld a, [$ff24] ld a, [rNR50]
and a and a
jr z, .asm_2903 jr z, .asm_2903
ld b, a ld b, a
@ -1031,20 +1031,20 @@ Func_28cb:: ; 28cb (0:28cb)
dec a dec a
swap a swap a
or c or c
ld [$ff24], a ld [rNR50], a
ret ret
.asm_2903 .asm_2903
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
ld b, a ld b, a
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, [wc0f0] ld a, [wAudioSavedROMBank]
ld [wc0ef], a ld [wAudioROMBank], a
ld a, b ld a, b
ld [wc0ee], a ld [wNewSoundID], a
jp PlaySound jp PlaySound
; this function is used to display sign messages, sprite dialog, etc. ; this function is used to display sign messages, sprite dialog, etc.
@ -2604,12 +2604,12 @@ PlayTrainerMusic:: ; 33e8 (0:33e8)
and a and a
ret nz ret nz
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, $ff ld a, $ff
call PlaySound call PlaySound
ld a, BANK(Music_MeetEvilTrainer) ld a, BANK(Music_MeetEvilTrainer)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, [wEngagedTrainerClass] ld a, [wEngagedTrainerClass]
ld b, a ld b, a
ld hl, EvilTrainerList ld hl, EvilTrainerList
@ -2634,7 +2634,7 @@ PlayTrainerMusic:: ; 33e8 (0:33e8)
.maleTrainer .maleTrainer
ld a, MUSIC_MEET_MALE_TRAINER ld a, MUSIC_MEET_MALE_TRAINER
.PlaySound .PlaySound
ld [wc0ee], a ld [wNewSoundID], a
jp PlaySound jp PlaySound
INCLUDE "data/trainer_types.asm" INCLUDE "data/trainer_types.asm"
@ -3217,8 +3217,8 @@ WaitForSoundToFinish:: ; 3748 (0:3748)
and $80 and $80
ret nz ret nz
push hl push hl
.asm_374f .waitLoop
ld hl, wc02a ld hl, wChannelSoundIDs + CH4
xor a xor a
or [hl] or [hl]
inc hl inc hl
@ -3226,7 +3226,7 @@ WaitForSoundToFinish:: ; 3748 (0:3748)
inc hl inc hl
inc hl inc hl
or [hl] or [hl]
jr nz, .asm_374f jr nz, .waitLoop
pop hl pop hl
ret ret

233
home/audio.asm
View file

@ -3,112 +3,139 @@ PlayDefaultMusic:: ; 2307 (0:2307)
xor a xor a
ld c, a ld c, a
ld d, a ld d, a
ld [wcfca], a ld [wLastMusicSoundID], a
jr Func_2324 jr PlayDefaultMusicCommon
Func_2312:: ; 2312 (0:2312) PlayDefaultMusicFadeOutCurrent:: ; 2312 (0:2312)
ld c, $a ; Fade out the current music and then play the default music.
ld d, $0 ld c, 10
ld d, 0
ld a, [wd72e] ld a, [wd72e]
bit 5, a bit 5, a ; has a battle just ended?
jr z, Func_2324 jr z, PlayDefaultMusicCommon
xor a xor a
ld [wcfca], a ld [wLastMusicSoundID], a
ld c, $8 ld c, 8
ld d, c ld d, c
Func_2324:: ; 2324 (0:2324)
PlayDefaultMusicCommon:: ; 2324 (0:2324)
ld a, [wWalkBikeSurfState] ld a, [wWalkBikeSurfState]
and a and a
jr z, .asm_2343 jr z, .walking
cp $2 cp $2
jr z, .asm_2332 jr z, .surfing
ld a, MUSIC_BIKE_RIDING ld a, MUSIC_BIKE_RIDING
jr .asm_2334 jr .next
.asm_2332
.surfing
ld a, MUSIC_SURFING ld a, MUSIC_SURFING
.asm_2334
.next
ld b, a ld b, a
ld a, d ld a, d
and a and a ; should current music be faded out first?
ld a, BANK(Music_BikeRiding) ld a, BANK(Music_BikeRiding)
jr nz, .asm_233e jr nz, .next2
ld [wc0ef], a
.asm_233e ; Only change the audio ROM bank if the current music isn't going to be faded
ld [wc0f0], a ; out before the default music begins.
jr .asm_234c ld [wAudioROMBank], a
.asm_2343
ld a, [wd35b] .next2
; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the
; current music (if the current music is faded out).
ld [wAudioSavedROMBank], a
jr .next3
.walking
ld a, [wMapMusicSoundID]
ld b, a ld b, a
call Func_2385 call CompareMapMusicBankWithCurrentBank
jr c, .asm_2351 jr c, .next4
.asm_234c
ld a, [wcfca] .next3
cp b ld a, [wLastMusicSoundID]
ret z cp b ; is the default music already playing?
.asm_2351 ret z ; if so, do nothing
.next4
ld a, c ld a, c
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, b ld a, b
ld [wcfca], a ld [wLastMusicSoundID], a
ld [wc0ee], a ld [wNewSoundID], a
jp PlaySound jp PlaySound
Func_235f:: ; 235f (0:235f) UpdateMusic6Times:: ; 235f (0:235f)
ld a, [wc0ef] ; This is called when entering a map, before fading out the current music and
; playing the default music (i.e. the map's music or biking/surfing music).
ld a, [wAudioROMBank]
ld b, a ld b, a
cp BANK(Audio1_UpdateMusic) cp BANK(Audio1_UpdateMusic)
jr nz, .checkForAudio2 jr nz, .checkForAudio2
.audio1
; audio 1
ld hl, Audio1_UpdateMusic ld hl, Audio1_UpdateMusic
jr .asm_2378 jr .next
.checkForAudio2 .checkForAudio2
cp BANK(Audio2_UpdateMusic) cp BANK(Audio2_UpdateMusic)
jr nz, .audio3 jr nz, .audio3
.audio2
; audio 2
ld hl, Audio2_UpdateMusic ld hl, Audio2_UpdateMusic
jr .asm_2378 jr .next
.audio3 .audio3
ld hl, Audio3_UpdateMusic ld hl, Audio3_UpdateMusic
.asm_2378
ld c, $6 .next
.asm_237a ld c, 6
.loop
push bc push bc
push hl push hl
call Bankswitch call Bankswitch
pop hl pop hl
pop bc pop bc
dec c dec c
jr nz, .asm_237a jr nz, .loop
ret ret
Func_2385:: ; 2385 (0:2385) CompareMapMusicBankWithCurrentBank:: ; 2385 (0:2385)
ld a, [wd35c] ; Compares the map music's audio ROM bank with the current audio ROM bank
; and updates the audio ROM bank variables.
; Returns whether the banks are different in carry.
ld a, [wMapMusicROMBank]
ld e, a ld e, a
ld a, [wc0ef] ld a, [wAudioROMBank]
cp e cp e
jr nz, .asm_2394 jr nz, .differentBanks
ld [wc0f0], a ld [wAudioSavedROMBank], a
and a and a
ret ret
.asm_2394 .differentBanks
ld a, c ld a, c ; this is a fade-out counter value and it's always non-zero
and a and a
ld a, e ld a, e
jr nz, .asm_239c jr nz, .next
ld [wc0ef], a ; If the fade-counter is non-zero, we don't change the audio ROM bank because
.asm_239c ; it's needed to keep playing the music as it fades out. The FadeOutAudio
ld [wc0f0], a ; routine will take care of copying [wAudioSavedROMBank] to [wAudioROMBank]
; when the music has faded out.
ld [wAudioROMBank], a
.next
ld [wAudioSavedROMBank], a
scf scf
ret ret
PlayMusic:: ; 23a1 (0:23a1) PlayMusic:: ; 23a1 (0:23a1)
ld b, a ld b, a
ld [wc0ee], a ld [wNewSoundID], a
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, c ld a, c
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, b ld a, b
; plays music specified by a. If value is $ff, music is stopped ; plays music specified by a. If value is $ff, music is stopped
@ -117,66 +144,74 @@ PlaySound:: ; 23b1 (0:23b1)
push de push de
push bc push bc
ld b, a ld b, a
ld a, [wc0ee] ld a, [wNewSoundID]
and a and a
jr z, .asm_23c8 jr z, .next
xor a xor a
ld [wc02a], a ld [wChannelSoundIDs + CH4], a
ld [wc02b], a ld [wChannelSoundIDs + CH5], a
ld [wc02c], a ld [wChannelSoundIDs + CH6], a
ld [wc02d], a ld [wChannelSoundIDs + CH7], a
.asm_23c8 .next
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
and a and a ; has a fade-out length been specified?
jr z, .asm_23e3 jr z, .noFadeOut
ld a, [wc0ee] ld a, [wNewSoundID]
and a and a ; is the new sound ID 0?
jr z, .asm_2425 jr z, .done ; if so, do nothing
xor a xor a
ld [wc0ee], a ld [wNewSoundID], a
ld a, [wcfca] ld a, [wLastMusicSoundID]
cp $ff cp $ff ; has the music been stopped?
jr nz, .asm_2414 jr nz, .fadeOut ; if not, fade out the current music
; If it has been stopped, start playing the new music immediately.
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
.asm_23e3 .noFadeOut
xor a xor a
ld [wc0ee], a ld [wNewSoundID], a
ld a, [H_LOADEDROMBANK] ld a, [H_LOADEDROMBANK]
ld [$ffb9], a ld [hSavedROMBank], a
ld a, [wc0ef] ld a, [wAudioROMBank]
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [MBC1RomBank], a ld [MBC1RomBank], a
cp BANK(Audio1_9876) cp BANK(Audio1_PlaySound)
jr nz, .checkForAudio2 jr nz, .checkForAudio2
.audio1
; audio 1
ld a, b ld a, b
call Audio1_9876 call Audio1_PlaySound
jr .asm_240b jr .next2
.checkForAudio2 .checkForAudio2
cp BANK(Audio2_22035) cp BANK(Audio2_PlaySound)
jr nz, .audio3 jr nz, .audio3
.audio2
; audio 2
ld a, b ld a, b
call Audio2_22035 call Audio2_PlaySound
jr .asm_240b jr .next2
.audio3 .audio3
ld a, b ld a, b
call Audio3_7d8ea call Audio3_PlaySound
.asm_240b
ld a, [$ffb9] .next2
ld a, [hSavedROMBank]
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [MBC1RomBank], a ld [MBC1RomBank], a
jr .asm_2425 jr .done
.asm_2414
.fadeOut
ld a, b ld a, b
ld [wcfca], a ld [wLastMusicSoundID], a
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
ld [wcfc8], a ld [wAudioFadeOutCounterReloadValue], a
ld [wcfc9], a ld [wAudioFadeOutCounter], a
ld a, b ld a, b
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
.asm_2425
.done
pop bc pop bc
pop de pop de
pop hl pop hl

14
home/init.asm
View file

@ -98,8 +98,8 @@ rLCDC_DEFAULT EQU %11100011
predef LoadSGB predef LoadSGB
ld a, BANK(SFX_Shooting_Star) ld a, BANK(SFX_Shooting_Star)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
ld a, $9c ld a, $9c
ld [H_AUTOBGTRANSFERDEST + 1], a ld [H_AUTOBGTRANSFERDEST + 1], a
xor a xor a
@ -127,11 +127,11 @@ ClearVram:
StopAllSounds:: StopAllSounds::
ld a, BANK(Audio1_UpdateMusic) ld a, BANK(Audio1_UpdateMusic)
ld [wc0ef], a ld [wAudioROMBank], a
ld [wc0f0], a ld [wAudioSavedROMBank], a
xor a xor a
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld [wc0ee], a ld [wNewSoundID], a
ld [wcfca], a ld [wLastMusicSoundID], a
dec a dec a
jp PlaySound jp PlaySound

22
home/overworld.asm
View file

@ -658,7 +658,7 @@ CheckMapConnections:: ; 07ba (0:07ba)
ld [wCurrentTileBlockMapViewPointer + 1],a ld [wCurrentTileBlockMapViewPointer + 1],a
.loadNewMap ; load the connected map that was entered .loadNewMap ; load the connected map that was entered
call LoadMapHeader call LoadMapHeader
call Func_2312 ; music call PlayDefaultMusicFadeOutCurrent
ld b,$09 ld b,$09
call GoPAL_SET call GoPAL_SET
; Since the sprite set shouldn't change, this will just update VRAM slots at ; Since the sprite set shouldn't change, this will just update VRAM slots at
@ -750,16 +750,16 @@ HandleBlackOut::
ld [MBC1RomBank], a ld [MBC1RomBank], a
call ResetStatusAndHalveMoneyOnBlackout call ResetStatusAndHalveMoneyOnBlackout
call SpecialWarpIn call SpecialWarpIn
call Func_2312 call PlayDefaultMusicFadeOutCurrent
jp SpecialEnterMap jp SpecialEnterMap
StopMusic:: StopMusic::
ld [wMusicHeaderPointer], a ld [wAudioFadeOutControl], a
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.wait .wait
ld a, [wMusicHeaderPointer] ld a, [wAudioFadeOutControl]
and a and a
jr nz, .wait jr nz, .wait
jp StopAllSounds jp StopAllSounds
@ -1224,7 +1224,7 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
call CheckTilePassable call CheckTilePassable
jr nc,.noCollision jr nc,.noCollision
.collision .collision
ld a,[wc02a] ld a,[wChannelSoundIDs + CH4]
cp a,SFX_COLLISION ; check if collision sound is already playing cp a,SFX_COLLISION ; check if collision sound is already playing
jr z,.setCarry jr z,.setCarry
ld a,SFX_COLLISION ld a,SFX_COLLISION
@ -1927,7 +1927,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
jr z,.stopSurfing ; stop surfing if the tile is passable jr z,.stopSurfing ; stop surfing if the tile is passable
jr .loop jr .loop
.collision .collision
ld a,[wc02a] ld a,[wChannelSoundIDs + CH4]
cp a,SFX_COLLISION ; check if collision sound is already playing cp a,SFX_COLLISION ; check if collision sound is already playing
jr z,.setCarry jr z,.setCarry
ld a,SFX_COLLISION ld a,SFX_COLLISION
@ -2279,9 +2279,9 @@ LoadMapHeader:: ; 107c (0:107c)
add hl,bc add hl,bc
add hl,bc add hl,bc
ld a,[hli] ld a,[hli]
ld [wd35b],a ; music 1 ld [wMapMusicSoundID],a ; music 1
ld a,[hl] ld a,[hl]
ld [wd35c],a ; music 2 ld [wMapMusicROMBank],a ; music 2
pop af pop af
ld [H_LOADEDROMBANK],a ld [H_LOADEDROMBANK],a
ld [MBC1RomBank],a ld [MBC1RomBank],a
@ -2352,8 +2352,8 @@ LoadMapData:: ; 1241 (0:1241)
ld a,[W_FLAGS_D733] ld a,[W_FLAGS_D733]
bit 1,a bit 1,a
jr nz,.restoreRomBank jr nz,.restoreRomBank
call Func_235f ; music related call UpdateMusic6Times
call Func_2312 ; music related call PlayDefaultMusicFadeOutCurrent
.restoreRomBank .restoreRomBank
pop af pop af
ld [H_LOADEDROMBANK],a ld [H_LOADEDROMBANK],a

12
home/vblank.asm
View file

@ -38,21 +38,21 @@ VBlank::
ld a, [H_VBLANKOCCURRED] ld a, [H_VBLANKOCCURRED]
and a and a
jr z, .vblanked jr z, .skipZeroing
xor a xor a
ld [H_VBLANKOCCURRED], a ld [H_VBLANKOCCURRED], a
.vblanked
.skipZeroing
ld a, [H_FRAMECOUNTER] ld a, [H_FRAMECOUNTER]
and a and a
jr z, .decced jr z, .skipDec
dec a dec a
ld [H_FRAMECOUNTER], a ld [H_FRAMECOUNTER], a
.decced
call Func_28cb .skipDec
call FadeOutAudio
ld a, [wc0ef] ; music ROM bank ld a, [wAudioROMBank] ; music ROM bank
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [MBC1RomBank], a ld [MBC1RomBank], a

4
hram.asm
View file

@ -182,7 +182,9 @@ hJoy5 EQU $FFB5
hJoy6 EQU $FFB6 hJoy6 EQU $FFB6
hJoy7 EQU $FFB7 hJoy7 EQU $FFB7
H_LOADEDROMBANK EQU $FFB8 H_LOADEDROMBANK EQU $FFB8
hSavedROMBank EQU $FFB9
; is automatic background transfer during V-blank enabled? ; is automatic background transfer during V-blank enabled?
; if nonzero, yes ; if nonzero, yes

4
scripts/ceruleancity.asm
View file

@ -65,7 +65,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
and a and a
jr z, .asm_19512 jr z, .asm_19512
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.asm_19512 .asm_19512
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
@ -172,7 +172,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $1 ld a, $1

4
scripts/oakslab.asm
View file

@ -511,7 +511,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld [hJoyHeld], a ld [hJoyHeld], a
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $15 ld a, $15
@ -612,7 +612,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call FillMemory call FillMemory
ld [hl], $ff ld [hl], $ff
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $1 ld a, $1

4
scripts/pewterpokecenter.asm
View file

@ -59,9 +59,9 @@ PewterPokecenterText3: ; 5c59b (17:459b)
ld c, 24 ld c, 24
call DelayFrames call DelayFrames
ld a, [wc026] ld a, [wChannelSoundIDs]
ld b, a ld b, a
ld a, [wc027] ld a, [wChannelSoundIDs + CH1]
or b or b
jr nz, .loop jr nz, .loop

4
scripts/pokemontower2.asm
View file

@ -23,7 +23,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
@ -77,7 +77,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
call MoveSprite call MoveSprite
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $2 ld a, $2

8
scripts/redshouse1f.asm
View file

@ -29,14 +29,14 @@ MomHealPokemon: ; 4818a (12:418a)
call ReloadMapData call ReloadMapData
predef HealParty predef HealParty
ld a, MUSIC_PKMN_HEALED ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.next .next
ld a, [wc026] ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED cp MUSIC_PKMN_HEALED
jr z, .next jr z, .next
ld a, [wd35b] ld a, [wMapMusicSoundID]
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
call GBFadeInFromWhite call GBFadeInFromWhite
ld hl, MomHealText2 ld hl, MomHealText2

10
scripts/route22.asm
View file

@ -89,7 +89,7 @@ Route22Script0: ; 50f00 (14:4f00)
and a and a
jr z, .asm_50f4e jr z, .asm_50f4e
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.asm_50f4e .asm_50f4e
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
@ -168,7 +168,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, [wcf0d] ld a, [wcf0d]
@ -242,11 +242,11 @@ Route22Script_5104e: ; 5104e (14:504e)
and a and a
jr z, .skipYVisibilityTesta jr z, .skipYVisibilityTesta
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.skipYVisibilityTesta .skipYVisibilityTesta
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateTempo callba Music_RivalAlternateTempo
ld a, $2 ld a, $2
@ -327,7 +327,7 @@ Route22Script5: ; 510df (14:50df)
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStartAndTempo callba Music_RivalAlternateStartAndTempo
ld a, [wcf0d] ld a, [wcf0d]

4
scripts/silphco7.asm
View file

@ -131,7 +131,7 @@ SilphCo7Script0: ; 51c23 (14:5c23)
ld a, PLAYER_DIR_DOWN ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
@ -220,7 +220,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld de, MovementData_51d1d ld de, MovementData_51d1d

4
scripts/ssanne2.asm
View file

@ -25,7 +25,7 @@ SSAnne2Script0: ; 613be (18:53be)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
@ -146,7 +146,7 @@ SSAnne2Script2: ; 6146d (18:546d)
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
call MoveSprite call MoveSprite
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $3 ld a, $3

12
scripts/ssanne7.asm
View file

@ -44,21 +44,21 @@ SSAnne7Text1: ; 618ad (18:58ad)
SSAnne7RubText: ; 618ec (18:58ec) SSAnne7RubText: ; 618ec (18:58ec)
TX_FAR _SSAnne7RubText TX_FAR _SSAnne7RubText
TX_ASM TX_ASM
ld a, [wc0ef] ld a, [wAudioROMBank]
cp BANK(Audio3_UpdateMusic) cp BANK(Audio3_UpdateMusic)
ld [wc0f0], a ld [wAudioSavedROMBank], a
jr nz, .asm_61908 jr nz, .asm_61908
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld a, Bank(Music_PkmnHealed) ld a, Bank(Music_PkmnHealed)
ld [wc0ef], a ld [wAudioROMBank], a
.asm_61908 .asm_61908
ld a, MUSIC_PKMN_HEALED ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
.asm_61910 .asm_61910
ld a, [wc026] ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED cp MUSIC_PKMN_HEALED
jr z, .asm_61910 jr z, .asm_61910
call PlayDefaultMusic call PlayDefaultMusic

2
scripts/vermiliondock.asm
View file

@ -40,7 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
SetEventForceReuseHL EVENT_SS_ANNE_LEFT SetEventForceReuseHL EVENT_SS_ANNE_LEFT
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wc0ee], a ld [wNewSoundID], a
call PlaySound call PlaySound
ld c, BANK(Music_Surfing) ld c, BANK(Music_Surfing)
ld a, MUSIC_SURFING ld a, MUSIC_SURFING

239
wram.asm
View file

@ -61,66 +61,146 @@ ENDM
SECTION "WRAM Bank 0", WRAM0 SECTION "WRAM Bank 0", WRAM0
wc000:: ds 1 wUnusedC000:: ; c000
wc001:: ds 1 ds 1
wc002:: ds 1
wc003:: ds 1 wSoundID:: ; c001
wc004:: ds 1 ds 1
wc005:: ds 1
wc006:: ds 8 wMuteAudioAndPauseMusic:: ; c002
wc00e:: ds 4 ; bit 7: whether sound has been muted
wc012:: ds 4 ; all bits: whether the effective is active
wc016:: ds 16 ; Store 1 to activate effect (any value in the range [1, 127] works).
wc026:: ds 1 ; All audio is muted and music is paused. Sfx continues playing until it
wc027:: ds 1 ; ends normally.
wc028:: ds 2 ; Store 0 to resume music.
wc02a:: ds 1 ds 1
wc02b:: ds 1
wc02c:: ds 1 wDisableChannelOutputWhenSfxEnds:: ; c003
wc02d:: ds 1 ds 1
wc02e:: ds 8
wc036:: ds 8 wStereoPanning:: ; c004
wc03e:: ds 8 ds 1
wc046:: ds 8
wc04e:: ds 8 wSavedVolume:: ; c005
wc056:: ds 8 ds 1
wc05e:: ds 8
wc066:: ds 8 wChannelCommandPointers:: ; c006
wc06e:: ds 8 ds 16
wc076:: ds 8
wc07e:: ds 8 wChannelReturnAddresses:: ; c016
wc086:: ds 8 ds 16
wc08e:: ds 8
wc096:: ds 8 wChannelSoundIDs:: ; c026
wc09e:: ds 8 ds 8
wc0a6:: ds 8
wc0ae:: ds 8 wChannelFlags1:: ; c02e
wc0b6:: ds 8 ds 8
wc0be:: ds 8
wc0c6:: ds 8 wChannelFlags2:: ; c036
wc0ce:: ds 1 ds 8
wc0cf:: ds 1
wc0d0:: ds 1 wChannelDuties:: ; c03e
wc0d1:: ds 1 ds 8
wc0d2:: ds 1
wc0d3:: ds 1 wChannelDutyCycles:: ; c046
wc0d4:: ds 1 ds 8
wc0d5:: ds 1
wc0d6:: ds 8 wChannelVibratoDelayCounters:: ; c04e
wc0de:: ds 8 ; reloaded at the beginning of a note. counts down until the vibrato begins.
wc0e6:: ds 1 ds 8
wc0e7:: ds 1
wc0e8:: ds 1 wChannelVibratoExtents:: ; c056
wc0e9:: ds 1 ds 8
wc0ea:: ds 1
wc0eb:: ds 1 wChannelVibratoRates:: ; c05e
wc0ec:: ds 1 ; high nybble is rate (counter reload value) and low nybble is counter.
wc0ed:: ds 1 ; time between applications of vibrato.
wc0ee:: ds 1 ds 8
wc0ef:: ds 1
wc0f0:: ds 1 wChannelFrequencyLowBytes:: ; c066
wc0f1:: ds 1 ds 8
wc0f2:: ds 14
wChannelVibratoDelayCounterReloadValues:: ; c06e
; delay of the beginning of the vibrato from the start of the note
ds 8
wChannelPitchBendLengthModifiers:: ; c076
ds 8
wChannelPitchBendFrequencySteps:: ; c07e
ds 8
wChannelPitchBendFrequencyStepsFractionalPart:: ; c086
ds 8
wChannelPitchBendCurrentFrequencyFractionalPart:: ; c08e
ds 8
wChannelPitchBendCurrentFrequencyHighBytes:: ; c096
ds 8
wChannelPitchBendCurrentFrequencyLowBytes:: ; c09e
ds 8
wChannelPitchBendTargetFrequencyHighBytes:: ; c0a6
ds 8
wChannelPitchBendTargetFrequencyLowBytes:: ; c0ae
ds 8
wChannelNoteDelayCounters:: ; c0b6
; Note delays are stored as 16-bit fixed-point numbers where the integer part
; is 8 bits and the fractional part is 8 bits.
ds 8
wChannelLoopCounters:: ; c0be
ds 8
wChannelNoteSpeeds:: ; c0c6
ds 8
wChannelNoteDelayCountersFractionalPart:: ; c0ce
ds 8
wChannelOctaves:: ; c0d6
ds 8
wChannelVolumes:: ; c0de
; also includes fade for hardware channels that support it
ds 8
wMusicWaveInstrument::
ds 1
wSfxWaveInstrument::
ds 1
wMusicTempo:: ; c0e8
ds 2
wSfxTempo:: ; c0ea
ds 2
wSfxHeaderPointer:: ; c0ec
ds 2
wNewSoundID:: ; c0ee
ds 1
wAudioROMBank:: ; c0ef
ds 1
wAudioSavedROMBank:: ; c0f0
ds 1
wFrequencyModifier:: ; c0f1
ds 1
wTempoModifier:: ; c0f2
ds 1
ds 13
SECTION "Sprite State Data", WRAM0[$c100] SECTION "Sprite State Data", WRAM0[$c100]
@ -1289,13 +1369,35 @@ wTileInFrontOfPlayer:: ; cfc6
; background tile number in front of the player (either 1 or 2 steps ahead) ; background tile number in front of the player (either 1 or 2 steps ahead)
ds 1 ds 1
wMusicHeaderPointer:: ; cfc7 wAudioFadeOutControl:: ; cfc7
; (the current music channel address - $4000) / 3 ; The desired fade counter reload value is stored here prior to calling
; PlaySound in order to cause the current music to fade out before the new
; music begins playing. Storing 0 causes no fade out to occur and the new music
; to begin immediately.
; This variable has another use related to fade-out, as well. PlaySound stores
; the sound ID of the music that should be played after the fade-out is finished
; in this variable. FadeOutAudio checks if it's non-zero every V-Blank and
; fades out the current audio if it is. Once it has finished fading out the
; audio, it zeroes this variable and starts playing the sound ID stored in it.
ds 1 ds 1
wcfc8:: ds 1 ; used with audio wAudioFadeOutCounterReloadValue:: ; cfc8
wcfc9:: ds 1 ; also used with audio ds 1
wcfca:: ds 1 ; also used with audio too
wAudioFadeOutCounter:: ; cfc9
ds 1
wLastMusicSoundID:: ; cfca
; This is used to determine whether the default music is already playing when
; attempting to play the default music (in order to avoid restarting the same
; music) and whether the music has already been stopped when attempting to
; fade out the current music (so that the new music can be begin immediately
; instead of waiting).
; It sometimes contains the sound ID of the last music played, but it may also
; contain $ff (if the music has been stopped) or 0 (because some routines zero
; it in order to prevent assumptions from being made about the current state of
; the music).
ds 1
wUpdateSpritesEnabled:: ; cfcb wUpdateSpritesEnabled:: ; cfcb
; $00 = causes sprites to be hidden and the value to change to $ff ; $00 = causes sprites to be hidden and the value to change to $ff
@ -2126,8 +2228,11 @@ wLetterPrintingDelayFlags:: ; d358
wPlayerID:: ; d359 wPlayerID:: ; d359
ds 2 ds 2
wd35b:: ds 1 ; used with audio stuff wMapMusicSoundID:: ; d35b
wd35c:: ds 1 ; storage for audio bank for current map? ds 1
wMapMusicROMBank:: ; d35c
ds 1
wMapPalOffset:: ; d35d wMapPalOffset:: ; d35d
; offset subtracted from FadePal4 to get the background and object palettes for the current map ; offset subtracted from FadePal4 to get the background and object palettes for the current map