Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
This commit is contained in:
GriffinR
+77
-77
@@ -108,8 +108,8 @@ static u8 UpdateTourneyTreeCursor(u8);
|
||||
static void DecideRoundWinners(u8);
|
||||
static u8 GetOpposingNPCTournamentIdByRound(u8, u8);
|
||||
static void DrawTourneyAdvancementLine(u8, u8);
|
||||
static void SpriteCb_HorizontalScrollArrow(struct Sprite *);
|
||||
static void SpriteCb_VerticalScrollArrow(struct Sprite *);
|
||||
static void SpriteCB_HorizontalScrollArrow(struct Sprite *);
|
||||
static void SpriteCB_VerticalScrollArrow(struct Sprite *);
|
||||
static void InitDomeChallenge(void);
|
||||
static void GetDomeData(void);
|
||||
static void SetDomeData(void);
|
||||
@@ -1089,7 +1089,7 @@ static const struct SpriteTemplate sHorizontalScrollArrowSpriteTemplate =
|
||||
.anims = sSpriteAnimTable_HorizontalScrollArrow,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = SpriteCb_HorizontalScrollArrow
|
||||
.callback = SpriteCB_HorizontalScrollArrow
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sVerticalScrollArrowSpriteTemplate =
|
||||
@@ -1100,7 +1100,7 @@ static const struct SpriteTemplate sVerticalScrollArrowSpriteTemplate =
|
||||
.anims = sSpriteAnimTable_VerticalScrollArrow,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = SpriteCb_VerticalScrollArrow
|
||||
.callback = SpriteCB_VerticalScrollArrow
|
||||
};
|
||||
|
||||
// Organized by seed starting position, i.e. seed 0 battles seed 8 first
|
||||
@@ -2348,8 +2348,8 @@ static void InitDomeTrainers(void)
|
||||
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPDEF, NULL);
|
||||
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPEED, NULL);
|
||||
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_MAX_HP, NULL);
|
||||
monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
|
||||
monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].types[0]];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].types[1]];
|
||||
}
|
||||
|
||||
// Count the number of types in the players party, to factor into the ranking
|
||||
@@ -2383,8 +2383,8 @@ static void InitDomeTrainers(void)
|
||||
rankingScores[i] += statValues[STAT_SPDEF];
|
||||
rankingScores[i] += statValues[STAT_SPEED];
|
||||
rankingScores[i] += statValues[STAT_HP];
|
||||
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
|
||||
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[0]];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[1]];
|
||||
}
|
||||
|
||||
for (monTypesCount = 0, j = 0; j < 32; j++)
|
||||
@@ -2448,7 +2448,7 @@ static void InitDomeTrainers(void)
|
||||
|
||||
#define CALC_STAT(base, statIndex) \
|
||||
{ \
|
||||
u8 baseStat = gBaseStats[species].base; \
|
||||
u8 baseStat = gSpeciesInfo[species].base; \
|
||||
stats[statIndex] = (((2 * baseStat + ivs + evs[statIndex] / 4) * level) / 100) + 5; \
|
||||
stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex); \
|
||||
}
|
||||
@@ -2481,7 +2481,7 @@ static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 natu
|
||||
}
|
||||
else
|
||||
{
|
||||
int n = 2 * gBaseStats[species].baseHP;
|
||||
int n = 2 * gSpeciesInfo[species].baseHP;
|
||||
stats[STAT_HP] = (((n + ivs + evs[STAT_HP] / 4) * level) / 100) + level + 10;
|
||||
}
|
||||
|
||||
@@ -2750,9 +2750,9 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode)
|
||||
if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || gBattleMoves[move].power == 0)
|
||||
return 0;
|
||||
|
||||
defType1 = gBaseStats[targetSpecies].type1;
|
||||
defType2 = gBaseStats[targetSpecies].type2;
|
||||
defAbility = gBaseStats[targetSpecies].abilities[0];
|
||||
defType1 = gSpeciesInfo[targetSpecies].types[0];
|
||||
defType2 = gSpeciesInfo[targetSpecies].types[1];
|
||||
defAbility = gSpeciesInfo[targetSpecies].abilities[0];
|
||||
moveType = gBattleMoves[move].type;
|
||||
|
||||
if (defAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND)
|
||||
@@ -3115,7 +3115,7 @@ static void Task_ShowTourneyInfoCard(u8 taskId)
|
||||
// Note: Card scrolling up means the current card goes down and another one appears from top.
|
||||
// The same is true for scrolling left.
|
||||
// That means that the sprite needs to move with the moving card in the opposite scrolling direction.
|
||||
static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
|
||||
static void SpriteCB_TrainerIconCardScrollUp(struct Sprite *sprite)
|
||||
{
|
||||
sprite->y += 4;
|
||||
if (sprite->data[0] != 0)
|
||||
@@ -3135,7 +3135,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
|
||||
static void SpriteCB_TrainerIconCardScrollDown(struct Sprite *sprite)
|
||||
{
|
||||
sprite->y -= 4;
|
||||
if (sprite->data[0] != 0)
|
||||
@@ -3155,7 +3155,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
|
||||
static void SpriteCB_TrainerIconCardScrollLeft(struct Sprite *sprite)
|
||||
{
|
||||
sprite->x += 4;
|
||||
if (sprite->data[0] != 0)
|
||||
@@ -3175,7 +3175,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
|
||||
static void SpriteCB_TrainerIconCardScrollRight(struct Sprite *sprite)
|
||||
{
|
||||
sprite->x -= 4;
|
||||
if (sprite->data[0] != 0)
|
||||
@@ -3197,13 +3197,13 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
|
||||
|
||||
#define sMonIconStill data[3]
|
||||
|
||||
static void SpriteCb_MonIcon(struct Sprite *sprite)
|
||||
static void SpriteCB_MonIconDomeInfo(struct Sprite *sprite)
|
||||
{
|
||||
if (!sprite->sMonIconStill)
|
||||
UpdateMonIconFrame(sprite);
|
||||
}
|
||||
|
||||
static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
|
||||
static void SpriteCB_MonIconCardScrollUp(struct Sprite *sprite)
|
||||
{
|
||||
if (!sprite->sMonIconStill)
|
||||
UpdateMonIconFrame(sprite);
|
||||
@@ -3213,7 +3213,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
|
||||
if (sprite->y >= -16)
|
||||
sprite->invisible = FALSE;
|
||||
if (++sprite->data[1] == 40)
|
||||
sprite->callback = SpriteCb_MonIcon;
|
||||
sprite->callback = SpriteCB_MonIconDomeInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3225,7 +3225,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
|
||||
static void SpriteCB_MonIconCardScrollDown(struct Sprite *sprite)
|
||||
{
|
||||
if (!sprite->sMonIconStill)
|
||||
UpdateMonIconFrame(sprite);
|
||||
@@ -3235,7 +3235,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
|
||||
if (sprite->y <= 176)
|
||||
sprite->invisible = FALSE;
|
||||
if (++sprite->data[1] == 40)
|
||||
sprite->callback = SpriteCb_MonIcon;
|
||||
sprite->callback = SpriteCB_MonIconDomeInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3247,7 +3247,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
|
||||
static void SpriteCB_MonIconCardScrollLeft(struct Sprite *sprite)
|
||||
{
|
||||
if (!sprite->sMonIconStill)
|
||||
UpdateMonIconFrame(sprite);
|
||||
@@ -3257,7 +3257,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
|
||||
if (sprite->x >= -16)
|
||||
sprite->invisible = FALSE;
|
||||
if (++sprite->data[1] == 64)
|
||||
sprite->callback = SpriteCb_MonIcon;
|
||||
sprite->callback = SpriteCB_MonIconDomeInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3269,7 +3269,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
|
||||
static void SpriteCB_MonIconCardScrollRight(struct Sprite *sprite)
|
||||
{
|
||||
if (!sprite->sMonIconStill)
|
||||
UpdateMonIconFrame(sprite);
|
||||
@@ -3279,7 +3279,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
|
||||
if (sprite->x <= DISPLAY_WIDTH + 16)
|
||||
sprite->invisible = FALSE;
|
||||
if (++sprite->data[1] == 64)
|
||||
sprite->callback = SpriteCb_MonIcon;
|
||||
sprite->callback = SpriteCB_MonIconDomeInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3291,7 +3291,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_HorizontalScrollArrow(struct Sprite *sprite)
|
||||
static void SpriteCB_HorizontalScrollArrow(struct Sprite *sprite)
|
||||
{
|
||||
int taskId1 = sprite->data[0];
|
||||
int arrId = gTasks[gTasks[taskId1].data[4]].data[1];
|
||||
@@ -3360,7 +3360,7 @@ static void SpriteCb_HorizontalScrollArrow(struct Sprite *sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void SpriteCb_VerticalScrollArrow(struct Sprite *sprite)
|
||||
static void SpriteCB_VerticalScrollArrow(struct Sprite *sprite)
|
||||
{
|
||||
int taskId1 = sprite->data[0];
|
||||
|
||||
@@ -3526,7 +3526,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3537,7 +3537,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3550,7 +3550,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3561,7 +3561,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollUp;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3642,7 +3642,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3653,7 +3653,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3666,7 +3666,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3677,7 +3677,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollDown;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3725,7 +3725,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3736,7 +3736,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3749,7 +3749,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3760,7 +3760,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3808,7 +3808,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3819,7 +3819,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3832,7 +3832,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3843,7 +3843,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3889,7 +3889,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3900,7 +3900,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3913,7 +3913,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3924,7 +3924,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3972,7 +3972,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3983,7 +3983,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -3996,7 +3996,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -4007,7 +4007,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
|
||||
{
|
||||
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
|
||||
{
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
|
||||
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
|
||||
@@ -4297,7 +4297,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
|
||||
if (trainerId == TRAINER_PLAYER)
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[trainerTourneyId][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sInfoTrainerMonX[i],
|
||||
y + sInfoTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4306,7 +4306,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
|
||||
else if (trainerId == TRAINER_FRONTIER_BRAIN)
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[trainerTourneyId][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sInfoTrainerMonX[i],
|
||||
y + sInfoTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4315,7 +4315,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
|
||||
else
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[trainerTourneyId][i]].species,
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sInfoTrainerMonX[i],
|
||||
y + sInfoTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4786,7 +4786,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
if (trainerIds[0] == TRAINER_PLAYER)
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[0]][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sLeftTrainerMonX[i],
|
||||
y + sLeftTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4795,7 +4795,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN)
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[0]][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sLeftTrainerMonX[i],
|
||||
y + sLeftTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4804,7 +4804,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
else
|
||||
{
|
||||
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[tournamentIds[0]][i]].species,
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sLeftTrainerMonX[i],
|
||||
y + sLeftTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4826,7 +4826,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
if (trainerIds[1] == TRAINER_PLAYER)
|
||||
{
|
||||
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[1]][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sRightTrainerMonX[i],
|
||||
y + sRightTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4835,7 +4835,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN)
|
||||
{
|
||||
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[1]][i],
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sRightTrainerMonX[i],
|
||||
y + sRightTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -4844,7 +4844,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
|
||||
else
|
||||
{
|
||||
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[tournamentIds[1]][i]].species,
|
||||
SpriteCb_MonIcon,
|
||||
SpriteCB_MonIconDomeInfo,
|
||||
x | sRightTrainerMonX[i],
|
||||
y + sRightTrainerMonY[i],
|
||||
0, 0, TRUE);
|
||||
@@ -5204,9 +5204,9 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun
|
||||
|
||||
targetSpecies = gFacilityTrainerMons[DOME_MONS[loserTournamentId][k]].species;
|
||||
if (var & 1)
|
||||
targetAbility = gBaseStats[targetSpecies].abilities[1];
|
||||
targetAbility = gSpeciesInfo[targetSpecies].abilities[1];
|
||||
else
|
||||
targetAbility = gBaseStats[targetSpecies].abilities[0];
|
||||
targetAbility = gSpeciesInfo[targetSpecies].abilities[0];
|
||||
|
||||
var = AI_TypeCalc(moveIds[i * MAX_MON_MOVES + j], targetSpecies, targetAbility);
|
||||
if (var & MOVE_RESULT_NOT_VERY_EFFECTIVE && var & MOVE_RESULT_SUPER_EFFECTIVE)
|
||||
@@ -5883,8 +5883,8 @@ static void InitRandomTourneyTreeResults(void)
|
||||
statSums[i] += statValues[STAT_SPDEF];
|
||||
statSums[i] += statValues[STAT_SPEED];
|
||||
statSums[i] += statValues[STAT_HP];
|
||||
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
|
||||
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[0]];
|
||||
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[1]];
|
||||
}
|
||||
|
||||
// Because GF hates temporary vars, trainerId acts like monTypesCount here.
|
||||
@@ -6010,12 +6010,12 @@ static void DecideRoundWinners(u8 roundId)
|
||||
}
|
||||
}
|
||||
species = gFacilityTrainerMons[DOME_MONS[tournamentId1][monId1]].species;
|
||||
points1 += ( gBaseStats[species].baseHP
|
||||
+ gBaseStats[species].baseAttack
|
||||
+ gBaseStats[species].baseDefense
|
||||
+ gBaseStats[species].baseSpeed
|
||||
+ gBaseStats[species].baseSpAttack
|
||||
+ gBaseStats[species].baseSpDefense) / 10;
|
||||
points1 += ( gSpeciesInfo[species].baseHP
|
||||
+ gSpeciesInfo[species].baseAttack
|
||||
+ gSpeciesInfo[species].baseDefense
|
||||
+ gSpeciesInfo[species].baseSpeed
|
||||
+ gSpeciesInfo[species].baseSpAttack
|
||||
+ gSpeciesInfo[species].baseSpDefense) / 10;
|
||||
}
|
||||
// Random part of the formula.
|
||||
points1 += (Random() & 0x1F);
|
||||
@@ -6033,12 +6033,12 @@ static void DecideRoundWinners(u8 roundId)
|
||||
}
|
||||
}
|
||||
species = gFacilityTrainerMons[DOME_MONS[tournamentId2][monId1]].species;
|
||||
points2 += ( gBaseStats[species].baseHP
|
||||
+ gBaseStats[species].baseAttack
|
||||
+ gBaseStats[species].baseDefense
|
||||
+ gBaseStats[species].baseSpeed
|
||||
+ gBaseStats[species].baseSpAttack
|
||||
+ gBaseStats[species].baseSpDefense) / 10;
|
||||
points2 += ( gSpeciesInfo[species].baseHP
|
||||
+ gSpeciesInfo[species].baseAttack
|
||||
+ gSpeciesInfo[species].baseDefense
|
||||
+ gSpeciesInfo[species].baseSpeed
|
||||
+ gSpeciesInfo[species].baseSpAttack
|
||||
+ gSpeciesInfo[species].baseSpDefense) / 10;
|
||||
}
|
||||
// Random part of the formula.
|
||||
points2 += (Random() & 0x1F);
|
||||
|
||||
Reference in New Issue
Block a user