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
+7 -7
View File
@@ -1,29 +1,29 @@
SCRIPT_START script_080145B0
BeginBlock
BeginBlock
SetEntityPositionRelative 0x01f8, 0x00e0
CheckLocalFlag 0x005e
JumpIf script_080145E4
EndBlock
EndBlock
script_080145C2:
CheckRoomFlag 0x0005
JumpIfNot script_080145C2
_0807E864
_0807E864
ClearRoomFlag 0x0005
.ifdef EU
Wait 0x0018
_0807E8E4_1
_0807E8E4_1
_0807EB44 0x0006
.else
Wait 0x000c
_0807EB8C
_0807EB8C
.endif
MessageFromTargetPos 0x432e, 0x000c
_0807EA94
.ifdef EU
Wait 0x0018
.endif
_0807E878
_0807E878
Jump script_080145C2
script_080145E4:
EndBlock
EndBlock
SCRIPT_END