diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-06 00:33:07 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-06 00:33:07 +0100 |
| commit | a6d133e42dfec121b42028eb0d3a38fa4345d18d (patch) | |
| tree | ac7d0d5684c7b236bfbc996cf5a01a530f123e16 /data/scripts/script_08014CDC.inc | |
| parent | 1a0f416bacbd8ceefa3197fcb71015ee721e43fb (diff) | |
| parent | 3592e47cd6167082e866b1a391781995df253c3b (diff) | |
Merge branch 'master' into asset-extraction
Diffstat (limited to 'data/scripts/script_08014CDC.inc')
| -rw-r--r-- | data/scripts/script_08014CDC.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index a2c0f4df..c7c09148 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -10,8 +10,8 @@ SCRIPT_START script_08014CDC EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 - _0807E864 - TextboxNoOverlapFollowPos 0x1010, 0x000c + _0807E864 + MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000002 script_08014D1E: @@ -23,7 +23,7 @@ script_08014D1E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1012 + MessageNoOverlap 0x1012 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -36,7 +36,7 @@ script_08014D60: JumpIf script_08014D60 _0807E864 Call sub_0807DF28 - TextboxNoOverlap 0x1013 + MessageNoOverlap 0x1013 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08014D96: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1014 + MessageNoOverlap 0x1014 WaitUntilTextboxCloses _0807EC64 0x0018 .ifdef JP |