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
+5 -5
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_08014CDC
EndBlock
WaitForSomething2 0x00000001
Call sub_08066E08
_0807E864
TextboxNoOverlapFollowPos 0x1010, 0x000c
_0807E864
MessageFromTargetPos 0x1010, 0x000c
WaitUntilTextboxCloses
_0807E5F8 0x00000002
script_08014D1E:
@@ -23,7 +23,7 @@ script_08014D1E:
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
TextboxNoOverlap 0x1012
MessageNoOverlap 0x1012
WaitUntilTextboxCloses
_0807EC64 0x0040
_0807EB44 0x0004
@@ -36,7 +36,7 @@ script_08014D60:
JumpIf script_08014D60
_0807E864
Call sub_0807DF28
TextboxNoOverlap 0x1013
MessageNoOverlap 0x1013
WaitUntilTextboxCloses
_0807EC64 0x0040
_0807EB44 0x0004
@@ -50,7 +50,7 @@ script_08014D96:
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
TextboxNoOverlap 0x1014
MessageNoOverlap 0x1014
WaitUntilTextboxCloses
_0807EC64 0x0018
.ifdef JP