Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump

src/battle_script_commands.c

@@ -48,7 +48,7 @@
 #include "constants/abilities.h"
 #include "constants/pokemon.h"
 #include "constants/trainers.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
 
 #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 

src/battle_setup.c

@@ -37,7 +37,7 @@
 #include "constants/pokemon.h"
 #include "constants/trainers.h"
 #include "constants/trainer_classes.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
 
 enum
 {

src/fldeff_rocksmash.c

@@ -16,7 +16,7 @@
 #include "event_object_movement.h"
 #include "constants/songs.h"
 #include "constants/object_events.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
 
 static void task08_080C9820(u8 taskId);
 static void sub_80C98FC(u8 taskId);

src/item_use.c

@@ -42,7 +42,7 @@
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
 
 static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;