diff --git a/game/scripts/events/DayNight.rpy b/game/scripts/events/DayNight.rpy
index e07b7007..38e943dc 100644
--- a/game/scripts/events/DayNight.rpy
+++ b/game/scripts/events/DayNight.rpy
@@ -100,13 +100,7 @@ label day_start:
         eventqueue.tick()
 
     # Update map locations
-    call set_her_map_location()
-    call set_lun_map_location()
-    call set_cho_map_location()
-    call set_ast_map_location()
-    call set_sus_map_location()
-    #TODO: Add Tonks map location
-    #TODO: Add Snape map location
+    call set_all_map_locations
 
     # Reset appearances and sprites
     call update_luna
@@ -203,13 +197,7 @@ label night_start:
         map_randomobj = renpy.random.Random()
 
     # Update map locations
-    call set_her_map_location()
-    call set_lun_map_location()
-    call set_cho_map_location()
-    call set_ast_map_location()
-    call set_sus_map_location()
-    #TODO: Add Tonks map location
-    #TODO: Add Snape map location
+    call set_all_map_locations
 
     # Reset appearances and sprites
     call update_luna
diff --git a/game/scripts/interface/map.rpy b/game/scripts/interface/map.rpy
index 28c9218d..97b91492 100644
--- a/game/scripts/interface/map.rpy
+++ b/game/scripts/interface/map.rpy
@@ -208,6 +208,18 @@ screen map_buttons():
         tooltip "Toggles map folding animation"
         action ToggleVariable("map_animated", True, False)
 
+label set_all_map_locations:
+    call set_her_map_location()
+    call set_lun_map_location()
+    call set_cho_map_location()
+    call set_ast_map_location()
+    call set_sus_map_location()
+    #TODO: Add Tonks map location
+    #TODO: Add Snape map location
+
+    call update_character_map_locations
+    return
+
 label set_her_map_location(location=""):
 
     if location != "":
@@ -234,7 +246,8 @@ label set_her_map_location(location=""):
             else:
                 $ states.her.map_location = __choice(("room_s", "courtyard", "room_g", "room_g", "room_g"))
 
-    call update_character_map_locations
+    if location:
+        call update_character_map_locations
 
     return
 
@@ -251,7 +264,8 @@ label set_lun_map_location(location = ""):
     else: #Random
         $ states.lun.map_location = __choice(("greenhouse", "forest", "forest", "room_r", "room_r"))
 
-    call update_character_map_locations
+    if location:
+        call update_character_map_locations
 
     return
 
@@ -267,7 +281,8 @@ label set_ast_map_location(location = ""):
     else: #Random
         $ states.ast.map_location = __choice(("courtyard", "courtyard", "room_s", "room_s", "room_s"))
 
-    call update_character_map_locations
+    if location:
+        call update_character_map_locations
 
     return
 
@@ -281,7 +296,8 @@ label set_sus_map_location(location = ""):
     else: #Random
         $ states.sus.map_location = __choice(("great_hall", "great_hall", "room_h", "room_h", "room_h"))
 
-    call update_character_map_locations
+    if location:
+        call update_character_map_locations
 
     return
 
@@ -295,7 +311,8 @@ label set_cho_map_location(location = ""):
     else: #Random
         $ states.cho.map_location = __choice(("training_grounds", "training_grounds", "room_r", "room_r", "room_r"))
 
-    call update_character_map_locations
+    if location:
+        call update_character_map_locations
 
     return