From d91e42ca5e3796108b01df9e6535e84892cbf9cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 18:10:01 -0500 Subject: Group some mutually edited files in data/sprites/ --- engine/color.asm | 2 +- engine/map_objects.asm | 4 ++-- engine/overworld.asm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engine') 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" -- cgit v1.2.3