diff --git a/src/ride/water/log_flume.c b/src/ride/water/log_flume.c index f9c9904a40..62a1c79334 100644 --- a/src/ride/water/log_flume.c +++ b/src/ride/water/log_flume.c @@ -74,55 +74,42 @@ enum { SPR_LOG_FLUME_25_DEG_DOWN_SE_NW = 21045, SPR_LOG_FLUME_25_DEG_DOWN_SW_NE = 21046, SPR_LOG_FLUME_25_DEG_DOWN_NW_SE = 21047, - - SPR_LOG_FLUME_S_BEND_LEFT_SW_NW_NE_SEQ_0 = 21116, - SPR_LOG_FLUME_S_BEND_LEFT_SW_NW_NE_SEQ_1 = 21117, - SPR_LOG_FLUME_S_BEND_LEFT_SW_NW_NE_SEQ_2 = 21118, - SPR_LOG_FLUME_S_BEND_LEFT_SW_NW_NE_SEQ_3 = 21119, - SPR_LOG_FLUME_S_BEND_LEFT_NW_NE_SE_SEQ_0 = 21120, - SPR_LOG_FLUME_S_BEND_LEFT_NW_NE_SE_SEQ_1 = 21121, - SPR_LOG_FLUME_S_BEND_LEFT_NW_NE_SE_SEQ_2 = 21122, - SPR_LOG_FLUME_S_BEND_LEFT_NW_NE_SE_SEQ_3 = 21123, - SPR_LOG_FLUME_S_BEND_LEFT_SW_SE_NE_SEQ_0 = 21124, - SPR_LOG_FLUME_S_BEND_LEFT_SW_SE_NE_SEQ_1 = 21125, - SPR_LOG_FLUME_S_BEND_LEFT_SW_SE_NE_SEQ_2 = 21126, - SPR_LOG_FLUME_S_BEND_LEFT_SW_SE_NE_SEQ_3 = 21127, - SPR_LOG_FLUME_S_BEND_LEFT_NW_SW_SE_SEQ_0 = 21128, - SPR_LOG_FLUME_S_BEND_LEFT_NW_SW_SE_SEQ_1 = 21129, - SPR_LOG_FLUME_S_BEND_LEFT_NW_SW_SE_SEQ_2 = 21130, - SPR_LOG_FLUME_S_BEND_LEFT_NW_SW_SE_SEQ_3 = 21131, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_SW_NE_SEQ_0 = 20964, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_SW_NE_SEQ_1 = 20965, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_SW_NE_SEQ_2 = 20966, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_SW_NE_SEQ_3 = 20967, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_NW_SE_SEQ_0 = 20968, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_NW_SE_SEQ_1 = 20969, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_NW_SE_SEQ_2 = 20970, - SPR_LOG_FLUME_S_BEND_LEFT_FRONT_NW_SE_SEQ_3 = 20971, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_SW_NE_SEQ_0 = 20972, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_SW_NE_SEQ_1 = 20973, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_SW_NE_SEQ_2 = 20974, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_SW_NE_SEQ_3 = 20975, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_NW_SE_SEQ_0 = 20976, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_NW_SE_SEQ_1 = 20977, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_NW_SE_SEQ_2 = 20978, - SPR_LOG_FLUME_S_BEND_RIGHT_FRONT_NW_SE_SEQ_3 = 20979, - SPR_LOG_FLUME_S_BEND_LEFT_NE_SE_SW_SEQ_3 = 20980, - SPR_LOG_FLUME_S_BEND_LEFT_NE_SE_SW_SEQ_2 = 20981, - SPR_LOG_FLUME_S_BEND_LEFT_NE_SE_SW_SEQ_1 = 20982, - SPR_LOG_FLUME_S_BEND_LEFT_NE_SE_SW_SEQ_0 = 20983, - SPR_LOG_FLUME_S_BEND_LEFT_SE_SW_NW_SEQ_3 = 20984, - SPR_LOG_FLUME_S_BEND_LEFT_SE_SW_NW_SEQ_2 = 20985, - SPR_LOG_FLUME_S_BEND_LEFT_SE_SW_NW_SEQ_1 = 20986, - SPR_LOG_FLUME_S_BEND_LEFT_SE_SW_NW_SEQ_0 = 20987, - SPR_LOG_FLUME_S_BEND_LEFT_NE_NW_SW_SEQ_3 = 20988, - SPR_LOG_FLUME_S_BEND_LEFT_NE_NW_SW_SEQ_2 = 20989, - SPR_LOG_FLUME_S_BEND_LEFT_NE_NW_SW_SEQ_1 = 20990, - SPR_LOG_FLUME_S_BEND_LEFT_NE_NW_SW_SEQ_0 = 20991, - SPR_LOG_FLUME_S_BEND_LEFT_SE_NE_NW_SEQ_3 = 20992, - SPR_LOG_FLUME_S_BEND_LEFT_SE_NE_NW_SEQ_2 = 20993, - SPR_LOG_FLUME_S_BEND_LEFT_SE_NE_NW_SEQ_1 = 20994, - SPR_LOG_FLUME_S_BEND_LEFT_SE_NE_NW_SEQ_0 = 20995, + SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_0 = 21048, + SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_2 = 21049, + SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_3 = 21050, + SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_0 = 21051, + SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_2 = 21052, + SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_3 = 21053, + SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_0 = 21054, + SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_2 = 21055, + SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_3 = 21056, + SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_0 = 21057, + SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_2 = 21058, + SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_3 = 21059, + SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0 = 21060, + SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2 = 21061, + SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_3 = 21062, + SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0 = 21063, + SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2 = 21064, + SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_3 = 21065, + SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0 = 21066, + SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2 = 21067, + SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_3 = 21068, + SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0 = 21069, + SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2 = 21070, + SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_3 = 21071, + SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_0 = 21072, + SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_2 = 21073, + SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_3 = 21074, + SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_0 = 21075, + SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_2 = 21076, + SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_3 = 21077, + SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_0 = 21078, + SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_2 = 21079, + SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_3 = 21080, + SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_0 = 21081, + SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_2 = 21082, + SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_3 = 21083, }; static const uint32 LogFlumeTrackFlatImageIds[4][2] = @@ -488,18 +475,18 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(uint8 rideIndex, uin { static const uint32 imageIds[4][3] = { - { 21072, 21073, 21074 }, - { 21075, 21076, 21077 }, - { 21078, 21079, 21080 }, - { 21081, 21082, 21083 } + { SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_2, SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_2, SPR_LOG_FLUME_3_TURN_NE_NW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_2, SPR_LOG_FLUME_3_TURN_SE_NE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_2, SPR_LOG_FLUME_3_TURN_SW_SE_SEQ_3 }, }; static const uint32 imageIdsFront[4][3] = { - { 21060, 21061, 21062 }, - { 21063, 21064, 21065 }, - { 21066, 21067, 21068 }, - { 21069, 21070, 21071 } + { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_3 }, }; track_paint_util_left_quarter_turn_3_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIds, get_current_rotation()); @@ -535,18 +522,18 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(uint8 rideIndex, ui { static const uint32 imageIds[4][3] = { - { 21057, 21058, 21059 }, - { 21048, 21049, 21050 }, - { 21051, 21052, 21053 }, - { 21054, 21055, 21056 } + { SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_2, SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_2, SPR_LOG_FLUME_3_TURN_NE_SE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_2, SPR_LOG_FLUME_3_TURN_SE_SW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_2, SPR_LOG_FLUME_3_TURN_SW_NW_SEQ_3 } }; static const uint32 imageIdsFront[4][3] = { - { 21069, 21070, 21071 }, - { 21060, 21061, 21062 }, - { 21063, 21064, 21065 }, - { 21066, 21067, 21068 } + { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_3 }, + { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_3 }, }; track_paint_util_right_quarter_turn_3_tiles_paint_2(2, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], imageIds, get_current_rotation());