diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/battle_pike.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 13 | ||||
| -rw-r--r-- | data/scripts/interview.inc | 13 | ||||
| -rw-r--r-- | data/scripts/secret_base.inc | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 67eb19011..7ba25321d 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -1,5 +1,5 @@ @ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal -BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B +BattleFrontier_BattlePikeRoom_MapScripts: @ 82C3E1B map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 84cd315f7..c7f576aba 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,16 +1,3 @@ -@ Unused -EventScript_28CCAA:: @ 828CCAA - setvar VAR_0x8005, 8 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq EventScript_UnusedRet - setvar VAR_0x8005, 8 - special InterviewAfter - return - -EventScript_UnusedRet:: @ 828CCC6 - return - @ Gabby and Ty always move to the same spots for the first 5 battles @ From the 6th battle onwards, they move randomly between locations 6-8 @ Note: The local IDs of Gabby and Ty are hard-coded in GabbyAndTySetScriptVarsToObjectEventLocalIds diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index f968577f3..9921aa603 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -342,3 +342,16 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84 BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER return + +@ Unused +EventScript_ContestLiveInterview:: @ 828CCAA + setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES + special InterviewBefore + compare VAR_RESULT, TRUE + goto_if_eq EventScript_ContestLiveInterviewEnd + setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES + special InterviewAfter + return + +EventScript_ContestLiveInterviewEnd:: @ 828CCC6 + return diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 4a20de9a6..9e7a60e15 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B end SecretBase_EventScript_FirstEntrance:: @ 8275B81 - applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4 + applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_EnterBase waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO @@ -175,7 +175,7 @@ SecretBase_EventScript_SetAsBase:: @ 8275BAB waitstate end -SecretBase_Movement_275BB4: @ 8275BB4 +SecretBase_Movement_EnterBase: @ 8275BB4 walk_up walk_up step_end |