diff options
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/diploma/page2.tilemap | bin | 361 -> 360 bytes | |||
| -rw-r--r-- | gfx/intro/background.attrmap (renamed from gfx/intro/003.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/background.attrmap.lz.9f90366a (renamed from gfx/intro/003.tilemap.lz.9f90366a) | bin | 16 -> 16 bytes | |||
| -rw-r--r-- | gfx/intro/background.pal (renamed from gfx/intro/intro_1.pal) | 0 | ||||
| -rw-r--r-- | gfx/intro/background.png | bin | 563 -> 562 bytes | |||
| -rw-r--r-- | gfx/intro/background.tilemap (renamed from gfx/intro/004.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/background.tilemap.lz.4c7562ee (renamed from gfx/intro/004.tilemap.lz.4c7562ee) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/intro/crystal_unowns.attrmap (renamed from gfx/intro/015.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 (renamed from gfx/intro/015.tilemap.lz.1bfc5a89) | bin | 48 -> 48 bytes | |||
| -rw-r--r-- | gfx/intro/crystal_unowns.pal (renamed from gfx/intro/intro_3.pal) | 0 | ||||
| -rw-r--r-- | gfx/intro/crystal_unowns.tilemap (renamed from gfx/intro/017.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/crystal_unowns.tilemap.lz.e4772015 (renamed from gfx/intro/017.tilemap.lz.e4772015) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | gfx/intro/suicune.pal (renamed from gfx/intro/intro_5.pal) | 0 | ||||
| -rw-r--r-- | gfx/intro/suicune_back.attrmap (renamed from gfx/intro/013.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_back.attrmap.lz.18e3115f (renamed from gfx/intro/013.tilemap.lz.18e3115f) | bin | 80 -> 80 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_back.tilemap (renamed from gfx/intro/014.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_back.tilemap.lz.7b59259d (renamed from gfx/intro/014.tilemap.lz.7b59259d) | bin | 208 -> 208 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_close.attrmap (renamed from gfx/intro/011.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_close.attrmap.lz.bb066632 (renamed from gfx/intro/011.tilemap.lz.bb066632) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_close.pal (renamed from gfx/intro/intro_4.pal) | 0 | ||||
| -rw-r--r-- | gfx/intro/suicune_close.tilemap (renamed from gfx/intro/012.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_close.tilemap.lz.bc182264 (renamed from gfx/intro/012.tilemap.lz.bc182264) | bin | 208 -> 208 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_jump.attrmap (renamed from gfx/intro/009.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_jump.attrmap.lz.911a1ace (renamed from gfx/intro/009.tilemap.lz.911a1ace) | bin | 16 -> 16 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_jump.tilemap (renamed from gfx/intro/010.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/suicune_jump.tilemap.lz.2717d106 (renamed from gfx/intro/010.tilemap.lz.2717d106) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/intro/unown_a.attrmap (renamed from gfx/intro/001.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unown_a.attrmap.lz.c2341875 (renamed from gfx/intro/001.tilemap.lz.c2341875) | bin | 16 -> 16 bytes | |||
| -rw-r--r-- | gfx/intro/unown_a.tilemap (renamed from gfx/intro/002.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unown_a.tilemap.lz.54d5b74b (renamed from gfx/intro/002.tilemap.lz.54d5b74b) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | gfx/intro/unown_hi.attrmap (renamed from gfx/intro/005.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unown_hi.attrmap.lz.bed1ff6d (renamed from gfx/intro/005.tilemap.lz.bed1ff6d) | bin | 32 -> 32 bytes | |||
| -rw-r--r-- | gfx/intro/unown_hi.tilemap (renamed from gfx/intro/006.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unown_hi.tilemap.lz.c8756972 (renamed from gfx/intro/006.tilemap.lz.c8756972) | bin | 80 -> 80 bytes | |||
| -rw-r--r-- | gfx/intro/unowns.attrmap (renamed from gfx/intro/007.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unowns.attrmap.lz.a9cbcbca (renamed from gfx/intro/007.tilemap.lz.a9cbcbca) | bin | 80 -> 80 bytes | |||
| -rw-r--r-- | gfx/intro/unowns.pal (renamed from gfx/intro/intro_2.pal) | 0 | ||||
| -rw-r--r-- | gfx/intro/unowns.tilemap (renamed from gfx/intro/008.tilemap) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | gfx/intro/unowns.tilemap.lz.f12ed6d9 (renamed from gfx/intro/008.tilemap.lz.f12ed6d9) | bin | 192 -> 192 bytes | |||
| -rw-r--r-- | gfx/mobile/pokemon_news.bin (renamed from gfx/unknown/17eb8e.attrmap) | bin | 1128 -> 1128 bytes | |||
| -rw-r--r-- | gfx/pokedex/question_mark.2bpp.lz.6e639380 (renamed from gfx/pokedex/question_mark.2bpp.lz.14c284f5) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/sgb/sgb_border_nonmatching.bin | bin | 0 -> 1792 bytes | |||
| -rw-r--r-- | gfx/tileset_palette_maps.asm | 4 | ||||
| -rw-r--r-- | gfx/tilesets.asm | 234 | ||||
| -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 |
48 files changed, 120 insertions, 118 deletions
diff --git a/gfx/diploma/page2.tilemap b/gfx/diploma/page2.tilemap Binary files differindex e37c6b27d..26e0d07b3 100644 --- a/gfx/diploma/page2.tilemap +++ b/gfx/diploma/page2.tilemap diff --git a/gfx/intro/003.tilemap b/gfx/intro/background.attrmap Binary files differindex 98512513c..98512513c 100644 --- a/gfx/intro/003.tilemap +++ b/gfx/intro/background.attrmap diff --git a/gfx/intro/003.tilemap.lz.9f90366a b/gfx/intro/background.attrmap.lz.9f90366a Binary files differindex 182ffb130..182ffb130 100644 --- a/gfx/intro/003.tilemap.lz.9f90366a +++ b/gfx/intro/background.attrmap.lz.9f90366a diff --git a/gfx/intro/intro_1.pal b/gfx/intro/background.pal index ae0faadac..ae0faadac 100644 --- a/gfx/intro/intro_1.pal +++ b/gfx/intro/background.pal diff --git a/gfx/intro/background.png b/gfx/intro/background.png Binary files differindex ede95e46b..dfb2b62ff 100644 --- a/gfx/intro/background.png +++ b/gfx/intro/background.png diff --git a/gfx/intro/004.tilemap b/gfx/intro/background.tilemap Binary files differindex 2dd6b6ea7..2dd6b6ea7 100644 --- a/gfx/intro/004.tilemap +++ b/gfx/intro/background.tilemap diff --git a/gfx/intro/004.tilemap.lz.4c7562ee b/gfx/intro/background.tilemap.lz.4c7562ee Binary files differindex 5897d176b..5897d176b 100644 --- a/gfx/intro/004.tilemap.lz.4c7562ee +++ b/gfx/intro/background.tilemap.lz.4c7562ee diff --git a/gfx/intro/015.tilemap b/gfx/intro/crystal_unowns.attrmap Binary files differindex f97c9cb93..f97c9cb93 100644 --- a/gfx/intro/015.tilemap +++ b/gfx/intro/crystal_unowns.attrmap diff --git a/gfx/intro/015.tilemap.lz.1bfc5a89 b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 Binary files differindex 22a4cc926..22a4cc926 100644 --- a/gfx/intro/015.tilemap.lz.1bfc5a89 +++ b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 diff --git a/gfx/intro/intro_3.pal b/gfx/intro/crystal_unowns.pal index 95f3e052a..95f3e052a 100644 --- a/gfx/intro/intro_3.pal +++ b/gfx/intro/crystal_unowns.pal diff --git a/gfx/intro/017.tilemap b/gfx/intro/crystal_unowns.tilemap Binary files differindex 05c37dbf2..05c37dbf2 100644 --- a/gfx/intro/017.tilemap +++ b/gfx/intro/crystal_unowns.tilemap diff --git a/gfx/intro/017.tilemap.lz.e4772015 b/gfx/intro/crystal_unowns.tilemap.lz.e4772015 Binary files differindex 90ce59e58..90ce59e58 100644 --- a/gfx/intro/017.tilemap.lz.e4772015 +++ b/gfx/intro/crystal_unowns.tilemap.lz.e4772015 diff --git a/gfx/intro/intro_5.pal b/gfx/intro/suicune.pal index 5b1be1a5f..5b1be1a5f 100644 --- a/gfx/intro/intro_5.pal +++ b/gfx/intro/suicune.pal diff --git a/gfx/intro/013.tilemap b/gfx/intro/suicune_back.attrmap Binary files differindex 28e27ad62..28e27ad62 100644 --- a/gfx/intro/013.tilemap +++ b/gfx/intro/suicune_back.attrmap diff --git a/gfx/intro/013.tilemap.lz.18e3115f b/gfx/intro/suicune_back.attrmap.lz.18e3115f Binary files differindex 91635527c..91635527c 100644 --- a/gfx/intro/013.tilemap.lz.18e3115f +++ b/gfx/intro/suicune_back.attrmap.lz.18e3115f diff --git a/gfx/intro/014.tilemap b/gfx/intro/suicune_back.tilemap Binary files differindex 52829cc74..52829cc74 100644 --- a/gfx/intro/014.tilemap +++ b/gfx/intro/suicune_back.tilemap diff --git a/gfx/intro/014.tilemap.lz.7b59259d b/gfx/intro/suicune_back.tilemap.lz.7b59259d Binary files differindex a892ab1b4..a892ab1b4 100644 --- a/gfx/intro/014.tilemap.lz.7b59259d +++ b/gfx/intro/suicune_back.tilemap.lz.7b59259d diff --git a/gfx/intro/011.tilemap b/gfx/intro/suicune_close.attrmap Binary files differindex 59f365a34..59f365a34 100644 --- a/gfx/intro/011.tilemap +++ b/gfx/intro/suicune_close.attrmap diff --git a/gfx/intro/011.tilemap.lz.bb066632 b/gfx/intro/suicune_close.attrmap.lz.bb066632 Binary files differindex 68ceb19f8..68ceb19f8 100644 --- a/gfx/intro/011.tilemap.lz.bb066632 +++ b/gfx/intro/suicune_close.attrmap.lz.bb066632 diff --git a/gfx/intro/intro_4.pal b/gfx/intro/suicune_close.pal index fdcf058de..fdcf058de 100644 --- a/gfx/intro/intro_4.pal +++ b/gfx/intro/suicune_close.pal diff --git a/gfx/intro/012.tilemap b/gfx/intro/suicune_close.tilemap Binary files differindex 3577fc467..3577fc467 100644 --- a/gfx/intro/012.tilemap +++ b/gfx/intro/suicune_close.tilemap diff --git a/gfx/intro/012.tilemap.lz.bc182264 b/gfx/intro/suicune_close.tilemap.lz.bc182264 Binary files differindex 0d6af294c..0d6af294c 100644 --- a/gfx/intro/012.tilemap.lz.bc182264 +++ b/gfx/intro/suicune_close.tilemap.lz.bc182264 diff --git a/gfx/intro/009.tilemap b/gfx/intro/suicune_jump.attrmap Binary files differindex 554e919a8..554e919a8 100644 --- a/gfx/intro/009.tilemap +++ b/gfx/intro/suicune_jump.attrmap diff --git a/gfx/intro/009.tilemap.lz.911a1ace b/gfx/intro/suicune_jump.attrmap.lz.911a1ace Binary files differindex 238d6a60e..238d6a60e 100644 --- a/gfx/intro/009.tilemap.lz.911a1ace +++ b/gfx/intro/suicune_jump.attrmap.lz.911a1ace diff --git a/gfx/intro/010.tilemap b/gfx/intro/suicune_jump.tilemap Binary files differindex 4ddef19c7..4ddef19c7 100644 --- a/gfx/intro/010.tilemap +++ b/gfx/intro/suicune_jump.tilemap diff --git a/gfx/intro/010.tilemap.lz.2717d106 b/gfx/intro/suicune_jump.tilemap.lz.2717d106 Binary files differindex 6e45c45f7..6e45c45f7 100644 --- a/gfx/intro/010.tilemap.lz.2717d106 +++ b/gfx/intro/suicune_jump.tilemap.lz.2717d106 diff --git a/gfx/intro/001.tilemap b/gfx/intro/unown_a.attrmap Binary files differindex 8b1b66033..8b1b66033 100644 --- a/gfx/intro/001.tilemap +++ b/gfx/intro/unown_a.attrmap diff --git a/gfx/intro/001.tilemap.lz.c2341875 b/gfx/intro/unown_a.attrmap.lz.c2341875 Binary files differindex 926fb6e8e..926fb6e8e 100644 --- a/gfx/intro/001.tilemap.lz.c2341875 +++ b/gfx/intro/unown_a.attrmap.lz.c2341875 diff --git a/gfx/intro/002.tilemap b/gfx/intro/unown_a.tilemap Binary files differindex 6a035d14a..6a035d14a 100644 --- a/gfx/intro/002.tilemap +++ b/gfx/intro/unown_a.tilemap diff --git a/gfx/intro/002.tilemap.lz.54d5b74b b/gfx/intro/unown_a.tilemap.lz.54d5b74b Binary files differindex c63f215f2..c63f215f2 100644 --- a/gfx/intro/002.tilemap.lz.54d5b74b +++ b/gfx/intro/unown_a.tilemap.lz.54d5b74b diff --git a/gfx/intro/005.tilemap b/gfx/intro/unown_hi.attrmap Binary files differindex 3f7d23b64..3f7d23b64 100644 --- a/gfx/intro/005.tilemap +++ b/gfx/intro/unown_hi.attrmap diff --git a/gfx/intro/005.tilemap.lz.bed1ff6d b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d Binary files differindex 0ae96b7f7..0ae96b7f7 100644 --- a/gfx/intro/005.tilemap.lz.bed1ff6d +++ b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d diff --git a/gfx/intro/006.tilemap b/gfx/intro/unown_hi.tilemap Binary files differindex 4af27a158..4af27a158 100644 --- a/gfx/intro/006.tilemap +++ b/gfx/intro/unown_hi.tilemap diff --git a/gfx/intro/006.tilemap.lz.c8756972 b/gfx/intro/unown_hi.tilemap.lz.c8756972 Binary files differindex 46436b607..46436b607 100644 --- a/gfx/intro/006.tilemap.lz.c8756972 +++ b/gfx/intro/unown_hi.tilemap.lz.c8756972 diff --git a/gfx/intro/007.tilemap b/gfx/intro/unowns.attrmap Binary files differindex 2e3fdb41a..2e3fdb41a 100644 --- a/gfx/intro/007.tilemap +++ b/gfx/intro/unowns.attrmap diff --git a/gfx/intro/007.tilemap.lz.a9cbcbca b/gfx/intro/unowns.attrmap.lz.a9cbcbca Binary files differindex d1694ed3e..d1694ed3e 100644 --- a/gfx/intro/007.tilemap.lz.a9cbcbca +++ b/gfx/intro/unowns.attrmap.lz.a9cbcbca diff --git a/gfx/intro/intro_2.pal b/gfx/intro/unowns.pal index 5f83df020..5f83df020 100644 --- a/gfx/intro/intro_2.pal +++ b/gfx/intro/unowns.pal diff --git a/gfx/intro/008.tilemap b/gfx/intro/unowns.tilemap Binary files differindex 903f59ae5..903f59ae5 100644 --- a/gfx/intro/008.tilemap +++ b/gfx/intro/unowns.tilemap diff --git a/gfx/intro/008.tilemap.lz.f12ed6d9 b/gfx/intro/unowns.tilemap.lz.f12ed6d9 Binary files differindex 356c6d5e8..356c6d5e8 100644 --- a/gfx/intro/008.tilemap.lz.f12ed6d9 +++ b/gfx/intro/unowns.tilemap.lz.f12ed6d9 diff --git a/gfx/unknown/17eb8e.attrmap b/gfx/mobile/pokemon_news.bin Binary files differindex 24a0bcfee..24a0bcfee 100644 --- a/gfx/unknown/17eb8e.attrmap +++ b/gfx/mobile/pokemon_news.bin diff --git a/gfx/pokedex/question_mark.2bpp.lz.14c284f5 b/gfx/pokedex/question_mark.2bpp.lz.6e639380 Binary files differindex cd2f7f22e..cd2f7f22e 100644 --- a/gfx/pokedex/question_mark.2bpp.lz.14c284f5 +++ b/gfx/pokedex/question_mark.2bpp.lz.6e639380 diff --git a/gfx/sgb/sgb_border_nonmatching.bin b/gfx/sgb/sgb_border_nonmatching.bin Binary files differnew file mode 100644 index 000000000..5ad4fb002 --- /dev/null +++ b/gfx/sgb/sgb_border_nonmatching.bin 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..72410ef30 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + tilecoll: MACRO ; used in data/tilesets/*_collision.asm db COLL_\1, COLL_\2, COLL_\3, COLL_\4 @@ -6,332 +8,332 @@ ENDM SECTION "Tileset Data 1", ROMX -TilesetKantoGFX: +TilesetKantoGFX:: INCBIN "gfx/tilesets/kanto.2bpp.lz" -TilesetKantoMeta: +TilesetKantoMeta:: INCBIN "data/tilesets/kanto_metatiles.bin" -TilesetKantoColl: +TilesetKantoColl:: INCLUDE "data/tilesets/kanto_collision.asm" -Tileset0GFX: -TilesetJohtoGFX: +Tileset0GFX:: +TilesetJohtoGFX:: INCBIN "gfx/tilesets/johto.2bpp.lz" -Tileset0Meta: -TilesetJohtoMeta: +Tileset0Meta:: +TilesetJohtoMeta:: INCBIN "data/tilesets/johto_metatiles.bin" -Tileset0Coll: -TilesetJohtoColl: +Tileset0Coll:: +TilesetJohtoColl:: INCLUDE "data/tilesets/johto_collision.asm" -TilesetIcePathGFX: +TilesetIcePathGFX:: INCBIN "gfx/tilesets/ice_path.2bpp.lz" -TilesetIcePathMeta: +TilesetIcePathMeta:: INCBIN "data/tilesets/ice_path_metatiles.bin" -TilesetIcePathColl: +TilesetIcePathColl:: INCLUDE "data/tilesets/ice_path_collision.asm" -TilesetPlayersRoomGFX: +TilesetPlayersRoomGFX:: INCBIN "gfx/tilesets/players_room.2bpp.lz" -TilesetPlayersRoomMeta: +TilesetPlayersRoomMeta:: INCBIN "data/tilesets/players_room_metatiles.bin" -TilesetPlayersRoomColl: +TilesetPlayersRoomColl:: INCLUDE "data/tilesets/players_room_collision.asm" SECTION "Tileset Data 2", ROMX -TilesetPokecenterGFX: +TilesetPokecenterGFX:: INCBIN "gfx/tilesets/pokecenter.2bpp.lz" -TilesetPokecenterMeta: +TilesetPokecenterMeta:: INCBIN "data/tilesets/pokecenter_metatiles.bin" -TilesetPokecenterColl: +TilesetPokecenterColl:: INCLUDE "data/tilesets/pokecenter_collision.asm" -TilesetPortGFX: +TilesetPortGFX:: INCBIN "gfx/tilesets/port.2bpp.lz" -TilesetPortMeta: +TilesetPortMeta:: INCBIN "data/tilesets/port_metatiles.bin" -TilesetPortColl: +TilesetPortColl:: INCLUDE "data/tilesets/port_collision.asm" -TilesetPlayersHouseGFX: +TilesetPlayersHouseGFX:: INCBIN "gfx/tilesets/players_house.2bpp.lz" -TilesetPlayersHouseMeta: +TilesetPlayersHouseMeta:: INCBIN "data/tilesets/players_house_metatiles.bin" -TilesetPlayersHouseColl: +TilesetPlayersHouseColl:: INCLUDE "data/tilesets/players_house_collision.asm" -TilesetMansionGFX: +TilesetMansionGFX:: INCBIN "gfx/tilesets/mansion.2bpp.lz" -TilesetMansionMeta: +TilesetMansionMeta:: INCBIN "data/tilesets/mansion_metatiles.bin" -TilesetMansionColl: +TilesetMansionColl:: INCLUDE "data/tilesets/mansion_collision.asm" -TilesetCaveGFX: +TilesetCaveGFX:: INCBIN "gfx/tilesets/cave.2bpp.lz" -TilesetCaveMeta: -TilesetDarkCaveMeta: +TilesetCaveMeta:: +TilesetDarkCaveMeta:: INCBIN "data/tilesets/cave_metatiles.bin" -TilesetCaveColl: -TilesetDarkCaveColl: +TilesetCaveColl:: +TilesetDarkCaveColl:: INCLUDE "data/tilesets/cave_collision.asm" SECTION "Tileset Data 3", ROMX -TilesetTowerGFX: +TilesetTowerGFX:: INCBIN "gfx/tilesets/tower.2bpp.lz" -TilesetTowerMeta: +TilesetTowerMeta:: INCBIN "data/tilesets/tower_metatiles.bin" -TilesetTowerColl: +TilesetTowerColl:: INCLUDE "data/tilesets/tower_collision.asm" -TilesetLabGFX: +TilesetLabGFX:: INCBIN "gfx/tilesets/lab.2bpp.lz" -TilesetLabMeta: +TilesetLabMeta:: INCBIN "data/tilesets/lab_metatiles.bin" -TilesetLabColl: +TilesetLabColl:: INCLUDE "data/tilesets/lab_collision.asm" -TilesetMartGFX: +TilesetMartGFX:: INCBIN "gfx/tilesets/mart.2bpp.lz" -TilesetMartMeta: +TilesetMartMeta:: INCBIN "data/tilesets/mart_metatiles.bin" -TilesetMartColl: +TilesetMartColl:: INCLUDE "data/tilesets/mart_collision.asm" -TilesetGameCornerGFX: +TilesetGameCornerGFX:: INCBIN "gfx/tilesets/game_corner.2bpp.lz" -TilesetGameCornerMeta: +TilesetGameCornerMeta:: INCBIN "data/tilesets/game_corner_metatiles.bin" -TilesetGameCornerColl: +TilesetGameCornerColl:: INCLUDE "data/tilesets/game_corner_collision.asm" -TilesetTrainStationGFX: +TilesetTrainStationGFX:: INCBIN "gfx/tilesets/train_station.2bpp.lz" -TilesetTrainStationMeta: +TilesetTrainStationMeta:: INCBIN "data/tilesets/train_station_metatiles.bin" -TilesetTrainStationColl: +TilesetTrainStationColl:: INCLUDE "data/tilesets/train_station_collision.asm" -TilesetForestMeta: +TilesetForestMeta:: INCBIN "data/tilesets/forest_metatiles.bin" SECTION "Tileset Data 4", ROMX -TilesetEliteFourRoomGFX: +TilesetEliteFourRoomGFX:: INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" -TilesetEliteFourRoomMeta: +TilesetEliteFourRoomMeta:: INCBIN "data/tilesets/elite_four_room_metatiles.bin" -TilesetEliteFourRoomColl: +TilesetEliteFourRoomColl:: INCLUDE "data/tilesets/elite_four_room_collision.asm" -TilesetParkGFX: +TilesetParkGFX:: INCBIN "gfx/tilesets/park.2bpp.lz" -TilesetParkMeta: +TilesetParkMeta:: INCBIN "data/tilesets/park_metatiles.bin" -TilesetParkColl: +TilesetParkColl:: INCLUDE "data/tilesets/park_collision.asm" -TilesetRadioTowerGFX: +TilesetRadioTowerGFX:: INCBIN "gfx/tilesets/radio_tower.2bpp.lz" -TilesetRadioTowerMeta: +TilesetRadioTowerMeta:: INCBIN "data/tilesets/radio_tower_metatiles.bin" -TilesetRadioTowerColl: +TilesetRadioTowerColl:: INCLUDE "data/tilesets/radio_tower_collision.asm" -TilesetUndergroundGFX: +TilesetUndergroundGFX:: INCBIN "gfx/tilesets/underground.2bpp.lz" -TilesetUndergroundMeta: +TilesetUndergroundMeta:: INCBIN "data/tilesets/underground_metatiles.bin" -TilesetUndergroundColl: +TilesetUndergroundColl:: INCLUDE "data/tilesets/underground_collision.asm" -TilesetDarkCaveGFX: +TilesetDarkCaveGFX:: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -UnusedTilesetDarkCaveMeta: +UnusedTilesetDarkCaveMeta:: INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" -UnusedTilesetDarkCaveColl: +UnusedTilesetDarkCaveColl:: INCLUDE "data/tilesets/unused_dark_cave_collision.asm" SECTION "Tileset Data 5", ROMX -TilesetPokeComCenterGFX: +TilesetPokeComCenterGFX:: INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" -TilesetPokeComCenterMeta: +TilesetPokeComCenterMeta:: INCBIN "data/tilesets/pokecom_center_metatiles.bin" -TilesetPokeComCenterColl: +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: +TilesetGateGFX:: INCBIN "gfx/tilesets/gate.2bpp.lz" -TilesetGateMeta: +TilesetGateMeta:: INCBIN "data/tilesets/gate_metatiles.bin" -TilesetGateColl: +TilesetGateColl:: INCLUDE "data/tilesets/gate_collision.asm" -TilesetJohtoModernGFX: -TilesetBattleTowerOutsideGFX: +TilesetJohtoModernGFX:: +TilesetBattleTowerOutsideGFX:: INCBIN "gfx/tilesets/johto_modern.2bpp.lz" -TilesetJohtoModernMeta: +TilesetJohtoModernMeta:: INCBIN "data/tilesets/johto_modern_metatiles.bin" -TilesetJohtoModernColl: +TilesetJohtoModernColl:: INCLUDE "data/tilesets/johto_modern_collision.asm" -TilesetTraditionalHouseGFX: +TilesetTraditionalHouseGFX:: INCBIN "gfx/tilesets/traditional_house.2bpp.lz" -TilesetTraditionalHouseMeta: +TilesetTraditionalHouseMeta:: INCBIN "data/tilesets/traditional_house_metatiles.bin" -TilesetTraditionalHouseColl: +TilesetTraditionalHouseColl:: INCLUDE "data/tilesets/traditional_house_collision.asm" SECTION "Tileset Data 6", ROMX -TilesetForestGFX: +TilesetForestGFX:: INCBIN "gfx/tilesets/forest.2bpp.lz" -TilesetChampionsRoomGFX: +TilesetChampionsRoomGFX:: INCBIN "gfx/tilesets/champions_room.2bpp.lz" -TilesetChampionsRoomMeta: +TilesetChampionsRoomMeta:: INCBIN "data/tilesets/champions_room_metatiles.bin" -TilesetChampionsRoomColl: +TilesetChampionsRoomColl:: INCLUDE "data/tilesets/champions_room_collision.asm" -TilesetHouseGFX: +TilesetHouseGFX:: INCBIN "gfx/tilesets/house.2bpp.lz" -TilesetHouseMeta: +TilesetHouseMeta:: INCBIN "data/tilesets/house_metatiles.bin" -TilesetHouseColl: +TilesetHouseColl:: INCLUDE "data/tilesets/house_collision.asm" -TilesetLighthouseGFX: +TilesetLighthouseGFX:: INCBIN "gfx/tilesets/lighthouse.2bpp.lz" -TilesetLighthouseMeta: +TilesetLighthouseMeta:: INCBIN "data/tilesets/lighthouse_metatiles.bin" -TilesetLighthouseColl: +TilesetLighthouseColl:: INCLUDE "data/tilesets/lighthouse_collision.asm" -TilesetForestColl: +TilesetForestColl:: INCLUDE "data/tilesets/forest_collision.asm" -TilesetFacilityGFX: +TilesetFacilityGFX:: INCBIN "gfx/tilesets/facility.2bpp.lz" -TilesetFacilityMeta: +TilesetFacilityMeta:: INCBIN "data/tilesets/facility_metatiles.bin" -TilesetFacilityColl: +TilesetFacilityColl:: INCLUDE "data/tilesets/facility_collision.asm" -TilesetBattleTowerOutsideMeta: +TilesetBattleTowerOutsideMeta:: INCBIN "data/tilesets/battle_tower_outside_metatiles.bin" -TilesetBattleTowerOutsideColl: +TilesetBattleTowerOutsideColl:: INCLUDE "data/tilesets/battle_tower_outside_collision.asm" -TilesetBetaWordRoomMeta: +TilesetBetaWordRoomMeta:: INCBIN "data/tilesets/beta_word_room_metatiles.bin" -TilesetBetaWordRoomColl: -TilesetHoOhWordRoomColl: -TilesetKabutoWordRoomColl: -TilesetOmanyteWordRoomColl: -TilesetAerodactylWordRoomColl: +TilesetBetaWordRoomColl:: +TilesetHoOhWordRoomColl:: +TilesetKabutoWordRoomColl:: +TilesetOmanyteWordRoomColl:: +TilesetAerodactylWordRoomColl:: INCLUDE "data/tilesets/beta_word_room_collision.asm" SECTION "Tileset Data 7", ROMX -TilesetRuinsOfAlphGFX: -TilesetBetaWordRoomGFX: -TilesetHoOhWordRoomGFX: -TilesetKabutoWordRoomGFX: -TilesetOmanyteWordRoomGFX: -TilesetAerodactylWordRoomGFX: +TilesetRuinsOfAlphGFX:: +TilesetBetaWordRoomGFX:: +TilesetHoOhWordRoomGFX:: +TilesetKabutoWordRoomGFX:: +TilesetOmanyteWordRoomGFX:: +TilesetAerodactylWordRoomGFX:: INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" -TilesetRuinsOfAlphMeta: +TilesetRuinsOfAlphMeta:: INCBIN "data/tilesets/ruins_of_alph_metatiles.bin" -TilesetRuinsOfAlphColl: +TilesetRuinsOfAlphColl:: INCLUDE "data/tilesets/ruins_of_alph_collision.asm" SECTION "Tileset Data 8", ROMX -TilesetHoOhWordRoomMeta: +TilesetHoOhWordRoomMeta:: INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin" -TilesetKabutoWordRoomMeta: +TilesetKabutoWordRoomMeta:: INCBIN "data/tilesets/kabuto_word_room_metatiles.bin" -TilesetOmanyteWordRoomMeta: +TilesetOmanyteWordRoomMeta:: INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" -TilesetAerodactylWordRoomMeta: +TilesetAerodactylWordRoomMeta:: INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" 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 |
