diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /include/matsuda_debug_menu.h | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'include/matsuda_debug_menu.h')
| -rw-r--r-- | include/matsuda_debug_menu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/matsuda_debug_menu.h b/include/matsuda_debug_menu.h index 60f2dc48c..ad877a014 100644 --- a/include/matsuda_debug_menu.h +++ b/include/matsuda_debug_menu.h @@ -3,7 +3,6 @@ #define BIT(n) (1 << (n)) -void sub_80AB184(void); void sub_80AA280(u8); void sub_80AA5E8(u8); void sub_80AA658(u8); |