dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up a few unlabeled scripts

Browse Source
This commit is contained in:
GriffinR
2021-03-04 16:34:09 -05:00
committed by huderlem
parent 91ab30fa71
commit 734a15135f
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/battle_pike.inc
View File

@@ -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

13
data/scripts/gabby_and_ty.inc
View File

@@ -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

13
data/scripts/interview.inc
View File

@@ -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

4
data/scripts/secret_base.inc
View File

@@ -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