summaryrefslogtreecommitdiff
path: root/include/decoration.h
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-07-05 21:37:14 -0400
committeryenatch <yenatch@gmail.com>2017-07-05 21:37:14 -0400
commit06bf25405c98257e47953b5d3c327e314ea371b3 (patch)
tree81be5b612621bdd74f632dbedb9f85c4d1d203b9 /include/decoration.h
parent282cae4a9fbd019a973fb6618337d29a61f97f42 (diff)
parentbe05c5bd52769b58316986bd7451cb2483571099 (diff)
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts: include/use_pokeblock.h
Diffstat (limited to 'include/decoration.h')
-rwxr-xr-x[-rw-r--r--]include/decoration.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/decoration.h b/include/decoration.h
index 2595d491a..7a6d8ef5a 100644..100755
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -274,7 +274,7 @@ extern const u8 *const gUnknown_083EC5E4[];
extern const u8 *const gUnknown_083EC624[];
extern u8 gUnknown_020388F7[];
extern const struct MenuAction2 gUnknown_083EC604[];
-extern const struct MenuAction3 gUnknown_083EC634[];
+extern const struct YesNoFuncTable gUnknown_083EC634[];
extern const u8 gUnknown_083EC65A[];
extern const u8 gUnknown_083EC97C[];
extern const u8 gUnknown_083EC984[];