From c64ca288ffabfb33ff4fb84bb0501ee4814dfe4c Mon Sep 17 00:00:00 2001 From: Electro Date: Sat, 10 Jan 2026 00:28:44 +0000 Subject: [PATCH] Label more audio numbers --- src/audio/music1.asm | 4 ++-- src/audio/music2.asm | 4 ++-- src/audio/music3.asm | 4 ++-- src/audio/music4.asm | 4 ++-- src/audio/music5.asm | 4 ++-- src/audio/music6.asm | 4 ++-- src/audio/music7.asm | 4 ++-- src/audio/sfx2.asm | 32 ++++++++++++++++---------------- src/home/audio_callback.asm | 4 ++-- src/home/unsorted.asm | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/audio/music1.asm b/src/audio/music1.asm index f1dca2d..e617f9b 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -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 diff --git a/src/audio/music2.asm b/src/audio/music2.asm index b4b3c65..1fad43f 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -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 diff --git a/src/audio/music3.asm b/src/audio/music3.asm index 72baf61..935377c 100644 --- a/src/audio/music3.asm +++ b/src/audio/music3.asm @@ -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 diff --git a/src/audio/music4.asm b/src/audio/music4.asm index 580ffcb..44988f7 100644 --- a/src/audio/music4.asm +++ b/src/audio/music4.asm @@ -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 diff --git a/src/audio/music5.asm b/src/audio/music5.asm index 545a19f..f898322 100644 --- a/src/audio/music5.asm +++ b/src/audio/music5.asm @@ -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 diff --git a/src/audio/music6.asm b/src/audio/music6.asm index 37be2b3..bdcab1c 100644 --- a/src/audio/music6.asm +++ b/src/audio/music6.asm @@ -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 diff --git a/src/audio/music7.asm b/src/audio/music7.asm index 0820a59..da02e1a 100644 --- a/src/audio/music7.asm +++ b/src/audio/music7.asm @@ -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 diff --git a/src/audio/sfx2.asm b/src/audio/sfx2.asm index 68873ea..3e019ae 100644 --- a/src/audio/sfx2.asm +++ b/src/audio/sfx2.asm @@ -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 diff --git a/src/home/audio_callback.asm b/src/home/audio_callback.asm index e48fd0f..e80c6e8 100644 --- a/src/home/audio_callback.asm +++ b/src/home/audio_callback.asm @@ -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 diff --git a/src/home/unsorted.asm b/src/home/unsorted.asm index 81c3f06..bc09b45 100644 --- a/src/home/unsorted.asm +++ b/src/home/unsorted.asm @@ -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