Merge remote-tracking branch 'pret/master' into render_text

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);