7 files changed, 15 insertions, 15 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 5dc6e61f..eeaa4594 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -483,7 +483,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a)
 	cp a,16 ; is the cursor on Cancel?
 	jr nz,.loop
 .exitMenu
-	ld a,(SFX_02_40 - SFX_Headers_02) / 3
+	ld a,SFX_PRESS_AB
 	call PlaySound
 	ret
 .eraseOldMenuCursor
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 20deb834..9a608491 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -262,7 +262,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld a, [wHPBarNewHP]
 	ld [hli], a
 	ld [hl], $50
-	ld a, (SFX_02_40 - SFX_Headers_02) / 3
+	ld a, SFX_PRESS_AB
 	call PlaySound
 	ret
 .pressedB
diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm
index 8ee40c7c..b5281964 100755
--- a/engine/menu/pc.asm
+++ b/engine/menu/pc.asm
@@ -1,6 +1,6 @@
 ActivatePC: ; 17e2c (5:7e2c)
 	call SaveScreenTilesToBuffer2
-	ld a, (SFX_02_45 - SFX_Headers_02) / 3
+	ld a, SFX_TURN_ON_PC
 	call PlaySound
 	ld hl, TurnedOnPC1Text
 	call PrintText
@@ -51,7 +51,7 @@ PCMainMenu: ; 17e48 (5:7e48)
 	ld hl, wFlags_0xcd60
 	res 5, [hl]
 	set 3, [hl]
-	ld a, (SFX_02_47 - SFX_Headers_02) / 3
+	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	ld hl, AccessedMyPCText
@@ -59,19 +59,19 @@ PCMainMenu: ; 17e48 (5:7e48)
 	callba PlayerPC
 	jr ReloadMainMenu
 OaksPC: ; 17ec0 (5:7ec0)
-	ld a, (SFX_02_47 - SFX_Headers_02) / 3
+	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	callba OpenOaksPC
 	jr ReloadMainMenu
 PKMNLeague: ; 17ed2 (5:7ed2)
-	ld a, (SFX_02_47 - SFX_Headers_02) / 3
+	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	callba PKMNLeaguePC
 	jr ReloadMainMenu
 BillsPC: ; 17ee4 (5:7ee4)
-	ld a, (SFX_02_47 - SFX_Headers_02) / 3
+	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	ld a, [wd7f1] ;has to do with having met Bill
@@ -91,7 +91,7 @@ ReloadMainMenu: ; 17f06 (5:7f06)
 	call UpdateSprites
 	jp PCMainMenu
 LogOff: ; 17f13 (5:7f13)
-	ld a, (SFX_02_46 - SFX_Headers_02) / 3
+	ld a, SFX_TURN_OFF_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	ld hl, wFlags_0xcd60
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index 89974dd0..00889e93 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -11,7 +11,7 @@ PlayerPC: ; 78e6 (1:78e6)
 	bit 3, a ; accessing player's PC through another PC?
 	jr nz, PlayerPCMenu
 ; accessing it directly
-	ld a, (SFX_02_45 - SFX_Headers_02) / 3
+	ld a, SFX_TURN_ON_PC
 	call PlaySound
 	ld hl, TurnedOnPC2Text
 	call PrintText
@@ -67,7 +67,7 @@ ExitPlayerPC: ; 796d (1:796d)
 	bit 3, a ; accessing player's PC through another PC?
 	jr nz, .next
 ; accessing it directly
-	ld a, (SFX_02_46 - SFX_Headers_02) / 3
+	ld a, SFX_TURN_OFF_PC
 	call PlaySound
 	call WaitForSoundToFinish
 .next
@@ -130,7 +130,7 @@ PlayerPCDeposit: ; 7995 (1:7995)
 	ld hl, wNumBagItems
 	call RemoveItemFromInventory
 	call WaitForSoundToFinish
-	ld a, (SFX_02_55 - SFX_Headers_02) / 3
+	ld a, SFX_WITHDRAW_DEPOSIT
 	call PlaySound
 	call WaitForSoundToFinish
 	ld hl, ItemWasStoredText
@@ -184,7 +184,7 @@ PlayerPCWithdraw: ; 7a12 (1:7a12)
 	ld hl, wNumBoxItems
 	call RemoveItemFromInventory
 	call WaitForSoundToFinish
-	ld a, (SFX_02_55 - SFX_Headers_02) / 3
+	ld a, SFX_WITHDRAW_DEPOSIT
 	call PlaySound
 	call WaitForSoundToFinish
 	ld hl, WithdrewItemText
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 7aa09df7..bd876f5b 100755
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -4,7 +4,7 @@ DisplayStartMenu:: ; 2acd (0:2acd)
 	ld [MBC1RomBank],a
 	ld a,[wWalkBikeSurfState] ; walking/biking/surfing
 	ld [wWalkBikeSurfStateCopy],a
-	ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound
+	ld a, SFX_START_MENU
 	call PlaySound
 
 RedisplayStartMenu:: ; 2adf (0:2adf)
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 0036d66e..481c0fbe 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -734,7 +734,7 @@ SwitchPartyMon_ClearGfx: ; 13625 (4:7625)
 	dec c
 	jr nz, .clearMonOAMLoop
 	call WaitForSoundToFinish
-	ld a, (SFX_02_58 - SFX_Headers_02) / 3
+	ld a, SFX_SWAP
 	jp PlaySound
 
 SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653)
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 0f6c6a13..8460889f 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -58,7 +58,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld c, 2
 	call DelayFrames
 	push bc
-	ld a, (SFX_02_53 - SFX_Headers_02) / 3
+	ld a, SFX_PUSH_BOULDER
 	call PlaySound
 	pop bc
 	dec b