diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /src/field_message_box.c | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'src/field_message_box.c')
| -rwxr-xr-x | src/field_message_box.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_message_box.c b/src/field_message_box.c index 5e23b5f6b..299aafaf2 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -5,8 +5,8 @@ #include "task.h" #include "text.h" -extern bool32 sub_8196094(void); -extern void sub_8196080(u8*); +extern bool32 IsMatchCallTaskActive(void); +extern void StartMatchCallFromScript(u8*); static EWRAM_DATA u8 sFieldMessageBoxMode = 0; @@ -68,7 +68,7 @@ bool8 ShowFieldMessage(u8 *str) void sub_8098214(u8 taskId) { - if (!sub_8196094()) + if (!IsMatchCallTaskActive()) { sFieldMessageBoxMode = 0; DestroyTask(taskId); @@ -81,7 +81,7 @@ bool8 sub_8098238(u8 *str) return FALSE; StringExpandPlaceholders(gStringVar4, str); CreateTask(sub_8098214, 0); - sub_8196080(str); + StartMatchCallFromScript(str); sFieldMessageBoxMode = 2; return TRUE; } |