dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Some script clean up, document secret base secrets show

Browse Source
This commit is contained in:
GriffinR
2020-01-08 04:26:26 -05:00
committed by huderlem
parent 0284014e0e
commit 6a470ddfda
36 changed files with 920 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/script_pokemon_util_80F87D8.c
View File

@@ -52,6 +52,7 @@ void SetContestTrainerGfxIds(void)
gSaveBlock1Ptr->vars[VAR_OBJ_GFX_ID_2 - VARS_START] = gContestMons[2].trainerGfxId;
}
// Unused
void sub_80F8814(void)
{
u16 var1;
@@ -82,7 +83,8 @@ void BufferContestTrainerAndMonNames(void)
BufferContestantMonSpecies();
}
void sub_80F8864(void)
// Unused
void DoesContestCategoryHaveWinner(void)
{
int contestWinner;
switch (gSpecialVar_ContestCategory)
@@ -105,10 +107,10 @@ void sub_80F8864(void)
break;
}
if (!gSaveBlock1Ptr->contestWinners[contestWinner].species)
gSpecialVar_0x8004 = 0;
if (gSaveBlock1Ptr->contestWinners[contestWinner].species == SPECIES_NONE)
gSpecialVar_0x8004 = FALSE;
else
gSpecialVar_0x8004 = 1;
gSpecialVar_0x8004 = TRUE;
}
void SaveMuseumContestPainting(void)
@@ -144,9 +146,10 @@ u8 CountPlayerContestPaintings(void)
return count;
}
// Unused
void sub_80F8970(void)
{
s16 sp[4];
s16 conditions[CONTESTANT_COUNT];
int i, j;
s16 condition;
s8 var0;
@@ -154,28 +157,27 @@ void sub_80F8970(void)
u8 r8;
u8 r7;
for (i = 0; i < 4; i++)
sp[i] = gContestMonConditions[i];
for (i = 0; i < CONTESTANT_COUNT; i++)
conditions[i] = gContestMonConditions[i];
for (i = 0; i < 3; i++)
for (i = 0; i < CONTESTANT_COUNT - 1; i++)
{
for (j = 3; j > i; j--)
for (j = CONTESTANT_COUNT - 1; j > i; j--)
{
if (sp[j - 1] < sp[j])
if (conditions[j - 1] < conditions[j])
{
int temp = sp[j];
sp[j] = sp[j - 1];
sp[j - 1] = temp;
int temp;
SWAP(conditions[j], conditions[j - 1], temp)
}
}
}
condition = sp[gSpecialVar_0x8006];
condition = conditions[gSpecialVar_0x8006];
var0 = 0;
r8 = 0;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (sp[i] == condition)
if (conditions[i] == condition)
{
var0++;
if (i == gSpecialVar_0x8006)
@@ -183,15 +185,15 @@ void sub_80F8970(void)
}
}
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (sp[i] == condition)
if (conditions[i] == condition)
break;
}
r7 = i;
var2 = r8;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (condition == gContestMonConditions[i])
{