From e2ac753da178063877a06f1cd577888a5337d6e8 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Wed, 17 Jan 2018 00:00:43 -0500
Subject: [PATCH] No redundant filename prefixes

---
 constants/map_constants.asm                 | 4 ++--
 constants/map_data_constants.asm            | 4 ++--
 data/maps/{map_data.asm => data.asm}        | 0
 data/maps/{map_defs.asm => definitions.asm} | 2 +-
 data/maps/maps.asm                          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename data/maps/{map_data.asm => data.asm} (100%)
 rename data/maps/{map_defs.asm => definitions.asm} (99%)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 6c7fac3b1..7e8eded91 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -15,11 +15,11 @@ ENDM
 
 ; map group ids
 ; `newgroup` indexes are for:
-; - MapGroupPointers (see data/maps/map_defs.asm)
+; - MapGroupPointers (see data/maps/definitions.asm)
 ; - MapGroupRoofs (see data/maps/roofs.asm)
 ; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
 ; - RoofPals (see gfx/tilesets/roofs.pal)
-; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_defs.asm)
+; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/definitions.asm)
 	const_def
 
 	newgroup                                                     ;  1
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index b25dea04d..f58e8ec3a 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -3,7 +3,7 @@ MAP_N_A    EQU -1
 GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
-; map header struct members (see data/maps/map_defs.asm)
+; map header struct members (see data/maps/definitions.asm)
 	const_def
 	const MAPDEF_MAPDATA_BANK ; 0
 	const MAPDEF_TILESET      ; 1
@@ -52,7 +52,7 @@ const_value set 1
 	const FISHGROUP_QWILFISH_NO_SWARM
 
 
-; connection directions (see data/maps/map_data.asm)
+; connection directions (see data/maps/data.asm)
 	const_def
 	const EAST_F
 	const WEST_F
diff --git a/data/maps/map_data.asm b/data/maps/data.asm
similarity index 100%
rename from data/maps/map_data.asm
rename to data/maps/data.asm
diff --git a/data/maps/map_defs.asm b/data/maps/definitions.asm
similarity index 99%
rename from data/maps/map_defs.asm
rename to data/maps/definitions.asm
index d11071a35..fd8ad3a33 100644
--- a/data/maps/map_defs.asm
+++ b/data/maps/definitions.asm
@@ -1,5 +1,5 @@
 map_def: MACRO
-;\1: map name: for the MapData pointer (see data/maps/map_data.asm)
+;\1: map name: for the MapData pointer (see data/maps/data.asm)
 ;\2: tileset: a TILESET_* constant
 ;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
 ;\4: location: from constants/landmark_constants.asm
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 2855c4a96..56958ccfc 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 
 SECTION "Maps", ROMX
 
-INCLUDE "data/maps/map_defs.asm"
-INCLUDE "data/maps/map_data.asm"
+INCLUDE "data/maps/definitions.asm"
+INCLUDE "data/maps/data.asm"
 
 
 INCLUDE "data/maps/blocks.asm"