(svn r3118) Name 3 palette modifiers properly (belugas)

1 files changed, 37 insertions, 37 deletions

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),