diff --git a/src/ride/coaster/reverse_freefall_coaster.c b/src/ride/coaster/reverse_freefall_coaster.c index fa95a0a46e..5b1b8bf9e0 100644 --- a/src/ride/coaster/reverse_freefall_coaster.c +++ b/src/ride/coaster/reverse_freefall_coaster.c @@ -33,58 +33,58 @@ enum { SPR_REVERSE_FREEFALL_RC_FLAT_SW_NE = 22164, SPR_REVERSE_FREEFALL_RC_FLAT_NW_SE = 22165, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_0 = 22174, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_1 = 22175, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_2 = 22176, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_3 = 22177, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_4 = 22178, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_6 = 22179, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_0 = 22180, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_1 = 22181, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_2 = 22182, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_3 = 22183, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_4 = 22184, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_6 = 22185, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_0 = 22186, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_1 = 22187, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_2 = 22188, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_3 = 22189, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_4 = 22190, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_6 = 22191, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_0 = 22192, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_1 = 22193, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_2 = 22194, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_3 = 22195, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_4 = 22196, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_6 = 22197, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_0 = 22198, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_1 = 22199, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_2 = 22200, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_3 = 22201, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_4 = 22202, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_6 = 22203, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_5 = 22204, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_0 = 22205, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_1 = 22206, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_2 = 22207, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_3 = 22208, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_4 = 22209, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_6 = 22210, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_5 = 22211, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_0 = 22212, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_1 = 22213, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_2 = 22214, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_3 = 22215, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_4 = 22216, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_6 = 22217, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_5 = 22218, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_0 = 22219, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_1 = 22220, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_2 = 22221, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_3 = 22222, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_4 = 22223, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_6 = 22224, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_5 = 22225, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_0 = 22174, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_1 = 22175, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_2 = 22176, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_3 = 22177, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_4 = 22178, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_6 = 22179, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_0 = 22180, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_1 = 22181, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_2 = 22182, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_3 = 22183, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_4 = 22184, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_6 = 22185, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_0 = 22186, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_1 = 22187, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_2 = 22188, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_3 = 22189, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_4 = 22190, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_6 = 22191, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_0 = 22192, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_1 = 22193, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_2 = 22194, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_3 = 22195, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_4 = 22196, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_6 = 22197, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_0 = 22198, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_1 = 22199, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_2 = 22200, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_3 = 22201, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_4 = 22202, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_6 = 22203, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_5 = 22204, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_0 = 22205, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_1 = 22206, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_2 = 22207, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_3 = 22208, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_4 = 22209, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_6 = 22210, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_5 = 22211, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_0 = 22212, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_1 = 22213, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_2 = 22214, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_3 = 22215, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_4 = 22216, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_6 = 22217, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_5 = 22218, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_0 = 22219, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_1 = 22220, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_2 = 22221, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_3 = 22222, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_4 = 22223, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_6 = 22224, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_5 = 22225, }; static const uint32 reverse_freefall_rc_track_pieces_station[4] = { @@ -96,34 +96,34 @@ static const uint32 reverse_freefall_rc_track_pieces_station[4] = { static const uint32 reverse_freefall_rc_track_pieces_slope[7][4] = { { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_0, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_1, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_2, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_3, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_4, }, { 0, @@ -132,55 +132,55 @@ static const uint32 reverse_freefall_rc_track_pieces_slope[7][4] = { 0 }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_NE_SW_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SE_NW_6, }, }; static const uint32 reverse_freefall_rc_track_pieces_slope_supports[7][4] = { { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_0, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_0, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_0, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_1, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_1, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_1, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_2, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_2, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_2, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_3, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_3, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_3, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_4, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_4, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_4, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_5, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_5, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_5, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_5, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_5, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_5, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_5, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_5, }, { - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW_6, - SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SE_NW_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NE_SW_6, + SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_6, }, };