Clean up color/palette code

This commit is contained in:
Remy Oukaour
2017-12-25 12:41:31 -05:00
parent ec8c9688ce
commit da2b01a36c
32 changed files with 418 additions and 526 deletions

View File

@@ -1,4 +1,3 @@
_AnimateTileset:: ; fc000
; Iterate over a given pointer array of
; animation functions (one per frame).

View File

@@ -1,8 +1,3 @@
SECTION "Roofs", ROMX
INCLUDE "tilesets/roofs.asm"
SECTION "Tileset Data 1", ROMX
TilesetKantoGFX: ; 0x18000

View File

@@ -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

View File

@@ -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