From 01f68fcc6ab477c7feaa07979391de9649f70fb4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 3 Nov 2019 12:03:37 -0500 Subject: Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE --- constants/tileset_constants.asm | 2 +- data/maps/maps.asm | 8 +-- data/tilesets.asm | 2 +- data/tilesets/battle_tower_collision.asm | 64 ---------------------- data/tilesets/battle_tower_inside_collision.asm | 64 ++++++++++++++++++++++ data/tilesets/battle_tower_inside_metatiles.bin | Bin 0 -> 1024 bytes data/tilesets/battle_tower_metatiles.bin | Bin 1024 -> 0 bytes engine/tilesets/tileset_anims.asm | 2 +- engine/tilesets/tileset_palettes.asm | 28 +++++----- gfx/tileset_palette_maps.asm | 4 +- gfx/tilesets.asm | 12 ++-- gfx/tilesets/battle_tower.2bpp.lz.467b6a2d | Bin 832 -> 0 bytes gfx/tilesets/battle_tower.pal | 40 -------------- gfx/tilesets/battle_tower.png | Bin 1004 -> 0 bytes gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d | Bin 0 -> 832 bytes gfx/tilesets/battle_tower_inside.pal | 40 ++++++++++++++ gfx/tilesets/battle_tower_inside.png | Bin 0 -> 1004 bytes gfx/tilesets/battle_tower_inside_palette_map.asm | 29 ++++++++++ gfx/tilesets/battle_tower_palette_map.asm | 29 ---------- 19 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 data/tilesets/battle_tower_collision.asm create mode 100644 data/tilesets/battle_tower_inside_collision.asm create mode 100644 data/tilesets/battle_tower_inside_metatiles.bin delete mode 100644 data/tilesets/battle_tower_metatiles.bin delete mode 100644 gfx/tilesets/battle_tower.2bpp.lz.467b6a2d delete mode 100644 gfx/tilesets/battle_tower.pal delete mode 100644 gfx/tilesets/battle_tower.png create mode 100644 gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d create mode 100644 gfx/tilesets/battle_tower_inside.pal create mode 100644 gfx/tilesets/battle_tower_inside.png create mode 100644 gfx/tilesets/battle_tower_inside_palette_map.asm delete mode 100644 gfx/tilesets/battle_tower_palette_map.asm diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index e89714fee..79be4ad57 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -21,7 +21,7 @@ const TILESET_LIGHTHOUSE ; 13 const TILESET_PLAYERS_ROOM ; 14 const TILESET_POKECOM_CENTER ; 15 - const TILESET_BATTLE_TOWER ; 16 + const TILESET_BATTLE_TOWER_INSIDE ; 16 const TILESET_TOWER ; 17 const TILESET_CAVE ; 18 const TILESET_PARK ; 19 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1cc528738..268c4be8d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -416,10 +416,10 @@ MapGroup_Cianwood: map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/tilesets.asm b/data/tilesets.asm index b95c20f40..eb5b6fe49 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -34,7 +34,7 @@ Tilesets:: tileset TilesetLighthouse tileset TilesetPlayersRoom tileset TilesetPokeComCenter - tileset TilesetBattleTower + tileset TilesetBattleTowerInside tileset TilesetTower tileset TilesetCave tileset TilesetPark diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm deleted file mode 100644 index 97e09bf5d..000000000 --- a/data/tilesets/battle_tower_collision.asm +++ /dev/null @@ -1,64 +0,0 @@ - tilecoll WALL, WALL, WALL, WALL ; 00 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, FLOOR ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll DOOR, WALL, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, FLOOR, WALL, FLOOR ; 14 - tilecoll FLOOR, WALL, FLOOR, WALL ; 15 - tilecoll FLOOR, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 - tilecoll WALL, FLOOR, WALL, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, WALL ; 1f - tilecoll WALL, WALL, WALL, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, WALL, WALL ; 24 - tilecoll WALL, FLOOR, FLOOR, DOOR ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, PC, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, FLOOR ; 2a - tilecoll WALL, WALL, FLOOR, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c - tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 - tilecoll WALL, WALL, FLOOR, WALL ; 36 - tilecoll WALL, WALL, WALL, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, WALL ; 38 - tilecoll WALL, WALL, WALL, WALL ; 39 - tilecoll WALL, WALL, WALL, FLOOR ; 3a - tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, FLOOR, WALL ; 3d - tilecoll WALL, WALL, WALL, FLOOR ; 3e - tilecoll WALL, WALL, FLOOR, WALL ; 3f diff --git a/data/tilesets/battle_tower_inside_collision.asm b/data/tilesets/battle_tower_inside_collision.asm new file mode 100644 index 000000000..97e09bf5d --- /dev/null +++ b/data/tilesets/battle_tower_inside_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll DOOR, WALL, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, WALL ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WALL, WALL ; 24 + tilecoll WALL, FLOOR, FLOOR, DOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll WALL, PC, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c + tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, FLOOR, WALL ; 3d + tilecoll WALL, WALL, WALL, FLOOR ; 3e + tilecoll WALL, WALL, FLOOR, WALL ; 3f diff --git a/data/tilesets/battle_tower_inside_metatiles.bin b/data/tilesets/battle_tower_inside_metatiles.bin new file mode 100644 index 000000000..c64ef0a12 Binary files /dev/null and b/data/tilesets/battle_tower_inside_metatiles.bin differ diff --git a/data/tilesets/battle_tower_metatiles.bin b/data/tilesets/battle_tower_metatiles.bin deleted file mode 100644 index c64ef0a12..000000000 Binary files a/data/tilesets/battle_tower_metatiles.bin and /dev/null differ diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index d596849d2..f8869b59b 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -259,7 +259,7 @@ TilesetChampionsRoomAnim: TilesetLighthouseAnim: TilesetPlayersRoomAnim: TilesetPokeComCenterAnim: -TilesetBattleTowerAnim: +TilesetBattleTowerInsideAnim: TilesetRuinsOfAlphAnim: TilesetRadioTowerAnim: TilesetUndergroundAnim: diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm index 459cd74c2..3654d7e3c 100644 --- a/engine/tilesets/tileset_palettes.asm +++ b/engine/tilesets/tileset_palettes.asm @@ -2,8 +2,8 @@ LoadSpecialMapPalette: ld a, [wMapTileset] cp TILESET_POKECOM_CENTER jr z, .pokecom_2f - cp TILESET_BATTLE_TOWER - jr z, .battle_tower + cp TILESET_BATTLE_TOWER_INSIDE + jr z, .battle_tower_inside cp TILESET_ICE_PATH jr z, .ice_path cp TILESET_HOUSE @@ -14,17 +14,17 @@ LoadSpecialMapPalette: jr z, .mansion_mobile jr .do_nothing -.pokecom_2f +.pokecom_2f: call LoadPokeComPalette scf ret -.battle_tower - call LoadBattleTowerPalette +.battle_tower_inside: + call LoadBattleTowerInsidePalette scf ret -.ice_path +.ice_path: ld a, [wEnvironment] and $7 cp INDOOR ; Hall of Fame @@ -33,22 +33,22 @@ LoadSpecialMapPalette: scf ret -.house +.house: call LoadHousePalette scf ret -.radio_tower +.radio_tower: call LoadRadioTowerPalette scf ret -.mansion_mobile +.mansion_mobile: call LoadMansionPalette scf ret -.do_nothing +.do_nothing: and a ret @@ -63,16 +63,16 @@ LoadPokeComPalette: PokeComPalette: INCLUDE "gfx/tilesets/pokecom_center.pal" -LoadBattleTowerPalette: +LoadBattleTowerInsidePalette: ld a, BANK(wBGPals1) ld de, wBGPals1 - ld hl, BattleTowerPalette + ld hl, BattleTowerInsidePalette ld bc, 8 palettes call FarCopyWRAM ret -BattleTowerPalette: -INCLUDE "gfx/tilesets/battle_tower.pal" +BattleTowerInsidePalette: +INCLUDE "gfx/tilesets/battle_tower_inside.pal" LoadIcePathPalette: ld a, BANK(wBGPals1) 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.2bpp.lz.467b6a2d deleted file mode 100644 index fa5d0a9f0..000000000 Binary files a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d and /dev/null differ diff --git a/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower.pal deleted file mode 100644 index 4e71a5575..000000000 --- a/gfx/tilesets/battle_tower.pal +++ /dev/null @@ -1,40 +0,0 @@ -; gray - RGB 30, 28, 26 - RGB 19, 19, 19 - RGB 13, 13, 13 - RGB 07, 07, 07 -; red - RGB 30, 28, 26 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 -; green - RGB 18, 24, 09 - RGB 15, 20, 01 - RGB 09, 13, 00 - RGB 07, 07, 07 -; water (blue) - RGB 30, 28, 26 - RGB 15, 16, 31 - RGB 09, 09, 31 - RGB 07, 07, 07 -; yellow - RGB 30, 28, 26 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 -; brown - RGB 26, 24, 17 - RGB 21, 17, 07 - RGB 16, 13, 03 - RGB 07, 07, 07 -; roof - RGB 05, 05, 16 - RGB 08, 19, 28 - RGB 00, 00, 00 - RGB 31, 31, 31 -; text - RGB 31, 31, 16 - RGB 31, 31, 16 - RGB 14, 09, 00 - RGB 00, 00, 00 diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower.png deleted file mode 100644 index cf9e12d53..000000000 Binary files a/gfx/tilesets/battle_tower.png and /dev/null differ diff --git a/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d new file mode 100644 index 000000000..fa5d0a9f0 Binary files /dev/null and b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d differ diff --git a/gfx/tilesets/battle_tower_inside.pal b/gfx/tilesets/battle_tower_inside.pal new file mode 100644 index 000000000..4e71a5575 --- /dev/null +++ b/gfx/tilesets/battle_tower_inside.pal @@ -0,0 +1,40 @@ +; gray + RGB 30, 28, 26 + RGB 19, 19, 19 + RGB 13, 13, 13 + RGB 07, 07, 07 +; red + RGB 30, 28, 26 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 +; green + RGB 18, 24, 09 + RGB 15, 20, 01 + RGB 09, 13, 00 + RGB 07, 07, 07 +; water (blue) + RGB 30, 28, 26 + RGB 15, 16, 31 + RGB 09, 09, 31 + RGB 07, 07, 07 +; yellow + RGB 30, 28, 26 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 +; brown + RGB 26, 24, 17 + RGB 21, 17, 07 + RGB 16, 13, 03 + RGB 07, 07, 07 +; roof + RGB 05, 05, 16 + RGB 08, 19, 28 + RGB 00, 00, 00 + RGB 31, 31, 31 +; text + RGB 31, 31, 16 + RGB 31, 31, 16 + RGB 14, 09, 00 + RGB 00, 00, 00 diff --git a/gfx/tilesets/battle_tower_inside.png b/gfx/tilesets/battle_tower_inside.png new file mode 100644 index 000000000..cf9e12d53 Binary files /dev/null and b/gfx/tilesets/battle_tower_inside.png differ diff --git a/gfx/tilesets/battle_tower_inside_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm new file mode 100644 index 000000000..1abce2a16 --- /dev/null +++ b/gfx/tilesets/battle_tower_inside_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY + tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER + tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN + tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER + tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED + tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_palette_map.asm deleted file mode 100644 index 1abce2a16..000000000 --- a/gfx/tilesets/battle_tower_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN - tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN - tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY - tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER - tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN - tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED - tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER - tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED - tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER - -rept 16 - db $ff -endr - - tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED - tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER - tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED - tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED - tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED - tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN - tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY -- cgit v1.2.3