mirror of
https://github.com/zeldaret/tmc
synced 2026-08-13 20:24:59 -04:00
Merge remote-tracking branch 'upstream/master' into m
This commit is contained in:
theo3
@@ -1,16 +1,16 @@
|
||||
SCRIPT_START script_0800E0BC
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CheckLocalFlag 0x0093
|
||||
JumpIf script_0800E12E
|
||||
_0807E930 0x0008
|
||||
CallWithArg sub_0807F8E8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800E0DE:
|
||||
CheckRoomFlag 0x0000
|
||||
JumpIfNot script_0800E0DE
|
||||
_0807E864
|
||||
_0807E864
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0010
|
||||
PlaySound SFX_1C9
|
||||
@@ -24,40 +24,40 @@ script_0800E0DE:
|
||||
DoPostScriptAction 0x0004
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0000
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
Wait 0x000a
|
||||
MessageNoOverlap 0x2402
|
||||
_0807EA94
|
||||
SetLocalFlag 0x0093
|
||||
script_0800E12E:
|
||||
Call sub_080668F0
|
||||
_0807E878
|
||||
EndBlock
|
||||
_0807E878
|
||||
EndBlock
|
||||
script_0800E138:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E138
|
||||
_0807E864
|
||||
_0807EB74
|
||||
MessageNoOverlap 0x2402
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800E138
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_0800E154
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CheckLocalFlag 0x0094
|
||||
JumpIf script_0800E1D0
|
||||
_0807E930 0x0010
|
||||
CallWithArg sub_0807F8E8, 0x00000001
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800E176:
|
||||
CheckRoomFlag 0x0001
|
||||
JumpIfNot script_0800E176
|
||||
_0807E864
|
||||
_0807E864
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0010
|
||||
PlaySound SFX_1C9
|
||||
@@ -71,8 +71,8 @@ script_0800E176:
|
||||
DoPostScriptAction 0x0004
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0000
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
Wait 0x000a
|
||||
MessageNoOverlap 0x2401
|
||||
@@ -80,42 +80,42 @@ script_0800E176:
|
||||
SetLocalFlag 0x0094
|
||||
script_0800E1D0:
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
script_0800E1E0:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E1E0
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageNoOverlap 0x2401
|
||||
_0807EA94
|
||||
_0807E878
|
||||
Jump script_0800E1E0
|
||||
SCRIPT_START script_0800E200
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
SetEntitySpeed 0x0100
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CheckLocalFlag 0x0073
|
||||
JumpIfNot script_0800E232
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
SetEntityPositionRelative 0x0070, 0x0168
|
||||
_0807EB44 0x0002
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
Jump script_0800E32E
|
||||
script_0800E232:
|
||||
CheckLocalFlag 0x0095
|
||||
JumpIf script_0800E29A
|
||||
_0807E930 0x0010
|
||||
CallWithArg sub_0807F8E8, 0x00000002
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800E24A:
|
||||
CheckRoomFlag 0x0002
|
||||
JumpIfNot script_0800E24A
|
||||
_0807E864
|
||||
_0807E864
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0010
|
||||
PlaySound SFX_1C9
|
||||
@@ -129,20 +129,20 @@ script_0800E24A:
|
||||
DoPostScriptAction 0x0004
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0000
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
_0807EB8C
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
SetLocalFlag 0x0095
|
||||
script_0800E29A:
|
||||
DoPostScriptAction 0x0000
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
script_0800E2AE:
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
EndBlock
|
||||
BeginBlock
|
||||
CheckEntityInteractType
|
||||
JumpIf script_0800E312
|
||||
CheckLocalFlag 0x0093
|
||||
JumpIfNot script_0800E2AE
|
||||
@@ -150,22 +150,22 @@ script_0800E2AE:
|
||||
JumpIfNot script_0800E2AE
|
||||
CheckLocalFlag 0x0095
|
||||
JumpIfNot script_0800E2AE
|
||||
_0807E9DC
|
||||
_0807E9DC
|
||||
SetLocalFlag 0x0073
|
||||
EndBlock
|
||||
EndBlock
|
||||
_0807EB44 0x0000
|
||||
CallWithArg sub_0807F3D8, 0x00000004
|
||||
_0807EDD4 0x0088, 0x0168
|
||||
_0807EB44 0x0006
|
||||
CallWithArg sub_0807F3D8, 0x00000004
|
||||
_0807EDD4 0x0070, 0x0168
|
||||
_0807EB74
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
_0807E9D4
|
||||
_0807E9D4
|
||||
Jump script_0800E32E
|
||||
script_0800E312:
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
EndBlock
|
||||
MessageNoOverlap 0x2404
|
||||
@@ -173,10 +173,10 @@ script_0800E312:
|
||||
_0807E878
|
||||
Jump script_0800E2AE
|
||||
script_0800E32E:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E32E
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageNoOverlap 0x2403
|
||||
_0807EA94
|
||||
@@ -184,7 +184,7 @@ script_0800E32E:
|
||||
Jump script_0800E32E
|
||||
.2byte 0x0000
|
||||
SCRIPT_START script_0800E350
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
DoPostScriptAction 0x000a
|
||||
CheckLocalFlag 0x0071
|
||||
@@ -193,11 +193,11 @@ SCRIPT_START script_0800E350
|
||||
JumpIf script_0800E3BE
|
||||
_0807E930 0x000c
|
||||
CallWithArg sub_0807F8E8, 0x00000000
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800E37A:
|
||||
CheckRoomFlag 0x0000
|
||||
JumpIfNot script_0800E37A
|
||||
_0807E864
|
||||
_0807E864
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0010
|
||||
PlaySound SFX_1C9
|
||||
@@ -211,15 +211,15 @@ script_0800E37A:
|
||||
DoPostScriptAction 0x0004
|
||||
Wait 0x001e
|
||||
DoPostScriptAction 0x0000
|
||||
_0807EB74
|
||||
_0807EB74
|
||||
SetLocalFlag 0x0096
|
||||
script_0800E3BE:
|
||||
DoPostScriptAction 0x0000
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
script_0800E3C8:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E3C8
|
||||
_0807E864
|
||||
_0807EB74
|
||||
@@ -227,68 +227,68 @@ script_0800E3C8:
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807F034 0x0053
|
||||
WaitPlayerAction8
|
||||
WaitPlayerAction8
|
||||
SetLocalFlag 0x0071
|
||||
_0807E878
|
||||
_0807E878
|
||||
script_0800E3E8:
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
_0807E878
|
||||
EndBlock
|
||||
script_0800E3EE:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E3EE
|
||||
_0807E864
|
||||
_0807EB74
|
||||
MessageNoOverlap 0x240d
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800E3EE
|
||||
SCRIPT_START script_0800E408
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0002
|
||||
DoPostScriptAction 0x000a
|
||||
Call sub_080668F0
|
||||
EndBlock
|
||||
EndBlock
|
||||
script_0800E41A:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E41A
|
||||
_0807E864
|
||||
_0807EB74
|
||||
MessageNoOverlap 0x2406
|
||||
_0807EA94
|
||||
Wait 0x000f
|
||||
_0807E878
|
||||
_0807E878
|
||||
Jump script_0800E41A
|
||||
SCRIPT_START script_0800E434
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0002
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
DoPostScriptAction 0x000a
|
||||
_0807E9D4
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
EndBlock
|
||||
script_0800E44C:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E44C
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageNoOverlap 0x2405
|
||||
_0807EA94
|
||||
_0807E878
|
||||
Jump script_0800E44C
|
||||
SCRIPT_START script_0800E46C
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807EB44 0x0004
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
DoPostScriptAction 0x000a
|
||||
_0807E9D4
|
||||
EndBlock
|
||||
_0807E9D4
|
||||
EndBlock
|
||||
script_0800E484:
|
||||
CheckEntityInteractType
|
||||
CheckEntityInteractType
|
||||
JumpIfNot script_0800E484
|
||||
_0807E864
|
||||
_0807EB74
|
||||
_0807E864
|
||||
_0807EB74
|
||||
CallWithArg sub_0807F3D8, 0x00000000
|
||||
MessageNoOverlap 0x2407
|
||||
_0807EA94
|
||||
@@ -297,9 +297,9 @@ script_0800E484:
|
||||
|
||||
|
||||
SCRIPT_START script_0800E4A4
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
Call sub_0807F354
|
||||
EndBlock
|
||||
EndBlock
|
||||
CheckLocalFlag 0x007c
|
||||
JumpIf script_0800E4FA
|
||||
script_0800E4B6:
|
||||
@@ -313,16 +313,18 @@ script_0800E4B6:
|
||||
.endif
|
||||
.endif
|
||||
JumpIfNot script_0800E4B6
|
||||
BeginBlock
|
||||
BeginBlock
|
||||
_0807E864
|
||||
.ifdef JP
|
||||
.ifndef DEMO_JP
|
||||
Call sub_0805E544
|
||||
.endif
|
||||
.else
|
||||
.ifdef EU
|
||||
Call sub_0805E544
|
||||
.endif
|
||||
.endif
|
||||
EndBlock
|
||||
EndBlock
|
||||
Call sub_0807F3F8
|
||||
Wait 0x003c
|
||||
MessageFromTarget 0x160c
|
||||
@@ -333,19 +335,21 @@ script_0800E4B6:
|
||||
Wait 0x001e
|
||||
_0807EB28 0x160e
|
||||
Wait 0x003c
|
||||
_0807EA94
|
||||
BeginBlock
|
||||
_0807EA94
|
||||
BeginBlock
|
||||
PlayBgm BGM_FIGHT_THEME2
|
||||
SetLocalFlag 0x007c
|
||||
.ifdef JP
|
||||
.ifndef DEMO_JP
|
||||
Call UnfreezeTime
|
||||
.endif
|
||||
.else
|
||||
.ifdef EU
|
||||
Call UnfreezeTime
|
||||
.endif
|
||||
.endif
|
||||
script_0800E4FA:
|
||||
_0807E878
|
||||
_0807E878
|
||||
DoPostScriptAction 0x0006
|
||||
EndBlock
|
||||
EndBlock
|
||||
SCRIPT_END
|
||||
|
||||
Reference in New Issue
Block a user