diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-01-04 20:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 20:08:43 -0500 |
| commit | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (patch) | |
| tree | a3b0d23a7501a337fb150ffb9253b3d5a301c657 /home/audio.asm | |
| parent | 9aeb0ab522ad36796b2ace55cca17e7314a3bc9a (diff) | |
| parent | 739a60b33c54021c975f22d627e4b5e40206fe37 (diff) | |
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/home/audio.asm b/home/audio.asm index 779c2267d..fecf17f33 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,6 +1,6 @@ ; Audio interfaces. -MapSetup_Sound_Off:: +InitSound:: push hl push de push bc @@ -8,11 +8,11 @@ MapSetup_Sound_Off:: ldh a, [hROMBank] push af - ld a, BANK(_MapSetup_Sound_Off) + ld a, BANK(_InitSound) ldh [hROMBank], a ld [MBC3RomBank], a - call _MapSetup_Sound_Off + call _InitSound pop af ldh [hROMBank], a @@ -71,7 +71,7 @@ PlayMusic:: ldh a, [hROMBank] push af - ld a, BANK(_PlayMusic) ; aka BANK(_MapSetup_Sound_Off) + ld a, BANK(_PlayMusic) ; aka BANK(_InitSound) ldh [hROMBank], a ld [MBC3RomBank], a @@ -83,7 +83,7 @@ PlayMusic:: jr .end .nomusic - call _MapSetup_Sound_Off + call _InitSound .end pop af @@ -359,7 +359,8 @@ PlayMapMusic:: pop hl ret -EnterMapMusic:: +PlayMapMusicBike:: +; If the player's on a bike, play the bike music instead of the map music push hl push de push bc |