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

26
src/starter_choose.c
View File

@@ -523,8 +523,8 @@ static void Task_HandleStarterChooseInput(u8 taskId)
static void Task_WaitForStarterSprite(u8 taskId)
{
if (gSprites[gTasks[taskId].tCircleSpriteId].affineAnimEnded &&
gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X &&
gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y)
gSprites[gTasks[taskId].tCircleSpriteId].x == STARTER_PKMN_POS_X &&
gSprites[gTasks[taskId].tCircleSpriteId].y == STARTER_PKMN_POS_Y)
{
gTasks[taskId].func = Task_AskConfirmStarter;
}
@@ -643,9 +643,9 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
static void SpriteCB_SelectionHand(struct Sprite *sprite)
{
// Float up and down above selected pokeball
sprite->pos1.x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0];
sprite->pos1.y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1];
sprite->pos2.y = Sin(sprite->data[1], 8);
sprite->x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0];
sprite->y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1];
sprite->y2 = Sin(sprite->data[1], 8);
sprite->data[1] = (u8)(sprite->data[1]) + 4;
}
@@ -661,12 +661,12 @@ static void SpriteCB_Pokeball(struct Sprite *sprite)
static void SpriteCB_StarterPokemon(struct Sprite *sprite)
{
// Move sprite to upper center of screen
if (sprite->pos1.x > STARTER_PKMN_POS_X)
sprite->pos1.x -= 4;
if (sprite->pos1.x < STARTER_PKMN_POS_X)
sprite->pos1.x += 4;
if (sprite->pos1.y > STARTER_PKMN_POS_Y)
sprite->pos1.y -= 2;
if (sprite->pos1.y < STARTER_PKMN_POS_Y)
sprite->pos1.y += 2;
if (sprite->x > STARTER_PKMN_POS_X)
sprite->x -= 4;
if (sprite->x < STARTER_PKMN_POS_X)
sprite->x += 4;
if (sprite->y > STARTER_PKMN_POS_Y)
sprite->y -= 2;
if (sprite->y < STARTER_PKMN_POS_Y)
sprite->y += 2;
}