diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine.asm | 34 | ||||
| -rw-r--r-- | audio/music/goldenrodcity.asm | 3 | ||||
| -rw-r--r-- | audio/music/johtowildbattle.asm | 3 | ||||
| -rw-r--r-- | audio/music/kantowildbattle.asm | 17 |
4 files changed, 34 insertions, 23 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 2842288b2..7a907bccc 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -413,10 +413,9 @@ UpdateChannels: ; e8125 ; hl << 4 ; each wavepattern is $0f bytes long ; so seeking is done in $10s +rept 4 add hl, hl - add hl, hl - add hl, hl - add hl, hl +endr ld de, WaveSamples add hl, de ; load wavepattern into $ff30-$ff3f @@ -1292,8 +1291,9 @@ GetNoiseSample: ; e86c5 ld d, $00 ; load ptr to noise sample set in hl ld hl, Drumkits +rept 2 add hl, de - add hl, de +endr ld a, [hli] ld h, [hl] ld l, a @@ -1306,8 +1306,9 @@ GetNoiseSample: ; e86c5 ; use 'pitch' to seek noise sample set ld e, a ld d, $00 +rept 2 add hl, de - add hl, de +endr ; load sample pointer into NoiseSampleAddress ld a, [hli] ld [NoiseSampleAddressLo], a @@ -1328,8 +1329,9 @@ ParseMusicCommand: ; e870f ld d, $00 ; seek command pointer ld hl, MusicCommands +rept 2 add hl, de - add hl, de +endr ; jump to the new pointer ld a, [hli] ld h, [hl] @@ -1572,8 +1574,9 @@ MusicFB: ; e8817 inc hl ld d, [hl] ; skip pointer +rept 2 inc de - inc de +endr ; update address ld [hl], d dec hl @@ -1623,8 +1626,9 @@ MusicEE; e883e inc hl ld d, [hl] ; skip pointer +rept 2 inc de - inc de +endr ; update address ld [hl], d dec hl @@ -2378,9 +2382,9 @@ _PlayCryHeader:: ; e8b79 ; 3-byte pointers (bank, address) ld hl, Cries +rept 3 add hl, de - add hl, de - add hl, de +endr ld a, [hli] ld [MusicBank], a @@ -2595,9 +2599,9 @@ PlayStereoSFX:: ; e8ca6 ; get sfx ptr ld hl, SFX +rept 3 add hl, de - add hl, de - add hl, de +endr ; bank ld a, [hli] @@ -2692,8 +2696,9 @@ LoadChannel: ; e8d1b ld c, a ld b, $00 ld hl, ChannelPointers +rept 2 add hl, bc - add hl, bc +endr ld c, [hl] inc hl ld b, [hl] ; bc = channel pointer @@ -3157,8 +3162,9 @@ ClearChannels:: ; e8fe9 ; doesn't seem to be used, but functionally identical to SoundRestart ld hl, rNR50 xor a +rept 2 ld [hli], a - ld [hli], a +endr ld a, $80 ld [hli], a ld hl, rNR10 diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index e0e919d5c..cf92246b6 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -275,8 +275,9 @@ Music_GoldenrodCity_Ch3: ; eb584 vibrato $8, $23 notetype $c, $25 Music_GoldenrodCity_branch_eb58c: ; eb58c +rept 2 callchannel Music_GoldenrodCity_branch_eb5aa - callchannel Music_GoldenrodCity_branch_eb5aa +endr callchannel Music_GoldenrodCity_branch_eb5d2 note __, 3 octave 3 diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index 505687382..ac53dac2a 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -492,8 +492,9 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fdb note F#, 4 +rept 2 callchannel Music_JohtoWildBattle_branch_f6055 - callchannel Music_JohtoWildBattle_branch_f6055 +endr Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 note D_, 2 note G_, 2 diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index c23a867e3..8eccf2e6b 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -325,22 +325,25 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 note F_, 1 note F#, 1 notetype $6, $b7 +rept 2 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 +endr forceoctave $1 +rept 2 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 +endr forceoctave $0 +rept 4 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 +endr forceoctave $1 +rept 2 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 +endr forceoctave $0 +rept 2 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 +endr note __, 16 octave 3 note A#, 16 |