mirror of
https://github.com/zeldaret/tmc
synced 2026-07-09 23:01:43 -04:00
Merge remote-tracking branch 'upstream/master' into m
This commit is contained in:
@@ -1,20 +1,20 @@
|
||||
SCRIPT_START script_0800CD7C
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
CheckInventory1 0x005b
|
||||
JumpIfNot script_0800C5FE
|
||||
Call sub_08060090
|
||||
DoPostScriptAction 0x000a
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800CD92:
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
JumpIf script_0800CDA6
|
||||
Call sub_08060158
|
||||
Jump script_0800CD92
|
||||
script_0800CDA6:
|
||||
EndBlock
|
||||
_0807E864
|
||||
EndBlock
|
||||
_0807E864
|
||||
Call sub_0807DF28
|
||||
CheckLocalFlag 0x009d
|
||||
JumpIf script_0800CDC4
|
||||
@@ -43,7 +43,7 @@ script_0800CDEC:
|
||||
JumpIfNot script_0800CF40
|
||||
PlaySound SFX_TASK_COMPLETE
|
||||
_0807F088 0x0023
|
||||
WaitPlayerAction8
|
||||
WaitPlayerAction8
|
||||
Jump script_0800CE32
|
||||
script_0800CE14:
|
||||
_0807E48C 0x0022
|
||||
@@ -54,9 +54,9 @@ script_0800CE14:
|
||||
JumpIfNot script_0800CF40
|
||||
PlaySound SFX_TASK_COMPLETE
|
||||
_0807F088 0x0022
|
||||
WaitPlayerAction8
|
||||
WaitPlayerAction8
|
||||
script_0800CE32:
|
||||
_0807EB8C
|
||||
_0807EB8C
|
||||
SetGlobalFlag 0x0054
|
||||
Call sub_08060340
|
||||
MessageNoOverlap 0x213f
|
||||
@@ -83,8 +83,8 @@ script_0800CE6E:
|
||||
JumpIfNot script_0800CF40
|
||||
PlaySound SFX_TASK_COMPLETE
|
||||
_0807F088 0x0027
|
||||
WaitPlayerAction8
|
||||
_0807EB8C
|
||||
WaitPlayerAction8
|
||||
_0807EB8C
|
||||
SetGlobalFlag 0x0054
|
||||
Call sub_08060340
|
||||
MessageNoOverlap 0x2143
|
||||
@@ -111,80 +111,80 @@ script_0800CECE:
|
||||
JumpIfNot script_0800CF40
|
||||
PlaySound SFX_TASK_COMPLETE
|
||||
_0807F088 0x0024
|
||||
WaitPlayerAction8
|
||||
_0807EB8C
|
||||
WaitPlayerAction8
|
||||
_0807EB8C
|
||||
SetGlobalFlag 0x0054
|
||||
Call sub_08060340
|
||||
MessageNoOverlap 0x2147
|
||||
script_0800CF02:
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
script_0800CF0C:
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
JumpIf script_0800CF20
|
||||
Call sub_08060158
|
||||
Jump script_0800CF0C
|
||||
script_0800CF20:
|
||||
EndBlock
|
||||
_0807E864
|
||||
EndBlock
|
||||
_0807E864
|
||||
Call sub_0807DF28
|
||||
script_0800CF2A:
|
||||
MessageNoOverlap 0x2140
|
||||
_0807EA94
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800CF0C
|
||||
script_0800CF3C:
|
||||
MessageNoOverlap 0x214a
|
||||
script_0800CF40:
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800CD92
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_0800CF50
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
Call sub_08068104
|
||||
DoPostScriptAction 0x000a
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800CF5E:
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
JumpIf script_0800CF72
|
||||
Call sub_0806811C
|
||||
EndBlock
|
||||
EndBlock
|
||||
Jump script_0800CF5E
|
||||
script_0800CF72:
|
||||
EndBlock
|
||||
_0807E864
|
||||
EndBlock
|
||||
_0807E864
|
||||
Call sub_08068190
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800CF5E
|
||||
SCRIPT_START script_0800CF88
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
Call sub_08068104
|
||||
DoPostScriptAction 0x000a
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800CF96:
|
||||
_0807E944
|
||||
_0807E864
|
||||
_0807E944
|
||||
_0807E864
|
||||
Call sub_08068190
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800CF96
|
||||
SCRIPT_START script_0800CFAC
|
||||
BeginBlock
|
||||
_0807E9D4
|
||||
BeginBlock
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
_0807EB44 0x0004
|
||||
_0807E930 0x0000
|
||||
EndBlock
|
||||
EndBlock
|
||||
CheckInventory1 0x0041
|
||||
JumpIf script_0800CFD2
|
||||
CheckLocalFlag 0x007e
|
||||
@@ -202,17 +202,17 @@ script_0800CFEC:
|
||||
JumpIfNot script_0800CFFA
|
||||
_0807E5F8 0x00000010
|
||||
script_0800CFFA:
|
||||
EndBlock
|
||||
BeginBlock
|
||||
EndBlock
|
||||
BeginBlock
|
||||
Call sub_08068910
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800CFFA
|
||||
EndBlock
|
||||
_0807E864
|
||||
EndBlock
|
||||
_0807E864
|
||||
Call sub_0807DF28
|
||||
CheckInventory1 0x0002
|
||||
JumpIfNot script_0800D032
|
||||
_0807EB74
|
||||
_0807EB74
|
||||
SetIntVariable 0x00000000
|
||||
Call sub_0806C028
|
||||
MessageNoOverlap 0x1219
|
||||
@@ -222,7 +222,7 @@ script_0800D032:
|
||||
JumpIfNot script_0800D098
|
||||
StartPlayerScript script_0800D190
|
||||
WaitForSomething2 0x00000008
|
||||
_0807EB74
|
||||
_0807EB74
|
||||
SetIntVariable 0x00000000
|
||||
Call sub_0806C028
|
||||
MessageFromTargetPos 0x125c, 0x0002
|
||||
@@ -250,7 +250,7 @@ script_0800D0A8:
|
||||
WaitForSomething2 0x00000004
|
||||
_0807E5F8 0x00000001
|
||||
WaitForSomething2 0x00000004
|
||||
_0807EB74
|
||||
_0807EB74
|
||||
SetIntVariable 0x00000000
|
||||
Call sub_0806C028
|
||||
MessageFromTargetPos 0x123d, 0x0002
|
||||
@@ -288,9 +288,9 @@ script_0800D108:
|
||||
Call sub_08095164
|
||||
_0807EB28 0x1240
|
||||
script_0800D17C:
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Call sub_0807DF50
|
||||
Jump script_0800CFFA
|
||||
.2byte 0x0000
|
||||
|
||||
Reference in New Issue
Block a user