Merge branch 'master' into asset-extraction

This commit is contained in:
octorock
2021-11-06 00:33:07 +01:00
413 changed files with 6686 additions and 12843 deletions
+9 -9
View File
@@ -24,10 +24,10 @@ script_0801197C:
CallWithArg sub_0807F3D8, 0x00000000
CheckGlobalFlag 0x0015
JumpIf script_080119A0
TextboxNoOverlapFollow 0x103d
MessageFromTarget 0x103d
Jump script_080119A4
script_080119A0:
TextboxNoOverlapFollow 0x103f
MessageFromTarget 0x103f
script_080119A4:
WaitUntilTextboxCloses
Wait 0x000f
@@ -87,9 +87,9 @@ script_08011A44:
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000000
TextboxNoOverlapFollow 0x1320
MessageFromTarget 0x1320
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_08011A44
SCRIPT_START script_08011A64
BeginBlock
@@ -106,9 +106,9 @@ script_08011A7C:
CallWithArg sub_0807F3D8, 0x00000000
CallWithArg sub_080644B4, 0x00000006
JumpIf script_08011AFA
TextboxNoOverlapFollow 0x1320
MessageFromTarget 0x1320
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_08011A7C
.2byte 0x0000
BeginBlock
@@ -123,9 +123,9 @@ script_08011AC4:
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000000
TextboxNoOverlapFollow 0x1322
MessageFromTarget 0x1322
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_08011AC4
SCRIPT_START script_08011AE4
@@ -135,7 +135,7 @@ SCRIPT_START script_08011AE4
Call sub_0807F9A4
Call sub_0807DF28
script_08011AFA:
TextboxNoOverlapFollowPos 0x1321, 0x0007
MessageFromTargetPos 0x1321, 0x0007
WaitUntilTextboxCloses
.ifdef JP
SetLocalFlag 0x0011