diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/animations.asm | 1 | ||||
| -rw-r--r-- | tilesets/data.asm | 5 | ||||
| -rw-r--r-- | tilesets/palettes/battle_tower.pal (renamed from tilesets/battle_tower.pal) | 0 | ||||
| -rw-r--r-- | tilesets/palettes/house_1.pal (renamed from tilesets/house_1.pal) | 0 | ||||
| -rw-r--r-- | tilesets/palettes/ice_path.pal (renamed from tilesets/ice_path.pal) | 0 | ||||
| -rw-r--r-- | tilesets/palettes/pokecom_center.pal (renamed from tilesets/pokecom_center.pal) | 0 | ||||
| -rw-r--r-- | tilesets/palettes/radio_tower.pal (renamed from tilesets/radio_tower.pal) | 0 | ||||
| -rw-r--r-- | tilesets/roofs.asm | 9 | ||||
| -rw-r--r-- | tilesets/special_palettes.asm | 10 |
9 files changed, 5 insertions, 20 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm index 3de67ee6e..06f68234a 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -1,4 +1,3 @@ - _AnimateTileset:: ; fc000 ; Iterate over a given pointer array of ; animation functions (one per frame). diff --git a/tilesets/data.asm b/tilesets/data.asm index 7cd1b9072..c26b7d3d1 100644 --- a/tilesets/data.asm +++ b/tilesets/data.asm @@ -1,8 +1,3 @@ -SECTION "Roofs", ROMX - -INCLUDE "tilesets/roofs.asm" - - SECTION "Tileset Data 1", ROMX TilesetKantoGFX: ; 0x18000 diff --git a/tilesets/battle_tower.pal b/tilesets/palettes/battle_tower.pal index 4e71a5575..4e71a5575 100644 --- a/tilesets/battle_tower.pal +++ b/tilesets/palettes/battle_tower.pal diff --git a/tilesets/house_1.pal b/tilesets/palettes/house_1.pal index a9f8b74b6..a9f8b74b6 100644 --- a/tilesets/house_1.pal +++ b/tilesets/palettes/house_1.pal diff --git a/tilesets/ice_path.pal b/tilesets/palettes/ice_path.pal index cb7659f50..cb7659f50 100644 --- a/tilesets/ice_path.pal +++ b/tilesets/palettes/ice_path.pal diff --git a/tilesets/pokecom_center.pal b/tilesets/palettes/pokecom_center.pal index 9fe7b765a..9fe7b765a 100644 --- a/tilesets/pokecom_center.pal +++ b/tilesets/palettes/pokecom_center.pal diff --git a/tilesets/radio_tower.pal b/tilesets/palettes/radio_tower.pal index 5799b6f77..5799b6f77 100644 --- a/tilesets/radio_tower.pal +++ b/tilesets/palettes/radio_tower.pal diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index 0e43854dd..a9fd8a654 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -18,12 +18,3 @@ LoadMapGroupRoof:: ; 1c000 INCLUDE "data/maps/mapgroup_roofs.asm" - - -Roofs: ; 1c03c -INCBIN "gfx/tilesets/roofs/0.2bpp" -INCBIN "gfx/tilesets/roofs/1.2bpp" -INCBIN "gfx/tilesets/roofs/2.2bpp" -INCBIN "gfx/tilesets/roofs/3.2bpp" -INCBIN "gfx/tilesets/roofs/4.2bpp" -; 1c30c diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm index 5674d9f80..7ec2537e0 100644 --- a/tilesets/special_palettes.asm +++ b/tilesets/special_palettes.asm @@ -63,7 +63,7 @@ LoadPokeComPalette: ; 494f2 ; 49501 PokeComPalette: ; 49501 -INCLUDE "tilesets/pokecom_center.pal" +INCLUDE "tilesets/palettes/pokecom_center.pal" ; 49541 LoadBattleTowerPalette: ; 49541 @@ -76,7 +76,7 @@ LoadBattleTowerPalette: ; 49541 ; 49550 BattleTowerPalette: ; 49550 -INCLUDE "tilesets/battle_tower.pal" +INCLUDE "tilesets/palettes/battle_tower.pal" ; 49590 LoadIcePathPalette: ; 49590 @@ -89,7 +89,7 @@ LoadIcePathPalette: ; 49590 ; 4959f IcePathPalette: ; 4959f -INCLUDE "tilesets/ice_path.pal" +INCLUDE "tilesets/palettes/ice_path.pal" ; 495df LoadHousePalette: ; 495df @@ -102,7 +102,7 @@ LoadHousePalette: ; 495df ; 495ee HousePalette: ; 495ee -INCLUDE "tilesets/house_1.pal" +INCLUDE "tilesets/palettes/house_1.pal" ; 4962e LoadRadioTowerPalette: ; 4962e @@ -115,7 +115,7 @@ LoadRadioTowerPalette: ; 4962e ; 4963d RadioTowerPalette: ; 4963d -INCLUDE "tilesets/radio_tower.pal" +INCLUDE "tilesets/palettes/radio_tower.pal" ; 4967d MansionPalette1: ; 4967d |