thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up music bank references

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2014-06-09 16:18:29 -04:00
parent d266f788b4
commit fadac928bc
10 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/engine_1.asm
View file

@ -1,6 +1,6 @@
; The first of three duplicated sound engines.
Func_9103:: ; 0x9103
Music2_UpdateMusic:: ; 0x9103
ld c, CH0
.loop
ld b, $0

2
audio/engine_2.asm
View file

@ -1,6 +1,6 @@
; The second of three duplicated sound engines.
Func_21879:: ; 21879 (8:5879)
Music8_UpdateMusic:: ; 21879 (8:5879)
ld c, CH0
.loop
ld b, $0

2
audio/engine_3.asm
View file

@ -1,6 +1,6 @@
; The third of three duplicated sound engines.
Func_7d177:: ; 7d177 (1f:5177)
Music1f_UpdateMusic:: ; 7d177 (1f:5177)
ld c, CH0
.loop
ld b, $0

2
engine/intro.asm
View file

@ -322,7 +322,7 @@ PlayShootingStar: ; 4188a (10:588a)
ld c, $28
call DelayFrames
.asm_418d0
ld a, Bank(Func_7d8ea)
ld a, BANK(Music_IntroBattle)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_INTRO_BATTLE

2
engine/overworld/healing_machine.asm
View file

@ -41,7 +41,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld a, $ff
ld [wc0ee], a
call PlaySound
ld a, Bank(Func_9876)
ld a, BANK(Music_PkmnHealed)
ld [wc0ef], a
.asm_70495
ld a, MUSIC_PKMN_HEALED

4
engine/overworld/npc_movement.asm
View file

@ -158,7 +158,7 @@ PointerTable_1a510: ; 1a510 (6:6510)
dw Func_1a56b
Func_1a514: ; 1a514 (6:6514)
ld a, Bank(Func_9876)
ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
@ -215,7 +215,7 @@ PointerTable_1a57d: ; 1a57d (6:657d)
dw Func_1a56b
Func_1a581: ; 1a581 (6:6581)
ld a, Bank(Func_9876)
ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY

2
engine/titlescreen.asm
View file

@ -17,7 +17,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)
ld [hli], a
ld [hli], a
ld [hl], a
ld a, Bank(Func_7d8ea)
ld a, BANK(Music_TitleScreen)
ld [wc0ef], a
ld [wc0f0], a

16
home/audio.asm
View file

@ -30,7 +30,7 @@ asm_2324:: ; 2324 (0:2324)
ld b, a
ld a, d
and a
ld a, Bank(Func_7d8ea)
ld a, BANK(Music_BikeRiding)
jr nz, .asm_233e
ld [wc0ef], a
.asm_233e
@ -56,19 +56,19 @@ asm_2324:: ; 2324 (0:2324)
Func_235f:: ; 235f (0:235f)
ld a, [wc0ef]
ld b, a
cp $2
cp BANK(Music2_UpdateMusic)
jr nz, .checkForBank08
.bank02
ld hl, Func_9103
ld hl, Music2_UpdateMusic
jr .asm_2378
.checkForBank08
cp $8
cp BANK(Music8_UpdateMusic)
jr nz, .bank1F
.bank08
ld hl, Func_21879
ld hl, Music8_UpdateMusic
jr .asm_2378
.bank1F
ld hl, Func_7d177
ld hl, Music1f_UpdateMusic
.asm_2378
ld c, $6
.asm_237a
@ -147,14 +147,14 @@ PlaySound:: ; 23b1 (0:23b1)
ld a, [wc0ef]
ld [H_LOADEDROMBANK], a
ld [$2000], a
cp $2
cp BANK(Func_9876)
jr nz, .checkForBank08
.bank02
ld a, b
call Func_9876
jr .asm_240b
.checkForBank08
cp $8
cp BANK(Func_22035)
jr nz, .bank1F
.bank08
ld a, b

2
home/init.asm
View file

@ -128,7 +128,7 @@ ClearVram:
StopAllSounds::
ld a, Bank(Func_9876)
ld a, BANK(Music2_UpdateMusic)
ld [wc0ef], a
ld [wc0f0], a
xor a

10
home/vblank.asm
View file

@ -56,20 +56,20 @@ VBlank::
ld [H_LOADEDROMBANK], a
ld [MBC3RomBank], a
cp BANK(Func_9103)
cp BANK(Music2_UpdateMusic)
jr nz, .notbank2
.bank2
call Func_9103
call Music2_UpdateMusic
jr .afterMusic
.notbank2
cp 8
cp BANK(Music8_UpdateMusic)
jr nz, .bank1F
.bank8
call Func_2136e
call Func_21879
call Music8_UpdateMusic
jr .afterMusic
.bank1F
call Func_7d177
call Music1f_UpdateMusic
.afterMusic
callba Func_18dee ; keep track of time played