4 files changed, 12 insertions, 12 deletions
diff --git a/include/constants/contest.h b/include/constants/contest.h
index c18af0817..28b02e9c0 100644
--- a/include/constants/contest.h
+++ b/include/constants/contest.h
@@ -32,8 +32,8 @@
 #define CONTEST_WINNER_HALL_5 5
 #define CONTEST_WINNER_HALL_6 6
 #define NUM_CONTEST_HALL_WINNERS 6
-#define CONTEST_WINNER_HALL_UNUSED 7
-#define CONTEST_WINNER_MUSEUM_UNUSED 8
+#define CONTEST_WINNER_HALL_UNUSED_1 7 // These two have data for gDefaultContestWinners
+#define CONTEST_WINNER_HALL_UNUSED_2 8 // but there are only 6 paintings in the Contest Hall
 #define CONTEST_WINNER_MUSEUM_COOL   9
 #define CONTEST_WINNER_MUSEUM_BEAUTY 10
 #define CONTEST_WINNER_MUSEUM_CUTE   11
@@ -41,14 +41,14 @@
 #define CONTEST_WINNER_MUSEUM_TOUGH  13
 // NUM_CONTEST_WINNERS in constants/global.h
 
-#define MUSEUM_CONTEST_WINNERS_START CONTEST_WINNER_MUSEUM_UNUSED
-
-// The number of possible captions for a Contest painting, per category
-#define NUM_PAINTING_CAPTIONS 3
+#define MUSEUM_CONTEST_WINNERS_START (CONTEST_WINNER_MUSEUM_COOL - 1)
 
 #define CONTEST_SAVE_FOR_MUSEUM ((u8)-1)
 #define CONTEST_SAVE_FOR_ARTIST ((u8)-2)
 
+// The number of possible captions for a Contest painting, per category
+#define NUM_PAINTING_CAPTIONS 3
+
 #define CANT_ENTER_CONTEST             0
 #define CAN_ENTER_CONTEST_EQUAL_RANK   1
 #define CAN_ENTER_CONTEST_HIGH_RANK    2
diff --git a/include/contest.h b/include/contest.h
index 6469bf628..9bac63eda 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -111,11 +111,11 @@ struct ContestPokemon
     u32 otId;
 };
 
-struct Shared1A004
+struct ContestTempSave
 {
     u16 cachedWindowPalettes[16][16]; // Saved palette data before a move happens?
-    u16 unk18204[PLTT_BUFFER_SIZE];     // Saved copy of gPlttBufferUnfaded
-    u16 unk18604[PLTT_BUFFER_SIZE];     // Saved copy of gPlttBufferFaded
+    u16 cachedPlttBufferUnfaded[PLTT_BUFFER_SIZE];
+    u16 cachedPlttBufferFaded[PLTT_BUFFER_SIZE];
     u8 savedJunk[0x800];
 };
 
@@ -306,7 +306,7 @@ struct ContestResources
 #define eUnzippedContestAudience_Gfx (gHeap + 0x18000)
 #define eContestAudienceFrame2_Gfx (gHeap + 0x19000)
 #define eContestDebugMode (gHeap[0x1a000])
-#define eUnknownHeap1A004 (*(struct Shared1A004 *)(gHeap + 0x1a004))
+#define eContestTempSave (*(struct ContestTempSave *)(gHeap + 0x1a004))
 
 extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
 extern s16 gContestMonRound1Points[CONTESTANT_COUNT];
diff --git a/include/contest_util.h b/include/contest_util.h
index 5b0c5559a..1e97d91d3 100644
--- a/include/contest_util.h
+++ b/include/contest_util.h
@@ -9,6 +9,6 @@ void ShowContestResults(void);
 void ContestLinkTransfer(u8);
 void ShowContestPainting(void);
 u16 GetContestRand(void);
-u8 CountPlayerContestPaintings(void);
+u8 CountPlayerMuseumPaintings(void);
 
 #endif // GUARD_CONTEST_UTIL_H
diff --git a/include/international_string_util.h b/include/international_string_util.h
index f76fc5be1..fe7e85b41 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -17,7 +17,7 @@ void CopyMonCategoryText(int dexNum, u8 *dest);
 u8 *sub_81DB494(u8 *str, int fontId, const u8 *str2, int totalStringWidth);
 void PadNameString(u8 *dest, u8 padChar);
 void ConvertInternationalPlayerNameStripChar(u8 *, u8);
-void sub_81DB5AC(u8 *);
+void ConvertInternationalContestantName(u8 *);
 int sub_81DB604(u8 *);
 void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows);