summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-04-08 16:00:56 -0400
committerhuderlem <huderlem@gmail.com>2019-04-08 17:33:35 -0500
commit1eb17b1921331db6015516d877c637d29cd25f98 (patch)
tree64854e7189d1c789494969f331189f510c631541 /src
parentfd4aa1ba8e80402b726501a91970cfd88a53f468 (diff)
Some documentation of contest_link_80C2020
Diffstat (limited to 'src')
-rw-r--r--src/battle/contest_link_80C2020.c44
-rw-r--r--src/contest.c18
-rw-r--r--src/debug/matsuda_debug_menu.c8
-rw-r--r--src/script_pokemon_util_80C4BF0.c25
-rw-r--r--src/script_pokemon_util_80F99CC.c2
5 files changed, 47 insertions, 50 deletions
diff --git a/src/battle/contest_link_80C2020.c b/src/battle/contest_link_80C2020.c
index 38c1d30d2..2dde3895c 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/battle/contest_link_80C2020.c
@@ -2562,18 +2562,18 @@ void sub_80C42C0(u8 taskId /*r12*/)
}
}
-void sub_80C43F4(void)
+void ScrSpecial_CheckSelectedMonAndInitContest(void)
{
- u8 result = sub_80AE47C(&gPlayerParty[gContestMonPartyIndex]);
+ u8 result = CanMonParticipateInContest(&gPlayerParty[gContestMonPartyIndex]);
if (result != 0)
{
Contest_InitAllPokemon(gSpecialVar_ContestCategory, gSpecialVar_ContestRank);
- sub_80AE82C(gSpecialVar_ContestCategory);
+ InitContestMonConditions(gSpecialVar_ContestCategory);
}
gSpecialVar_Result = result;
}
-u16 sub_80C4440(void)
+u16 ScrSpecial_CanMonParticipateInSelectedLinkContest(void)
{
u16 result = 0;
struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex];
@@ -2605,7 +2605,7 @@ u16 sub_80C4440(void)
}
-void sub_80C44C0(void)
+void ScrSpecial_GiveContestRibbon(void)
{
u8 ribbonData;
@@ -2657,14 +2657,14 @@ void sub_80C44C0(void)
}
}
-void sub_80C4674(u8 * dest, const u8 * src)
+void Contest_CopyAndConvertTrainerName_Intl(u8 * dest, const u8 * src)
{
StringCopy(dest, src);
if (dest[0] == EXT_CTRL_CODE_BEGIN && dest[1] == 0x15)
ConvertInternationalString(dest, LANGUAGE_JAPANESE);
}
-void sub_80C4698(u8 * dest, u8 idx)
+void Contest_CopyAndConvertNicknameI_Intl(u8 * dest, u8 idx)
{
StringCopy(dest, gContestMons[idx].nickname);
if (gIsLinkContest & 1)
@@ -2676,24 +2676,24 @@ void sub_80C4698(u8 * dest, u8 idx)
}
}
-void sub_80C46EC(void)
+void Contest_GetTrainerNameI_StringVar1(void)
{
if (gIsLinkContest & 1)
{
- sub_80C4674(gStringVar1, gLinkPlayers[gSpecialVar_0x8006].name);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar1, gLinkPlayers[gSpecialVar_0x8006].name);
}
else
{
- sub_80C4674(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
}
}
-void sub_80C4740(void)
+void Contest_GetNicknameI_StringVar1(void)
{
- sub_80C4698(gStringVar3, gSpecialVar_0x8006);
+ Contest_CopyAndConvertNicknameI_Intl(gStringVar3, gSpecialVar_0x8006);
}
-void sub_80C4758(void)
+void ScrSpecial_CountContestMonsWithBetterCondition(void)
{
u8 i;
u8 count;
@@ -2707,12 +2707,12 @@ void sub_80C4758(void)
gSpecialVar_0x8004 = count;
}
-void sub_80C47A0(void)
+void ScrSpecial_GetMonCondition(void)
{
gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006];
}
-void sub_80C47C0(void)
+void ScrSpecial_GetContestWinnerIdx(void)
{
u8 i;
@@ -2722,7 +2722,7 @@ void sub_80C47C0(void)
gSpecialVar_0x8005 = i;
}
-void sub_80C47F0(void)
+void ScrSpecial_GetContestWinnerTrainerName(void)
{
u8 i;
@@ -2731,22 +2731,22 @@ void sub_80C47F0(void)
if (gIsLinkContest & 1)
{
- sub_80C4674(gStringVar3, gLinkPlayers[i].name);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar3, gLinkPlayers[i].name);
}
else
{
- sub_80C4674(gStringVar3, gContestMons[i].trainerName);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar3, gContestMons[i].trainerName);
}
}
-void sub_80C4858(void)
+void ScrSpecial_GetContestWinnerNick(void)
{
u8 i;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
;
- sub_80C4698(gStringVar1, i);
+ Contest_CopyAndConvertNicknameI_Intl(gStringVar1, i);
}
void sub_80C488C(void)
@@ -2791,7 +2791,7 @@ void sub_80C4940(void)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
}
-void sub_80C496C(void)
+void ScrSpecial_GetContestPlayerMonIdx(void)
{
gSpecialVar_0x8004 = gContestPlayerMonIndex;
}
@@ -2850,7 +2850,7 @@ void sub_80C4A44(u8 taskId)
sp4[i] = gTasks[taskId].data[i + 5];
gUnknown_0203869B = sub_80C4B34(sp4);
- sub_80AE82C(gSpecialVar_ContestCategory);
+ InitContestMonConditions(gSpecialVar_ContestCategory);
SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80C4B0C);
}
diff --git a/src/contest.c b/src/contest.c
index 4efe18cce..9652e999e 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -2246,7 +2246,7 @@ void Contest_InitAllPokemon(u8 contestType, u8 rank)
}
// GetContestAvailability?
-u8 sub_80AE47C(struct Pokemon *pkmn)
+u8 CanMonParticipateInContest(struct Pokemon *pkmn)
{
u8 ribbon;
u8 retVal;
@@ -2380,7 +2380,7 @@ void sub_80AE6E4(u8 a, u8 b)
1);
}
-u16 sub_80AE770(u8 a, u8 b)
+u16 InitContestMonConditionI(u8 a, u8 b)
{
u8 r5;
u8 r4;
@@ -2388,27 +2388,27 @@ u16 sub_80AE770(u8 a, u8 b)
switch (b)
{
- case 0:
+ case CONTEST_CATEGORY_COOL:
r5 = gContestMons[a].cool;
r4 = gContestMons[a].tough;
r3 = gContestMons[a].beauty;
break;
- case 1:
+ case CONTEST_CATEGORY_BEAUTY:
r5 = gContestMons[a].beauty;
r4 = gContestMons[a].cool;
r3 = gContestMons[a].cute;
break;
- case 2:
+ case CONTEST_CATEGORY_CUTE:
r5 = gContestMons[a].cute;
r4 = gContestMons[a].beauty;
r3 = gContestMons[a].smart;
break;
- case 3:
+ case CONTEST_CATEGORY_SMART:
r5 = gContestMons[a].smart;
r4 = gContestMons[a].cute;
r3 = gContestMons[a].tough;
break;
- case 4:
+ case CONTEST_CATEGORY_TOUGH:
default:
r5 = gContestMons[a].tough;
r4 = gContestMons[a].smart;
@@ -2418,12 +2418,12 @@ u16 sub_80AE770(u8 a, u8 b)
return r5 + (r4 + r3 + gContestMons[a].sheen) / 2;
}
-void sub_80AE82C(u8 a)
+void InitContestMonConditions(u8 a)
{
u8 i;
for (i = 0; i < 4; i++)
- gContestMonConditions[i] = sub_80AE770(i, a);
+ gContestMonConditions[i] = InitContestMonConditionI(i, a);
}
u8 CreateJudgeSprite(void)
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index b0fc9b45d..1d2879661 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -182,7 +182,7 @@ static void sub_80A9D58(u8 taskId)
dest[i] = gTasks[taskId].data[5 + i];
gUnknown_0203869B = sub_80C4B34(dest);
- sub_80AE82C((u8)gSpecialVar_ContestCategory);
+ InitContestMonConditions((u8)gSpecialVar_ContestCategory);
sub_80B0F28(0);
SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80A9DBC);
}
@@ -607,7 +607,7 @@ void sub_80AA5E8(u8 var)
static void sub_80AA614(u8 var1, u8 var2)
{
- u16 var = sub_80AE770(var1, var2);
+ u16 var = InitContestMonConditionI(var1, var2);
ConvertIntToDecimalStringN(gSharedMem, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC);
@@ -859,7 +859,7 @@ void sub_80AACC4(void)
{
SetDebugMonForContest();
if (!(gIsLinkContest & 1))
- sub_80AE82C(eMatsudaDebugVar);
+ InitContestMonConditions(eMatsudaDebugVar);
SetMainCallback2(CB2_StartContest);
}
}
@@ -882,7 +882,7 @@ void sub_80AAD44(struct Sprite *sprite, s8 var2)
SetDebugMonForContest();
for (i = 0; i < 4; i++)
- gContestMonConditions[i] = sub_80AE770(i, gSpecialVar_ContestCategory);
+ gContestMonConditions[i] = InitContestMonConditionI(i, gSpecialVar_ContestCategory);
SetMainCallback2(c2_exit_to_overworld_1_sub_8080DEC);
}
}
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index cf6da2cda..f6cb8ae0a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -24,9 +24,6 @@
#include "task.h"
#include "ewram.h"
-extern void sub_80C4674();
-extern void sub_80C4698(u8 *, u8);
-
#define CONTEST_ENTRY_PIC_LEFT 10
#define CONTEST_ENTRY_PIC_TOP 3
@@ -72,8 +69,8 @@ void sub_80C4C28(void)
void sub_80C4C64(void)
{
- sub_80C46EC();
- sub_80C4740();
+ Contest_GetTrainerNameI_StringVar1();
+ Contest_GetNicknameI_StringVar1();
sub_80C48F4();
}
@@ -84,19 +81,19 @@ void sub_80C4C78(void)
switch(gSpecialVar_ContestCategory)
{
- case 0:
+ case CONTEST_CATEGORY_COOL:
var = 8;
break;
- case 1:
+ case CONTEST_CATEGORY_BEAUTY:
var = 9;
break;
- case 2:
+ case CONTEST_CATEGORY_CUTE:
var = 10;
break;
- case 3:
+ case CONTEST_CATEGORY_SMART:
var = 11;
break;
- case 4:
+ case CONTEST_CATEGORY_TOUGH:
default:
var = 12;
break;
@@ -202,12 +199,12 @@ void sub_80C4D80(void)
}
}
- sub_80C4698(gStringVar1, i);
+ Contest_CopyAndConvertNicknameI_Intl(gStringVar1, i);
if (gIsLinkContest & 1)
- sub_80C4674(gStringVar2, gLinkPlayers[i].name);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar2, gLinkPlayers[i].name);
else
- sub_80C4674(gStringVar2, gContestMons[i].trainerName);
+ Contest_CopyAndConvertTrainerName_Intl(gStringVar2, gContestMons[i].trainerName);
if (r10 == 1 || r7 == r10)
gSpecialVar_0x8006 = r4_;
@@ -234,7 +231,7 @@ void ShowContestWinner(void)
gMain.savedCallback = ShowContestWinnerCleanup;
}
-void sub_80C4F70(void)
+void ScrSpecial_SetLinkContestTrainerGfxIdx(void)
{
VarSet(VAR_OBJ_GFX_ID_0, gContestMons[0].trainerGfxId);
VarSet(VAR_OBJ_GFX_ID_1, gContestMons[1].trainerGfxId);
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index ebdcbf5fd..27cd8992f 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -139,7 +139,7 @@ void sub_80F9C00(void)
for (i = 0; i < gPlayerPartyCount; i++)
{
- switch (sub_80AE47C(&gPlayerParty[i]))
+ switch (CanMonParticipateInContest(&gPlayerParty[i]))
{
case 0:
case 3: