Remove global, gPaintMapPosition

This commit is contained in:
Ted John 2017-09-01 12:44:14 +01:00
parent 5730a36555
commit eb7b1e7b7e
58 changed files with 745 additions and 747 deletions

View File

@ -656,8 +656,8 @@ void lightfx_add_3d_light(uint32 lightID, uint16 lightIDqualifier, sint16 x, sin
void lightfx_add_3d_light_magic_from_drawing_tile(sint16 offsetX, sint16 offsetY, sint16 offsetZ, uint8 lightType)
{
sint16 x = gPaintMapPosition.x + offsetX;
sint16 y = gPaintMapPosition.y + offsetY;
sint16 x = gPaintSession.MapPosition.x + offsetX;
sint16 y = gPaintSession.MapPosition.y + offsetY;
switch (get_current_rotation()) {
case 0:

View File

@ -35,7 +35,6 @@
#ifdef NO_RCT2
uint8 g141E9DB;
uint16 gUnk141E9DC;
rct_xy16 gPaintMapPosition;
bool gDidPassSurface;
rct_map_element * gSurfaceElement;
tunnel_entry gLeftTunnels[TUNNEL_MAX_COUNT];
@ -161,8 +160,8 @@ static void sub_68B3FB(sint32 x, sint32 y)
RCT2_GLOBAL(0x009DE56A, uint16) = x;
RCT2_GLOBAL(0x009DE56E, uint16) = y;
#endif
gPaintMapPosition.x = x;
gPaintMapPosition.y = y;
gPaintSession.MapPosition.x = x;
gPaintSession.MapPosition.y = y;
rct_map_element* map_element = map_get_first_element_at(x >> 5, y >> 5);
uint8 rotation = get_current_rotation();
@ -196,8 +195,8 @@ static void sub_68B3FB(sint32 x, sint32 y)
dx >>= 1;
// Display little yellow arrow when building footpaths?
if ((gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_ARROW) &&
gPaintMapPosition.x == gMapSelectArrowPosition.x &&
gPaintMapPosition.y == gMapSelectArrowPosition.y
gPaintSession.MapPosition.x == gMapSelectArrowPosition.x &&
gPaintSession.MapPosition.y == gMapSelectArrowPosition.y
) {
uint8 arrowRotation =
(rotation
@ -254,7 +253,7 @@ static void sub_68B3FB(sint32 x, sint32 y)
sint32 direction = map_element_get_direction_with_offset(map_element, rotation);
sint32 height = map_element->base_height * 8;
rct_xy16 dword_9DE574 = gPaintMapPosition;
rct_xy16 dword_9DE574 = gPaintSession.MapPosition;
gPaintSession.CurrentlyDrawnItem = map_element;
// Setup the painting of for example: the underground, signs, rides, scenery, etc.
switch (map_element_get_type(map_element))
@ -293,7 +292,7 @@ static void sub_68B3FB(sint32 x, sint32 y)
// An undefined map element is most likely a corrupt element inserted by 8 cars' MOM feature to skip drawing of all elements after it.
return;
}
gPaintMapPosition = dword_9DE574;
gPaintSession.MapPosition = dword_9DE574;
} while (!map_element_is_last_for_tile(map_element++));
if (!gShowSupportSegmentHeights) {

View File

@ -85,7 +85,6 @@ enum
#ifdef NO_RCT2
extern uint8 g141E9DB;
extern uint16 gUnk141E9DC;
extern rct_xy16 gPaintMapPosition;
extern bool gDidPassSurface;
extern rct_map_element * gSurfaceElement;
extern tunnel_entry gLeftTunnels[TUNNEL_MAX_COUNT];
@ -96,7 +95,6 @@ extern uint8 gVerticalTunnelHeight;
#else
#define g141E9DB RCT2_GLOBAL(0x0141E9DB, uint8)
#define gUnk141E9DC RCT2_GLOBAL(0x0141E9DC, uint16)
#define gPaintMapPosition RCT2_GLOBAL(0x009DE574, rct_xy16)
#define gDidPassSurface RCT2_GLOBAL(0x009DE57C, bool)
#define gSurfaceElement RCT2_GLOBAL(0x009E3250, rct_map_element *)
#define gLeftTunnels RCT2_ADDRESS(0x009E3138, tunnel_entry)

View File

@ -700,7 +700,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element)
imageFlags = construction_markers[gConfigGeneral.construction_marker_colour];
}
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
sint16 x = gPaintSession.MapPosition.x, y = gPaintSession.MapPosition.y;
rct_map_element * surface = map_get_surface_element_at(x / 32, y / 32);
@ -727,8 +727,8 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element)
sint32 staffIndex = gStaffDrawPatrolAreas;
uint8 staffType = staffIndex & 0x7FFF;
bool is_staff_list = staffIndex & 0x8000;
x = gPaintMapPosition.x;
y = gPaintMapPosition.y;
x = gPaintSession.MapPosition.x;
y = gPaintSession.MapPosition.y;
uint8 patrolColour = COLOUR_LIGHT_BLUE;

View File

@ -1051,7 +1051,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if ((gCurrentViewportFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0)) {
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
sint16 x = gPaintSession.MapPosition.x, y = gPaintSession.MapPosition.y;
sint32 dx = map_element_height(x + 16, y + 16) & 0xFFFF;
dx += 3;
@ -1123,8 +1123,8 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
case 6:
// loc_660C6A
{
sint16 x = gPaintMapPosition.x & 0x20;
sint16 y = gPaintMapPosition.y & 0x20;
sint16 x = gPaintSession.MapPosition.x & 0x20;
sint16 y = gPaintSession.MapPosition.y & 0x20;
sint32 index = (y | (x << 1)) >> 5;
if (branch == 6) {
@ -1147,7 +1147,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
sint32 staffIndex = gStaffDrawPatrolAreas;
bool is_staff_list = staffIndex & 0x8000;
uint8 staffType = staffIndex & 0x7FFF;
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
sint16 x = gPaintSession.MapPosition.x, y = gPaintSession.MapPosition.y;
uint32 image_id = IMAGE_TYPE_REMAP;
uint8 patrolColour = 7;
@ -1173,7 +1173,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) &&
gCurrentViewportFlags & VIEWPORT_FLAG_LAND_OWNERSHIP
) {
rct_xy16 pos = gPaintMapPosition;
rct_xy16 pos = gPaintSession.MapPosition;
for (sint32 i = 0; i < MAX_PEEP_SPAWNS; ++i) {
rct2_peep_spawn * spawn = &gPeepSpawns[i];
@ -1193,7 +1193,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
assert(surfaceShape < countof(byte_97B444));
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_SQUARE + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) {
rct_xy16 pos = gPaintMapPosition;
rct_xy16 pos = gPaintSession.MapPosition;
paint_struct * backup = gPaintSession.UnkF1AD28;
sint32 height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3;
sub_98196C(SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2, rotation);
@ -1208,7 +1208,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_DOTTED + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) {
paint_struct * backup = gPaintSession.UnkF1AD28;
rct_xy16 pos = gPaintMapPosition;
rct_xy16 pos = gPaintSession.MapPosition;
sint32 height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF;
sub_98196C(SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3, rotation);
gPaintSession.UnkF1AD28 = backup;
@ -1221,7 +1221,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) {
// loc_660FB8:
rct_xy16 pos = gPaintMapPosition;
rct_xy16 pos = gPaintSession.MapPosition;
if (pos.x >= gMapSelectPositionA.x &&
pos.x <= gMapSelectPositionB.x &&
pos.y >= gMapSelectPositionA.y &&
@ -1284,7 +1284,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
}
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT) {
rct_xy16 pos = gPaintMapPosition;
rct_xy16 pos = gPaintSession.MapPosition;
rct_xy16 * tile;
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {

View File

@ -166,6 +166,7 @@ extern paint_session gPaintSession;
#define gSupportSegments RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_SUPPORT_SEGMENTS, support_height)
#define gSupport RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, support_height)
#define gWoodenSupportsPrependTo RCT2_GLOBAL(0x009DEA58, paint_struct *)
#define gPaintMapPosition RCT2_GLOBAL(0x009DE574, rct_xy16)
#endif
/** rct2: 0x00993CC4 */

View File

@ -42,7 +42,7 @@ static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14579, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -58,7 +58,7 @@ static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14575, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -107,7 +107,7 @@ static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14641, 0, 0, 32, 1, 50, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -129,7 +129,7 @@ static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14617, 0, 0, 32, 1, 50, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -164,7 +164,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14625, 0, 0, 32, 1, 42, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -186,7 +186,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14601, 0, 0, 32, 1, 42, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -221,7 +221,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14633, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -243,7 +243,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14609, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -438,7 +438,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14649, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -467,7 +467,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14657, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -496,7 +496,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14655, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -525,7 +525,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14647, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -697,7 +697,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14681, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -730,7 +730,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14689, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -763,7 +763,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14665, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -796,7 +796,7 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14673, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -853,7 +853,7 @@ static void bobsleigh_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14697, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -2214,7 +2214,7 @@ static void bobsleigh_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14585, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -2237,7 +2237,7 @@ static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 14591, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -44,7 +44,7 @@ void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17489, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -58,7 +58,7 @@ void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17147, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -109,7 +109,7 @@ void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17501, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -127,7 +127,7 @@ void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17207, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -157,7 +157,7 @@ void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17517, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -175,7 +175,7 @@ void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17223, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -205,7 +205,7 @@ void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17493, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -223,7 +223,7 @@ void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17199, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -255,7 +255,7 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17505, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -275,7 +275,7 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17211, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -307,7 +307,7 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17511, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -327,7 +327,7 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17217, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -357,7 +357,7 @@ void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17497, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -375,7 +375,7 @@ void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17203, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -557,7 +557,7 @@ void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17159, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -583,7 +583,7 @@ void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17167, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -609,7 +609,7 @@ void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17161, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -635,7 +635,7 @@ void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17165, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -787,7 +787,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17171, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -817,7 +817,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17179, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -847,7 +847,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17183, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -877,7 +877,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17191, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -925,7 +925,7 @@ void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17195, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -2901,7 +2901,7 @@ void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17149, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -2925,7 +2925,7 @@ void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17917, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -2953,7 +2953,7 @@ void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17921, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6115,7 +6115,7 @@ void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17151, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -6519,7 +6519,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17925, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6548,7 +6548,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideInde
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17929, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6577,7 +6577,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17935, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6606,7 +6606,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideInde
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17939, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6654,7 +6654,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ri
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17945, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6682,7 +6682,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17949, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6710,7 +6710,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ri
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17953, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6738,7 +6738,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17957, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6787,7 +6787,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17897, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6816,7 +6816,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17901, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6845,7 +6845,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17907, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6874,7 +6874,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17911, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -7383,7 +7383,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18042, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -7407,7 +7407,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18043, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7428,7 +7428,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18044, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7449,7 +7449,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18045, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 18, height, gTrackColours[SCHEME_SUPPORTS]);
}
switch (direction) {
@ -7485,7 +7485,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18058, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -7509,7 +7509,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18059, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7530,7 +7530,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18060, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 13, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -7551,7 +7551,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18061, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
}
switch (direction) {
@ -8172,7 +8172,7 @@ void bolliger_mabillard_track_booster(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | SPR_G2_BM_BOOSTER_NW_SE, nw_se_offsetX, nw_se_offsetY, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);

View File

@ -54,7 +54,7 @@ static void compact_inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -118,7 +118,7 @@ static void compact_inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 56, gTrackColours[SCHEME_SUPPORTS]);
@ -222,7 +222,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
@ -334,7 +334,7 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 70, gTrackColours[SCHEME_SUPPORTS]);
@ -395,7 +395,7 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -602,7 +602,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -629,7 +629,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -656,7 +656,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -683,7 +683,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -837,7 +837,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -881,7 +881,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, u
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -925,7 +925,7 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -969,7 +969,7 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, u
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -1037,7 +1037,7 @@ static void compact_inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -2913,7 +2913,7 @@ static void compact_inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequenc
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}
@ -5905,7 +5905,7 @@ static void compact_inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -44,7 +44,7 @@ static void corkscrew_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16229, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -58,7 +58,7 @@ static void corkscrew_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16225, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -108,7 +108,7 @@ static void corkscrew_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16317, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -126,7 +126,7 @@ static void corkscrew_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16289, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -157,7 +157,7 @@ static void corkscrew_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16333, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -175,7 +175,7 @@ static void corkscrew_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16305, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -206,7 +206,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16309, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -224,7 +224,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16281, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -257,7 +257,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16321, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -277,7 +277,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16293, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -310,7 +310,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16327, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -330,7 +330,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16299, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -361,7 +361,7 @@ static void corkscrew_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16313, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -379,7 +379,7 @@ static void corkscrew_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16285, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -570,7 +570,7 @@ static void corkscrew_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16241, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -597,7 +597,7 @@ static void corkscrew_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16249, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -624,7 +624,7 @@ static void corkscrew_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16243, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -651,7 +651,7 @@ static void corkscrew_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16247, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -803,7 +803,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16253, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -834,7 +834,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16261, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -865,7 +865,7 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16265, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -896,7 +896,7 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16273, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -949,7 +949,7 @@ static void corkscrew_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16277, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -3210,7 +3210,7 @@ static void corkscrew_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16231, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -3272,7 +3272,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16800, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3296,7 +3296,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16801, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3317,7 +3317,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16802, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3338,7 +3338,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16803, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 18, height, gTrackColours[SCHEME_SUPPORTS]);
}
switch (direction) {
@ -3374,7 +3374,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16816, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3398,7 +3398,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16817, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3419,7 +3419,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16818, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 13, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3440,7 +3440,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16819, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
}
switch (direction) {
@ -5888,7 +5888,7 @@ static void corkscrew_rc_track_booster(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_nw_se_after, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -45,7 +45,7 @@ static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17489, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -59,7 +59,7 @@ static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17147, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -92,7 +92,7 @@ static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -157,7 +157,7 @@ static void flying_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17207, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -201,7 +201,7 @@ static void flying_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -245,7 +245,7 @@ static void flying_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17223, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -298,7 +298,7 @@ static void flying_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17199, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -342,7 +342,7 @@ static void flying_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]);
@ -388,7 +388,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17211, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -445,7 +445,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17217, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -474,7 +474,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 71, gTrackColours[SCHEME_SUPPORTS]);
@ -518,7 +518,7 @@ static void flying_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17203, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -562,7 +562,7 @@ static void flying_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -885,7 +885,7 @@ static void flying_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17159, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -908,7 +908,7 @@ static void flying_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -937,7 +937,7 @@ static void flying_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17167, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -960,7 +960,7 @@ static void flying_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -989,7 +989,7 @@ static void flying_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17161, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1012,7 +1012,7 @@ static void flying_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequen
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1041,7 +1041,7 @@ static void flying_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17165, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1064,7 +1064,7 @@ static void flying_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1336,7 +1336,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17171, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1363,7 +1363,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -1409,7 +1409,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17179, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1436,7 +1436,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -1482,7 +1482,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17183, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1509,7 +1509,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -1555,7 +1555,7 @@ static void flying_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17191, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1582,7 +1582,7 @@ static void flying_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -1650,7 +1650,7 @@ static void flying_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17195, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1673,7 +1673,7 @@ static void flying_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -4864,7 +4864,7 @@ static void flying_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17149, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -4883,7 +4883,7 @@ static void flying_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 d
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -5862,7 +5862,7 @@ static void flying_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17917, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5889,7 +5889,7 @@ static void flying_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSe
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -5933,7 +5933,7 @@ static void flying_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17921, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5960,7 +5960,7 @@ static void flying_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -11492,7 +11492,7 @@ static void flying_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, u
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, gTrackColours[SCHEME_SUPPORTS]);
}
@ -12271,7 +12271,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17925, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12298,7 +12298,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -12343,7 +12343,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17929, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12370,7 +12370,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -12415,7 +12415,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17935, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12442,7 +12442,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -12487,7 +12487,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17939, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12514,7 +12514,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 57, gTrackColours[SCHEME_SUPPORTS]);
@ -12582,7 +12582,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ride
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17945, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12609,7 +12609,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ride
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]);
@ -12653,7 +12653,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ri
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17949, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12680,7 +12680,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ri
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]);
@ -12724,7 +12724,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ride
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17953, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12751,7 +12751,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ride
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -12795,7 +12795,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ri
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17957, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12822,7 +12822,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ri
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -12891,7 +12891,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17897, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12918,7 +12918,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]);
@ -12963,7 +12963,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17901, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -12990,7 +12990,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 49, gTrackColours[SCHEME_SUPPORTS]);
@ -13035,7 +13035,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17907, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -13062,7 +13062,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);
@ -13107,7 +13107,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 17911, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -13134,7 +13134,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 47, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -40,7 +40,7 @@ static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direc
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18693, 0, 0, 20, 32, 3, height, 6, 0, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else if (track_element_is_lift_hill(mapElement)) {
@ -58,7 +58,7 @@ static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direc
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18385, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -72,7 +72,7 @@ static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direc
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18075, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -121,7 +121,7 @@ static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18705, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else if (track_element_is_lift_hill(mapElement)) {
@ -139,7 +139,7 @@ static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18397, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -157,7 +157,7 @@ static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18137, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -188,7 +188,7 @@ static void giga_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18721, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -206,7 +206,7 @@ static void giga_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18153, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -237,7 +237,7 @@ static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18697, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else if (track_element_is_lift_hill(mapElement)) {
@ -255,7 +255,7 @@ static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18389, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -273,7 +273,7 @@ static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18129, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -306,7 +306,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18709, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -326,7 +326,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18141, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -359,7 +359,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18715, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -379,7 +379,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18147, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -410,7 +410,7 @@ static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18701, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else if (track_element_is_lift_hill(mapElement)) {
@ -428,7 +428,7 @@ static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18393, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -446,7 +446,7 @@ static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18133, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -637,7 +637,7 @@ static void giga_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18089, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -664,7 +664,7 @@ static void giga_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequenc
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18097, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -691,7 +691,7 @@ static void giga_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18091, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -718,7 +718,7 @@ static void giga_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequenc
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18095, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -870,7 +870,7 @@ static void giga_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18101, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -901,7 +901,7 @@ static void giga_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18109, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -932,7 +932,7 @@ static void giga_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18113, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -963,7 +963,7 @@ static void giga_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSe
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18121, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1016,7 +1016,7 @@ static void giga_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18125, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -2668,7 +2668,7 @@ static void giga_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 dir
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18083, 0, 0, 32, 1, 11, height, 0, 27, height + 5);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -2693,7 +2693,7 @@ static void giga_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18563, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -2722,7 +2722,7 @@ static void giga_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18567, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -2801,7 +2801,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18734, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -2819,7 +2819,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18672, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -2845,7 +2845,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18735, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -2863,7 +2863,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18673, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -2886,7 +2886,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18736, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -2904,7 +2904,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18674, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 7, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -2927,7 +2927,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18737, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -2945,7 +2945,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18675, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -2982,7 +2982,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18688, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3006,7 +3006,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18689, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3027,7 +3027,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18690, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
@ -3048,7 +3048,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18691, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 5, height, gTrackColours[SCHEME_SUPPORTS]);
}
switch (direction) {
@ -3096,7 +3096,7 @@ static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18701, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3122,7 +3122,7 @@ static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18699, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3150,7 +3150,7 @@ static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18716, 0, 0, 32, 1, 66, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3176,7 +3176,7 @@ static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18719, 0, 0, 32, 1, 98, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5328,7 +5328,7 @@ static void giga_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18081, 0, 0, 32, 1, 11, height, 0, 27, height + 5);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -5741,7 +5741,7 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18571, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5771,7 +5771,7 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18575, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5801,7 +5801,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18581, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5831,7 +5831,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18585, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5884,7 +5884,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIn
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18591, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5913,7 +5913,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ride
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18595, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5942,7 +5942,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIn
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18599, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5971,7 +5971,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ride
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18603, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6025,7 +6025,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18543, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6055,7 +6055,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18547, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6085,7 +6085,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18553, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6115,7 +6115,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 18557, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6170,7 +6170,7 @@ static void giga_rc_track_booster(uint8 rideIndex, uint8 trackSequence, uint8 di
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | SPR_G2_GIGA_RC_BOOSTER_NW_SE, nw_se_offsetX, nw_se_offsetY, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);

View File

@ -58,7 +58,7 @@ static void inverted_hairpin_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
}
@ -122,7 +122,7 @@ static void inverted_hairpin_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 48, gTrackColours[SCHEME_SUPPORTS]);
@ -226,7 +226,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 40, gTrackColours[SCHEME_SUPPORTS]);
@ -338,7 +338,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -399,7 +399,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
@ -873,7 +873,7 @@ static void inverted_hairpin_rc_track_brakes(uint8 rideIndex, uint8 trackSequenc
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
}
@ -896,7 +896,7 @@ static void inverted_hairpin_rc_track_block_brakes(uint8 rideIndex, uint8 trackS
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -41,7 +41,7 @@ static void inverted_impulse_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -88,7 +88,7 @@ static void inverted_impulse_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -54,7 +54,7 @@ static void inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -118,7 +118,7 @@ static void inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -205,7 +205,7 @@ static void inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -279,7 +279,7 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
@ -340,7 +340,7 @@ static void inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -547,7 +547,7 @@ static void inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -574,7 +574,7 @@ static void inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -601,7 +601,7 @@ static void inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -628,7 +628,7 @@ static void inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -782,7 +782,7 @@ static void inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -826,7 +826,7 @@ static void inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -870,7 +870,7 @@ static void inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -914,7 +914,7 @@ static void inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -982,7 +982,7 @@ static void inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -2858,7 +2858,7 @@ static void inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -3365,7 +3365,7 @@ static void inverted_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 track
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -3409,7 +3409,7 @@ static void inverted_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -6050,7 +6050,7 @@ static void inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -6477,7 +6477,7 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -6521,7 +6521,7 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideInde
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -6565,7 +6565,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -6609,7 +6609,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideInde
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -6677,7 +6677,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ri
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -6721,7 +6721,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -6765,7 +6765,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ri
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -6809,7 +6809,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -6877,7 +6877,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uin
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -6921,7 +6921,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -6965,7 +6965,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uin
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -7009,7 +7009,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -1877,7 +1877,7 @@ void junior_rc_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dire
sub_98196C_rotated(direction, imageId, 0, 6, 32, 20, 1, height);
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup((direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1941,7 +1941,7 @@ void junior_rc_paint_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
uint8 tunnel_type[4] = { TUNNEL_1, TUNNEL_2, TUNNEL_2, TUNNEL_1 };
paint_util_push_tunnel_rotated(direction, height + tunnel_height[direction], tunnel_type[direction]);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
sint32 supportType = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1961,7 +1961,7 @@ void junior_rc_paint_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequenc
paint_util_push_tunnel_rotated(direction, height, TUNNEL_2);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
sint32 supportType = (direction & 1) ? 2 : 1;
uint16 ax = (direction == 0) ? 5 : 3;
metal_a_supports_paint_setup(supportType, 4, ax, height, gTrackColours[SCHEME_SUPPORTS]);
@ -1995,7 +1995,7 @@ void junior_rc_paint_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequenc
paint_util_push_tunnel_left(tunnelHeight, tunnelType);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
sint32 supportType = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -2090,7 +2090,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 track
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2130,7 +2130,7 @@ static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trac
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2298,7 +2298,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2341,7 +2341,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2399,7 +2399,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2450,7 +2450,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2530,7 +2530,7 @@ static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence
paint_util_push_tunnel_left(height, 0);
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3342,7 +3342,7 @@ static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, ui
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3373,7 +3373,7 @@ static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequen
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4296,7 +4296,7 @@ void junior_rc_paint_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
break;
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
sint8 support[4] = { 35, 29, 25, 32};
if (track_paint_util_should_paint_supports(pos)) {
@ -4389,7 +4389,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSe
break;
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4461,7 +4461,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSe
break;
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup((direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4705,7 +4705,7 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4774,7 +4774,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup((direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height - 5, gTrackColours[SCHEME_SUPPORTS]);
@ -4855,7 +4855,7 @@ static void junior_rc_booster_paint_setup(uint8 rideIndex, uint8 trackSequence,
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
if (track_paint_util_should_paint_supports(pos)) {
uint8 supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -46,7 +46,7 @@ static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16229, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -60,7 +60,7 @@ static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16225, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -93,7 +93,7 @@ static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -160,7 +160,7 @@ static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16317, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -178,7 +178,7 @@ static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16289, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -223,7 +223,7 @@ static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 51, gTrackColours[SCHEME_SUPPORTS]);
@ -268,7 +268,7 @@ static void lay_down_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16333, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -286,7 +286,7 @@ static void lay_down_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16305, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -341,7 +341,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16309, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -359,7 +359,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16281, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -404,7 +404,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 43, gTrackColours[SCHEME_SUPPORTS]);
@ -451,7 +451,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16321, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -471,7 +471,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16293, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -530,7 +530,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16327, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -550,7 +550,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16299, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -580,7 +580,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 65, gTrackColours[SCHEME_SUPPORTS]);
@ -625,7 +625,7 @@ static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16313, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -643,7 +643,7 @@ static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16285, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -688,7 +688,7 @@ static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]);
@ -1011,7 +1011,7 @@ static void lay_down_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16241, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1034,7 +1034,7 @@ static void lay_down_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1063,7 +1063,7 @@ static void lay_down_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16249, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1086,7 +1086,7 @@ static void lay_down_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1115,7 +1115,7 @@ static void lay_down_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16243, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1138,7 +1138,7 @@ static void lay_down_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1167,7 +1167,7 @@ static void lay_down_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16247, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1190,7 +1190,7 @@ static void lay_down_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1462,7 +1462,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16253, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1489,7 +1489,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]);
@ -1535,7 +1535,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16261, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1562,7 +1562,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]);
@ -1608,7 +1608,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16265, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1635,7 +1635,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]);
@ -1681,7 +1681,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16273, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1708,7 +1708,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 41, gTrackColours[SCHEME_SUPPORTS]);
@ -1776,7 +1776,7 @@ static void lay_down_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16277, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1799,7 +1799,7 @@ static void lay_down_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -5696,7 +5696,7 @@ static void lay_down_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16231, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -5715,7 +5715,7 @@ static void lay_down_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}
@ -11688,7 +11688,7 @@ static void lay_down_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -907,7 +907,7 @@ static void lim_launched_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, u
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15019, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -1128,7 +1128,7 @@ static void lim_launched_rc_track_block_brakes(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15021, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -44,7 +44,7 @@ static void looping_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15009, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -58,7 +58,7 @@ static void looping_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15005, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -103,7 +103,7 @@ static void looping_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15063, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -121,7 +121,7 @@ static void looping_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15035, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -152,7 +152,7 @@ static void looping_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15079, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -170,7 +170,7 @@ static void looping_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15051, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -201,7 +201,7 @@ static void looping_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15055, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -219,7 +219,7 @@ static void looping_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15027, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -252,7 +252,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15067, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -272,7 +272,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15039, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -305,7 +305,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15073, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -325,7 +325,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15045, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -356,7 +356,7 @@ static void looping_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15059, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -374,7 +374,7 @@ static void looping_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15031, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -565,7 +565,7 @@ static void looping_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15083, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -592,7 +592,7 @@ static void looping_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15095, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -619,7 +619,7 @@ static void looping_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15085, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -646,7 +646,7 @@ static void looping_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15093, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -798,7 +798,7 @@ static void looping_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15099, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -829,7 +829,7 @@ static void looping_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15115, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -860,7 +860,7 @@ static void looping_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15107, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -891,7 +891,7 @@ static void looping_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trac
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15119, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -944,7 +944,7 @@ static void looping_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15091, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -2952,7 +2952,7 @@ static void looping_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15015, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -2977,7 +2977,7 @@ static void looping_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackS
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15597, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -3006,7 +3006,7 @@ static void looping_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15601, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5455,7 +5455,7 @@ static void looping_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15015, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -5868,7 +5868,7 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15605, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5898,7 +5898,7 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15609, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5928,7 +5928,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15615, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -5958,7 +5958,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15619, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6011,7 +6011,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rid
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15625, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6040,7 +6040,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 r
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15629, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6069,7 +6069,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rid
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15633, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6098,7 +6098,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 r
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15637, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6152,7 +6152,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15577, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6182,7 +6182,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15581, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6212,7 +6212,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15587, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6242,7 +6242,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15591, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -6300,7 +6300,7 @@ static void looping_rc_track_booster(uint8 rideIndex, uint8 trackSequence, uint8
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | sprite_nw_se, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -33,14 +33,14 @@ static void mine_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir
case 0:
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19338, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19339, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -74,25 +74,25 @@ static void mine_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19388, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 14, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19389, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 14, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19390, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 14, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19391, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 14, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -112,25 +112,25 @@ static void mine_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19380, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19381, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19382, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19383, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -150,25 +150,25 @@ static void mine_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19384, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19385, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19386, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19387, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -336,26 +336,26 @@ static void mine_ride_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19340, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19348, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19341, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19349, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19342, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19343, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -371,27 +371,27 @@ static void mine_ride_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19344, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19345, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19346, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19350, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19347, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19351, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -408,26 +408,26 @@ static void mine_ride_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequen
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19346, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19350, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19347, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19351, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19344, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19345, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -443,27 +443,27 @@ static void mine_ride_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeque
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19342, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19343, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19340, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19348, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19341, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19349, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -611,26 +611,26 @@ static void mine_ride_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19352, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19356, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19353, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19357, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19354, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19355, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -650,27 +650,27 @@ static void mine_ride_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19358, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19359, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19360, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19362, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19361, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19363, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 9, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -691,26 +691,26 @@ static void mine_ride_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19364, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19368, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19365, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19369, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19366, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19367, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -730,27 +730,27 @@ static void mine_ride_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19370, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19371, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19372, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19374, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19373, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19375, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
@ -794,25 +794,25 @@ static void mine_ride_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint
switch (direction) {
case 0:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19376, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 1:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19377, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 2:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19378, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;
case 3:
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 19379, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK_ALT, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
break;

File diff suppressed because it is too large Load Diff

View File

@ -54,7 +54,7 @@ static void mini_suspended_rc_track_flat(uint8 rideIndex, uint8 trackSequence, u
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
case 2:
@ -127,7 +127,7 @@ static void mini_suspended_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequen
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -188,7 +188,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);
@ -249,7 +249,7 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tra
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_FORK, 6, 0, height + 38, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -41,7 +41,7 @@ static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15809, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -55,7 +55,7 @@ static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15807, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -75,7 +75,7 @@ static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -94,7 +94,7 @@ static void multi_dimension_rc_track_station(uint8 rideIndex, uint8 trackSequenc
{ 15811, 15813, SPR_STATION_INVERTED_BAR_A_NW_SE },
};
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
if (mapElement->properties.track.type == TRACK_ELEM_END_STATION) {
sub_98197C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 26, 1, height, 0, 3, height + 3);
@ -146,7 +146,7 @@ static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15911, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -164,7 +164,7 @@ static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15883, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -192,7 +192,7 @@ static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -236,7 +236,7 @@ static void multi_dimension_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15899, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 24, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -290,7 +290,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15903, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -308,7 +308,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15875, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -336,7 +336,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 46, gTrackColours[SCHEME_SUPPORTS]);
@ -382,7 +382,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15887, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -439,7 +439,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15893, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -468,7 +468,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uin
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 68, gTrackColours[SCHEME_SUPPORTS]);
@ -513,7 +513,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15907, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -531,7 +531,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15879, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -559,7 +559,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
@ -882,7 +882,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15835, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -905,7 +905,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -934,7 +934,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15843, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -957,7 +957,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -986,7 +986,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 tr
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15837, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1009,7 +1009,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1038,7 +1038,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 t
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15841, 0, 0, 32, 1, 26, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1061,7 +1061,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 t
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1333,7 +1333,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15847, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1360,7 +1360,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uin
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
@ -1406,7 +1406,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15855, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1433,7 +1433,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
@ -1479,7 +1479,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uin
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15859, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1506,7 +1506,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uin
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
@ -1552,7 +1552,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, ui
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15867, 0, 0, 32, 1, 34, height, 0, 27, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -1579,7 +1579,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, ui
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
@ -1647,7 +1647,7 @@ static void multi_dimension_rc_track_left_bank(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 15871, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -1670,7 +1670,7 @@ static void multi_dimension_rc_track_left_bank(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -4003,7 +4003,7 @@ static void multi_dimension_rc_track_brakes(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 16219, 0, 0, 32, 20, 3, height, 0, 6, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_6);
@ -4022,7 +4022,7 @@ static void multi_dimension_rc_track_brakes(uint8 rideIndex, uint8 trackSequence
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}
@ -9290,7 +9290,7 @@ static void multi_dimension_rc_track_block_brakes(uint8 rideIndex, uint8 trackSe
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -44,7 +44,7 @@ static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25454, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -58,7 +58,7 @@ static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -108,7 +108,7 @@ static void stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25399, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -126,7 +126,7 @@ static void stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25245, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -157,7 +157,7 @@ static void stand_up_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25400, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -175,7 +175,7 @@ static void stand_up_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25246, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -206,7 +206,7 @@ static void stand_up_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25403, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -224,7 +224,7 @@ static void stand_up_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25249, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -257,7 +257,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25404, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -277,7 +277,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25250, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -310,7 +310,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25406, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -330,7 +330,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25252, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -361,7 +361,7 @@ static void stand_up_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25405, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
} else {
@ -379,7 +379,7 @@ static void stand_up_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25251, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
}
@ -568,7 +568,7 @@ static void stand_up_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25283, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -593,7 +593,7 @@ static void stand_up_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25285, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -618,7 +618,7 @@ static void stand_up_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25284, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -643,7 +643,7 @@ static void stand_up_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25286, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -793,7 +793,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25318, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -822,7 +822,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25322, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -851,7 +851,7 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25314, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -880,7 +880,7 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25310, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -933,7 +933,7 @@ static void stand_up_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25326, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -3374,7 +3374,7 @@ static void stand_up_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25570, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -5805,7 +5805,7 @@ static void stand_up_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
sub_98196C_rotated(direction, gTrackColours[SCHEME_TRACK] | 25572, 0, 6, 32, 20, 3, height);
break;
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -54,7 +54,7 @@ static void suspended_swinging_rc_track_flat(uint8 rideIndex, uint8 trackSequenc
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -118,7 +118,7 @@ static void suspended_swinging_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSe
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 62, gTrackColours[SCHEME_SUPPORTS]);
@ -205,7 +205,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 54, gTrackColours[SCHEME_SUPPORTS]);
@ -298,7 +298,7 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 76, gTrackColours[SCHEME_SUPPORTS]);
@ -359,7 +359,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -1282,7 +1282,7 @@ static void suspended_swinging_rc_track_brakes(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}
@ -2981,7 +2981,7 @@ static void suspended_swinging_rc_track_block_brakes(uint8 rideIndex, uint8 trac
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height + 44, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -182,7 +182,7 @@ static void wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di
uint8 isChained = track_element_is_lift_hill(mapElement) ? 1 : 0;
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -1, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -226,7 +226,7 @@ static void wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin
uint8 isChained = track_element_is_lift_hill(mapElement) ? 1 : 0;
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -9, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -255,7 +255,7 @@ static void wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin
} else {
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
if (direction == 0 || direction == 3) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -33, height, gTrackColours[SCHEME_SUPPORTS]);
} else {
@ -284,7 +284,7 @@ static void wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque
uint8 isChained = track_element_is_lift_hill(mapElement) ? 1 : 0;
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -4, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -321,7 +321,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -13, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -358,7 +358,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -21, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -383,7 +383,7 @@ static void wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
uint8 isChained = track_element_is_lift_hill(mapElement) ? 1 : 0;
uint32 imageId = imageIds[direction][isChained] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -7, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -660,7 +660,7 @@ static void wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, imageId, 0, 0, 1, 24, 43, height, 29, 4, height + 2);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -5, height, gTrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3) {
@ -697,7 +697,7 @@ static void wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque
sub_98197C_rotated(direction, imageId, 0, 0, 1, 24, 43, height, 29, 4, height + 2);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 2, 43, height, 0, 4, height);
}
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
if (direction == 0 || direction == 3) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, -17, height, gTrackColours[SCHEME_SUPPORTS]);
} else {
@ -730,7 +730,7 @@ static void wild_mouse_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8
{
uint32 imageId = _wild_mouse_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -750,7 +750,7 @@ static void wild_mouse_track_rotation_control_toggle(uint8 rideIndex, uint8 trac
uint32 imageId = imageIds[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);
@ -763,7 +763,7 @@ static void wild_mouse_track_block_brakes(uint8 rideIndex, uint8 trackSequence,
{
uint32 imageId = _wild_mouse_block_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
paint_util_push_tunnel_rotated(direction, height, TUNNEL_0);

View File

@ -420,7 +420,7 @@ static void paint_car_ride_track_spinning_tunnel(uint8 rideIndex, uint8 trackSeq
/** rct2: 0x006F73B8 */
static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = car_ride_track_pieces_60_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -466,7 +466,7 @@ static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence,
/** rct2: 0x006F73C8 */
static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = car_ride_track_pieces_25_deg_up_to_60_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
@ -512,7 +512,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t
/** rct2: 0x006F73D8 */
static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = car_ride_track_pieces_60_deg_up_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];

View File

@ -57,7 +57,7 @@ static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direct
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -71,7 +71,7 @@ static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 dire
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -52,7 +52,7 @@ static void paint_dodgems(uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 edges = edges_4x4[relativeTrackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -140,7 +140,7 @@ static void paint_ferris_wheel(uint8 rideIndex, uint8 trackSequence, uint8 direc
}
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -45,7 +45,7 @@ static void paint_flying_saucers(uint8 rideIndex, uint8 trackSequence, uint8 dir
sint32 edges = edges_4x4[relativeTrackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -149,7 +149,7 @@ static const uint32 ghost_train_track_pieces_brakes[4] = {
/** rct2: 0x00770BEC */
static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = ghost_train_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -176,7 +176,7 @@ static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, u
/** rct2: 0x00770BFC */
static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = ghost_train_track_pieces_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -219,7 +219,7 @@ static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequen
/** rct2: 0x00770C0C */
static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = ghost_train_track_pieces_flat_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -260,7 +260,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = ghost_train_track_pieces_25_deg_up_to_flat[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -438,7 +438,7 @@ static void paint_ghost_train_track_spinning_tunnel(uint8 rideIndex, uint8 track
/** rct2: 0x00770CDC */
static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = ghost_train_track_pieces_brakes[direction] | gTrackColours[SCHEME_TRACK];

View File

@ -90,7 +90,7 @@ static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 dire
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -109,7 +109,7 @@ static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 dir
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -623,7 +623,7 @@ static void paint_mini_golf_track_25_deg_down_to_flat(uint8 rideIndex, uint8 tra
/** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */
static void paint_mini_golf_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
uint32 imageId;

View File

@ -59,7 +59,7 @@ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSeq
/** rct2: 0x0081F348 */
static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;
if (direction & 1) {
@ -83,7 +83,7 @@ static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequen
/** rct2: 0x0081F368 */
static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;
switch (direction) {
@ -120,7 +120,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint
/** rct2: 0x0081F358 */
static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;
switch (direction) {
@ -157,7 +157,7 @@ static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackS
/** rct2: 0x0081F378 */
static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;
switch (direction) {

View File

@ -75,7 +75,7 @@ static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, u
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -90,7 +90,7 @@ static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direct
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;

View File

@ -166,7 +166,7 @@ static void paint_spiral_slide(uint8 rideIndex, uint8 trackSequence, uint8 direc
sint32 edges = edges_2x2[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -58,7 +58,7 @@ static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 directio
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -81,7 +81,7 @@ static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 directi
sint32 edges = edges_4x4[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -314,7 +314,7 @@ static void paint_go_karts_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trac
/** rct2: 0x */
static void paint_go_karts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

View File

@ -90,7 +90,7 @@ static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, u
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -129,7 +129,7 @@ static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 di
sint32 edges = edges_2x2[trackSequence];
rct_ride *ride = get_ride(rideIndex);
rct_xy16 position = { gPaintMapPosition.x, gPaintMapPosition.y };
rct_xy16 position = { gPaintSession.MapPosition.x, gPaintSession.MapPosition.y };
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);
track_paint_util_paint_floor(edges, gTrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation());

View File

@ -161,7 +161,7 @@ static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direct
{
uint8 relativeTrackSequence = track_map_1x5[direction][trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;
bool hasFence;

View File

@ -90,7 +90,7 @@ static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 dir
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -231,7 +231,7 @@ static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction
sint32 edges = edges_3x3[trackSequence];
rct_ride *ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

View File

@ -85,7 +85,7 @@ static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, s
const uint8 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId;

View File

@ -304,7 +304,7 @@ void track_paint_util_draw_station_3(uint8 rideIndex, uint8 trackSequence, uint8
void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
const bool hasGreenLight = map_element_get_green_light(mapElement);
@ -438,7 +438,7 @@ void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, ui
void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
const bool hasGreenLight = map_element_get_green_light(mapElement);
@ -647,7 +647,7 @@ bool track_paint_util_draw_station_covers_2(enum edge_t edge, bool hasFence, con
void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
if (direction & 1) {
bool hasFence = track_paint_util_has_fence(EDGE_NE, position, mapElement, ride, get_current_rotation());

View File

@ -166,7 +166,7 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_el
static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
uint8 trackType = mapElement->properties.track.type;
rct_ride * ride = get_ride(rideIndex);
uint32 imageId;
@ -245,7 +245,7 @@ static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence,
static void chairlift_paint_station_se_nw(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
const rct_xy16 pos = gPaintMapPosition;
const rct_xy16 pos = gPaintSession.MapPosition;
uint8 trackType = mapElement->properties.track.type;
rct_ride * ride = get_ride(rideIndex);
uint32 imageId;

View File

@ -79,7 +79,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = SPR_FLOOR_METAL_B | gTrackColours[SCHEME_SUPPORTS];
sub_98197C(imageId, 0, 0, 32, 32, 1, height, 0, 0, height, get_current_rotation());

View File

@ -443,7 +443,7 @@ static const uint32 monorail_track_pieces_diag_25_deg_up[4] = {
/** rct2: 0x008AE1AC */
static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = monorail_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -510,7 +510,7 @@ static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 d
/** rct2: 0x008AE1BC */
static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = monorail_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -538,7 +538,7 @@ static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence,
/** rct2: 0x008AE1CC */
static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = monorail_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -566,7 +566,7 @@ static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS
/** rct2: 0x008AE1DC */
static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
uint32 imageId = monorail_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK];

View File

@ -41,7 +41,7 @@ static void suspended_monorail_track_flat(uint8 rideIndex, uint8 trackSequence,
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height + 42, gTrackColours[SCHEME_SUPPORTS]);
}
@ -88,7 +88,7 @@ static void suspended_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 60, gTrackColours[SCHEME_SUPPORTS]);
@ -132,7 +132,7 @@ static void suspended_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 52, gTrackColours[SCHEME_SUPPORTS]);
@ -176,7 +176,7 @@ static void suspended_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr
}
paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
switch (direction) {
case 0:
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 6, 0, height + 50, gTrackColours[SCHEME_SUPPORTS]);

View File

@ -62,7 +62,7 @@ static void paint_boat_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uin
/** rct2: 0x008B0E50 */
static void paint_boat_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

View File

@ -379,7 +379,7 @@ static void dinghy_slide_track_flat(uint8 rideIndex, uint8 trackSequence, uint8
imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -436,7 +436,7 @@ static void dinghy_slide_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u
imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -465,7 +465,7 @@ static void dinghy_slide_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -503,7 +503,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq
imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -532,7 +532,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -561,7 +561,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -599,7 +599,7 @@ static void dinghy_slide_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq
imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -980,7 +980,7 @@ static void dinghy_slide_track_flat_covered(uint8 rideIndex, uint8 trackSequence
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1005,7 +1005,7 @@ static void dinghy_slide_track_25_deg_up_covered(uint8 rideIndex, uint8 trackSeq
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1034,7 +1034,7 @@ static void dinghy_slide_track_60_deg_up_covered(uint8 rideIndex, uint8 trackSeq
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 98, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 32, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1063,7 +1063,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(uint8 rideIndex, uint8
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1092,7 +1092,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(uint8 rideIndex, u
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 12, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1121,7 +1121,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(uint8 rideIndex, u
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 66, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -1150,7 +1150,7 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(uint8 rideIndex, uint8
imageId = imageIds[direction][1] | gTrackColours[SCHEME_TRACK];
sub_98197C_rotated(direction, imageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_TUBES, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -176,7 +176,7 @@ static void paint_log_flume_track_flat(uint8 rideIndex, uint8 trackSequence, uin
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 26, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -230,7 +230,7 @@ static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -259,7 +259,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -288,7 +288,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 track
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -317,7 +317,7 @@ static void paint_log_flume_track_25_deg_down(uint8 rideIndex, uint8 trackSequen
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 50, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -346,7 +346,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 34, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
}
@ -375,7 +375,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(uint8 rideIndex, uint8 tra
sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height);
sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 42, height, 0, 27, height);
if (track_paint_util_should_paint_supports(gPaintMapPosition)) {
if (track_paint_util_should_paint_supports(gPaintSession.MapPosition)) {
metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
}

View File

@ -70,7 +70,7 @@ void vehicle_visual_submarine(sint32 x, sint32 imageDirection, sint32 y, sint32
static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
sint32 heightLower = height - 16;
@ -96,7 +96,7 @@ static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSeque
static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = gPaintMapPosition;
rct_xy16 position = gPaintSession.MapPosition;
sint32 heightLower = height - 16;
uint32 imageId;