Rename sound effect files

5 files changed, 11 insertions, 11 deletions

diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 8893e496..34d7f64d 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -67,7 +67,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0)
 	ld [wMusicHeaderPointer], a
 	dec a
 	call PlaySound
-	ld c, BANK(SFX_02_5f)
+	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .asm_1e9c2
diff --git a/engine/items/items.asm b/engine/items/items.asm
index f2c41ef6..a62f75d2 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1719,7 +1719,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215)
 	ld a,$ff
 	call PlaySound ; turn off music
 	ld a, SFX_POKEFLUE
-	ld c, BANK(SFX_02_5e)
+	ld c, BANK(SFX_Pokeflute)
 	call PlayMusic
 .musicWaitLoop ; wait for music to finish playing
 	ld a,[wc028]
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 2f22f78e..76eb7450 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -139,7 +139,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 ; play pokemon cry
 .choseCry
 	ld a,[wd11e]
-	call GetCryData ; get cry data
+	call GetCryData
 	call PlaySound
 	jr .handleMenuInput
 .choseArea
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 09a38012..eb62fee7 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -17,7 +17,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	add d
 	ld [hSCY], a
 	push bc
-	ld c, BANK(SFX_02_5b)
+	ld c, BANK(SFX_Collision_1)
 	ld a, SFX_COLLISION
 	call PlayMusic
 	pop bc
@@ -29,7 +29,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	ld [hSCY], a
 	ld a, $ff
 	call PlaySound
-	ld c, BANK(SFX_02_5f)
+	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .musicLoop
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 5ce2b2a6..a9aa2cf2 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_TELEPORT_2
+	ld a, SFX_TELEPORT_ENTER_1
 	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_FLY_1
+	ld a, SFX_TELEPORT_ENTER_2
 	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_FLY_2
+	ld a, SFX_FLY
 	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_TELEPORT_1
+	ld a, SFX_TELEPORT_EXIT_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_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID
+	ld [hl], SFX_TELEPORT_EXIT_2 ; 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_FLY_2
+	ld a, SFX_FLY
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list