diff --git a/src/addresses.h b/src/addresses.h
index c962328e60..364989cf5c 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -40,7 +40,7 @@
 #define RCT2_CALLPROC_4(address, a1, a2, a3, a4, v1, v2, v3, v4)			RCT2_CALLFUNC_4(address, void, a1, a2, a3, a4, v1, v2, v3, v4)
 #define RCT2_CALLPROC_5(address, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5)	RCT2_CALLFUNC_5(address, void, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5)
 
-#define RCT2_ADDRESS_RIDE_PROPERTIES				0x00997c9d
+#define RCT2_ADDRESS_RIDE_PROPERTIES				0x00997C9D
 #define RCT2_ADDRESS_LAND_TOOL_SIZE					0x009A9800
 
 #define RCT2_ADDRESS_SCENARIO_LIST					0x009A9FF4
@@ -54,6 +54,8 @@
 #define RCT2_ADDRESS_CONFIG_KEYBOARD_SHORTCUTS		0x009AAC7A
 #define RCT2_ADDRESS_CONFIG_EDGE_SCROLLING			0x009AACBA
 
+#define RCT2_ADDRESS_EXPANSION_NAMES				0x009AACC0
+#define RCT2_ADDRESS_EXPANSION_FLAGS				0x009AB4C0
 #define RCT2_ADDRESS_CONFIG_RESOLUTION_WIDTH		0x009AB4C2
 #define RCT2_ADDRESS_CONFIG_RESOLUTION_HEIGHT		0x009AB4C4
 
@@ -68,8 +70,6 @@
 #define RCT2_ADDRESS_SCREEN_DPI						0x009ABDC8
 #define RCT2_ADDRESS_SCREEN_WIDTH					0x009ABDD8
 #define RCT2_ADDRESS_SCREEN_HEIGHT					0x009ABDDA
-#define RCT2_ADDRESS_SCREEN_CAP_BPP					0x01423C10
-#define RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH		0x01423C14
 
 #define RCT2_ADDRESS_DIRTY_BLOCK_WIDTH				0x009ABDE4
 #define RCT2_ADDRESS_DIRTY_BLOCK_HEIGHT				0x009ABDE6
@@ -163,6 +163,8 @@
 
 #define RCT2_ADDRESS_CURRENT_TICKS					0x013628F4
 #define RCT2_ADDRESS_RIDE_LIST						0x013628F8
+#define RCT2_ADDRESS_SAVED_VIEW_X					0x0138869A
+#define RCT2_ADDRESS_SAVED_VIEW_Y					0x0138869C
 #define RCT2_ADDRESS_RIDE_MEASUREMENTS				0x0138B60C
 
 #define RCT2_ADDRESS_CLIMATE						0x013CA746
@@ -183,6 +185,8 @@
 #define RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE		0x013CE950
 
 #define RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS		0x013CE9A4
+#define RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT		0x0141E9AC
+#define RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE		0x0141E9AE
 
 #define RCT2_ADDRESS_CURRENT_ROTATION				0x0141E9E0
 
@@ -215,8 +219,8 @@
 #define RCT2_ADDRESS_MEM_TOTAL_PAGEFILE				0x01423B60
 #define RCT2_ADDRESS_MEM_TOTAL_VIRTUAL				0x01423B64
 
-#define RCT2_ADDRESS_EXPANSION_FLAGS				0x009AB4C0
-#define RCT2_ADDRESS_EXPANSION_NAMES				0x009AACC0
+#define RCT2_ADDRESS_SCREEN_CAP_BPP					0x01423C10
+#define RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH		0x01423C14
 
 static void RCT2_CALLPROC_EBPSAFE(int address)
 {
diff --git a/src/editor.c b/src/editor.c
index 0508766e2a..c34485048d 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -21,6 +21,7 @@
 #include "addresses.h"
 #include "date.h"
 #include "editor.h"
+#include "game.h"
 #include "gfx.h"
 #include "map.h"
 #include "news_item.h"
@@ -165,5 +166,5 @@ static void set_all_land_owned()
 {
 	int mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16);
 
-	RCT2_CALLPROC_X(0x006677F2, 64, 1, 64, 2, 56, (mapSize - 2) * 32, (mapSize - 2) * 32);
+	game_do_command(64, 1, 64, 2, 56, (mapSize - 2) * 32, (mapSize - 2) * 32);
 }
diff --git a/src/game.c b/src/game.c
index 5e7f8c2bf0..6c3ffe1de2 100644
--- a/src/game.c
+++ b/src/game.c
@@ -971,4 +971,109 @@ void game_handle_keyboard_input()
 		// Write tutorial input
 		RCT2_CALLPROC_X(0x0066EEE1, RCT2_GLOBAL(RCT2_ADDRESS_PLACE_OBJECT_MODIFIER, uint8), 0, 0, 0, 0, 0, 0);
 	}
+}
+
+/**
+ * 
+ *  rct2: 0x006677F2
+ *
+ * @param cost (ebp)
+ */
+static int game_check_affordability(int cost)
+{
+	int eax, ebx, ecx, edx, esi, edi, ebp;
+	ebp = cost;
+	RCT2_CALLFUNC_X(0x0069C62C, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
+	return ebp;
+}
+
+/**
+ * 
+ *  rct2: 0x006677F2
+ *
+ * @param flags (ebx)
+ * @param command (esi)
+ */
+int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp)
+{
+	int cost, flags, insufficientFunds;
+	int original_ebx, original_edx, original_esi, original_edi, original_ebp;
+
+	original_ebx = ebx;
+	original_edx = edx;
+	original_esi = esi;
+	original_edi = edi;
+	original_ebp = ebp;
+
+	RCT2_CALLFUNC_X(0x006677F2, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
+	return ebx;
+
+	flags = ebx;
+	RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = 0xFFFF;
+
+	// Increment nest count
+	RCT2_GLOBAL(0x009A8C28, uint8)++;
+
+	ebx &= ~1;
+
+	// Primary command
+	RCT2_CALLFUNC_X(RCT2_ADDRESS(0x0097B9A4, uint32)[esi], &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
+	cost = ebx;
+
+	if (cost != 0x80000000) {
+		// Check funds
+		insufficientFunds = 0;
+		if (RCT2_GLOBAL(0x009A8C28, uint8) == 1 && !(flags & 4) && !(flags & 0x20) && cost != 0)
+			insufficientFunds = game_check_affordability(cost);
+
+		if (insufficientFunds != 0x80000000) {
+			ebx = original_ebx;
+			edx = original_edx;
+			esi = original_esi;
+			edi = original_edi;
+			ebp = original_ebp;
+
+			if (!(flags & 1)) {
+				// Decrement nest count
+				RCT2_GLOBAL(0x009A8C28, uint8)--;
+				return cost;
+			}
+
+			// Secondary command
+			RCT2_CALLFUNC_X(RCT2_ADDRESS(0x0097B9A4, uint32)[esi], &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
+			edx = ebx;
+
+			if (edx != 0x80000000 && edx < cost)
+				cost = edx;
+
+			// Decrement nest count
+			RCT2_GLOBAL(0x009A8C28, uint8)--;
+			if (RCT2_GLOBAL(0x009A8C28, uint8) != 0)
+				return cost;
+
+			// 
+			if (!(flags & 0x20)) {
+				// Update money balance
+				RCT2_CALLPROC_X(0x0069C674, 0, cost, 0, 0, 0, 0, 0);
+				if (RCT2_GLOBAL(0x0141F568, uint8) == RCT2_GLOBAL(0x013CA740, uint8)) {
+					// Create a +/- money text effect
+					if (cost != 0)
+						RCT2_CALLPROC_X(0x0069C5D0, 0, cost, 0, 0, 0, 0, 0);
+				}
+			}
+
+			return cost;
+		}
+	}
+
+	// Error occured
+
+	// Decrement nest count
+	RCT2_GLOBAL(0x009A8C28, uint8)--;
+
+	// Show error window
+	if (RCT2_GLOBAL(0x009A8C28, uint8) == 0 && (flags & 1) && RCT2_GLOBAL(0x0141F568, uint8) == RCT2_GLOBAL(0x013CA740, uint8) && !(flags & 8))
+		window_error_open(RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16), RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16));
+
+	return 0x80000000;
 }
\ No newline at end of file
diff --git a/src/game.h b/src/game.h
index 4a0ae74fa1..cca9afb469 100644
--- a/src/game.h
+++ b/src/game.h
@@ -25,4 +25,6 @@ void game_create_windows();
 void game_update();
 void game_logic_update();
 
+int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
+
 #endif
diff --git a/src/peep.h b/src/peep.h
index 363d78dd76..f78b5d1f43 100644
--- a/src/peep.h
+++ b/src/peep.h
@@ -78,17 +78,22 @@ typedef struct {
 	uint8 staff_type;				// 0x2F
 	uint8 var_30;
 	uint8 var_31;
-	uint8 pad_32[0x08];
+	uint8 pad_32[0x06];
+	uint8 energy;					// 0x38
+	uint8 var_39;
 	uint8 happiness;				// 0x3A
 	uint8 var_03B;
 	uint8 nausea;					// 0x3C
-	uint8 pad_03D[0x2B];
+	uint8 var_03D;
+	uint8 hunger;					// 0x3E
+	uint8 thirst;					// 0x3F
+	uint8 pad_040[0x28];
 	uint8 current_ride;				// 0x68
-	uint8 pad_6a;					// 0x6A Part of current_ride?
+	uint8 pad_6A;					// 0x6A Part of current_ride?
 	uint8 current_train;   	        // 0x6B
 	uint8 current_car;				// 0x6C
-	uint8 current_seat;				// 0x6d
-	uint8 pad_6C[0x2e];
+	uint8 current_seat;				// 0x6D
+	uint8 pad_6E[0x2E];
 	uint32 id;						// 0x9C
 	uint8 pad_A0[0x10];
 	rct_peep_thought thoughts[PEEP_MAX_THOUGHTS];	// 0xB0
diff --git a/src/scenario.c b/src/scenario.c
index 318f6535dc..f4f38d97fc 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -422,8 +422,8 @@ void scenario_load_and_play(rct_scenario_basic *scenario)
 	mainWindow = window_get_main();
 
 	mainWindow->var_4B0 = -1;
-	mainWindow->var_4B2 = RCT2_GLOBAL(0x0138869A, sint16);
-	mainWindow->var_4B4 = RCT2_GLOBAL(0x0138869C, sint16);
+	mainWindow->var_4B2 = RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_X, sint16);
+	mainWindow->var_4B4 = RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_Y, sint16);
 
 	uint8 _cl = (RCT2_GLOBAL(0x0138869E, sint16) & 0xFF) - mainWindow->viewport->zoom;
 	mainWindow->viewport->zoom = RCT2_GLOBAL(0x0138869E, sint16) & 0xFF;
@@ -462,33 +462,37 @@ void scenario_load_and_play(rct_scenario_basic *scenario)
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_COMPANY_VALUE, sint16) = calculate_company_value();
 	RCT2_GLOBAL(0x013587D0, sint16) = RCT2_GLOBAL(0x013573DC, sint16) - RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, sint16);
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, sint16) = ENCRYPT_MONEY(RCT2_GLOBAL(0x013573DC, sint32));
-	RCT2_CALLPROC_EBPSAFE(0x0069E869);
+	RCT2_CALLPROC_EBPSAFE(0x0069E869); // (loan related)
 
 	strcpy(0x0135924A, s6Info->details);
 	strcpy(0x0135920A, s6Info->name);
 
-	// RCT2_CALLPROC_EBPSAFE(0x00678461);
-
 	if (RCT2_GLOBAL(0x009ADAE4, sint32) != -1) {
 		char *ebp = RCT2_GLOBAL(0x009ADAE4, char*);
 
+		// 
 		format_string(0x0141ED68, RCT2_GLOBAL(ebp + 2, uint16), 0);
-		RCT2_GLOBAL(0x0141E9AE, uint16) = STR_CANT_RENAME_PARK;
-
-		RCT2_CALLPROC_X(0x006677F2, 1, 1, 0, *((int*)(0x0141ED68 + 0)), 33, *((int*)(0x0141ED68 + 8)), *((int*)(0x0141ED68 + 4)));
-		RCT2_CALLPROC_X(0x006677F2, 2, 1, 0, *((int*)(0x0141ED68 + 12)), 33, *((int*)(0x0141ED68 + 20)), *((int*)(0x0141ED68 + 16)));
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, *((int*)(0x0141ED68 + 24)), 33, *((int*)(0x0141ED68 + 32)), *((int*)(0x0141ED68 + 28)));
+		
+		// Set park name
+		RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_RENAME_PARK;
+		game_do_command(1, 1, 0, *((int*)(0x0141ED68 + 0)), 33, *((int*)(0x0141ED68 + 8)), *((int*)(0x0141ED68 + 4)));
+		game_do_command(2, 1, 0, *((int*)(0x0141ED68 + 12)), 33, *((int*)(0x0141ED68 + 20)), *((int*)(0x0141ED68 + 16)));
+		game_do_command(0, 1, 0, *((int*)(0x0141ED68 + 24)), 33, *((int*)(0x0141ED68 + 32)), *((int*)(0x0141ED68 + 28)));
 
+		// 
 		format_string(0x0141ED68, RCT2_GLOBAL(ebp + 0, uint16), 0);
 		strcpy_s(0x0135920A, 32, 0x0141ED68);
 
+		// Set scenario details
 		format_string(0x0141ED68, RCT2_GLOBAL(ebp + 4, uint16), 0);
 		strcpy_s(RCT2_ADDRESS_SCENARIO_DETAILS, 256, 0x0141ED68);
 	}
 
+	// Set the last saved game path
 	strcpy(0x009ABB37, 0x009AB5DA);
 	format_string(0x009ABB37 + strlen(0x009ABB37), RCT2_GLOBAL(0x0013573D4, uint16), 0x0013573D8);
 	strcat(0x009ABB37, ".SV6");
+
 	memset(0x001357848, 0, 56);
 	RCT2_GLOBAL(0x0135832C, uint32) = 0;
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PROFIT, sint32) = 0;
@@ -498,9 +502,9 @@ void scenario_load_and_play(rct_scenario_basic *scenario)
 	RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32) = 0;
 	RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, uint32) = 0;
 	RCT2_GLOBAL(0x013587D8, uint16) = 63;
-	RCT2_CALLPROC_EBPSAFE(0x0069E869);
-	RCT2_CALLPROC_EBPSAFE(0x0066729F);
-	RCT2_CALLPROC_EBPSAFE(0x006B7A38);
+	RCT2_CALLPROC_EBPSAFE(0x0069E869); // (loan related, called above already)
+	RCT2_CALLPROC_EBPSAFE(0x0066729F); // reset history / finance / awards
+	RCT2_CALLPROC_EBPSAFE(0x006B7A38); // reset_all_ride_build_dates
 	date_reset();
 	RCT2_CALLPROC_EBPSAFE(0x00674576);
 	park_calculate_size();
@@ -508,15 +512,20 @@ void scenario_load_and_play(rct_scenario_basic *scenario)
 	RCT2_GLOBAL(0x01358840, uint8) = 0;
 	memset(0x001358102, 0, 20);
 	RCT2_GLOBAL(0x00135882E, uint16) = 0;
+
+	// Open park with free entry when there is no money
 	if (RCT2_GLOBAL(RCT2_ADDRESS_GAME_FLAGS, uint32) & GAME_FLAGS_NO_MONEY) {
 		RCT2_GLOBAL(RCT2_ADDRESS_GAME_FLAGS, uint32) |= GAME_FLAGS_PARK_OPEN;
 		RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, uint16) = 0;
 	}
+
 	RCT2_GLOBAL(RCT2_ADDRESS_GAME_FLAGS, uint32) |= GAME_FLAGS_18;
-	RCT2_CALLPROC_EBPSAFE(0x006837E3);
+
+	RCT2_CALLPROC_EBPSAFE(0x006837E3); // (palette related)
+
 	gfx_invalidate_screen();
 	RCT2_GLOBAL(0x009DEA66, uint16) = 0;
-	RCT2_GLOBAL(0x009DEA5C, uint16) = 62000;
+	RCT2_GLOBAL(0x009DEA5C, uint16) = 62000; // (doesn't appear to ever be read)
 }
 
 
diff --git a/src/screenshot.c b/src/screenshot.c
index f383c95d9b..727d2ffc4d 100644
--- a/src/screenshot.c
+++ b/src/screenshot.c
@@ -33,7 +33,7 @@ enum {
 	SCREENSHOT_FORMAT_PNG
 };
 
-int gScreenshotFormat = SCREENSHOT_FORMAT_BMP;
+int gScreenshotFormat = SCREENSHOT_FORMAT_PNG;
 
 static int screenshot_dump_bmp();
 static int screenshot_dump_png();
diff --git a/src/window.h b/src/window.h
index 41ec37d2e7..d74e7e98d7 100644
--- a/src/window.h
+++ b/src/window.h
@@ -135,8 +135,8 @@ typedef struct rct_window {
 	sint16 var_4AC;
 	sint16 var_4AE;
 	sint16 var_4B0; // viewport target sprite?
-	sint16 var_4B2;
-	sint16 var_4B4;
+	sint16 var_4B2; // viewport target x?
+	sint16 var_4B4; // viewport target y?
 	rct_windowclass classification;	// 0x4B6
 	uint8 pad_4B7;
 	sint8 var_4B8;
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index fdf6697dbb..b5acb6ebae 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -19,6 +19,7 @@
  *****************************************************************************/
 
 #include "addresses.h"
+#include "game.h"
 #include "sprites.h"
 #include "strings.h"
 #include "widget.h"
@@ -151,7 +152,7 @@ static void window_game_top_toolbar_mouseup()
 
 	switch (widgetIndex) {
 	case WIDX_PAUSE:
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 2, 0, 0);
+		game_do_command(0, 1, 0, 0, 2, 0, 0);
 		break;
 	case WIDX_FASTFORWARD:
 		window_cheats_open();
@@ -342,7 +343,7 @@ static void window_game_top_toolbar_dropdown()
 	if (widgetIndex == WIDX_FILE_MENU) {
 		switch (dropdownIndex) {
 		case 0:		// load game
-			RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 5, 0, 0);
+			game_do_command(0, 1, 0, 0, 5, 0, 0);
 			break;
 		case 1:		// save game
 			RCT2_CALLPROC_EBPSAFE(0x006EE281);
@@ -367,7 +368,7 @@ static void window_game_top_toolbar_dropdown()
 				RCT2_CALLPROC_X(0x006754F5, eax, 0, 0, 0, 0, 0, 0);
 				// check success?
 
-				RCT2_CALLPROC_X(0x006677F2, 0, 1047, 0, -1, 0, 0, 0);
+				game_do_command(0, 1047, 0, -1, 0, 0, 0);
 				gfx_invalidate_screen();
 			}
 			break;
@@ -381,7 +382,7 @@ static void window_game_top_toolbar_dropdown()
 			RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10;
 			break;
 		case 7:		// quit game
-			RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 5, 1, 0);
+			game_do_command(0, 1, 0, 0, 5, 1, 0);
 			break;
 		}
 	} else if (widgetIndex == WIDX_VIEW_MENU) {
diff --git a/src/window_park.c b/src/window_park.c
index 7474a6f3d2..e88059317b 100644
--- a/src/window_park.c
+++ b/src/window_park.c
@@ -21,6 +21,7 @@
 #include "addresses.h"
 #include "config.h"
 #include "date.h"
+#include "game.h"
 #include "park.h"
 #include "peep.h"
 #include "ride.h"
@@ -759,12 +760,12 @@ static void window_park_entrance_dropdown()
 		if (dropdownIndex != 0) {
 			dropdownIndex &= 0x00FF;
 			dropdownIndex |= 0x0100;
-			RCT2_GLOBAL(0x0141E9AE, uint16) = 1724;
+			RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = 1724;
 		} else {
 			dropdownIndex &= 0x00FF;
-			RCT2_GLOBAL(0x0141E9AE, uint16) = 1723;
+			RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = 1723;
 		}
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, dropdownIndex, 34, 0, 0);
+		game_do_command(0, 1, 0, dropdownIndex, 34, 0, 0);
 	}
 }
 
@@ -886,10 +887,10 @@ static void window_park_entrance_textinput()
 
 	if (widgetIndex == WIDX_RENAME) {
 		if (result) {
-			RCT2_GLOBAL(0x0141E9AE, uint16) = STR_CANT_RENAME_PARK;
-			RCT2_CALLPROC_X(0x006677F2, 1, 1, 0, *((int*)(text + 0)), '!', *((int*)(text + 8)), *((int*)(text + 4)));
-			RCT2_CALLPROC_X(0x006677F2, 2, 1, 0, *((int*)(text + 12)), '!', *((int*)(text + 20)), *((int*)(text + 16)));
-			RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, *((int*)(text + 24)), '!', *((int*)(text + 32)), *((int*)(text + 28)));
+			RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_RENAME_PARK;
+			game_do_command(1, 1, 0, *((int*)(text + 0)), 33, *((int*)(text + 8)), *((int*)(text + 4)));
+			game_do_command(2, 1, 0, *((int*)(text + 12)), 33, *((int*)(text + 20)), *((int*)(text + 16)));
+			game_do_command(0, 1, 0, *((int*)(text + 24)), 33, *((int*)(text + 32)), *((int*)(text + 28)));
 		}
 	}
 }
@@ -1370,11 +1371,11 @@ static void window_park_price_mousedown()
 		break;
 	case WIDX_INCREASE_PRICE:
 		newFee = min(1000, RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, uint16) + 10);
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 39, newFee, 0);
+		game_do_command(0, 1, 0, 0, 39, newFee, 0);
 		break;
 	case WIDX_DECREASE_PRICE:
 		newFee = max(0, RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, uint16) - 10);
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 39, newFee, 0);
+		game_do_command(0, 1, 0, 0, 39, newFee, 0);
 		break;
 	}
 }
diff --git a/src/window_ride_list.c b/src/window_ride_list.c
index 380d5bff55..1d0476640f 100644
--- a/src/window_ride_list.c
+++ b/src/window_ride_list.c
@@ -20,6 +20,7 @@
 
 #include <string.h>
 #include "addresses.h"
+#include "game.h"
 #include "ride.h"
 #include "strings.h"
 #include "sprites.h"
@@ -756,7 +757,7 @@ static void window_ride_list_close_all(rct_window *w)
 		RCT2_GLOBAL(0x013CE952 + 6, uint16) = w->scrolls[0].v_top;
 		RCT2_GLOBAL(0x013CE952 + 8, uint32) = w->scrolls[0].v_bottom;
 
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, i, 8, 0, 0);
+		game_do_command(0, 1, 0, i, 8, 0, 0);
 	}
 }
 
@@ -776,6 +777,6 @@ static void window_ride_list_open_all(rct_window *w)
 		RCT2_GLOBAL(0x013CE952 + 6, uint16) = w->scrolls[0].v_top;
 		RCT2_GLOBAL(0x013CE952 + 8, uint32) = w->scrolls[0].v_bottom;
 
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, (1 << 8) | i, 8, 0, 0);
+		game_do_command(0, 1, 0, (1 << 8) | i, 8, 0, 0);
 	}
 }
diff --git a/src/window_title_exit.c b/src/window_title_exit.c
index f96943db03..1eaa52b6a8 100644
--- a/src/window_title_exit.c
+++ b/src/window_title_exit.c
@@ -19,6 +19,7 @@
  *****************************************************************************/
 
 #include "addresses.h"
+#include "game.h"
 #include "sprites.h"
 #include "strings.h"
 #include "widget.h"
@@ -104,7 +105,7 @@ static void window_title_exit_mouseup()
 		return;
 
 	if (widgetIndex == 0)
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 5, 2, 0);
+		game_do_command(0, 1, 0, 0, 5, 2, 0);
 }
 
 /**
diff --git a/src/window_title_menu.c b/src/window_title_menu.c
index 265e2501ac..f34c875127 100644
--- a/src/window_title_menu.c
+++ b/src/window_title_menu.c
@@ -20,6 +20,7 @@
 
 #include "addresses.h"
 #include "editor.h"
+#include "game.h"
 #include "strings.h"
 #include "sprites.h"
 #include "tutorial.h"
@@ -112,7 +113,7 @@ static void window_title_menu_mouseup()
 	if (widgetIndex == WIDX_START_NEW_GAME) {
 		window_scenarioselect_open();
 	} else if (widgetIndex == WIDX_CONTINUE_SAVED_GAME) {
-		RCT2_CALLPROC_X(0x006677F2, 0, 1, 0, 0, 5, 0, 0);
+		game_do_command(0, 1, 0, 0, 5, 0, 0);
 	}
 }