sfx constants in the wild

This commit is contained in:
yenatch 2013-05-02 20:27:39 -04:00
parent 16507d3989
commit 10604fe8b3
2 changed files with 17 additions and 14 deletions

View File

@ -7690,7 +7690,7 @@ BattleStartMessage ; 3fc8b
dec a dec a
jr z, .asm_3fcaa jr z, .asm_3fcaa
ld de, $5e ld de, SFX_SHINE
call StartSFX call StartSFX
call WaitSFX call WaitSFX
@ -8853,10 +8853,11 @@ EggStatsScreen: ; 4e33a
ld hl, $402d ld hl, $402d
rst FarCall rst FarCall
call $6497 call $6497
ld a, [$d129]
cp $6 ld a, [TempMonHappiness]
cp 6
ret nc ret nc
ld de, $00bb ld de, SFX_2_BOOPS
call StartSFX call StartSFX
ret ret
; 0x4e3c0 ; 0x4e3c0
@ -8947,13 +8948,15 @@ PartyMenuSelect: ; 0x50457
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld de, $0008
ld de, SFX_READ_TEXT_2
call StartSFX call StartSFX
call WaitSFX call WaitSFX
and a and a
ret ret
.exitmenu .exitmenu
ld de, $0008 ld de, SFX_READ_TEXT_2
call StartSFX call StartSFX
call WaitSFX call WaitSFX
scf scf
@ -16558,7 +16561,7 @@ StartTitleScreen: ; 10ed67
; Play starting sound effect ; Play starting sound effect
call SFXChannelsOff call SFXChannelsOff
ld de, $0065 ld de, SFX_TITLE_SCREEN_ENTRANCE
call StartSFX call StartSFX
ret ret

View File

@ -550,13 +550,13 @@ Script_specialsound: ; 0x96fe4
ld hl, $543d ld hl, $543d
rst $8 rst $8
ld a, [$d142] ld a, [$d142]
cp $4 cp TM_HM
ld de, $009b ld de, SFX_GET_TM
jr z, .asm_96ff7 ; 0x96ff2 $3 jr z, .play
ld de, $0001 ld de, SFX_ITEM
.asm_96ff7 .play
call StartSFX call StartSFX
call $3c55 call WaitSFX
ret ret
; 0x96ffe ; 0x96ffe
@ -877,7 +877,7 @@ Script_playsound: ; 0x971b7
Script_waitbutton: ; 0x971c3 Script_waitbutton: ; 0x971c3
; script command 0x86 ; script command 0x86
call $3c55 call WaitSFX
ret ret
; 0x971c7 ; 0x971c7