diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/decoration.h | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/decoration.h')
| -rwxr-xr-x[-rw-r--r--] | include/decoration.h | 2 |
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[]; |