Remove unused Junior RC sprites from g2

Diagonal flat-to-steep pieces are present in g1.dat, unlike their
orthogonal counterparts, so these images were never used.

Pointed out by @karst.

resources/g2/sprites.json

@@ -179,54 +179,6 @@
     {
         "path": "icons/multiplayer.png"
     },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_1.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_2.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_3.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_4.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_1.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_2.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_3.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_4.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_lift_1.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_lift_2.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_lift_3.png"
-    },
-    {
-        "path": "track/junior/flat_to_steep_diagonal_lift_4.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_lift_1.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_lift_2.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_lift_3.png"
-    },
-    {
-        "path": "track/junior/steep_to_flat_diagonal_lift_4.png"
-    },
     {
         "path": "icons/sort.png"
     },

src/openrct2/ride/coaster/JuniorRollerCoaster.cpp

@@ -634,8 +634,8 @@ enum
     SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2 = SPR_G2_BEGIN + 55,
     SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2 = SPR_G2_BEGIN + 56,
 
-    SPR_JUNIOR_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 83,
-    SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 84,
+    SPR_JUNIOR_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 67,
+    SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 68,
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_flat[3][4] = {

src/openrct2/sprites.h

@@ -919,26 +919,26 @@ enum
     SPR_G2_LOCKED = SPR_G2_BEGIN + 58,
     SPR_G2_MENU_MULTIPLAYER = SPR_G2_BEGIN + 59,
 
-    SPR_G2_SORT = SPR_G2_BEGIN + 76,
-    SPR_G2_COPY = SPR_G2_BEGIN + 77,
-    SPR_G2_PASTE = SPR_G2_BEGIN + 78,
+    SPR_G2_SORT,
+    SPR_G2_COPY,
+    SPR_G2_PASTE,
 
-    SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 79,
-    SPR_G2_GIGA_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 80,
-    SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BEGIN + 81,
-    SPR_G2_BM_BOOSTER_NW_SE = SPR_G2_BEGIN + 82,
+    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_TOOLBAR_MUTE = SPR_G2_BEGIN + 85,
-    SPR_G2_TOOLBAR_MUTE_PRESSED = SPR_G2_BEGIN + 86,
-    SPR_G2_TOOLBAR_UNMUTE = SPR_G2_BEGIN + 87,
-    SPR_G2_TOOLBAR_UNMUTE_PRESSED = SPR_G2_BEGIN + 88,
+    SPR_G2_TOOLBAR_MUTE = SPR_G2_BM_BOOSTER_NW_SE + 3,
+    SPR_G2_TOOLBAR_MUTE_PRESSED,
+    SPR_G2_TOOLBAR_UNMUTE,
+    SPR_G2_TOOLBAR_UNMUTE_PRESSED,
 
-    SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 89,
-    SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 90,
+    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_BEGIN + 91,
+    SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3,
 
-    SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 92,
+    SPR_G2_MINIATURE_RAILWAY_BEGIN,
     SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 0,
     SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 1,
     SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 2,
@@ -951,77 +951,77 @@ enum
     SPR_G2_MINIATURE_RAILWAY_INSET_END_SW = SPR_G2_MINIATURE_RAILWAY_BEGIN + 9,
     SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 10,
     SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 11,
-    SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_BEGIN + 103,
+    SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE,
 
-    SPR_G2_SEARCH = SPR_G2_BEGIN + 104,
+    SPR_G2_SEARCH,
 
-    SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 105,
+    SPR_G2_SURFACE_GLASSY_RECOLOURABLE,
 
-    SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 106,
-    SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 107,
-    SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 108,
-    SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 109,
+    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_BEGIN + 110,
-    SPR_G2_CHAT = SPR_G2_BEGIN + 111,
+    SPR_G2_EYEDROPPER,
+    SPR_G2_CHAT,
 
-    SPR_G2_MAP_NORTH = SPR_G2_BEGIN + 112,
-    SPR_G2_MAP_NORTH_PRESSED = SPR_G2_BEGIN + 113,
-    SPR_G2_MAP_WEST = SPR_G2_BEGIN + 114,
-    SPR_G2_MAP_WEST_PRESSED = SPR_G2_BEGIN + 115,
-    SPR_G2_MAP_SOUTH = SPR_G2_BEGIN + 116,
-    SPR_G2_MAP_SOUTH_PRESSED = SPR_G2_BEGIN + 117,
-    SPR_G2_MAP_EAST = SPR_G2_BEGIN + 118,
-    SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 119,
+    SPR_G2_MAP_NORTH,
+    SPR_G2_MAP_NORTH_PRESSED,
+    SPR_G2_MAP_WEST,
+    SPR_G2_MAP_WEST_PRESSED,
+    SPR_G2_MAP_SOUTH,
+    SPR_G2_MAP_SOUTH_PRESSED,
+    SPR_G2_MAP_EAST,
+    SPR_G2_MAP_EAST_PRESSED,
 
-    SPR_G2_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 120,
-    SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 121,
-    SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122,
-    SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123,
+    SPR_G2_TOOLBAR_MULTIPLAYER,
+    SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED,
+    SPR_G2_MULTIPLAYER_SYNC,
+    SPR_G2_MULTIPLAYER_DESYNC,
 
-    SPR_G2_SIMULATE = SPR_G2_BEGIN + 124,
-    SPR_G2_RCT1_SIMULATE_BUTTON_0 = SPR_G2_BEGIN + 125,
-    SPR_G2_RCT1_SIMULATE_BUTTON_1 = SPR_G2_BEGIN + 126,
-    SPR_G2_RCT1_SIMULATE_BUTTON_2 = SPR_G2_BEGIN + 127,
-    SPR_G2_RCT1_SIMULATE_BUTTON_3 = SPR_G2_BEGIN + 128,
+    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_BEGIN + 129,
+    SPR_G2_LAND_TOOL_SIZE_6,
 
-    SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 130,
-    SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 131,
+    SPR_G2_MOUNTAIN_TOOL_EVEN,
+    SPR_G2_MOUNTAIN_TOOL_ODD,
 
-    SPR_G2_SCENERY_SCATTER_LOW = SPR_G2_BEGIN + 132,
-    SPR_G2_SCENERY_SCATTER_MEDIUM = SPR_G2_BEGIN + 133,
-    SPR_G2_SCENERY_SCATTER_HIGH = SPR_G2_BEGIN + 134,
+    SPR_G2_SCENERY_SCATTER_LOW,
+    SPR_G2_SCENERY_SCATTER_MEDIUM,
+    SPR_G2_SCENERY_SCATTER_HIGH,
 
-    SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_BEGIN + 135,
-    SPR_G2_WOODEN_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 136,
+    SPR_G2_WOODEN_RC_BOOSTER_SW_NE,
+    SPR_G2_WOODEN_RC_BOOSTER_NW_SE,
 
-    SPR_G2_VIEW = SPR_G2_BEGIN + 137,
+    SPR_G2_VIEW,
 
-    SPR_G2_PATH_RAILINGS_TAB = SPR_G2_BEGIN + 138,
-    SPR_G2_LEGACY_PATH_TAB = SPR_G2_BEGIN + 139,
-    SPR_G2_PATH_SURFACE_TAB = SPR_G2_BEGIN + 140,
-    SPR_G2_RIDE_STATION_TAB = SPR_G2_BEGIN + 141,
-    SPR_G2_TERRAIN_EDGE_TAB = SPR_G2_BEGIN + 142,
+    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_BEGIN + 143,
-    SPR_G2_BUTTON_HIDE_SCENERY = SPR_G2_BEGIN + 144,
-    SPR_G2_BUTTON_HIDE_VEHICLES = SPR_G2_BEGIN + 145,
-    SPR_G2_BUTTON_HIDE_SUPPORTS = SPR_G2_BEGIN + 146,
-    SPR_G2_BUTTON_HIDE_PARTIAL = SPR_G2_BEGIN + 147,
-    SPR_G2_BUTTON_HIDE_FULL = SPR_G2_BEGIN + 148,
+    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_BEGIN + 149,
+    SPR_G2_LINK_CHAIN,
 
-    SPR_G2_SIDEWAYS_TAB = SPR_G2_BEGIN + 150,
-    SPR_G2_SIDEWAYS_TAB_ACTIVE = SPR_G2_BEGIN + 151,
+    SPR_G2_SIDEWAYS_TAB,
+    SPR_G2_SIDEWAYS_TAB_ACTIVE,
 
-    SPR_G2_ARROW_UP = SPR_G2_BEGIN + 152,
-    SPR_G2_ARROW_DOWN = SPR_G2_BEGIN + 153,
-    SPR_G2_RELOAD = SPR_G2_BEGIN + 154,
+    SPR_G2_ARROW_UP,
+    SPR_G2_ARROW_DOWN,
+    SPR_G2_RELOAD,
 
-    SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 155,
+    SPR_G2_CHAR_BEGIN,
 
     SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN,
     SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,