Remove redundant data/ filename prefixes

41 files changed, 88 insertions, 87 deletions

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 5e5805495..c1079e82d 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -1,9 +1,9 @@
 ; item ids
 ; indexes for:
-; - ItemAttributes (see data/items/item_attributes.asm)
-; - ItemDescriptions (see data/items/item_descriptions.asm)
+; - ItemNames (see data/items/names.asm)
+; - ItemDescriptions (see data/items/descriptions.asm)
+; - ItemAttributes (see data/items/attributes.asm)
 ; - ItemEffects (see engine/item_effects.asm)
-; - ItemNames (see data/items/item_names.asm)
 	const_def
 	const NO_ITEM      ; $00
 	const MASTER_BALL  ; $01
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index 2dee5b962..4ef221840 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -1,4 +1,4 @@
-; item_attributes struct members (see data/items/item_attributes.asm)
+; item_attributes struct members (see data/items/attributes.asm)
 	const_def
 	const ITEMATTR_PRICE
 	const ITEMATTR_PRICE_HI
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index be12cca02..7e3a628b1 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -16,8 +16,8 @@ endm
 ; map group ids
 ; `newgroup` indexes are for:
 ; - MapGroupPointers (see maps/map_headers.asm)
+; - MapGroupRoofs (see data/maps/roofs.asm)
 ; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
-; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm)
 ; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
 	const_def
 
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 2505bda55..20448f2fb 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,5 +1,5 @@
 ; hMapEntryMethod values
-; MapSetupScripts indexes (see data/maps/map_setup_scripts.asm)
+; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
 const_value SET $f1
 	const MAPSETUP_WARP       ; f1
 	const MAPSETUP_CONTINUE   ; f2
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index fb729028c..472ff2d0b 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -1,9 +1,9 @@
 ; move ids
 ; indexes for:
 ; - Moves (see data/moves/moves.asm)
-; - MoveNames (see data/moves/move_names.asm)
-; - MoveDescriptions (see data/moves/move_descriptions.asm)
-; - BattleAnimations (see data/moves/move_anims.asm)
+; - MoveNames (see data/moves/names.asm)
+; - MoveDescriptions (see data/moves/descriptions.asm)
+; - BattleAnimations (see data/moves/animations.asm)
 	const_def
 	const NO_MOVE      ; 00
 	const POUND        ; 01
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm
index dcb69ee38..0ca97f380 100644
--- a/constants/move_effect_constants.asm
+++ b/constants/move_effect_constants.asm
@@ -1,4 +1,4 @@
-; MoveEffectsPointers indexes (see data/moves/move_effects_pointers.asm)
+; MoveEffectsPointers indexes (see data/moves/effects_pointers.asm)
 	const_def
 	const EFFECT_NORMAL_HIT
 	const EFFECT_SLEEP
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 559f22fda..b29c310e6 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -1,21 +1,21 @@
 ; pokemon ids
 ; indexes for:
-; - PokemonCries (see data/pokemon/cries.asm)
+; - PokemonNames (see data/pokemon/names.asm)
 ; - BaseData (see data/pokemon/base_stats.asm)
-; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
 ; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm)
-; - PokemonNames (see data/pokemon/pokemon_names.asm)
+; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
+; - PokemonCries (see data/pokemon/cries.asm)
+; - MonMenuIcons (see data/pokemon/menu_icons.asm)
+; - PokemonPalettes (see data/pokemon/palettes.asm)
 ; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm)
-; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
-; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
-; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
-; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
-; - PicPointers (see gfx/pokemon/pic_pointers.asm)
-; - PokemonPalettes (see data/palettes/pokemon_palettes.asm)
 ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
-; - MonMenuIcons (see data/pokemon/menu_icons.asm)
 ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
+; - PokemonPicPointers (see gfx/pokemon/pic_pointers.asm)
+; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
+; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
+; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
+; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - SortedPokemon (see mobile/fixed_words.asm)
 const_value set 1
 	const BULBASAUR  ; 01
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index f5263e5d4..2590ed34e 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -5,12 +5,14 @@ ENDM
 
 ; trainer class ids
 ; `trainerclass` indexes are for:
-; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm)
-; - TrainerClassDVs (see data/trainers/trainer_dvs.asm)
-; - TrainerClassNames (see data/trainers/trainer_class_names.asm)
-; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
+; - TrainerClassNames (see data/trainers/class_names.asm)
+; - TrainerClassAttributes (see data/trainers/attributes.asm)
+; - TrainerClassDVs (see data/trainers/dvs.asm)
 ; - TrainerGroups (see data/trainers/party_pointers.asm)
-; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm)
+; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
+; - TrainerPicPointers (see data/trainers/pic_pointers.asm)
+; - TrainerPalettes (see data/trainers/palettes.asm)
+; - BTTrainerClassGenders (see data/trainers/genders.asm)
 ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
 	enum_start
 CHRIS EQU __enum__
diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm
index 631070e1c..2d87d8764 100644
--- a/constants/trainer_data_constants.asm
+++ b/constants/trainer_data_constants.asm
@@ -1,4 +1,4 @@
-; TrainerClassAttributes struct members (see data/trainers/trainer_attributes.asm)
+; TrainerClassAttributes struct members (see data/trainers/attributes.asm)
 	const_def
 	const TRNATTR_ITEM1           ; 0
 	const TRNATTR_ITEM2           ; 1
@@ -45,7 +45,7 @@ SWITCH_SOMETIMES   EQU 1 << SWITCH_SOMETIMES_F
 SWITCH_RARELY      EQU 1 << SWITCH_RARELY_F
 SWITCH_OFTEN       EQU 1 << SWITCH_OFTEN_F
 
-; TrainerTypes indexes (see trainers/read_party.asm)
+; TrainerTypes indexes (see engine/battle/read_trainer_party.asm)
 	const_def
 	const TRAINERTYPE_NORMAL
 	const TRAINERTYPE_MOVES
diff --git a/data/moves/effect_command_pointers.asm b/data/battle_command_pointers.asm
index 5dd6be786..38a3c1eb8 100644
--- a/data/moves/effect_command_pointers.asm
+++ b/data/battle_command_pointers.asm
@@ -1,7 +1,7 @@
 	dw 0 ; padding
 
 BattleCommandPointers: ; 3fd28
-; entries correspond to macros/scripts/effect_commands.asm
+; entries correspond to macros/scripts/battle_commands.asm
 	dw BattleCommand_CheckTurn ; 34084
 	dw BattleCommand_CheckObedience ; 343db
 	dw BattleCommand_UsedMoveText ; 34541
diff --git a/data/items/item_attributes.asm b/data/items/attributes.asm
index dc2842760..dc2842760 100644
--- a/data/items/item_attributes.asm
+++ b/data/items/attributes.asm
diff --git a/data/items/item_descriptions.asm b/data/items/descriptions.asm
index e5b01e8fd..e5b01e8fd 100644
--- a/data/items/item_descriptions.asm
+++ b/data/items/descriptions.asm
diff --git a/data/items/item_names.asm b/data/items/names.asm
index f44100ab3..f44100ab3 100644
--- a/data/items/item_names.asm
+++ b/data/items/names.asm
diff --git a/data/maps/mapgroup_roofs.asm b/data/maps/roofs.asm
index 8c79e6f82..8c79e6f82 100644
--- a/data/maps/mapgroup_roofs.asm
+++ b/data/maps/roofs.asm
diff --git a/data/maps/map_scenes.asm b/data/maps/scenes.asm
index 3d9600407..3d9600407 100644
--- a/data/maps/map_scenes.asm
+++ b/data/maps/scenes.asm
diff --git a/data/maps/map_setup_scripts.asm b/data/maps/setup_scripts.asm
index 47895b609..47895b609 100644
--- a/data/maps/map_setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
diff --git a/data/moves/move_anims.asm b/data/moves/animations.asm
index e28a2e62d..e28a2e62d 100644
--- a/data/moves/move_anims.asm
+++ b/data/moves/animations.asm
diff --git a/data/moves/move_descriptions.asm b/data/moves/descriptions.asm
index d86ceea37..d86ceea37 100644
--- a/data/moves/move_descriptions.asm
+++ b/data/moves/descriptions.asm
diff --git a/data/moves/move_effects.asm b/data/moves/effects.asm
index c56ff2560..c56ff2560 100644
--- a/data/moves/move_effects.asm
+++ b/data/moves/effects.asm
diff --git a/data/moves/move_effects_pointers.asm b/data/moves/effects_pointers.asm
index a12092881..a12092881 100644
--- a/data/moves/move_effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
diff --git a/data/moves/move_names.asm b/data/moves/names.asm
index cfc7ac54f..cfc7ac54f 100644
--- a/data/moves/move_names.asm
+++ b/data/moves/names.asm
diff --git a/data/pokemon/pokemon_names.asm b/data/pokemon/names.asm
index 266b0c020..266b0c020 100644
--- a/data/pokemon/pokemon_names.asm
+++ b/data/pokemon/names.asm
diff --git a/data/palettes/pokemon_palettes.asm b/data/pokemon/palettes.asm
index 2e47bbdaf..2e47bbdaf 100644
--- a/data/palettes/pokemon_palettes.asm
+++ b/data/pokemon/palettes.asm
diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index 27f1f949f..cca5c3b9c 100644
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -1,4 +1,4 @@
-PicPointers::
+PokemonPicPointers::
 ; entries correspond to Pokémon species, two apiece
 	dba_pic BulbasaurFrontpic
 	dba_pic BulbasaurBackpic
diff --git a/data/trainers/trainer_attributes.asm b/data/trainers/attributes.asm
index 224e460c9..224e460c9 100644
--- a/data/trainers/trainer_attributes.asm
+++ b/data/trainers/attributes.asm
diff --git a/data/trainers/trainer_class_names.asm b/data/trainers/class_names.asm
index 48d81f910..48d81f910 100755
--- a/data/trainers/trainer_class_names.asm
+++ b/data/trainers/class_names.asm
diff --git a/data/trainers/trainer_dvs.asm b/data/trainers/dvs.asm
index 503c468d3..06f486774 100644
--- a/data/trainers/trainer_dvs.asm
+++ b/data/trainers/dvs.asm
@@ -1,24 +1,3 @@
-GetTrainerDVs: ; 270c4
-; Return the DVs of OtherTrainerClass in bc
-
-	push hl
-	ld a, [OtherTrainerClass]
-	dec a
-	ld c, a
-	ld b, 0
-
-	ld hl, TrainerClassDVs
-	add hl, bc
-	add hl, bc
-
-	ld a, [hli]
-	ld b, a
-	ld c, [hl]
-
-	pop hl
-	ret
-; 270d6
-
 TrainerClassDVs: ; 270d6
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	;  Atk  Spd
diff --git a/data/palettes/trainer_palettes.asm b/data/trainers/palettes.asm
index c943e49d7..c943e49d7 100644
--- a/data/palettes/trainer_palettes.asm
+++ b/data/trainers/palettes.asm
diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md
index 4a11391db..5b457bf69 100644
--- a/docs/battle_anim_commands.md
+++ b/docs/battle_anim_commands.md
@@ -1,6 +1,6 @@
 # Battle Animation Commands
 
-Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm).
+Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/animations.asm:BattleAnimations](/data/moves/animations.asm).
 
 
 ## `$00`−`$EF`: `anim_wait` *length*
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index c80eec94c..69f902eb0 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -186,7 +186,7 @@ BattleCommand_BellyDrum: ; 37c1a
 
 This bug affects Acid, Iron Tail, and Rock Smash.
 
-This is a bug with `DefenseDownHit` in [data/moves/move_effects.asm](/data/moves/move_effects.asm):
+This is a bug with `DefenseDownHit` in [data/moves/effects.asm](/data/moves/effects.asm):
 
 ```asm
 DefenseDownHit:
@@ -661,7 +661,7 @@ FastBallMultiplier:
 
 ## Dragon Scale, not Dragon Fang, boosts Dragon-type moves
 
-This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_attributes.asm):
+This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm):
 
 ```asm
 ; DRAGON FANG
diff --git a/docs/effect_commands.md b/docs/move_effect_commands.md
index bd982a51d..b8b09c5c2 100644
--- a/docs/effect_commands.md
+++ b/docs/move_effect_commands.md
@@ -1,6 +1,6 @@
-# Effect Commands
+# Move Effect Commands
 
-Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [data/moves/effect_command_pointers.asm:BattleCommandPointers](/data/moves/effect_command_pointers.asm).
+Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle_command_pointers.asm:BattleCommandPointers](/data/battle_command_pointers.asm).
 
 
 ## `$01`: `checkturn`
diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm
new file mode 100644
index 000000000..d7c0ff50b
--- /dev/null
+++ b/engine/battle/read_trainer_dvs.asm
@@ -0,0 +1,20 @@
+GetTrainerDVs: ; 270c4
+; Return the DVs of OtherTrainerClass in bc
+
+	push hl
+	ld a, [OtherTrainerClass]
+	dec a
+	ld c, a
+	ld b, 0
+
+	ld hl, TrainerClassDVs
+	add hl, bc
+	add hl, bc
+
+	ld a, [hli]
+	ld b, a
+	ld c, [hl]
+
+	pop hl
+	ret
+; 270d6
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 9b7727a84..a09c6dd08 100755
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -1,4 +1,3 @@
-
 ReadTrainerParty: ; 39771
 	ld a, [InBattleTowerBattle]
 	bit 0, a
diff --git a/engine/color.asm b/engine/color.asm
index e000476c3..3eafbad70 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1218,9 +1218,9 @@ INCLUDE "data/palettes/hp_bar.pal"
 ExpBarPalette:
 INCLUDE "data/palettes/exp_bar.pal"
 
-INCLUDE "data/palettes/pokemon_palettes.asm"
+INCLUDE "data/pokemon/palettes.asm"
 
-INCLUDE "data/palettes/trainer_palettes.asm"
+INCLUDE "data/trainers/palettes.asm"
 
 LoadMapPals:
 	farcall LoadSpecialMapPalette
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 472532739..562916442 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -14,7 +14,7 @@ RunMapSetupScript:: ; 15363
 	ret
 ; 15377
 
-INCLUDE "data/maps/map_setup_scripts.asm"
+INCLUDE "data/maps/setup_scripts.asm"
 
 ReadMapSetupScript: ; 1541d
 .loop
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm
index 838fc5656..b8ddde182 100755
--- a/gfx/load_pics.asm
+++ b/gfx/load_pics.asm
@@ -103,13 +103,13 @@ _GetFrontpic: ; 510a5
 	ret
 
 GetFrontpicPointer: ; 510d7
-GLOBAL PicPointers, UnownPicPointers
+GLOBAL PokemonPicPointers, UnownPicPointers
 
 	ld a, [CurPartySpecies]
 	cp UNOWN
 	jr z, .unown
 	ld a, [CurPartySpecies]
-	ld d, BANK(PicPointers)
+	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
@@ -117,7 +117,7 @@ GLOBAL PicPointers, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 
 .ok
-	ld hl, PicPointers ; UnownPicPointers
+	ld hl, PokemonPicPointers ; UnownPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
@@ -212,10 +212,10 @@ GetMonBackpic: ; 5116c
 
 	; These are assumed to be at the same
 	; address in their respective banks.
-	GLOBAL PicPointers,  UnownPicPointers
-	ld hl, PicPointers ; UnownPicPointers
+	GLOBAL PokemonPicPointers,  UnownPicPointers
+	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
-	ld d, BANK(PicPointers)
+	ld d, BANK(PokemonPicPointers)
 	cp UNOWN
 	jr nz, .ok
 	ld a, c
@@ -295,16 +295,16 @@ GLOBAL PICS_FIX
 Function511ec: ; 511ec
 	ld a, c
 	push de
-	ld hl, PicPointers
+	ld hl, PokemonPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
-	ld a, BANK(PicPointers)
+	ld a, BANK(PokemonPicPointers)
 	call GetFarByte
 	call FixPicBank
 	push af
 	inc hl
-	ld a, BANK(PicPointers)
+	ld a, BANK(PokemonPicPointers)
 	call GetFarHalfword
 	pop af
 	pop de
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 37aac234e..fc2d46a77 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,8 +1,8 @@
 INCLUDE "includes.asm"
 
 
-; PicPointers and UnownPicPointers are assumed to start at the same address,
-; but in different banks. This is enforced in pokecrystal.link.
+; PokemonPicPointers and UnownPicPointers are assumed to start at the same
+; address, but in different banks. This is enforced in pokecrystal.link.
 
 SECTION "Pic Pointers", ROMX
 
diff --git a/macros.asm b/macros.asm
index f24d2f5a7..b6598c933 100644
--- a/macros.asm
+++ b/macros.asm
@@ -14,7 +14,7 @@ INCLUDE "macros/scripts/maps.asm"
 INCLUDE "macros/scripts/events.asm"
 INCLUDE "macros/scripts/text.asm"
 INCLUDE "macros/scripts/movement.asm"
-INCLUDE "macros/scripts/effect_commands.asm"
+INCLUDE "macros/scripts/battle_commands.asm"
 INCLUDE "macros/scripts/battle_anims.asm"
 INCLUDE "macros/scripts/trade_anims.asm"
 INCLUDE "macros/scripts/gfx_anims.asm"
diff --git a/macros/scripts/effect_commands.asm b/macros/scripts/battle_commands.asm
index 550deac6a..5ac9009ff 100644
--- a/macros/scripts/effect_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -3,7 +3,7 @@ command: macro
 \1 equs "db \1_command"
 endm
 
-; BattleCommandPointers indexes (see data/moves/effect_command_pointers.asm)
+; BattleCommandPointers indexes (see data/battle_command_pointers.asm)
 	enum_start 1
 	command checkturn               ; 01
 	command checkobedience          ; 02
diff --git a/main.asm b/main.asm
index d3d0b5460..098edb7d1 100644
--- a/main.asm
+++ b/main.asm
@@ -11,7 +11,7 @@ INCLUDE "engine/init_map.asm"
 INCLUDE "engine/learn.asm"
 INCLUDE "engine/routines/checknickerrors.asm"
 INCLUDE "engine/math.asm"
-INCLUDE "data/items/item_attributes.asm"
+INCLUDE "data/items/attributes.asm"
 INCLUDE "engine/npc_movement.asm"
 INCLUDE "engine/events/happiness_egg.asm"
 INCLUDE "engine/events/special.asm"
@@ -117,11 +117,12 @@ INCLUDE "engine/trainer_card.asm"
 INCLUDE "engine/events/prof_oaks_pc.asm"
 INCLUDE "engine/decorations.asm"
 INCLUDE "engine/routines/leveluphappinessmod.asm"
-INCLUDE "data/trainers/trainer_dvs.asm"
+INCLUDE "engine/battle/read_trainer_dvs.asm"
+INCLUDE "data/trainers/dvs.asm"
 INCLUDE "engine/battle/returntobattle_useball.asm"
 INCLUDE "engine/battle/consumehelditem.asm"
-INCLUDE "data/moves/move_effects_pointers.asm"
-INCLUDE "data/moves/move_effects.asm"
+INCLUDE "data/moves/effects_pointers.asm"
+INCLUDE "data/moves/effects.asm"
 INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
 
 
@@ -141,12 +142,12 @@ INCBIN "gfx/battle/dude.2bpp.lz"
 SECTION "bankB", ROMX
 
 INCLUDE "engine/battle/trainer_huds.asm"
-INCLUDE "data/trainers/trainer_class_names.asm"
+INCLUDE "data/trainers/class_names.asm"
 INCLUDE "engine/battle/ai/redundant.asm"
 INCLUDE "engine/events/move_deleter.asm"
 INCLUDE "engine/mystery_gift_2.asm"
 INCLUDE "engine/tmhm2.asm"
-INCLUDE "data/moves/move_descriptions.asm"
+INCLUDE "data/moves/descriptions.asm"
 INCLUDE "engine/events/pokerus/pokerus.asm"
 INCLUDE "engine/battle/start_battle.asm"
 INCLUDE "engine/routines/placegraphic.asm"
@@ -162,7 +163,7 @@ SECTION "Enemy Trainers", ROMX
 INCLUDE "engine/battle/ai/items.asm"
 INCLUDE "engine/battle/ai/scoring.asm"
 INCLUDE "engine/battle/read_trainer_attributes.asm"
-INCLUDE "data/trainers/trainer_attributes.asm"
+INCLUDE "data/trainers/attributes.asm"
 INCLUDE "engine/battle/read_trainer_party.asm"
 INCLUDE "data/trainers/party_pointers.asm"
 INCLUDE "data/trainers/parties.asm"
@@ -171,7 +172,7 @@ INCLUDE "data/trainers/parties.asm"
 SECTION "Battle Core", ROMX
 
 INCLUDE "engine/battle/core.asm"
-INCLUDE "data/moves/effect_command_pointers.asm"
+INCLUDE "data/battle_command_pointers.asm"
 
 
 SECTION "bank10", ROMX
@@ -220,7 +221,7 @@ INCLUDE "data/collision_permissions.asm"
 INCLUDE "engine/routines/emptyallsrambanks.asm"
 INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
 INCLUDE "engine/routines/checksave.asm"
-INCLUDE "data/maps/map_scenes.asm"
+INCLUDE "data/maps/scenes.asm"
 INCLUDE "engine/routines/loadmappart.asm"
 INCLUDE "engine/routines/phonering_copytilemapatonce.asm"
 
@@ -270,7 +271,7 @@ INCLUDE "engine/routines/switchpartymons.asm"
 INCLUDE "gfx/load_pics.asm"
 INCLUDE "engine/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
-INCLUDE "data/pokemon/pokemon_names.asm"
+INCLUDE "data/pokemon/names.asm"
 
 Unknown_53d84: ; unreferenced
 	db $1a, $15
@@ -390,7 +391,7 @@ INCLUDE "engine/events/trainer_scripts.asm"
 SECTION "bank32", ROMX
 
 INCLUDE "engine/battle_anims/bg_effects.asm"
-INCLUDE "data/moves/move_anims.asm"
+INCLUDE "data/moves/animations.asm"
 INCLUDE "engine/events/poisonstep_pals.asm"
 
 TheEndGFX:: ; cbd2e
@@ -593,9 +594,9 @@ INCLUDE "text/phone/trainers1.asm"
 
 SECTION "Miscellaneous Text", ROMX
 
-INCLUDE "data/items/item_names.asm"
-INCLUDE "data/items/item_descriptions.asm"
-INCLUDE "data/moves/move_names.asm"
+INCLUDE "data/items/names.asm"
+INCLUDE "data/items/descriptions.asm"
+INCLUDE "data/moves/names.asm"
 INCLUDE "engine/landmarks.asm"
 
 
diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm
index a9fd8a654..2a4b0a1b4 100644
--- a/tilesets/roofs.asm
+++ b/tilesets/roofs.asm
@@ -17,4 +17,4 @@ LoadMapGroupRoof:: ; 1c000
 ; 1c021
 
 
-INCLUDE "data/maps/mapgroup_roofs.asm"
+INCLUDE "data/maps/roofs.asm"