summaryrefslogtreecommitdiff
path: root/src/menu2.c
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
commit96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch)
tree969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /src/menu2.c
parent277726fd5e8c6da021206deeecb163f40073ff3c (diff)
parent53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff)
Merge branch 'master' into pokemon
Diffstat (limited to 'src/menu2.c')
-rw-r--r--src/menu2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu2.c b/src/menu2.c
index ffe5865e4..6a3668cfa 100644
--- a/src/menu2.c
+++ b/src/menu2.c
@@ -504,7 +504,7 @@ void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y)
// Yeah, no, I'm not bothering with this
NAKED
-void sub_819A080(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
+static void sub_812E768(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r10\n"