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
+9 -5
View File
@@ -1,20 +1,24 @@
SCRIPT_START script_08015B34
EndBlock
BeginBlock
EndBlock
BeginBlock
.ifdef JP
CheckLocalFlag 0x0089
.else
.ifdef EU
CheckLocalFlag 0x0089
.else
.ifdef DEMO_JP
CheckLocalFlag 0x0089 @ TODO deduplicate
.else
CheckLocalFlag 0x008b
.endif
.endif
.endif
JumpIf script_08015B7E
CallWithArg sub_0807F6B4, 0x00000318
JumpIfNot script_08015B34
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
MessageFromTargetPos 0x2506, 0x0002
@@ -22,7 +26,7 @@ SCRIPT_START script_08015B34
StartPlayerScript script_08015B84
WaitForSomething2 0x00000004
Call sub_0807DF50
_0807E878
_0807E878
Jump script_08015B34
script_08015B7E:
DoPostScriptAction 0x0006