diff options
author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/decoration.c | |
parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/decoration.c')
-rw-r--r-- | src/decoration.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index cf137799a..279a7568b 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -12,14 +12,15 @@ void sub_80FEC94(u8 arg0); void sub_80FECB8(u8 arg0); void sub_80FECE0(u8 arg0); -void sub_80FE7EC(u8 arg0) { +void sub_80FE7EC(u8 arg0) +{ sub_8072DEC(); MenuZeroFillWindowRect(0, 0, 29, 19); sub_80FEC94(arg0); sub_80FECB8(gUnknown_020388F6); - MenuDrawTextWindow(15, 12, 29, 19); + MenuDrawTextWindow(15, 12, 29, 19); sub_80FECE0(gUnknown_020388F2 + gUnknown_020388F4); InitMenu(0, 1, 2, gUnknown_020388F3 + 1, gUnknown_020388F2, 13); |