Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r8275) -Fix

Browse Source 
Factor common data tables and use a bit more sensible names
pull/155/head
tron 18 years ago
parent 53457d1acb
commit 659adc7c42
3 changed files with 68 additions and 233 deletions
Show Stats Download Patch File Download Diff File

111
src/table/road_land.h
Unescape Escape View File

@ -46,15 +46,8 @@ static const SpriteID _road_tile_sprites_1[16] = {
#define MAKELINE(a, b, c) { a, b, c }, #define MAKELINE(a, b, c) { a, b, c },
#define ENDLINE { 0, 0, 0 } #define ENDLINE { 0, 0, 0 }
static const DrawRoadTileStruct _road_display_datas2_0[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_1[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_2[] = { static const DrawRoadTileStruct _roadside_nothing[] = {
ENDLINE ENDLINE
}; };
@ -63,10 +56,6 @@ static const DrawRoadTileStruct _road_display_datas2_3[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_4[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_5[] = { static const DrawRoadTileStruct _road_display_datas2_5[] = {
MAKELINE(0x57f, 1, 8) MAKELINE(0x57f, 1, 8)
MAKELINE(0x57e, 14, 8) MAKELINE(0x57e, 14, 8)
@ -83,10 +72,6 @@ static const DrawRoadTileStruct _road_display_datas2_7[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_8[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_9[] = { static const DrawRoadTileStruct _road_display_datas2_9[] = {
MAKELINE(0x57f, 8, 14) MAKELINE(0x57f, 8, 14)
ENDLINE ENDLINE
@ -118,22 +103,6 @@ static const DrawRoadTileStruct _road_display_datas2_14[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_15[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_16[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_17[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_18[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_19[] = { static const DrawRoadTileStruct _road_display_datas2_19[] = {
MAKELINE(0x1212, 0, 2) MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212, 3, 9) MAKELINE(0x1212, 3, 9)
@ -141,10 +110,6 @@ static const DrawRoadTileStruct _road_display_datas2_19[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_20[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_21[] = { static const DrawRoadTileStruct _road_display_datas2_21[] = {
MAKELINE(0x1212, 0, 2) MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212, 0, 10) MAKELINE(0x1212, 0, 10)
@ -166,10 +131,6 @@ static const DrawRoadTileStruct _road_display_datas2_23[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_24[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_25[] = { static const DrawRoadTileStruct _road_display_datas2_25[] = {
MAKELINE(0x1212, 12, 2) MAKELINE(0x1212, 12, 2)
MAKELINE(0x1212, 9, 9) MAKELINE(0x1212, 9, 9)
@ -210,72 +171,64 @@ static const DrawRoadTileStruct _road_display_datas2_30[] = {
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_31[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_32[] = {
ENDLINE
};
#undef MAKELINE #undef MAKELINE
#undef ENDLINE #undef ENDLINE
static const DrawRoadTileStruct* const _road_display_table_1[] = { static const DrawRoadTileStruct* const _roadside_none[] = {
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing,
_road_display_datas2_32,_road_display_datas2_32, _roadside_nothing, _roadside_nothing
}; };
static const DrawRoadTileStruct* const _road_display_table_2[] = { static const DrawRoadTileStruct* const _roadside_lamps[] = {
_road_display_datas2_0, _roadside_nothing,
_road_display_datas2_1, _roadside_nothing,
_road_display_datas2_2, _roadside_nothing,
_road_display_datas2_3, _road_display_datas2_3,
_road_display_datas2_4, _roadside_nothing,
_road_display_datas2_5, _road_display_datas2_5,
_road_display_datas2_6, _road_display_datas2_6,
_road_display_datas2_7, _road_display_datas2_7,
_road_display_datas2_8, _roadside_nothing,
_road_display_datas2_9, _road_display_datas2_9,
_road_display_datas2_10, _road_display_datas2_10,
_road_display_datas2_11, _road_display_datas2_11,
_road_display_datas2_12, _road_display_datas2_12,
_road_display_datas2_13, _road_display_datas2_13,
_road_display_datas2_14, _road_display_datas2_14,
_road_display_datas2_15, _roadside_nothing,
}; };
static const DrawRoadTileStruct* const _road_display_table_3[] = { static const DrawRoadTileStruct* const _roadside_trees[] = {
_road_display_datas2_16, _roadside_nothing,
_road_display_datas2_17, _roadside_nothing,
_road_display_datas2_18, _roadside_nothing,
_road_display_datas2_19, _road_display_datas2_19,
_road_display_datas2_20, _roadside_nothing,
_road_display_datas2_21, _road_display_datas2_21,
_road_display_datas2_22, _road_display_datas2_22,
_road_display_datas2_23, _road_display_datas2_23,
_road_display_datas2_24, _roadside_nothing,
_road_display_datas2_25, _road_display_datas2_25,
_road_display_datas2_26, _road_display_datas2_26,
_road_display_datas2_27, _road_display_datas2_27,
_road_display_datas2_28, _road_display_datas2_28,
_road_display_datas2_29, _road_display_datas2_29,
_road_display_datas2_30, _road_display_datas2_30,
_road_display_datas2_31, _roadside_nothing,
}; };
static const DrawRoadTileStruct* const * const _road_display_table[] = { static const DrawRoadTileStruct* const * const _road_display_table[] = {
_road_display_table_1, _roadside_none,
_road_display_table_1, _roadside_none,
_road_display_table_1, _roadside_none,
_road_display_table_2, _roadside_lamps,
_road_display_table_1, _roadside_none,
_road_display_table_3, _roadside_trees,
}; };

126
src/table/station_land.h
Unescape Escape View File

@ -2,6 +2,10 @@
#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 } #define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 }
static const DrawTileSeqStruct _station_display_nothing[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_0[] = { static const DrawTileSeqStruct _station_display_datas_0[] = {
{ 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
@ -58,10 +62,6 @@ static const DrawTileSeqStruct _station_display_datas_7[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_8[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_9[] = { static const DrawTileSeqStruct _station_display_datas_9[] = {
{ 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, // fences north { 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, // fences north
TILE_SEQ_END() TILE_SEQ_END()
@ -72,46 +72,6 @@ static const DrawTileSeqStruct _station_display_datas_10[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_11[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_12[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_13[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_14[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_15[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_16[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_17[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_18[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_19[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_20[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_21[] = { static const DrawTileSeqStruct _station_display_datas_21[] = {
{ 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -195,10 +155,6 @@ static const DrawTileSeqStruct _station_display_datas_36[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_37[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_38[] = { static const DrawTileSeqStruct _station_display_datas_38[] = {
{ 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -282,14 +238,6 @@ static const DrawTileSeqStruct _station_display_datas_51[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_52[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_53[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_54[] = { static const DrawTileSeqStruct _station_display_datas_54[] = {
{ 0, 0, 0, 15, 15, 30, SPR_AIRFIELD_TERM_C_BUILD | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 15, 15, 30, SPR_AIRFIELD_TERM_C_BUILD | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -300,14 +248,6 @@ static const DrawTileSeqStruct _station_display_datas_55[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_56[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_57[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_58[] = { static const DrawTileSeqStruct _station_display_datas_58[] = {
{ 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_1 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_1 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
@ -414,10 +354,6 @@ static const DrawTileSeqStruct _station_display_datas_74[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_75[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _station_display_datas_76[] = { static const DrawTileSeqStruct _station_display_datas_76[] = {
{ 0, 4, 0, 16, 8, 8, SPR_DOCK_SLOPE_NE, PAL_NONE }, { 0, 4, 0, 16, 8, 8, SPR_DOCK_SLOPE_NE, PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -448,20 +384,6 @@ static const DrawTileSeqStruct _station_display_datas_81[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _station_display_datas_82[] = {
TILE_SEQ_END()
};
// end of runway
static const DrawTileSeqStruct _station_display_datas_083[] = {
TILE_SEQ_END()
};
// runway tiles
static const DrawTileSeqStruct _station_display_datas_084[] = {
TILE_SEQ_END()
};
// control tower with concrete underground and no fence // control tower with concrete underground and no fence
// concrete underground // concrete underground
static const DrawTileSeqStruct _station_display_datas_085[] = { static const DrawTileSeqStruct _station_display_datas_085[] = {
@ -1040,19 +962,19 @@ static const DrawTileSprites _station_display_datas[] = {
{ SPR_RAIL_TRACK_Y, PAL_NONE, _station_display_datas_5 }, { SPR_RAIL_TRACK_Y, PAL_NONE, _station_display_datas_5 },
{ SPR_RAIL_TRACK_X, PAL_NONE, _station_display_datas_6 }, { SPR_RAIL_TRACK_X, PAL_NONE, _station_display_datas_6 },
{ SPR_RAIL_TRACK_Y, PAL_NONE, _station_display_datas_7 }, { SPR_RAIL_TRACK_Y, PAL_NONE, _station_display_datas_7 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_8 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_9 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_9 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_10 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_10 },
{ SPR_AIRPORT_AIRCRAFT_STAND, PAL_NONE, _station_display_datas_11 }, { SPR_AIRPORT_AIRCRAFT_STAND, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_NS_WEST, PAL_NONE, _station_display_datas_12 }, { SPR_AIRPORT_TAXIWAY_NS_WEST, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_EW_SOUTH, PAL_NONE, _station_display_datas_13 }, { SPR_AIRPORT_TAXIWAY_EW_SOUTH, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_XING_SOUTH, PAL_NONE, _station_display_datas_14 }, { SPR_AIRPORT_TAXIWAY_XING_SOUTH, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_XING_WEST, PAL_NONE, _station_display_datas_15 }, { SPR_AIRPORT_TAXIWAY_XING_WEST, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_NS_CTR, PAL_NONE, _station_display_datas_16 }, { SPR_AIRPORT_TAXIWAY_NS_CTR, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_XING_EAST, PAL_NONE, _station_display_datas_17 }, { SPR_AIRPORT_TAXIWAY_XING_EAST, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_NS_EAST, PAL_NONE, _station_display_datas_18 }, { SPR_AIRPORT_TAXIWAY_NS_EAST, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_EW_NORTH, PAL_NONE, _station_display_datas_19 }, { SPR_AIRPORT_TAXIWAY_EW_NORTH, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_EW_CTR, PAL_NONE, _station_display_datas_20 }, { SPR_AIRPORT_TAXIWAY_EW_CTR, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_TAXIWAY_EW_NORTH, PAL_NONE, _station_display_datas_21 }, { SPR_AIRPORT_TAXIWAY_EW_NORTH, PAL_NONE, _station_display_datas_21 },
{ SPR_AIRPORT_RUNWAY_EXIT_A, PAL_NONE, _station_display_datas_22 }, { SPR_AIRPORT_RUNWAY_EXIT_A, PAL_NONE, _station_display_datas_22 },
{ SPR_AIRPORT_RUNWAY_EXIT_B, PAL_NONE, _station_display_datas_23 }, { SPR_AIRPORT_RUNWAY_EXIT_B, PAL_NONE, _station_display_datas_23 },
@ -1069,7 +991,7 @@ static const DrawTileSprites _station_display_datas[] = {
{ SPR_AIRPORT_AIRCRAFT_STAND, PAL_NONE, _station_display_datas_34 }, { SPR_AIRPORT_AIRCRAFT_STAND, PAL_NONE, _station_display_datas_34 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_35 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_35 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_36 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_36 },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_37 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_nothing },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_38 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_38 },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_39 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_39 },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_40 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_40 },
@ -1084,12 +1006,12 @@ static const DrawTileSprites _station_display_datas[] = {
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_49 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_49 },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_50 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_50 },
{ SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_51 }, { SPR_FLAT_GRASS_TILE, PAL_NONE, _station_display_datas_51 },
{ SPR_AIRFIELD_TERM_A, PAL_NONE, _station_display_datas_52 }, { SPR_AIRFIELD_TERM_A, PAL_NONE, _station_display_nothing },
{ SPR_AIRFIELD_TERM_B, PAL_NONE, _station_display_datas_53 }, { SPR_AIRFIELD_TERM_B, PAL_NONE, _station_display_nothing },
{ SPR_AIRFIELD_TERM_C_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_54 }, { SPR_AIRFIELD_TERM_C_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_54 },
{ SPR_AIRFIELD_APRON_A, PAL_NONE, _station_display_datas_55 }, { SPR_AIRFIELD_APRON_A, PAL_NONE, _station_display_datas_55 },
{ SPR_AIRFIELD_APRON_B, PAL_NONE, _station_display_datas_56 }, { SPR_AIRFIELD_APRON_B, PAL_NONE, _station_display_nothing },
{ SPR_AIRFIELD_APRON_C, PAL_NONE, _station_display_datas_57 }, { SPR_AIRFIELD_APRON_C, PAL_NONE, _station_display_nothing },
{ SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_58 }, { SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_58 },
{ SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_59 }, { SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_59 },
{ SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_60 }, { SPR_AIRFIELD_APRON_D, PAL_NONE, _station_display_datas_60 },
@ -1107,16 +1029,16 @@ static const DrawTileSprites _station_display_datas[] = {
{ SPR_BUS_STOP_SE_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_72 }, { SPR_BUS_STOP_SE_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_72 },
{ SPR_BUS_STOP_SW_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_73 }, { SPR_BUS_STOP_SW_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_73 },
{ SPR_BUS_STOP_NW_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_74 }, { SPR_BUS_STOP_NW_GROUND | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _station_display_datas_74 },
{ SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_75 }, { SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_nothing },
{ SPR_SHORE_TILEH_3, PAL_NONE, _station_display_datas_76 }, { SPR_SHORE_TILEH_3, PAL_NONE, _station_display_datas_76 },
{ SPR_SHORE_TILEH_9, PAL_NONE, _station_display_datas_77 }, { SPR_SHORE_TILEH_9, PAL_NONE, _station_display_datas_77 },
{ SPR_SHORE_TILEH_12, PAL_NONE, _station_display_datas_78 }, { SPR_SHORE_TILEH_12, PAL_NONE, _station_display_datas_78 },
{ SPR_SHORE_TILEH_6, PAL_NONE, _station_display_datas_79 }, { SPR_SHORE_TILEH_6, PAL_NONE, _station_display_datas_79 },
{ SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_80 }, { SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_80 },
{ SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_81 }, { SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_81 },
{ SPR_BUOY, PAL_NONE, _station_display_datas_82 }, { SPR_BUOY, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_RUNWAY_END, PAL_NONE, _station_display_datas_083 }, { SPR_AIRPORT_RUNWAY_END, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_RUNWAY_EXIT_B, PAL_NONE, _station_display_datas_084 }, { SPR_AIRPORT_RUNWAY_EXIT_B, PAL_NONE, _station_display_nothing },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_085 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_085 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_086 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_086 },
{ SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_087 }, { SPR_AIRPORT_APRON, PAL_NONE, _station_display_datas_087 },

64
src/table/unmovable_land.h
Unescape Escape View File

@ -18,35 +18,7 @@ static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
}; };
static const DrawTileSeqStruct _unmovable_display_datas_0[] = { static const DrawTileSeqStruct _unmovable_display_nothing[] = {
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[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
@ -65,10 +37,6 @@ static const DrawTileSeqStruct _unmovable_display_datas_10[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _unmovable_display_datas_11[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _unmovable_display_datas_12[] = { static const DrawTileSeqStruct _unmovable_display_datas_12[] = {
{ 0, 0, 0, 16, 16, 50, 0xA3B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 16, 16, 50, 0xA3B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -84,10 +52,6 @@ static const DrawTileSeqStruct _unmovable_display_datas_14[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _unmovable_display_datas_15[] = {
TILE_SEQ_END()
};
static const DrawTileSeqStruct _unmovable_display_datas_16[] = { static const DrawTileSeqStruct _unmovable_display_datas_16[] = {
{ 0, 0, 0, 16, 16, 60, 0xA42 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, { 0, 0, 0, 16, 16, 60, 0xA42 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
TILE_SEQ_END() TILE_SEQ_END()
@ -103,29 +67,25 @@ static const DrawTileSeqStruct _unmovable_display_datas_18[] = {
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTileSeqStruct _unmovable_display_datas_19[] = {
TILE_SEQ_END()
};
static const DrawTileSprites _unmovable_display_datas[] = { static const DrawTileSprites _unmovable_display_datas[] = {
{ 0xA2B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_0 }, { 0xA2B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA2C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_1 }, { 0xA2C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA2D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_2 }, { 0xA2D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA2E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_3 }, { 0xA2E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA2F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_4 }, { 0xA2F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA30 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_5 }, { 0xA30 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA31 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_6 }, { 0xA31 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_7 }, { 0xA32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_nothing },
{ 0xA33 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_8 }, { 0xA33 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_8 },
{ 0xA35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_9 }, { 0xA35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_9 },
{ 0xA37 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_10 }, { 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 }, { 0xA3A | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_12 },
{ 0xA3C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_13 }, { 0xA3C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_13 },
{ 0xA3E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_14 }, { 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 }, { 0xA41 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_16 },
{ 0xA43 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_17 }, { 0xA43 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_17 },
{ 0xA45 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_18 }, { 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 },
}; };

Write Preview
Loading…
Cancel
Save