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
@@ -43,8 +43,6 @@
 #include "constants/species.h"
 #include "constants/trainers.h"

-extern void mapldr_default(void);
-
 // Static type declarations

 struct SecretBaseListMenuBuffer {