diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-11-03 12:03:37 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-11-03 12:03:37 -0500 |
| commit | 01f68fcc6ab477c7feaa07979391de9649f70fb4 (patch) | |
| tree | 58f854c62116466e6b76d54487bab4ed8a9d7709 /gfx | |
| parent | 86061d37d2aff18530d4340796c0799bb316e7f0 (diff) | |
Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/tileset_palette_maps.asm | 4 | ||||
| -rw-r--r-- | gfx/tilesets.asm | 12 | ||||
| -rw-r--r-- | gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d (renamed from gfx/tilesets/battle_tower.2bpp.lz.467b6a2d) | bin | 832 -> 832 bytes | |||
| -rw-r--r-- | gfx/tilesets/battle_tower_inside.pal (renamed from gfx/tilesets/battle_tower.pal) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/battle_tower_inside.png (renamed from gfx/tilesets/battle_tower.png) | bin | 1004 -> 1004 bytes | |||
| -rw-r--r-- | gfx/tilesets/battle_tower_inside_palette_map.asm (renamed from gfx/tilesets/battle_tower_palette_map.asm) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 41f71ff0b..110e48941 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -103,8 +103,8 @@ INCLUDE "gfx/tilesets/forest_palette_map.asm" TilesetPokeComCenterPalMap: INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm" -TilesetBattleTowerPalMap: -INCLUDE "gfx/tilesets/battle_tower_palette_map.asm" +TilesetBattleTowerInsidePalMap: +INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm" TilesetBattleTowerOutsidePalMap: INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index c4071349c..6cc4d7155 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -206,14 +206,14 @@ INCBIN "data/tilesets/pokecom_center_metatiles.bin" TilesetPokeComCenterColl: INCLUDE "data/tilesets/pokecom_center_collision.asm" -TilesetBattleTowerGFX: -INCBIN "gfx/tilesets/battle_tower.2bpp.lz" +TilesetBattleTowerInsideGFX: +INCBIN "gfx/tilesets/battle_tower_inside.2bpp.lz" -TilesetBattleTowerMeta: -INCBIN "data/tilesets/battle_tower_metatiles.bin" +TilesetBattleTowerInsideMeta: +INCBIN "data/tilesets/battle_tower_inside_metatiles.bin" -TilesetBattleTowerColl: -INCLUDE "data/tilesets/battle_tower_collision.asm" +TilesetBattleTowerInsideColl: +INCLUDE "data/tilesets/battle_tower_inside_collision.asm" TilesetGateGFX: INCBIN "gfx/tilesets/gate.2bpp.lz" diff --git a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d Binary files differindex fa5d0a9f0..fa5d0a9f0 100644 --- a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d +++ b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d diff --git a/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower_inside.pal index 4e71a5575..4e71a5575 100644 --- a/gfx/tilesets/battle_tower.pal +++ b/gfx/tilesets/battle_tower_inside.pal diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower_inside.png Binary files differindex cf9e12d53..cf9e12d53 100644 --- a/gfx/tilesets/battle_tower.png +++ b/gfx/tilesets/battle_tower_inside.png diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm index 1abce2a16..1abce2a16 100644 --- a/gfx/tilesets/battle_tower_palette_map.asm +++ b/gfx/tilesets/battle_tower_inside_palette_map.asm |
