Merge remote-tracking branch 'upstream/master' into m

This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
440 changed files with 7319 additions and 11526 deletions
+14 -14
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_0800EFC0
BeginBlock
BeginBlock
SetEntitySpeed 0x0080
_0807E9D4
_0807E9D4
DoPostScriptAction 0x000a
CheckLocalFlag 0x007b
JumpIf script_0800F082
EndBlock
EndBlock
Jump script_0800EFFE
script_0800EFDA:
_0807EB44 0x0006
@@ -39,19 +39,19 @@ script_0800EFFE:
JumpIf script_0800F082
Jump script_0800EFDA
script_0800F082:
EndBlock
EndBlock
Call sub_0806AEE4
Jump script_0800F082
.2byte 0x0000
SCRIPT_START script_0800F090
BeginBlock
BeginBlock
_0807F0B4 0x0001
CameraTargetPlayer
EndBlock
CameraTargetPlayer
EndBlock
script_0800F09A:
CheckPlayerInRegion 0x01f8, 0x0338, 0x1030
JumpIfNot script_0800F09A
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
LoadRoomEntityList gUnk_080EE8AC
@@ -66,27 +66,27 @@ script_0800F09A:
MessageFromTargetPos 0x1202, 0x000c
_0807EA94
_0807F034 0x0067
WaitPlayerAction8
_0807E8E4_0
WaitPlayerAction8
_0807E8E4_0
_0807E5F8 0x00000002
WaitForSomething2 0x00000040
MessageFromTargetPos 0x1203, 0x000c
_0807EA94
_0807E5F8 0x00000002
Call sub_0807DF50
_0807E878
_0807E878
WaitForSomething2 0x00000040
script_0800F11A:
CheckKinstoneFused 0x0032
JumpIfNot script_0800F11A
_0807E864
_0807E864
Call sub_0807DF28
_0807E5F8 0x0000001e
Wait 0x003c
_0807E8E4_1
_0807E8E4_1
WaitForSomething2 0x000003c0
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000