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
+6 -6
View File
@@ -13,15 +13,15 @@ SCRIPT_START script_0800AB6E
Wait 0x003c
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
TextboxNoOverlapFollowPos 0x165f, 0x000e
MessageFromTargetPos 0x165f, 0x000e
WaitUntilTextboxCloses
StartPlayerScript script_0800ACBC
WaitForSomething2 0x00000001
TextboxNoOverlapFollowPos 0x1660, 0x000e
MessageFromTargetPos 0x1660, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
TextboxNoOverlapFollowPos 0x1661, 0x000e
MessageFromTargetPos 0x1661, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000008
_0807E5F8 0x00000002
@@ -32,9 +32,9 @@ SCRIPT_START script_0800AB6E
StartPlayerScript script_0800ACE0
WaitForSomething2 0x00000001
Wait 0x003c
TextboxNoOverlapFollowPos 0x1662, 0x000e
MessageFromTargetPos 0x1662, 0x000e
WaitUntilTextboxCloses
TextboxNoOverlapFollowPos 0x1663, 0x000e
MessageFromTargetPos 0x1663, 0x000e
WaitUntilTextboxCloses
SetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
@@ -45,7 +45,7 @@ SCRIPT_START script_0800AB6E
StartPlayerScript script_0800AD54
WaitForSomething2 0x00000001
Wait 0x003c
TextboxNoOverlapFollowPos 0x1665, 0x000e
MessageFromTargetPos 0x1665, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000002
WaitForSomething2 0x00000004