Merge pull request #554 from hatal175/document2

24 files changed, 27 insertions, 27 deletions

diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
index 9566e4ae..76862484 100644
--- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
+++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2
 	WaitForSyncFlagAndClear 0x00000002
 script_0800D80C:
 	SetEntitySpeed 0x0100
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 	DoPostScriptAction 0x000e
 	Call sub_0806CA5C
 	SetEntityVelocity 0x00040000
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
diff --git a/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc
index a8613fff..544a4d21 100644
--- a/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc
+++ b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_CutsceneMiscObjectV3DefeatedMinishCap
 	CallWithArg sub_080960C4, script_CutsceneMiscObjectV3DefeatedMinishCap2
 	EndBlock
 	PlaySound SFX_SPARKLES
-	_0807EF3C 0xff80, 0x0000
+	_0807EF3C -128, 0x0000
 	PlaySound SFX_143
 	SetAnimation 0x0004
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc
index 5939aa30..418511d1 100644
--- a/data/scripts/hyruleTown/script_Carlov.inc
+++ b/data/scripts/hyruleTown/script_Carlov.inc
@@ -50,7 +50,7 @@ script_080144C8:
 	Wait 0x0018
 	SetRoomFlag 0x0000
 	SetLocalFlag 0x0092
-	_0807EEF4 0x0000, 0xffa0
+	_0807EEF4 0x0000, -96
 	Call DisablePauseMenu
 	Jump script_080144FC
 script_080144F0:
diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc
index 73498142..4bd86b55 100644
--- a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc
+++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc
@@ -1,7 +1,7 @@
 @ BigGoron Kinstone Cutscene 5
 SCRIPT_START script_BigGoronKinstone5
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xff30
+	_0807EEF4 0x0000, -208
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x00b4
 	Call sub_08054968
diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc
index b3c65aab..87ce4e77 100644
--- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc
+++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc
@@ -34,5 +34,5 @@ script_0800BD1C:
 	SetAnimationState 0x0002
 	WaitForSyncFlagAndClear 0x00000004
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc
index 588ede36..226eb90c 100644
--- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc
+++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc
@@ -31,6 +31,6 @@ SCRIPT_START script_Goron2Kinstone2
 	SetAnimationState 0x0006
 	SetSyncFlag 0x00000004
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc
index 918a8076..b65e77f2 100644
--- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc
+++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc
@@ -36,5 +36,5 @@ script_0800BFA8:
 	Wait 0x003c
 	Call sub_08054F64
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc
index 0f84880e..62165e7f 100644
--- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc
+++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc
@@ -36,5 +36,5 @@ script_0800C248:
 	Wait 0x003c
 	Call sub_08054F64
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc
index a2a854bc..3a632fca 100644
--- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc
+++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc
@@ -32,6 +32,6 @@ SCRIPT_START script_Goron4Kinstone4
 	Wait 0x003c
 	SetSyncFlag 0x0000001c
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc
index 1726b2c6..4eaed958 100644
--- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc
+++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc
@@ -32,6 +32,6 @@ SCRIPT_START script_Goron6Kindstone6
 	Wait 0x003c
 	SetSyncFlag 0x0000007c
 	SetEntitySpeed 0x0080
-	_0807EEF4 0x0000, 0xffe0
+	_0807EEF4 0x0000, -32
 	Call sub_08054968
 SCRIPT_END
diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc
index e8d78eee..cd7f7c5e 100644
--- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc
+++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc
@@ -7,9 +7,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkFromBottom
 	Wait 0x000a
 	DoPostScriptAction 0x0007
 	PlaySound SFX_136
-	_0807EEF4 0x0000, 0xff90
+	_0807EEF4 0x0000, -112
 	Wait 0x001e
-	_0807EEF4 0x0000, 0xffb0
+	_0807EEF4 0x0000, -80
 	Wait 0x003c
 	SetRoomFlag 0x00ff
 	SetAnimation 0x0005
diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc
index 66905ff2..73f10379 100644
--- a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_CutsceneMiscObjectSwordCharge3
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0002
 	Call sub_0807F738
-	OffsetEntityPosition 0x0000, 0xfff0
+	OffsetEntityPosition 0, -16
 	EndBlock
 	WaitForSyncFlag 0x00000040
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc
index a65de2da..12a257fc 100644
--- a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_CutsceneMiscObjectSwordCharge4
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0003
 	Call sub_0807F738
-	OffsetEntityPosition 0x0000, 0xfff0
+	OffsetEntityPosition 0, -16
 	EndBlock
 	WaitForSyncFlag 0x00000040
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc
index 3c3dbe7d..156eb528 100644
--- a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneMiscObjectSwordCharge7
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0006
-	OffsetEntityPosition 0x0000, 0xfff0
+	OffsetEntityPosition 0, -16
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000800
 	SetAnimation 0x000a
diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc
index 28aa4a44..ad494b3a 100644
--- a/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneMiscObjectSwordCharge8
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0007
-	OffsetEntityPosition 0x0000, 0xfff0
+	OffsetEntityPosition 0, -16
 	EndBlock
 	WaitForSyncFlagAndClear 0x00001000
 	SetAnimation 0x000b
diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc
index 72138857..6dd3ea33 100644
--- a/data/scripts/unused/script_08012B24.inc
+++ b/data/scripts/unused/script_08012B24.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B24
 	DoPostScriptAction 0x0001
 	WalkSouth 0x0008
 	SetSyncFlag 0x00000002
-	CallWithArg SetPlayerIFrames, 0xffffffe2
+	CallWithArg SetPlayerIFrames, -30
 	Call SetPlayerActionNormal
 SCRIPT_END
diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc
index 8d48f7f2..d59845b9 100644
--- a/data/scripts/unused/script_08012B50.inc
+++ b/data/scripts/unused/script_08012B50.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B50
 	DoPostScriptAction 0x0001
 	WalkNorth 0x0008
 	SetSyncFlag 0x00000002
-	CallWithArg SetPlayerIFrames, 0xffffffe2
+	CallWithArg SetPlayerIFrames, -30
 	Call SetPlayerActionNormal
 SCRIPT_END
diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc
index 228ba8b9..316929f6 100644
--- a/data/scripts/unused/script_08012B7C.inc
+++ b/data/scripts/unused/script_08012B7C.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B7C
 	DoPostScriptAction 0x0001
 	WalkEast 0x0008
 	SetSyncFlag 0x00000002
-	CallWithArg SetPlayerIFrames, 0xffffffe2
+	CallWithArg SetPlayerIFrames, -30
 	Call SetPlayerActionNormal
 SCRIPT_END
diff --git a/data/scripts/veilFalls/script_BigGoronHiding.inc b/data/scripts/veilFalls/script_BigGoronHiding.inc
index 1cf359ef..237d4470 100644
--- a/data/scripts/veilFalls/script_BigGoronHiding.inc
+++ b/data/scripts/veilFalls/script_BigGoronHiding.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_BigGoronHiding
 	SetEntitySpeed 0x0010
 	EndBlock
 script_0800932E:
-	_0807EEF4 0xfff8, 0x0000
+	_0807EEF4 -8, 0x0000
 	_0807EEF4 0x0008, 0x0000
 	Jump script_0800932E
 SCRIPT_END
diff --git a/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc b/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc
index 8005afe9..f4f1057f 100644
--- a/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc
+++ b/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc
@@ -1,5 +1,5 @@
 @ Veil Falls MINISH_VILLAGE_OBJECT left stone
 SCRIPT_START script_MinishVillageObjectLeftStone
-	OffsetEntityPosition 0xfff0, 0x0000
+	OffsetEntityPosition -16, 0
 SCRIPT_END
 	.2byte 0x0000