summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/scripts/cave_hole.inc4
-rw-r--r--data/scripts/contest_hall.inc16
-rw-r--r--data/scripts/day_care.inc4
-rw-r--r--data/scripts/elite_four.inc2
-rw-r--r--data/scripts/obtain_item.inc6
-rw-r--r--data/scripts/pc.inc6
-rw-r--r--data/scripts/players_house.inc6
-rw-r--r--data/scripts/safari_zone.inc4
-rw-r--r--data/scripts/secret_base.inc6
-rw-r--r--data/scripts/shared_secret_base.inc4
11 files changed, 30 insertions, 30 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index f7952540c..cf17f759d 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -112,7 +112,7 @@ BerryTree_EventScript_1A161D:: @ 81A161D
goto_if_eq BerryTree_EventScript_1A1642
special ObjectEventInteractionRemoveBerryTree
message Route102_Text_1A17FD
- playfanfare MUS_ME_KINOMI
+ playfanfare MUS_OBTAIN_BERRY
waitmessage
waitfanfare
waitbuttonpress
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index 0bc876575..59b53d40d 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 81C6BC5
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
- playse SE_RU_HYUU
+ playse SE_FALL
delay 60
warphole MAP_UNDEFINED
waitstate
@@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 81C6BDE
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
- playse SE_RU_HYUU
+ playse SE_FALL
delay 60
special DoFallWarp
waitstate
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index a99c33492..465b0bfe8 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -343,13 +343,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323
waitmovement 0
releaseall
addobject 13
- playse SE_DANSA
+ playse SE_LEDGE
lockall
applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5D9C
waitmovement 0
releaseall
addvar VAR_0x8006, -1
- playse SE_BOWA2
+ playse SE_BALL_OPEN
special ShowContestEntryMonPic
call LinkContestRoom1_EventScript_1A535E
return
@@ -369,7 +369,7 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370
LinkContestRoom1_EventScript_1A5377:: @ 81A5377
call LinkContestRoom1_EventScript_1A53B3
call LinkContestRoom1_EventScript_1A53CE
- playse SE_W227B
+ playse SE_M_ENCORE2
waitmessage
call LinkContestRoom1_EventScript_1A5A90
applymovement 1, LinkContestRoom1_Movement_1A5D9F
@@ -406,7 +406,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF
LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5
applymovement 1, LinkContestRoom1_Movement_1A5DAF
waitmovement 0
- playse SE_W227B
+ playse SE_M_ENCORE2
call LinkContestRoom1_EventScript_1A5AE4
applymovement 9, LinkContestRoom1_Movement_1A5DB7
applymovement 12, LinkContestRoom1_Movement_1A5DBB
@@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
- playbgm MUS_CON_FAN, FALSE
+ playbgm MUS_CONTEST_WINNER, FALSE
return
LinkContestRoom1_EventScript_1A5984:: @ 81A5984
@@ -888,7 +888,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
call LinkContestRoom1_EventScript_1A5A75
applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99
waitmovement 0
- playse SE_W227B
+ playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
return
@@ -999,7 +999,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
waitmessage
call LinkContestRoom1_EventScript_1A5C7F
call LinkContestRoom1_EventScript_1A5CE5
- playse SE_W227B
+ playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
call LinkContestRoom1_EventScript_1A5A90
delay 30
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
setflag FLAG_SYS_RIBBON_GET
lockall
msgbox LinkContestRoom1_Text_1A6D6A, MSGBOX_DEFAULT
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
msgbox LinkContestRoom1_Text_1A6D96, MSGBOX_DEFAULT
waitfanfare
special ScrSpecial_GetContestWinnerNick
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 2eb32cc71..9acd544d9 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298
Route117_EventScript_1B22B2:: @ 81B22B2
message Route117_Text_1B27A2
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
waitfanfare
waitmessage
waitbuttonpress
@@ -208,7 +208,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special PayMoneyFor
- playse SE_REGI
+ playse SE_SHOP
msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index 39d52825e..af2a747e9 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
- playse SE_TRACK_DOOR
+ playse SE_TRUCK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 2be28646e..37e8a3788 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -66,11 +66,11 @@ EventScript_NoRoomForItem: @ 819FECC
return
EventScript_PlayFanfareObtainedItem:
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
return
EventScript_PlayFanfareObtainedTMHM:
- playfanfare MUS_ME_WAZA
+ playfanfare MUS_OBTAIN_TMHM
return
Std_ObtainDecoration: @ 819FEDA
@@ -88,7 +88,7 @@ EventScript_ObtainDecorationMessage: @ 819FEE8
return
EventScript_ObtainedDecor: @ 819FF03
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
message Text_ObtainedTheDecor
waitfanfare
waitmessage
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index 91b47004d..a8c1cff90 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -25,7 +25,7 @@ EventScript_AccessPC:
end
EventScript_AccessPlayersPC:
- playse SE_PC_LOGON
+ playse SE_PC_LOGIN
msgbox Text_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
@@ -33,7 +33,7 @@ EventScript_AccessPlayersPC:
end
EventScript_AccessPokemonStorage:
- playse SE_PC_LOGON
+ playse SE_PC_LOGIN
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox Text_StorageSystemOpened, MSGBOX_DEFAULT
@@ -59,7 +59,7 @@ EventScript_TurnOffPC:
EventScript_AccessHallOfFame:
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
- playse SE_PC_LOGON
+ playse SE_PC_LOGIN
special AccessHallOfFamePC
waitstate
goto EventScript_AccessPC
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 2b746dbe0..68aef1b37 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -72,7 +72,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
compare VAR_RESULT, 1
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61
- playse SE_KAIDAN
+ playse SE_EXIT
removeobject VAR_0x8008
releaseall
end
@@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
waitmovement 0
- playbgm MUS_INTER_V, FALSE
+ playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
@@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
waitmovement 0
- playbgm MUS_INTER_V, FALSE
+ playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 68efec328..07ae88aa6 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -24,7 +24,7 @@ EventScript_1C3443:
gUnknown_081C3448:: @ 81C3448
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
message UnknownString_81C34E4
waitmessage
waitbuttonpress
@@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448
gUnknown_081C3459:: @ 81C3459
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
message UnknownString_81C3514
waitmessage
waitbuttonpress
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 8a82583b2..ae361ac7e 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -115,7 +115,7 @@ EventScript_1A2DAA:
EventScript_1A2DB8:
closemessage
- playse SE_KAIDAN
+ playse SE_EXIT
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_1
special sub_80BB8CC
@@ -135,7 +135,7 @@ SecretBase_EventScript_FirstEntrance:: @ 81A2DDE
compare VAR_RESULT, YES
goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
closemessage
- playse SE_KAIDAN
+ playse SE_EXIT
special sub_80BC440
end
@@ -154,7 +154,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
gUnknown_081A2E14:: @ 81A2E14
lockall
setvar VAR_INIT_SECRET_BASE, 1
- playse SE_KAIDAN
+ playse SE_EXIT
special sub_80BC114
compare VAR_RESULT, 0
goto_if_eq EventScript_1A2E38
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index e3b87f1ea..b466a8409 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -24,7 +24,7 @@ SecretBase_OnFrame:: @ 815F362
SecretBase_EventScript_PC:: @ 815F36C
lockall
- playse SE_PC_LOGON
+ playse SE_PC_LOGIN
message SecretBase_Text_BootUpPC
dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
waitstate
@@ -85,7 +85,7 @@ SecretBase_EventScript_PCRegistryMenu:
SecretBase_EventScript_RecordMixingPC:: @ 815F43A
lockall
message SecretBase_Text_BootUpPC
- playse SE_PC_LOGON
+ playse SE_PC_LOGIN
dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
waitstate
waitmessage
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 18:01:12 +0000