From 76f6d05173e134d9cea3df0deb65f93804617c0f Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 17 Jun 2020 03:39:03 -0400
Subject: Document confetti

---
 include/graphics.h     |  4 ++--
 include/hall_of_fame.h |  1 -
 include/rom_81520A8.h  | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/graphics.h b/include/graphics.h
index b41a43095..99d396df2 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4082,8 +4082,8 @@ extern const u8 gNamingScreenUnderscoreTiles[];
 
 extern const u32 gUnknown_08D9BA44[];
 
-extern const u32 gContestConfetti_Gfx[];
-extern const u32 gContestConfetti_Pal[];
+extern const u32 gConfetti_Gfx[];
+extern const u32 gConfetti_Pal[];
 
 extern const u32 gUnknown_08C093F0[];
 extern const u32 gSubstituteDollTilemap[];
diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h
index a83fad2fc..f1f456713 100644
--- a/include/hall_of_fame.h
+++ b/include/hall_of_fame.h
@@ -4,7 +4,6 @@
 void CB2_DoHallOfFameScreen(void);
 void CB2_DoHallOfFameScreenDontSaveData(void);
 void CB2_DoHallOfFamePC(void);
-void DoConfettiEffect(void);
 
 // hof_pc.c
 void ReturnFromHallOfFamePC(void);
diff --git a/include/rom_81520A8.h b/include/rom_81520A8.h
index 2be12200f..9ad299197 100644
--- a/include/rom_81520A8.h
+++ b/include/rom_81520A8.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_ROM_81520A8_H
 #define GUARD_ROM_81520A8_H
 
-struct UnkStruct_81520A8
+struct OamUtil
 {
     struct OamData oam;
     s16 x;
@@ -12,22 +12,22 @@ struct UnkStruct_81520A8
     u16 palTag;
     u16 tileNum;
     u8 id;
-    u8 filler17; // Unused.
-    u8 unk18;
-    u8 unk19_0:1;
-    u8 unk19_1:1;
-    u8 unk19_2:1;
+    u8 filler;
+    u8 animNum;
+    u8 active:1;
+    u8 allowUpdates:1;
+    u8 dummied:1;
     u8 priority:2;
     s16 data[8];
-    void (*callback)(struct UnkStruct_81520A8 *);
+    void (*callback)(struct OamUtil *);
 };
 
-bool32 sub_81521C0(u8 count);
-bool32 sub_8152254(void);
-bool32 sub_81522D4(void);
-u8 sub_8152438(u8 id, void (*func)(struct UnkStruct_81520A8 *));
-u8 sub_8152474(u8 id, u8 dataArrayId, s16 dataValue);
-u8 sub_81524C4(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 arg5, u8 priority);
-u8 sub_81525D0(u8 id);
+bool32 OamUtil_Init(u8 count);
+bool32 OamUtil_Free(void);
+bool32 OamUtil_Update(void);
+u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *));
+u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue);
+u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority);
+u8 OamUtil_Remove(u8 id);
 
 #endif // GUARD_ROM_81520A8_H
-- 
cgit v1.2.3


From f600aff71140b34e4b3c210ef27ec1b9704a6f45 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 17 Jun 2020 03:42:10 -0400
Subject: Rename rom_81520A8

---
 include/oam_util.h    | 33 +++++++++++++++++++++++++++++++++
 include/rom_81520A8.h | 33 ---------------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 include/oam_util.h
 delete mode 100644 include/rom_81520A8.h

(limited to 'include')

diff --git a/include/oam_util.h b/include/oam_util.h
new file mode 100644
index 000000000..24e166c93
--- /dev/null
+++ b/include/oam_util.h
@@ -0,0 +1,33 @@
+#ifndef GUARD_OAM_UTIL_H
+#define GUARD_OAM_UTIL_H
+
+struct OamUtil
+{
+    struct OamData oam;
+    s16 x;
+    s16 y;
+    s16 xDelta;
+    s16 yDelta;
+    u16 tileTag;
+    u16 palTag;
+    u16 tileNum;
+    u8 id;
+    u8 filler;
+    u8 animNum;
+    u8 active:1;
+    u8 allowUpdates:1;
+    u8 dummied:1;
+    u8 priority:2;
+    s16 data[8];
+    void (*callback)(struct OamUtil *);
+};
+
+bool32 OamUtil_Init(u8 count);
+bool32 OamUtil_Free(void);
+bool32 OamUtil_Update(void);
+u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *));
+u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue);
+u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority);
+u8 OamUtil_Remove(u8 id);
+
+#endif // GUARD_OAM_UTIL_H
diff --git a/include/rom_81520A8.h b/include/rom_81520A8.h
deleted file mode 100644
index 9ad299197..000000000
--- a/include/rom_81520A8.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef GUARD_ROM_81520A8_H
-#define GUARD_ROM_81520A8_H
-
-struct OamUtil
-{
-    struct OamData oam;
-    s16 x;
-    s16 y;
-    s16 xDelta;
-    s16 yDelta;
-    u16 tileTag;
-    u16 palTag;
-    u16 tileNum;
-    u8 id;
-    u8 filler;
-    u8 animNum;
-    u8 active:1;
-    u8 allowUpdates:1;
-    u8 dummied:1;
-    u8 priority:2;
-    s16 data[8];
-    void (*callback)(struct OamUtil *);
-};
-
-bool32 OamUtil_Init(u8 count);
-bool32 OamUtil_Free(void);
-bool32 OamUtil_Update(void);
-u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *));
-u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue);
-u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority);
-u8 OamUtil_Remove(u8 id);
-
-#endif // GUARD_ROM_81520A8_H
-- 
cgit v1.2.3


From 24569583e49e66fefd0aeaeac68d2ba9bf206145 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 17 Jun 2020 17:48:20 -0400
Subject: Document contest results

---
 include/constants/contest.h        | 17 +++++++++++++++++
 include/constants/field_specials.h |  5 +++++
 include/constants/global.h         |  1 +
 include/contest.h                  |  5 ++---
 include/contest_link_80F57C4.h     |  4 ++--
 include/global.h                   |  2 +-
 include/graphics.h                 | 28 ++++++++++++++--------------
 include/strings.h                  |  2 +-
 8 files changed, 43 insertions(+), 21 deletions(-)

(limited to 'include')

diff --git a/include/constants/contest.h b/include/constants/contest.h
index 186c56e2b..2de2866a3 100644
--- a/include/constants/contest.h
+++ b/include/constants/contest.h
@@ -29,6 +29,23 @@
 #define CONTEST_CATEGORY_TOUGH    4
 #define CONTEST_CATEGORIES_COUNT  5
 
+#define CONTEST_WINNER_ARTIST 0  // Winner shown by the artist, painting not necessarily saved
+#define CONTEST_WINNER_HALL_1 1
+#define CONTEST_WINNER_HALL_2 2
+#define CONTEST_WINNER_HALL_3 3
+#define CONTEST_WINNER_HALL_4 4
+#define CONTEST_WINNER_HALL_5 5
+#define CONTEST_WINNER_HALL_6 6
+#define NUM_CONTEST_HALL_WINNERS 6
+#define CONTEST_WINNER_7 7
+#define CONTEST_WINNER_8 8
+#define CONTEST_WINNER_MUSEUM_COOL   9
+#define CONTEST_WINNER_MUSEUM_BEAUTY 10
+#define CONTEST_WINNER_MUSEUM_CUTE   11
+#define CONTEST_WINNER_MUSEUM_SMART  12
+#define CONTEST_WINNER_MUSEUM_TOUGH  13
+// NUM_CONTEST_WINNERS in constants/global.h
+
 #define CANT_ENTER_CONTEST             0
 #define CAN_ENTER_CONTEST_EQUAL_RANK   1
 #define CAN_ENTER_CONTEST_HIGH_RANK    2
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h
index a2dc117e4..a01151378 100644
--- a/include/constants/field_specials.h
+++ b/include/constants/field_specials.h
@@ -75,4 +75,9 @@
 #define FANCLUB_MEMBER7        14
 #define FANCLUB_MEMBER8        15
 
+#define FANCOUNTER_DEFEATED_DRAKE    0
+#define FANCOUNTER_BATTLED_AT_BASE   1
+#define FANCOUNTER_FINISHED_CONTEST  2
+#define FANCOUNTER_USED_BATTLE_TOWER 3
+
 #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H
diff --git a/include/constants/global.h b/include/constants/global.h
index c7063d71c..2f4ede229 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -52,6 +52,7 @@
 #define APPRENTICE_COUNT 4
 #define APPRENTICE_MAX_QUESTIONS 9
 #define MAX_REMATCH_ENTRIES 100 // only REMATCH_TABLE_ENTRIES (78) are used
+#define NUM_CONTEST_WINNERS 13
 
 #define PYRAMID_BAG_ITEMS_COUNT 10
 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
diff --git a/include/contest.h b/include/contest.h
index 00c3191eb..a9b1db9ee 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -430,9 +430,9 @@ struct ContestResources
 
 extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
 extern s16 gContestMonConditions[CONTESTANT_COUNT];
-extern s16 gUnknown_02039F08[CONTESTANT_COUNT];
+extern s16 gContestMonTotalPoints[CONTESTANT_COUNT];
 extern s16 gUnknown_02039F10[CONTESTANT_COUNT];
-extern s16 gUnknown_02039F18[CONTESTANT_COUNT];
+extern s16 gContestMonRound2Points[CONTESTANT_COUNT];
 extern u8 gContestFinalStandings[CONTESTANT_COUNT];
 extern u8 gContestMonPartyIndex;
 extern u8 gContestPlayerMonIndex;
@@ -448,7 +448,6 @@ extern u8 sContestBgCopyFlags;
 extern struct ContestWinner gCurContestWinner;
 extern u8 gUnknown_02039F5C;
 extern u8 gUnknown_02039F5D;
-
 extern u32 gContestRngValue;
 
 // contest.c
diff --git a/include/contest_link_80F57C4.h b/include/contest_link_80F57C4.h
index add3ae62f..8bbc0f14b 100644
--- a/include/contest_link_80F57C4.h
+++ b/include/contest_link_80F57C4.h
@@ -5,8 +5,8 @@ void BufferContestantTrainerName(void);
 void BufferContestantMonNickname(void);
 void StartContest(void);
 void BufferContestantMonSpecies(void);
-void sub_80F8484(void);
-void sub_80F84C4(u8);
+void ShowContestResults(void);
+void ContestLinkTransfer(u8);
 void sub_80FC998(u8 taskId);
 
 #endif // GUARD_CONTEST_LINK_80F57C4_H
diff --git a/include/global.h b/include/global.h
index 2b03ebbe1..03b6f47bf 100644
--- a/include/global.h
+++ b/include/global.h
@@ -960,7 +960,7 @@ struct SaveBlock1
     /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E28*/ OldMan oldMan;
     /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
-    /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum
+    /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_*
     /*0x3030*/ struct DayCare daycare;
     /*0x3150*/ struct LinkBattleRecords linkBattleRecords;
     /*0x31A8*/ u8 giftRibbons[52];
diff --git a/include/graphics.h b/include/graphics.h
index 99d396df2..186d381db 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4927,23 +4927,23 @@ extern const u32 gRouletteCreditTiles[];
 extern const u32 gRouletteNumbersTiles[];
 extern const u32 gRouletteMultiplierTiles[];
 
-// Contest Link
-extern const u32 gUnknown_08C19588[];
+// Contest util
+extern const u32 gContestResults_Gfx[];
 extern const u32 gUnknown_08C19EEC[];
 extern const u32 gUnknown_08C1A000[];
 extern const u32 gUnknown_08C1A12C[];
-extern const u32 gUnknown_08C1A2B4[];
-extern const u16 gUnknown_08DC6498[];
-extern const u16 gUnknown_08DC63F8[];
-extern const u16 gUnknown_08DC6420[];
-extern const u16 gUnknown_08DC6448[];
-extern const u16 gUnknown_08DC6470[];
-extern const u16 gUnknown_08DC64AC[];
-extern const u16 gUnknown_08DC64C0[];
-extern const u16 gUnknown_08DC64D4[];
-extern const u16 gUnknown_08DC64E8[];
-extern const u16 gUnknown_08DC64FC[];
-extern const u16 gUnknown_08DC6510[];
+extern const u32 gContestResults_Pal[];
+extern const u16 gLinkContestResults_Tilemap[];
+extern const u16 gNormalContestResults_Tilemap[];
+extern const u16 gSuperContestResults_Tilemap[];
+extern const u16 gHyperContestResults_Tilemap[];
+extern const u16 gMasterContestResults_Tilemap[];
+extern const u16 gCoolContestResults_Tilemap[];
+extern const u16 gBeautyContestResults_Tilemap[];
+extern const u16 gCuteContestResults_Tilemap[];
+extern const u16 gSmartContestResults_Tilemap[];
+extern const u16 gToughContestResults_Tilemap[];
+extern const u16 gContestResults_Tilemap[];
 
 // Trainer Card.
 extern const u16 gHoennTrainerCard0Star_Pal[];
diff --git a/include/strings.h b/include/strings.h
index 5720598ad..408eafbd7 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2494,7 +2494,7 @@ extern const u8 gText_CommunicationStandby[];
 extern const u8 gText_AnnouncingResults[];
 extern const u8 gText_PreliminaryResults[];
 extern const u8 gText_Round2Results[];
-extern const u8 gText_Var1sVar2Won[];
+extern const u8 gText_ContestantsMonWon[];
 
 // Trainer Card
 extern const u8 gText_LinkCableBattles[];
-- 
cgit v1.2.3


From d2a760afdbb4555e0b831598491e5fe1f410251d Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 18 Jun 2020 18:01:32 -0400
Subject: Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4

---
 include/contest_link.h         | 13 +++++++++++++
 include/contest_link_80F57C4.h | 12 ------------
 include/contest_link_80FC4F4.h | 13 -------------
 include/contest_util.h         | 12 ++++++++++++
 4 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 include/contest_link.h
 delete mode 100644 include/contest_link_80F57C4.h
 delete mode 100644 include/contest_link_80FC4F4.h
 create mode 100644 include/contest_util.h

(limited to 'include')

diff --git a/include/contest_link.h b/include/contest_link.h
new file mode 100644
index 000000000..4344d55ad
--- /dev/null
+++ b/include/contest_link.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_CONTEST_LINK_H
+#define GUARD_CONTEST_LINK_H
+
+void sub_80FCC88(u8);
+void sub_80FCC88(u8);
+void sub_80FCACC(u8);
+void sub_80FC580(u8);
+void sub_80FC6BC(u8);
+void sub_80FC804(u8);
+void sub_80FCE48(u8);
+void sub_80FC894(u8);
+
+#endif //GUARD_CONTEST_LINK_H
diff --git a/include/contest_link_80F57C4.h b/include/contest_link_80F57C4.h
deleted file mode 100644
index 8bbc0f14b..000000000
--- a/include/contest_link_80F57C4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GUARD_CONTEST_LINK_80F57C4_H
-#define GUARD_CONTEST_LINK_80F57C4_H
-
-void BufferContestantTrainerName(void);
-void BufferContestantMonNickname(void);
-void StartContest(void);
-void BufferContestantMonSpecies(void);
-void ShowContestResults(void);
-void ContestLinkTransfer(u8);
-void sub_80FC998(u8 taskId);
-
-#endif // GUARD_CONTEST_LINK_80F57C4_H
diff --git a/include/contest_link_80FC4F4.h b/include/contest_link_80FC4F4.h
deleted file mode 100644
index a3f118798..000000000
--- a/include/contest_link_80FC4F4.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef GUARD_CONTEST_LINK_80FC4F4_H
-#define GUARD_CONTEST_LINK_80FC4F4_H
-
-void sub_80FCC88(u8);
-void sub_80FCC88(u8);
-void sub_80FCACC(u8);
-void sub_80FC580(u8);
-void sub_80FC6BC(u8);
-void sub_80FC804(u8);
-void sub_80FCE48(u8);
-void sub_80FC894(u8);
-
-#endif //GUARD_CONTEST_LINK_80FC4F4_H
diff --git a/include/contest_util.h b/include/contest_util.h
new file mode 100644
index 000000000..c0d8df031
--- /dev/null
+++ b/include/contest_util.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_CONTEST_UTIL_H
+#define GUARD_CONTEST_UTIL_H
+
+void BufferContestantTrainerName(void);
+void BufferContestantMonNickname(void);
+void StartContest(void);
+void BufferContestantMonSpecies(void);
+void ShowContestResults(void);
+void ContestLinkTransfer(u8);
+void sub_80FC998(u8 taskId);
+
+#endif // GUARD_CONTEST_UTIL_H
-- 
cgit v1.2.3


From 8b462f3f6c30de55767808136861e892fc3f0356 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 18 Jun 2020 18:14:30 -0400
Subject: Specify confetti util name

---
 include/confetti_util.h | 33 +++++++++++++++++++++++++++++++++
 include/oam_util.h      | 33 ---------------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 include/confetti_util.h
 delete mode 100644 include/oam_util.h

(limited to 'include')

diff --git a/include/confetti_util.h b/include/confetti_util.h
new file mode 100644
index 000000000..ecc05a220
--- /dev/null
+++ b/include/confetti_util.h
@@ -0,0 +1,33 @@
+#ifndef GUARD_CONFETTI_UTIL_H
+#define GUARD_CONFETTI_UTIL_H
+
+struct ConfettiUtil
+{
+    struct OamData oam;
+    s16 x;
+    s16 y;
+    s16 xDelta;
+    s16 yDelta;
+    u16 tileTag;
+    u16 palTag;
+    u16 tileNum;
+    u8 id;
+    u8 filler;
+    u8 animNum;
+    u8 active:1;
+    u8 allowUpdates:1;
+    u8 dummied:1;
+    u8 priority:2;
+    s16 data[8];
+    void (*callback)(struct ConfettiUtil *);
+};
+
+bool32 ConfettiUtil_Init(u8 count);
+bool32 ConfettiUtil_Free(void);
+bool32 ConfettiUtil_Update(void);
+u8 ConfettiUtil_SetCallback(u8 id, void (*func)(struct ConfettiUtil *));
+u8 ConfettiUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue);
+u8 ConfettiUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority);
+u8 ConfettiUtil_Remove(u8 id);
+
+#endif // GUARD_CONFETTI_UTIL_H
diff --git a/include/oam_util.h b/include/oam_util.h
deleted file mode 100644
index 24e166c93..000000000
--- a/include/oam_util.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef GUARD_OAM_UTIL_H
-#define GUARD_OAM_UTIL_H
-
-struct OamUtil
-{
-    struct OamData oam;
-    s16 x;
-    s16 y;
-    s16 xDelta;
-    s16 yDelta;
-    u16 tileTag;
-    u16 palTag;
-    u16 tileNum;
-    u8 id;
-    u8 filler;
-    u8 animNum;
-    u8 active:1;
-    u8 allowUpdates:1;
-    u8 dummied:1;
-    u8 priority:2;
-    s16 data[8];
-    void (*callback)(struct OamUtil *);
-};
-
-bool32 OamUtil_Init(u8 count);
-bool32 OamUtil_Free(void);
-bool32 OamUtil_Update(void);
-u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *));
-u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue);
-u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority);
-u8 OamUtil_Remove(u8 id);
-
-#endif // GUARD_OAM_UTIL_H
-- 
cgit v1.2.3