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
+12 -4
View File
@@ -4,9 +4,13 @@ SCRIPT_START script_0800FD0C
.else
.ifdef EU
CheckLocalFlag 0x00ca
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ca @ TODO deduplicate
.else
CheckLocalFlag 0x00cd
.endif
.endif
.endif
JumpIf script_0800FD50
WaitForSomething2 0x00000010
@@ -18,29 +22,33 @@ script_0800FD1A:
.else
.ifdef EU
CheckLocalFlag 0x00ca
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ca @ TODO deduplicate
.else
CheckLocalFlag 0x00cd
.endif
.endif
.endif
JumpIf script_0800FD5C
_0807E864
_0807E864
Call sub_0807F9A4
MessageFromTargetPos 0x2506, 0x0000
_0807EA94
StartPlayerScript script_0800FD80
WaitForSomething2 0x00000008
_0807E878
_0807E878
Jump script_0800FD1A
script_0800FD50:
CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
JumpIfNot script_0800FD50
script_0800FD5C:
_0807E864
_0807E864
Call sub_0807F9A4
MessageFromTargetPos 0x106c, 0x0000
_0807EA94
StartPlayerScript script_0800FD80
WaitForSomething2 0x00000008
_0807E878
_0807E878
Jump script_0800FD50
.2byte 0x0000