diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /home/audio.asm | |
parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'home/audio.asm')
-rw-r--r-- | home/audio.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/home/audio.asm b/home/audio.asm index dd115449d..917d52953 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -6,16 +6,16 @@ MapSetup_Sound_Off:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_MapSetup_Sound_Off) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a call _MapSetup_Sound_Off pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a pop af @@ -30,16 +30,16 @@ UpdateSound:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_UpdateSound) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a call _UpdateSound pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a pop af @@ -50,14 +50,14 @@ UpdateSound:: _LoadMusicByte:: ; wCurMusicByte = [a:de] - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ld a, [de] ld [wCurMusicByte], a ld a, BANK(LoadMusicByte) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ret @@ -69,10 +69,10 @@ PlayMusic:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_PlayMusic) ; and BANK(_MapSetup_Sound_Off) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ld a, e @@ -87,7 +87,7 @@ PlayMusic:: .end pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a pop af pop bc @@ -103,10 +103,10 @@ PlayMusic2:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_PlayMusic) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a push de @@ -117,7 +117,7 @@ PlayMusic2:: call _PlayMusic pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a pop af @@ -134,12 +134,12 @@ PlayCry:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af ; Cries are stuck in one bank. ld a, BANK(PokemonCries) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ld hl, PokemonCries @@ -162,13 +162,13 @@ endr ld [wCryLength + 1], a ld a, BANK(_PlayCry) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a call _PlayCry pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a pop af @@ -196,10 +196,10 @@ PlaySFX:: jr c, .done .play - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_PlaySFX) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ld a, e @@ -207,7 +207,7 @@ PlaySFX:: call _PlaySFX pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a .done @@ -525,11 +525,11 @@ TerminateExpBarSound:: xor a ld [wChannel5Flags1], a ld [wSoundInput], a - ld [rNR10], a - ld [rNR11], a - ld [rNR12], a - ld [rNR13], a - ld [rNR14], a + ldh [rNR10], a + ldh [rNR11], a + ldh [rNR12], a + ldh [rNR13], a + ldh [rNR14], a ret ChannelsOff:: |