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

Add misc party constant usage

Browse Source
This commit is contained in:
GriffinR
2020-04-09 15:18:53 -04:00
parent 22fa4cb178
commit 7a5deff0bc
10 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hall_of_fame.c
+4 -4
View File
@@ -155,7 +155,7 @@ static const struct CompressedSpritePalette sHallOfFame_ConfettiSpritePalette[]
{},
};
static const s16 sHallOfFame_MonFullTeamPositions[6][4] =
static const s16 sHallOfFame_MonFullTeamPositions[PARTY_SIZE][4] =
{
{120, 210, 120, 40},
{326, 220, 56, 40},
@@ -165,7 +165,7 @@ static const s16 sHallOfFame_MonFullTeamPositions[6][4] =
{310, -92, 40, 88}
};
static const s16 sHallOfFame_MonHalfTeamPositions[3][4] =
static const s16 sHallOfFame_MonHalfTeamPositions[PARTY_SIZE / 2][4] =
{
{120, 234, 120, 64},
{326, 244, 56, 64},
@@ -544,7 +544,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
u16 currMonId = gTasks[taskId].tDisplayedMonId;
struct HallofFameMon* currMon = &sHofMonPtr->mon[currMonId];
if (gTasks[taskId].tMonNumber > 3)
if (gTasks[taskId].tMonNumber > PARTY_SIZE / 2)
{
xPos = sHallOfFame_MonFullTeamPositions[currMonId][0];
yPos = sHallOfFame_MonFullTeamPositions[currMonId][1];
@@ -893,7 +893,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
u16 spriteId;
s16 posX, posY;
if (gTasks[taskId].tMonNo > 3)
if (gTasks[taskId].tMonNo > PARTY_SIZE / 2)
{
posX = sHallOfFame_MonFullTeamPositions[i][2];
posY = sHallOfFame_MonFullTeamPositions[i][3];