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
@@ -77,7 +77,7 @@ script_0800FFCC:
CallWithArg sub_0807F3D8, 0x00000008
CheckInventory1 0x0048
JumpIf script_0800FFF8
TextboxNoOverlap 0x3401
MessageNoOverlap 0x3401
WaitUntilTextboxCloses
Jump script_08010060
script_0800FFF8:
@@ -95,11 +95,11 @@ script_0800FFF8:
.endif
.endif
JumpIfNot script_0801000A
TextboxNoOverlap 0x340b
MessageNoOverlap 0x340b
WaitUntilTextboxCloses
Jump script_08010060
script_0801000A:
TextboxNoOverlap 0x3402
MessageNoOverlap 0x3402
WaitUntilTextboxCloses
Jump script_08010060
script_08010014:
@@ -110,7 +110,7 @@ script_08010014:
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
PlaySound SFX_TASK_COMPLETE
TextboxNoOverlap 0x340a
MessageNoOverlap 0x340a
WaitUntilTextboxCloses
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x0000000c
@@ -149,7 +149,7 @@ script_08010090:
_0807E864
_0807EB74
CallWithArg sub_080672B0, 0x00000004
TextboxNoOverlapFollow 0x0a01
MessageFromTarget 0x0a01
WaitUntilTextboxCloses
Wait 0x000f
_0807E878