summaryrefslogtreecommitdiff
path: root/include/pokenav.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-21 23:12:36 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-21 23:12:36 +0100
commitbcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (patch)
treecd9e57cb761cad0ad93d5024d3f8c84e49e2bd9d /include/pokenav.h
parentdf479661ffd0c270e4a8c35f37285d5d3988f592 (diff)
parenta705a863d1f59411a6f18fdd95e81de76f66fd66 (diff)
pokeblock merge conflicts
Diffstat (limited to 'include/pokenav.h')
-rw-r--r--include/pokenav.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/pokenav.h b/include/pokenav.h
index 8e1ec52bd..ebe3b325c 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -12,5 +12,6 @@ void sub_81D3464(void *arg0);
void sub_81D3480(void *arg0, u8 arg1);
void sub_81D2754(void *arg0, void *arg1);
void sub_81D1F84(void *arg0, void *arg1, void *arg2);
+const u8 *sub_81D62AC(void);
#endif //GUARD_POKENAV_H