Merge branch 'moonrise' into HEAD

legacy/watch_faces/clock/wyoscan_face.c

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "wyoscan_face.h"
+#include "watch_private_display.h"
 
 /*
 Slowly render the current time from left to right, 

movement_faces.h

@@ -33,7 +33,6 @@
 #include "stopwatch_face.h"
 #include "fast_stopwatch_face.h"
 #include "sunrise_sunset_face.h"
-#include "moonrise_face.h"
 #include "moon_phase_face.h"
 #include "days_since_face.h"
 #include "character_set_face.h"
@@ -79,5 +78,5 @@
 #include "higher_lower_game_face.h"
 #include "lander_face.h"
 #include "simon_face.h"
-#include "wyoscan_face.h"
+#include "moonrise_face.h"
 // New includes go above this line.

watch-faces.mk

@@ -10,7 +10,6 @@ SRCS += \
   ./watch-faces/complication/stopwatch_face.c \
   ./watch-faces/complication/fast_stopwatch_face.c \
   ./watch-faces/complication/sunrise_sunset_face.c \
-  ./watch-faces/complication/moonrise_face.c \
   ./watch-faces/complication/moon_phase_face.c \
   ./watch-faces/complication/days_since_face.c \
   ./watch-faces/complication/breathing_face.c \
@@ -54,5 +53,5 @@ SRCS += \
   ./watch-faces/complication/higher_lower_game_face.c \
   ./watch-faces/complication/lander_face.c \
   ./watch-faces/complication/simon_face.c \
-  ./watch-faces/clock/wyoscan_face.c \
+  ./watch-faces/complication/moonrise_face.c \
 # New watch faces go above this line.

watch-faces/clock/close_enough_face.c

@@ -189,8 +189,8 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
             char second_word[3];
             char third_word[3];
             if (five_minute_period == 0) { // "  HH OC",
-                sprintf(first_word, "%2d", close_enough_hour);
-                sprintf(second_word, "  ");
+                sprintf(first_word, "  ");
+                sprintf(second_word, "%2d", close_enough_hour);
                 strncpy(third_word, oclock_word, 3);
             } else { // "MM P HH" or "MM 2 HH+1"
                 int words_length = sizeof(words) / sizeof(words[0]);