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

Flatten pos fields in struct Sprite

Browse Source
This commit is contained in:
PikalaxALT
2021-07-07 09:11:52 -04:00
parent 3964820a84
commit 810ca5f8ff
111 changed files with 3764 additions and 3764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/contest.c
View File

@@ -1784,7 +1784,7 @@ static void Task_DoAppeals(u8 taskId)
gContestMons[eContest.currentContestant].otId,
gContestMons[eContest.currentContestant].personality,
eContest.currentContestant);
gSprites[spriteId].pos2.x = 120;
gSprites[spriteId].x2 = 120;
gSprites[spriteId].callback = SpriteCB_MonSlideIn;
gTasks[taskId].tMonSpriteId = spriteId;
gBattlerSpriteIds[gBattlerAttacker] = spriteId;
@@ -2449,9 +2449,9 @@ static void Task_EndWaitForLink(u8 taskId)
static void SpriteCB_MonSlideIn(struct Sprite *sprite)
{
if (sprite->pos2.x != 0)
if (sprite->x2 != 0)
{
sprite->pos2.x -= 2;
sprite->x2 -= 2;
}
else
{
@@ -2465,8 +2465,8 @@ static void SpriteCB_MonSlideIn(struct Sprite *sprite)
static void SpriteCB_MonSlideOut(struct Sprite *sprite)
{
sprite->pos2.x -= 6;
if (sprite->pos1.x + sprite->pos2.x < -32)
sprite->x2 -= 6;
if (sprite->x + sprite->x2 < -32)
{
sprite->callback = SpriteCallbackDummy;
sprite->invisible = TRUE;
@@ -3864,7 +3864,7 @@ static void UpdateHeartSlider(u8 contestant)
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].sContestant = contestant;
gSprites[spriteId].sTargetX = slideTarget;
if (gSprites[spriteId].sTargetX > gSprites[spriteId].pos2.x)
if (gSprites[spriteId].sTargetX > gSprites[spriteId].x2)
gSprites[spriteId].sMoveX = 1;
else
gSprites[spriteId].sMoveX = -1;
@@ -3896,14 +3896,14 @@ static bool8 SlidersDoneUpdating(void)
static void SpriteCB_UpdateHeartSlider(struct Sprite *sprite)
{
if (sprite->pos2.x == sprite->sTargetX)
if (sprite->x2 == sprite->sTargetX)
{
eContestGfxState[sprite->sContestant].sliderUpdating = FALSE;
sprite->callback = SpriteCallbackDummy;
}
else
{
sprite->pos2.x += sprite->sMoveX;
sprite->x2 += sprite->sMoveX;
}
}
@@ -3917,7 +3917,7 @@ static void UpdateSliderHeartSpriteYPositions(void)
s32 i;
for (i = 0; i < CONTESTANT_COUNT; i++)
gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.y = sSliderHeartYPositions[gContestantTurnOrder[i]];
gSprites[eContestGfxState[i].sliderHeartSpriteId].y = sSliderHeartYPositions[gContestantTurnOrder[i]];
}
// Used to hide (or subsequently reshow) the bottom two slider hearts that get hidden by text windows by moving them offscreen
@@ -3931,9 +3931,9 @@ static void SetBottomSliderHeartsInvisibility(bool8 invisible)
if (gContestantTurnOrder[i] > 1)
{
if (!invisible)
gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 180;
gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 180;
else
gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 256;
gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 256;
}
}
}
@@ -4789,7 +4789,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId)
static void SlideApplauseMeterIn(void)
{
CreateTask(Task_SlideApplauseMeterIn, 10);
gSprites[eContest.applauseMeterSpriteId].pos2.x = -70;
gSprites[eContest.applauseMeterSpriteId].x2 = -70;
gSprites[eContest.applauseMeterSpriteId].invisible = FALSE;
eContest.applauseMeterIsMoving = TRUE;
}
@@ -4799,11 +4799,11 @@ static void Task_SlideApplauseMeterIn(u8 taskId)
struct Sprite *sprite = &gSprites[eContest.applauseMeterSpriteId];
gTasks[taskId].data[10] += 1664;
sprite->pos2.x += gTasks[taskId].data[10] >> 8;
sprite->x2 += gTasks[taskId].data[10] >> 8;
gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
if (sprite->pos2.x > 0)
sprite->pos2.x = 0;
if (sprite->pos2.x == 0)
if (sprite->x2 > 0)
sprite->x2 = 0;
if (sprite->x2 == 0)
{
eContest.applauseMeterIsMoving = FALSE;
DestroyTask(taskId);
@@ -4819,7 +4819,7 @@ static void SlideApplauseMeterOut(void)
else
{
CreateTask(Task_SlideApplauseMeterOut, 10);
gSprites[eContest.applauseMeterSpriteId].pos2.x = 0;
gSprites[eContest.applauseMeterSpriteId].x2 = 0;
eContest.applauseMeterIsMoving = TRUE;
}
}
@@ -4829,11 +4829,11 @@ static void Task_SlideApplauseMeterOut(u8 taskId)
struct Sprite *sprite = &gSprites[eContest.applauseMeterSpriteId];
gTasks[taskId].data[10] += 1664;
sprite->pos2.x -= gTasks[taskId].data[10] >> 8;
sprite->x2 -= gTasks[taskId].data[10] >> 8;
gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
if (sprite->pos2.x < -70)
sprite->pos2.x = -70;
if (sprite->pos2.x == -70)
if (sprite->x2 < -70)
sprite->x2 = -70;
if (sprite->x2 == -70)
{
sprite->invisible = TRUE;
eContest.applauseMeterIsMoving = FALSE;
@@ -4878,7 +4878,7 @@ static void Task_ShowAndUpdateApplauseMeter(u8 taskId)
// Unused.
static void HideApplauseMeterNoAnim(void)
{
gSprites[eContest.applauseMeterSpriteId].pos2.x = 0;
gSprites[eContest.applauseMeterSpriteId].x2 = 0;
gSprites[eContest.applauseMeterSpriteId].invisible = FALSE;
}
@@ -5017,7 +5017,7 @@ static void ShowHideNextTurnGfx(bool8 show)
if (eContestantStatus[i].turnOrderMod != 0 && show)
{
CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(OBJ_VRAM0 + (gSprites[eContestGfxState[i].nextTurnSpriteId].oam.tileNum + 6) * 32), 32);
gSprites[eContestGfxState[i].nextTurnSpriteId].pos1.y = sNextTurnSpriteYPositions[gContestantTurnOrder[i]];
gSprites[eContestGfxState[i].nextTurnSpriteId].y = sNextTurnSpriteYPositions[gContestantTurnOrder[i]];
gSprites[eContestGfxState[i].nextTurnSpriteId].invisible = FALSE;
}
else
@@ -5379,10 +5379,10 @@ static void SetBattleTargetSpritePosition(void)
{
struct Sprite *sprite = &gSprites[gBattlerSpriteIds[B_POSITION_OPPONENT_RIGHT]];
sprite->pos2.x = 0;
sprite->pos2.y = 0;
sprite->pos1.x = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_X);
sprite->pos1.y = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_Y);
sprite->x2 = 0;
sprite->y2 = 0;
sprite->x = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_X);
sprite->y = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_Y);
sprite->invisible = TRUE;
}