Sync more function names from Emerald

4 files changed, 61 insertions, 61 deletions

diff --git a/include/contest.h b/include/contest.h
index f9efe711f..11b85482e 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -14,16 +14,16 @@ enum
 enum
 {
     CONTEST_WINNER_ARTIST,
-    CONTEST_WINNER_HALL_1,
-    CONTEST_WINNER_HALL_2,
-    CONTEST_WINNER_HALL_3,
-    CONTEST_WINNER_HALL_4,
-    CONTEST_WINNER_HALL_5,
-    CONTEST_WINNER_HALL_6,
-    NUM_CONTEST_HALL_WINNERS = CONTEST_WINNER_HALL_6,
-    CONTEST_WINNER_HALL_UNUSED_1 , // These two have data for gDefaultContestWinners
-    CONTEST_WINNER_HALL_UNUSED_2, // but there are only 6 paintings in the Contest Hall
-    MUSEUM_CONTEST_WINNERS_START = CONTEST_WINNER_HALL_UNUSED_2,
+    CONTEST_WINNER_NORMAL,
+    CONTEST_WINNER_SUPER,
+    CONTEST_WINNER_HYPER_1,
+    CONTEST_WINNER_HYPER_2,
+    CONTEST_WINNER_HYPER_3,
+    CONTEST_WINNER_MASTER_1,
+    CONTEST_WINNER_MASTER_2,
+    CONTEST_WINNER_MASTER_3,
+    NUM_CONTEST_HALL_WINNERS = CONTEST_WINNER_MASTER_3,
+    MUSEUM_CONTEST_WINNERS_START = CONTEST_WINNER_MASTER_3,
     CONTEST_WINNER_MUSEUM_COOL,
     CONTEST_WINNER_MUSEUM_BEAUTY,
     CONTEST_WINNER_MUSEUM_CUTE,
@@ -328,9 +328,9 @@ struct Contest
                 u16 isShowingApplauseMeter :1;
                 u16 applauseMeterIsMoving :1;
                 u16 animatingAudience :1;
-    /*0x1920B*/ u16 unk1920B_0:1;
-                u16 unk1920B_1:1;
-                u16 unk1920B_2:1;
+    /*0x1920B*/ u16 waitForAudienceBlend :1;
+                u16 sliderHeartsAnimating :1;
+                u16 waitForLink :1;
     /*0x1920C*/ u8 mainTaskId;
     /*0x1920D*/ u8 unk1920D[4];
     /*0x19211*/ u8 unk19211;
@@ -340,20 +340,20 @@ struct Contest
     /*0x19215*/ u8 unk19215;
     /*0x19216*/ u8 unk19216;    // sprite ID
     /*0x19217*/ s8 applauseLevel;
-    /*0x19218*/ u8 unk19218[4];
+    /*0x19218*/ u8 prevTurnOrder[4];
     /*0x1921C*/ u32 unk1921C;   // saved RNG value?
                 u16 unk19220[5][4];  // move history?
                 u8 unk19248[5][4];  // excitement history
                 u8 applauseMeterSpriteId;    // sprite ID
     /*0x1925D*/ u8 unk1925D;
-    /*0x1925E*/ u8 unk1925E;
+    /*0x1925E*/ u8 moveAnimTurnCount;
 };
 
 struct ContestantStatus
 {
  /*0x00*/ s16 baseAppeal;  // move appeal?
  /*0x02*/ s16 appeal;  // final appeal after end of turn, maybe?
- /*0x04*/ s16 unk4;
+ /*0x04*/ s16 pointTotal;
  /*0x06*/ u16 currMove;
  /*0x08*/ u16 prevMove;
  /*0x0A*/ u8 moveCategory;
@@ -385,7 +385,7 @@ struct ContestantStatus
  /*0x14*/ u8 effectStringId2;
  /*0x15*/ u8 disappointedRepeat:1;
           u8 unk15_1:1;
-          u8 unk15_2:1;
+          u8 repeatedPrevMove :1;
           u8 completedComboFlag :1;
           u8 hasJudgesAttention:1;
           u8 judgesAttentionWasRemoved:1;
@@ -401,11 +401,11 @@ struct ContestantStatus
 // possibly the same as UnknownContestStruct3?
 struct ContestGfxState
 {
-    u8 unk0;  // sprite ID
+    u8 sliderHeartSpriteId;  // sprite ID
     u8 unk1;  // sprite ID
     u8 unk2_0:1;
     u8 boxBlinking :1;
-    u8 unk2_2:1;
+    u8 updatingAppealHearts :1;
 };
 
 struct ContestExcitement
@@ -426,14 +426,14 @@ struct UnknownContestStruct7
     u8 contestant;
 };
 
-struct UnknownContestStruct8
+struct ContestMoveAnim
 {
-    u16 unk0;
+    u16 species;
     u16 unk2;
     u8 unk4_0:1;
-    u8 unk5;
-    u32 unk8;
-    u32 unkC;
+    u8 contestant;
+    u32 personality;
+    u32 otId;
     u32 unk10;
 };
 
@@ -446,14 +446,14 @@ struct ContestFinalStandings
 };
 
 // TODO: Please move these to ewram.h once the defines are settled down and figured out completely.
-#define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0))
+#define gCurContestWinner (*(struct ContestWinner *)(gSharedMem + 0x15DE0))
 #define eEnableContestDebugging (gSharedMem[0x18000])
 #define eContestTempSave (*(struct ContestTempSave *)(gSharedMem + 0x18004))
 #define sContest (*(struct Contest *)(gSharedMem + 0x19204))
 #define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260))
 #define eContestExcitement (*(struct ContestExcitement *)(gSharedMem + 0x19328))
 #define eContestGfxState ((struct ContestGfxState *)(gSharedMem + 0x19338))
-#define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
+#define gContestResources__moveAnim (*(struct ContestMoveAnim *)(gSharedMem + 0x19348))
 
 extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
@@ -474,7 +474,7 @@ void SetContestantEffectStringID(u8 a, u8 b);
 void SetContestantEffectStringID2(u8 a, u8 b);
 void MakeContestantNervous(u8 p);
 bool8 Contest_IsMonsTurnDisabled(u8 a);
-bool8 IsContestantAllowedToCombo(u8 a);
+bool8 IsContestantAllowedToCombo(u8 contestant);
 void SetStartledString(u8 a, u8 b);
 
 #endif // GUARD_CONTEST_H
diff --git a/include/contest_internal.h b/include/contest_internal.h
index f268a1690..dd81a624c 100644
--- a/include/contest_internal.h
+++ b/include/contest_internal.h
@@ -26,7 +26,7 @@ void sub_80AC204(u8);
 void sub_80AC250(u8);
 void sub_80AC284(u8);
 void sub_80AC2CC(u8);
-void sub_80AD8DC(u8);
+void Task_EndWaitForLink(u8 taskId);
 void sub_80AD8FC(struct Sprite *);
 void sub_80AD92C(struct Sprite *);
 void sub_80AD960(u8);
@@ -68,21 +68,21 @@ bool8 DrawStatusSymbol(u8);
 void DrawStatusSymbols(void);
 void ContestClearGeneralTextWindow(void);
 u16 GetChosenMove(u8);
-void sub_80AF1B8(void);
+void GetAllChosenMoves(void);
 void sub_80AF2A0(u8);
-void sub_80AF2FC(void);
-void sub_80AF3C0(void);
+void RankContestants(void);
+void SetAttentionLevels(void);
 s16 GetContestantRound2Points(u8 a);
 void DetermineFinalStandings(void);
 bool8 DidContestantPlaceHigher(s32 a, s32 b, struct ContestFinalStandings *c);
 void ContestPrintLinkStandby(void);
 void sub_80AF94C(u8);
-void sub_80AFA5C(void);
-u16 sub_80AFB40(u8);
-s8 sub_80AFB74(s16);
-u8 sub_80AFBA0(s16, s16, u8);
-void sub_80AFC74(u8);
-void sub_80AFE30(void);
+void FillContestantWindowBgs(void);
+u16 GetAppealHeartTileOffset(u8 a);
+s8 GetNumHeartsFromAppealPoints(s16 a);
+u8 UpdateAppealHearts(s16 startAppeal, s16 appealDelta, u8 contestant);
+void Task_UpdateAppealHearts(u8 taskId);
+void CreateSliderHeartSprites(void);
 void sub_80AFF10(void);
 bool8 sub_80AFF28(void);
 void sub_80AFF60(struct Sprite *);
@@ -109,7 +109,7 @@ u8 CreateContestantBoxBlinkSprites(u8);
 void BlinkContestantBox(u8, bool8);
 void SpriteCB_BlinkContestantBox(struct Sprite *);
 void SpriteCB_EndBlinkContestantBox(struct Sprite *);
-void sub_80B0CDC(u8, int);
+void Unused_EndBlinkingState(u8 a, int unused);
 void ContestDebugTogglePointTotal(void);
 void ContestDebugDoPrint(void);
 void DrawContestantWindows(void);
@@ -128,27 +128,27 @@ void ShowAndUpdateApplauseMeter(s8);
 void Task_ShowAndUpdateApplauseMeter(u8);
 void AnimateAudience(void);
 void Task_AnimateAudience(u8);
-void sub_80B1EA8(s8, s8);
-void sub_80B1F4C(u8);
-void sub_80B1FD0(bool8);
+void BlendAudienceBackground(s8 excitementDir, s8 blendDir);
+void Task_BlendAudienceBackground(u8 taskId);
+void ShowHideNextTurnGfx(bool8 a);
 const u8 *GetTurnOrderNumberGfx(u8);
-void sub_80B20C4(void);
-void sub_80B2184(void);
-void sub_80B2280(void);
-void sub_80B237C(u8);
-void sub_80B23BC(u8);
-void sub_80B2400(u8);
-void sub_80B253C(u8);
-void sub_80B25A4(u8);
-void sub_80B25E4(u8);
-void sub_80B26C8(u8);
-u16 SanitizeMove(u16);
-u16 SanitizeSpecies(u16);
-void sub_80B2790(u8);
-void sub_80B28CC(int);
-void sub_80B28F0(u8);
-void sub_80B292C(void);
-void sub_80B2968(void);
+void DrawUnnervedSymbols(void);
+void SetBgForCurtainDrop(void);
+void UpdateContestantBoxOrder(void);
+void Task_StartDropCurtainAtRoundEnd(u8 taskId);
+void Task_UpdateCurtainDropAtRoundEnd(u8 taskId);
+void Task_ResetForNextRound(u8 taskId);
+void Task_WaitRaiseCurtainAtRoundEnd(u8 taskId);
+void Task_StartRaiseCurtainAtRoundEnd(u8 taskId);
+void AnimateSliderHearts(u8 animId);
+void Task_WaitForSliderHeartAnim(u8 taskId);
+u16 SanitizeMove(u16 move);
+u16 SanitizeSpecies(u16 species);
+void SetMoveSpecificAnimData(u8 contestant);
+void ClearMoveAnimData(u8 contestant);
+void SetMoveAnimAttackerData(u8 contestant);
+void CreateInvisibleBattleTargetSprite(void);
+void SetBattleTargetSpritePosition(void);
 void SelectContestMoveBankTarget(u16);
 
 #endif //GUARD_CONTEST_INTERNAL_H
diff --git a/include/data2.h b/include/data2.h
index 8ba1294ac..c5c8a42fb 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -21,9 +21,9 @@ extern const struct SpriteFrameImage gSpriteImageTable_81E7A30[];
 extern const struct SpriteFrameImage gSpriteImageTable_81E7A50[];
 extern const struct SpriteFrameImage gSpriteImageTable_81E7A70[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7B70[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[];
+extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[];
 
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[];
+extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[];
 extern const union AnimCmd *const gSpriteAnimTable_81E7C64[];
 extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct MonCoords gMonBackPicCoords[];
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 4f49885bf..e17d836de 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -17,7 +17,7 @@ struct TransformStatus
 };
 
 u8 GetBattlerSpriteCoord(u8, u8);
-u8 sub_8077E44(u8 slot, u16 species, u8 a3);
+u8 GetBattlerSpriteFinal_Y(u8 slot, u16 species, u8 a3);
 u8 GetAnimBattlerSpriteId(u8 bank);
 void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *));
 void sub_8078314(struct Sprite *sprite);