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
+7 -7
View File
@@ -6,9 +6,9 @@ SCRIPT_START script_080143C0
_0807E930 0x0001
Call sub_080654EC
Wait 0x003c
TextboxNoOverlap 0x2c16
MessageNoOverlap 0x2c16
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_080143FA
SetIntVariable 0x00000002
Call sub_08065528
@@ -16,21 +16,21 @@ SCRIPT_START script_080143C0
script_080143FA:
Call sub_080654EC
Wait 0x001e
TextboxNoOverlap 0x2c18
MessageNoOverlap 0x2c18
WaitUntilTextboxCloses
Wait 0x000a
SetIntVariable 0x00000000
Call sub_08065528
_0807F034 0x0036
WaitPlayerAction8
TextboxNoOverlap 0x2c19
WaitPlayerAction8
MessageNoOverlap 0x2c19
WaitUntilTextboxCloses
SetIntVariable 0x00000303
Call sub_0807F420
.ifndef EU
Wait 0x001e
_0807EB8C
TextboxNoOverlap 0x2c22
_0807EB8C
MessageNoOverlap 0x2c22
WaitUntilTextboxCloses
.endif
script_0801443E: