diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-14 11:29:23 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-14 11:29:23 -0400 |
commit | 939bd127bba0ba3af5b94a288ab47a6e374adfe2 (patch) | |
tree | af573b5e11dc940c31bfbdc928dd9b56938ac4d6 /src/menu2.c | |
parent | 31c26e862a3d775c2a78fac646c614efe96033c0 (diff) | |
parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) |
Merge branch 'master' into battle_records
Diffstat (limited to 'src/menu2.c')
-rw-r--r-- | src/menu2.c | 2 |
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" |