This commit is contained in:
theo3
2021-12-14 23:31:27 -08:00
parent 83fc028502
commit 34e69959df
198 changed files with 1578 additions and 1550 deletions
+2 -2
View File
@@ -81,7 +81,7 @@ script_08008E12:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0035
WaitPlayerAction8
WaitPlayerGetItem
StartPlayerScript script_08008FC0
WaitForSomething2 0x00000020
_0807E8E4_0
@@ -95,7 +95,7 @@ script_08008E12:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0047
WaitPlayerAction8
WaitPlayerGetItem
SetIntVariable 0x00000003
Call sub_0807F420
_0807E8E4_0
+1 -1
View File
@@ -20,7 +20,7 @@ SCRIPT_START script_08009464
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageNoOverlap 0x1d0c
WaitUntilTextboxCloses
+1 -1
View File
@@ -10,7 +10,7 @@ SCRIPT_START script_080095F2
PlaySound SFX_109
_0807F088 0x003c
MessageFromTarget 0x053c
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807F078 0x003c, 0x0001
script_08009622:
+1 -1
View File
@@ -42,7 +42,7 @@ SCRIPT_START script_08009B78
WaitForSomething2 0x00000008
Call sub_08053250
_0807F034 0x0034
WaitPlayerAction8
WaitPlayerGetItem
_0807E8E4_1
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100c, 0x0000
+3 -3
View File
@@ -25,7 +25,7 @@ script_08009F36:
WaitUntilTextboxCloses
Wait 0x001e
_0807F034 0x0065
WaitPlayerAction8
WaitPlayerGetItem
DoPostScriptAction 0x000a
Call sub_0807DF50
_0807E878
@@ -74,7 +74,7 @@ script_0800A002:
Wait 0x0008
_0807F034 0x0008
Call sub_08060318
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f13
@@ -108,7 +108,7 @@ script_0800A064:
Wait 0x0008
_0807F034 0x0007
Call sub_08060318
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f10
+3 -3
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_0800AB6E
_0807E8E4_0
_0807E5F8 0x00000040
WaitForSomething2 0x00000080
SetEntityPosition 0x0000, 0xffe0
OffsetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
Wait 0x003c
CallWithArg DeleteManager36, 0x00000001
@@ -26,7 +26,7 @@ SCRIPT_START script_0800AB6E
_0807E5F8 0x00000008
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
SetEntityPosition 0x0000, 0x0020
OffsetEntityPosition 0x0000, 0x0020
Call sub_0807F5C0
WaitForSomething2 0x00000010
StartPlayerScript script_0800ACE0
@@ -36,7 +36,7 @@ SCRIPT_START script_0800AB6E
WaitUntilTextboxCloses
MessageFromTargetPos 0x1663, 0x000e
WaitUntilTextboxCloses
SetEntityPosition 0x0000, 0xffe0
OffsetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
+1 -1
View File
@@ -17,7 +17,7 @@ SCRIPT_START script_0800B41C
Wait 0x003c
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0037
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageFromTarget 0x200c
WaitUntilTextboxCloses
+1 -1
View File
@@ -49,7 +49,7 @@ script_0800B68E:
SetLocalFlag 0x009e
_0807F034 0x0066
script_0800B698:
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
Wait 0x001e
MessageNoOverlap 0x057f
+1 -1
View File
@@ -89,7 +89,7 @@ SCRIPT_START script_0800C634
_0807EB44 0x0004
CheckLocalFlag 0x0082
JumpIfNot script_0800C650
SetEntityPosition 0x0010, 0x0000
OffsetEntityPosition 0x0010, 0x0000
script_0800C650:
EndBlock
script_0800C652:
+4 -4
View File
@@ -43,7 +43,7 @@ script_0800CDEC:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0023
WaitPlayerAction8
WaitPlayerGetItem
Jump script_0800CE32
script_0800CE14:
_0807E48C 0x0022
@@ -54,7 +54,7 @@ script_0800CE14:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0022
WaitPlayerAction8
WaitPlayerGetItem
script_0800CE32:
_0807EB8C
SetGlobalFlag 0x0054
@@ -83,7 +83,7 @@ script_0800CE6E:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0027
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
SetGlobalFlag 0x0054
Call sub_08060340
@@ -111,7 +111,7 @@ script_0800CECE:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0024
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
SetGlobalFlag 0x0054
Call sub_08060340
+1 -1
View File
@@ -42,7 +42,7 @@ script_0800D8F4:
JumpIfNot script_0800D8F4
Call sub_0807DF28
_0807E864
WaitPlayerAction8
WaitPlayerGetItem
_0807EB28 0x1325
WaitUntilTextboxCloses
PlaySound SFX_113
+1 -1
View File
@@ -27,7 +27,7 @@ script_0800D962:
_0807E5F8 0x00000004
WaitForSomething2 0x00000002
_0807F050 0x006d
WaitPlayerAction8
WaitPlayerGetItem
_0807EB28 0x1703
WaitUntilTextboxCloses
Wait 0x003c
+1 -1
View File
@@ -227,7 +227,7 @@ script_0800E3C8:
WaitUntilTextboxCloses
Wait 0x000f
_0807F034 0x0053
WaitPlayerAction8
WaitPlayerGetItem
SetLocalFlag 0x0071
_0807E878
script_0800E3E8:
+1 -1
View File
@@ -41,7 +41,7 @@ script_0800E708:
script_0800E722:
WaitUntilTextboxCloses
_0807F034 0x0057
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807E878
Jump script_0800E6F4
+1 -1
View File
@@ -220,7 +220,7 @@ script_0800ED20:
WaitUntilTextboxCloses
JumpIfNot script_0800ED46
_0807F050 0x0070
WaitPlayerAction8
WaitPlayerGetItem
script_0800ED46:
_0807E878
Call sub_08063874
+1 -1
View File
@@ -66,7 +66,7 @@ script_0800F09A:
MessageFromTargetPos 0x1202, 0x000c
WaitUntilTextboxCloses
_0807F034 0x0067
WaitPlayerAction8
WaitPlayerGetItem
_0807E8E4_0
_0807E5F8 0x00000002
WaitForSomething2 0x00000040
+1 -1
View File
@@ -175,7 +175,7 @@ SCRIPT_START script_0800F73C
MessageFromTargetPos 0x102b, 0x0000
WaitUntilTextboxCloses
_0807F034 0x000d
WaitPlayerAction8
WaitPlayerGetItem
Call sub_0806DC3C
Call sub_080791BC
CallWithArg sub_0807F244, 0x0000000d
+1 -1
View File
@@ -107,7 +107,7 @@ script_080101AC:
WaitUntilTextboxCloses
JumpIfNot script_08010240
Call sub_080A13E8
WaitPlayerAction8
WaitPlayerGetItem
Call sub_080A1460
WaitUntilTextboxCloses
Call sub_080A14A8
+4 -4
View File
@@ -246,7 +246,7 @@ script_08010570:
MessageNoOverlap 0x2b07
WaitUntilTextboxCloses
CallWithArg sub_0807F800, 0x00000000
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
MessageNoOverlap 0x2b0c
Jump script_080105E0
@@ -366,14 +366,14 @@ script_080106E0:
MessageNoOverlap 0x3c04
Jump script_08010726
script_0801070C:
WaitPlayerAction8
WaitPlayerGetItem
ModHealth 0x0008
Call sub_08062EDC
JumpIf script_08010724
MessageNoOverlap 0x3c06
Jump script_08010726
script_08010724:
WaitPlayerAction8
WaitPlayerGetItem
script_08010726:
WaitUntilTextboxCloses
_0807E878
@@ -489,7 +489,7 @@ script_08010860:
JumpIfNot script_080108B2
Call GoronMerchant_TryToBuyKinstone
JumpIfNot script_080108B2
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807EB8C
CheckGlobalFlag 0x0042
+1 -1
View File
@@ -74,7 +74,7 @@ script_08011C28:
CheckLocalFlag 0x0001
JumpIfNot script_08011C28
_0807E888
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x001e
CallWithArg sub_0806C2A0, 0x00000000
WaitFor_2
+3 -3
View File
@@ -362,7 +362,7 @@ script_08012070:
MessageNoOverlap 0x3125
WaitUntilTextboxCloses
_0807F034 0x0031
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
@@ -420,7 +420,7 @@ script_080120FC:
MessageNoOverlap 0x3119
WaitUntilTextboxCloses
_0807F034 0x002f
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
@@ -478,7 +478,7 @@ script_08012188:
MessageNoOverlap 0x311f
WaitUntilTextboxCloses
_0807F034 0x0030
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
+1 -1
View File
@@ -15,7 +15,7 @@ script_08012338:
JumpIf script_0801235A
SetLocalFlag 0x0042
_0807F034 0x0057
WaitPlayerAction8
WaitPlayerGetItem
script_0801235A:
_0807E878
Jump script_08012338
+1 -1
View File
@@ -17,7 +17,7 @@ script_08012440:
JumpIf script_08012474
SetLocalFlag 0x00b3
_0807F034 0x0062
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
SetLocalFlag 0x00d0
.else
+2 -2
View File
@@ -39,7 +39,7 @@ script_08013006:
EndBlock
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0038
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x001e
_0807E8E4_0
Call sub_0806AB9C
@@ -62,7 +62,7 @@ script_08013006:
WaitUntilTextboxCloses
_0807E5F8 0x00000200
_0807F034 0x0015
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageNoOverlap 0x4406
WaitUntilTextboxCloses
+1 -1
View File
@@ -24,7 +24,7 @@ SCRIPT_START script_080131AC
StartPlayerScript script_08013330
WaitForSomething2 0x00000002
MoveEntityToPlayer
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
Call sub_0807F844
CameraTargetEntity
Call sub_080536B8
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08014094
DoPostScriptAction 0x0007
_0807E930 0x0002
Call sub_0807F738
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething 0x00000040
DoPostScriptAction 0x0006
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_080140B8
DoPostScriptAction 0x0007
_0807E930 0x0003
Call sub_0807F738
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething 0x00000040
DoPostScriptAction 0x0006
+1 -1
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_08014154
BeginBlock
DoPostScriptAction 0x0007
_0807E930 0x0006
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething2 0x00000800
_0807E930 0x000a
+1 -1
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_08014198
BeginBlock
DoPostScriptAction 0x0007
_0807E930 0x0007
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething2 0x00001000
_0807E930 0x000b
+1 -1
View File
@@ -22,7 +22,7 @@ script_080143FA:
SetIntVariable 0x00000000
Call sub_08065528
_0807F034 0x0036
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x2c19
WaitUntilTextboxCloses
SetIntVariable 0x00000303
+1 -1
View File
@@ -233,7 +233,7 @@ script_0801478A:
Call sub_08088478
WaitUntilTextboxCloses
Call sub_080885B0
WaitPlayerAction8
WaitPlayerGetItem
_0807E5F8 0x00000008
Jump script_080147CE
script_080147A4:
+2 -2
View File
@@ -60,7 +60,7 @@ script_08014BF2:
WaitUntilTextboxCloses
SetIntVariable 0x00000064
_0807F034 0x003f
WaitPlayerAction8
WaitPlayerGetItem
Jump script_08014C22
script_08014C1C:
MessageNoOverlap 0x2f08
@@ -93,7 +93,7 @@ script_08014C56:
MessageNoOverlap 0x2f0d
WaitUntilTextboxCloses
_0807F034 0x000a
WaitPlayerAction8
WaitPlayerGetItem
Jump script_08014C82
script_08014C7C:
MessageNoOverlap 0x2f09
+2 -2
View File
@@ -38,7 +38,7 @@ script_08014E64:
_0807E48C 0x0020
JumpIfNot script_08014EB8
CallWithArg sub_0807F800, 0x00000022
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x0a04
Jump script_08014EBC
script_08014EB0:
@@ -117,7 +117,7 @@ script_08014F4A:
JumpIfNot script_08014FA2
ModRupees 0xff9c
_0807F034 0x0022
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x3b11
Jump script_08014FA6
script_08014F9A:
+1 -1
View File
@@ -1,4 +1,4 @@
SCRIPT_START script_08016062
SetEntityPosition 0xfff0, 0x0000
OffsetEntityPosition 0xfff0, 0x0000
SCRIPT_END
.2byte 0x0000
+1 -1
View File
@@ -1,4 +1,4 @@
SCRIPT_START script_0801609E
SetEntityPosition 0x0010, 0x0000
OffsetEntityPosition 0x0010, 0x0000
SCRIPT_END
.2byte 0x0000
+4 -4
View File
@@ -33,7 +33,7 @@ script_080160E0:
WaitUntilTextboxCloses
Jump script_08016132
script_0801610C:
WaitPlayerAction8
WaitPlayerGetItem
.ifndef EU
_0807EB8C
MessageFromTarget 0x2d0d
@@ -79,7 +79,7 @@ script_08016172:
MessageFromTarget 0x2d0b
Jump script_0801618A
script_08016184:
WaitPlayerAction8
WaitPlayerGetItem
MessageFromTarget 0x2d06
script_0801618A:
_0807E878
@@ -109,7 +109,7 @@ script_080161C6:
Jump script_080161E2
script_080161D8:
.ifndef EU
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807EB8C
MessageNoOverlap 0x2d06
@@ -205,7 +205,7 @@ script_0801631C:
Call sub_08068E30
WaitUntilTextboxCloses
Call sub_08068C6C
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
Jump script_08016346
script_08016332:
+1 -1
View File
@@ -61,7 +61,7 @@ SCRIPT_START script_08016384
Wait 0x001e
WaitForSomething 0x00000001
WaitForSomething2 0x00000002
WaitPlayerAction8
WaitPlayerGetItem
WaitForPlayerAction0x17
WaitFor_1
WaitFor_2
+1 -1
View File
@@ -225,7 +225,7 @@ script_0801690A:
WaitUntilTextboxCloses
JumpIfNot script_08016926
_0807F034 0x003d
WaitPlayerAction8
WaitPlayerGetItem
script_08016926:
_0807E878
SetGlobalFlag 0x005c