summaryrefslogtreecommitdiff
path: root/data/scripts/cutscene
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-08-08 20:03:12 +0300
committerTal Hayon <talhayon1@gmail.com>2022-08-08 20:03:12 +0300
commit79bae9cd8a7891dd4545649fa196aad5a36237d2 (patch)
tree1e59403522cbeeaa36c33ca34662f17c49866639 /data/scripts/cutscene
parent22cbdd2fd645a5525a6ef0c9b8ee8ec11af9e9aa (diff)
Various documentations
Diffstat (limited to 'data/scripts/cutscene')
-rw-r--r--data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc4
-rw-r--r--data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc2
-rw-r--r--data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc4
-rw-r--r--data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc2
4 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc
index 015df913..76640636 100644
--- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc
+++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc
@@ -1,7 +1,7 @@
@ Minish Woods Ezlo Cutscene NPC4E
SCRIPT_START script_Npc4EEzloCutscene
BeginBlock
- Call sub_08054564
+ Call DisableRandomDrops
EndBlock
script_0801248A:
CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
@@ -126,7 +126,7 @@ script_08012566:
StopBgm
Wait 0x003c
PlayBGM
- Call sub_08054570
+ Call EnableRandomDrops
SetGlobalFlag EZERO_1ST
CallWithArg ResetPlayerFlag, PL_NO_CAP
Call EnablePauseMenu
diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc
index 2bc226f6..b835a4ce 100644
--- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc
+++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc
@@ -11,7 +11,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCap
_0807EDD4 0x0078, 0x0068
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
- _0807EF3C 0xff80, 0x0000
+ _0807EF3C -128, 0x0000
CallWithArg DeleteRepeatedSoundManager, 0x00000003
Wait 0x003c
SetSyncFlag 0x00000100
diff --git a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc
index a51f7c15..6d3e1cbe 100644
--- a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc
+++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc
@@ -2,7 +2,7 @@
SCRIPT_START script_CutsceneOrchestratorVaatiAppears
BeginBlock
SetEntityPositionRelative 0x01f8, 0x00e0
- Call sub_08054564
+ Call DisableRandomDrops
EndBlock
script_08014FCC:
CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
@@ -141,7 +141,7 @@ script_08015104:
WaitUntilTextboxCloses
_0807F0B4 0x0004
CameraTargetPlayer
- Call sub_08054570
+ Call EnableRandomDrops
PlayBGM
Call EnablePauseMenu
EnablePlayerControl
diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
index d6887242..d4e0b0ab 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
@@ -37,7 +37,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
WaitUntilTextboxCloses
MessageFromTargetPos TEXT_VAATI2, 0x63, 0x000e
WaitUntilTextboxCloses
- OffsetEntityPosition 0x0000, 0xffe0
+ OffsetEntityPosition 0x0000, -32
Call WaitForCameraTouchRoomBorder
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000004