mirror of
https://github.com/zeldaret/tmc
synced 2026-06-20 16:21:24 -04:00
Merge remote-tracking branch 'upstream/master' into m
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
SCRIPT_START script_08014CDC
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
SetEntitySpeed 0x0180
|
||||
DoPostScriptAction 0x000a
|
||||
Call sub_08066D04
|
||||
@@ -7,7 +7,7 @@ SCRIPT_START script_08014CDC
|
||||
SetEntityPositionRelative 0x01e8, 0x0180
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x0000
|
||||
EndBlock
|
||||
EndBlock
|
||||
WaitForSomething2 0x00000001
|
||||
Call sub_08066E08
|
||||
_0807E864
|
||||
@@ -15,12 +15,12 @@ SCRIPT_START script_08014CDC
|
||||
_0807EA94
|
||||
_0807E5F8 0x00000002
|
||||
script_08014D1E:
|
||||
EndBlock
|
||||
BeginBlock
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckPlayerInRegion 0x01d8, 0x0160, 0x3050
|
||||
JumpIfNot script_08014D1E
|
||||
EndBlock
|
||||
_0807E864
|
||||
EndBlock
|
||||
_0807E864
|
||||
Call sub_0807F9A4
|
||||
Call sub_0807DF28
|
||||
MessageNoOverlap 0x1012
|
||||
@@ -30,11 +30,11 @@ script_08014D1E:
|
||||
Call sub_08066E08
|
||||
SetEntityPositionRelative 0x01f8, 0x00c8
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
script_08014D60:
|
||||
CallWithArg sub_0807F6B4, 0x000000e8
|
||||
JumpIf script_08014D60
|
||||
_0807E864
|
||||
_0807E864
|
||||
Call sub_0807DF28
|
||||
MessageNoOverlap 0x1013
|
||||
_0807EA94
|
||||
@@ -43,11 +43,11 @@ script_08014D60:
|
||||
DoPostScriptAction 0x0000
|
||||
SetEntityPositionRelative 0x01e8, 0x0028
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
script_08014D96:
|
||||
CheckPlayerInRegion 0x01f8, 0x0028, 0x2040
|
||||
JumpIfNot script_08014D96
|
||||
_0807E864
|
||||
_0807E864
|
||||
Call sub_0807F9A4
|
||||
Call sub_0807DF28
|
||||
MessageNoOverlap 0x1014
|
||||
@@ -58,11 +58,15 @@ script_08014D96:
|
||||
.else
|
||||
.ifdef EU
|
||||
SetLocalFlag 0x006b
|
||||
.else
|
||||
.ifdef DEMO_JP
|
||||
SetLocalFlag 0x006b @ TODO deduplicate
|
||||
.else
|
||||
SetLocalFlag 0x006d
|
||||
.endif
|
||||
.endif
|
||||
.endif
|
||||
Call sub_0807DF50
|
||||
_0807E878
|
||||
_0807E878
|
||||
DoPostScriptAction 0x0006
|
||||
SCRIPT_END
|
||||
|
||||
Reference in New Issue
Block a user