diff --git a/src/rct1.c b/src/rct1.c index 854ecaf06f..ef7d150391 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -299,7 +299,7 @@ static void rct1_remove_rides() break; case MAP_ELEMENT_TYPE_TRACK: - RCT2_CALLPROC_EBPSAFE(0x006A7594); + sub_6A7594(); sub_6A6AA7(it.x * 32, it.y * 32, it.element); map_element_remove(it.element); map_element_iterator_restart_for_tile(&it); @@ -307,7 +307,7 @@ static void rct1_remove_rides() case MAP_ELEMENT_TYPE_ENTRANCE: if (it.element->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) { - RCT2_CALLPROC_EBPSAFE(0x006A7594); + sub_6A7594(); sub_6A6AA7(it.x * 32, it.y * 32, it.element); map_element_remove(it.element); map_element_iterator_restart_for_tile(&it); diff --git a/src/ride/track.c b/src/ride/track.c index c5d28d804f..d2ac2eeafa 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -1280,7 +1280,7 @@ int track_place_scenery(rct_track_scenery* scenery_start, uint8 rideIndex, int o if (map_element == NULL) continue; - RCT2_CALLPROC_EBPSAFE(0x006A7594); + sub_6A7594(); sub_6A6AA7(mapCoord.x, mapCoord.y, map_element); bl = 1; diff --git a/src/world/map.c b/src/world/map.c index 2f898d9652..c2ce3126cb 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -2155,7 +2155,7 @@ void map_remove_all_rides() // fall-through case MAP_ELEMENT_TYPE_TRACK: - RCT2_CALLPROC_EBPSAFE(0x006A7594); + sub_6A7594(); sub_6A6AA7(it.x * 32, it.y * 32, it.element); map_element_remove(it.element); map_element_iterator_restart_for_tile(&it); @@ -2445,4 +2445,9 @@ static void map_set_grass_length(int x, int y, rct_map_element *mapElement, int z0 = mapElement->base_height * 8; z1 = z0 + 16; gfx_invalidate_viewport_tile(x, y, z0, z1); +} + +void sub_6A7594() +{ + RCT2_GLOBAL(0x00F3EFF4, uint32) = 0x00F3EFF8; } \ No newline at end of file diff --git a/src/world/map.h b/src/world/map.h index f91d8f31fe..86e451d4a9 100644 --- a/src/world/map.h +++ b/src/world/map.h @@ -321,4 +321,6 @@ void map_element_iterator_restart_for_tile(map_element_iterator *it); void map_remove_intersecting_walls(int x, int y, int z0, int z1, int direction); void map_update_tiles(); +void sub_6A7594(); + #endif