summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-09 13:50:20 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-09 13:50:20 -0500
commit62d6f72bb35ed75574bb74b2edca120f8d80a628 (patch)
tree6f098a8718544567bbd7f99960f5c5476830eb98
parentc158404b7cad3d1ad4201b179f25c266e2f2ebcb (diff)
Make tileset palette maps easier to edit
-rw-r--r--data/tilesets.asm2
-rw-r--r--gfx/tileset_palette_maps.asm (renamed from gfx/tilesets/palette_maps.asm)0
-rw-r--r--main.asm2
3 files changed, 2 insertions, 2 deletions
diff --git a/data/tilesets.asm b/data/tilesets.asm
index c44a218fc..82052f1e8 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -7,8 +7,8 @@ ENDM
; Associated data:
; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
+; - The *PalMap are defined in gfx/tileset_palette_maps.asm
; - The *Anim are defined in engine/tileset_anims.asm
-; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
Tilesets:: ; 4d596
; entries correspond to TILESET_* constants
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tileset_palette_maps.asm
index b3b2f5b98..b3b2f5b98 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
diff --git a/main.asm b/main.asm
index 7a5ddca9d..9a9ba485c 100644
--- a/main.asm
+++ b/main.asm
@@ -206,7 +206,7 @@ INCLUDE "engine/events/buena_menu.asm"
SECTION "bank13", ROMX
INCLUDE "engine/map_palettes.asm"
-INCLUDE "gfx/tilesets/palette_maps.asm"
+INCLUDE "gfx/tileset_palette_maps.asm"
INCLUDE "data/collision_permissions.asm"
INCLUDE "engine/routines/emptyallsrambanks.asm"
INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"