diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 24 | ||||
| -rw-r--r-- | home/text_script.asm | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/home/audio.asm b/home/audio.asm index bf2537a7..aa48985d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -262,33 +262,35 @@ DetermineAudioFunction:: call BankswitchCommon ; determine the audio function, based on the bank cp BANK(Audio1_PlaySound) - jr nz, .checkForBank08 -; bank 02 (audio 1) + jr nz, .checkForAudio2 +; audio 1 ld a, b call Audio1_PlaySound jr .done -.checkForBank08 +.checkForAudio2 cp BANK(Audio2_PlaySound) - jr nz, .checkForBank1F -; bank 08 (audio 2) + jr nz, .checkForAudio3 +; audio 2 ld a, b call Audio2_PlaySound jr .done -.checkForBank1F +.checkForAudio3 cp BANK(Audio3_PlaySound) - jr nz, .bank20 -; bank 1f (audio 3) + jr nz, .audio4 +; audio 3 ld a, b call Audio3_PlaySound jr .done -.bank20 -; invalid banks will default to XX:6bd4 -; this is seen when encountering Missingno, as its sprite dimensions overflow to wAudioROMBank +.audio4 +; invalid banks will default to audio 4 +; this is seen when encountering Missingno, +; as its sprite dimensions overflow to wAudioROMBank ld a, b call Audio4_PlaySound + .done pop af call BankswitchCommon diff --git a/home/text_script.asm b/home/text_script.asm index fe81cb51..5ef9f9fa 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -200,7 +200,7 @@ DisplayPlayerBlackedOutText:: ld [wNumSafariBalls], a ld [wSafariSteps], a ld [wSafariSteps + 1], a - EventFlagAddressa EVENT_IN_SAFARI_ZONE + EventFlagAddressA EVENT_IN_SAFARI_ZONE ld [wcf0d], a ld [wSafariZoneGateCurScript], a .didnotblackoutinsafari |