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
+3 -3
View File
@@ -48,9 +48,9 @@ script_0800BA46:
JumpIfNot script_0800BA46
_0807E864
Call sub_0807DF28
TextboxNoOverlapFollow 0x3301
MessageFromTarget 0x3301
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_0800BA6C
StopBgm
Call sub_0806E964
@@ -77,7 +77,7 @@ script_0800BA8E:
Wait 0x001e
_0807EDD4 0x02f0, 0x0350
Wait 0x001e
TextboxNoOverlap 0x0e00
MessageNoOverlap 0x0e00
WaitUntilTextboxCloses
Wait 0x0078
Call sub_08054968