mirror of
https://github.com/zeldaret/tmc
synced 2026-07-11 07:25:23 -04:00
Merge remote-tracking branch 'upstream/master' into m
This commit is contained in:
@@ -1,26 +1,26 @@
|
||||
SCRIPT_START script_0801194C
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0002
|
||||
Jump script_0801196A
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_08011958
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0006
|
||||
Jump script_0801196A
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_08011964
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
script_0801196A:
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0801197C:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0801197C
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
CheckGlobalFlag 0x0015
|
||||
JumpIf script_080119A0
|
||||
@@ -29,80 +29,80 @@ script_0801197C:
|
||||
script_080119A0:
|
||||
MessageFromTarget 0x103f
|
||||
script_080119A4:
|
||||
_0807EA94
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0801197C
|
||||
SCRIPT_START script_080119B0
|
||||
BeginBlock
|
||||
_0807E9D4
|
||||
BeginBlock
|
||||
_0807E9D4
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x0000000c
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_080119C8:
|
||||
Wait 0x003c
|
||||
Call sub_0806407C
|
||||
Jump script_080119C8
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_080119D8
|
||||
BeginBlock
|
||||
SCRIPT_START script_080119D8
|
||||
BeginBlock
|
||||
_0807EB44 0x0002
|
||||
Jump script_080119F6
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_080119E4
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
Jump script_080119F6
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_080119F0
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0006
|
||||
script_080119F6:
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_08011A08:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_08011A08
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
Call sub_08064428
|
||||
_0807EA94
|
||||
_0807E878
|
||||
_0807EA94
|
||||
_0807E878
|
||||
Jump script_08011A08
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_08011A2C
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_08011A44:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_08011A44
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageFromTarget 0x1320
|
||||
_0807EA94
|
||||
_0807E878
|
||||
Jump script_08011A44
|
||||
SCRIPT_START script_08011A64
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0002
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_08011A7C:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_08011A7C
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
CallWithArg sub_080644B4, 0x00000006
|
||||
JumpIf script_08011AFA
|
||||
@@ -111,17 +111,17 @@ script_08011A7C:
|
||||
_0807E878
|
||||
Jump script_08011A7C
|
||||
.2byte 0x0000
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
DoPostScriptAction 0x000a
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_08011AC4:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_08011AC4
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageFromTarget 0x1322
|
||||
_0807EA94
|
||||
@@ -131,7 +131,7 @@ script_08011AC4:
|
||||
SCRIPT_START script_08011AE4
|
||||
CheckRoomFlag 0x000f
|
||||
JumpIfNot script_08011AE4
|
||||
_0807E864
|
||||
_0807E864
|
||||
Call sub_0807F9A4
|
||||
Call sub_0807DF28
|
||||
script_08011AFA:
|
||||
@@ -142,12 +142,16 @@ script_08011AFA:
|
||||
.else
|
||||
.ifdef EU
|
||||
SetLocalFlag 0x0011
|
||||
.else
|
||||
.ifdef DEMO_JP
|
||||
SetLocalFlag 0x0011 @ TODO deduplicate
|
||||
.else
|
||||
SetLocalFlag 0x0010
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
CallWithArg sub_0806DA1C, 0x00000003
|
||||
_0807E878
|
||||
_0807E878
|
||||
Call sub_0807DF50
|
||||
DoPostScriptAction 0x0006
|
||||
SCRIPT_END
|
||||
|
||||
Reference in New Issue
Block a user