diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/scrcmd.c | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
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; } |