diff options
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -455,7 +455,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] -Music_DoLowHealthAlarm:: ; 2136e (8:536e) +Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -537,7 +537,7 @@ INCLUDE "engine/menu/bills_pc.asm" INCLUDE "audio/engine_2.asm" -Music_PokeFluteInBattle:: ; 22306 (8:6306) +Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent @@ -549,7 +549,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306) call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch3 -Audio2_OverwriteChannelPointer: ; 2231d (8:631d) +Audio2_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -559,7 +559,7 @@ Audio2_OverwriteChannelPointer: ; 2231d (8:631d) SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -PlayPokedexRatingSfx:: ; 7d13b (1f:513b) +PlayPokedexRatingSfx:: ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues @@ -584,7 +584,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) call PlayMusic jp PlayDefaultMusic -PokedexRatingSfxPointers: ; 7d162 (1f:5162) +PokedexRatingSfxPointers: db SFX_DENIED, BANK(SFX_Denied_3) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) @@ -593,7 +593,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162) db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) -OwnedMonValues: ; 7d170 (1f:5170) +OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff |