From ec0fb8346a30c6551cee777bc9c4d7ac02ac32fd Mon Sep 17 00:00:00 2001 From: Electro Date: Fri, 9 Jan 2026 20:39:28 +0000 Subject: [PATCH 1/2] Replace hardcoded audio banks, and misc labeling --- src/audio/music1.asm | 2 +- src/audio/music2.asm | 2 +- src/engine/credits.asm | 8 ++++---- src/engine/menus/print_stats.asm | 2 +- src/home/audio_callback.asm | 4 ++-- src/home/scroll.asm | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/audio/music1.asm b/src/audio/music1.asm index 01e43d6..e1dad1d 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -113,7 +113,7 @@ 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, $3d + ld a, BANK("Audio 1") ld [wCurSongBank], a ld a, $80 ld [wCurSongID], a diff --git a/src/audio/music2.asm b/src/audio/music2.asm index 61daae7..aaa0731 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -113,7 +113,7 @@ 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, $3d + ld a, BANK("Audio 1") ld [wCurSongBank], a ld a, $80 ld [wCurSongID], a diff --git a/src/engine/credits.asm b/src/engine/credits.asm index 247cc60..04c933b 100644 --- a/src/engine/credits.asm +++ b/src/engine/credits.asm @@ -29,7 +29,7 @@ PlayCreditsSequence:: call DoFrameIfLCDEnabled call DisableLCD ld hl, wLCDC - set 1, [hl] + set B_LCDC_OBJS, [hl] call ResetDoFrameFunction ret @@ -102,7 +102,7 @@ Func_1d765: ld [hli], a push hl ld hl, wLCDC - set 1, [hl] + set B_LCDC_OBJS, [hl] pop hl jr .asm_1d7e2 @@ -118,7 +118,7 @@ Func_1d765: ld [hli], a push hl ld hl, wLCDC - set 1, [hl] + set B_LCDC_OBJS, [hl] pop hl ld a, $07 jr .asm_1d7a9 @@ -128,7 +128,7 @@ Func_1d765: ldh [hWX], a push hl ld hl, wLCDC - res 1, [hl] + res B_LCDC_OBJS, [hl] pop hl .asm_1d7a9 ld [hli], a diff --git a/src/engine/menus/print_stats.asm b/src/engine/menus/print_stats.asm index d3a5560..a637928 100644 --- a/src/engine/menus/print_stats.asm +++ b/src/engine/menus/print_stats.asm @@ -57,7 +57,7 @@ LoadCollectedMedalTilemaps: ld [wd4ca], a ld a, $01 ld [wd4cb], a - ld a, $76 + ld a, PALETTE_118 farcall SetBGPAndLoadedPal .done ret diff --git a/src/home/audio_callback.asm b/src/home/audio_callback.asm index f0f6365..16120db 100644 --- a/src/home/audio_callback.asm +++ b/src/home/audio_callback.asm @@ -3,7 +3,7 @@ SECTION "Audio Callback", ROM0 ; jumps to 3f:hl, then switches to bank 3d Bankswitch3dTo3f:: push af - ld a, $3f + ld a, BANK("Audio 3") ldh [hBankROM], a ld [rROMB], a pop af @@ -11,7 +11,7 @@ Bankswitch3dTo3f:: push bc jp hl .bankswitch3d - ld a, $3d + ld a, BANK("Audio 1") ldh [hBankROM], a ld [rROMB], a ret diff --git a/src/home/scroll.asm b/src/home/scroll.asm index 43a5fe1..7df067b 100644 --- a/src/home/scroll.asm +++ b/src/home/scroll.asm @@ -19,10 +19,10 @@ Func_3e44:: ld hl, rLCDC cp $a7 jr c, .disable_sprites - set 1, [hl] ; enable sprites + set B_LCDC_OBJS, [hl] ; enable sprites jr .asm_3e6c .disable_sprites - res 1, [hl] ; disable sprites + res B_LCDC_OBJS, [hl] ; disable sprites .asm_3e6c ld hl, wd651 add hl, bc @@ -148,7 +148,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 @@ -159,7 +159,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 From 83151ce30f2a93888e3b69a00124395e2677f07f Mon Sep 17 00:00:00 2001 From: Electro Date: Sat, 10 Jan 2026 00:34:49 +0000 Subject: [PATCH 2/2] Also use waveram related constants --- src/audio/music1.asm | 4 ++-- src/audio/music2.asm | 4 ++-- src/audio/sfx.asm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio/music1.asm b/src/audio/music1.asm index e1dad1d..af1d608 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -1286,14 +1286,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 diff --git a/src/audio/music2.asm b/src/audio/music2.asm index aaa0731..b03fdc6 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -1286,14 +1286,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 diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm index 08eb80e..ff570fd 100644 --- a/src/audio/sfx.asm +++ b/src/audio/sfx.asm @@ -403,14 +403,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