From d51a14e8ca2c2ab1fd3cebb7d562b9b36f4c1221 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 20 Aug 2016 22:20:18 +0200 Subject: [PATCH] Integrate word_9A3684 --- src/ride/vehicle.c | 2 +- src/ride/vehicle_data.c | 36 ++++++++++++++++++++++++++++++++++++ src/ride/vehicle_data.h | 2 ++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 26813d312b..87efd57abe 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -4632,7 +4632,7 @@ static void vehicle_update_sound(rct_vehicle *vehicle) vehicle->sound2_volume = (soundIdVolume >> 8) & 0xFF; { - int ebx = RCT2_ADDRESS(0x009A3684, sint16)[vehicle->sprite_direction]; + int ebx = word_9A3684[vehicle->sprite_direction]; int eax = ((vehicle->velocity >> 14) * ebx) >> 14; eax = clamp(-127, eax, 127); diff --git a/src/ride/vehicle_data.c b/src/ride/vehicle_data.c index 26d41dccb3..f07ad06efd 100644 --- a/src/ride/vehicle_data.c +++ b/src/ride/vehicle_data.c @@ -882,3 +882,39 @@ const sint32 dword_9A2970[] = { 546342, // 58 -110424, // 59 }; + +/** rct2: 0x009A3684 */ +const sint32 word_9A3684[] = { + -0x4000, // 0 + -0x3000, // 1 + -0x2000, // 2 + -0x1000, // 3 + 0, // 4 + 0x1000, // 5 + 0x2000, // 6 + 0x3000, // 7 + 0x4000, // 8 + 0x4800, // 9 + 0x4800, // 10 + 0x4800, // 11 + 0x4800, // 12 + 0x4800, // 13 + 0x4800, // 14 + 0x4800, // 15 + 0x4000, // 16 + 0x3000, // 17 + 0x2000, // 18 + 0x1000, // 19 + 0, // 20 + -0x1000, // 21 + -0x2000, // 22 + -0x3000, // 23 + -0x4000, // 24 + -0x4800, // 25 + -0x4800, // 26 + -0x4800, // 27 + -0x4800, // 28 + -0x4800, // 29 + -0x4800, // 30 + -0x4800, // 31 +}; diff --git a/src/ride/vehicle_data.h b/src/ride/vehicle_data.h index 8aad6b7156..47d33d2628 100644 --- a/src/ride/vehicle_data.h +++ b/src/ride/vehicle_data.h @@ -36,4 +36,6 @@ extern const int MotionSimulatorTimeToSpriteMapCount; extern const sint32 dword_9A2930[]; extern const sint32 dword_9A2970[]; +extern const sint32 word_9A3684[]; + #endif