summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--table/bridge_land.h6
-rw-r--r--table/sprites.h7
-rw-r--r--table/town_land.h74
3 files changed, 43 insertions, 44 deletions
diff --git a/table/bridge_land.h b/table/bridge_land.h
index a40055b60..9c5995aee 100644
--- a/table/bridge_land.h
+++ b/table/bridge_land.h
@@ -39,9 +39,9 @@ static const PalSpriteID _bridge_sprite_table_2_0[] = {
static const PalSpriteID _bridge_sprite_table_2_1[] = {
0x986, 0x988, 0x985, 0x987, 0x98A, 0x98C, 0x989, 0x98B,
- 0x98E | PALETTE_31D, 0x990 | PALETTE_31D, 0x98D | PALETTE_31D, 0x98F | PALETTE_31D, 0x992 | PALETTE_31D, 0x994 | PALETTE_31D, 0x991 | PALETTE_31D, 0x993 | PALETTE_31D,
- 0x10E7 | PALETTE_31D, 0x10E9 | PALETTE_31D, 0x10E6 | PALETTE_31D, 0x10E8 | PALETTE_31D, 0x10EB | PALETTE_31D, 0x10ED | PALETTE_31D, 0x10EA | PALETTE_31D, 0x10EC | PALETTE_31D,
- 0x110F | PALETTE_31D, 0x1111 | PALETTE_31D, 0x110E | PALETTE_31D, 0x1110 | PALETTE_31D, 0x1113 | PALETTE_31D, 0x1115 | PALETTE_31D, 0x1112 | PALETTE_31D, 0x1114 | PALETTE_31D,
+ 0x98E | PALETTE_TO_STRUCT_WHITE, 0x990 | PALETTE_TO_STRUCT_WHITE, 0x98D | PALETTE_TO_STRUCT_WHITE, 0x98F | PALETTE_TO_STRUCT_WHITE, 0x992 | PALETTE_TO_STRUCT_WHITE, 0x994 | PALETTE_TO_STRUCT_WHITE, 0x991 | PALETTE_TO_STRUCT_WHITE, 0x993 | PALETTE_TO_STRUCT_WHITE,
+ 0x10E7 | PALETTE_TO_STRUCT_WHITE, 0x10E9 | PALETTE_TO_STRUCT_WHITE, 0x10E6 | PALETTE_TO_STRUCT_WHITE, 0x10E8 | PALETTE_TO_STRUCT_WHITE, 0x10EB | PALETTE_TO_STRUCT_WHITE, 0x10ED | PALETTE_TO_STRUCT_WHITE, 0x10EA | PALETTE_TO_STRUCT_WHITE, 0x10EC | PALETTE_TO_STRUCT_WHITE,
+ 0x110F | PALETTE_TO_STRUCT_WHITE, 0x1111 | PALETTE_TO_STRUCT_WHITE, 0x110E | PALETTE_TO_STRUCT_WHITE, 0x1110 | PALETTE_TO_STRUCT_WHITE, 0x1113 | PALETTE_TO_STRUCT_WHITE, 0x1115 | PALETTE_TO_STRUCT_WHITE, 0x1112 | PALETTE_TO_STRUCT_WHITE, 0x1114 | PALETTE_TO_STRUCT_WHITE,
};
static const PalSpriteID _bridge_sprite_table_2_poles[] = {
diff --git a/table/sprites.h b/table/sprites.h
index 125b84857..8ee56c20d 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -1102,14 +1102,13 @@ enum PaletteSprites {
//sets color to bare land stuff, for rail and road (and crossings)
PALETTE_TO_BARE_LAND = PALETTE_RECOLOR_SPRITE(0x317),
//XXX is 318-31A really not used?
- //XXX FIXME I dunno yet what this is
- PALETTE_31B = PALETTE_RECOLOR_SPRITE(0x31B),
+ PALETTE_TO_STRUCT_BLUE = PALETTE_RECOLOR_SPRITE(0x31B),
//structure color to something brownish (for the cantilever bridges for example)
PALETTE_TO_STRUCT_BROWN = PALETTE_RECOLOR_SPRITE(0x31C),
- PALETTE_31D = PALETTE_RECOLOR_SPRITE(0x31D), //XXX FIXME Don't know this either
+ PALETTE_TO_STRUCT_WHITE = PALETTE_RECOLOR_SPRITE(0x31D),
//sets bridge or structure to red, little concrete one and cantilever use this one for example
PALETTE_TO_STRUCT_RED = PALETTE_RECOLOR_SPRITE(0x31E),
- //XXX 31F
+ PALETTE_TO_STRUCT_GREEN = PALETTE_RECOLOR_SPRITE(0x31F),
PALETTE_TO_STRUCT_CONCRETE = PALETTE_RECOLOR_SPRITE(0x320), //Sets the suspension bridge to concrete, also other strucutures use it
PALETTE_TO_STRUCT_YELLOW = PALETTE_RECOLOR_SPRITE(0x321), //Sets the bridge color to yellow (suspension and tubular)
PALETTE_TO_TRANSPARENT = 0x322 << PALETTE_SPRITE_START | PALETTE_MODIFIER_TRANSPARENT, //This sets the sprite to transparent
diff --git a/table/town_land.h b/table/town_land.h
index 30ada4321..7141077c5 100644
--- a/table/town_land.h
+++ b/table/town_land.h
@@ -37,10 +37,10 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x58e, 0, 0, 14, 14, 60, 0),
M( 0xf54, 0x591, 0, 0, 14, 14, 60, 0),
M( 0x590, 0x591, 0, 0, 14, 14, 60, 0),
- M( 0xf54, 0x58d | PALETTE_31D, 0, 0, 14, 14, 8, 0),
- M( 0xf54, 0x58e | PALETTE_31D, 0, 0, 14, 14, 60, 0),
- M( 0xf54, 0x591 | PALETTE_31D, 0, 0, 14, 14, 60, 0),
- M( 0x590, 0x591 | PALETTE_31D, 0, 0, 14, 14, 60, 0),
+ M( 0xf54, 0x58d | PALETTE_TO_STRUCT_WHITE, 0, 0, 14, 14, 8, 0),
+ M( 0xf54, 0x58e | PALETTE_TO_STRUCT_WHITE, 0, 0, 14, 14, 60, 0),
+ M( 0xf54, 0x591 | PALETTE_TO_STRUCT_WHITE, 0, 0, 14, 14, 60, 0),
+ M( 0x590, 0x591 | PALETTE_TO_STRUCT_WHITE, 0, 0, 14, 14, 60, 0),
M( 0xf54, 0x58d | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 14, 14, 8, 0),
M( 0xf54, 0x58e | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 14, 14, 60, 0),
M( 0xf54, 0x591 | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 14, 14, 60, 0),
@@ -49,10 +49,10 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x593, 0, 0, 14, 16, 33, 0),
M( 0xf54, 0x594, 0, 0, 14, 16, 33, 0),
M( 0x595, 0x594, 0, 0, 14, 16, 33, 0),
- M( 0xf54, 0x592 | PALETTE_31D, 0, 0, 16, 16, 11, 0),
- M( 0xf54, 0x593 | PALETTE_31D, 0, 0, 16, 16, 33, 0),
- M( 0xf54, 0x594 | PALETTE_31D, 0, 0, 16, 16, 33, 0),
- M( 0x595, 0x594 | PALETTE_31D, 0, 0, 16, 16, 33, 0),
+ M( 0xf54, 0x592 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 11, 0),
+ M( 0xf54, 0x593 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 33, 0),
+ M( 0xf54, 0x594 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 33, 0),
+ M( 0x595, 0x594 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 33, 0),
M( 0xf54, 0x592 | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 16, 16, 11, 0),
M( 0xf54, 0x593 | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 16, 16, 33, 0),
M( 0xf54, 0x594 | PALETTE_TO_STRUCT_CONCRETE, 0, 0, 16, 16, 33, 0),
@@ -241,10 +241,10 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x5b3, 0, 0, 16, 16, 42, 0),
M( 0xf54, 0x5b4, 0, 0, 16, 16, 42, 0),
M( 0x58c, 0x5b4, 0, 0, 16, 16, 42, 0),
- M( 0xf54, 0x5b2 | PALETTE_31D, 0, 0, 16, 16, 8, 0),
- M( 0xf54, 0x5b3 | PALETTE_31D, 0, 0, 16, 16, 42, 0),
- M( 0xf54, 0x5b4 | PALETTE_31D, 0, 0, 16, 16, 42, 0),
- M( 0x58c, 0x5b4 | PALETTE_31D, 0, 0, 16, 16, 42, 0),
+ M( 0xf54, 0x5b2 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 8, 0),
+ M( 0xf54, 0x5b3 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 42, 0),
+ M( 0xf54, 0x5b4 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 42, 0),
+ M( 0x58c, 0x5b4 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 42, 0),
M( 0xf54, 0x5b2 | PALETTE_TO_STRUCT_RED, 0, 0, 16, 16, 8, 0),
M( 0xf54, 0x5b3 | PALETTE_TO_STRUCT_RED, 0, 0, 16, 16, 42, 0),
M( 0xf54, 0x5b4 | PALETTE_TO_STRUCT_RED, 0, 0, 16, 16, 42, 0),
@@ -293,14 +293,14 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x5bc, 2, 0, 13, 16, 45, 0),
M( 0xf54, 0x5bd, 2, 0, 13, 16, 46, 0),
M( 0x58c, 0x5bd, 2, 0, 13, 16, 46, 0),
- M( 0xf54, 0x5bb | PALETTE_31B, 2, 0, 13, 16, 6, 0),
- M( 0xf54, 0x5bc | PALETTE_31B, 2, 0, 13, 16, 45, 0),
- M( 0xf54, 0x5bd | PALETTE_31B, 2, 0, 13, 16, 46, 0),
- M( 0x58c, 0x5bd | PALETTE_31B, 2, 0, 13, 16, 46, 0),
- M( 0xf54, 0x5bb | PALETTE_31D, 2, 0, 13, 16, 6, 0),
- M( 0xf54, 0x5bc | PALETTE_31D, 2, 0, 13, 16, 45, 0),
- M( 0xf54, 0x5bd | PALETTE_31D, 2, 0, 13, 16, 46, 0),
- M( 0x58c, 0x5bd | PALETTE_31D, 2, 0, 13, 16, 46, 0),
+ M( 0xf54, 0x5bb | PALETTE_TO_STRUCT_BLUE, 2, 0, 13, 16, 6, 0),
+ M( 0xf54, 0x5bc | PALETTE_TO_STRUCT_BLUE, 2, 0, 13, 16, 45, 0),
+ M( 0xf54, 0x5bd | PALETTE_TO_STRUCT_BLUE, 2, 0, 13, 16, 46, 0),
+ M( 0x58c, 0x5bd | PALETTE_TO_STRUCT_BLUE, 2, 0, 13, 16, 46, 0),
+ M( 0xf54, 0x5bb | PALETTE_TO_STRUCT_WHITE, 2, 0, 13, 16, 6, 0),
+ M( 0xf54, 0x5bc | PALETTE_TO_STRUCT_WHITE, 2, 0, 13, 16, 45, 0),
+ M( 0xf54, 0x5bd | PALETTE_TO_STRUCT_WHITE, 2, 0, 13, 16, 46, 0),
+ M( 0x58c, 0x5bd | PALETTE_TO_STRUCT_WHITE, 2, 0, 13, 16, 46, 0),
M( 0xf54, 0x5be | PALETTE_TO_RED, 2, 0, 13, 16, 13, 0),
M( 0xf54, 0x5bf | PALETTE_TO_RED, 2, 0, 13, 16, 110, 0),
M( 0xf54, 0x5c0 | PALETTE_TO_RED, 2, 0, 13, 16, 110, 0),
@@ -498,9 +498,9 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0x600, 0x601, 0, 0, 16, 16, 55, 0),
M( 0x600, 0x601, 0, 0, 16, 16, 55, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
- M( 0x600 | PALETTE_31D, 0x601 | PALETTE_31D, 0, 0, 16, 16, 55, 0),
- M( 0x600 | PALETTE_31D, 0x601 | PALETTE_31D, 0, 0, 16, 16, 55, 0),
- M( 0x600 | PALETTE_31D, 0x601 | PALETTE_31D, 0, 0, 16, 16, 55, 0),
+ M( 0x600 | PALETTE_TO_STRUCT_WHITE, 0x601 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 55, 0),
+ M( 0x600 | PALETTE_TO_STRUCT_WHITE, 0x601 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 55, 0),
+ M( 0x600 | PALETTE_TO_STRUCT_WHITE, 0x601 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 55, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
M( 0x602, 0x603, 0, 0, 16, 16, 42, 0),
M( 0x602, 0x603, 0, 0, 16, 16, 42, 0),
@@ -626,9 +626,9 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0x61e, 0x61f, 0, 0, 16, 16, 25, 0),
M( 0x61e, 0x61f, 0, 0, 16, 16, 25, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
- M( 0x61e | PALETTE_31D, 0x61f | PALETTE_31D, 0, 0, 16, 16, 25, 0),
- M( 0x61e | PALETTE_31D, 0x61f | PALETTE_31D, 0, 0, 16, 16, 25, 0),
- M( 0x61e | PALETTE_31D, 0x61f | PALETTE_31D, 0, 0, 16, 16, 25, 0),
+ M( 0x61e | PALETTE_TO_STRUCT_WHITE, 0x61f | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
+ M( 0x61e | PALETTE_TO_STRUCT_WHITE, 0x61f | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
+ M( 0x61e | PALETTE_TO_STRUCT_WHITE, 0x61f | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
M( 0x620, 0x621, 0, 0, 16, 16, 25, 0),
M( 0x620, 0x621, 0, 0, 16, 16, 25, 0),
@@ -642,9 +642,9 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M(0x11da, 0x11db, 0, 0, 16, 16, 25, 0),
M(0x11da, 0x11db, 0, 0, 16, 16, 25, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
- M( 0x11da | PALETTE_31D, 0x11db | PALETTE_31D, 0, 0, 16, 16, 25, 0),
- M( 0x11da | PALETTE_31D, 0x11db | PALETTE_31D, 0, 0, 16, 16, 25, 0),
- M( 0x11da | PALETTE_31D, 0x11db | PALETTE_31D, 0, 0, 16, 16, 25, 0),
+ M( 0x11da | PALETTE_TO_STRUCT_WHITE, 0x11db | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
+ M( 0x11da | PALETTE_TO_STRUCT_WHITE, 0x11db | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
+ M( 0x11da | PALETTE_TO_STRUCT_WHITE, 0x11db | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 25, 0),
M( 0xf54, 0x0, 0, 0, 16, 16, 22, 0),
M(0x11dc, 0x11dd, 0, 0, 16, 16, 25, 0),
M(0x11dc, 0x11dd, 0, 0, 16, 16, 25, 0),
@@ -1161,10 +1161,10 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x117e | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
M( 0xf54, 0x117f | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
M( 0x58c, 0x117f | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x117d | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x117e | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x117f | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0x58c, 0x117f | PALETTE_31D, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x117d | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x117e | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x117f | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0x58c, 0x117f | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
M( 0xf54, 0x117d, 0, 0, 16, 16, 50, 0),
M( 0xf54, 0x117e, 0, 0, 16, 16, 50, 0),
M( 0xf54, 0x11e1, 0, 0, 16, 16, 50, 0),
@@ -1177,10 +1177,10 @@ static const DrawTownTileStruct _town_draw_tile_data[] = {
M( 0xf54, 0x117e | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
M( 0xf54, 0x11e1 | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
M( 0x58c, 0x11e3 | PALETTE_TO_STRUCT_BROWN, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x117d | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x117e | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0xf54, 0x11e1 | PALETTE_31D, 0, 0, 16, 16, 50, 0),
- M( 0x58c, 0x11e1 | PALETTE_31D, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x117d | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x117e | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0xf54, 0x11e1 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
+ M( 0x58c, 0x11e1 | PALETTE_TO_STRUCT_WHITE, 0, 0, 16, 16, 50, 0),
M(0x1180, 0x1181, 0, 0, 16, 16, 10, 0),
M(0x1183, 0x1182 | PALETTE_TO_DARK_GREEN, 0, 0, 16, 16, 60, 0),
M(0x1183, 0x1182 | PALETTE_TO_DARK_GREEN, 0, 0, 16, 16, 60, 0),
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-24 02:59:56 +0000