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
+55 -55
View File
@@ -16,9 +16,9 @@ script_08011C9A:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4515
MessageNoOverlap 0x4515
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08011C9A
@@ -35,9 +35,9 @@ script_08011CC2:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x3105
MessageNoOverlap 0x3105
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011D0E
_0807E878
_0807EB44 0x0004
@@ -50,7 +50,7 @@ script_08011D00:
_0807EB74
DoPostScriptAction 0x0000
script_08011D0E:
TextboxNoOverlap 0x3108
MessageNoOverlap 0x3108
WaitUntilTextboxCloses
SetGlobalFlag 0x002b
_0807E878
@@ -76,9 +76,9 @@ script_08011D46:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4513
MessageNoOverlap 0x4513
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08011D46
@@ -95,9 +95,9 @@ script_08011D6E:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x3103
MessageNoOverlap 0x3103
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011DBA
_0807E878
_0807EB44 0x0004
@@ -110,7 +110,7 @@ script_08011DAC:
_0807EB74
DoPostScriptAction 0x0000
script_08011DBA:
TextboxNoOverlap 0x3106
MessageNoOverlap 0x3106
WaitUntilTextboxCloses
SetGlobalFlag 0x002c
_0807E878
@@ -136,9 +136,9 @@ script_08011DF2:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4514
MessageNoOverlap 0x4514
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08011DF2
@@ -155,9 +155,9 @@ script_08011E1A:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x3104
MessageNoOverlap 0x3104
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011E66
_0807E878
_0807EB44 0x0004
@@ -170,7 +170,7 @@ script_08011E58:
_0807EB74
DoPostScriptAction 0x0000
script_08011E66:
TextboxNoOverlap 0x3107
MessageNoOverlap 0x3107
WaitUntilTextboxCloses
SetGlobalFlag 0x002d
_0807E878
@@ -200,13 +200,13 @@ script_08011E96:
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
JumpIf script_08011ECC
TextboxNoOverlap 0x4524
MessageNoOverlap 0x4524
WaitUntilTextboxCloses
Jump script_08011ED8
script_08011ECC:
TextboxNoOverlap 0x3111
MessageNoOverlap 0x3111
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011EF4
script_08011ED8:
_0807E878
@@ -220,7 +220,7 @@ script_08011EE6:
_0807EB74
DoPostScriptAction 0x0000
script_08011EF4:
TextboxNoOverlap 0x3114
MessageNoOverlap 0x3114
WaitUntilTextboxCloses
SetGlobalFlag 0x002e
_0807E878
@@ -249,13 +249,13 @@ script_08011F22:
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
JumpIf script_08011F58
TextboxNoOverlap 0x4522
MessageNoOverlap 0x4522
WaitUntilTextboxCloses
Jump script_08011F64
script_08011F58:
TextboxNoOverlap 0x310f
MessageNoOverlap 0x310f
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_08011F80
script_08011F64:
_0807E878
@@ -269,7 +269,7 @@ script_08011F72:
_0807EB74
DoPostScriptAction 0x0000
script_08011F80:
TextboxNoOverlap 0x3112
MessageNoOverlap 0x3112
WaitUntilTextboxCloses
SetGlobalFlag 0x002f
_0807E878
@@ -298,13 +298,13 @@ script_08011FAE:
DoPostScriptAction 0x0000
CheckGlobalFlag 0x0048
JumpIf script_08011FE4
TextboxNoOverlap 0x4523
MessageNoOverlap 0x4523
WaitUntilTextboxCloses
Jump script_08011FF0
script_08011FE4:
TextboxNoOverlap 0x3110
MessageNoOverlap 0x3110
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_0801200C
script_08011FF0:
_0807E878
@@ -318,7 +318,7 @@ script_08011FFE:
_0807EB74
DoPostScriptAction 0x0000
script_0801200C:
TextboxNoOverlap 0x3113
MessageNoOverlap 0x3113
WaitUntilTextboxCloses
SetGlobalFlag 0x0030
_0807E878
@@ -342,24 +342,24 @@ script_0801203A:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0094
JumpIf script_0801205E
TextboxNoOverlap 0x3122
MessageNoOverlap 0x3122
WaitUntilTextboxCloses
SetLocalFlag 0x0094
Jump script_0801209E
script_0801205E:
_0807E48C 0x0031
JumpIfNot script_08012070
TextboxNoOverlap 0x3123
MessageNoOverlap 0x3123
WaitUntilTextboxCloses
Jump script_0801209E
script_08012070:
TextboxNoOverlap 0x3124
MessageNoOverlap 0x3124
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_0801209E
_0807E48C 0x0020
JumpIfNot script_0801209A
TextboxNoOverlap 0x3125
MessageNoOverlap 0x3125
WaitUntilTextboxCloses
_0807F034 0x0031
WaitPlayerAction8
@@ -376,7 +376,7 @@ script_08012070:
.endif
Jump script_0801209E
script_0801209A:
TextboxNoOverlap 0x3127
MessageNoOverlap 0x3127
script_0801209E:
WaitUntilTextboxCloses
_0807E878
@@ -400,24 +400,24 @@ script_080120C6:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0095
JumpIf script_080120EA
TextboxNoOverlap 0x3116
MessageNoOverlap 0x3116
WaitUntilTextboxCloses
SetLocalFlag 0x0095
Jump script_0801212A
script_080120EA:
_0807E48C 0x002f
JumpIfNot script_080120FC
TextboxNoOverlap 0x3117
MessageNoOverlap 0x3117
WaitUntilTextboxCloses
Jump script_0801212A
script_080120FC:
TextboxNoOverlap 0x3118
MessageNoOverlap 0x3118
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_0801212A
_0807E48C 0x0020
JumpIfNot script_08012126
TextboxNoOverlap 0x3119
MessageNoOverlap 0x3119
WaitUntilTextboxCloses
_0807F034 0x002f
WaitPlayerAction8
@@ -434,7 +434,7 @@ script_080120FC:
.endif
Jump script_0801212A
script_08012126:
TextboxNoOverlap 0x311b
MessageNoOverlap 0x311b
script_0801212A:
WaitUntilTextboxCloses
_0807E878
@@ -458,24 +458,24 @@ script_08012152:
DoPostScriptAction 0x0000
CheckLocalFlag 0x0096
JumpIf script_08012176
TextboxNoOverlap 0x311c
MessageNoOverlap 0x311c
WaitUntilTextboxCloses
SetLocalFlag 0x0096
Jump script_080121B6
script_08012176:
_0807E48C 0x0030
JumpIfNot script_08012188
TextboxNoOverlap 0x311d
MessageNoOverlap 0x311d
WaitUntilTextboxCloses
Jump script_080121B6
script_08012188:
TextboxNoOverlap 0x311e
MessageNoOverlap 0x311e
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_080121B6
_0807E48C 0x0020
JumpIfNot script_080121B2
TextboxNoOverlap 0x311f
MessageNoOverlap 0x311f
WaitUntilTextboxCloses
_0807F034 0x0030
WaitPlayerAction8
@@ -492,7 +492,7 @@ script_08012188:
.endif
Jump script_080121B6
script_080121B2:
TextboxNoOverlap 0x3121
MessageNoOverlap 0x3121
script_080121B6:
WaitUntilTextboxCloses
_0807E878
@@ -514,9 +514,9 @@ script_080121DE:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4527
MessageNoOverlap 0x4527
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_080121DE
@@ -533,9 +533,9 @@ script_08012216:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4525
MessageNoOverlap 0x4525
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08012216
@@ -552,9 +552,9 @@ script_0801224E:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlap 0x4526
MessageNoOverlap 0x4526
WaitUntilTextboxCloses
_0807E878
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_0801224E
@@ -579,9 +579,9 @@ script_08012298:
_0807EB74
_0807E864
Call sub_08061FD8
TextboxNoOverlapFollow 0x2302
MessageFromTarget 0x2302
WaitUntilTextboxCloses
_0807E878
_0807E878
SetGlobalFlag 0x001e
Jump script_08012284
script_080122BA:
@@ -598,9 +598,9 @@ script_080122CE:
_0807EB74
_0807E864
Call sub_08061FD8
TextboxNoOverlapFollow 0x2303
MessageFromTarget 0x2303
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_080122BA
script_080122EC:
EndBlock