diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-03 17:44:40 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-03 17:44:40 -0400 |
| commit | 79aa0bfbc6d11532129d1457545eebd88ea7b70a (patch) | |
| tree | 79f5bc6378a3fbe9436bbe807493994758dbc1a2 | |
| parent | fbeac8adb657c01192d2c755a45005b0f0f3c332 (diff) | |
bank1f audio.
Also move yellow/audio.asm to audio.asm
| -rw-r--r-- | audio.asm | 93 | ||||
| -rw-r--r-- | audio/engine_3.asm | 1613 | ||||
| -rw-r--r-- | audio/headers/musicheaders3.asm | 8 | ||||
| -rw-r--r-- | audio/music/dungeon1.asm | 2 | ||||
| -rw-r--r-- | audio/sfx/save_3.asm | 11 | ||||
| -rw-r--r-- | audio/sfx/shooting_star.asm | 2 | ||||
| -rw-r--r-- | home/audio.asm | 4 | ||||
| -rwxr-xr-x | yellow/audio.asm | 455 | ||||
| -rwxr-xr-x | yellow/main.asm | 7 |
9 files changed, 106 insertions, 2089 deletions
@@ -49,7 +49,7 @@ INCLUDE "audio/sfx/triangle3_1.asm" INCLUDE "audio/sfx/muted_snare2_1.asm" INCLUDE "audio/sfx/muted_snare3_1.asm" INCLUDE "audio/sfx/muted_snare4_1.asm" - +; Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/start_menu_1.asm" INCLUDE "audio/sfx/pokeflute.asm" INCLUDE "audio/sfx/cut_1.asm" @@ -123,7 +123,6 @@ INCLUDE "audio/sfx/cry1f_1.asm" INCLUDE "audio/sfx/cry20_1.asm" INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] @@ -146,7 +145,7 @@ INCLUDE "audio/sfx/triangle3_2.asm" INCLUDE "audio/sfx/muted_snare2_2.asm" INCLUDE "audio/sfx/muted_snare3_2.asm" INCLUDE "audio/sfx/muted_snare4_2.asm" - +;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/press_ab_2.asm" INCLUDE "audio/sfx/start_menu_2.asm" INCLUDE "audio/sfx/tink_2.asm" @@ -158,6 +157,7 @@ INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" +INCLUDE "audio/sfx/swap_2.asm" ; added in yellow INCLUDE "audio/sfx/pokeflute_ch3.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" @@ -246,7 +246,7 @@ INCLUDE "audio/sfx/cry1f_2.asm" INCLUDE "audio/sfx/cry20_2.asm" INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" +;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] @@ -269,7 +269,7 @@ INCLUDE "audio/sfx/triangle3_3.asm" INCLUDE "audio/sfx/muted_snare2_3.asm" INCLUDE "audio/sfx/muted_snare3_3.asm" INCLUDE "audio/sfx/muted_snare4_3.asm" - +;Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/start_menu_3.asm" INCLUDE "audio/sfx/cut_3.asm" INCLUDE "audio/sfx/go_inside_3.asm" @@ -351,24 +351,20 @@ INCLUDE "audio/sfx/cry1f_3.asm" INCLUDE "audio/sfx/cry20_3.asm" INCLUDE "audio/sfx/cry21_3.asm" INCLUDE "audio/sfx/cry22_3.asm" -Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" - SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] -PlayBattleMusic:: ; 0x90c6 +PlayBattleMusic:: ; 9064 (2:5064) xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a - dec a - ld [wNewSoundID], a - call PlaySound ; stop music + call StopAllMusic call DelayFrame - ld c, BANK(Music_GymLeaderBattle) + ld c, $8 ; BANK(Music_GymLeaderBattle) ld a, [W_GYMLEADERNO] and a jr z, .notGymLeaderBattle - ld a, MUSIC_GYM_LEADER_BATTLE + ld a, $ea ; MUSIC_GYM_LEADER_BATTLE jr .playSong .notGymLeaderBattle ld a, [W_CUROPPONENT] @@ -378,16 +374,16 @@ PlayBattleMusic:: ; 0x90c6 jr z, .finalBattle cp OPP_LANCE jr nz, .normalTrainerBattle - ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme + ld a, $ea ; MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme jr .playSong .normalTrainerBattle - ld a, MUSIC_TRAINER_BATTLE + ld a, $ed ; MUSIC_TRAINER_BATTLE jr .playSong .finalBattle - ld a, MUSIC_FINAL_BATTLE + ld a, $f3 ; MUSIC_FINAL_BATTLE jr .playSong .wildBattle - ld a, MUSIC_WILD_BATTLE + ld a, $f0 ; MUSIC_WILD_BATTLE .playSong jp PlayMusic @@ -396,7 +392,7 @@ INCLUDE "audio/engine_1.asm" ; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: ; 0x9b47 +Music_RivalAlternateStart:: ; 99bd (2:59bd) ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -407,7 +403,7 @@ Music_RivalAlternateStart:: ; 0x9b47 call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Audio1_OverwriteChannelPointer: ; 0x9b60 +Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) ld a, e ld [hli], a ld a, d @@ -415,23 +411,24 @@ Audio1_OverwriteChannelPointer: ; 0x9b60 ret ; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: ; 0x9b65 +Music_RivalAlternateTempo:: ; 99db (2:59db) ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b119 - jp Audio1_OverwriteChannelPointer - + jr asm_99ed + ; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: ; 0x9b75 +Music_RivalAlternateStartAndTempo:: ; 99e7 (2:59e7) call Music_RivalAlternateStart - ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b19b +asm_99ed: ; 99ed (2:59ed) + ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer + ret ; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: ; 0x9b81 +Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a @@ -440,16 +437,15 @@ Music_Cities1AlternateTempo:: ; 0x9b81 ld c, 100 call DelayFrames ; wait for the fade-out to finish ld c, BANK(Music_Cities1) - ld a, MUSIC_CITIES1 + ld a, $c3 ; MUSIC_CITIES1 call PlayMusic ld hl, wChannelCommandPointers ld de, Music_Cities1_branch_aa6f jp Audio1_OverwriteChannelPointer - SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] -Music_DoLowHealthAlarm:: ; 2136e (8:536e) +Music_DoLowHealthAlarm:: ; 2131e (8:531e) ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -525,35 +521,13 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e) .toneDataSilence db $00,$00,$00,$80 - INCLUDE "engine/menu/bills_pc.asm" INCLUDE "audio/engine_2.asm" - -Music_PokeFluteInBattle:: ; 22306 (8:6306) - ; begin playing the "caught mon" sound effect - ld a, SFX_CAUGHT_MON - call PlaySoundWaitForCurrent - ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 - call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 - call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 - -Audio2_OverwriteChannelPointer: ; 2231d (8:631d) - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret - - SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -PlayPokedexRatingSfx:: ; 7d13b (1f:513b) +PlayPokedexRatingSfx:: ; 7d0d6 (1f:50d6) ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues @@ -565,9 +539,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) jr .getSfxPointer .gotSfxPointer push bc - ld a, $ff - ld [wNewSoundID], a - call PlaySoundWaitForCurrent + call StopAllMusic pop bc ld b, $0 ld hl, PokedexRatingSfxPointers @@ -578,7 +550,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) call PlayMusic jp PlayDefaultMusic -PokedexRatingSfxPointers: ; 7d162 (1f:5162) +PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) db SFX_DENIED, BANK(SFX_Denied_3) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) @@ -587,16 +559,18 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162) db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) -OwnedMonValues: ; 7d170 (1f:5170) +OwnedMonValues: ; 7d106 (1f:5106) db 10, 40, 60, 90, 120, 150, $ff - + INCLUDE "audio/engine_3.asm" SECTION "Music 1", ROMX, BANK[AUDIO_1] +Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" + INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" INCLUDE "audio/music/routes2.asm" @@ -626,7 +600,6 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" @@ -664,4 +637,4 @@ INCLUDE "audio/music/surfing.asm" INCLUDE "audio/music/jigglypuffsong.asm" INCLUDE "audio/music/halloffame.asm" INCLUDE "audio/music/credits.asm" - +INCLUDE "audio/music/yellowintro.asm"
\ No newline at end of file diff --git a/audio/engine_3.asm b/audio/engine_3.asm index c7254405..7aa446cd 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,1363 +1,21 @@ ; The third of three duplicated sound engines. -Audio3_UpdateMusic:: ; 7d177 (1f:5177) - ld c, CH0 -.loop - ld b, $0 - ld hl, wChannelSoundIDs - add hl, bc - ld a, [hl] - and a - jr z, .nextChannel - ld a, c - cp CH4 - jr nc, .applyAffects ; if sfx channel - ld a, [wMuteAudioAndPauseMusic] - and a - jr z, .applyAffects - bit 7, a - jr nz, .nextChannel - set 7, a - ld [wMuteAudioAndPauseMusic], a - xor a - ld [rNR51], a - ld [rNR30], a - ld a, $80 - ld [rNR30], a - jr .nextChannel -.applyAffects - call Audio3_ApplyMusicAffects -.nextChannel - ld a, c - inc c ; inc channel number - cp CH7 - jr nz, .loop - ret - -; this routine checks flags for music effects currently applied -; to the channel and calls certain functions based on flags. -; known flags for wChannelFlags1: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag -Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) - ld b, $0 - ld hl, wChannelNoteDelayCounters ; delay until next note - add hl, bc - ld a, [hl] - cp $1 ; if delay is 1, play next note - jp z, Audio3_PlayNextNote - dec a ; otherwise, decrease the delay timer - ld [hl], a - ld a, c - cp CH4 - jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 - add hl, bc - ld a, [hl] - and a - jr z, .startChecks - ret -.startChecks - ld hl, wChannelFlags1 - add hl, bc - bit 6, [hl] ; dutycycle - jr z, .checkForExecuteMusic - call Audio3_ApplyDutyCycle -.checkForExecuteMusic - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit 0, [hl] - jr nz, .checkForPitchBend - ld hl, wChannelFlags1 - add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato -.checkForPitchBend - ld hl, wChannelFlags1 - add hl, bc - bit 4, [hl] ; pitchbend - jr z, .checkVibratoDelay - jp Audio3_ApplyPitchBend -.checkVibratoDelay - ld hl, wChannelVibratoDelayCounters ; vibrato delay - add hl, bc - ld a, [hl] - and a ; check if delay is over - jr z, .checkForVibrato - dec [hl] ; otherwise, dec delay -.disablePitchBendVibrato - ret -.checkForVibrato - ld hl, wChannelVibratoExtents ; vibrato rate - add hl, bc - ld a, [hl] - and a - jr nz, .vibrato - ret ; no vibrato -.vibrato - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - ld a, [hl] - and $f - and a - jr z, .vibratoAlreadyDone - dec [hl] ; apply vibrato pitch change - ret -.vibratoAlreadyDone - ld a, [hl] - swap [hl] - or [hl] - ld [hl], a ; reset the vibrato value and start again - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld e, [hl] ; get note pitch - ld hl, wChannelFlags1 - add hl, bc - bit 3, [hl] ; this is the only code that sets/resets bit three so - jr z, .unset ; it continuously alternates which path it takes - res 3, [hl] - ld a, d - and $f - ld d, a - ld a, e - sub d - jr nc, .noCarry - ld a, $0 -.noCarry - jr .done -.unset - set 3, [hl] - ld a, d - and $f0 - swap a - add e - jr nc, .done - ld a, $ff -.done - ld d, a - ld b, $3 - call Audio3_7d8ac - ld [hl], d - ret - -; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return -; until the first note is reached -Audio3_PlayNextNote: ; 7d244 (1f:5244) - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld a, [hl] - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a - ld hl, wChannelFlags1 - add hl, bc - res 4, [hl] - res 5, [hl] - call Audio3_endchannel - ret - -Audio3_endchannel: ; 7d25a (1f:525a) - call Audio3_GetNextMusicByte - ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio3_callchannel ; no - ld b, $0 ; yes - ld hl, wChannelFlags1 - add hl, bc - bit 1, [hl] - jr nz, .returnFromCall - ld a, c - cp CH3 - jr nc, .noiseOrSfxChannel - jr .asm_7d2b3 -.noiseOrSfxChannel - res 2, [hl] - ld hl, wChannelFlags2 - add hl, bc - res 0, [hl] - cp CH6 - jr nz, .notSfxChannel3 - ld a, $0 - ld [rNR30], a - ld a, $80 - ld [rNR30], a -.notSfxChannel3 - jr nz, .asm_7d296 - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr z, .asm_7d296 - xor a - ld [wDisableChannelOutputWhenSfxEnds], a - jr .asm_7d2b3 -.asm_7d296 - jr .asm_7d2bc -.returnFromCall - res 1, [hl] - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl ; store current channel address - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hl], a ; loads channel address to return to - jp Audio3_endchannel -.asm_7d2b3 - ld hl, Unknown_7db93 - add hl, bc - ld a, [rNR51] - and [hl] - ld [rNR51], a -.asm_7d2bc - ld a, [wChannelSoundIDs + CH4] - cp $14 - jr nc, .asm_7d2c5 - jr .asm_7d2e2 -.asm_7d2c5 - ld a, [wChannelSoundIDs + CH4] - cp $86 - jr z, .asm_7d2e2 - jr c, .asm_7d2d0 - jr .asm_7d2e2 -.asm_7d2d0 - ld a, c - cp CH4 - jr z, .asm_7d2d9 - call Audio3_7d73b - ret c -.asm_7d2d9 - ld a, [wSavedVolume] - ld [rNR50], a - xor a - ld [wSavedVolume], a -.asm_7d2e2 - ld hl, wChannelSoundIDs - add hl, bc - ld [hl], b - ret - -Audio3_callchannel: ; 7d2e8 (1f:52e8) - cp $fd ; is this command a callchannel? - jp nz, Audio3_loopchannel ; no - call Audio3_GetNextMusicByte ; yes - push af - call Audio3_GetNextMusicByte - ld d, a - pop af - ld e, a - push de ; store pointer - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [hli] - ld [de], a - inc de - ld a, [hld] - ld [de], a ; copy current channel address - pop de - ld [hl], e - inc hl - ld [hl], d ; overwrite current address with pointer - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set 1, [hl] ; set the call flag - jp Audio3_endchannel - -Audio3_loopchannel: ; 7d31d (1f:531d) - cp $fe ; is this command a loopchannel? - jp nz, Audio3_notetype ; no - call Audio3_GetNextMusicByte ; yes - ld e, a - and a - jr z, .infiniteLoop - ld b, $0 - ld hl, wChannelLoopCounters - add hl, bc - ld a, [hl] - cp e - jr nz, .loopAgain - ld a, $1 ; if no more loops to make - ld [hl], a - call Audio3_GetNextMusicByte ; skip pointer - call Audio3_GetNextMusicByte - jp Audio3_endchannel -.loopAgain ; inc loop count - inc a - ld [hl], a - ; fall through -.infiniteLoop ; overwrite current address with pointer - call Audio3_GetNextMusicByte - push af - call Audio3_GetNextMusicByte - ld b, a - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - pop af - ld [hli], a - ld [hl], b - jp Audio3_endchannel - -Audio3_notetype: ; 7d358 (1f:5358) - and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio3_toggleperfectpitch ; no - ld a, d ; yes - and $f - ld b, $0 - ld hl, wChannelNoteSpeeds - add hl, bc - ld [hl], a ; store low nibble as speed - ld a, c - cp CH3 - jr z, .noiseChannel ; noise channel has 0 params - call Audio3_GetNextMusicByte - ld d, a - ld a, c - cp CH2 - jr z, .musicChannel3 - cp CH6 - jr nz, .notChannel3 - ld hl, wSfxWaveInstrument - jr .sfxChannel3 -.musicChannel3 - ld hl, wMusicWaveInstrument -.sfxChannel3 - ld a, d - and $f - ld [hl], a ; store low nibble of param as duty - ld a, d - and $30 - sla a - ld d, a - ; fall through - - ; if channel 3, store high nibble as volume - ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 - ld hl, wChannelVolumes - add hl, bc - ld [hl], d -.noiseChannel - jp Audio3_endchannel - -Audio3_toggleperfectpitch: ; 7d397 (1f:5397) - ld a, d - cp $e8 ; is this command a toggleperfectpitch? - jr nz, Audio3_vibrato ; no - ld b, $0 ; yes - ld hl, wChannelFlags1 - add hl, bc - ld a, [hl] - xor $1 - ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio3_endchannel - -Audio3_vibrato: ; 7d3a9 (1f:53a9) - cp $ea ; is this command a vibrato? - jr nz, Audio3_pitchbend ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a ; store delay - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld [hl], a ; store delay - call Audio3_GetNextMusicByte - ld d, a - and $f0 - swap a - ld b, $0 - ld hl, wChannelVibratoExtents - add hl, bc - srl a - ld e, a - adc b - swap a - or e - ld [hl], a ; store rate as both high and low nibbles - ld a, d - and $f - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - swap a - or d - ld [hl], a ; store depth as both high and low nibbles - jp Audio3_endchannel - -Audio3_pitchbend: ; 7d3e1 (1f:53e1) - cp $eb ; is this command a pitchbend? - jr nz, Audio3_duty ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelPitchBendLengthModifiers - add hl, bc - ld [hl], a ; store first param - call Audio3_GetNextMusicByte - ld d, a - and $f0 - swap a - ld b, a - ld a, d - and $f - call Audio3_7d8cc - ld b, $0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set 4, [hl] ; set pitchbend flag - call Audio3_GetNextMusicByte - ld d, a - jp Audio3_notelength - -Audio3_duty: ; 7d419 (1f:5419) - cp $ec ; is this command a duty? - jr nz, Audio3_tempo ; no - call Audio3_GetNextMusicByte ; yes - rrca - rrca - and $c0 - ld b, $0 - ld hl, wChannelDuties - add hl, bc - ld [hl], a ; store duty - jp Audio3_endchannel - -Audio3_tempo: ; 7d42e (1f:542e) - cp $ed ; is this command a tempo? - jr nz, Audio3_stereopanning ; no - ld a, c ; yes - cp CH4 - jr nc, .sfxChannel - call Audio3_GetNextMusicByte - ld [wMusicTempo], a ; store first param - call Audio3_GetNextMusicByte - ld [wMusicTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 1], a - ld [wChannelNoteDelayCountersFractionalPart + 2], a - ld [wChannelNoteDelayCountersFractionalPart + 3], a - jr .musicChannelDone -.sfxChannel - call Audio3_GetNextMusicByte - ld [wSfxTempo], a ; store first param - call Audio3_GetNextMusicByte - ld [wSfxTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 5], a - ld [wChannelNoteDelayCountersFractionalPart + 6], a - ld [wChannelNoteDelayCountersFractionalPart + 7], a -.musicChannelDone - jp Audio3_endchannel - -Audio3_stereopanning: ; 7d46e (1f:546e) - cp $ee ; is this command a stereopanning? - jr nz, Audio3_unknownmusic0xef ; no - call Audio3_GetNextMusicByte ; yes - ld [wStereoPanning], a ; store panning - jp Audio3_endchannel - -; this appears to never be used -Audio3_unknownmusic0xef: ; 7d47b (1f:547b) - cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio3_dutycycle ; no - call Audio3_GetNextMusicByte ; yes - push bc - call Audio3_PlaySound - pop bc - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skip - ld a, [wChannelSoundIDs + CH7] - ld [wDisableChannelOutputWhenSfxEnds], a - xor a - ld [wChannelSoundIDs + CH7], a -.skip - jp Audio3_endchannel - -Audio3_dutycycle: ; 7d49a (1f:549a) - cp $fc ; is this command a dutycycle? - jr nz, Audio3_volume ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties - add hl, bc - ld [hl], a ; store first duty - ld hl, wChannelFlags1 - add hl, bc - set 6, [hl] ; set duty flag - jp Audio3_endchannel - -Audio3_volume: ; 7d4b8 (1f:54b8) - cp $f0 ; is this command a volume? - jr nz, Audio3_executemusic ; no - call Audio3_GetNextMusicByte ; yes - ld [rNR50], a ; store volume - jp Audio3_endchannel - -Audio3_executemusic: ; 7d4c4 (1f:54c4) - cp $f8 ; is this command an executemusic? - jr nz, Audio3_octave ; no - ld b, $0 ; yes - ld hl, wChannelFlags2 - add hl, bc - set 0, [hl] - jp Audio3_endchannel - -Audio3_octave: ; 7d4d3 (1f:54d3) - and $f0 - cp $e0 ; is this command an octave? - jr nz, Audio3_unknownsfx0x20 ; no - ld hl, wChannelOctaves ; yes - ld b, $0 - add hl, bc - ld a, d - and $f - ld [hl], a ; store low nibble as octave - jp Audio3_endchannel - -Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio3_unknownsfx0x10 ; no - ld a, c - cp CH3 ; is this a noise or sfx channel? - jr c, Audio3_unknownsfx0x10 ; no - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit 0, [hl] - jr nz, Audio3_unknownsfx0x10 ; no - call Audio3_notelength ; yes - ld d, a - ld b, $0 - ld hl, wChannelDuties - add hl, bc - ld a, [hl] - or d - ld d, a - ld b, $1 - call Audio3_7d8ac - ld [hl], d - call Audio3_GetNextMusicByte - ld d, a - ld b, $2 - call Audio3_7d8ac - ld [hl], d - call Audio3_GetNextMusicByte - ld e, a - ld a, c - cp CH7 - ld a, $0 - jr z, .sfxNoiseChannel ; only two params for noise channel - push de - call Audio3_GetNextMusicByte - pop de -.sfxNoiseChannel - ld d, a - push de - call Audio3_7d69d - call Audio3_7d66c - pop de - call Audio3_7d6bf - ret - -Audio3_unknownsfx0x10: ; 7d533 (1f:5533) - ld a, c - cp CH4 - jr c, Audio3_note ; if not a sfx - ld a, d - cp $10 ; is this command an unknownsfx0x10? - jr nz, Audio3_note ; no - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit 0, [hl] - jr nz, Audio3_note ; no - call Audio3_GetNextMusicByte ; yes - ld [rNR10], a - jp Audio3_endchannel - -Audio3_note: ; 7d54f (1f:554f) - ld a, c - cp CH3 - jr nz, Audio3_notelength ; if not noise channel - ld a, d - and $f0 - cp $b0 ; is this command a dnote? - jr z, Audio3_dnote ; yes - jr nc, Audio3_notelength ; no - swap a - ld b, a - ld a, d - and $f - ld d, a - ld a, b - push de - push bc - jr asm_7d571 - -Audio3_dnote: ; 7d569 (1f:5569) - ld a, d - and $f - push af - push bc - call Audio3_GetNextMusicByte ; get dnote instrument -asm_7d571 - ld d, a - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .asm_7d57c - ld a, d - call Audio3_PlaySound -.asm_7d57c - pop bc - pop de - -Audio3_notelength: ; 7d57e (1f:557e) - ld a, d - push af - and $f - inc a - ld b, $0 - ld e, a ; store note length (in 16ths) - ld d, b - ld hl, wChannelNoteSpeeds - add hl, bc - ld a, [hl] - ld l, b - call Audio3_7d8bb - ld a, c - cp CH4 - jr nc, .sfxChannel - ld a, [wMusicTempo] - ld d, a - ld a, [wMusicTempo + 1] - ld e, a - jr .skip -.sfxChannel - ld d, $1 - ld e, $0 - cp CH7 - jr z, .skip ; if noise channel - call Audio3_7d707 - ld a, [wSfxTempo] - ld d, a - ld a, [wSfxTempo + 1] - ld e, a -.skip - ld a, l - ld b, $0 - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld l, [hl] - call Audio3_7d8bb - ld e, l - ld d, h - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld [hl], e - ld a, d - ld hl, wChannelNoteDelayCounters - add hl, bc - ld [hl], a - ld hl, wChannelFlags2 - add hl, bc - bit 0, [hl] - jr nz, Audio3_notepitch - ld hl, wChannelFlags1 - add hl, bc - bit 2, [hl] - jr z, Audio3_notepitch - pop hl - ret - -Audio3_notepitch: ; 7d5dc (1f:55dc) - pop af - and $f0 - cp $c0 ; compare to rest - jr nz, .notRest - ld a, c - cp CH4 - jr nc, .sfxChannel - ld hl, wChannelSoundIDs + CH4 - add hl, bc - ld a, [hl] - and a - jr nz, .quit - ; fall through -.sfxChannel - ld a, c - cp CH2 - jr z, .musicChannel3 - cp CH6 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_7db93 - add hl, bc - ld a, [rNR51] - and [hl] - ld [rNR51], a - jr .quit -.notSfxChannel3 - ld b, $2 - call Audio3_7d8ac - ld a, $8 - ld [hli], a - inc hl - ld a, $80 - ld [hl], a -.quit - ret -.notRest - swap a - ld b, $0 - ld hl, wChannelOctaves - add hl, bc - ld b, [hl] - call Audio3_7d8cc - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - bit 4, [hl] - jr z, .asm_7d62c - call Audio3_7d803 -.asm_7d62c - push de - ld a, c - cp CH4 - jr nc, .skip ; if sfx Channel - ld hl, wChannelSoundIDs + CH4 - ld d, $0 - ld e, a - add hl, de - ld a, [hl] - and a - jr nz, .done - jr .skip -.done - pop de - ret -.skip - ld b, $0 - ld hl, wChannelVolumes - add hl, bc - ld d, [hl] - ld b, $2 - call Audio3_7d8ac - ld [hl], d - call Audio3_7d69d - call Audio3_7d66c - pop de - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - bit 0, [hl] ; has toggleperfectpitch been used? - jr z, .skip2 - inc e ; if yes, increment the pitch by 1 - jr nc, .skip2 - inc d -.skip2 - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld [hl], e - call Audio3_7d6bf - ret - -Audio3_7d66c: ; 7d66c (1f:566c) - ld b, $0 - ld hl, Unknown_7db9b - add hl, bc - ld a, [rNR51] - or [hl] - ld d, a - ld a, c - cp CH7 - jr z, .sfxNoiseChannel - cp CH4 - jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 - add hl, bc - ld a, [hl] - and a - jr nz, .skip -.sfxNoiseChannel - ld a, [wStereoPanning] - ld hl, Unknown_7db9b - add hl, bc - and [hl] - ld d, a - ld a, [rNR51] - ld hl, Unknown_7db93 - add hl, bc - and [hl] - or d - ld d, a -.skip - ld a, d - ld [rNR51], a - ret - -Audio3_7d69d: ; 7d69d (1f:569d) - ld b, $0 - ld hl, wChannelNoteDelayCounters - add hl, bc - ld d, [hl] - ld a, c - cp CH2 - jr z, .channel3 ; if music channel 3 - cp CH6 - jr z, .channel3 ; if sfx channel 3 - ld a, d - and $3f - ld d, a - ld hl, wChannelDuties - add hl, bc - ld a, [hl] - or d - ld d, a -.channel3 - ld b, $1 - call Audio3_7d8ac - ld [hl], d - ret - -Audio3_7d6bf: ; 7d6bf (1f:56bf) - ld a, c - cp CH2 - jr z, .channel3 - cp CH6 - jr nz, .notSfxChannel3 - ; fall through -.channel3 - push de - ld de, wMusicWaveInstrument - cp CH2 - jr z, .musicChannel3 - ld de, wSfxWaveInstrument -.musicChannel3 - ld a, [de] - add a - ld d, $0 - ld e, a - ld hl, Audio3_WavePointers - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld hl, $ff30 - ld b, $f - ld a, $0 - ld [rNR30], a -.loop - ld a, [de] - inc de - ld [hli], a - ld a, b - dec b - and a - jr nz, .loop - ld a, $80 - ld [rNR30], a - pop de -.notSfxChannel3 - ld a, d - or $80 - and $c7 - ld d, a - ld b, $3 - call Audio3_7d8ac - ld [hl], e - inc hl - ld [hl], d - call Audio3_7d729 - ret - -Audio3_7d707: ; 7d707 (1f:5707) - call Audio3_7d759 - jr nc, .asm_7d71f - ld d, $0 - ld a, [wTempoModifier] - add $80 - jr nc, .asm_7d716 - inc d -.asm_7d716 - ld [wSfxTempo + 1], a - ld a, d - ld [wSfxTempo], a - jr .asm_7d728 -.asm_7d71f - xor a - ld [wSfxTempo + 1], a - ld a, $1 - ld [wSfxTempo], a -.asm_7d728 - ret - -Audio3_7d729: ; 7d729 (1f:5729) - call Audio3_7d759 - jr nc, .asm_7d73a - ld a, [wFrequencyModifier] - add e - jr nc, .asm_7d735 - inc d -.asm_7d735 - dec hl - ld e, a - ld [hl], e - inc hl - ld [hl], d -.asm_7d73a - ret - -Audio3_7d73b: ; 7d73b (1f:573b) - call Audio3_7d759 - jr nc, .asm_7d756 - ld hl, wChannelCommandPointers - ld e, c - ld d, $0 - sla e - rl d - add hl, de - ld a, [hl] - sub $1 - ld [hl], a - inc hl - ld a, [hl] - sbc $0 - ld [hl], a - scf - ret -.asm_7d756 - scf - ccf - ret - -Audio3_7d759: ; 7d759 (1f:5759) - ld a, [wChannelSoundIDs + CH4] - cp $14 - jr nc, .asm_7d762 - jr .asm_7d768 -.asm_7d762 - cp $86 - jr z, .asm_7d768 - jr c, .asm_7d76b -.asm_7d768 - scf - ccf - ret -.asm_7d76b - scf - ret - -Audio3_ApplyPitchBend: ; 7d76d (1f:576d) - ld hl, wChannelFlags1 - add hl, bc - bit 5, [hl] - jp nz, .asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps - add hl, bc - ld l, [hl] - ld h, b - add hl, de - ld d, h - ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - add hl, bc - push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - pop hl - add [hl] - ld [hl], a - ld a, $0 - adc e - ld e, a - ld a, $0 - adc d - ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - cp d - jp c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - cp e - jp c, .asm_7d7fa - jr .asm_7d7e7 -.asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, bc - ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps - add hl, bc - ld e, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - add a - ld [hl], a - ld a, e - sbc b - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, bc - ld a, d - cp [hl] - jr c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, bc - ld a, e - cp [hl] - jr c, .asm_7d7fa -.asm_7d7e7 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld b, $3 - call Audio3_7d8ac - ld a, e - ld [hli], a - ld [hl], d - ret -.asm_7d7fa - ld hl, wChannelFlags1 - add hl, bc - res 4, [hl] - res 5, [hl] - ret - -Audio3_7d803: ; 7d803 (1f:5803) - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelNoteDelayCounters - add hl, bc - ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers - add hl, bc - sub [hl] - jr nc, .asm_7d81b - ld a, $1 -.asm_7d81b - ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, bc - ld a, e - sub [hl] - ld e, a - ld a, d - sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, bc - sub [hl] - jr c, .asm_7d837 - ld d, a - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set 5, [hl] - jr .asm_7d85a -.asm_7d837 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - sub d - ld d, a - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - res 5, [hl] -.asm_7d85a - ld hl, wChannelPitchBendLengthModifiers - add hl, bc -.asm_7d85e - inc b - ld a, e - sub [hl] - ld e, a - jr nc, .asm_7d85e - ld a, d - and a - jr z, .asm_7d86c - dec a - ld d, a - jr .asm_7d85e -.asm_7d86c - ld a, e - add [hl] - ld d, b - ld b, $0 - ld hl, wChannelPitchBendFrequencySteps - add hl, bc - ld [hl], d - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - add hl, bc - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - add hl, bc - ld [hl], a - ret - -Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) - ld b, $0 - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - rlca - rlca - ld [hl], a - and $c0 - ld d, a - ld b, $1 - call Audio3_7d8ac - ld a, [hl] - and $3f - or d - ld [hl], a - ret - -Audio3_GetNextMusicByte: ; 7d899 (1f:5899) - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - ld a, [hli] - ld e, a - ld a, [hld] - ld d, a - ld a, [de] ; get next music command - inc de - ld [hl], e ; store address of next command - inc hl - ld [hl], d - ret - -Audio3_7d8ac: ; 7d8ac (1f:58ac) - ld a, c - ld hl, Unknown_7db8b - add l - jr nc, .noCarry - inc h -.noCarry - ld l, a - ld a, [hl] - add b - ld l, a - ld h, $ff - ret - -Audio3_7d8bb: ; 7d8bb (1f:58bb) - ld h, $0 -.loop - srl a - jr nc, .noCarry - add hl, de -.noCarry - sla e - rl d - and a - jr z, .done - jr .loop -.done - ret - -Audio3_7d8cc: ; 7d8cc (1f:58cc) - ld h, $0 - ld l, a - add hl, hl - ld d, h - ld e, l - ld hl, Audio3_Pitches - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld a, b -.loop - cp $7 - jr z, .done - sra d - rr e - inc a - jr .loop -.done - ld a, $8 - add d - ld d, a - ret - -Audio3_PlaySound:: ; 7d8ea (1f:58ea) +Audio3_PlaySound:: ; 7d10d (1f:510d) ld [wSoundID], a + ld a, [wSoundID] cp $ff - jp z, Audio3_7daa8 + jp z, Audio3_7d18e cp $c2 - jp z, Audio3_7d9c2 - jp c, Audio3_7d9c2 - cp $fe - jr z, .asm_7d901 - jp nc, Audio3_7d9c2 -.asm_7d901 - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMusicTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, $8 - ld hl, wChannelReturnAddresses - call FillAudioRAM3 - ld hl, wChannelCommandPointers - call FillAudioRAM3 - ld d, $4 - ld hl, wChannelSoundIDs - call FillAudioRAM3 - ld hl, wChannelFlags1 - call FillAudioRAM3 - ld hl, wChannelDuties - call FillAudioRAM3 - ld hl, wChannelDutyCycles - call FillAudioRAM3 - ld hl, wChannelVibratoDelayCounters - call FillAudioRAM3 - ld hl, wChannelVibratoExtents - call FillAudioRAM3 - ld hl, wChannelVibratoRates - call FillAudioRAM3 - ld hl, wChannelFrequencyLowBytes - call FillAudioRAM3 - ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM3 - ld hl, wChannelFlags2 - call FillAudioRAM3 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM3 - ld a, $1 - ld hl, wChannelLoopCounters - call FillAudioRAM3 - ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 - ld hl, wChannelNoteSpeeds - call FillAudioRAM3 - ld [wMusicTempo], a - ld a, $ff - ld [wStereoPanning], a - xor a - ld [rNR50], a - ld a, $8 - ld [rNR10], a - ld a, $0 - ld [rNR51], a - xor a - ld [rNR30], a - ld a, $80 - ld [rNR30], a - ld a, $77 - ld [rNR50], a - jp Audio3_7db03 - -Audio3_7d9c2: ; 7d9c2 (1f:59c2) + jp z, Audio3_7d12d + jp c, Audio3_7d12d + cp $fd + jr z, .asm_7d127 + jp nc, Audio3_7d12d +.asm_7d127 + call Func_22aa + jp Audio3_7d192 + +Audio3_7d12d: ; 7d12d (1f:512d) ld l, a ld e, a ld h, $0 @@ -1375,7 +33,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) rlca rlca ld c, a -.asm_7d9db +.asm_7d146 ld d, c ld a, c add a @@ -1396,167 +54,38 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) add hl, de ld a, [hl] and a - jr z, .asm_7da17 + jr z, .asm_7d182 ld a, e cp $7 - jr nz, .asm_7da0e + jr nz, .asm_7d179 ld a, [wSoundID] cp $14 - jr nc, .asm_7da07 + jr nc, .asm_7d172 ret -.asm_7da07 +.asm_7d172 ld a, [hl] cp $14 - jr z, .asm_7da17 - jr c, .asm_7da17 -.asm_7da0e + jr z, .asm_7d182 + jr c, .asm_7d182 +.asm_7d179 ld a, [wSoundID] cp [hl] - jr z, .asm_7da17 - jr c, .asm_7da17 + jr z, .asm_7d182 + jr c, .asm_7d182 ret -.asm_7da17 - xor a - push de - ld h, d - ld l, e - add hl, hl - ld d, h - ld e, l - ld hl, wChannelReturnAddresses - add hl, de - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers - add hl, de - ld [hli], a - ld [hl], a - pop de - ld hl, wChannelSoundIDs - add hl, de - ld [hl], a - ld hl, wChannelFlags1 - add hl, de - ld [hl], a - ld hl, wChannelDuties - add hl, de - ld [hl], a - ld hl, wChannelDutyCycles - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelVibratoExtents - add hl, de - ld [hl], a - ld hl, wChannelVibratoRates - add hl, de - ld [hl], a - ld hl, wChannelFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, de - ld [hl], a - ld hl, wChannelPitchBendLengthModifiers - add hl, de - ld [hl], a - ld hl, wChannelPitchBendFrequencySteps - add hl, de - ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelFlags2 - add hl, de - ld [hl], a - ld a, $1 - ld hl, wChannelLoopCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteSpeeds - add hl, de - ld [hl], a - ld a, e - cp $4 - jr nz, .asm_7da9f - ld a, $8 - ld [rNR10], a -.asm_7da9f +.asm_7d182 + call Func_22c0 ld a, c and a - jp z, Audio3_7db03 + jp z, Audio3_7d192 dec c - jp .asm_7d9db + jp .asm_7d146 -Audio3_7daa8: ; 7daa8 (1f:5aa8) - ld a, $80 - ld [rNR52], a - ld [rNR30], a - xor a - ld [rNR51], a - ld [rNR32], a - ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], a - ld a, $40 - ld [rNR14], a - ld [rNR24], a - ld [rNR44], a - ld a, $77 - ld [rNR50], a - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMuteAudioAndPauseMusic], a - ld [wMusicTempo + 1], a - ld [wSfxTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, $a0 - ld hl, wChannelCommandPointers - call FillAudioRAM3 - ld a, $1 - ld d, $18 - ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 - ld [wMusicTempo], a - ld [wSfxTempo], a - ld a, $ff - ld [wStereoPanning], a +Audio3_7d18e: ; 7d18e (1f:518e) + call Func_22d6 ret -; fills d bytes at hl with a -FillAudioRAM3: ; 7dafd (1f:5afd) - ld b, d -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -Audio3_7db03: ; 7db03 (1f:5b03) +Audio3_7d192: ; 7d192 (1f:5192) ld a, [wSoundID] ld l, a ld e, a @@ -1581,30 +110,25 @@ Audio3_7db03: ; 7db03 (1f:5b03) inc b inc de ld c, $0 -.asm_7db25 +.asm_7d1b4 cp c - jr z, .asm_7db2d + jr z, .asm_7d1bc inc c inc hl inc hl - jr .asm_7db25 -.asm_7db2d + jr .asm_7d1b4 +.asm_7d1bc + push af push hl push bc - push af ld b, $0 ld c, a - ld hl, wChannelSoundIDs - add hl, bc - ld a, [wSoundID] - ld [hl], a - pop af cp $3 - jr c, .asm_7db46 + jr c, .asm_7d1cc ld hl, wChannelFlags1 add hl, bc set 2, [hl] -.asm_7db46 +.asm_7d1cc pop bc pop hl ld a, [de] ; get channel pointer @@ -1613,24 +137,35 @@ Audio3_7db03: ; 7db03 (1f:5b03) ld a, [de] ld [hli], a inc de + pop af + push hl + push bc + ld b, $0 + ld c, a + ld hl, wChannelSoundIDs + add hl, bc + ld a, [wSoundID] + ld [hl], a + pop bc + pop hl inc c dec b ld a, b and a ld a, [de] inc de - jr nz, .asm_7db25 + jr nz, .asm_7d1b4 ld a, [wSoundID] cp $14 - jr nc, .asm_7db5f - jr .asm_7db89 -.asm_7db5f + jr nc, .asm_7d1f5 + jr .asm_7d21f +.asm_7d1f5 ld a, [wSoundID] cp $86 - jr z, .asm_7db89 - jr c, .asm_7db6a - jr .asm_7db89 -.asm_7db6a + jr z, .asm_7d21f + jr c, .asm_7d200 + jr .asm_7d21f +.asm_7d200 ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a @@ -1643,41 +178,13 @@ Audio3_7db03: ; 7db03 (1f:5b03) ld [hl], d ; overwrite pointer to point to endchannel ld a, [wSavedVolume] and a - jr nz, .asm_7db89 + jr nz, .asm_7d21f ld a, [rNR50] ld [wSavedVolume], a ld a, $77 ld [rNR50], a -.asm_7db89 +.asm_7d21f ret -Noise3_endchannel: ; 7db8a (1f:5b8a) - endchannel - -Unknown_7db8b: ; 7db8b (1f:5b8b) - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 - -Unknown_7db93: ; 7db93 (1f:5b93) - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 - -Unknown_7db9b: ; 7db9b (1f:5b9b) - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 - -Audio3_Pitches: ; 7dba3 (1f:5ba3) - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ - - +Noise3_endchannel: ; 7d220 (1f:5220) + endchannel
\ No newline at end of file diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 75633a7a..be83f2ee 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -65,12 +65,12 @@ Music_GameCorner:: ; 7c28b (1f:428b) dw Music_GameCorner_Ch3 Music_IntroBattle:: ; 7c294 (1f:4294) - db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch1 + db ( $80 | CH0 ) + dw Music_YellowIntro_Ch1 db CH1 - dw Music_IntroBattle_Ch2 + dw Music_YellowIntro_Ch2 db CH2 - dw Music_IntroBattle_Ch3 + dw Music_YellowIntro_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: ; 7c2a0 (1f:42a0) diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index ac6b3e07..27e4deb9 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -6,10 +6,8 @@ Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) vibrato 10, 1, 4 notetype 12, 4, 13 rest 8 - stereopanning 237 octave 4 F# 8 - stereopanning 255 Music_Dungeon1_branch_7dee5:: notetype 12, 11, 2 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 70b6a81c..e0c8ce2b 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,19 +1,18 @@ SFX_Save_3_Ch1: ; 7c45e (1f:445e) duty 2 - unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 3, 228, 0, 6 unknownsfx0x20 3, 228, 128, 6 unknownsfx0x20 3, 228, 192, 6 unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 + unknownsfx0x20 15, 242, 224, 7 endchannel - SFX_Save_3_Ch2: ; 7c475 (1f:4475) duty 2 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 3, 212, 1, 7 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 3, 196, 1, 6 unknownsfx0x20 3, 196, 129, 6 unknownsfx0x20 3, 196, 193, 6 unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 + unknownsfx0x20 15, 210, 225, 7 endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 2cb831c8..09dc4bf9 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,5 +1,5 @@ SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) - dutycycle 228 + dutycycle 136 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 unknownsfx0x20 4, 96, 224, 7 diff --git a/home/audio.asm b/home/audio.asm index 004ac32a..e165d80d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -298,10 +298,10 @@ Func_22ec:: ; 22ec (0:22ec) call Audio2_PlaySound jr .done .checkForBank1F - cp BANK(Func_7d10d) + cp BANK(Audio3_PlaySound) jr nz, .bank20 ld a, b - call Func_7d10d + call Audio3_PlaySound jr .done .bank20 ld a,b diff --git a/yellow/audio.asm b/yellow/audio.asm index 3313f764..b61fccd8 100755 --- a/yellow/audio.asm +++ b/yellow/audio.asm @@ -1,455 +1,2 @@ -AUDIO_1 EQU $2 -AUDIO_2 EQU $8 -AUDIO_3 EQU $1f - -INCLUDE "constants.asm" INCLUDE "charmap.asm" - -SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/headers/sfxheaders1.asm" - -SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/headers/sfxheaders2.asm" - -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/headers/musicheaders1.asm" - -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/headers/musicheaders2.asm" - -SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] - -INCLUDE "audio/sfx/snare1_1.asm" -INCLUDE "audio/sfx/snare2_1.asm" -INCLUDE "audio/sfx/snare3_1.asm" -INCLUDE "audio/sfx/snare4_1.asm" -INCLUDE "audio/sfx/snare5_1.asm" -INCLUDE "audio/sfx/triangle1_1.asm" -INCLUDE "audio/sfx/triangle2_1.asm" -INCLUDE "audio/sfx/snare6_1.asm" -INCLUDE "audio/sfx/snare7_1.asm" -INCLUDE "audio/sfx/snare8_1.asm" -INCLUDE "audio/sfx/snare9_1.asm" -INCLUDE "audio/sfx/cymbal1_1.asm" -INCLUDE "audio/sfx/cymbal2_1.asm" -INCLUDE "audio/sfx/cymbal3_1.asm" -INCLUDE "audio/sfx/muted_snare1_1.asm" -INCLUDE "audio/sfx/triangle3_1.asm" -INCLUDE "audio/sfx/muted_snare2_1.asm" -INCLUDE "audio/sfx/muted_snare3_1.asm" -INCLUDE "audio/sfx/muted_snare4_1.asm" - -INCLUDE "audio/sfx/start_menu_1.asm" -INCLUDE "audio/sfx/pokeflute.asm" -INCLUDE "audio/sfx/cut_1.asm" -INCLUDE "audio/sfx/go_inside_1.asm" -INCLUDE "audio/sfx/swap_1.asm" -INCLUDE "audio/sfx/tink_1.asm" -INCLUDE "audio/sfx/59_1.asm" -INCLUDE "audio/sfx/purchase_1.asm" -INCLUDE "audio/sfx/collision_1.asm" -INCLUDE "audio/sfx/go_outside_1.asm" -INCLUDE "audio/sfx/press_ab_1.asm" -INCLUDE "audio/sfx/save_1.asm" -INCLUDE "audio/sfx/heal_hp_1.asm" -INCLUDE "audio/sfx/poisoned_1.asm" -INCLUDE "audio/sfx/heal_ailment_1.asm" -INCLUDE "audio/sfx/trade_machine_1.asm" -INCLUDE "audio/sfx/turn_on_pc_1.asm" -INCLUDE "audio/sfx/turn_off_pc_1.asm" -INCLUDE "audio/sfx/enter_pc_1.asm" -INCLUDE "audio/sfx/shrink_1.asm" -INCLUDE "audio/sfx/switch_1.asm" -INCLUDE "audio/sfx/healing_machine_1.asm" -INCLUDE "audio/sfx/teleport_exit1_1.asm" -INCLUDE "audio/sfx/teleport_enter1_1.asm" -INCLUDE "audio/sfx/teleport_exit2_1.asm" -INCLUDE "audio/sfx/ledge_1.asm" -INCLUDE "audio/sfx/teleport_enter2_1.asm" -INCLUDE "audio/sfx/fly_1.asm" -INCLUDE "audio/sfx/denied_1.asm" -INCLUDE "audio/sfx/arrow_tiles_1.asm" -INCLUDE "audio/sfx/push_boulder_1.asm" -INCLUDE "audio/sfx/ss_anne_horn_1.asm" -INCLUDE "audio/sfx/withdraw_deposit_1.asm" -INCLUDE "audio/sfx/safari_zone_pa.asm" -INCLUDE "audio/sfx/unused_1.asm" -INCLUDE "audio/sfx/cry09_1.asm" -INCLUDE "audio/sfx/cry23_1.asm" -INCLUDE "audio/sfx/cry24_1.asm" -INCLUDE "audio/sfx/cry11_1.asm" -INCLUDE "audio/sfx/cry25_1.asm" -INCLUDE "audio/sfx/cry03_1.asm" -INCLUDE "audio/sfx/cry0f_1.asm" -INCLUDE "audio/sfx/cry10_1.asm" -INCLUDE "audio/sfx/cry00_1.asm" -INCLUDE "audio/sfx/cry0e_1.asm" -INCLUDE "audio/sfx/cry06_1.asm" -INCLUDE "audio/sfx/cry07_1.asm" -INCLUDE "audio/sfx/cry05_1.asm" -INCLUDE "audio/sfx/cry0b_1.asm" -INCLUDE "audio/sfx/cry0c_1.asm" -INCLUDE "audio/sfx/cry02_1.asm" -INCLUDE "audio/sfx/cry0d_1.asm" -INCLUDE "audio/sfx/cry01_1.asm" -INCLUDE "audio/sfx/cry0a_1.asm" -INCLUDE "audio/sfx/cry08_1.asm" -INCLUDE "audio/sfx/cry04_1.asm" -INCLUDE "audio/sfx/cry19_1.asm" -INCLUDE "audio/sfx/cry16_1.asm" -INCLUDE "audio/sfx/cry1b_1.asm" -INCLUDE "audio/sfx/cry12_1.asm" -INCLUDE "audio/sfx/cry13_1.asm" -INCLUDE "audio/sfx/cry14_1.asm" -INCLUDE "audio/sfx/cry1e_1.asm" -INCLUDE "audio/sfx/cry15_1.asm" -INCLUDE "audio/sfx/cry17_1.asm" -INCLUDE "audio/sfx/cry1c_1.asm" -INCLUDE "audio/sfx/cry1a_1.asm" -INCLUDE "audio/sfx/cry1d_1.asm" -INCLUDE "audio/sfx/cry18_1.asm" -INCLUDE "audio/sfx/cry1f_1.asm" -INCLUDE "audio/sfx/cry20_1.asm" -INCLUDE "audio/sfx/cry21_1.asm" -INCLUDE "audio/sfx/cry22_1.asm" - -SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] - -INCLUDE "audio/sfx/snare1_2.asm" -INCLUDE "audio/sfx/snare2_2.asm" -INCLUDE "audio/sfx/snare3_2.asm" -INCLUDE "audio/sfx/snare4_2.asm" -INCLUDE "audio/sfx/snare5_2.asm" -INCLUDE "audio/sfx/triangle1_2.asm" -INCLUDE "audio/sfx/triangle2_2.asm" -INCLUDE "audio/sfx/snare6_2.asm" -INCLUDE "audio/sfx/snare7_2.asm" -INCLUDE "audio/sfx/snare8_2.asm" -INCLUDE "audio/sfx/snare9_2.asm" -INCLUDE "audio/sfx/cymbal1_2.asm" -INCLUDE "audio/sfx/cymbal2_2.asm" -INCLUDE "audio/sfx/cymbal3_2.asm" -INCLUDE "audio/sfx/muted_snare1_2.asm" -INCLUDE "audio/sfx/triangle3_2.asm" -INCLUDE "audio/sfx/muted_snare2_2.asm" -INCLUDE "audio/sfx/muted_snare3_2.asm" -INCLUDE "audio/sfx/muted_snare4_2.asm" - -INCLUDE "audio/sfx/press_ab_2.asm" -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/ball_toss.asm" -INCLUDE "audio/sfx/ball_poof.asm" -INCLUDE "audio/sfx/faint_thud.asm" -INCLUDE "audio/sfx/run.asm" -INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/swap_2.asm" ; added in yellow -INCLUDE "audio/sfx/pokeflute_ch3.asm" -INCLUDE "audio/sfx/peck.asm" -INCLUDE "audio/sfx/faint_fall.asm" -INCLUDE "audio/sfx/battle_09.asm" -INCLUDE "audio/sfx/pound.asm" -INCLUDE "audio/sfx/battle_0b.asm" -INCLUDE "audio/sfx/battle_0c.asm" -INCLUDE "audio/sfx/battle_0d.asm" -INCLUDE "audio/sfx/battle_0e.asm" -INCLUDE "audio/sfx/battle_0f.asm" -INCLUDE "audio/sfx/damage.asm" -INCLUDE "audio/sfx/not_very_effective.asm" -INCLUDE "audio/sfx/battle_12.asm" -INCLUDE "audio/sfx/battle_13.asm" -INCLUDE "audio/sfx/battle_14.asm" -INCLUDE "audio/sfx/vine_whip.asm" -INCLUDE "audio/sfx/battle_16.asm" -INCLUDE "audio/sfx/battle_17.asm" -INCLUDE "audio/sfx/battle_18.asm" -INCLUDE "audio/sfx/battle_19.asm" -INCLUDE "audio/sfx/super_effective.asm" -INCLUDE "audio/sfx/battle_1b.asm" -INCLUDE "audio/sfx/battle_1c.asm" -INCLUDE "audio/sfx/doubleslap.asm" -INCLUDE "audio/sfx/battle_1e.asm" -INCLUDE "audio/sfx/horn_drill.asm" -INCLUDE "audio/sfx/battle_20.asm" -INCLUDE "audio/sfx/battle_21.asm" -INCLUDE "audio/sfx/battle_22.asm" -INCLUDE "audio/sfx/battle_23.asm" -INCLUDE "audio/sfx/battle_24.asm" -INCLUDE "audio/sfx/battle_25.asm" -INCLUDE "audio/sfx/battle_26.asm" -INCLUDE "audio/sfx/battle_27.asm" -INCLUDE "audio/sfx/battle_28.asm" -INCLUDE "audio/sfx/battle_29.asm" -INCLUDE "audio/sfx/battle_2a.asm" -INCLUDE "audio/sfx/battle_2b.asm" -INCLUDE "audio/sfx/battle_2c.asm" -INCLUDE "audio/sfx/psybeam.asm" -INCLUDE "audio/sfx/battle_2e.asm" -INCLUDE "audio/sfx/battle_2f.asm" -INCLUDE "audio/sfx/psychic_m.asm" -INCLUDE "audio/sfx/battle_31.asm" -INCLUDE "audio/sfx/battle_32.asm" -INCLUDE "audio/sfx/battle_33.asm" -INCLUDE "audio/sfx/battle_34.asm" -INCLUDE "audio/sfx/battle_35.asm" -INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/unused_2.asm" -INCLUDE "audio/sfx/cry09_2.asm" -INCLUDE "audio/sfx/cry23_2.asm" -INCLUDE "audio/sfx/cry24_2.asm" -INCLUDE "audio/sfx/cry11_2.asm" -INCLUDE "audio/sfx/cry25_2.asm" -INCLUDE "audio/sfx/cry03_2.asm" -INCLUDE "audio/sfx/cry0f_2.asm" -INCLUDE "audio/sfx/cry10_2.asm" -INCLUDE "audio/sfx/cry00_2.asm" -INCLUDE "audio/sfx/cry0e_2.asm" -INCLUDE "audio/sfx/cry06_2.asm" -INCLUDE "audio/sfx/cry07_2.asm" -INCLUDE "audio/sfx/cry05_2.asm" -INCLUDE "audio/sfx/cry0b_2.asm" -INCLUDE "audio/sfx/cry0c_2.asm" -INCLUDE "audio/sfx/cry02_2.asm" -INCLUDE "audio/sfx/cry0d_2.asm" -INCLUDE "audio/sfx/cry01_2.asm" -INCLUDE "audio/sfx/cry0a_2.asm" -INCLUDE "audio/sfx/cry08_2.asm" -INCLUDE "audio/sfx/cry04_2.asm" -INCLUDE "audio/sfx/cry19_2.asm" -INCLUDE "audio/sfx/cry16_2.asm" -INCLUDE "audio/sfx/cry1b_2.asm" -INCLUDE "audio/sfx/cry12_2.asm" -INCLUDE "audio/sfx/cry13_2.asm" -INCLUDE "audio/sfx/cry14_2.asm" -INCLUDE "audio/sfx/cry1e_2.asm" -INCLUDE "audio/sfx/cry15_2.asm" -INCLUDE "audio/sfx/cry17_2.asm" -INCLUDE "audio/sfx/cry1c_2.asm" -INCLUDE "audio/sfx/cry1a_2.asm" -INCLUDE "audio/sfx/cry1d_2.asm" -INCLUDE "audio/sfx/cry18_2.asm" -INCLUDE "audio/sfx/cry1f_2.asm" -INCLUDE "audio/sfx/cry20_2.asm" -INCLUDE "audio/sfx/cry21_2.asm" -INCLUDE "audio/sfx/cry22_2.asm" -;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" - -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] - -PlayBattleMusic:: ; 9064 (2:5064) - xor a - ld [wAudioFadeOutControl], a - ld [wLowHealthAlarm], a - call StopAllMusic - call DelayFrame - ld c, $8 ; BANK(Music_GymLeaderBattle) - ld a, [W_GYMLEADERNO] - and a - jr z, .notGymLeaderBattle - ld a, $ea ; MUSIC_GYM_LEADER_BATTLE - jr .playSong -.notGymLeaderBattle - ld a, [W_CUROPPONENT] - cp 200 - jr c, .wildBattle - cp OPP_SONY3 - jr z, .finalBattle - cp OPP_LANCE - jr nz, .normalTrainerBattle - ld a, $ea ; MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme - jr .playSong -.normalTrainerBattle - ld a, $ed ; MUSIC_TRAINER_BATTLE - jr .playSong -.finalBattle - ld a, $f3 ; MUSIC_FINAL_BATTLE - jr .playSong -.wildBattle - ld a, $f0 ; MUSIC_WILD_BATTLE -.playSong - jp PlayMusic - - -INCLUDE "audio/engine_1.asm" - - -; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: ; 99bd (2:59bd) - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b1a2 - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b21d - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b2b5 - -Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret - -; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: ; 99db (2:59db) - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld de, Music_MeetRival_branch_b119 - jr asm_99ed - -; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: ; 99e7 (2:59e7) - call Music_RivalAlternateStart - ld de, Music_MeetRival_branch_b19b -asm_99ed: ; 99ed (2:59ed) - ld hl, wChannelCommandPointers - jp Audio1_OverwriteChannelPointer - ret - -; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) - ld a, 10 - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, $ff ; stop playing music after the fade-out is finished - ld [wAudioFadeOutControl], a - ld c, 100 - call DelayFrames ; wait for the fade-out to finish - ld c, BANK(Music_Cities1) - ld a, $c3 ; MUSIC_CITIES1 - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_Cities1_branch_aa6f - jp Audio1_OverwriteChannelPointer - -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] - -Music_DoLowHealthAlarm:: ; 2131e (8:531e) - ld a, [wLowHealthAlarm] - cp $ff - jr z, .disableAlarm - - bit 7, a ;alarm enabled? - ret z ;nope - - and $7f ;low 7 bits are the timer. - jr nz, .asm_21383 ;if timer > 0, play low tone. - - call .playToneHi - ld a, 30 ;keep this tone for 30 frames. - jr .asm_21395 ;reset the timer. - -.asm_21383 - cp 20 - jr nz, .asm_2138a ;if timer == 20, - call .playToneLo ;actually set the sound registers. - -.asm_2138a - ld a, $86 - ld [wChannelSoundIDs + CH4], a ;disable sound channel? - ld a, [wLowHealthAlarm] - and $7f ;decrement alarm timer. - dec a - -.asm_21395 - ; reset the timer and enable flag. - set 7, a - ld [wLowHealthAlarm], a - ret - -.disableAlarm - xor a - ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? - ld de, .toneDataSilence - jr .playTone - -;update the sound registers to change the frequency. -;the tone set here stays until we change it. -.playToneHi - ld de, .toneDataHi - jr .playTone - -.playToneLo - ld de, .toneDataLo - -;update sound channel 1 to play the alarm, overriding all other sounds. -.playTone - ld hl, rNR10 ;channel 1 sound register - ld c, $5 - xor a - -.copyLoop - ld [hli], a - ld a, [de] - inc de - dec c - jr nz, .copyLoop - ret - -;bytes to write to sound channel 1 registers for health alarm. -;starting at FF11 (FF10 is always zeroed), so these bytes are: -;length, envelope, freq lo, freq hi -.toneDataHi - db $A0,$E2,$50,$87 - -.toneDataLo - db $B0,$E2,$EE,$86 - -;written to stop the alarm -.toneDataSilence - db $00,$00,$00,$80 - -INCLUDE "engine/menu/bills_pc.asm" - -INCLUDE "audio/engine_2.asm" - -SECTION "Music 1", ROMX, BANK[AUDIO_1] - -Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" - -INCLUDE "audio/music/pkmnhealed.asm" -INCLUDE "audio/music/routes1.asm" -INCLUDE "audio/music/routes2.asm" -INCLUDE "audio/music/routes3.asm" -INCLUDE "audio/music/routes4.asm" -INCLUDE "audio/music/indigoplateau.asm" -INCLUDE "audio/music/pallettown.asm" -INCLUDE "audio/music/unusedsong.asm" -INCLUDE "audio/music/cities1.asm" -INCLUDE "audio/sfx/get_item1_1.asm" -INCLUDE "audio/music/museumguy.asm" -INCLUDE "audio/music/meetprofoak.asm" -INCLUDE "audio/music/meetrival.asm" -INCLUDE "audio/sfx/pokedex_rating_1.asm" -INCLUDE "audio/sfx/get_item2_1.asm" -INCLUDE "audio/sfx/get_key_item_1.asm" -INCLUDE "audio/music/ssanne.asm" -INCLUDE "audio/music/cities2.asm" -INCLUDE "audio/music/celadon.asm" -INCLUDE "audio/music/cinnabar.asm" -INCLUDE "audio/music/vermilion.asm" -INCLUDE "audio/music/lavender.asm" -INCLUDE "audio/music/safarizone.asm" -INCLUDE "audio/music/gym.asm" -INCLUDE "audio/music/pokecenter.asm" - -SECTION "Music 2", ROMX, BANK[AUDIO_2] - -INCLUDE "audio/sfx/unused2_2.asm" -INCLUDE "audio/music/gymleaderbattle.asm" -INCLUDE "audio/music/trainerbattle.asm" -INCLUDE "audio/music/wildbattle.asm" -INCLUDE "audio/music/finalbattle.asm" -INCLUDE "audio/sfx/level_up.asm" -INCLUDE "audio/sfx/get_item2_2.asm" -INCLUDE "audio/sfx/caught_mon.asm" -INCLUDE "audio/music/defeatedtrainer.asm" -INCLUDE "audio/music/defeatedwildmon.asm" -INCLUDE "audio/music/defeatedgymleader.asm"
\ No newline at end of file +INCLUDE "audio.asm"
\ No newline at end of file diff --git a/yellow/main.asm b/yellow/main.asm index 77dcc839..ed853b80 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1139,13 +1139,6 @@ RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" dr $7a22a,$7c000 - -SECTION "bank1F",ROMX,BANK[$1F] - - dr $7c000,$7d10d -Func_7d10d: ; 7d10d (1f:510d) - dr $7d10d,$80000 - SECTION "bank20",ROMX,BANK[$20] dr $80000,$80f14 |