(svn r8275) -Fix

Factor common data tables and use a bit more sensible names

1 files changed, 12 insertions, 52 deletions

diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h
index 97b910938..9b9f004a7 100644
--- a/src/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
@@ -18,35 +18,7 @@ static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
 };
 
 
-static const DrawTileSeqStruct _unmovable_display_datas_0[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_1[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_2[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_3[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_4[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_5[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_6[] = {
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _unmovable_display_datas_7[] = {
+static const DrawTileSeqStruct _unmovable_display_nothing[] = {
 	TILE_SEQ_END()
 };
 
@@ -65,10 +37,6 @@ static const DrawTileSeqStruct _unmovable_display_datas_10[] = {
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _unmovable_display_datas_11[] = {
-	TILE_SEQ_END()
-};
-
 static const DrawTileSeqStruct _unmovable_display_datas_12[] = {
 	{   0,  0,  0, 16, 16, 50, 0xA3B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
 	TILE_SEQ_END()
@@ -84,10 +52,6 @@ static const DrawTileSeqStruct _unmovable_display_datas_14[] = {
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _unmovable_display_datas_15[] = {
-	TILE_SEQ_END()
-};
-
 static const DrawTileSeqStruct _unmovable_display_datas_16[] = {
 	{   0,  0,  0, 16, 16, 60, 0xA42 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
 	TILE_SEQ_END()
@@ -103,29 +67,25 @@ static const DrawTileSeqStruct _unmovable_display_datas_18[] = {
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _unmovable_display_datas_19[] = {
-	TILE_SEQ_END()
-};
-
 static const DrawTileSprites _unmovable_display_datas[] = {
-	{ 0xA2B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_0 },
-	{ 0xA2C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_1 },
-	{ 0xA2D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_2 },
-	{ 0xA2E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_3 },
-	{ 0xA2F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_4 },
-	{ 0xA30 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_5 },
-	{ 0xA31 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_6 },
-	{ 0xA32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_7 },
+	{ 0xA2B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA2C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA2D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA2E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA2F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA30 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA31 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
+	{ 0xA32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
 	{ 0xA33 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_8 },
 	{ 0xA35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_9 },
 	{ 0xA37 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_10 },
-	{ 0xA39 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_11 },
+	{ 0xA39 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
 	{ 0xA3A | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_12 },
 	{ 0xA3C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_13 },
 	{ 0xA3E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_14 },
-	{ 0xA40 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_15 },
+	{ 0xA40 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
 	{ 0xA41 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_16 },
 	{ 0xA43 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_17 },
 	{ 0xA45 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_18 },
-	{ 0xA47 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_19 },
+	{ 0xA47 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
 };