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
+45 -21
View File
@@ -1,29 +1,37 @@
SCRIPT_START script_0800FF74
BeginBlock
BeginBlock
_0807EB44 0x0002
_0807E9D4
_0807E9D4
CallWithArg sub_0807F3D8, 0x00000008
Call sub_080644A4
.ifdef JP
ClearLocalFlag 0x00c4
.else
.ifdef DEMO_JP
ClearLocalFlag 0x00c4 @ TODO deduplicate
.else
.ifndef EU
ClearLocalFlag 0x00c7
.endif
.endif
EndBlock
.endif
EndBlock
script_0800FF92:
EndBlock
BeginBlock
EndBlock
BeginBlock
DoPostScriptAction 0x000a
.ifdef JP
CheckLocalFlag 0x00cb
.else
.ifdef EU
CheckLocalFlag 0x00cb
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00cb @ TODO deduplicate
.else
CheckLocalFlag 0x00ce
.endif
.endif
.endif
JumpIf script_0800FFCC
DoPostScriptAction 0x000b
@@ -33,9 +41,13 @@ script_0800FF92:
.else
.ifdef EU
CheckLocalFlag 0x00c4
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00c4 @ TODO deduplicate
.else
CheckLocalFlag 0x00c7
.endif
.endif
.endif
JumpIfNot script_0800FFCC
Call sub_08064488
@@ -44,20 +56,24 @@ script_0800FF92:
Call sub_08064470
JumpIf script_08010014
script_0800FFCC:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800FF92
EndBlock
EndBlock
.ifdef JP
SetLocalFlag 0x00c4
.else
.ifdef EU
SetLocalFlag 0x00c4
.else
.ifdef DEMO_JP
SetLocalFlag 0x00c4 @ TODO deduplicate
.else
SetLocalFlag 0x00c7
.endif
.endif
_0807E864
_0807EB74
.endif
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
CheckInventory1 0x0048
JumpIf script_0800FFF8
@@ -70,9 +86,13 @@ script_0800FFF8:
.else
.ifdef EU
CheckLocalFlag 0x00cb
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00cb @ TODO deduplicate
.else
CheckLocalFlag 0x00ce
.endif
.endif
.endif
JumpIfNot script_0801000A
MessageNoOverlap 0x340b
@@ -83,11 +103,11 @@ script_0801000A:
_0807EA94
Jump script_08010060
script_08010014:
EndBlock
_0807E888
EndBlock
_0807E888
Call sub_0807F594
_0807E864
_0807EB74
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
PlaySound SFX_TASK_COMPLETE
MessageNoOverlap 0x340a
@@ -103,32 +123,36 @@ script_08010014:
.else
.ifdef EU
SetLocalFlag 0x00cb
.else
.ifdef DEMO_JP
SetLocalFlag 0x00cb @ TODO deduplicate
.else
SetLocalFlag 0x00ce
.endif
.endif
.endif
script_08010060:
Call sub_080644A4
CallWithArg sub_0807F5B0, 0x0000000a
_0807E878
_0807E878
Jump script_0800FF92
.2byte 0x0000
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
_0807EB44 0x0004
CallWithArg sub_080672B0, 0x00000000
EndBlock
EndBlock
script_08010090:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08010090
_0807E864
_0807EB74
_0807E864
_0807EB74
CallWithArg sub_080672B0, 0x00000004
MessageFromTarget 0x0a01
_0807EA94
Wait 0x000f
_0807E878
_0807E878
_0807EB44 0x0004
CallWithArg sub_080672B0, 0x00000000
Jump script_08010090