diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-09-05 22:50:19 +0200 |
|---|---|---|
| committer | anonymous <> | 2022-10-08 22:32:54 +0200 |
| commit | 67467fd831d2928715835f8a389b4f464a0f9a7a (patch) | |
| tree | 261864c07f334c35024033a908b4af8e808caebe /data/scripts | |
| parent | 756a8a89da46dade06fad1723de88fa5a82cc2ec (diff) | |
Extract some data
And split up subtasks and world events.
Diffstat (limited to 'data/scripts')
26 files changed, 56 insertions, 56 deletions
diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index f2ee4050..135e95c0 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed BeginBlock Call SetPriorityHighest SetEntitySpeed 0x0700 - _0807F0B4 0x0007 + SetScrollSpeed 7 CameraTargetEntity Call sub_0807FBC4 EndBlock @@ -14,7 +14,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed SetSyncFlag 0x0000000a WaitForSyncFlagAndClear 0x00000004 _0807EEB4 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC EnablePlayerControl diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 7ee1968c..126ad33e 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -24,7 +24,7 @@ script_0800D650: Call sub_0807FBC4 Call sub_0807FBA0 SetEntitySpeed 0x0700 - _0807F0B4 0x0007 + SetScrollSpeed 7 CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 Wait 0x003c diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 9a46581f..f4372344 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,7 +1,7 @@ @ Cloud Tops NPC4E after Kinstone has been fused SCRIPT_START script_Npc4EKinstoneFused _0807EEB4 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC EnablePlayerControl diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index 76640636..65c464af 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -62,7 +62,7 @@ script_08012566: StartPlayerScript script_PlayerEzloBeingBullied WaitForSyncFlagAndClear 0x00000001 SetEntityPositionRelative 0x0388, 0x0168 - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity Wait 0x005a SetSyncFlag 0x00000004 @@ -113,7 +113,7 @@ script_08012566: Wait 0x003c PlayBGM Call sub_0806DCA0 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call EnablePauseMenu EnablePlayerControl diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 60b87ab5..f63130ca 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse WaitForFadeFinish SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call EnablePauseMenu EnablePlayerControl diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index be79b6e2..f89bcaa1 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -9,7 +9,7 @@ script_08008E12: SetPlayerIdle Call WaitForPlayerNormal Call DisablePauseMenuAndPutAwayItems - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity WaitForPlayerEnterRoom Wait 0x003c @@ -66,7 +66,7 @@ script_08008E12: _0807E8E4_0 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000100 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer SetGlobalFlag TABIDACHI Call sub_0806DCC0 diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 074c3e75..c1affdb9 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -20,7 +20,7 @@ script_080157DA: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 StartPlayerScript script_PlayerIntroBusinessScrub1 - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity Call WaitForCameraTouchRoomBorder @@ -50,7 +50,7 @@ script_08015888: JumpIf script_08015888 SetPlayerIdle Call DisablePauseMenuAndPutAwayItems - _0807F0B4 0x0002 + SetScrollSpeed 2 SetEntityPositionRelative 0x0248, 0x0208 CameraTargetEntity StartPlayerScript script_PlayerIntroBusinessScrub3 @@ -68,7 +68,7 @@ script_08015888: Call sub_08066FB8 Call EnablePauseMenu EnablePlayerControl - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 1aa6c7fa..eb566324 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -31,7 +31,7 @@ SCRIPT_START script_Npc4EMonsters Call SetPlayerActionNormal CallWithArg EquipItem, ITEM_SHIELD CallWithArg SetPlayerMacro, gUnk_080049F6 - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x01f8, 0x0068 SetSyncFlag 0x00000004 Wait 0x001e diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index cd6a0d9b..0884bbc7 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -34,10 +34,10 @@ SCRIPT_START script_Npc4EIntroCastle StartPlayerScript script_PlayerAtIntroCeremony WaitForSyncFlagAndClear 0x00000400 SetEntityPositionRelative 0x01f8, 0x0050 - _0807F0B4 0x0007 + SetScrollSpeed 7 CameraTargetEntity Wait 0x000a - _0807F0B4 0x0001 + SetScrollSpeed 1 SetFadeTime 0x0001 SetFade4 SetSyncFlag 0x0002a800 @@ -67,7 +67,7 @@ SCRIPT_START script_Npc4EIntroCastle MessageFromTargetPos TEXT_PROLOGUE, 0x3a, 0x000c WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x01c0 - _0807F0B4 0x0004 + SetScrollSpeed 4 Wait 0x0078 SetSyncFlag 0x00280000 WaitForSyncFlagAndClear 0x00500000 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 0a7ccb4a..14a92e0c 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -11,12 +11,12 @@ SCRIPT_START script_Npc4EIntroTown WaitForFadeFinish StartPlayerScript script_PlayerIntro1 SetSyncFlag 0x00000002 - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x00c8, 0x0218 Call WaitForCameraTouchRoomBorder Wait 0x0064 @ Camera reaches center of town square - _0807F0B4 0x0002 + SetScrollSpeed 2 SetEntityPositionRelative 0x00c8, 0x0368 Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000001 @@ -27,7 +27,7 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 @ Zelda ran off. Give control to the player - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call EnablePauseMenu EnablePlayerControl @@ -85,7 +85,7 @@ SCRIPT_START script_Npc4EIntroTown WaitUntilTextboxCloses StartPlayerScript script_PlayerIntro5 SetEntityPositionRelative 0x00f0, 0x0258 - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity Wait 0x001e Call sub_08063C2C @@ -161,7 +161,7 @@ SCRIPT_START script_Npc4EIntroTown @ Give control back to the player CallWithArg SetPlayerMacro, 0x00000000 Call NPC4E_RestoreEquippedItems - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Wait 0x000a SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index 952b62d8..bfcfdea3 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -1,7 +1,7 @@ @ Hyrule Town NPC4E Kinstone Cutscene SCRIPT_START script_Npc4EFirstKinstone BeginBlock - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetPlayer EndBlock script_0800F09A: diff --git a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc index e18c6468..38109c0e 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc @@ -1,7 +1,7 @@ @ Ezlo Cutscene CUTSCENE_ORCHESTRATOR MinishVaati SCRIPT_START script_CutsceneOrchestratorMinishVaati BeginBlock - _0807F0B4 0x0007 + SetScrollSpeed 7 SetEntityPositionRelative 0x0078, 0x0068 CameraTargetEntity EndBlock @@ -16,7 +16,7 @@ SCRIPT_START script_CutsceneOrchestratorMinishVaati WaitForSyncFlagAndClear 0x00001000 SetSyncFlag 0x00000880 WaitForSyncFlagAndClear 0x00001100 - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0078, 0x0090 MessageFromTargetPos TEXT_VAATI, 0x30, 0x0002 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc index 6d3e1cbe..a04a4ef1 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc @@ -11,7 +11,7 @@ script_08014FCC: Call WaitForPlayerNormal Call DisablePauseMenuAndPutAwayItems StopBgm - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity StartPlayerScript script_PlayerAtVaatisAppearance WaitForSyncFlagAndClear 0x00000001 @@ -39,7 +39,7 @@ script_08014FCC: StopBgm StartPlayerScript script_PlayerTryToFollowVaati CameraTargetEntity - _0807F0B4 0x0003 + SetScrollSpeed 3 SetEntityPositionRelative 0x01f8, 0x0148 WaitForSyncFlagAndClear 0x00000001 Call sub_0804F6A8 @@ -105,7 +105,7 @@ script_08015104: PlaySound SFX_10B Wait 0x003c PlaySound SFX_SECRET - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer SetLocalFlag SOUGEN_06_SAIKAI EzloMessage TEXT_VAATI, 0x0c @@ -120,7 +120,7 @@ script_08015104: SetPlayerIdle CallWithArg SetPlayerFlag, PL_NO_CAP MoveEntityToPlayer - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetEntity SetFadeTime 0x0100 SetFade4 @@ -139,7 +139,7 @@ script_08015104: EzloMessage TEXT_VAATI, 0x15 EndBlock WaitUntilTextboxCloses - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call EnableRandomDrops PlayBGM diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index a802c19a..53cf9705 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Npc4EFixedEverything PlaySound SFX_APPARATE EndBlock Wait 0x0078 - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x0088, 0x0078 Call WaitForCameraTouchRoomBorder MessageFromTargetPos TEXT_VAATI2, 0x64, 0x0000 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index d4e0b0ab..b20b5172 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -59,7 +59,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing Call sub_0807FB94 @ Roll Credits MoveEntityToPlayer Call sub_0807F844 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer SetSyncFlag 0x80000000 SetFade4 diff --git a/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc index 0ea36fde..5f75acdc 100644 --- a/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc @@ -1,7 +1,7 @@ @ Western Wood Cutscene CUTSCENE_ORCHESTRATOR in Castle SCRIPT_START script_CutsceneOrchestratorTakeoverCutscene BeginBlock - _0807F0B4 0x0007 + SetScrollSpeed 7 SetEntityPositionRelative 0x0088, 0x0068 CameraTargetEntity EndBlock @@ -9,26 +9,26 @@ SCRIPT_START script_CutsceneOrchestratorTakeoverCutscene SetFade4 WaitForFadeFinish Wait 0x003c - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c PlayBgm BGM_VAATI_THEME SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c diff --git a/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc index dcbe756b..f6743f5b 100644 --- a/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc @@ -11,7 +11,7 @@ script_0800DA64: _0807E8E4_0 Call CreatePlayerExclamationMark Wait 0x003c - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity Call WaitForCameraTouchRoomBorder @@ -25,7 +25,7 @@ script_0800DA64: WaitUntilTextboxCloses _0807E8E4_0 CallWithArg SetPlayerPos, 0x00780138 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call WaitForCameraTouchRoomBorder SetRoomFlag 0x0000 diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index cadcafdc..a147db33 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -8,7 +8,7 @@ script_0800DB7C: SetPlayerIdle Call WaitForPlayerNormal Call DisablePauseMenuAndPutAwayItems - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity Call WaitForCameraTouchRoomBorder diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index 8e7a3d72..30ea180c 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -14,7 +14,7 @@ SCRIPT_START script_Vaati1Intro Call CreatePlayerExclamationMark Wait 0x003c _0807E8E4_0 - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity Call WaitForCameraTouchRoomBorder Call Vaati_Apparate @@ -29,7 +29,7 @@ SCRIPT_START script_Vaati1Intro SetRoomFlag 0x0000 DoPostScriptAction 0x0008 Wait 0x0080 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call WaitForCameraTouchRoomBorder SetLocalFlag 0x0078 diff --git a/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc index 148ddcf9..133c4a9e 100644 --- a/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc @@ -2,14 +2,14 @@ SCRIPT_START script_CutsceneOrchestratorAllBooksCollected BeginBlock SetEntityPositionRelative 0x0068, 0x0068 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetEntity EndBlock Wait 0x001e SetSyncFlag 0x00000002 WaitForSyncFlag 0x00000001 Wait 0x000f - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Wait 0x001e SetSyncFlag 0x00000004 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index cd82075c..afa05cc5 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble Call CreatePlayerExclamationMark Wait 0x003c .ifdef EU - _0807F0B4 0x0007 + SetScrollSpeed 7 SetEntityPositionRelative 0x00e8, 0x00a8 CameraTargetEntity Wait 0x003c @@ -13,19 +13,19 @@ SCRIPT_START script_Npc4EFinalSwordRumble CallWithArg DeleteRepeatedSoundManager, 0x00000001 _0807F0C8 0x0000, 0x0000 Wait 0x003c - _0807F0B4 0x0004 + SetScrollSpeed 4 SetEntityPositionRelative 0x00e8, 0x0050 CameraTargetEntity Wait 0x003c LoadRoomEntityList gUnk_080F55D8 Wait 0x0078 - _0807F0B4 0x0007 + SetScrollSpeed 7 MoveEntityToPlayer CameraTargetEntity Wait 0x003c EzloMessage TEXT_PANEL_TUTORIAL, 0x02 WaitUntilTextboxCloses - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index 7fac00e4..c79401b8 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -9,12 +9,12 @@ script_08013CA6: Call DisablePauseMenuAndPutAwayItems Call CreatePlayerExclamationMark Wait 0x003c - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x00e8, 0x0138 CameraTargetEntity Call WaitForCameraTouchRoomBorder Wait 0x0078 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call WaitForCameraTouchRoomBorder EzloMessage TEXT_PANEL_TUTORIAL, 0x04 diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index ed7ce571..97e1d836 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard Call CreatePlayerExclamationMark Wait 0x003c - _0807F0B4 0x0007 + SetScrollSpeed 7 SetEntityPositionRelative 0x00e8, 0x00a8 CameraTargetEntity Wait 0x003c @@ -14,7 +14,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard WaitForSyncFlagAndClear 0x00000002 EzloMessage TEXT_PANEL_TUTORIAL, 0x01 WaitUntilTextboxCloses - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 3bab3e34..abe02e5b 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -79,7 +79,7 @@ script_080138D0: WaitUntilTextboxCloses SetSyncFlag 0x00040000 .ifndef EU - _0807F0B4 0x0002 + SetScrollSpeed 2 SetEntityPositionRelative 0x00e8, 0x00d8 CameraTargetEntity .endif diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index e6357030..be00febe 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -75,7 +75,7 @@ SCRIPT_START script_08016482 InitItemGetSequence ITEM_SMITH_SWORD CameraTargetEntity CameraTargetPlayer - _0807F0B4 0x0007 + SetScrollSpeed 7 _0807F0C8 0x003c, 0x0003 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index c3d78354..1fa9e8d7 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -9,7 +9,7 @@ script_0800934E: SetPlayerIdle Call DisablePauseMenuAndPutAwayItems Call sub_0806D638 - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetEntity CheckGlobalFlag GAMECLEAR JumpIf script_BigGoronTalk @@ -18,10 +18,10 @@ script_0800934E: script_08009376: WaitUntilTextboxCloses Call sub_0806D640 - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetPlayer Wait 0x002d - _0807F0B4 0x0004 + SetScrollSpeed 4 EnablePlayerControl Call EnablePauseMenu Jump script_0800934E |
