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
@@ -30,8 +30,8 @@ SCRIPT_START script_080131AC
Call sub_080536B8
_0807E864
Call sub_0807DF28
WaitFor_2
TextboxNoOverlapFollowPos 0x1602, 0x000c
WaitFor_2
MessageFromTargetPos 0x1602, 0x000c
WaitUntilTextboxCloses
_0807E5F8 0x00000008
WaitForSomething2 0x00000010
@@ -45,11 +45,11 @@ SCRIPT_START script_080131AC
StartPlayerScript script_08013378
_0807E5F8 0x00000020
WaitForSomething2 0x00000042
TextboxNoOverlapFollowPos 0x1603, 0x000c
MessageFromTargetPos 0x1603, 0x000c
WaitUntilTextboxCloses
_0807E5F8 0x00000020
WaitForSomething2 0x00000040
_0807E788 0xffff7fff
SetFadeMask 0xffff7fff
_0807E778 0x0004
DoFade5
WaitFor_2
@@ -58,9 +58,9 @@ SCRIPT_START script_080131AC
Wait 0x003c
CameraTargetPlayer
Call sub_0807F5C0
TextboxNoOverlapFollowPos 0x1604, 0x0007
MessageFromTargetPos 0x1604, 0x0007
WaitUntilTextboxCloses
_0807E788 0xffffffff
SetFadeMask 0xffffffff
_0807E778 0x0004
DoFade4
WaitFor_2