Merge branch 'master' into demo-jp

This commit is contained in:
octorock
2021-11-01 16:55:04 +01:00
110 changed files with 709 additions and 723 deletions
+2 -2
View File
@@ -31,7 +31,7 @@ script_08012368:
StopBgm
BeginBlock
_0807E778 0x0004
_0807E788 0x00007fff
SetFadeMask 0x00007fff
DoFade5
_0807E858 0x0080
EndBlock
@@ -55,7 +55,7 @@ script_08012368:
Wait 0x003c
BeginBlock
_0807E778 0x0004
_0807E788 0xffffffff
SetFadeMask 0xffffffff
DoFade4
_0807E858 0x0080
EndBlock
+1 -1
View File
@@ -77,7 +77,7 @@ script_0801248A:
MoveEntityToPlayer
Call sub_0807F844
CameraTargetPlayer
_0807E788 0xffffffff
SetFadeMask 0xffffffff
_0807E778 0x0004
_0807E800 0x00000000
WaitFor_2
+2 -2
View File
@@ -49,7 +49,7 @@ SCRIPT_START script_080131AC
_0807EA94
_0807E5F8 0x00000020
WaitForSomething2 0x00000040
_0807E788 0xffff7fff
SetFadeMask 0xffff7fff
_0807E778 0x0004
DoFade5
WaitFor_2
@@ -60,7 +60,7 @@ SCRIPT_START script_080131AC
Call sub_0807F5C0
TextboxNoOverlapFollowPos 0x1604, 0x0007
_0807EA94
_0807E788 0xffffffff
SetFadeMask 0xffffffff
_0807E778 0x0004
DoFade4
WaitFor_2
+1 -1
View File
@@ -66,4 +66,4 @@ SCRIPT_START script_08016384
WaitFor_1
WaitFor_2
_0807E778 0x0004
_0807E788 0x0000ffff
SetFadeMask 0x0000ffff