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
+8 -8
View File
@@ -11,8 +11,8 @@ SCRIPT_START script_08011B40
_0807EB44 0x0006
DoPostScriptAction 0x0004
Wait 0x003c
_0807EB8C
TextboxNoOverlap 0x3d07
_0807EB8C
MessageNoOverlap 0x3d07
WaitUntilTextboxCloses
_0807EB44 0x0004
ClearGlobalFlag 0x0050
@@ -21,11 +21,11 @@ SCRIPT_START script_08011B40
script_08011B84:
CheckEntityInteractType
JumpIfNot script_08011B84
_0807E864
_0807EB74
TextboxNoOverlap 0x3d01
_0807E864
_0807EB74
MessageNoOverlap 0x3d01
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011BA4
script_08011B9A:
_0807E878
@@ -36,12 +36,12 @@ script_08011BA4:
JumpIf script_08011BBC
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x3d05
MessageNoOverlap 0x3d05
Jump script_08011B9A
script_08011BBC:
ModRupees 0xfff6
Wait 0x001e
TextboxNoOverlap 0x3d06
MessageNoOverlap 0x3d06
WaitUntilTextboxCloses
CallWithArg sub_0806C2A0, 0x00000000
WaitFor_2