Leahnaya/poketcg
1
0
Fork 0
mirror of https://github.com/pret/poketcg.git synced 2026-03-21 17:54:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #176 from ElectroDeoxys/master

Browse Source 
Replace hardcoded audio banks, and misc labeling
This commit is contained in:
dannye 2026-01-24 14:38:44 -06:00 committed by GitHub
commit 2ff2b93cf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/music1.asm
View File

@ -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
@ -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

6
src/audio/music2.asm
View File

@ -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
@ -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

4
src/audio/sfx.asm
View File

@ -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

8
src/engine/credits.asm
View File

@ -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

2
src/engine/menus/print_stats.asm
View File

@ -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

4
src/home/audio_callback.asm
View File

@ -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

8
src/home/scroll.asm
View File

@ -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