Also use waveram related constants

This commit is contained in:
Electro 2026-01-10 00:32:55 +00:00
parent c64ca288ff
commit 552f9d09e7
9 changed files with 20 additions and 20 deletions

View File

@ -1576,14 +1576,14 @@ Music1_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music2_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music3_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music4_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music5_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music6_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -1576,14 +1576,14 @@ Music7_LoadWaveInstrument:
ld h, [hl]
ld l, a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.copy_wave_loop
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .copy_wave_loop
xor a
ld [wMusicWaveChange], a

View File

@ -450,14 +450,14 @@ SFX_wave:
ld a, AUD3ENA_OFF
ldh [rAUD3ENA], a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.asm_fc215
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .asm_fc215
ld a, $1
ld [wMusicWaveChange], a

View File

@ -447,21 +447,21 @@ SFX2_wave:
ld a, [hli]
ld h, [hl]
ld l, a
ld a, $0
ld a, AUD3ENA_OFF
ldh [rAUD3ENA], a
ld b, d
ld de, $ff30
ld de, _AUD3WAVERAM
.asm_fc215
ld a, [hli]
ld [de], a
inc de
inc b
ld a, b
cp $10
cp AUD3WAVE_SIZE
jr nz, .asm_fc215
ld a, $1
ld [wMusicWaveChange], a
ld a, $80
ld a, AUD3ENA_ON
ldh [rAUD3ENA], a
ld b, $0
pop hl