Label more audio numbers

This commit is contained in:
Electro
2026-01-10 00:28:44 +00:00
parent 66d93ba691
commit c64ca288ff
10 changed files with 34 additions and 34 deletions
+2 -2
View File
@@ -132,9 +132,9 @@ Music1_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music2_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music3_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music4_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music5_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music6_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+2 -2
View File
@@ -132,9 +132,9 @@ Music7_Init:
ldh [rAUDVOL], a
ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
ldh [rAUDTERM], a
ld a, $78
ld a, BANK("Audio 2")
ld [wCurSongBank], a
ld a, $7e
ld a, BANK("Audio 8")
ld [wCurSfxBank], a
ld a, $80
ld [wCurSongID], a
+16 -16
View File
@@ -168,16 +168,16 @@ Func_fc094_2:
jp hl
SFX2_CommandTable:
dw SFX2_0
dw SFX2_1
dw SFX2_2
dw SFX2_frequency
dw SFX2_envelope
dw SFX2_duty
dw SFX2_loop
dw SFX2_endloop
dw SFX2_5
dw SFX2_6
dw SFX2_7
dw SFX2_8
dw SFX2_9
dw SFX2_pitch_offset
dw SFX2_wait
dw SFX2_wave
dw SFX2_pan
dw SFX2_sweep
dw SFX2_unused
dw SFX2_unused
dw SFX2_unused
@@ -188,7 +188,7 @@ SFX2_CommandTable:
SFX2_unused:
jp Func_fc094_2
SFX2_0:
SFX2_frequency:
ld d, a
pop hl
ld a, [hli]
@@ -242,7 +242,7 @@ Func_fc105_2:
ld [hl], d
ret
SFX2_1:
SFX2_envelope:
ld hl, wde2b
add hl, bc
ld a, $80
@@ -262,7 +262,7 @@ SFX2_1:
pop hl
jp Func_fc094_2
SFX2_2:
SFX2_duty:
swap a
ld e, a
ld hl, rAUD1LEN
@@ -312,7 +312,7 @@ SFX2_endloop:
pop hl
jp Func_fc094_2
SFX2_5:
SFX2_pitch_offset:
ld hl, wde2f
add hl, bc
ld e, l
@@ -322,7 +322,7 @@ SFX2_5:
ld [de], a
jp Func_fc094_2
SFX2_6:
SFX2_wait:
ld a, c
cp $3
jr nz, .asm_fc17c
@@ -438,7 +438,7 @@ Func_fc1cd_2:
.asm_fc201
ret
SFX2_7:
SFX2_wave:
add a
ld d, $0
ld e, a
@@ -467,7 +467,7 @@ SFX2_7:
pop hl
jp Func_fc094_2
SFX2_8:
SFX2_pan:
pop hl
ld a, [hli]
push hl
@@ -491,7 +491,7 @@ SFX2_8:
pop hl
jp Func_fc094_2
SFX2_9:
SFX2_sweep:
pop hl
ld a, [hli]
ldh [rAUD1SWEEP], a
+2 -2
View File
@@ -3,7 +3,7 @@ SECTION "Audio Callback", ROM0
; jumps to 7e:hl, then switches to bank 78
Bankswitch78To7e::
push af
ld a, $7e
ld a, BANK("Audio 8")
ldh [hBankROM], a
ld [rROMB], a
pop af
@@ -11,7 +11,7 @@ Bankswitch78To7e::
push bc
jp hl
.bankswitch78
ld a, $78
ld a, BANK("Audio 2")
ldh [hBankROM], a
ld [rROMB], a
ret
+2 -2
View File
@@ -2777,7 +2777,7 @@ EnableInt_LYCoincidence::
push hl
ld hl, rSTAT
set B_STAT_LYC, [hl]
xor a
xor a ; useless
ld hl, rIE
set B_IE_STAT, [hl]
pop hl
@@ -2788,7 +2788,7 @@ DisableInt_LYCoincidence::
push hl
ld hl, rSTAT
res B_STAT_LYC, [hl]
xor a
xor a ; useless
ld hl, rIE
res B_IE_STAT, [hl]
pop hl