diff --git a/src/addresses.h b/src/addresses.h index 96d30f099c..2278173c3d 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -228,9 +228,6 @@ #define RCT2_ADDRESS_PARK_RATING_WARNING_DAYS 0x0135883E -#define RCT2_ADDRESS_SCENARIO_NAME 0x0135920A -#define RCT2_ADDRESS_SCENARIO_DETAILS 0x0135924A - #define RCT2_ADDRESS_PARK_ENTRANCE_X 0x01359350 #define RCT2_ADDRESS_PARK_ENTRANCE_Y 0x01359358 #define RCT2_ADDRESS_PARK_ENTRANCE_Z 0x01359360 @@ -248,7 +245,6 @@ #define RCT2_ADDRESS_SAVED_VIEW_Y 0x0138869C #define RCT2_ADDRESS_SAVED_VIEW_ZOOM 0x0138869E #define RCT2_ADDRESS_SAVED_VIEW_ROTATION 0x0138869F -#define RCT2_ADDRESS_SCENARIO_COMPLETED_BY 0x013587D8 #define RCT2_ADDRESS_RIDE_MEASUREMENTS 0x0138B60C #define RCT2_ADDRESS_GRASS_SCENERY_TILEPOS 0x013B0E70 @@ -588,6 +584,9 @@ #define RCT2_ADDRESS_PARK_SIZE 0x013580EA #define RCT2_ADDRESS_LAND_COST 0x01358770 #define RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST 0x01358772 +#define RCT2_ADDRESS_SCENARIO_COMPLETED_BY 0x013587D8 +#define RCT2_ADDRESS_SCENARIO_NAME 0x0135920A +#define RCT2_ADDRESS_SCENARIO_DETAILS 0x0135924A #define RCT2_ADDRESS_NUM_MAP_ANIMATIONS 0x0138B580 #define RCT2_ADDRESS_CLIMATE 0x013CA746 diff --git a/src/management/finance.c b/src/management/finance.c index 15e8abca49..63235b231e 100644 --- a/src/management/finance.c +++ b/src/management/finance.c @@ -202,9 +202,7 @@ void finance_init() { gScenarioCompletedCompanyValue = MONEY32_UNDEFINED; gTotalAdmissions = 0; gTotalIncomeFromAdmissions = 0; - - RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 0x3F; - + strcpy(gScenarioCompletedBy, "?"); finance_update_loan_hash(); } diff --git a/src/scenario.c b/src/scenario.c index d09268b07d..f9149babd5 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -59,9 +59,9 @@ static char _scenarioPath[MAX_PATH]; const char *_scenarioFileName = ""; rct_s6_info *gS6Info = RCT2_ADDRESS(0x0141F570, rct_s6_info); -char *gScenarioName = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_NAME, char); -char *gScenarioDetails = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_DETAILS, char); -char *gScenarioCompletedBy = RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, char); +char gScenarioName[64]; +char gScenarioDetails[256]; +char gScenarioCompletedBy[32]; char gScenarioSavePath[MAX_PATH]; int gFirstTimeSave = 1; uint32 gLastAutoSaveTick = 0; @@ -259,7 +259,7 @@ void scenario_begin() gScenarioCompletedCompanyValue = MONEY32_UNDEFINED; gTotalAdmissions = 0; gTotalIncomeFromAdmissions = 0; - RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 63; + strcpy(gScenarioCompletedBy, "?"); finance_update_loan_hash(); park_reset_history(); finance_reset_history(); diff --git a/src/scenario.h b/src/scenario.h index e7d952ea5a..d661ea2965 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -436,9 +436,9 @@ extern int gScenarioListCapacity; extern scenario_index_entry *gScenarioList; extern rct_s6_info *gS6Info; -extern char *gScenarioName; -extern char *gScenarioDetails; -extern char *gScenarioCompletedBy; +extern char gScenarioName[64]; +extern char gScenarioDetails[256]; +extern char gScenarioCompletedBy[32]; extern char gScenarioSavePath[MAX_PATH]; extern int gFirstTimeSave; extern uint32 gLastAutoSaveTick;