Name sound effects

9 files changed, 15 insertions, 15 deletions

diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm
index 86a7ab7d..b9e3102a 100755
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -57,7 +57,7 @@ CableClubNPC: ; 71c5 (1:71c5)
 	jr nz, .choseNo
 	callab SaveSAVtoSRAM
 	call WaitForSoundToFinish
-	ld a, (SFX_02_5d - SFX_Headers_02) / 3
+	ld a, SFX_SAVE
 	call PlaySoundWaitForCurrent
 	ld hl, CableClubNPCPleaseWaitText
 	call PrintText
diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm
index 94c1868c..746ea326 100755
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -51,7 +51,7 @@ PrintCardKeyText: ; 52673 (14:6673)
 	predef ReplaceTileBlock
 	ld hl, wd126
 	set 5, [hl]
-	ld a, (SFX_1f_57 - SFX_Headers_1f) / 3
+	ld a, SFX_GO_INSIDE
 	jp PlaySound
 .noCardKey
 	tx_pre_id CardKeyFailText
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index f7be269c..293daee7 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -60,7 +60,7 @@ UsedCut: ; ef54 (3:6f54)
 	callba Func_79e96
 	ld a, $1
 	ld [wUpdateSpritesEnabled], a
-	ld a, (SFX_02_56 - SFX_Headers_02) / 3
+	ld a, SFX_CUT
 	call PlaySound
 	ld a, $90
 	ld [hWY], a
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index f5b1d14c..0c30ee59 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -19,7 +19,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	ld [hSCY], a
 	push bc
 	ld c, BANK(SFX_02_5b)
-	ld a, (SFX_02_5b - SFX_Headers_02) / 3
+	ld a, SFX_COLLISION
 	call PlayMusic
 	pop bc
 	ld c, 2
@@ -31,7 +31,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	ld a, $ff
 	call PlaySound
 	ld c, BANK(SFX_02_5f)
-	ld a, (SFX_02_5f - SFX_Headers_02) / 3
+	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .asm_7bf57
 	ld a, [wc02a]
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index d00bbc05..fce797d0 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -28,7 +28,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
 	ld b, a
 .asm_7046e
 	call Func_70503
-	ld a, (SFX_02_4a - SFX_Headers_02) / 3
+	ld a, SFX_HEALING_MACHINE
 	call PlaySound
 	ld c, 30
 	call DelayFrames
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm
index 910fcf04..94f20439 100755
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -33,7 +33,7 @@ FoundHiddenItemText: ; 7675b (1d:675b)
 	ld c, a
 	ld b, $1
 	predef FlagActionPredef
-	ld a, (SFX_02_3b - SFX_Headers_02) / 3
+	ld a, SFX_GET_ITEM_2
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
 	jp TextScriptEnd
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 3a183c0f..51819802 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -50,7 +50,7 @@ HandleLedges: ; 1a672 (6:6672)
 	ld a, $2
 	ld [wSimulatedJoypadStatesIndex], a
 	call LoadHoppingShadowOAM
-	ld a, (SFX_02_4e - SFX_Headers_02) / 3
+	ld a, SFX_LEDGE
 	call PlaySound
 	ret
 
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 98ea466d..5ce2b2a6 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	bit 7, [hl] ; used fly out of battle?
 	res 7, [hl]
 	jr nz, .flyAnimation
-	ld a, (SFX_02_4c - SFX_Headers_02) / 3
+	ld a, SFX_TELEPORT_2
 	call PlaySound
 	ld hl, wd732
 	bit 4, [hl] ; used dungeon warp?
@@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	pop hl
 	jr nz, .dungeonWarpAnimation
 	call PlayerSpinWhileMovingDown
-	ld a, (SFX_02_4f - SFX_Headers_02) / 3
+	ld a, SFX_FLY_1
 	call PlaySound
 	call IsPlayerStandingOnWarpPadOrHole
 	ld a, b
@@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	ld bc, (BANK(BirdSprite) << 8) + $0c
 	call CopyVideoData
 	call LoadBirdSpriteGraphics
-	ld a, (SFX_02_50 - SFX_Headers_02) / 3
+	ld a, SFX_FLY_2
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
@@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	dec a
 	jp nz, LeaveMapThroughHoleAnim
 .spinWhileMovingUp
-	ld a, (SFX_02_4b - SFX_Headers_02) / 3
+	ld a, SFX_TELEPORT_1
 	call PlaySound
 	ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	ld a, -$10
@@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta
 	xor a
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue
-	ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID
+	ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID
 	ld hl, wFacingDirectionList
 	call PlayerSpinInPlace
 	jr .spinWhileMovingUp
@@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	ld [hli], a ; wFlyAnimCounter
 	ld [hl], $c ; wFlyAnimBirdSpriteImageIndex
 	call DoFlyAnimation
-	ld a, (SFX_02_50 - SFX_Headers_02) / 3
+	ld a, SFX_FLY_2
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index ebc99eed..d59b2dc7 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -190,7 +190,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	ld a,1
 	ld [wBoughtOrSoldItemInMart],a
 .skipSettingFlag2
-	ld a,(SFX_02_5a - SFX_Headers_02) / 3
+	ld a,SFX_PURCHASE
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
 	ld hl,PokemartBoughtItemText