summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-04-30 06:04:35 -0400
committeryenatch <yenatch@gmail.com>2014-04-30 06:04:35 -0400
commitce59c9a84f34600dff097858ab3d00d55eaeaf78 (patch)
treef9f92c934ba299096ade83919942cd3ca0343b44
parent5708cf75690d066c6e72f0e99d1aba2cfa54f774 (diff)
Music and sound effect constants in map events.
-rw-r--r--maps/AzaleaGym.asm2
-rw-r--r--maps/AzaleaTown.asm6
-rw-r--r--maps/BattleTowerBattleRoom.asm4
-rw-r--r--maps/BattleTowerElevator.asm2
-rw-r--r--maps/BlackthornGym1F.asm2
-rw-r--r--maps/BlackthornGym2F.asm2
-rw-r--r--maps/BluesHouse.asm2
-rw-r--r--maps/BrunosRoom.asm4
-rw-r--r--maps/BurnedTower1F.asm8
-rw-r--r--maps/BurnedTowerB1F.asm14
-rw-r--r--maps/CeladonCafe.asm2
-rw-r--r--maps/CeladonDeptStore6F.asm2
-rw-r--r--maps/CeladonDeptStoreElevator.asm2
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm8
-rw-r--r--maps/CeladonGym.asm2
-rw-r--r--maps/CeladonMansion3F.asm2
-rw-r--r--maps/CeladonPokeCenter1F.asm2
-rw-r--r--maps/CeruleanCity.asm16
-rw-r--r--maps/CeruleanGym.asm8
-rw-r--r--maps/CherrygroveCity.asm12
-rw-r--r--maps/CianwoodCity.asm8
-rw-r--r--maps/CianwoodGym.asm4
-rw-r--r--maps/CianwoodPharmacy.asm2
-rw-r--r--maps/CinnabarIsland.asm2
-rw-r--r--maps/DayCare.asm2
-rw-r--r--maps/DragonShrine.asm10
-rw-r--r--maps/DragonsDenB1F.asm8
-rw-r--r--maps/EcruteakGym.asm4
-rw-r--r--maps/EcruteakPokeCenter1F.asm4
-rw-r--r--maps/ElmsLab.asm12
-rw-r--r--maps/FastShip1F.asm8
-rw-r--r--maps/FastShipCabins.asm2
-rw-r--r--maps/FastShipCabins_NNW_NNE_NE.asm6
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm2
-rw-r--r--maps/FastShipCabins_SW_SSW_NW.asm4
-rw-r--r--maps/FuchsiaGym.asm2
-rw-r--r--maps/GoldenrodBikeShop.asm2
-rw-r--r--maps/GoldenrodBillsHouse.asm4
-rw-r--r--maps/GoldenrodCity.asm4
-rw-r--r--maps/GoldenrodDeptStore6F.asm2
-rw-r--r--maps/GoldenrodDeptStoreElevator.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm8
-rw-r--r--maps/GoldenrodGym.asm2
-rw-r--r--maps/GoldenrodPokeCenter1F.asm12
-rw-r--r--maps/IcePathB1F.asm2
-rw-r--r--maps/IndigoPlateauPokeCenter1F.asm8
-rw-r--r--maps/KarensRoom.asm4
-rw-r--r--maps/KogasRoom.asm4
-rw-r--r--maps/KrissHouse1F.asm4
-rw-r--r--maps/KrissHouse2F.asm2
-rw-r--r--maps/KrissNeighborsHouse.asm2
-rw-r--r--maps/KurtsHouse.asm14
-rw-r--r--maps/LakeofRage.asm4
-rw-r--r--maps/LancesRoom.asm8
-rw-r--r--maps/MahoganyGym.asm2
-rw-r--r--maps/MahoganyMart1F.asm6
-rw-r--r--maps/MahoganyTown.asm2
-rw-r--r--maps/ManiasHouse.asm2
-rw-r--r--maps/MobileBattleRoom.asm2
-rw-r--r--maps/MountMoon.asm4
-rw-r--r--maps/MountMortarB1F.asm2
-rw-r--r--maps/MrPokemonsHouse.asm10
-rw-r--r--maps/NewBarkTown.asm6
-rw-r--r--maps/OlivineCity.asm8
-rw-r--r--maps/OlivineGym.asm2
-rw-r--r--maps/OlivineLighthouse6F.asm2
-rw-r--r--maps/OlivinePort.asm4
-rw-r--r--maps/PewterGym.asm2
-rw-r--r--maps/PokeCenter2F.asm10
-rw-r--r--maps/PokemonFanClub.asm2
-rw-r--r--maps/PowerPlant.asm2
-rw-r--r--maps/RadioTower1F.asm20
-rw-r--r--maps/RadioTower2F.asm6
-rw-r--r--maps/RadioTower3F.asm2
-rw-r--r--maps/RadioTower5F.asm6
-rw-r--r--maps/Route24.asm4
-rw-r--r--maps/Route25.asm4
-rw-r--r--maps/Route26HealSpeechHouse.asm2
-rw-r--r--maps/Route30.asm6
-rw-r--r--maps/Route34.asm6
-rw-r--r--maps/Route35.asm2
-rw-r--r--maps/Route35Goldenrodgate.asm2
-rw-r--r--maps/Route35NationalParkgate.asm8
-rw-r--r--maps/Route36.asm6
-rw-r--r--maps/Route36NationalParkgate.asm8
-rw-r--r--maps/Route39Barn.asm2
-rw-r--r--maps/Route39Farmhouse.asm2
-rw-r--r--maps/Route42.asm2
-rw-r--r--maps/Route43Gate.asm2
-rw-r--r--maps/RuinsofAlphAerodactylChamber.asm6
-rw-r--r--maps/RuinsofAlphHoOhChamber.asm6
-rw-r--r--maps/RuinsofAlphKabutoChamber.asm6
-rw-r--r--maps/RuinsofAlphOmanyteChamber.asm6
-rw-r--r--maps/RuinsofAlphOutside.asm2
-rw-r--r--maps/RuinsofAlphResearchCenter.asm10
-rw-r--r--maps/SaffronGym.asm2
-rw-r--r--maps/SeafoamGym.asm2
-rw-r--r--maps/SproutTower3F.asm12
-rw-r--r--maps/TeamRocketBaseB1F.asm46
-rw-r--r--maps/TeamRocketBaseB2F.asm6
-rw-r--r--maps/TeamRocketBaseB3F.asm10
-rw-r--r--maps/TinTower1F.asm22
-rw-r--r--maps/UndergroundPathSwitchRoomEntrances.asm28
-rw-r--r--maps/VermilionGym.asm2
-rw-r--r--maps/VermilionPort.asm4
-rw-r--r--maps/VictoryRoad.asm4
-rw-r--r--maps/VioletCity.asm4
-rw-r--r--maps/VioletGym.asm2
-rw-r--r--maps/VioletPokeCenter1F.asm4
-rw-r--r--maps/ViridianGym.asm2
-rw-r--r--maps/WarehouseEntrance.asm6
-rw-r--r--maps/WillsRoom.asm4
112 files changed, 312 insertions, 312 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 6d5db0b19..1181cc37e 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -21,7 +21,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
setevent EVENT_BEAT_BUGSY
loadfont
2writetext UnknownText_0x18ee14
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $001c
checkcode $7
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index dd9567bbb..4000f9d61 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -53,7 +53,7 @@ UnknownScript_0x198034: ; 0x198034
applymovement $b, MovementData_0x19813c
spriteface $0, $1
UnknownScript_0x198049: ; 0x198049
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x19814d
closetext
@@ -93,14 +93,14 @@ UnknownScript_0x198081: ; 0x198081
; 0x198091
UnknownScript_0x198091: ; 0x198091
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x198233
closetext
loadmovesprites
spriteface $0, $2
applymovement $b, MovementData_0x198144
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $b
dotrigger $0
waitbutton
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 8dba68b55..8668d9856 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -48,7 +48,7 @@ UnknownScript_0x9f425: ; 0x9f425
2writetext UnknownText_0x9ee92
closetext
loadmovesprites
- playmusic $000d
+ playmusic MUSIC_HEAL
special $002e
special $00a4
pause 60
@@ -75,7 +75,7 @@ UnknownScript_0x9f483: ; 0x9f483
special $0086
writebyte $3
special $0086
- playsound $0025
+ playsound SFX_SAVE
waitbutton
special $002e
special $007e
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index a0874bf4f..4314730d1 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -25,7 +25,7 @@ UnknownScript_0x9f568: ; 0x9f568
applymovement $0, MovementData_0x9f592
writebyte $a
special $0086
- playsound $006e
+ playsound SFX_ELEVATOR
earthquake 60
waitbutton
follow $2, $0
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index b4a2a4d40..f10f1f2f3 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -72,7 +72,7 @@ UnknownScript_0x194e69: ; 0x194e69
iffalse UnknownScript_0x194e8e
itemtotext TM_24, $0
2writetext UnknownText_0x1951bf
- playsound $0001
+ playsound SFX_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 9da3d6617..a941e9c6a 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -59,7 +59,7 @@ UnknownScript_0x19574c: ; 0x19574c
; 0x195758
UnknownScript_0x195758: ; 0x195758
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
end
; 0x19575e
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index a6c528db2..dee311fdf 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -33,7 +33,7 @@ UnknownScript_0x19b0de: ; 0x19b0de
closetext
loadmovesprites
special $002e
- playmusic $000d
+ playmusic MUSIC_HEAL
pause 60
special $0031
special $003d
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index ae87a3928..a3ef29365 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -38,7 +38,7 @@ UnknownScript_0x1809ac: ; 0x1809ac
UnknownScript_0x1809ad: ; 0x1809ad
applymovement $0, MovementData_0x1809f9
refreshscreen $86
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
reloadmappart
@@ -66,7 +66,7 @@ BrunoScript_0x1809c5: ; 0x1809c5
2writetext UnknownText_0x180b3c
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
reloadmappart
loadmovesprites
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index f73933fab..34346b3d3 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -61,7 +61,7 @@ UnknownScript_0x185c25: ; 0x185c25
pause 15
applymovement $0, MovementData_0x185ccd
applymovement $4, MovementData_0x185ccf
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x185cd9
closetext
@@ -100,7 +100,7 @@ UnknownScript_0x185c70: ; 0x185c70
; 0x185c80
UnknownScript_0x185c80: ; 0x185c80
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x185de2
closetext
@@ -111,13 +111,13 @@ UnknownScript_0x185c80: ; 0x185c80
pause 15
earthquake 50
showemote $0, $0, 15
- playsound $001f
+ playsound SFX_ENTER_DOOR
waitbutton
changeblock $a, $8, $25
reloadmappart
pause 15
applymovement $0, MovementData_0x185cd1
- playsound $002f
+ playsound SFX_KINESIS
showemote $0, $4, 20
loadfont
2writetext UnknownText_0x185e75
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index e5cc4ced1..686996354 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -31,7 +31,7 @@ UnknownScript_0x18616a: ; 0x18616a
; 0x18616b
UnknownScript_0x18616b: ; 0x18616b
- playmusic $0000
+ playmusic MUSIC_NONE
pause 30
appear $3
spriteface $0, $1
@@ -52,28 +52,28 @@ UnknownScript_0x18616b: ; 0x18616b
pause 15
cry SUICUNE
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
spriteface $0, $2
applymovement $3, MovementData_0x186236
disappear $3
waitbutton
- playsound $0014
+ playsound SFX_WARP_FROM
spriteface $0, $3
applymovement $4, MovementData_0x18623b
disappear $4
waitbutton
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
spriteface $0, $1
applymovement $5, MovementData_0x186241
- playsound $0014
+ playsound SFX_WARP_FROM
spriteface $0, $0
applymovement $5, MovementData_0x186248
spriteface $0, $1
pause 20
cry SUICUNE
pause 30
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $5, MovementData_0x186253
spriteface $0, $0
disappear $5
@@ -114,7 +114,7 @@ UnknownScript_0x186226: ; 0x186226
applymovement $a, MovementData_0x18625c
UnknownScript_0x18622a: ; 0x18622a
disappear $a
- playsound $0023
+ playsound SFX_EXIT_BUILDING
waitbutton
end
; 0x186231
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 10e98ed70..50a9a6376 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -99,7 +99,7 @@ MapCeladonCafeSignpost1Script: ; 0x730b0
loadfont
itemtotext LEFTOVERS, $0
2writetext UnknownText_0x732e7
- playsound $0001
+ playsound SFX_ITEM
waitbutton
itemnotify
loadmovesprites
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 8508e9830..e1625c26c 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -70,7 +70,7 @@ UnknownScript_0x711ce: ; 0x711ce
UnknownScript_0x711e8: ; 0x711e8
pause 10
- playsound $001f
+ playsound SFX_ENTER_DOOR
2writetext UnknownText_0x71274
keeptextopen
itemnotify
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index aa2ed2cf8..5d45c7bb8 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -12,7 +12,7 @@ MapCeladonDeptStoreElevatorSignpost0Script: ; 0x713ad
loadmovesprites
iffalse UnknownScript_0x713bd
pause 5
- playsound $006e
+ playsound SFX_ELEVATOR
earthquake 60
waitbutton
UnknownScript_0x713bd: ; 0x713bd
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index c7065e0c1..25a8162fa 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -77,7 +77,7 @@ UnknownScript_0x72768: ; 0x72768
UnknownScript_0x7276d: ; 0x7276d
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x729ad
closetext
2jump UnknownScript_0x726fd
@@ -158,7 +158,7 @@ UnknownScript_0x727ed: ; 0x727ed
2call UnknownScript_0x72768
iffalse UnknownScript_0x72784
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x729ad
closetext
writebyte PIKACHU
@@ -177,7 +177,7 @@ UnknownScript_0x7281b: ; 0x7281b
2call UnknownScript_0x72768
iffalse UnknownScript_0x72784
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x729ad
closetext
writebyte PORYGON
@@ -196,7 +196,7 @@ UnknownScript_0x72849: ; 0x72849
2call UnknownScript_0x72768
iffalse UnknownScript_0x72784
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x729ad
closetext
writebyte LARVITAR
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index f6426f8c4..34ccccc83 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -25,7 +25,7 @@ ErikaScript_0x72a6a: ; 0x72a6a
setevent EVENT_BEAT_TWINS_JO_AND_ZOE
loadfont
2writetext UnknownText_0x72c96
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0026
UnknownScript_0x72a9b: ; 0x72a9b
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index e05564271..95f44697f 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -20,7 +20,7 @@ CooltrainerMScript_0x71670: ; 0x71670
UnknownScript_0x7167e: ; 0x7167e
keeptextopen
2writetext UnknownText_0x71725
- playsound $00a3
+ playsound SFX_DEX_FANFARE_230_PLUS
waitbutton
2writetext UnknownText_0x71760
keeptextopen
diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm
index dc1a9a99f..ff964082d 100644
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -53,7 +53,7 @@ UnknownScript_0x71e5a: ; 0x71e5a
applymovement $6, MovementData_0x71e65
UnknownScript_0x71e5e: ; 0x71e5e
disappear $6
- playsound $0023
+ playsound SFX_EXIT_BUILDING
waitbutton
end
; 0x71e65
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index f92804d08..374a57679 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -103,21 +103,21 @@ YoungsterScript_0x184064: ; 0x184064
UnknownScript_0x184072: ; 0x184072
waitbutton
- playsound $0012
+ playsound SFX_SECOND_PART_OF_ITEMFINDER
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
waitbutton
- playsound $0012
+ playsound SFX_SECOND_PART_OF_ITEMFINDER
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
waitbutton
- playsound $0012
+ playsound SFX_SECOND_PART_OF_ITEMFINDER
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
waitbutton
- playsound $0012
+ playsound SFX_SECOND_PART_OF_ITEMFINDER
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
waitbutton
showemote $0, $7, 15
spriteface $7, $2
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 2efde060a..d1f2ddb5f 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -21,9 +21,9 @@ UnknownScript_0x1883da: ; 0x1883da
UnknownScript_0x1883de: ; 0x1883de
applymovement $2, MovementData_0x1884e3
- playsound $0041
+ playsound SFX_TACKLE
applymovement $2, MovementData_0x1884eb
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
2writetext UnknownText_0x1884fb
closetext
@@ -40,7 +40,7 @@ UnknownScript_0x1883de: ; 0x1883de
closetext
loadmovesprites
applymovement $2, MovementData_0x1884e8
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent $076c
@@ -74,7 +74,7 @@ MistyScript_0x188432: ; 0x188432
setevent EVENT_BEAT_SWIMMERM_PARKER
loadfont
2writetext UnknownText_0x188768
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0024
UnknownScript_0x188460: ; 0x188460
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index a29f53b91..f2573913b 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -40,7 +40,7 @@ UnknownScript_0x19c01f: ; 0x19c01f
2writetext UnknownText_0x19c26f
closetext
loadmovesprites
- playmusic $0011
+ playmusic MUSIC_SHOW_ME_AROUND
follow $2, $0
applymovement $2, MovementData_0x19c195
loadfont
@@ -85,7 +85,7 @@ UnknownScript_0x19c01f: ; 0x19c01f
special $003d
spriteface $0, $1
applymovement $2, MovementData_0x19c1cb
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $2
clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
waitbutton
@@ -118,7 +118,7 @@ UnknownScript_0x19c0ae: ; 0x19c0ae
appear $3
applymovement $3, MovementData_0x19c1ce
spriteface $0, $3
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x19c4e2
closetext
@@ -163,7 +163,7 @@ UnknownScript_0x19c104: ; 0x19c104
; 0x19c11a
UnknownScript_0x19c11a: ; 0x19c11a
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x19c608
closetext
@@ -172,13 +172,13 @@ UnknownScript_0x19c11a: ; 0x19c11a
; 0x19c126
UnknownScript_0x19c126: ; 0x19c126
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x19c59e
closetext
loadmovesprites
UnknownScript_0x19c12f: ; 0x19c12f
- playsound $0041
+ playsound SFX_TACKLE
applymovement $0, MovementData_0x19c1d4
spriteface $0, $2
applymovement $3, MovementData_0x19c1da
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 8f4192e98..1339de71b 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -36,11 +36,11 @@ UnknownScript_0x1a001e: ; 0x1a001e
spriteface $0, $1
showemote $0, $0, 15
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00da
spriteface $0, $0
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00e0
disappear $d
pause 10
@@ -50,7 +50,7 @@ UnknownScript_0x1a001e: ; 0x1a001e
checkevent $0333
iftrue UnknownScript_0x1a0083
setevent $0333
- playmusic $0061
+ playmusic MUSIC_MYSTICALMAN_ENCOUNTER
appear $c
applymovement $c, MovementData_0x1a00e7
loadfont
@@ -63,7 +63,7 @@ UnknownScript_0x1a001e: ; 0x1a001e
startbattle
reloadmapmusic
returnafterbattle
- playmusic $0061
+ playmusic MUSIC_MYSTICALMAN_ENCOUNTER
loadfont
2writetext UnknownText_0x1a05c3
closetext
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index a920a7155..6b271d51d 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -20,7 +20,7 @@ ChuckScript_0x9d60f: ; 0x9d60f
closetext
loadmovesprites
applymovement $7, MovementData_0x9d6f3
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
disappear $7
pause 30
@@ -36,7 +36,7 @@ ChuckScript_0x9d60f: ; 0x9d60f
setevent EVENT_BEAT_CHUCK
loadfont
2writetext UnknownText_0x9d835
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0020
checkcode $7
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 2b0dbc3fc..a16097af8 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -24,7 +24,7 @@ PharmacistScript_0x9df9e: ; 0x9df9e
keeptextopen
giveitem SECRETPOTION, $1
2writetext UnknownText_0x9e056
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 2df937c70..3d9ea00ed 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -21,7 +21,7 @@ BlueScript_0x1ac9b0: ; 0x1ac9b0
2writetext UnknownText_0x1ac9d2
closetext
loadmovesprites
- playsound $0013
+ playsound SFX_WARP_TO
applymovement $2, MovementData_0x1ac9d0
disappear $2
clearevent $0776
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index ce4e30294..0e1cc2441 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -37,7 +37,7 @@ GrampsScript_0x62f8f: ; 0x62f8f
special $007d
loadfont
2writetext UnknownText_0x631ae
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
2writetext UnknownText_0x631c3
closetext
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 699e72240..942f72705 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -119,9 +119,9 @@ UnknownScript_0x18d100: ; 0x18d100
2writetext UnknownText_0x18d47c
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
showemote $0, $0, 15
- playmusic $005d
+ playmusic MUSIC_CLAIR
appear $5
waitbutton
spriteface $0, $0
@@ -161,7 +161,7 @@ UnknownScript_0x18d100: ; 0x18d100
2writetext UnknownText_0x18d9bf
closetext
setflag $0022
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
special $003d
specialphonecall $8
@@ -185,7 +185,7 @@ UnknownScript_0x18d100: ; 0x18d100
closetext
loadmovesprites
applymovement $5, MovementData_0x18d2e3
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $5
waitbutton
setevent $0000
@@ -215,7 +215,7 @@ UnknownScript_0x18d1c5: ; 0x18d1c5
checkcode $1
if_equal $6, UnknownScript_0x18d1ed
2writetext UnknownText_0x18d697
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
givepoke DRATINI, 15, 0, 0
checkevent $00c1
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index e4be7d72b..c84ed1813 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -50,7 +50,7 @@ UnknownScript_0x18c8b8: ; 0x18c8b8
loadmovesprites
showemote $0, $0, 15
spriteface $0, $2
- playmusic $005d
+ playmusic MUSIC_CLAIR
applymovement $3, MovementData_0x18c9ae
loadfont
2writetext UnknownText_0x18c9bf
@@ -59,7 +59,7 @@ UnknownScript_0x18c8b8: ; 0x18c8b8
iffalse UnknownScript_0x18c8f4
itemtotext TM_24, $0
2writetext UnknownText_0x18c9fb
- playsound $0001
+ playsound SFX_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH
@@ -208,7 +208,7 @@ PokeBallScript_0x18c95a: ; 0x18c95a
loadfont
itemtotext DRAGON_FANG, $0
2writetext UnknownText_0x18cf41
- playsound $0001
+ playsound SFX_ITEM
waitbutton
itemnotify
loadmovesprites
@@ -227,7 +227,7 @@ UnknownScript_0x18c970: ; 0x18c970
; 0x18c97e
SilverScript_0x18c97e: ; 0x18c97e
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
loadfont
checkevent $0000
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 2afe30b04..26010678a 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -34,7 +34,7 @@ MortyScript_0x99d58: ; 0x99d58
setevent EVENT_BEAT_MORTY
loadfont
2writetext UnknownText_0x9a043
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $001e
checkcode $7
@@ -93,7 +93,7 @@ UnknownScript_0x99dc6: ; 0x99dc6
applymovement $0, MovementData_0x99e5f
stopfollow
special $002e
- playsound $001f
+ playsound SFX_ENTER_DOOR
waitbutton
warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b
end
diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm
index ac81daccf..4d393bb6b 100644
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -21,7 +21,7 @@ UnknownScript_0x98e63: ; 0x98e63
UnknownScript_0x98e64: ; 0x98e64
pause 30
- playsound $0023
+ playsound SFX_EXIT_BUILDING
appear $6
waitbutton
applymovement $6, MovementData_0x98ec5
@@ -48,7 +48,7 @@ UnknownScript_0x98e95: ; 0x98e95
loadmovesprites
spriteface $0, $0
applymovement $6, MovementData_0x98ece
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $6
clearevent $0712
setflag $0053
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index b98a8c70a..af2135a6b 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -70,7 +70,7 @@ UnknownScript_0x78ba5: ; 0x78ba5
2writetext UnknownText_0x7913a
closetext
loadmovesprites
- playsound $00bc
+ playsound SFX_GLASS_TING
pause 30
showemote $0, $2, 10
spriteface $2, $0
@@ -188,7 +188,7 @@ CyndaquilPokeBallScript: ; 0x78c73
waitbutton
pokenamemem CYNDAQUIL, $0
2writetext ReceivedStarterText
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
keeptextopen
givepoke CYNDAQUIL, 5, BERRY, 0
@@ -219,7 +219,7 @@ TotodilePokeBallScript: ; 0x78cb5
waitbutton
pokenamemem TOTODILE, $0
2writetext ReceivedStarterText
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
keeptextopen
givepoke TOTODILE, 5, BERRY, 0
@@ -248,7 +248,7 @@ ChikoritaPokeBallScript: ; 0x78cf1
waitbutton
pokenamemem CHIKORITA, $0
2writetext ReceivedStarterText
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
keeptextopen
givepoke CHIKORITA, 5, BERRY, 0
@@ -273,7 +273,7 @@ ElmDirectionsScript: ; 0x78d33
addcellnum $4
loadfont
2writetext GotElmsNumberText
- playsound $0093
+ playsound SFX_REGISTER_PHONE_NUMBER
waitbutton
closetext
loadmovesprites
@@ -330,7 +330,7 @@ UnknownScript_0x78d81: ; 0x78d81
UnknownScript_0x78d8a: ; 0x78d8a
special $009d
special $001b
- playmusic $0000
+ playmusic MUSIC_NONE
writebyte $1
special $003e
pause 30
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 407c0ba49..c2821f41f 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -29,7 +29,7 @@ UnknownScript_0x7513b: ; 0x7513b
applymovement $0, MovementData_0x75217
applymovement $2, MovementData_0x75211
pause 30
- playsound $001c
+ playsound SFX_BOAT
earthquake 30
blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
clearevent $0031
@@ -71,7 +71,7 @@ UnknownScript_0x7517a: ; 0x7517a
closetext
loadmovesprites
2call UnknownScript_0x751b8
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
setevent $072b
@@ -85,7 +85,7 @@ UnknownScript_0x7519c: ; 0x7519c
closetext
loadmovesprites
2call UnknownScript_0x751b8
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
setevent $072a
@@ -137,7 +137,7 @@ UnknownScript_0x751e7: ; 0x751e7
UnknownScript_0x751eb: ; 0x751eb
appear $5
applymovement $5, MovementData_0x7521b
- playsound $0041
+ playsound SFX_TACKLE
applymovement $0, MovementData_0x7522e
applymovement $5, MovementData_0x75220
loadfont
diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm
index 65044c6c2..b8776e0af 100644
--- a/maps/FastShipCabins.asm
+++ b/maps/FastShipCabins.asm
@@ -100,7 +100,7 @@ UnknownScript_0x75f37: ; 0x75f37
UnknownScript_0x75f44: ; 0x75f44
loadmovesprites
waitbutton
- playsound $0027
+ playsound SFX_ELEVATOR_END
pause 30
loadfont
2writetext UnknownText_0x76645
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 09c0a4133..e2e80bbb7 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -181,7 +181,7 @@ BurglarCoreyScript: ; 0x755e9
; 0x755f1
SailorScript_0x755f1: ; 0x755f1
- playmusic $000a
+ playmusic MUSIC_HIKER_ENCOUNTER
faceplayer
loadfont
2writetext UnknownText_0x75812
@@ -202,7 +202,7 @@ SailorScript_0x755f1: ; 0x755f1
checkcode $9
if_equal $3, UnknownScript_0x75629
applymovement $6, MovementData_0x75637
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $6
waitbutton
end
@@ -210,7 +210,7 @@ SailorScript_0x755f1: ; 0x755f1
UnknownScript_0x75629: ; 0x75629
applymovement $6, MovementData_0x7563c
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $6
waitbutton
end
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 65044c6c2..b8776e0af 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -100,7 +100,7 @@ UnknownScript_0x75f37: ; 0x75f37
UnknownScript_0x75f44: ; 0x75f44
loadmovesprites
waitbutton
- playsound $0027
+ playsound SFX_ELEVATOR_END
pause 30
loadfont
2writetext UnknownText_0x76645
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 3592a6c1d..8859a2f2f 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -141,7 +141,7 @@ MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac
special $0033
special $009d
special $001b
- playmusic $000d
+ playmusic MUSIC_HEAL
pause 60
special $003d
special $0032
@@ -160,7 +160,7 @@ UnknownScript_0x75ae1: ; 0x75ae1
; 0x75ae2
UnknownScript_0x75ae2: ; 0x75ae2
- playsound $0027
+ playsound SFX_ELEVATOR_END
pause 30
checkevent $002f
iftrue UnknownScript_0x75af7
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index b608e7914..834d6dd94 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -31,7 +31,7 @@ JanineScript_0x195db9: ; 0x195db9
special $005e
loadfont
2writetext UnknownText_0x195feb
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0027
2jump UnknownScript_0x195e02
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 0d7b95b0f..7b0d5c64f 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -23,7 +23,7 @@ ClerkScript_0x54750: ; 0x54750
waitbutton
giveitem BICYCLE, $1
2writetext UnknownText_0x54848
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
itemnotify
setflag $0014
diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm
index 4781b71b8..55902f248 100644
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -20,7 +20,7 @@ BillScript_0x54be4: ; 0x54be4
checkcode $1
if_equal $6, UnknownScript_0x54c13
2writetext UnknownText_0x54dae
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
givepoke EEVEE, 20, 0, 0
setevent EVENT_GOT_EEVEE
@@ -81,7 +81,7 @@ TwinScript_0x54c39: ; 0x54c39
waitbutton
addcellnum $3
2writetext UnknownText_0x54fd9
- playsound $0093
+ playsound SFX_REGISTER_PHONE_NUMBER
waitbutton
keeptextopen
UnknownScript_0x54c58: ;0x54c58
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 729c3da3f..3364aadd6 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -127,7 +127,7 @@ UnknownScript_0x1989a6: ; 0x1989a6
keeptextopen
takecoins 4000
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
special $004f
2writetext UnknownText_0x19918b
closetext
@@ -141,7 +141,7 @@ UnknownScript_0x1989a6: ; 0x1989a6
UnknownScript_0x1989c6: ; 0x1989c6
applymovement $10, MovementData_0x198a63
UnknownScript_0x1989ca: ; 0x1989ca
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $10
clearevent $076b
setflag $005e
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index fa7449cfe..d137b8d3c 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -53,7 +53,7 @@ UnknownScript_0x56443: ; 0x56443
UnknownScript_0x5645d: ; 0x5645d
pause 10
- playsound $001f
+ playsound SFX_ENTER_DOOR
2writetext UnknownText_0x564ef
keeptextopen
itemnotify
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index 696ac6fda..8182801b1 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -12,7 +12,7 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: ; 0x56699
loadmovesprites
iffalse UnknownScript_0x566df
pause 5
- playsound $006e
+ playsound SFX_ELEVATOR
earthquake 60
waitbutton
checkevent $0307
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 69d16411a..8b446511f 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -108,7 +108,7 @@ UnknownScript_0x56ca1: ; 0x56ca1
UnknownScript_0x56ca6: ; 0x56ca6
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x56ebd
closetext
2jump UnknownScript_0x56c36
@@ -189,7 +189,7 @@ UnknownScript_0x56d26: ; 0x56d26
2call UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x56ebd
closetext
writebyte ABRA
@@ -208,7 +208,7 @@ UnknownScript_0x56d54: ; 0x56d54
2call UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x56ebd
closetext
writebyte CUBONE
@@ -227,7 +227,7 @@ UnknownScript_0x56d82: ; 0x56d82
2call UnknownScript_0x56ca1
iffalse UnknownScript_0x56cbd
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x56ebd
closetext
writebyte WOBBUFFET
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 034a88fa1..c28c30f6a 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -56,7 +56,7 @@ UnknownScript_0x54044: ; 0x54044
keeptextopen
waitbutton
2writetext UnknownText_0x54273
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $001d
checkcode $7
diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm
index 25b4595de..f0a5466c3 100644
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -20,11 +20,11 @@ UnknownScript_0x60f94: ; 0x60f94
UnknownScript_0x60f9e: ; 0x60f9e
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x60fd8
- playsound $0023
+ playsound SFX_EXIT_BUILDING
moveperson $3, $0, $7
disappear $3
appear $3
- playmusic $0011
+ playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x6105a
spriteface $0, $1
loadfont
@@ -39,7 +39,7 @@ UnknownScript_0x60f9e: ; 0x60f9e
applymovement $3, MovementData_0x61060
special $003d
disappear $3
- playsound $0023
+ playsound SFX_EXIT_BUILDING
UnknownScript_0x60fd8: ; 0x60fd8
end
; 0x60fd9
@@ -54,11 +54,11 @@ UnknownScript_0x60fd9: ; 0x60fd9
UnknownScript_0x60fe3: ; 0x60fe3
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x6101d
- playsound $0023
+ playsound SFX_EXIT_BUILDING
moveperson $3, $0, $7
disappear $3
appear $3
- playmusic $0011
+ playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x61065
spriteface $0, $1
loadfont
@@ -73,7 +73,7 @@ UnknownScript_0x60fe3: ; 0x60fe3
applymovement $3, MovementData_0x6106c
special $003d
disappear $3
- playsound $0023
+ playsound SFX_EXIT_BUILDING
UnknownScript_0x6101d: ; 0x6101d
end
; 0x6101e
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 8f09e39b5..9e181432e 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -71,7 +71,7 @@ UnknownScript_0x7e4f8: ; 0x7e4f8
; 0x7e504
UnknownScript_0x7e504: ; 0x7e504
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
end
; 0x7e50a
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
index ee1fb0055..89f2cfc0a 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -61,7 +61,7 @@ UnknownScript_0x180053: ; 0x180053
special $006a
pause 15
applymovement $5, MovementData_0x180164
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
spriteface $0, $3
2jump UnknownScript_0x1800ce
; 0x180094
@@ -83,7 +83,7 @@ UnknownScript_0x180094: ; 0x180094
special $006a
pause 15
applymovement $5, MovementData_0x18016b
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
spriteface $0, $2
UnknownScript_0x1800ce: ; 0x1800ce
loadfont
@@ -125,7 +125,7 @@ UnknownScript_0x180103: ; 0x180103
; 0x180113
UnknownScript_0x180113: ; 0x180113
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x1802a4
closetext
@@ -164,7 +164,7 @@ GrampsScript_0x180139: ; 0x180139
2writetext UnknownText_0x1803e7
closetext
loadmovesprites
- playsound $0013
+ playsound SFX_WARP_TO
special $002e
waitbutton
warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 5795a0efa..cf74ed065 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -38,7 +38,7 @@ UnknownScript_0x180bd5: ; 0x180bd5
UnknownScript_0x180bd6: ; 0x180bd6
applymovement $0, MovementData_0x180c22
refreshscreen $86
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
reloadmappart
@@ -66,7 +66,7 @@ KarenScript_0x180bee: ; 0x180bee
2writetext UnknownText_0x180d29
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
reloadmappart
loadmovesprites
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index dabf4b8cd..937a53705 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -38,7 +38,7 @@ UnknownScript_0x180741: ; 0x180741
UnknownScript_0x180742: ; 0x180742
applymovement $0, MovementData_0x18078e
refreshscreen $86
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
reloadmappart
@@ -66,7 +66,7 @@ KogaScript_0x18075a: ; 0x18075a
2writetext UnknownText_0x1808ca
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
reloadmappart
loadmovesprites
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
index 24390b2e9..b067a3657 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -23,7 +23,7 @@ UnknownScript_0x7a4d8: ; 0x7a4d8
; 0x7a4db
UnknownScript_0x7a4db: ; 0x7a4db
- playmusic $004e
+ playmusic MUSIC_MOM
showemote $0, $2, 15
spriteface $0, $2
checkevent $0000
@@ -110,7 +110,7 @@ UnknownScript_0x7a56b: ; 0x7a56b
; 0x7a572
UnknownScript_0x7a572: ; 0x7a572
- playmusic $004e
+ playmusic MUSIC_MOM
2jump UnknownScript_0x7a4f6
; 0x7a578
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
index 6ed4d4dfd..693bd6386 100644
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -68,7 +68,7 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda
iftrue UnknownScript_0x7ac07
checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
iftrue UnknownScript_0x7ac0a
- playmusic $001d
+ playmusic MUSIC_POKEMON_TALK
loadfont
2writetext UnknownText_0x7ac24
pause 45
diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
index 930f2db1f..38c2b4f01 100644
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -23,7 +23,7 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7
iftrue UnknownScript_0x7ad24
checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
iftrue UnknownScript_0x7ad27
- playmusic $001d
+ playmusic MUSIC_POKEMON_TALK
loadfont
2writetext UnknownText_0x7ae3b
pause 45
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index e6ffa6c23..1faf19ec7 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -48,9 +48,9 @@ KurtScript_0x18e178: ; 0x18e178
checkcode $9
if_equal $1, UnknownScript_0x18e1ab
spriteface $0, $0
- playsound $0018
+ playsound SFX_FLY
applymovement $2, MovementData_0x18e466
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
special $003d
@@ -59,9 +59,9 @@ KurtScript_0x18e178: ; 0x18e178
UnknownScript_0x18e1ab: ; 0x18e1ab
spriteface $0, $0
- playsound $0018
+ playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
special $003d
@@ -325,17 +325,17 @@ UnknownScript_0x18e378: ; 0x18e378
checkcode $9
if_equal $1, UnknownScript_0x18e3a2
spriteface $0, $0
- playsound $0018
+ playsound SFX_FLY
applymovement $2, MovementData_0x18e466
2jump UnknownScript_0x18e3ac
; 0x18e3a2
UnknownScript_0x18e3a2: ; 0x18e3a2
spriteface $0, $0
- playsound $0018
+ playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
UnknownScript_0x18e3ac: ; 0x18e3ac
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
clearevent $07a4
waitbutton
diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
index 96e5eb2f3..46cdf948f 100644
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -55,7 +55,7 @@ UnknownScript_0x70035: ; 0x70035
2writetext UnknownText_0x702c6
closetext
loadmovesprites
- playsound $0013
+ playsound SFX_WARP_TO
applymovement $2, MovementData_0x70155
disappear $2
clearevent $06d5
@@ -98,7 +98,7 @@ UnknownScript_0x7007a: ; 0x7007a
giveitem RED_SCALE, $1
waitbutton
2writetext UnknownText_0x703df
- playsound $0001
+ playsound SFX_ITEM
waitbutton
itemnotify
loadmovesprites
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 4c18799f2..bed117617 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -38,7 +38,7 @@ UnknownScript_0x180e52: ; 0x180e52
UnknownScript_0x180e53: ; 0x180e53
applymovement $0, MovementData_0x180f33
refreshscreen $86
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
changeblock $4, $16, $34
reloadmappart
@@ -74,7 +74,7 @@ LanceScript_0x180e7b: ; 0x180e7b
2writetext UnknownText_0x181132
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $4, $0, $b
reloadmappart
loadmovesprites
@@ -119,10 +119,10 @@ LanceScript_0x180e7b: ; 0x180e7b
spriteface $4, $1
applymovement $2, MovementData_0x180f53
stopfollow
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
applymovement $0, MovementData_0x180f55
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $0
applymovement $3, MovementData_0x180f57
showemote $0, $3, 15
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 3221571d9..7130e36c7 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -21,7 +21,7 @@ PryceScript_0x199a9e: ; 0x199a9e
setevent EVENT_BEAT_PRYCE
loadfont
2writetext UnknownText_0x199d3b
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0021
checkcode $7
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index b1d67c446..2afd8040d 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -75,7 +75,7 @@ UnknownScript_0x6c38f: ; 0x6c38f
2writetext UnknownText_0x6c52a
pause 15
loadmovesprites
- playsound $0041
+ playsound SFX_TACKLE
applymovement $5, MovementData_0x6c3f6
applymovement $3, MovementData_0x6c3fb
pause 15
@@ -95,7 +95,7 @@ UnknownScript_0x6c38f: ; 0x6c38f
2writetext UnknownText_0x6c59e
closetext
showemote $0, $2, 10
- playsound $002a
+ playsound SFX_UNKNOWN_2A
changeblock $6, $2, $1e
reloadmappart
loadmovesprites
@@ -106,7 +106,7 @@ UnknownScript_0x6c38f: ; 0x6c38f
closetext
loadmovesprites
applymovement $4, MovementData_0x6c412
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $4
dotrigger $0
waitbutton
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 072945b94..b4dd98865 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -67,7 +67,7 @@ UnknownScript_0x190040: ; 0x190040
giveitem RAGECANDYBAR, $1
iffalse UnknownScript_0x190078
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
takemoney $0, 300
special $0051
2writetext UnknownText_0x19014a
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index a9193f91d..b0c5ec1fd 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -22,7 +22,7 @@ RockerScript_0x9d278: ; 0x9d278
keeptextopen
waitbutton
2writetext UnknownText_0x9d41b
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
loadmovesprites
setevent EVENT_GOT_SHUCKIE
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 8e2e872a3..bf47c1539 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -41,7 +41,7 @@ UnknownScript_0x1935f4: ; 0x1935f4
pause 20
loadmovesprites
special $002e
- playmusic $000d
+ playmusic MUSIC_HEAL
special $00a4
pause 60
special $0031
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 67d248d3b..b2437062e 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -25,7 +25,7 @@ UnknownScript_0x7408e: ; 0x7408e
special $006a
pause 15
applymovement $2, MovementData_0x740f9
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x74105
closetext
@@ -64,7 +64,7 @@ UnknownScript_0x740d3: ; 0x740d3
; 0x740e3
UnknownScript_0x740e3: ; 0x740e3
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x741fa
closetext
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 74ff4081e..dbb55a2b3 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -29,7 +29,7 @@ UnknownScript_0x7e217: ; 0x7e217
checkcode $1
if_equal $6, UnknownScript_0x7e237
2writetext UnknownText_0x7e355
- playsound $0002
+ playsound SFX_CAUGHT_MON
waitbutton
givepoke TYROGUE, 10, 0, 0
setevent EVENT_GOT_TYROGUE_FROM_KIYO
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index a41e4a21d..8b7d3eb90 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -33,7 +33,7 @@ UnknownScript_0x196e56: ; 0x196e56
waitbutton
giveitem MYSTERY_EGG, $1
2writetext UnknownText_0x196fd2
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
@@ -90,7 +90,7 @@ UnknownScript_0x196ec7: ; 0x196ec7
; 0x196ec9
UnknownScript_0x196ec9: ; 0x196ec9
- playmusic $001e
+ playmusic MUSIC_PROF_OAK
applymovement $3, MovementData_0x196f5d
spriteface $0, $3
loadfont
@@ -98,7 +98,7 @@ UnknownScript_0x196ec9: ; 0x196ec9
keeptextopen
waitbutton
2writetext UnknownText_0x1973cc
- playsound $0001
+ playsound SFX_ITEM
waitbutton
setflag $000b
2writetext UnknownText_0x1973de
@@ -106,7 +106,7 @@ UnknownScript_0x196ec9: ; 0x196ec9
loadmovesprites
spriteface $0, $0
applymovement $3, MovementData_0x196f61
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $3
waitbutton
special $003d
@@ -118,7 +118,7 @@ UnknownScript_0x196ec9: ; 0x196ec9
loadmovesprites
special $0030
special $0033
- playmusic $000d
+ playmusic MUSIC_HEAL
special $009d
special $001b
pause 60
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 2f2ebc0a1..9645456b5 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -29,7 +29,7 @@ UnknownScript_0x1a800f: ; 0x1a800f
; 0x1a8016
UnknownScript_0x1a8016: ; 0x1a8016
- playmusic $004e
+ playmusic MUSIC_MOM
spriteface $2, $2
loadfont
2writetext UnknownText_0x1a8134
@@ -53,7 +53,7 @@ UnknownScript_0x1a8016: ; 0x1a8016
; 0x1a8041
UnknownScript_0x1a8041: ; 0x1a8041
- playmusic $004e
+ playmusic MUSIC_MOM
spriteface $2, $2
loadfont
2writetext UnknownText_0x1a8134
@@ -133,7 +133,7 @@ SilverScript_0x1a809e: ; 0x1a809e
pause 5
spriteface $4, $0
pause 5
- playsound $0041
+ playsound SFX_TACKLE
applymovement $0, MovementData_0x1a80f0
applymovement $4, MovementData_0x1a80f5
end
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 03c03e39d..6c754dd7f 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -32,11 +32,11 @@ UnknownScript_0x1a8833: ; 0x1a8833
showemote $0, $0, 15
special $006a
pause 15
- playsound $001f
+ playsound SFX_ENTER_DOOR
appear $5
waitbutton
applymovement $5, MovementData_0x1a88d2
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x1a88fa
closetext
@@ -57,11 +57,11 @@ UnknownScript_0x1a886b: ; 0x1a886b
showemote $0, $0, 15
special $006a
pause 15
- playsound $001f
+ playsound SFX_ENTER_DOOR
appear $5
waitbutton
applymovement $5, MovementData_0x1a88d6
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x1a88fa
closetext
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 3544c45e1..bae05d336 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -21,7 +21,7 @@ JasmineScript_0x9c12f: ; 0x9c12f
setevent EVENT_BEAT_JASMINE
loadfont
2writetext UnknownText_0x9c33a
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $001f
checkcode $7
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index eae9d8033..2bcaac655 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -37,7 +37,7 @@ UnknownScript_0x60bab: ; 0x60bab
pause 15
spriteface $3, $2
loadfont
- playmusic $000d
+ playmusic MUSIC_HEAL
2writetext UnknownText_0x60e44
pause 60
keeptextopen
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index e362a8597..ac54186e1 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -38,11 +38,11 @@ SailorScript_0x748c0: ; 0x748c0
loadmovesprites
spriteface $2, $0
pause 10
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
applymovement $0, MovementData_0x74a30
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
checkevent $0030
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index d5a57681c..4ea9b6a5f 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -22,7 +22,7 @@ BrockScript_0x1a2864: ; 0x1a2864
setevent EVENT_BEAT_CAMPER_JERRY
loadfont
2writetext UnknownText_0x1a2a3d
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0023
2writetext UnknownText_0x1a2a57
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index d99134a7c..9525509e5 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -480,7 +480,7 @@ UnknownScript_0x192b12: ; 0x192b12
2writetext UnknownText_0x193278
closetext
loadmovesprites
- playsound $00ca
+ playsound SFX_TINGLE
applymovement $0, MovementData_0x192d17
writebyte $80
special $0098
@@ -509,7 +509,7 @@ UnknownScript_0x192b63: ; 0x192b63
applymovement $2, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
clearflag $009f
- playsound $00ca
+ playsound SFX_TINGLE
applymovement $0, MovementData_0x192d17
writebyte $90
special $0098
@@ -533,7 +533,7 @@ UnknownScript_0x192b9d: ; 0x192b9d
applymovement $3, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
clearflag $009f
- playsound $00ca
+ playsound SFX_TINGLE
applymovement $0, MovementData_0x192d17
writebyte $90
special $0098
@@ -598,7 +598,7 @@ UnknownScript_0x192c20: ; 0x192c20
2writetext UnknownText_0x193278
closetext
loadmovesprites
- playsound $00ca
+ playsound SFX_TINGLE
applymovement $0, MovementData_0x192d17
writebyte $80
special $0098
@@ -629,7 +629,7 @@ UnknownScript_0x192c66: ; 0x192c66
applymovement $4, MovementData_0x192d08
applymovement $0, MovementData_0x192cfc
clearflag $009f
- playsound $00ca
+ playsound SFX_TINGLE
applymovement $0, MovementData_0x192d17
writebyte $90
special $0098
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index e59d8170c..94e4d8e52 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -80,7 +80,7 @@ UnknownScript_0x191844: ; 0x191844
iffalse UnknownScript_0x191865
disappear $6
2writetext UnknownText_0x191d0a
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
itemnotify
setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 02c3720ad..08ed89873 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -19,7 +19,7 @@ UnknownScript_0x188dc4: ; 0x188dc4
; 0x188dc5
UnknownScript_0x188dc5: ; 0x188dc5
- playsound $006a
+ playsound SFX_CALL
showemote $0, $2, 15
waitbutton
pause 30
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 30da18c32..78b1fec7c 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -45,7 +45,7 @@ UnknownScript_0x5cd4c: ; 0x5cd4c
keeptextopen
waitbutton
2writetext UnknownText_0x5cf79
- playsound $0009
+ playsound SFX_DEX_FANFARE_20_49
waitbutton
keeptextopen
special $0052
@@ -67,7 +67,7 @@ UnknownScript_0x5cd84: ; 0x5cd84
UnknownScript_0x5cd8a: ; 0x5cd8a
2writetext UnknownText_0x5cfb5
- playsound $0099
+ playsound SFX_1ST_PLACE
waitbutton
keeptextopen
giveitem MASTER_BALL, $1
@@ -79,7 +79,7 @@ UnknownScript_0x5cd8a: ; 0x5cd8a
UnknownScript_0x5cd9f: ; 0x5cd9f
2writetext UnknownText_0x5d023
- playsound $0098
+ playsound SFX_2ND_PLACE
waitbutton
keeptextopen
giveitem EXP_SHARE, $1
@@ -91,7 +91,7 @@ UnknownScript_0x5cd9f: ; 0x5cd9f
UnknownScript_0x5cdb4: ; 0x5cdb4
2writetext UnknownText_0x5d076
- playsound $0094
+ playsound SFX_3RD_PLACE
waitbutton
keeptextopen
giveitem PP_UP, $1
@@ -126,27 +126,27 @@ CooltrainerFScript_0x5cdd5: ; 0x5cdd5
2writetext UnknownText_0x5d1f2
yesorno
iffalse UnknownScript_0x5ce42
- playsound $0027
+ playsound SFX_ELEVATOR_END
waitbutton
2writetext UnknownText_0x5d231
yesorno
iffalse UnknownScript_0x5ce42
- playsound $0027
+ playsound SFX_ELEVATOR_END
waitbutton
2writetext UnknownText_0x5d282
yesorno
iftrue UnknownScript_0x5ce42
- playsound $0027
+ playsound SFX_ELEVATOR_END
waitbutton
2writetext UnknownText_0x5d2bc
yesorno
iffalse UnknownScript_0x5ce42
- playsound $0027
+ playsound SFX_ELEVATOR_END
waitbutton
2writetext UnknownText_0x5d30e
yesorno
iftrue UnknownScript_0x5ce42
- playsound $0027
+ playsound SFX_ELEVATOR_END
waitbutton
2writetext UnknownText_0x5d37b
keeptextopen
@@ -172,7 +172,7 @@ UnknownScript_0x5ce3e: ; 0x5ce3e
; 0x5ce42
UnknownScript_0x5ce42: ; 0x5ce42
- playsound $0019
+ playsound SFX_WRONG
2writetext UnknownText_0x5d409
closetext
loadmovesprites
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index b2caa2cb9..1af8412e6 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -182,7 +182,7 @@ BuenaScript_0x5d775: ; 0x5d775
iffalse UnknownScript_0x5d86b
checkcode $18
if_equal $1e, UnknownScript_0x5d87f
- playmusic $0060
+ playmusic MUSIC_BUENAS_PASSWORD
2writetext UnknownText_0x5de35
special $00a3
iffalse UnknownScript_0x5d81e
@@ -212,7 +212,7 @@ UnknownScript_0x5d7be: ; 0x5d7be
addvar $1
writevarcode $18
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
setflag $0060
pause 20
spriteface $b, $3
@@ -361,7 +361,7 @@ UnknownScript_0x5d8d0: ; 0x5d8d0
if_equal $1, UnknownScript_0x5d8f6
if_equal $2, UnknownScript_0x5d8ed
2writetext UnknownText_0x5e2f3
- playsound $0093
+ playsound SFX_REGISTER_PHONE_NUMBER
waitbutton
keeptextopen
2writetext UnknownText_0x5e310
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 1b83961ee..9c62810d8 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -219,7 +219,7 @@ UnknownScript_0x5e605: ; 0x5e605
2writetext UnknownText_0x5eabc
closetext
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $e, $2, $2a
changeblock $e, $4, $1
reloadmappart
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 5f67feb0f..424435e46 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -31,7 +31,7 @@ UnknownScript_0x60011: ; 0x60011
closetext
loadmovesprites
applymovement $2, MovementData_0x60109
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
2writetext UnknownText_0x60147
closetext
@@ -100,7 +100,7 @@ Executivef1Script: ; 0x60066
UnknownScript_0x6006e: ; 0x6006e
applymovement $0, MovementData_0x60125
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $3, $3
loadfont
2writetext UnknownText_0x603d1
@@ -155,7 +155,7 @@ UnknownScript_0x6006e: ; 0x6006e
UnknownScript_0x600f1: ; 0x600f1
applymovement $2, MovementData_0x6011a
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
end
; 0x600fb
diff --git a/maps/Route24.asm b/maps/Route24.asm
index 7ec93ba71..6c77d33f8 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -8,7 +8,7 @@ Route24_MapScriptHeader: ; 0x1adbf8
RocketScript_0x1adbfa: ; 0x1adbfa
faceplayer
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
2writetext UnknownText_0x1adc2e
closetext
@@ -18,7 +18,7 @@ RocketScript_0x1adbfa: ; 0x1adbfa
startbattle
reloadmapmusic
returnafterbattle
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
2writetext UnknownText_0x1addc0
keeptextopen
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 6ea3695ed..30c4b6dfe 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -26,7 +26,7 @@ UnknownScript_0x19eea0: ; 0x19eea0
applymovement $3, MovementData_0x19efe8
disappear $3
pause 15
- playmusic $0038
+ playmusic MUSIC_BEAUTY_ENCOUNTER
spriteface $2, $1
pause 10
applymovement $2, MovementData_0x19efed
@@ -53,7 +53,7 @@ UnknownScript_0x19eee0: ; 0x19eee0
applymovement $3, MovementData_0x19efea
disappear $3
pause 15
- playmusic $0038
+ playmusic MUSIC_BEAUTY_ENCOUNTER
spriteface $2, $1
pause 10
applymovement $2, MovementData_0x19eff4
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
index 16b21d94c..1befb5f02 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -15,7 +15,7 @@ TeacherScript_0x7b125: ; 0x7b125
special $0030
special $0033
special $009d
- playmusic $000d
+ playmusic MUSIC_HEAL
special $001b
pause 60
special $0032
diff --git a/maps/Route30.asm b/maps/Route30.asm
index b3388605e..eb1e7cc39 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -8,12 +8,12 @@ Route30_MapScriptHeader: ; 0x1a1671
YoungsterScript_0x1a1673: ; 0x1a1673
waitbutton
- playmusic $002a
+ playmusic MUSIC_JOHTO_TRAINER_BATTLE
loadfont
2writetext UnknownText_0x1a1806
pause 30
loadmovesprites
- playsound $0041
+ playsound SFX_TACKLE
applymovement $8, MovementData_0x1a17fe
loadfont
faceplayer
@@ -21,7 +21,7 @@ YoungsterScript_0x1a1673: ; 0x1a1673
closetext
spriteface $2, $1
loadmovesprites
- playsound $0041
+ playsound SFX_TACKLE
applymovement $7, MovementData_0x1a1802
special $003d
end
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 962c305ab..6b09fa468 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -59,7 +59,7 @@ GrampsScript_0x7803d: ; 0x7803d
checkcode $9
if_equal $3, UnknownScript_0x7805b
applymovement $8, MovementData_0x78333
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $8
UnknownScript_0x7805a: ; 0x7805a
end
@@ -67,7 +67,7 @@ UnknownScript_0x7805a: ; 0x7805a
UnknownScript_0x7805b: ; 0x7805b
applymovement $8, MovementData_0x78337
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $8
end
; 0x78065
@@ -423,7 +423,7 @@ OfficerScript_0x7824c: ; 0x7824c
iffalse UnknownScript_0x78276
checkevent $0546
iftrue UnknownScript_0x78270
- playmusic $000c
+ playmusic MUSIC_OFFICER_ENCOUNTER
2writetext UnknownText_0x785e4
closetext
loadmovesprites
diff --git a/maps/Route35.asm b/maps/Route35.asm
index ca4159b77..ec3366a2f 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -390,7 +390,7 @@ OfficerScript_0x19ca49: ; 0x19ca49
iffalse UnknownScript_0x19ca73
checkevent $0547
iftrue UnknownScript_0x19ca6d
- playmusic $000c
+ playmusic MUSIC_OFFICER_ENCOUNTER
2writetext UnknownText_0x19ceea
closetext
loadmovesprites
diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm
index a512b5eb3..6a619d091 100644
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -24,7 +24,7 @@ OfficerScript_0x69d37: ; 0x69d37
checkcode $1
if_equal $6, UnknownScript_0x69d79
2writetext UnknownText_0x69eb8
- playsound $0091
+ playsound SFX_KEY_ITEM
waitbutton
givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index fa53f19f5..073648aeb 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -83,7 +83,7 @@ UnknownScript_0x6a1ee: ; 0x6a1ee
closetext
loadmovesprites
2call UnknownScript_0x6a261
- playsound $001f
+ playsound SFX_ENTER_DOOR
special $002e
waitbutton
warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
@@ -114,14 +114,14 @@ UnknownScript_0x6a234: ; 0x6a234
2writetext UnknownText_0x6a39d
keeptextopen
2writetext UnknownText_0x6a3c7
- playsound $0001
+ playsound SFX_ITEM
waitbutton
2writetext UnknownText_0x6a3e2
closetext
loadmovesprites
special $0018
2call UnknownScript_0x6a261
- playsound $001f
+ playsound SFX_ENTER_DOOR
special $002e
waitbutton
special $0047
@@ -159,7 +159,7 @@ UnknownScript_0x6a27d: ; 6a27d
2writetext UnknownText_0x6a537
keeptextopen
2writetext UnknownText_0x6a56b
- playsound $000c
+ playsound SFX_GOT_SAFARI_BALLS
waitbutton
keeptextopen
2jump UnknownScript_0x6a234
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 040669575..7f29e415c 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -37,7 +37,7 @@ UnknownScript_0x194018: ; 0x194018
UnknownScript_0x19401b: ; 0x19401b
showemote $0, $0, 15
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
spriteface $0, $1
applymovement $a, MovementData_0x194262
disappear $a
@@ -53,7 +53,7 @@ WeirdTreeScript_0x19403c: ; 0x19403c
checkitem SQUIRTBOTTLE
iftrue UnknownScript_0x19404a
waitbutton
- playsound $006d
+ playsound SFX_SANDSTORM
applymovement $4, MovementData_0x194249
end
; 0x19404a
@@ -73,7 +73,7 @@ WateredWeirdTreeScript:: ; 0x194053
closetext
loadmovesprites
waitbutton
- playsound $006d
+ playsound SFX_SANDSTORM
applymovement $4, MovementData_0x194249
loadfont
2writetext UnknownText_0x1942aa
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 01a99882f..1a62b0100 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -91,7 +91,7 @@ UnknownScript_0x6ab76: ; 0x6ab76
closetext
loadmovesprites
spriteface $0, $2
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
@@ -168,7 +168,7 @@ UnknownScript_0x6ac10: ; 0x6ac10
keeptextopen
waitbutton
2writetext UnknownText_0x6aeb1
- playsound $0001
+ playsound SFX_ITEM
waitbutton
2writetext UnknownText_0x6aecc
closetext
@@ -176,7 +176,7 @@ UnknownScript_0x6ac10: ; 0x6ac10
setflag $0011
special $0018
spriteface $0, $2
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
special $0047
@@ -201,7 +201,7 @@ UnknownScript_0x6ac4d: ; 0x6ac4d
2writetext UnknownText_0x6b021
keeptextopen
2writetext UnknownText_0x6b055
- playsound $000c
+ playsound SFX_GOT_SAFARI_BALLS
waitbutton
keeptextopen
2jump UnknownScript_0x6ac10
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 16a059a33..fff276d77 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -101,7 +101,7 @@ UnknownScript_0x9ccfa: ; 0x9ccfa
; 0x9cd04
UnknownScript_0x9cd04: ; 0x9cd04
- playmusic $000d
+ playmusic MUSIC_HEAL
2writetext UnknownText_0x9cdbc
pause 60
keeptextopen
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 977640e3d..8457c2765 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -32,7 +32,7 @@ UnknownScript_0x9cec5: ; 0x9cec5
takemoney $0, 500
special $0051
waitbutton
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x9d05d
keeptextopen
itemnotify
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 3460d74fe..bc6b72371 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -21,7 +21,7 @@ UnknownScript_0x1a9217: ; 0x1a9217
UnknownScript_0x1a9218: ; 0x1a9218
showemote $0, $0, 15
pause 15
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $a, MovementData_0x1a9356
disappear $a
pause 10
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index cf5ea9324..6f53bf1d9 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -36,7 +36,7 @@ UnknownScript_0x19abd5: ; 0x19abd5
; 0x19abda
UnknownScript_0x19abda: ; 0x19abda
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
checkcode $9
if_equal $0, UnknownScript_0x19abea
if_equal $1, UnknownScript_0x19ac38
diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm
index cccb78f53..cd4366089 100644
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -50,7 +50,7 @@ UnknownScript_0x58dd3: ; 0x58dd3
earthquake 30
showemote $0, $0, 20
pause 30
- playsound $001b
+ playsound SFX_STRENGTH
changeblock $4, $0, $30
reloadmappart
earthquake 50
@@ -78,10 +78,10 @@ UnknownScript_0x58df7: ; 0x58df7
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
applymovement $0, MovementData_0x58e4d
- playsound $002f
+ playsound SFX_KINESIS
waitbutton
pause 20
warpcheck
diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm
index be2693c67..9e123d8b1 100644
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -51,7 +51,7 @@ UnknownScript_0x58596: ; 0x58596
earthquake 30
showemote $0, $0, 20
pause 30
- playsound $001b
+ playsound SFX_STRENGTH
changeblock $4, $0, $30
reloadmappart
earthquake 50
@@ -79,10 +79,10 @@ UnknownScript_0x585ba: ; 0x585ba
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
applymovement $0, MovementData_0x58610
- playsound $002f
+ playsound SFX_KINESIS
waitbutton
pause 20
warpcheck
diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm
index 9da5ef7de..cd502aff2 100644
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -53,7 +53,7 @@ UnknownScript_0x58751: ; 0x58751
earthquake 30
showemote $0, $0, 20
pause 30
- playsound $001b
+ playsound SFX_STRENGTH
changeblock $4, $0, $30
reloadmappart
earthquake 50
@@ -86,10 +86,10 @@ UnknownScript_0x58778: ; 0x58778
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
applymovement $0, MovementData_0x587fe
- playsound $002f
+ playsound SFX_KINESIS
waitbutton
pause 20
warpcheck
diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm
index 42e16d033..44be92c98 100644
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -51,7 +51,7 @@ UnknownScript_0x58c12: ; 0x58c12
earthquake 30
showemote $0, $0, 20
pause 30
- playsound $001b
+ playsound SFX_STRENGTH
changeblock $4, $0, $30
reloadmappart
earthquake 50
@@ -79,10 +79,10 @@ UnknownScript_0x58c36: ; 0x58c36
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
applymovement $0, MovementData_0x58c8c
- playsound $002f
+ playsound SFX_KINESIS
waitbutton
pause 20
warpcheck
diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm
index 056645554..0e2684092 100644
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -67,7 +67,7 @@ UnknownScript_0x58044: ; 0x58044
2writetext UnknownText_0x580c7
closetext
loadmovesprites
- playmusic $0011
+ playmusic MUSIC_SHOW_ME_AROUND
follow $3, $0
applymovement $3, MovementData_0x580ba
disappear $3
diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm
index 57048db91..f1b1a0d38 100644
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -37,13 +37,13 @@ UnknownScript_0x5918b: ; 0x5918b
UnknownScript_0x59192: ; 0x59192
applymovement $4, MovementData_0x5926f
- playsound $000d
+ playsound SFX_BOOT_PC
pause 60
- playsound $0020
+ playsound SFX_SWITCH_POKEMON
pause 30
- playsound $0021
+ playsound SFX_TALLY
pause 30
- playsound $0022
+ playsound SFX_TRANSACTION
pause 30
spriteface $4, $0
loadfont
@@ -53,7 +53,7 @@ UnknownScript_0x59192: ; 0x59192
applymovement $4, MovementData_0x59274
loadfont
2writetext UnknownText_0x592fa
- playsound $0001
+ playsound SFX_ITEM
waitbutton
setflag $000c
2writetext UnknownText_0x59311
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 85a8680c1..205e29034 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -25,7 +25,7 @@ SabrinaScript_0x189c2e: ; 0x189c2e
setevent EVENT_BEAT_PSYCHIC_JARED
loadfont
2writetext UnknownText_0x189e95
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0028
2writetext UnknownText_0x189ead
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 3a4949518..d62909263 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -31,7 +31,7 @@ UnknownScript_0x1ab516: ; 0x1ab516
setevent $04cb
loadfont
2writetext UnknownText_0x1ab683
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0029
2writetext UnknownText_0x1ab69d
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 1e59781c6..6021f6ef3 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -22,12 +22,12 @@ UnknownScript_0x184947: ; 0x184947
spriteface $0, $1
showemote $0, $0, 15
special $006a
- playsound $0041
- playsound $006e
+ playsound SFX_TACKLE
+ playsound SFX_ELEVATOR
earthquake 79
pause 15
- playsound $0041
- playsound $006e
+ playsound SFX_TACKLE
+ playsound SFX_ELEVATOR
earthquake 79
applymovement $0, MovementData_0x184a1d
applymovement $8, MovementData_0x184a22
@@ -39,7 +39,7 @@ UnknownScript_0x184947: ; 0x184947
spriteface $8, $0
pause 15
applymovement $8, MovementData_0x184a24
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x184aec
closetext
@@ -49,7 +49,7 @@ UnknownScript_0x184947: ; 0x184947
2writetext UnknownText_0x184bc8
pause 15
loadmovesprites
- playsound $0013
+ playsound SFX_WARP_TO
special $0030
special $0033
disappear $8
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 8a72e5234..7c8b2f50b 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -29,7 +29,7 @@ SecurityCamera1a: ; 0x6c65e
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $2
appear $2
spriteface $0, $2
@@ -38,7 +38,7 @@ SecurityCamera1a: ; 0x6c65e
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $2
appear $2
applymovement $2, SecurityCameraMovement1
@@ -55,7 +55,7 @@ SecurityCamera1b: ; 0x6c6a7
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $3
appear $2
spriteface $0, $2
@@ -64,7 +64,7 @@ SecurityCamera1b: ; 0x6c6a7
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $3
appear $2
applymovement $2, SecurityCameraMovement1
@@ -81,7 +81,7 @@ SecurityCamera2a: ; 0x6c6f0
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $7
appear $2
spriteface $0, $2
@@ -90,7 +90,7 @@ SecurityCamera2a: ; 0x6c6f0
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $c, $5
appear $2
@@ -108,7 +108,7 @@ SecurityCamera2b: ; 0x6c73c
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $8
appear $2
spriteface $0, $2
@@ -117,7 +117,7 @@ SecurityCamera2b: ; 0x6c73c
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $c, $5
appear $2
@@ -135,7 +135,7 @@ SecurityCamera3a: ; 0x6c788
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $6
appear $2
spriteface $0, $2
@@ -144,7 +144,7 @@ SecurityCamera3a: ; 0x6c788
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $19, $b
appear $2
@@ -162,7 +162,7 @@ SecurityCamera3b: ; 0x6c7d4
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $7
appear $2
spriteface $0, $2
@@ -171,7 +171,7 @@ SecurityCamera3b: ; 0x6c7d4
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $19, $c
appear $2
@@ -189,7 +189,7 @@ SecurityCamera4: ; 0x6c820
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $11, $10
appear $2
spriteface $0, $2
@@ -198,7 +198,7 @@ SecurityCamera4: ; 0x6c820
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $19, $b
appear $2
@@ -216,7 +216,7 @@ SecurityCamera5: ; 0x6c86c
checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $3, $10
appear $2
spriteface $0, $2
@@ -225,7 +225,7 @@ SecurityCamera5: ; 0x6c86c
if_equal $1, NoSecurityCamera
2call PlaySecurityCameraSounds
showemote $0, $0, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $0, $3
moveperson $2, $e, $10
appear $2
@@ -269,17 +269,17 @@ TrainerCameraGrunt2: ; 0x6c8ce
; 0x6c8e3
PlaySecurityCameraSounds: ; 0x6c8e3
- playsound $0030
+ playsound SFX_LICK
pause 10
- playsound $0030
+ playsound SFX_LICK
pause 10
- playsound $0030
+ playsound SFX_LICK
pause 10
- playsound $0030
+ playsound SFX_LICK
pause 10
- playsound $0030
+ playsound SFX_LICK
pause 10
- playsound $0030
+ playsound SFX_LICK
end
; 0x6c900
@@ -564,7 +564,7 @@ MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c
checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
iftrue UnknownScript_0x6cabe
2writetext UnknownText_0x6cdad
- playsound $0021
+ playsound SFX_TALLY
closetext
loadmovesprites
setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index a04102b07..2d2ea3804 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -63,7 +63,7 @@ UnknownScript_0x6cfac: ; 0x6cfac
spriteface $0, $0
showemote $0, $0, 15
applymovement $0, MovementData_0x6d21f
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
applymovement $3, MovementData_0x6d224
spriteface $0, $1
applymovement $2, MovementData_0x6d22f
@@ -169,7 +169,7 @@ UnknownScript_0x6d091: ; 0x6d091
loadmovesprites
special $002e
special $009d
- playsound $0005
+ playsound SFX_FULL_HEAL
special $001b
special $0031
loadfont
@@ -395,7 +395,7 @@ MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db
UnknownScript_0x6d1e8: ; 0x6d1e8
2writetext UnknownText_0x6dd6b
closetext
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $e, $c, $7
reloadmappart
loadmovesprites
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index cd46f157d..cc23fbecf 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -67,12 +67,12 @@ UnknownScript_0x6e019: ; 0x6e019
appear $a
applymovement $a, MovementData_0x6e164
spriteface $0, $2
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x6e267
closetext
loadmovesprites
- playsound $0041
+ playsound SFX_TACKLE
applymovement $0, MovementData_0x6e175
applymovement $a, MovementData_0x6e16d
disappear $a
@@ -95,7 +95,7 @@ UnknownScript_0x6e052: ; 0x6e052
UnknownScript_0x6e056: ; 0x6e056
pause 30
showemote $0, $3, 15
- playmusic $0039
+ playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $3, $0
loadfont
2writetext UnknownText_0x6e400
@@ -113,7 +113,7 @@ UnknownScript_0x6e056: ; 0x6e056
closetext
loadmovesprites
applymovement $3, MovementData_0x6e144
- playsound $0041
+ playsound SFX_TACKLE
applymovement $3, MovementData_0x6e147
disappear $3
dotrigger $3
@@ -272,7 +272,7 @@ UnknownScript_0x6e105: ; 0x6e105
UnknownScript_0x6e10b: ; 0x6e10b
2writetext UnknownText_0x6e9a3
closetext
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $a, $8, $7
reloadmappart
loadmovesprites
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index ab4355f08..4e4d93d04 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -96,10 +96,10 @@ UnknownScript_0x18508f: ; 0x18508f
spriteface $0, $2
cry RAIKOU
pause 10
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $3, MovementData_0x1851d4
disappear $3
- playsound $0023
+ playsound SFX_EXIT_BUILDING
waitbutton
UnknownScript_0x1850b6: ; 0x1850b6
writebyte ENTEI
@@ -109,10 +109,10 @@ UnknownScript_0x1850b6: ; 0x1850b6
spriteface $0, $3
cry ENTEI
pause 10
- playsound $0014
+ playsound SFX_WARP_FROM
applymovement $4, MovementData_0x1851de
disappear $4
- playsound $0023
+ playsound SFX_EXIT_BUILDING
waitbutton
UnknownScript_0x1850d7: ; 0x1850d7
spriteface $0, $1
@@ -138,20 +138,20 @@ UnknownScript_0x1850d7: ; 0x1850d7
returnafterbattle
pause 20
spriteface $0, $0
- playmusic $0061
- playsound $001f
+ playmusic MUSIC_MYSTICALMAN_ENCOUNTER
+ playsound SFX_ENTER_DOOR
moveperson $5, $a, $f
appear $5
applymovement $5, MovementData_0x1851ec
- playsound $001f
+ playsound SFX_ENTER_DOOR
moveperson $6, $9, $f
appear $6
applymovement $6, MovementData_0x1851f5
- playsound $001f
+ playsound SFX_ENTER_DOOR
moveperson $7, $9, $f
appear $7
applymovement $7, MovementData_0x1851fb
- playsound $001f
+ playsound SFX_ENTER_DOOR
moveperson $8, $9, $f
appear $8
applymovement $8, MovementData_0x1851fe
@@ -164,7 +164,7 @@ UnknownScript_0x1850d7: ; 0x1850d7
closetext
loadmovesprites
applymovement $5, MovementData_0x1851f1
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $5
waitbutton
special $006a
@@ -209,7 +209,7 @@ SageScript_0x185188: ; 0x185188
refreshscreen $0
earthquake 72
waitbutton
- playsound $001b
+ playsound SFX_STRENGTH
changeblock $a, $2, $20
reloadmappart
setevent EVENT_GOT_RAINBOW_WING
diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
index 43460e951..52973d7c2 100644
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -88,14 +88,14 @@ UnknownScript_0x7ca80: ; 0x7ca80
showemote $0, $0, 15
special $006a
pause 15
- playsound $0023
+ playsound SFX_EXIT_BUILDING
appear $c
waitbutton
applymovement $c, MovementData_0x7ce87
spriteface $0, $3
2call UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce92
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $c
dotrigger $1
waitbutton
@@ -108,14 +108,14 @@ UnknownScript_0x7caaa: ; 0x7caaa
showemote $0, $0, 15
special $006a
pause 15
- playsound $0023
+ playsound SFX_EXIT_BUILDING
appear $c
waitbutton
applymovement $c, MovementData_0x7ce8c
spriteface $0, $3
2call UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce97
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $c
dotrigger $1
waitbutton
@@ -129,7 +129,7 @@ UnknownScript_0x7cad4: ; 0x7cad4
setevent $06c5
domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1
UnknownScript_0x7cae1: ; 0x7cae1
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x7ce9d
closetext
@@ -169,7 +169,7 @@ UnknownScript_0x7cb19: ; 0x7cb19
; 0x7cb29
UnknownScript_0x7cb29: ; 0x7cb29
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x7cfc2
closetext
@@ -479,7 +479,7 @@ UnknownScript_0x7cc8d: ; 0x7cc8d
if_equal $6, UnknownScript_0x7cd5e
if_equal $7, UnknownScript_0x7cd79
UnknownScript_0x7ccb0: ; 0x7ccb0
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7ce11
2call UnknownScript_0x7ce19
2call UnknownScript_0x7ce21
@@ -497,7 +497,7 @@ UnknownScript_0x7ccb0: ; 0x7ccb0
; 0x7ccd7
UnknownScript_0x7ccd7: ; 0x7ccd7
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cda5
2call UnknownScript_0x7cdd5
2call UnknownScript_0x7cdf9
@@ -511,7 +511,7 @@ UnknownScript_0x7ccd7: ; 0x7ccd7
; 0x7ccf2
UnknownScript_0x7ccf2: ; 0x7ccf2
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cdad
2call UnknownScript_0x7cde1
2call UnknownScript_0x7cded
@@ -525,7 +525,7 @@ UnknownScript_0x7ccf2: ; 0x7ccf2
; 0x7cd0d
UnknownScript_0x7cd0d: ; 0x7cd0d
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cdb5
2call UnknownScript_0x7cdd5
2call UnknownScript_0x7cdf9
@@ -539,7 +539,7 @@ UnknownScript_0x7cd0d: ; 0x7cd0d
; 0x7cd28
UnknownScript_0x7cd28: ; 0x7cd28
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cdbd
2call UnknownScript_0x7cde1
2call UnknownScript_0x7cded
@@ -553,7 +553,7 @@ UnknownScript_0x7cd28: ; 0x7cd28
; 0x7cd43
UnknownScript_0x7cd43: ; 0x7cd43
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cdc5
2call UnknownScript_0x7cdd5
2call UnknownScript_0x7cdf9
@@ -567,7 +567,7 @@ UnknownScript_0x7cd43: ; 0x7cd43
; 0x7cd5e
UnknownScript_0x7cd5e: ; 0x7cd5e
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7cdcd
2call UnknownScript_0x7cde1
2call UnknownScript_0x7cded
@@ -581,7 +581,7 @@ UnknownScript_0x7cd5e: ; 0x7cd5e
; 0x7cd79
UnknownScript_0x7cd79: ; 0x7cd79
- playsound $001f
+ playsound SFX_ENTER_DOOR
2call UnknownScript_0x7ce11
2call UnknownScript_0x7ce19
2call UnknownScript_0x7cdb5
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 5e022945e..2e221bb18 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -24,7 +24,7 @@ SurgeScript_0x1920a5: ; 0x1920a5
setevent EVENT_BEAT_JUGGLER_HORTON
loadfont
2writetext UnknownText_0x192277
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $0025
2writetext UnknownText_0x192291
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 72f7e2b80..c8c7680bb 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -52,11 +52,11 @@ SailorScript_0x74dc4: ; 0x74dc4
loadmovesprites
spriteface $2, $0
pause 10
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
applymovement $0, MovementData_0x74ef1
- playsound $0023
+ playsound SFX_EXIT_BUILDING
special $002e
waitbutton
setevent $073a
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 59f9fb9f0..05310b5ac 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -51,7 +51,7 @@ UnknownScript_0x744b5: ; 0x744b5
UnknownScript_0x744d4: ; 0x744d4
spriteface $0, $0
- playmusic $001f
+ playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
2writetext UnknownText_0x7455f
closetext
@@ -91,7 +91,7 @@ UnknownScript_0x7450f: ; 0x7450f
; 0x7451f
UnknownScript_0x7451f: ; 0x7451f
- playmusic $0020
+ playmusic MUSIC_RIVAL_AFTER
loadfont
2writetext UnknownText_0x746ce
closetext
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index e29b2b6b0..ab7d58456 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -36,7 +36,7 @@ UnknownScript_0x1a83d1: ; 0x1a83d1
2writetext UnknownText_0x1a84cb
closetext
loadmovesprites
- playmusic $0011
+ playmusic MUSIC_SHOW_ME_AROUND
follow $2, $0
applymovement $2, MovementData_0x1a842a
spriteface $0, $1
@@ -49,7 +49,7 @@ UnknownScript_0x1a83d1: ; 0x1a83d1
loadmovesprites
applymovement $2, MovementData_0x1a8465
applymovement $2, MovementData_0x1a8463
- playsound $001f
+ playsound SFX_ENTER_DOOR
disappear $2
clearevent $06cb
waitbutton
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 82ab8e9bd..563c25c25 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -21,7 +21,7 @@ FalknerScript_0x683c2: ; 0x683c2
setevent EVENT_BEAT_FALKNER
loadfont
2writetext UnknownText_0x685af
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $001b
checkcode $7
diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm
index be6d27a4b..49d6a2a71 100644
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -35,7 +35,7 @@ UnknownScript_0x694d7: ; 0x694d7
if_equal $1, .UnknownScript_0x69511
spriteface $0, $0
applymovement $6, MovementData_0x69549
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $6
waitbutton
end
@@ -44,7 +44,7 @@ UnknownScript_0x694d7: ; 0x694d7
applymovement $6, MovementData_0x6954e
spriteface $0, $0
applymovement $6, MovementData_0x69551
- playsound $0023
+ playsound SFX_EXIT_BUILDING
disappear $6
waitbutton
end
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 4337011cf..e3a8def43 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -21,7 +21,7 @@ BlueScript_0x9aa26: ; 0x9aa26
setevent EVENT_BEAT_BLUE
loadfont
2writetext UnknownText_0x9ac0f
- playsound $009c
+ playsound SFX_GET_BADGE
waitbutton
setflag $002a
2writetext UnknownText_0x9ac27
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index d869bdb33..1085fa4af 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -317,7 +317,7 @@ UnknownScript_0x7c1cd: ; 0x7c1cd
closetext
loadmovesprites
special $002e
- playmusic $000d
+ playmusic MUSIC_HEAL
pause 60
special $0031
special $003d
@@ -409,7 +409,7 @@ UnknownScript_0x7c27a: ; 0x7c27a
closetext
loadmovesprites
special $002e
- playmusic $000d
+ playmusic MUSIC_HEAL
pause 60
special $0031
special $003d
@@ -481,7 +481,7 @@ MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6
; 0x7c2e8
UnknownScript_0x7c2e8: ; 0x7c2e8
- playsound $0022
+ playsound SFX_TRANSACTION
2writetext UnknownText_0x7c5d6
closetext
loadmovesprites
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 62682ad9d..4eda6e204 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -38,7 +38,7 @@ UnknownScript_0x1804df: ; 0x1804df
UnknownScript_0x1804e0: ; 0x1804e0
applymovement $0, MovementData_0x18052c
refreshscreen $86
- playsound $001b
+ playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
reloadmappart
@@ -66,7 +66,7 @@ WillScript_0x1804f8: ; 0x1804f8
2writetext UnknownText_0x180644
closetext
loadmovesprites
- playsound $001f
+ playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
reloadmappart
loadmovesprites