pokeblock merge conflicts

2017-12-21 23:12:36 +01:00
parent df479661ff a705a863d1
commit bcffcb0c1c
51 changed files with 5037 additions and 1907 deletions
--- 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