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/cable_club.inc22
-rw-r--r--data/scripts/cave_hole.inc4
-rw-r--r--data/scripts/contest_hall.inc18
-rw-r--r--data/scripts/day_care.inc4
-rw-r--r--data/scripts/elite_four.inc2
-rw-r--r--data/scripts/field_move_scripts.inc15
-rw-r--r--data/scripts/flash.inc2
-rw-r--r--data/scripts/lilycove_lady.inc8
-rw-r--r--data/scripts/mevent_pichu.inc2
-rw-r--r--data/scripts/new_game.inc4
-rw-r--r--data/scripts/obtain_item.inc6
-rw-r--r--data/scripts/players_house.inc8
-rw-r--r--data/scripts/roulette.inc4
-rw-r--r--data/scripts/safari_zone.inc4
-rw-r--r--data/scripts/secret_base.inc6
-rw-r--r--data/scripts/std_msgbox.inc2
-rw-r--r--data/scripts/trainer_hill.inc4
-rw-r--r--data/scripts/trainer_script.inc2
19 files changed, 61 insertions, 58 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1e121678e..fe10af4b3 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -122,7 +122,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448
special IncrementDailyPickedBerries
special ObjectEventInteractionRemoveBerryTree
message BerryTree_Text_PickedTheBerry
- playfanfare MUS_ME_KINOMI
+ playfanfare MUS_OBTAIN_BERRY
waitmessage
waitfanfare
waitbuttonpress
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 66cf74f0a..b81fbb4d5 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -132,7 +132,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -142,7 +142,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call EventScript_CloseMossdeepGameCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -165,7 +165,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7
call CableClub_EventScript_PlayerExitTradeCenter
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -187,7 +187,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
call CableClub_EventScript_PlayerExitRecordCorner
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -209,7 +209,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C
call CableClub_EventScript_PlayerExitUnionRoom
call CableClub_EventScript_CloseUnionRoomBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -372,7 +372,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -477,7 +477,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -552,7 +552,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -955,7 +955,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
call CableClub_EventScript_OpenUnionRoomBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -1285,7 +1285,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
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
@@ -1481,7 +1481,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
copyvar VAR_0x8007, VAR_LAST_TALKED
call EventScript_OpenMossdeepGameCornerBarrier
special DrawWholeMapView
- playse SE_TK_KASYA
+ playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index b55c932ee..1cc334004 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 82A8337
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:: @ 82A8350
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 c21488502..1ef723c37 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -401,13 +401,13 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_CheckIfContestWithRSPlayer
addobject LOCALID_POKEBALL
- playse SE_DANSA
+ playse SE_LEDGE
lockall
applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
waitmovement 0
releaseall
addvar VAR_0x8006, -1
- playse SE_BOWA2
+ playse SE_BALL_OPEN
special ShowContestEntryMonPic
call ContestHall_EventScript_EntryXTrainersMon
return
@@ -427,7 +427,7 @@ ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
ContestHall_EventScript_AudienceVote:: @ 827A230
call ContestHall_EventScript_AudienceWillVote
call ContestHall_EventScript_VotingUnderWay
- playse SE_W227B
+ playse SE_M_ENCORE2
waitmessage
call ContestHall_EventScript_AudienceLookAround
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2
@@ -481,7 +481,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
- playse SE_W227B
+ playse SE_M_ENCORE2
call ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
@@ -542,7 +542,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
ContestHall_EventScript_DisplayHearts:: @ 827A3E5
setvar VAR_RESULT, 8
- special ScriptRandom
+ special GenerateContestRand
compare VAR_RESULT, 0
call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
compare VAR_RESULT, 1
@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
- playbgm MUS_CON_FAN, 0
+ playbgm MUS_CONTEST_WINNER, 0
return
ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
@@ -1005,7 +1005,7 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
call ContestHall_EventScript_CongratsWinner
applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp
waitmovement 0
- playse SE_W227B
+ playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
return
@@ -1117,7 +1117,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
releaseall
call ContestHall_EventScript_WinnerApproachForPrize
call ContestHall_EventScript_GivePrizeIfWinner
- playse SE_W227B
+ playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
call ContestHall_EventScript_AudienceLookAround
delay 30
@@ -1266,7 +1266,7 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
setflag FLAG_SYS_RIBBON_GET
lockall
msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT
waitfanfare
special BufferContestWinnerMonName
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 87995581f..ea8552510 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
message Route117_Text_ReceivedEgg
- playfanfare MUS_FANFA1
+ playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
@@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
- playse SE_REGI
+ playse SE_SHOP
msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index 3b395de21..f4eb6393b 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
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/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 56e3297b6..2d689348b 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,4 +1,4 @@
-
+@ Interact with cuttable tree
EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
@@ -18,7 +18,8 @@ EventScript_CutTree:: @ 82906BB
goto EventScript_CutTreeDown
end
-EventScript_FldEffCut:: @ 8290705
+@ Use cut from party menu
+EventScript_UseCut:: @ 8290705
lockall
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
@@ -58,6 +59,7 @@ Text_CantCut: @ 829077D
.string "This tree looks like it can be\n"
.string "CUT down!$"
+@ Interact with smashable rock
EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
@@ -77,7 +79,8 @@ EventScript_RockSmash:: @ 82907A6
goto EventScript_SmashRock
end
-EventScript_FldEffRockSmash:: @ 82907F0
+@ Use rock smash from party menu
+EventScript_UseRockSmash:: @ 82907F0
lockall
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
@@ -89,10 +92,10 @@ EventScript_SmashRock:: @ 82907FB
waitmovement 0
removeobject VAR_LAST_TALKED
specialvar VAR_RESULT, TryUpdateRusturfTunnelState
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_EndSmash
special RockSmashWildEncounter
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_EndSmash
waitstate
releaseall
@@ -141,7 +144,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto EventScript_ActivateStrength
end
-EventScript_FldEffStrength:: @ 82908FD
+EventScript_UseStrength:: @ 82908FD
lockall
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc
index 916b50719..bb4ae84eb 100644
--- a/data/scripts/flash.inc
+++ b/data/scripts/flash.inc
@@ -1,4 +1,4 @@
-EventScript_FldEffFlash:: @ 82926F8
+EventScript_UseFlash:: @ 82926F8
animateflash 1
setflashradius 1
end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 7f629e5db..40ead8e58 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -259,9 +259,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
end
LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
- playse SE_SEIKAI
+ playse SE_SUCCESS
delay 10
- playse SE_SEIKAI
+ playse SE_SUCCESS
msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT
goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
end
@@ -269,9 +269,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
special BufferQuizCorrectAnswer
special BufferQuizPrizeName
- playse SE_HAZURE
+ playse SE_FAILURE
delay 10
- playse SE_HAZURE
+ playse SE_FAILURE
msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT
goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index cc947e396..c51558e9e 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -14,7 +14,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C
vmessage sText_MysteryGiftEgg
waitmessage
waitbuttonpress
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
waitfanfare
release
end
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 3c68dfa13..f72337972 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
- setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
+ setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
@@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
- setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+ setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
setflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 3afd92588..19f57d9d5 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -65,11 +65,11 @@ EventScript_NoRoomForItem:: @ 8271BA9
return
EventScript_PlayFanfareObtainedItem:: @ 8271BAF
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
return
EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
- playfanfare MUS_ME_WAZA
+ playfanfare MUS_OBTAIN_TMHM
return
Std_ObtainDecoration:: @ 8271BB7
@@ -87,7 +87,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5
return
EventScript_ObtainedDecor:: @ 8271BE0
- playfanfare MUS_FANFA4
+ playfanfare MUS_OBTAIN_ITEM
message gText_ObtainedTheDecor
waitfanfare
msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 440f47a6a..684b27e71 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -73,7 +73,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale
compare VAR_RESULT, FEMALE
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale
- playse SE_KAIDAN
+ playse SE_EXIT
removeobject VAR_0x8008
releaseall
end
@@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
- playbgm MUS_INTER_V, 0
+ playbgm MUS_ENCOUNTER_INTERVIEWER, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
@@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
- playbgm MUS_INTER_V, 0
+ playbgm MUS_ENCOUNTER_INTERVIEWER, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
@@ -334,7 +334,7 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT
closemessage
delay 30
- playfanfare MUS_ME_TORE_EYE
+ playfanfare MUS_REGISTER_MATCH_CALL
msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT
waitfanfare
closemessage
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index 9aea65054..f590ca358 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -6,7 +6,7 @@ Roulette_EventScript_Table1:: @ 82A5AB1
getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
- addvar VAR_0x8004, 128
+ addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
goto Roulette_EventScript_Play
end
@@ -18,7 +18,7 @@ Roulette_EventScript_Table2:: @ 82A5ADF
getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
- addvar VAR_0x8004, 128
+ addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
goto Roulette_EventScript_Play
end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 6a811d935..d04a16b58 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -24,7 +24,7 @@ SafariZone_EventScript_Retire:: @ 82A4B85
SafariZone_EventScript_TimesUp:: @ 82A4B8A
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
message SafariZone_Text_TimesUp
waitmessage
waitbuttonpress
@@ -33,7 +33,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A
SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
lockall
- playse SE_PINPON
+ playse SE_DING_DONG
message SafariZone_Text_OutOfBalls
waitmessage
waitbuttonpress
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 0de890aa6..132bdd19c 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -144,7 +144,7 @@ SecretBase_EventScript_ShrubEnter:: @ 8275B4D
SecretBase_EventScript_InitSecretBase:: @ 8275B5B
closemessage
- playse SE_KAIDAN
+ playse SE_EXIT
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
special SetPlayerSecretBase
@@ -164,7 +164,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
compare VAR_RESULT, YES
goto_if_eq SecretBase_EventScript_SetAsBase
closemessage
- playse SE_KAIDAN
+ playse SE_EXIT
special ClearAndLeaveSecretBase
end
@@ -183,7 +183,7 @@ SecretBase_Movement_275BB4: @ 8275BB4
SecretBase_EventScript_Enter:: @ 8275BB7
lockall
setvar VAR_INIT_SECRET_BASE, 1
- playse SE_KAIDAN
+ playse SE_EXIT
special IsCurSecretBaseOwnedByAnotherPlayer
compare VAR_RESULT, FALSE
goto_if_eq SecretBase_EventScript_EnterPlayersBase
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index 1d82bb381..10b46700e 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -29,7 +29,7 @@ Std_MsgboxYesNo: @ 8271332
Std_MsgboxGetPoints: @ 827133C
message 0x0
- playfanfare MUS_ME_POINTGET
+ playfanfare MUS_OBTAIN_B_POINTS
waitfanfare
waitmessage
return
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index ca692e1ef..34d0462bb 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -32,8 +32,8 @@ EventScript_TrainerHillTimer:: @ 82C8393
TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
setvar VAR_TEMP_2, 1
- trainerhill_clearresult
- compare VAR_RESULT, 1 @ VAR_RESULT always 0 here
+ trainerhill_getusingereader
+ compare VAR_RESULT, TRUE @ VAR_RESULT always FALSE here
goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
end
diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc
index 59577e8a8..c77e628ee 100644
--- a/data/scripts/trainer_script.inc
+++ b/data/scripts/trainer_script.inc
@@ -3,7 +3,7 @@ Std_RegisteredInMatchCall:: @ 82742C9
buffertrainername 1, VAR_0x8000
closemessage
delay 30
- playfanfare MUS_ME_TORE_EYE
+ playfanfare MUS_REGISTER_MATCH_CALL
msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
waitfanfare
closemessage
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 13:04:43 +0000