diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-06 01:22:22 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-06 01:22:22 -0500 |
| commit | a070bdcb21310c7d17b4fd057852f788fdfd61ca (patch) | |
| tree | ca50135e03b11b93e4c20ae2313742fcd728f595 /audio | |
| parent | Clean up Makefile (diff) | |
| download | pokeyellow-a070bdcb21310c7d17b4fd057852f788fdfd61ca.tar.gz pokeyellow-a070bdcb21310c7d17b4fd057852f788fdfd61ca.tar.xz pokeyellow-a070bdcb21310c7d17b4fd057852f788fdfd61ca.zip | |
Clean up white space
Diffstat (limited to '')
| -rw-r--r-- | audio.asm | 8 | ||||
| -rw-r--r-- | audio/engine_1.asm | 6 | ||||
| -rw-r--r-- | audio/engine_2.asm | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -449,7 +449,7 @@ INCLUDE "audio/music/printer.asm" INCLUDE "audio/sfx/unknown_80e5a.asm" INCLUDE "audio/sfx/unknown_80e91.asm" INCLUDE "audio/sfx/get_item2_4.asm" - + SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] PlayBattleMusic:: ; 9064 (2:5064) @@ -515,7 +515,7 @@ Music_RivalAlternateTempo:: ; 99db (2:59db) 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 @@ -662,7 +662,7 @@ PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) OwnedMonValues: ; 7d106 (1f:5106) db 10, 40, 60, 90, 120, 150, $ff - + INCLUDE "audio/engine_3.asm" SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4] @@ -749,7 +749,7 @@ INCLUDE "audio/music/yellowunusedsong.asm" INCLUDE "audio/music/jessieandjames.asm" INCBIN "audio/unknown_832b9.bin" - + SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1] PikachuCry1:: ; 84000 (21:4000) dw (PikachuCry1_End - PikachuCry1) - 2 ; length of pcm data diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 0eb4d5d7..adf4cfde 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -967,7 +967,7 @@ Audio1_ApplyWavePatternAndFrequency: ; 0x964b ld a, $80 ld [wTempoModifier], a ret - + Audio1_SetSfxTempo: ; 9657 (2:5657) call Audio1_IsCry jr c, .isCry @@ -1070,7 +1070,7 @@ Audio1_96c3: ; 96c3 (2:56c3) .asm_96de scf ret - + Audio1_ApplyPitchBend: ; 0x96f9 ld hl, wChannelFlags1 add hl, bc @@ -1566,7 +1566,7 @@ Audio1_9972: ; 9972 (2:5972) pop bc pop af ret - + Audio1_HWChannelEnableMasks: ; 9985 (2:5985) db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index a5cec3ee..b09e3d1e 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -207,7 +207,7 @@ Audio2_OverwriteChannelPointer: ; 219e6 (8:59e6) ret INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" - + Audio2_InitMusicVariables:: ; 219f8 (8:59f8) xor a ld [wUnusedC000], a @@ -407,7 +407,7 @@ Audio2_StopAllAudio:: ; 21b3f (8:5b3f) ld a, $ff ld [wStereoPanning], a ret - + FillAudioRAM2: ; 21b94 (8:5b94) ld b, d .loop |