Merge pull request #19 from JustRegularLuna/master

Minor clean up, Improve tileset palette assignments

color/data/map_palette_assignments.asm

@@ -1,31 +1,95 @@
-; $60 bytes for each tileset. Each byte is the palette number for a tile.
-; Remaining $a0 tiles aren't part of the tileset and are set to 7 (text palette).
+; One byte for each tile in the tileset
+; Remaining tiles are set to 7 (text palette).
 ; Refer to MapPaletteSets for clarification on specific colors
 ; These use the pokecrystal macro for tileset palettes
 ; Also, this repo can use Polished Map's "Priority Colors" already
 ; In the event of Duplicate tilesets, the asm files are named to match the png files
 MapPaletteAssignments:
-	INCLUDE "color/tilesets/overworld.asm"   ; OVERWORLD
-	INCLUDE "color/tilesets/reds_house.asm"  ; REDS_HOUSE_1  (Duplicate of REDS_HOUSE_2)
-	INCLUDE "color/tilesets/pokecenter.asm"  ; MART          (Duplicate of POKECENTER)
-	INCLUDE "color/tilesets/forest.asm"      ; FOREST
-	INCLUDE "color/tilesets/reds_house.asm"  ; REDS_HOUSE_2  (Duplicate of REDS_HOUSE_1)
-	INCLUDE "color/tilesets/gym.asm"         ; DOJO          (Duplicate of GYM)
-	INCLUDE "color/tilesets/pokecenter.asm"  ; POKECENTER    (Duplicate of MART)
-	INCLUDE "color/tilesets/gym.asm"         ; GYM           (Duplicate of DOJO)
-	INCLUDE "color/tilesets/house.asm"       ; HOUSE
-	INCLUDE "color/tilesets/gate.asm"        ; FOREST_GATE   (Duplicate of GATE and MUSEUM)
-	INCLUDE "color/tilesets/gate.asm"        ; MUSEUM        (Duplicate of GATE and FOREST_GATE)
-	INCLUDE "color/tilesets/underground.asm" ; UNDERGROUND
-	INCLUDE "color/tilesets/gate.asm"        ; GATE          (Duplicate of FOREST_GATE and MUSEUM)
-	INCLUDE "color/tilesets/ship.asm"        ; SHIP
-	INCLUDE "color/tilesets/ship_port.asm"   ; SHIP_PORT
-	INCLUDE "color/tilesets/cemetery.asm"    ; CEMETERY
-	INCLUDE "color/tilesets/interior.asm"    ; INTERIOR
-	INCLUDE "color/tilesets/cavern.asm"      ; CAVERN
-	INCLUDE "color/tilesets/lobby.asm"       ; LOBBY
-	INCLUDE "color/tilesets/mansion.asm"     ; MANSION
-	INCLUDE "color/tilesets/lab.asm"         ; LAB
-	INCLUDE "color/tilesets/club.asm"        ; CLUB
-	INCLUDE "color/tilesets/facility.asm"    ; FACILITY
-	INCLUDE "color/tilesets/plateau.asm"     ; PLATEAU
+	table_width 2, MapPaletteAssignments
+	dw OverworldPalMap   ; OVERWORLD
+	dw RedsHouse1PalMap  ; REDS_HOUSE_1
+	dw MartPalMap        ; MART
+	dw ForestPalMap      ; FOREST
+	dw RedsHouse2PalMap  ; REDS_HOUSE_2
+	dw DojoPalMap        ; DOJO
+	dw PokecenterPalMap  ; POKECENTER
+	dw GymPalMap         ; GYM
+	dw HousePalMap       ; HOUSE
+	dw ForestGatePalMap  ; FOREST_GATE
+	dw MuseumPalMap      ; MUSEUM
+	dw UndergroundPalMap ; UNDERGROUND
+	dw GatePalMap        ; GATE
+	dw ShipPalMap        ; SHIP
+	dw ShipPortPalMap    ; SHIP_PORT
+	dw CemeteryPalMap    ; CEMETERY
+	dw InteriorPalMap    ; INTERIOR
+	dw CavernPalMap      ; CAVERN
+	dw LobbyPalMap       ; LOBBY
+	dw MansionPalMap     ; MANSION
+	dw LabPalMap         ; LAB
+	dw ClubPalMap        ; CLUB
+	dw FacilityPalMap    ; FACILITY
+	dw PlateauPalMap     ; PLATEAU
+	assert_table_length NUM_TILESETS
+
+OverworldPalMap:
+	INCLUDE "color/tilesets/overworld.asm"
+
+RedsHouse1PalMap:
+RedsHouse2PalMap:
+	INCLUDE "color/tilesets/reds_house.asm"
+
+MartPalMap:
+PokecenterPalMap:
+	INCLUDE "color/tilesets/pokecenter.asm"
+
+ForestPalMap:
+	INCLUDE "color/tilesets/forest.asm"
+
+DojoPalMap:
+GymPalMap:
+	INCLUDE "color/tilesets/gym.asm"
+
+HousePalMap:
+	INCLUDE "color/tilesets/house.asm"
+
+GatePalMap:
+ForestGatePalMap:
+MuseumPalMap:
+	INCLUDE "color/tilesets/gate.asm"
+
+UndergroundPalMap:
+	INCLUDE "color/tilesets/underground.asm"
+
+ShipPalMap:
+	INCLUDE "color/tilesets/ship.asm"
+
+ShipPortPalMap:
+	INCLUDE "color/tilesets/ship_port.asm"
+
+CemeteryPalMap:
+	INCLUDE "color/tilesets/cemetery.asm"
+
+InteriorPalMap:
+	INCLUDE "color/tilesets/interior.asm"
+
+CavernPalMap:
+	INCLUDE "color/tilesets/cavern.asm"
+
+LobbyPalMap:
+	INCLUDE "color/tilesets/lobby.asm"
+
+MansionPalMap:
+	INCLUDE "color/tilesets/mansion.asm"
+
+LabPalMap:
+	INCLUDE "color/tilesets/lab.asm"
+
+ClubPalMap:
+	INCLUDE "color/tilesets/club.asm"
+
+FacilityPalMap:
+	INCLUDE "color/tilesets/facility.asm"
+
+PlateauPalMap:
+	INCLUDE "color/tilesets/plateau.asm"

color/data/map_palette_sets.asm

@@ -1,6 +1,34 @@
 ; 8 bytes per tileset for 8 palettes, which are taken from MapPalettes.
 MapPaletteSets:
-; OVERWORLD
+	table_width 2, MapPaletteSets
+	dw OverworldPalSet   ; OVERWORLD
+	dw RedsHouse1PalSet  ; REDS_HOUSE_1
+	dw MartPalSet        ; MART
+	dw ForestPalSet      ; FOREST
+	dw RedsHouse2PalSet  ; REDS_HOUSE_2
+	dw DojoPalSet        ; DOJO
+	dw PokecenterPalSet  ; POKECENTER
+	dw GymPalSet         ; GYM
+	dw HousePalSet       ; HOUSE
+	dw ForestGatePalSet  ; FOREST_GATE
+	dw MuseumPalSet      ; MUSEUM
+	dw UndergroundPalSet ; UNDERGROUND
+	dw GatePalSet        ; GATE
+	dw ShipPalSet        ; SHIP
+	dw ShipPortPalSet    ; SHIP_PORT
+	dw CemeteryPalSet    ; CEMETERY
+	dw InteriorPalSet    ; INTERIOR
+	dw CavernPalSet      ; CAVERN
+	dw LobbyPalSet       ; LOBBY
+	dw MansionPalSet     ; MANSION
+	dw LabPalSet         ; LAB
+	dw ClubPalSet        ; CLUB
+	dw FacilityPalSet    ; FACILITY
+	dw PlateauPalSet     ; PLATEAU
+	assert_table_length NUM_TILESETS
+
+OverworldPalSet:
+PlateauPalSet:
 	db OUTDOOR_GRAY
 	db OUTDOOR_RED
 	db OUTDOOR_GREEN
@@ -10,7 +38,17 @@ MapPaletteSets:
 	db OUTDOOR_ROOF
 	db CRYS_TEXTBOX
 
-; REDS_HOUSE_1
+RedsHouse1PalSet:
+RedsHouse2PalSet:
+DojoPalSet:
+GymPalSet:
+HousePalSet:
+ForestGatePalSet:
+UndergroundPalSet:
+ShipPalSet:
+ShipPortPalSet:
+ClubPalSet:
+FacilityPalSet:
 	db INDOOR_GRAY
 	db INDOOR_RED
 	db INDOOR_GREEN
@@ -20,7 +58,11 @@ MapPaletteSets:
 	db INDOOR_LIGHT_BLUE
 	db CRYS_TEXTBOX
 
-; MART
+MartPalSet:
+InteriorPalSet:
+LobbyPalSet:
+MansionPalSet:
+LabPalSet:
 	db INDOOR_GRAY
 	db INDOOR_RED
 	db INDOOR_GREEN
@@ -30,7 +72,7 @@ MapPaletteSets:
 	db INDOOR_LIGHT_BLUE
 	db PC_POKEBALL_PAL
 
-; FOREST
+ForestPalSet:
 	db OUTDOOR_GRAY
 	db FOREST_ROCKS
 	db OUTDOOR_GREEN
@@ -40,27 +82,7 @@ MapPaletteSets:
 	db FOREST_TREES
 	db CRYS_TEXTBOX
 
-; REDS_HOUSE_2
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; DOJO
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; POKECENTER
+PokecenterPalSet:
 	db INDOOR_GRAY
 	db INDOOR_RED
 	db INDOOR_GREEN
@@ -70,37 +92,8 @@ MapPaletteSets:
 	db INDOOR_LIGHT_BLUE
 	db PC_POKEBALL_PAL
 
-; GYM
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; HOUSE
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; FOREST_GATE
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; MUSEUM
+MuseumPalSet:
+GatePalSet:
 	db INDOOR_GRAY
 	db INDOOR_RED
 	db INDOOR_GREEN
@@ -110,47 +103,7 @@ MapPaletteSets:
 	db INDOOR_LIGHT_BLUE
 	db ALT_TEXTBOX_PAL ; Uses variant of textbox palette for skeleton pokemon
 
-; UNDERGROUND
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; GATE
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db ALT_TEXTBOX_PAL ; Uses variant of textbox palette for Articuno binoculars
-
-; SHIP
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; SHIP_PORT
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; CEMETERY
+CemeteryPalSet:
 	db INDOOR_GRAY
 	db INDOOR_RED
 	db INDOOR_GREEN
@@ -160,17 +113,7 @@ MapPaletteSets:
 	db INDOOR_PURPLE
 	db CRYS_TEXTBOX
 
-; INTERIOR
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db PC_POKEBALL_PAL
-
-; CAVERN
+CavernPalSet:
 	db CAVE_GRAY
 	db CAVE_RED
 	db CAVE_GREEN
@@ -179,63 +122,3 @@ MapPaletteSets:
 	db CAVE_BROWN
 	db CAVE_LIGHT_BLUE
 	db CRYS_TEXTBOX
-
-; LOBBY
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db PC_POKEBALL_PAL
-
-; MANSION
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db PC_POKEBALL_PAL
-
-; LAB
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db PC_POKEBALL_PAL
-
-; CLUB
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; FACILITY
-	db INDOOR_GRAY
-	db INDOOR_RED
-	db INDOOR_GREEN
-	db INDOOR_BLUE
-	db INDOOR_YELLOW
-	db INDOOR_BROWN
-	db INDOOR_LIGHT_BLUE
-	db CRYS_TEXTBOX
-
-; PLATEAU
-	db OUTDOOR_GRAY
-	db OUTDOOR_RED
-	db OUTDOOR_GREEN
-	db OUTDOOR_BLUE
-	db OUTDOOR_YELLOW
-	db OUTDOOR_BROWN
-	db OUTDOOR_ROOF
-	db CRYS_TEXTBOX