diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c
index af2e47ea5b..6996c05f60 100644
--- a/src/drawing/drawing.c
+++ b/src/drawing/drawing.c
@@ -475,4 +475,41 @@ void gfx_draw_rain(int left, int top, int width, int height, sint32 x_start, sin
 		pattern_y_pos++;
 		pattern_y_pos %= pattern_y_space;
 	}
-}
\ No newline at end of file
+}
+
+/**
+*
+*  rct2: 0x006843DC
+*/
+void redraw_peep_and_rain()
+{
+	if (RCT2_GLOBAL(0x009ABDF2, uint32) != 0) {
+		int sprite = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_SPRITE, sint32);
+		if (sprite != -1) {
+			sprite = (sprite & 0x7FFFF) * 16;
+			
+			rct_g1_element *g1_elements = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element);
+			int left = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_X, sint32) + g1_elements[sprite].x_offset;
+			int top = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_Y, sint32) + g1_elements[sprite].y_offset;
+			int right = left + g1_elements[sprite].width;
+			int bottom = top + g1_elements[sprite].height;
+			
+			gfx_set_dirty_blocks(left, top, right, bottom);
+		}
+		if (RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32) == 0) {
+			return;
+		}
+		
+		uint8 *screen_pixels = (int *)RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo)->bits;
+		uint32 *rain_pixels = RCT2_ADDRESS(RCT2_ADDRESS_RAIN_PIXEL_STORE, uint32);
+		int rain_no_pixels = RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32);
+		if (rain_pixels) {
+			for (int i = 0; i < rain_no_pixels; i++) {
+				uint32 pixel = rain_pixels[i];
+				screen_pixels[pixel >> 8] = pixel & 0xFF;
+			}
+			RCT2_GLOBAL(0x009E2C78, uint32) = 1;
+		}
+		RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32) = 0;
+	}
+}
diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h
index f167d9ba00..9a206eb6b5 100644
--- a/src/drawing/drawing.h
+++ b/src/drawing/drawing.h
@@ -115,5 +115,6 @@ void draw_string_right_underline(rct_drawpixelinfo *dpi, int format, void *args,
 
 // rain
 void update_rain_animation();
+void redraw_peep_and_rain();
 
 #endif
diff --git a/src/game.c b/src/game.c
index b00d41d1cf..d3374c0b87 100644
--- a/src/game.c
+++ b/src/game.c
@@ -190,7 +190,7 @@ void game_update()
 	int i, numUpdates, tmp;
 
 	// Handles picked-up peep and rain redraw
-	RCT2_CALLPROC_EBPSAFE(0x006843DC);
+	redraw_peep_and_rain();
 
 	// 0x006E3AEC // screen_game_process_mouse_input();
 	// RCT2_CALLPROC_EBPSAFE(0x006E3AEC); // screen_game_process_keyboard_input();
diff --git a/src/interface/screenshot.c b/src/interface/screenshot.c
index 1a8bb459d8..8f192134fa 100644
--- a/src/interface/screenshot.c
+++ b/src/interface/screenshot.c
@@ -52,7 +52,7 @@ void screenshot_check()
 
 			window_error_open(screenshotIndex == -1 ? STR_SCREENSHOT_FAILED : STR_SCREENSHOT_SAVED_AS, -1);
 			RCT2_GLOBAL(0x009A8C29, uint8) &= ~1;
-			RCT2_CALLPROC_EBPSAFE(0x006843DC);
+			redraw_peep_and_rain();
 		}
 	}
 }