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
@@ -7,11 +7,11 @@ SCRIPT_START script_0800B5EC
script_0800B5FA:
CheckEntityInteractType
JumpIfNot script_0800B5FA
_0807E864
_0807EB74
TextboxNoOverlap 0x2009
_0807E864
_0807EB74
MessageNoOverlap 0x2009
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
Jump script_0800B5FA
SCRIPT_START script_0800B614
@@ -29,19 +29,19 @@ script_0800B618:
WaitForSomething2 0x00000004
CheckLocalFlag 0x009e
JumpIf script_0800B7A2
TextboxNoOverlap 0x0583
MessageNoOverlap 0x0583
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_0800B684
Wait 0x000f
TextboxNoOverlap 0x0584
MessageNoOverlap 0x0584
CallWithArg sub_0807F970, 0x0000058b
JumpIf script_0800B68E
CallWithArg sub_08087424, 0x00000000
Wait 0x00b4
Jump script_0800B6A6
script_0800B684:
TextboxNoOverlap 0x057d
MessageNoOverlap 0x057d
WaitUntilTextboxCloses
Jump script_0800B6A6
script_0800B68E:
@@ -52,7 +52,7 @@ script_0800B698:
WaitPlayerAction8
_0807EB8C
Wait 0x001e
TextboxNoOverlap 0x057f
MessageNoOverlap 0x057f
WaitUntilTextboxCloses
script_0800B6A6:
_0807E778 0x0004