summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc20
-rw-r--r--data/scripts/mystery_event_club.inc2
-rw-r--r--data/scripts/secret_base.inc62
-rw-r--r--data/scripts/shared_secret_base.inc20
5 files changed, 53 insertions, 53 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 1081af8f9..ff0482619 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -525,7 +525,7 @@ CableClub_EventScript_RecordCorner:: @ 82771DB
goto_if_eq CableClub_EventScript_AbortLink
message gText_PleaseWaitForLink
waitmessage
- special sub_80B2E74
+ special TryRecordMixLinkup
waitstate
special sub_80B2EA8
waitstate
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 98faa4748..dfe8780e7 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -149,61 +149,61 @@ GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
end
GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
- trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
- trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
- trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
- trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
- trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
- trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
- trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
- trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
- trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
- trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+ trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 6687bbd47..16e9a657f 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -41,7 +41,7 @@ MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB
MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
setvar VAR_0x8004, 0
- special sub_811EECC
+ special ShowEasyChatProfile
waitmessage
delay 80
msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 523eef39b..cf582bba5 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -346,7 +346,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer0PostBattle
- msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer0Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle
setvar VAR_RESULT, 1
@@ -364,7 +364,7 @@ SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25
end
SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT
@@ -383,7 +383,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer1PostBattle
- msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer1Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle
setvar VAR_RESULT, 1
@@ -401,7 +401,7 @@ SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D
end
SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT
@@ -420,7 +420,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer2PostBattle
- msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer2Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle
setvar VAR_RESULT, 1
@@ -438,7 +438,7 @@ SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15
end
SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT
@@ -457,7 +457,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer3PostBattle
- msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer3Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle
setvar VAR_RESULT, 1
@@ -475,7 +475,7 @@ SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D
end
SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT
@@ -494,7 +494,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer4PostBattle
- msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer4Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle
setvar VAR_RESULT, 1
@@ -512,7 +512,7 @@ SecretBase_EventScript_Trainer4PreChampion:: @ 8276005
end
SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT
@@ -531,7 +531,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer5PostBattle
- msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer5Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle
setvar VAR_RESULT, 1
@@ -549,7 +549,7 @@ SecretBase_EventScript_Trainer5PreChampion:: @ 827607D
end
SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT
@@ -568,7 +568,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer6PostBattle
- msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer6Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle
setvar VAR_RESULT, 1
@@ -586,7 +586,7 @@ SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5
end
SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT
@@ -605,7 +605,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer7PostBattle
- msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer7Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle
setvar VAR_RESULT, 1
@@ -623,7 +623,7 @@ SecretBase_EventScript_Trainer7PreChampion:: @ 827616D
end
SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT
@@ -642,7 +642,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer8PostBattle
- msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer8Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle
setvar VAR_RESULT, 1
@@ -660,7 +660,7 @@ SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5
end
SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT
@@ -679,7 +679,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion
compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer9PostBattle
- msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO
+ msgbox SecretBase_Text_Trainer9Intro, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle
setvar VAR_RESULT, 1
@@ -697,7 +697,7 @@ SecretBase_EventScript_Trainer9PreChampion:: @ 827625D
end
SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267
- special sub_80EB300
+ special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0
special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT
@@ -716,35 +716,35 @@ SecretBase_EventScript_BattleTrainer:: @ 8276286
special DoSpecialTrainerBattle
waitstate
compare VAR_RESULT, B_OUTCOME_DREW
- call_if_eq SecretBase_EventScript_2762BD
+ call_if_eq SecretBase_EventScript_DrewSecretBaseBattle
compare VAR_RESULT, B_OUTCOME_WON
- call_if_eq SecretBase_EventScript_2762C1
+ call_if_eq SecretBase_EventScript_WonSecretBaseBattle
compare VAR_RESULT, B_OUTCOME_LOST
- call_if_eq SecretBase_EventScript_2762C5
+ call_if_eq SecretBase_EventScript_LostSecretBaseBattle
special HealPlayerParty
release
end
-SecretBase_EventScript_2762BD:: @ 82762BD
- special sub_80EB438
+SecretBase_EventScript_DrewSecretBaseBattle:: @ 82762BD
+ special DrewSecretBaseBattle
return
-SecretBase_EventScript_2762C1:: @ 82762C1
- special sub_80EB368
+SecretBase_EventScript_WonSecretBaseBattle:: @ 82762C1
+ special WonSecretBaseBattle
return
-SecretBase_EventScript_2762C5:: @ 82762C5
- special sub_80EB3D0
+SecretBase_EventScript_LostSecretBaseBattle:: @ 82762C5
+ special LostSecretBaseBattle
return
.include "data/scripts/secret_power_tm.inc"
SecretBase_EventScript_DollInteract:: @ 82766A2
- special sub_80EB290
+ special CheckInteractedWithFriendsDollDecor
end
SecretBase_EventScript_CushionInteract:: @ 82766A6
- special sub_80EB2C8
+ special CheckInteractedWithFriendsCushionDecor
end
SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index de5dcc703..0fa61a214 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -157,33 +157,33 @@ SecretBase_EventScript_PCTurnOff:: @ 823B66E
end
@ Unused
-SecretBase_EventScript_23B674:: @ 823B674
- special SetSecretBaseSecretsTvFlags_Poster
+SecretBase_EventScript_Poster:: @ 823B674
+ special CheckInteractedWithFriendsPosterDecor
end
@ Unused
-SecretBase_EventScript_23B678:: @ 823B678
- special SetSecretBaseSecretsTvFlags_MiscFurnature
+SecretBase_EventScript_FurnitureBottom:: @ 823B678
+ special CheckInteractedWithFriendsFurnitureBottom
end
@ Unused
-SecretBase_EventScript_23B67C:: @ 823B67C
- special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
+SecretBase_EventScript_FurnitureMiddle:: @ 823B67C
+ special CheckInteractedWithFriendsFurnitureMiddle
end
@ Unused
-SecretBase_EventScript_23B680:: @ 823B680
- special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
+SecretBase_EventScript_FurnitureTop:: @ 823B680
+ special CheckInteractedWithFriendsFurnitureTop
end
SecretBase_EventScript_SandOrnament:: @ 823B684
- special SetSecretBaseSecretsTvFlags_SandOrnament
+ special CheckInteractedWithFriendsSandOrnament
dofieldeffect FLDEFF_SAND_PILLAR
waitstate
end
SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C
- special GetShieldToyTVDecorationInfo
+ special InteractWithShieldOrTVDecoration
compare VAR_RESULT, 0
goto_if_eq SecretBase_EventScript_BattleTowerShield
compare VAR_RESULT, 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 19:15:26 +0000