Skip to content

Commit 1e99747

Browse files
Rangi42Rangi42
committed
Use more audio constants
1 parent 78e44a8 commit 1e99747

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎audio/engine_1.asm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Audio1_UpdateMusic::
2222
xor a ; disable all channels' output
2323
ldh [rAUDTERM], a
2424
ldh [rAUD3ENA], a
25-
ld a, $80
25+
ld a, AUD3ENA_ON
2626
ldh [rAUD3ENA], a
2727
jr .nextChannel
2828
.applyAffects
@@ -182,9 +182,9 @@ Audio1_sound_ret:
182182
cp CHAN7
183183
jr nz, .skipSfxChannel3
184184
; restart hardware channel 3 (wave channel) output
185-
ld a, $0
185+
ld a, AUD3ENA_OFF
186186
ldh [rAUD3ENA], a
187-
ld a, $80
187+
ld a, AUD3ENA_ON
188188
ldh [rAUD3ENA], a
189189
.skipSfxChannel3
190190
jr nz, .dontDisable
@@ -927,7 +927,7 @@ Audio1_ApplyWavePatternAndFrequency:
927927
inc hl
928928
ld d, [hl]
929929
ld hl, _AUD3WAVERAM
930-
ld b, $f
930+
ld b, AUD3WAVE_SIZE - 1
931931
ld a, $0 ; stop hardware channel 3
932932
ldh [rAUD3ENA], a
933933
.loop
@@ -938,7 +938,7 @@ Audio1_ApplyWavePatternAndFrequency:
938938
dec b
939939
and a
940940
jr nz, .loop
941-
ld a, $80 ; start hardware channel 3
941+
ld a, AUD3ENA_ON ; start hardware channel 3
942942
ldh [rAUD3ENA], a
943943
pop de
944944
.notChannel3
@@ -1401,13 +1401,13 @@ Audio1_PlaySound::
14011401
ld [wStereoPanning], a
14021402
xor a
14031403
ldh [rAUDVOL], a
1404-
ld a, $8
1404+
ld a, AUD1SWEEP_DOWN
14051405
ldh [rAUD1SWEEP], a
14061406
ld a, 0
14071407
ldh [rAUDTERM], a
14081408
xor a
14091409
ldh [rAUD3ENA], a
1410-
ld a, $80
1410+
ld a, AUD3ENA_ON
14111411
ldh [rAUD3ENA], a
14121412
ld a, $77
14131413
ldh [rAUDVOL], a
@@ -1555,7 +1555,7 @@ Audio1_PlaySound::
15551555
ld a, e
15561556
cp CHAN5
15571557
jr nz, .skipSweepDisable
1558-
ld a, $8
1558+
ld a, AUD1SWEEP_DOWN
15591559
ldh [rAUD1SWEEP], a ; sweep off
15601560
.skipSweepDisable
15611561
ld a, c
@@ -1565,18 +1565,18 @@ Audio1_PlaySound::
15651565
jp .sfxChannelLoop
15661566

15671567
.stopAllAudio
1568-
ld a, $80
1568+
ld a, AUDENA_ON
15691569
ldh [rAUDENA], a ; sound hardware on
15701570
ldh [rAUD3ENA], a ; wave playback on
15711571
xor a
15721572
ldh [rAUDTERM], a ; no sound output
15731573
ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel)
1574-
ld a, $8
1574+
ld a, AUD1SWEEP_DOWN
15751575
ldh [rAUD1SWEEP], a ; sweep off
15761576
ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1)
15771577
ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2)
15781578
ldh [rAUD4ENV], a ; mute channel 4 (noise channel)
1579-
ld a, $40
1579+
ld a, AUD1HIGH_LENGTH_ON
15801580
ldh [rAUD1HIGH], a ; counter mode
15811581
ldh [rAUD2HIGH], a
15821582
ldh [rAUD4GO], a

‎audio/engine_2.asm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Audio2_UpdateMusic::
2424
xor a ; disable all channels' output
2525
ldh [rAUDTERM], a
2626
ldh [rAUD3ENA], a
27-
ld a, $80
27+
ld a, AUD3ENA_ON
2828
ldh [rAUD3ENA], a
2929
jr .nextChannel
3030
.applyAffects
@@ -193,9 +193,9 @@ Audio2_sound_ret:
193193
cp CHAN7
194194
jr nz, .skipSfxChannel3
195195
; restart hardware channel 3 (wave channel) output
196-
ld a, $0
196+
ld a, AUD3ENA_OFF
197197
ldh [rAUD3ENA], a
198-
ld a, $80
198+
ld a, AUD3ENA_ON
199199
ldh [rAUD3ENA], a
200200
.skipSfxChannel3
201201
jr nz, .dontDisable
@@ -938,7 +938,7 @@ Audio2_ApplyWavePatternAndFrequency:
938938
inc hl
939939
ld d, [hl]
940940
ld hl, _AUD3WAVERAM
941-
ld b, $f
941+
ld b, AUD3WAVE_SIZE - 1
942942
ld a, $0 ; stop hardware channel 3
943943
ldh [rAUD3ENA], a
944944
.loop
@@ -949,7 +949,7 @@ Audio2_ApplyWavePatternAndFrequency:
949949
dec b
950950
and a
951951
jr nz, .loop
952-
ld a, $80 ; start hardware channel 3
952+
ld a, AUD3ENA_ON ; start hardware channel 3
953953
ldh [rAUD3ENA], a
954954
pop de
955955
.notChannel3
@@ -1464,13 +1464,13 @@ Audio2_PlaySound::
14641464
ld [wStereoPanning], a
14651465
xor a
14661466
ldh [rAUDVOL], a
1467-
ld a, $8
1467+
ld a, AUD1SWEEP_DOWN
14681468
ldh [rAUD1SWEEP], a
14691469
ld a, 0
14701470
ldh [rAUDTERM], a
14711471
xor a
14721472
ldh [rAUD3ENA], a
1473-
ld a, $80
1473+
ld a, AUD3ENA_ON
14741474
ldh [rAUD3ENA], a
14751475
ld a, $77
14761476
ldh [rAUDVOL], a
@@ -1618,7 +1618,7 @@ Audio2_PlaySound::
16181618
ld a, e
16191619
cp CHAN5
16201620
jr nz, .skipSweepDisable
1621-
ld a, $8
1621+
ld a, AUD1SWEEP_DOWN
16221622
ldh [rAUD1SWEEP], a ; sweep off
16231623
.skipSweepDisable
16241624
ld a, c
@@ -1628,18 +1628,18 @@ Audio2_PlaySound::
16281628
jp .sfxChannelLoop
16291629

16301630
.stopAllAudio
1631-
ld a, $80
1631+
ld a, AUDENA_ON
16321632
ldh [rAUDENA], a ; sound hardware on
16331633
ldh [rAUD3ENA], a ; wave playback on
16341634
xor a
16351635
ldh [rAUDTERM], a ; no sound output
16361636
ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel)
1637-
ld a, $8
1637+
ld a, AUD1SWEEP_DOWN
16381638
ldh [rAUD1SWEEP], a ; sweep off
16391639
ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1)
16401640
ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2)
16411641
ldh [rAUD4ENV], a ; mute channel 4 (noise channel)
1642-
ld a, $40
1642+
ld a, AUD1HIGH_LENGTH_ON
16431643
ldh [rAUD1HIGH], a ; counter mode
16441644
ldh [rAUD2HIGH], a
16451645
ldh [rAUD4GO], a

‎audio/engine_3.asm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Audio3_UpdateMusic::
2222
xor a ; disable all channels' output
2323
ldh [rAUDTERM], a
2424
ldh [rAUD3ENA], a
25-
ld a, $80
25+
ld a, AUD3ENA_ON
2626
ldh [rAUD3ENA], a
2727
jr .nextChannel
2828
.applyAffects
@@ -182,9 +182,9 @@ Audio3_sound_ret:
182182
cp CHAN7
183183
jr nz, .skipSfxChannel3
184184
; restart hardware channel 3 (wave channel) output
185-
ld a, $0
185+
ld a, AUD3ENA_OFF
186186
ldh [rAUD3ENA], a
187-
ld a, $80
187+
ld a, AUD3ENA_ON
188188
ldh [rAUD3ENA], a
189189
.skipSfxChannel3
190190
jr nz, .dontDisable
@@ -927,7 +927,7 @@ Audio3_ApplyWavePatternAndFrequency:
927927
inc hl
928928
ld d, [hl]
929929
ld hl, _AUD3WAVERAM
930-
ld b, $f
930+
ld b, AUD3WAVE_SIZE - 1
931931
ld a, $0 ; stop hardware channel 3
932932
ldh [rAUD3ENA], a
933933
.loop
@@ -938,7 +938,7 @@ Audio3_ApplyWavePatternAndFrequency:
938938
dec b
939939
and a
940940
jr nz, .loop
941-
ld a, $80 ; start hardware channel 3
941+
ld a, AUD3ENA_ON ; start hardware channel 3
942942
ldh [rAUD3ENA], a
943943
pop de
944944
.notChannel3
@@ -1401,13 +1401,13 @@ Audio3_PlaySound::
14011401
ld [wStereoPanning], a
14021402
xor a
14031403
ldh [rAUDVOL], a
1404-
ld a, $8
1404+
ld a, AUD1SWEEP_DOWN
14051405
ldh [rAUD1SWEEP], a
14061406
ld a, 0
14071407
ldh [rAUDTERM], a
14081408
xor a
14091409
ldh [rAUD3ENA], a
1410-
ld a, $80
1410+
ld a, AUD3ENA_ON
14111411
ldh [rAUD3ENA], a
14121412
ld a, $77
14131413
ldh [rAUDVOL], a
@@ -1555,7 +1555,7 @@ Audio3_PlaySound::
15551555
ld a, e
15561556
cp CHAN5
15571557
jr nz, .skipSweepDisable
1558-
ld a, $8
1558+
ld a, AUD1SWEEP_DOWN
15591559
ldh [rAUD1SWEEP], a ; sweep off
15601560
.skipSweepDisable
15611561
ld a, c
@@ -1565,18 +1565,18 @@ Audio3_PlaySound::
15651565
jp .sfxChannelLoop
15661566

15671567
.stopAllAudio
1568-
ld a, $80
1568+
ld a, AUDENA_ON
15691569
ldh [rAUDENA], a ; sound hardware on
15701570
ldh [rAUD3ENA], a ; wave playback on
15711571
xor a
15721572
ldh [rAUDTERM], a ; no sound output
15731573
ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel)
1574-
ld a, $8
1574+
ld a, AUD1SWEEP_DOWN
15751575
ldh [rAUD1SWEEP], a ; sweep off
15761576
ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1)
15771577
ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2)
15781578
ldh [rAUD4ENV], a ; mute channel 4 (noise channel)
1579-
ld a, $40
1579+
ld a, AUD1HIGH_LENGTH_ON
15801580
ldh [rAUD1HIGH], a ; counter mode
15811581
ldh [rAUD2HIGH], a
15821582
ldh [rAUD4GO], a

0 commit comments

Comments
 (0)