Merge remote-tracking branch 'upstream/master' into move-tutor

# Conflicts: # include/pokenav.h # src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
@@ -7,5 +7,6 @@ bool8 sub_81D4A58(struct EventObject*);
 bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 void sub_81D4998(void);
+void CB2_InitPokeNav(void);

 #endif //GUARD_POKENAV_H