diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index e603a37a7..c8066f066 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -202,7 +202,7 @@ NUM_SPAWNS EQU const_value
 	const OBJECTTYPE_6
 
 
-; Emotes indexes (see data/emotes.asm)
+; Emotes indexes (see data/sprites/emotes.asm)
 	const_def
 	const EMOTE_SHOCK ; 0
 	const EMOTE_QUESTION ; 1
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index e657c4027..32d386ba7 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -105,7 +105,7 @@
 	const SPRITE_RAIKOU ; 65
 	const SPRITE_STANDING_YOUNGSTER ; 66
 
-; SpriteMons indexes (see data/sprite_mons.asm)
+; SpriteMons indexes (see data/sprites/sprite_mons.asm)
 const_value set $80
 SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN ; 80
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 9ec78d1fb..7abac6c37 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -36,7 +36,7 @@ const_value set (1 << 3)
 	const PAL_NPC_TREE   ; e
 	const PAL_NPC_ROCK   ; f
 
-; SpriteMovementData indexes (see data/map_objects.asm)
+; SpriteMovementData indexes (see data/sprites/map_objects.asm)
 	const_def
 	const SPRITEMOVEDATA_00                   ; 00
 	const SPRITEMOVEDATA_ITEM_TREE            ; 01
@@ -158,7 +158,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const OBJECT_ACTION_GRASS_SHAKE  ; 0f
 	const OBJECT_ACTION_SKYFALL      ; 10
 
-; Facings indexes (see data/facings.asm)
+; Facings indexes (see data/sprites/facings.asm)
 	const_def
 	const FACING_STEP_DOWN_0    ; 00
 	const FACING_STEP_DOWN_1    ; 01
diff --git a/data/emotes.asm b/data/sprites/emotes.asm
similarity index 100%
rename from data/emotes.asm
rename to data/sprites/emotes.asm
diff --git a/data/facings.asm b/data/sprites/facings.asm
similarity index 100%
rename from data/facings.asm
rename to data/sprites/facings.asm
diff --git a/data/map_objects.asm b/data/sprites/map_objects.asm
similarity index 100%
rename from data/map_objects.asm
rename to data/sprites/map_objects.asm
diff --git a/data/sprite_mons.asm b/data/sprites/sprite_mons.asm
similarity index 100%
rename from data/sprite_mons.asm
rename to data/sprites/sprite_mons.asm
diff --git a/data/sprites.asm b/data/sprites/sprites.asm
similarity index 100%
rename from data/sprites.asm
rename to data/sprites/sprites.asm
diff --git a/engine/color.asm b/engine/color.asm
index 58a2c0df8..76729187a 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1341,7 +1341,7 @@ TilesetBGPalette:
 INCLUDE "gfx/tilesets/bg_tiles.pal"
 
 MapObjectPals::
-INCLUDE "gfx/overworld/map_objects.pal"
+INCLUDE "gfx/overworld/map_sprites.pal"
 
 RoofPals:
 INCLUDE "gfx/tilesets/roofs.pal"
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index a0dadf9a5..c65843254 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -1,6 +1,6 @@
-INCLUDE "data/facings.asm"
+INCLUDE "data/sprites/facings.asm"
 
-INCLUDE "data/map_objects.asm"
+INCLUDE "data/sprites/map_objects.asm"
 
 
 ; 4357
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 68b8adaed..bd373db66 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -719,10 +719,10 @@ LoadEmote:: ; 1442f
 ; 1444d
 
 
-INCLUDE "data/emotes.asm"
+INCLUDE "data/sprites/emotes.asm"
 
-INCLUDE "data/sprite_mons.asm"
+INCLUDE "data/sprites/sprite_mons.asm"
 
 INCLUDE "data/maps/outdoor_sprites.asm"
 
-INCLUDE "data/sprites.asm"
+INCLUDE "data/sprites/sprites.asm"
diff --git a/gfx/overworld/map_objects.pal b/gfx/overworld/map_sprites.pal
similarity index 100%
rename from gfx/overworld/map_objects.pal
rename to gfx/overworld/map_sprites.pal
diff --git a/home/text.asm b/home/text.asm
index 191c96172..49b5f8abc 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -47,10 +47,8 @@ ClearScreen:: ; fdb
 
 
 TextBox:: ; fe8
-; Draw a text box at hl with room for
-; b lines of c characters each.
-; Places a border around the textbox,
-; then switches the palette to the
+; Draw a text box at hl with room for b lines of c characters each.
+; Places a border around the textbox, then switches the palette to the
 ; text black-and-white scheme.
 	push bc
 	push hl