Make g2 sprite order more coherent

This commit is contained in:
AuraSpecs 2022-11-05 12:54:31 +01:00 committed by GitHub
parent 21fbcbc608
commit a9a92c4fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2405 additions and 2420 deletions

File diff suppressed because it is too large Load Diff

View File

@ -877,26 +877,26 @@ enum
// Start of OpenRCT2 additions (g2.dat)
SPR_G2_BEGIN = 29357,
SPR_G2_LOGO = SPR_G2_BEGIN + 0,
SPR_G2_EMPTY = SPR_G2_BEGIN,
SPR_G2_PLACEHOLDER,
// G2 UI Elements
SPR_G2_LOGO,
SPR_G2_TITLE,
SPR_G2_FASTFORWARD,
SPR_G2_SPEED_ARROW,
SPR_G2_HYPER_ARROW,
SPR_G2_TAB_LAND,
SPR_G2_PLACEHOLDER,
SPR_G2_ZOOM_IN,
SPR_G2_ZOOM_IN_DISABLED,
SPR_G2_ZOOM_OUT,
SPR_G2_ZOOM_OUT_DISABLED,
SPR_G2_TAB_TREE,
SPR_G2_TAB_PENCIL,
SPR_G2_BUTTON_LARGE_SCENERY,
SPR_G2_BUTTON_TREES,
SPR_G2_BUTTON_FOOTPATH,
SPR_G2_RCT1_CLOSE_BUTTON_0,
SPR_G2_RCT1_CLOSE_BUTTON_1,
SPR_G2_RCT1_CLOSE_BUTTON_2,
@ -909,89 +909,24 @@ enum
SPR_G2_RCT1_OPEN_BUTTON_1,
SPR_G2_RCT1_OPEN_BUTTON_2,
SPR_G2_RCT1_OPEN_BUTTON_3,
SPR_G2_TITLE_RESTART,
SPR_G2_TITLE_STOP,
SPR_G2_TITLE_PLAY,
SPR_G2_TITLE_SKIP,
SPR_G2_SANDBOX,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SW_NE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2,
SPR_G2_TAB_NEWS,
SPR_G2_LOCKED,
SPR_G2_MENU_MULTIPLAYER,
SPR_G2_SORT,
SPR_G2_COPY,
SPR_G2_PASTE,
SPR_G2_GIGA_RC_BOOSTER_NE_SW,
SPR_G2_GIGA_RC_BOOSTER_NW_SE,
SPR_G2_BM_BOOSTER_NE_SW,
SPR_G2_BM_BOOSTER_NW_SE,
SPR_JUNIOR_RC_BOOSTER_NW_SE,
SPR_JUNIOR_RC_BOOSTER_NE_SW,
SPR_G2_TOOLBAR_MUTE,
SPR_G2_TOOLBAR_MUTE_PRESSED,
SPR_G2_TOOLBAR_UNMUTE,
SPR_G2_TOOLBAR_UNMUTE_PRESSED,
SPR_G2_MINI_RC_BOOSTER_NE_SW,
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE,
SPR_G2_SEARCH,
SPR_G2_SURFACE_GLASSY_RECOLOURABLE,
SPR_G2_SELECTION_EDGE_NW,
SPR_G2_SELECTION_EDGE_NE,
SPR_G2_SELECTION_EDGE_SW,
SPR_G2_SELECTION_EDGE_SE,
SPR_G2_EYEDROPPER,
SPR_G2_CHAT,
SPR_G2_MAP_NORTH,
SPR_G2_MAP_NORTH_PRESSED,
SPR_G2_MAP_WEST,
@ -1000,54 +935,48 @@ enum
SPR_G2_MAP_SOUTH_PRESSED,
SPR_G2_MAP_EAST,
SPR_G2_MAP_EAST_PRESSED,
SPR_G2_TOOLBAR_MULTIPLAYER,
SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED,
SPR_G2_MULTIPLAYER_SYNC,
SPR_G2_MULTIPLAYER_DESYNC,
SPR_G2_SIMULATE,
SPR_G2_RCT1_SIMULATE_BUTTON_0,
SPR_G2_RCT1_SIMULATE_BUTTON_1,
SPR_G2_RCT1_SIMULATE_BUTTON_2,
SPR_G2_RCT1_SIMULATE_BUTTON_3,
SPR_G2_LAND_TOOL_SIZE_6,
SPR_G2_MOUNTAIN_TOOL_EVEN,
SPR_G2_MOUNTAIN_TOOL_ODD,
SPR_G2_SCENERY_SCATTER_LOW,
SPR_G2_SCENERY_SCATTER_MEDIUM,
SPR_G2_SCENERY_SCATTER_HIGH,
SPR_G2_WOODEN_RC_BOOSTER_SW_NE,
SPR_G2_WOODEN_RC_BOOSTER_NW_SE,
SPR_G2_VIEW,
SPR_G2_PATH_RAILINGS_TAB,
SPR_G2_LEGACY_PATH_TAB,
SPR_G2_PATH_SURFACE_TAB,
SPR_G2_RIDE_STATION_TAB,
SPR_G2_TERRAIN_EDGE_TAB,
SPR_G2_BUTTON_HIDE_VEGETATION,
SPR_G2_BUTTON_HIDE_SCENERY,
SPR_G2_BUTTON_HIDE_VEHICLES,
SPR_G2_BUTTON_HIDE_SUPPORTS,
SPR_G2_BUTTON_HIDE_PARTIAL,
SPR_G2_BUTTON_HIDE_FULL,
SPR_G2_LINK_CHAIN,
SPR_G2_SIDEWAYS_TAB,
SPR_G2_SIDEWAYS_TAB_ACTIVE,
SPR_G2_ARROW_UP,
SPR_G2_ARROW_DOWN,
SPR_G2_RELOAD,
// G2 Misc
SPR_G2_SURFACE_GLASSY_RECOLOURABLE,
SPR_G2_SELECTION_EDGE_NW,
SPR_G2_SELECTION_EDGE_NE,
SPR_G2_SELECTION_EDGE_SW,
SPR_G2_SELECTION_EDGE_SE,
// G2 Characters
SPR_G2_CHAR_BEGIN,
@ -1182,11 +1111,92 @@ enum
SPR_G2_GLYPH_COUNT = (SPR_G2_EYE - SPR_G2_CHAR_BEGIN) + 1,
SPR_G2_CHAR_END = SPR_G2_CHAR_BEGIN + SPR_G2_GLYPH_COUNT * 3,
// G2 New track types
// G2 Track additions
SPR_G2_SUPPORT_BEGIN = SPR_G2_CHAR_END,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE = SPR_G2_CHAR_END,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NE_SW_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SW_NE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_SE_NW,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_CHAIN_NE_SW_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SW_NE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_SE_NW,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2,
SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2,
SPR_JUNIOR_RC_BOOSTER_NW_SE,
SPR_JUNIOR_RC_BOOSTER_NE_SW,
SPR_G2_GIGA_RC_BOOSTER_NE_SW,
SPR_G2_GIGA_RC_BOOSTER_NW_SE,
SPR_G2_BM_BOOSTER_NE_SW,
SPR_G2_BM_BOOSTER_NW_SE,
SPR_G2_MINI_RC_BOOSTER_NE_SW,
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_NW_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW,
SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE,
SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE,
SPR_G2_WOODEN_RC_BOOSTER_SW_NE,
SPR_G2_WOODEN_RC_BOOSTER_NW_SE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_SW_NE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_NW_SE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_CLOSED_SW_NE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_CLOSED_NW_SE,
SPR_RIDE_DESIGN_PREVIEW_CLASSIC_WOODEN_ROLLER_COASTER_TRACK,
SPR_RIDE_DESIGN_PREVIEW_CLASSIC_WOODEN_ROLLER_COASTER_SUPPORTS,
SPR_G2_BM_INVERT_BOOSTER_1,
SPR_G2_BM_INVERT_BOOSTER_2,
SPR_G2_LIM_LAUNCHED_TRACK_BEGIN,
SPR_G2_LIM_LAUNCHED_TRACK_BARREL_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_BEGIN + 0,
SPR_G2_LIM_LAUNCHED_TRACK_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_BARREL_ROLL + 48,
SPR_G2_LIM_LAUNCHED_TRACK_FLAT_TO_STEEP = SPR_G2_LIM_LAUNCHED_TRACK_HALF_LOOP + 16,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_CORKSCREW = SPR_G2_LIM_LAUNCHED_TRACK_FLAT_TO_STEEP + 32,
SPR_G2_LIM_LAUNCHED_TRACK_TURN_BANK_TRANSITION = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_CORKSCREW + 40,
SPR_G2_LIM_LAUNCHED_TRACK_MEDIUM_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_TURN_BANK_TRANSITION + 18,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_MEDIUM_HALF_LOOP + 40,
SPR_G2_LIM_LAUNCHED_TRACK_ZERO_G_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_HALF_LOOP + 56,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_ZERO_G_ROLL + 32,
SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_ZERO_G_ROLL + 40,
SPR_G2_LIM_LAUNCHED_TRACK_END = SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP + 20,
// G2 Supports
SPR_G2_SUPPORT_BEGIN = SPR_G2_LIM_LAUNCHED_TRACK_END,
SPR_G2_SUPPORT_END = SPR_G2_SUPPORT_BEGIN + 32,
// G2 New track types
SPR_RIDE_DESIGN_PREVIEW_HYBRID_COASTER_TRACK = SPR_G2_SUPPORT_END,
SPR_RIDE_DESIGN_PREVIEW_HYBRID_COASTER_SUPPORTS = SPR_RIDE_DESIGN_PREVIEW_HYBRID_COASTER_TRACK + 1,
SPR_G2_HYBRID_BEGIN = SPR_RIDE_DESIGN_PREVIEW_HYBRID_COASTER_TRACK + 2,
@ -1314,32 +1324,7 @@ enum
SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4,
SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_SW_NE = SPR_G2_ALPINE_END,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_NW_SE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_CLOSED_SW_NE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_CLOSED_NW_SE,
SPR_G2_EMPTY,
SPR_RIDE_DESIGN_PREVIEW_CLASSIC_WOODEN_ROLLER_COASTER_TRACK,
SPR_RIDE_DESIGN_PREVIEW_CLASSIC_WOODEN_ROLLER_COASTER_SUPPORTS,
SPR_G2_BM_INVERT_BOOSTER_1,
SPR_G2_BM_INVERT_BOOSTER_2,
SPR_G2_LIM_LAUNCHED_TRACK_BEGIN,
SPR_G2_LIM_LAUNCHED_TRACK_BARREL_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_BEGIN,
SPR_G2_LIM_LAUNCHED_TRACK_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_BARREL_ROLL + 48,
SPR_G2_LIM_LAUNCHED_TRACK_FLAT_TO_STEEP = SPR_G2_LIM_LAUNCHED_TRACK_HALF_LOOP + 16,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_CORKSCREW = SPR_G2_LIM_LAUNCHED_TRACK_FLAT_TO_STEEP + 32,
SPR_G2_LIM_LAUNCHED_TRACK_TURN_BANK_TRANSITION = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_CORKSCREW + 40,
SPR_G2_LIM_LAUNCHED_TRACK_MEDIUM_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_TURN_BANK_TRANSITION + 18,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_HALF_LOOP = SPR_G2_LIM_LAUNCHED_TRACK_MEDIUM_HALF_LOOP + 40,
SPR_G2_LIM_LAUNCHED_TRACK_ZERO_G_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_HALF_LOOP + 56,
SPR_G2_LIM_LAUNCHED_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_LIM_LAUNCHED_TRACK_ZERO_G_ROLL + 32,
SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_ZERO_G_ROLL + 40,
SPR_G2_LIM_LAUNCHED_TRACK_END = SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP + 20,
SPR_G2_END = SPR_G2_LIM_LAUNCHED_TRACK_END,
SPR_G2_END = SPR_G2_ALPINE_END,
SPR_CSG_BEGIN = SPR_G2_END,
SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries,