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
@@ -17,14 +17,14 @@ SCRIPT_START script_0800939A
JumpIf script_080093BC
CheckInventory1 0x000e
JumpIf script_080093BC
TextboxNoOverlap 0x1d02
MessageNoOverlap 0x1d02
WaitUntilTextboxCloses
Jump script_08009376
script_080093BC:
CheckInventory1 0x000e
JumpIfNot script_080093DA
Call sub_0806D788
TextboxNoOverlap 0x1d03
MessageNoOverlap 0x1d03
WaitUntilTextboxCloses
Call sub_0806D70C
Jump script_08009376
@@ -46,12 +46,12 @@ script_080093DA:
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
TextboxNoOverlapVar
MessageNoOverlapVar
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_08009376
Wait 0x001e
TextboxNoOverlap 0x1d08
MessageNoOverlap 0x1d08
WaitUntilTextboxCloses
LoadRoomEntityList gUnk_080F9C38
Wait 0x0078
@@ -77,19 +77,19 @@ script_080093EE:
.endif
.endif
Call sub_0806D5D4
_0807EB8C
TextboxNoOverlap 0x1d09
_0807EB8C
MessageNoOverlap 0x1d09
WaitUntilTextboxCloses
Wait 0x000a
Jump script_08009376
script_0800943E:
Call sub_0806D600
JumpIf script_08009452
TextboxNoOverlap 0x1d0a
MessageNoOverlap 0x1d0a
WaitUntilTextboxCloses
JumpIfNot script_08009376
script_08009452:
TextboxNoOverlap 0x1d0b
MessageNoOverlap 0x1d0b
WaitUntilTextboxCloses
Call sub_0806D74C
_0807F0C8 0xffff, 0x0000