mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

reorder sprites.h

This commit is contained in:
Spacek531 2023-07-23 22:04:18 -07:00
parent 56ec0f721a
commit e43ba3729a
3 changed files with 373 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

624
resources/g2/sprites.json
View File

@ -2619,6 +2619,42 @@
"x_offset": -22,
"y_offset": 1
},
{
"path": "track/junior/brake_horizontal.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/brake_vertical.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_vertical_closed.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_vertical_open.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/intamin/booster_1.png"
},
@ -6213,6 +6249,42 @@
"y_offset": -22,
"palette": "keep"
},
{
"path": "track/bm/brake_horizontal.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/mini/booster_1.png"
},
@ -6420,6 +6492,246 @@
"x_offset": -25,
"y_offset": -5
},
{
"path": "track/bm_invert/brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/bm_invert/brake_vertical.png",
"x_offset": -13,
"y_offset": -13,
"palette": "keep"
},
{
"path": "track/looping/brake_horizontal_1.png",
"x_offset": -32,
"y_offset": 0,
"palette": "keep"
},
{
"path": "track/looping/brake_horizontal_2.png",
"x_offset": -32,
"y_offset": 0,
"palette": "keep"
},
{
"path": "track/looping/brake_vertical_1.png",
"x_offset": -15,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/looping/brake_vertical_2.png",
"x_offset": -15,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/minetrain/brake_horizontal.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/brake_vertical.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_vertical_closed.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_vertical_open.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/standup/brake_horizontal.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/steeplechase/brake_horizontal.png",
"x_offset": -32,
"y_offset": 9,
"palette": "keep"
},
{
"path": "track/steeplechase/brake_vertical.png",
"x_offset": -4,
"y_offset": -6,
"palette": "keep"
},
{
"path": "track/multidim/upright_brake_horizontal.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_brake_vertical.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_vertical_closed.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_vertical_open.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/inverted_brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/multidim/inverted_brake_vertical.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_vertical_open.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_vertical_closed.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/slc/brake_horizontal.png",
"x_offset": -32,
"y_offset": 4,
"palette": "keep"
},
{
"path": "track/slc/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/slc/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/corkscrew/brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/brake_vertical.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/lim/barrel_roll_left_1_1.png",
"x_offset": -22,
@ -24488,317 +24800,5 @@
"x_offset": -5,
"y_offset": -20,
"palette": "keep"
},
{
"path": "track/junior/brake_horizontal.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/brake_vertical.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 7,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_vertical_closed.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/junior/blockbrake_vertical_open.png",
"x_offset": -9,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/corkscrew/brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/brake_vertical.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/corkscrew/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/slc/brake_horizontal.png",
"x_offset": -32,
"y_offset": 4,
"palette": "keep"
},
{
"path": "track/slc/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/slc/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/multidim/upright_brake_horizontal.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_brake_vertical.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 3,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_vertical_closed.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/upright_blockbrake_vertical_open.png",
"x_offset": -11,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/multidim/inverted_brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/multidim/inverted_brake_vertical.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_vertical_open.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/multidim/inverted_blockbrake_vertical_closed.png",
"x_offset": -11,
"y_offset": -12,
"palette": "keep"
},
{
"path": "track/steeplechase/brake_horizontal.png",
"x_offset": -32,
"y_offset": 9,
"palette": "keep"
},
{
"path": "track/steeplechase/brake_vertical.png",
"x_offset": -4,
"y_offset": -6,
"palette": "keep"
},
{
"path": "track/standup/brake_horizontal.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/standup/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/minetrain/brake_horizontal.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/brake_vertical.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 6,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_vertical_closed.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/minetrain/blockbrake_vertical_open.png",
"x_offset": -17,
"y_offset": -3,
"palette": "keep"
},
{
"path": "track/looping/brake_horizontal_1.png",
"x_offset": -32,
"y_offset": 0,
"palette": "keep"
},
{
"path": "track/looping/brake_horizontal_2.png",
"x_offset": -32,
"y_offset": 0,
"palette": "keep"
},
{
"path": "track/looping/brake_vertical_1.png",
"x_offset": -15,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/looping/brake_vertical_2.png",
"x_offset": -15,
"y_offset": -8,
"palette": "keep"
},
{
"path": "track/bm/brake_horizontal.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/brake_vertical.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_horizontal_closed.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_horizontal_open.png",
"x_offset": -32,
"y_offset": 1,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_vertical_closed.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/bm/blockbrake_vertical_open.png",
"x_offset": -13,
"y_offset": -9,
"palette": "keep"
},
{
"path": "track/bm_invert/brake_horizontal.png",
"x_offset": -32,
"y_offset": 2,
"palette": "keep"
},
{
"path": "track/bm_invert/brake_vertical.png",
"x_offset": -13,
"y_offset": -13,
"palette": "keep"
}
]

8
src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
View File

@ -19,10 +19,10 @@
#include "../TrackPaint.h"
static constexpr const uint32_t InvertedRCDiagBrakeImages[NumOrthogonalDirections] = {
SPR_G2_BM_INVERTED_DIAG_BRAKES,
SPR_G2_BM_INVERTED_DIAG_BRAKES + 1,
SPR_G2_BM_INVERTED_DIAG_BRAKES,
SPR_G2_BM_INVERTED_DIAG_BRAKES + 1,
SPR_G2_BM_INVERT_DIAG_BRAKES,
SPR_G2_BM_INVERT_DIAG_BRAKES + 1,
SPR_G2_BM_INVERT_DIAG_BRAKES,
SPR_G2_BM_INVERT_DIAG_BRAKES + 1,
};
/** rct2: 0x008A92E8 */

84
src/openrct2/sprites.h
View File

@ -1179,7 +1179,8 @@ enum
// G2 Track additions
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE = SPR_G2_CHAR_END,
SPR_G2_JUNIOR_RC_BEGIN = SPR_G2_CHAR_END,
SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE = SPR_G2_JUNIOR_RC_BEGIN,
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,
@ -1205,8 +1206,11 @@ enum
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_JUNIOR_DIAG_BRAKES,
SPR_G2_JUNIOR_RC_END = SPR_G2_JUNIOR_DIAG_BRAKES + 6,
SPR_G2_GIGA_RC_BOOSTER_NE_SW,
SPR_G2_GIGA_RC_BEGIN = SPR_G2_JUNIOR_RC_END,
SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_GIGA_RC_BEGIN,
SPR_G2_GIGA_RC_BOOSTER_NW_SE,
SPR_G2_GIGA_RC_POWERED_LIFT_0,
SPR_G2_GIGA_RC_POWERED_LIFT_1,
@ -1228,15 +1232,21 @@ enum
SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 40,
SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE = SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 20,
SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 64,
SPR_G2_GIGA_END = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 128,
SPR_G2_GIGA_RC_END = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 128,
SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_GIGA_END,
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_BM_BOOSTER_NE_SW,
SPR_G2_BM_RC_BEGIN = SPR_G2_GIGA_RC_END,
SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BM_RC_BEGIN,
SPR_G2_BM_BOOSTER_NW_SE,
SPR_G2_BM_DIAG_BRAKES,
SPR_G2_BM_RC_END = SPR_G2_BM_DIAG_BRAKES + 6,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3,
SPR_G2_MINI_RC_BEGIN = SPR_G2_BM_RC_END,
SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_MINI_RC_BEGIN,
SPR_G2_MINI_RC_BOOSTER_NW_SE,
SPR_G2_MINI_RC_END,
SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_MINI_RC_END,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_MINIATURE_RAILWAY_BEGIN,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE,
SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE,
@ -1249,8 +1259,10 @@ enum
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_MINIATURE_RAILWAY_END,
SPR_G2_WOODEN_RC_BOOSTER_SW_NE,
SPR_G2_WOODEN_RC_BEGIN = SPR_G2_MINIATURE_RAILWAY_END,
SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_WOODEN_RC_BEGIN,
SPR_G2_WOODEN_RC_BOOSTER_NW_SE,
SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_SW_NE,
@ -1273,11 +1285,44 @@ enum
SPR_G2_WOODEN_RC_60_25_SENW_CHAINED,
SPR_G2_WOODEN_RC_60_25_SWNE_CHAINED_BACK,
SPR_G2_WOODEN_RC_60_25_SENW_CHAINED_BACK,
SPR_G2_WOODEN_RC_END,
SPR_G2_BM_INVERT_BOOSTER_1,
SPR_G2_BM_INVERT_RC_BEGIN = SPR_G2_WOODEN_RC_END,
SPR_G2_BM_INVERT_BOOSTER_1 = SPR_G2_BM_INVERT_RC_BEGIN,
SPR_G2_BM_INVERT_BOOSTER_2,
SPR_G2_BM_INVERT_DIAG_BRAKES,
SPR_G2_BM_INVERT_RC_END = SPR_G2_BM_INVERT_DIAG_BRAKES + 2,
SPR_G2_LIM_LAUNCHED_TRACK_BEGIN,
SPR_G2_LOOPING_RC_BEGIN = SPR_G2_BM_INVERT_RC_END,
SPR_G2_LOOPING_DIAG_BRAKES = SPR_G2_LOOPING_RC_BEGIN,
SPR_G2_LOOPING_RC_END = SPR_G2_LOOPING_DIAG_BRAKES + 4,
SPR_G2_MINETRAIN_RC_BEGIN = SPR_G2_LOOPING_RC_END,
SPR_G2_MINETRAIN_DIAG_BRAKES = SPR_G2_MINETRAIN_RC_BEGIN,
SPR_G2_MINETRAIN_RC_END = SPR_G2_MINETRAIN_DIAG_BRAKES + 6,
SPR_G2_STANDUP_RC_BEGIN = SPR_G2_MINETRAIN_RC_END,
SPR_G2_STANDUP_DIAG_BRAKES = SPR_G2_STANDUP_RC_BEGIN,
SPR_G2_STANDUP_RC_END = SPR_G2_STANDUP_DIAG_BRAKES + 6,
SPR_G2_STEEPLECHASE_RC_BEGIN = SPR_G2_STANDUP_RC_END,
SPR_G2_STEEPLECHASE_DIAG_BRAKES = SPR_G2_STEEPLECHASE_RC_BEGIN,
SPR_G2_STEEPLECHASE_RC_END = SPR_G2_STEEPLECHASE_DIAG_BRAKES + 2,
SPR_G2_MULTIDIM_RC_BEGIN = SPR_G2_STEEPLECHASE_RC_END,
SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES = SPR_G2_MULTIDIM_RC_BEGIN,
SPR_G2_MULTIDIM_INVERTED_DIAG_BRAKES = SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES + 6,
SPR_G2_MULTIDIM_RC_END = SPR_G2_MULTIDIM_INVERTED_DIAG_BRAKES + 5,
SPR_G2_SLC_RC_BEGIN = SPR_G2_MULTIDIM_RC_END,
SPR_G2_SLC_DIAG_BRAKES = SPR_G2_SLC_RC_BEGIN,
SPR_G2_SLC_RC_END = SPR_G2_SLC_DIAG_BRAKES + 3,
SPR_G2_CORKSCREW_RC_BEGIN = SPR_G2_SLC_RC_END,
SPR_G2_CORKSCREW_DIAG_BRAKES = SPR_G2_CORKSCREW_RC_BEGIN,
SPR_G2_CORKSCREW_RC_END = SPR_G2_CORKSCREW_DIAG_BRAKES + 6,
SPR_G2_LIM_LAUNCHED_TRACK_BEGIN = SPR_G2_CORKSCREW_RC_END,
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,
@ -1445,22 +1490,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_DIAG_BRAKES_START = SPR_G2_ALPINE_END,
SPR_G2_JUNIOR_DIAG_BRAKES = SPR_G2_DIAG_BRAKES_START,
SPR_G2_CORKSCREW_DIAG_BRAKES = SPR_G2_JUNIOR_DIAG_BRAKES + 6,
SPR_G2_SLC_DIAG_BRAKES = SPR_G2_CORKSCREW_DIAG_BRAKES + 6,
SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES = SPR_G2_SLC_DIAG_BRAKES + 3,
SPR_G2_MULTIDIM_INVERTED_DIAG_BRAKES = SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES + 6,
SPR_G2_STEEPLECHASE_DIAG_BRAKES = SPR_G2_MULTIDIM_INVERTED_DIAG_BRAKES + 5,
SPR_G2_STANDUP_DIAG_BRAKES = SPR_G2_STEEPLECHASE_DIAG_BRAKES + 2,
SPR_G2_MINETRAIN_DIAG_BRAKES = SPR_G2_STANDUP_DIAG_BRAKES + 6,
SPR_G2_LOOPING_DIAG_BRAKES = SPR_G2_MINETRAIN_DIAG_BRAKES + 6,
SPR_G2_BM_DIAG_BRAKES = SPR_G2_LOOPING_DIAG_BRAKES + 4,
SPR_G2_BM_INVERTED_DIAG_BRAKES = SPR_G2_BM_DIAG_BRAKES + 6,
SPR_G2_DIAG_BRAKES_END = SPR_G2_BM_INVERTED_DIAG_BRAKES + 2,
SPR_G2_END = SPR_G2_DIAG_BRAKES_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,