From 10604fe8b3dfbc876df1bf6872ee8db37f712b1d Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Thu, 2 May 2013 20:27:39 -0400
Subject: [PATCH] sfx constants in the wild

---
 main.asm      | 17 ++++++++++-------
 scripting.asm | 14 +++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/main.asm b/main.asm
index 01f42b655..b127d8902 100644
--- a/main.asm
+++ b/main.asm
@@ -7690,7 +7690,7 @@ BattleStartMessage ; 3fc8b
 	dec a
 	jr z, .asm_3fcaa
 
-	ld de, $5e
+	ld de, SFX_SHINE
 	call StartSFX
 	call WaitSFX
 
@@ -8853,10 +8853,11 @@ EggStatsScreen: ; 4e33a
 	ld hl, $402d
 	rst FarCall
 	call $6497
-	ld a, [$d129]
-	cp $6
+
+	ld a, [TempMonHappiness]
+	cp 6
 	ret nc
-	ld de, $00bb
+	ld de, SFX_2_BOOPS
 	call StartSFX
 	ret
 ; 0x4e3c0
@@ -8947,13 +8948,15 @@ PartyMenuSelect: ; 0x50457
 	add hl, bc
 	ld a, [hl]
 	ld [CurPartySpecies], a
-	ld de, $0008
+
+	ld de, SFX_READ_TEXT_2
 	call StartSFX
 	call WaitSFX
 	and a
 	ret
+
 .exitmenu
-	ld de, $0008
+	ld de, SFX_READ_TEXT_2
 	call StartSFX
 	call WaitSFX
 	scf
@@ -16558,7 +16561,7 @@ StartTitleScreen: ; 10ed67
 	
 ; Play starting sound effect
 	call SFXChannelsOff
-	ld de, $0065
+	ld de, SFX_TITLE_SCREEN_ENTRANCE
 	call StartSFX
 	
 	ret
diff --git a/scripting.asm b/scripting.asm
index b029b7865..f2eb1a891 100644
--- a/scripting.asm
+++ b/scripting.asm
@@ -550,13 +550,13 @@ Script_specialsound: ; 0x96fe4
 	ld hl, $543d
 	rst $8
 	ld a, [$d142]
-	cp $4
-	ld de, $009b
-	jr z, .asm_96ff7 ; 0x96ff2 $3
-	ld de, $0001
-.asm_96ff7
+	cp TM_HM
+	ld de, SFX_GET_TM
+	jr z, .play
+	ld de, SFX_ITEM
+.play
 	call StartSFX
-	call $3c55
+	call WaitSFX
 	ret
 ; 0x96ffe
 
@@ -877,7 +877,7 @@ Script_playsound: ; 0x971b7
 Script_waitbutton: ; 0x971c3
 ; script command 0x86
 
-	call $3c55
+	call WaitSFX
 	ret
 ; 0x971c7