diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-01 16:55:04 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-01 16:55:04 +0100 |
| commit | 57c5cefaf8bcb8fe5a6688aa3831ee5afc13e894 (patch) | |
| tree | d7efc0061212815d9b5e78f169cc2870f267e2db /data/scripts | |
| parent | 18387d8d6063611ea56a13039e4a144ed794216b (diff) | |
| parent | 541fd0e9fff0dfc7736b42fb8acefcb70b949fb0 (diff) | |
Merge branch 'master' into demo-jp
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/script_0801232C.inc | 4 | ||||
| -rw-r--r-- | data/scripts/script_08012430.inc | 2 | ||||
| -rw-r--r-- | data/scripts/script_0801319A.inc | 4 | ||||
| -rw-r--r-- | data/scripts/script_08016384.inc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 8c01c8db..313b7c64 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -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 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 6070d716..675ecb48 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -77,7 +77,7 @@ script_0801248A: MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer - _0807E788 0xffffffff + SetFadeMask 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 3a6734da..f7e6a70f 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -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 diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 6b85d8b8..6f6aaa07 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -66,4 +66,4 @@ SCRIPT_START script_08016384 WaitFor_1 WaitFor_2 _0807E778 0x0004 - _0807E788 0x0000ffff + SetFadeMask 0x0000ffff |