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

Merge pull request #1479 from PikalaxALT/flatten_sprite_pos

Browse Source 
Flatten pos fields in struct Sprite
This commit is contained in:
GriffinR
2021-07-27 18:02:00 -04:00
committed by GitHub
parent 80c77fc120 a274cc6a76
commit 459b20d762
111 changed files with 3764 additions and 3764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_summary_screen.c
+6 -6
View File
@@ -3772,8 +3772,8 @@ static void SetTypeSpritePosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]];
StartSpriteAnim(sprite, typeId);
sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
sprite->pos1.x = x + 16;
sprite->pos1.y = y + 8;
sprite->x = x + 16;
sprite->y = y + 8;
SetSpriteInvisibility(spriteArrayId, FALSE);
}
@@ -3999,8 +3999,8 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon)
if (sprite != NULL)
{
StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
sMonSummaryScreen->markingsSprite->pos1.x = 60;
sMonSummaryScreen->markingsSprite->pos1.y = 26;
sMonSummaryScreen->markingsSprite->x = 60;
sMonSummaryScreen->markingsSprite->y = 26;
sMonSummaryScreen->markingsSprite->oam.priority = 1;
}
}
@@ -4087,9 +4087,9 @@ static void SpriteCb_MoveSelector(struct Sprite *sprite)
}
if (sprite->data[0] == SPRITE_ARR_ID_MOVE_SELECTOR1)
sprite->pos2.y = sMonSummaryScreen->firstMoveIndex * 16;
sprite->y2 = sMonSummaryScreen->firstMoveIndex * 16;
else
sprite->pos2.y = sMonSummaryScreen->secondMoveIndex * 16;
sprite->y2 = sMonSummaryScreen->secondMoveIndex * 16;
}
static void DestroyMoveSelectorSprites(u8 firstArrayId)