summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc18
-rw-r--r--data/scripts/hole.inc4
-rw-r--r--data/scripts/obtain_item.inc6
-rw-r--r--data/scripts/pokedex_rating.inc4
-rw-r--r--data/scripts/pokemon_league.inc6
-rw-r--r--data/scripts/route23.inc6
-rw-r--r--data/scripts/safari_zone.inc4
-rw-r--r--data/scripts/silphco_doors.inc4
-rw-r--r--data/scripts/static_pokemon.inc2
-rw-r--r--data/scripts/std_msgbox.inc10
-rw-r--r--data/scripts/trainer_card.inc8
-rw-r--r--data/scripts/trainer_tower.inc4
12 files changed, 38 insertions, 38 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 52720d0cc..c581ba332 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -93,7 +93,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -103,7 +103,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call CableClub_EventScript_CloseGameCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -129,7 +129,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F
call CableClub_EventScript_PlayerExitTradeCenter
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -154,7 +154,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C
call CableClub_EventScript_PlayerExitUnionRoom
call CableClub_EventScript_CloseUnionRoomBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -312,7 +312,7 @@ CableClub_EventScript_EnterColosseum:: @ 81BB5B3
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -421,7 +421,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 81BB73D
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -821,7 +821,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 81BBA94
special HelpSystem_Disable
call CableClub_EventScript_OpenUnionRoomBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -1126,7 +1126,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88
copyvar VAR_0x8007, VAR_LAST_TALKED
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -1324,7 +1324,7 @@ CableClub_EventScript_EnterMinigame:: @ 81BC262
copyvar VAR_0x8007, VAR_LAST_TALKED
call CableClub_EventScript_OpenGameCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc
index 98900f04a..fddd574ad 100644
--- a/data/scripts/hole.inc
+++ b/data/scripts/hole.inc
@@ -13,7 +13,7 @@ EventScript_FallDownHole:: @ 81C1348
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
- playse SE_RU_HYUU
+ playse SE_FALL
delay 60
warphole 0xFFFF
waitstate
@@ -25,7 +25,7 @@ EventScript_1C1361:: @ 81C1361
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/obtain_item.inc b/data/scripts/obtain_item.inc
index e89aabfba..6c74df5bd 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -78,11 +78,11 @@ EventScript_NoRoomForItem:: @ 81A675E
return
EventScript_PlayFanfareObtainedItem:: @ 81A6764
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
return
EventScript_PlayFanfareObtainedTMHM:: @ 81A6768
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
return
Std_ObtainDecoration:: @ 81A676C
@@ -100,7 +100,7 @@ EventScript_ObtainDecorMessage:: @ 81A677A
return
EventScript_ObtainedDecor:: @ 81A6795
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
message Text_ObtainedTheDecor
waitfanfare
waitmessage
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index 05d27ffa9..64955bb8a 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -27,11 +27,11 @@ PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6
return
PokedexRating_EventScript_NormalFanfare:: @ 81A73D8
- playfanfare MUS_FAN2
+ playfanfare MUS_DEX_RATING
return
PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
- playfanfare MUS_FANFA5
+ playfanfare MUS_EVOLVED
return
PokedexRating_EventScript_Rate:: @ 81A73E0
diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc
index 65baba59a..ad39c4528 100644
--- a/data/scripts/pokemon_league.inc
+++ b/data/scripts/pokemon_league.inc
@@ -1,7 +1,7 @@
PokemonLeague_EventScript_OpenDoor:: @ 81A7506
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
- playse SE_DOOR
+ playse SE_RS_DOOR
call PokemonLeague_EventScript_SetDoorOpen
special DrawWholeMapView
setflag FLAG_TEMP_4
@@ -11,7 +11,7 @@ PokemonLeague_EventScript_EnterRoom:: @ 81A751F
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
- playse SE_KI_GASYAN
+ playse SE_UNLOCK
call PokemonLeague_EventScript_CloseEntry
special DrawWholeMapView
return
@@ -34,7 +34,7 @@ PokemonLeague_EventScript_PreventExit:: @ 81A754B
PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
- playse SE_DOOR
+ playse SE_RS_DOOR
setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0
special DrawWholeMapView
diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc
index cfdfe53a7..c59080c6c 100644
--- a/data/scripts/route23.inc
+++ b/data/scripts/route23.inc
@@ -18,7 +18,7 @@ Route23_EventScript_MissingBadge:: @ 81A77DE
Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC
message Text_OhThatsBadgeGoRightAhead
waitmessage
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
release
@@ -101,7 +101,7 @@ Route23_EventScript_CheckEarthBadge:: @ 81A793E
Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D
message Text_OhThatsBadgeGoRightAhead
waitmessage
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
@@ -196,7 +196,7 @@ Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77
Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96
message Text_OhThatsBadgeGoRightAhead
waitmessage
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 15c735821..65ddd4996 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -24,14 +24,14 @@ SafariZone_EventScript_Retire:: @ 81BFBC0
SafariZone_EventScript_TimesUp:: @ 81BFBC5
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
msgbox SafariZone_Text_TimesUp
goto SafariZone_EventScript_Exit
end
SafariZone_EventScript_OutOfBalls:: @ 81BFBD7
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
msgbox SafariZone_Text_OutOfBalls
goto SafariZone_EventScript_Exit
end
diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc
index df619b345..e648301ff 100644
--- a/data/scripts/silphco_doors.inc
+++ b/data/scripts/silphco_doors.inc
@@ -512,7 +512,7 @@ EventScript_TryUnlockDoor:: @ 81A8B23
end
EventScript_OpenDoor:: @ 81A8B32
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
msgbox Text_CardKeyOpenedDoor
waitfanfare
compare VAR_TEMP_1, 1
@@ -556,7 +556,7 @@ EventScript_OpenDoor:: @ 81A8B32
compare VAR_TEMP_1, 20
call_if_eq EventScript_Open11FDoor
waitse
- playse SE_KI_GASYAN
+ playse SE_UNLOCK
special DrawWholeMapView
waitse
special SetHiddenItemFlag
diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc
index 5334688a3..906097666 100644
--- a/data/scripts/static_pokemon.inc
+++ b/data/scripts/static_pokemon.inc
@@ -17,7 +17,7 @@ EventScript_MonFlewAway:: @ 81A9236
EventScript_AwakenSnorlax:: @ 81A924B
message Text_PlayedPokeFlute
waitmessage
- playfanfare MUS_POKEFUE
+ playfanfare MUS_POKE_FLUTE
waitfanfare
msgbox Text_SnorlaxWokeUp
return
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index da53a3cc1..9e542e6e7 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -29,25 +29,25 @@ Std_MsgboxYesNo:: @ 81A4E5C
Std_ReceivedItem:: @ 81A4E66
textcolor 3
- compare VAR_0x8002, MUS_FANFA1
+ compare VAR_0x8002, MUS_LEVEL_UP
call_if_eq EventScript_ReceivedItemFanfare1
- compare VAR_0x8002, MUS_FAN5
+ compare VAR_0x8002, MUS_OBTAIN_KEY_ITEM
call_if_eq EventScript_ReceivedItemFanfare2
message 0x0
waitmessage
waitfanfare
- compare VAR_0x8002, MUS_FANFA1
+ compare VAR_0x8002, MUS_LEVEL_UP
call_if_eq EventScript_ReceivedItemWaitFanfare
putitemaway VAR_0x8000, VAR_0x8001
call EventScript_RestorePrevTextColor
return
EventScript_ReceivedItemFanfare1:: @ 81A4EA2
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
return
EventScript_ReceivedItemFanfare2:: @ 81A4EA6
- playfanfare MUS_FAN5
+ playfanfare MUS_OBTAIN_KEY_ITEM
return
EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA
diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc
index 589d84a64..253e2837a 100644
--- a/data/scripts/trainer_card.inc
+++ b/data/scripts/trainer_card.inc
@@ -44,7 +44,7 @@ CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC
CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
message CeladonCity_GameCorner_Text_BigSmileForPhoto
waitmessage
- playse MUS_ME_PHOTO
+ playse MUS_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
special UpdateTrainerCardPhotoIcons
@@ -237,7 +237,7 @@ FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47
FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51
textcolor 3
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
message FourIsland_House2_Text_HoFStickerApplied
waitmessage
waitfanfare
@@ -300,7 +300,7 @@ FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11
FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B
textcolor 3
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
message FourIsland_House2_Text_EggStickerApplied
waitmessage
waitfanfare
@@ -363,7 +363,7 @@ FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB
FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5
textcolor 3
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
message FourIsland_House2_Text_VictoryStickerApplied
waitmessage
waitfanfare
diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc
index 3b21c0844..94f1c7263 100644
--- a/data/scripts/trainer_tower.inc
+++ b/data/scripts/trainer_tower.inc
@@ -293,7 +293,7 @@ TrainerTower_Roof_EventScript_GivePrize:
TrainerTower_Roof_EventScript_ReceivePrize:
msgbox TrainerTower_Roof_Text_ThisIsForYou
textcolor 3
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
message Text_ObtainedTheX
waitfanfare
waitmessage
@@ -365,7 +365,7 @@ TrainerTower_EventScript_TriggerDoubleBattle:
TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 04:05:05 +0000