diff --git a/src/addresses.h b/src/addresses.h index 21cf8f82c5..241a204c2c 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -213,9 +213,6 @@ #define RCT2_ADDRESS_SPRITE_LISTS_HEAD 0x013573BC #define RCT2_ADDRESS_SPRITE_LISTS_COUNT 0x013573C8 #define RCT2_ADDRESS_CURRENT_PARK_VALUE 0x0135853C -#define RCT2_ADDRESS_AWARD_LIST 0x01358760 -#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT 0x01358838 -#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT_EXTENDED 0x0135934C #define RCT2_ADDRESS_PEEP_SPAWNS 0x013573F2 @@ -228,8 +225,6 @@ #define RCT2_ADDRESS_MAP_SIZE 0x01358834 #define RCT2_ADDRESS_MAP_MAX_XY 0x01358836 -#define RCT2_TOTAL_RIDE_VALUE 0x013580EE - #define RCT2_ADDRESS_PARK_RATING_WARNING_DAYS 0x0135883E #define RCT2_ADDRESS_PARK_ENTRANCE_X 0x01359350 @@ -526,6 +521,7 @@ #define RCT2_ADDRESS_INITIAL_CASH 0x013573DC #define RCT2_ADDRESS_CURRENT_LOAN 0x013573E0 +#define RCT2_TOTAL_RIDE_VALUE 0x013580EE #define RCT2_ADDRESS_MAXIMUM_LOAN 0x013580F0 #define RCT2_ADDRESS_CURRENT_EXPENDITURE 0x0135832C #define RCT2_ADDRESS_CURRENT_PROFIT 0x01358330 @@ -564,6 +560,9 @@ #define RCT2_ADDRESS_GUEST_INITIAL_HUNGER 0x013580F6 #define RCT2_ADDRESS_GUEST_INITIAL_THIRST 0x013580F7 +#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT 0x01358838 +#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT_EXTENDED 0x0135934C + #define RCT2_ADDRESS_CURRENT_RESEARCH_LEVEL 0x013573FF #define RCT2_ADDRESS_ACTIVE_RESEARCH_TYPES 0x01357CF2 #define RCT2_ADDRESS_RESEARH_PROGRESS_STAGE 0x01357CF3 diff --git a/src/management/finance.c b/src/management/finance.c index f6f06d9717..0730b1f269 100644 --- a/src/management/finance.c +++ b/src/management/finance.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../game.h" #include "../interface/window.h" #include "../localisation/date.h" diff --git a/src/ride/ride.c b/src/ride/ride.c index 31386b6bdb..ee0461fc78 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -138,6 +138,10 @@ int gRideRemoveTrackPieceCallbackZ; int gRideRemoveTrackPieceCallbackDirection; int gRideRemoveTrackPieceCallbackType; +money16 gTotalRideValue; +uint32 gSamePriceThroughoutParkA; +uint32 gSamePriceThroughoutParkB; + money32 _currentTrackPrice; uint16 _numCurrentPossibleRideConfigurations; diff --git a/src/ride/ride.h b/src/ride/ride.h index a6a7dd77b6..fa2d27104d 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -920,9 +920,9 @@ rct_ride_measurement *get_ride_measurement(int index); for (i = 0; i < MAX_RIDES; i++) \ if ((ride = get_ride(i))->type != RIDE_TYPE_NULL) -#define gTotalRideValue RCT2_GLOBAL(RCT2_TOTAL_RIDE_VALUE, money16) -#define gSamePriceThroughoutParkA RCT2_GLOBAL(RCT2_ADDRESS_SAME_PRICE_THROUGHOUT, uint32) -#define gSamePriceThroughoutParkB RCT2_GLOBAL(RCT2_ADDRESS_SAME_PRICE_THROUGHOUT_EXTENDED, uint32) +extern money16 gTotalRideValue; +extern uint32 gSamePriceThroughoutParkA; +extern uint32 gSamePriceThroughoutParkB; extern const uint8 gRideClassifications[255];