diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/scrcmd.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index fa3e21996..127a5ecaa 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1,5 +1,5 @@ #include "global.h" -#include "battle_frontier_2.h" +#include "frontier_util.h" #include "battle_setup.h" #include "berry.h" #include "clock.h" @@ -49,6 +49,11 @@ #include "tv.h" #include "window.h" +extern u16 sub_81A89A0(u8); +extern void sub_81A8AF8(void); +extern void sub_81A895C(void); +extern void sub_81A8934(u8); + typedef u16 (*SpecialFunc)(void); typedef void (*NativeFunc)(void); @@ -1290,8 +1295,8 @@ bool8 ScrCmd_messageautoscroll(struct ScriptContext *ctx) if (msg == NULL) msg = (const u8 *)ctx->data[0]; - gTextFlags.flag_2 = TRUE; - gTextFlags.flag_3 = TRUE; + gTextFlags.autoScroll = TRUE; + gTextFlags.forceMidTextSpeed = TRUE; ShowFieldAutoScrollMessage(msg); return FALSE; } |