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
+3 -3
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_08010F84
WaitForSomething2 0x00000200
StartPlayerScript script_080110BC
WaitForSomething2 0x00000400
TextboxNoOverlapFollowPos 0x1047, 0x0000
MessageFromTargetPos 0x1047, 0x0000
WaitUntilTextboxCloses
Call sub_0806DC3C
Call sub_080791BC
@@ -28,11 +28,11 @@ SCRIPT_START script_08010F84
WaitForSomething2 0x00000020
StopBgm
Wait 0x003c
TextboxNoOverlapFollowPos 0x104a, 0x0000
MessageFromTargetPos 0x104a, 0x0000
WaitUntilTextboxCloses
_0807E5F8 0x00000100
WaitForSomething2 0x00000200
TextboxNoOverlapFollowPos 0x1049, 0x0000
MessageFromTargetPos 0x1049, 0x0000
WaitUntilTextboxCloses
SetEntityPositionRelative 0x01f8, 0x0098
Wait 0x0078