diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-01 10:04:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 10:04:42 -0600 |
| commit | b26c24ffeecdc82da84cb6fb2bdea37cd9de9df9 (patch) | |
| tree | af7d4ab5c4a49b3eefbabfcf331eb8c6e1d35cea /src/pokemon_icon.c | |
| parent | b4f83b4f0fcce8c06a6a5a5fd541fb76b1fe9f4c (diff) | |
| parent | c0db31163732e976ebe64d0d65da309847986367 (diff) | |
Merge pull request #532 from DizzyEggg/bored
Fix some fakematches
Diffstat (limited to 'src/pokemon_icon.c')
| -rw-r--r-- | src/pokemon_icon.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index bcbb60e21..ecb8f4950 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1238,7 +1238,6 @@ const u16* GetValidMonIconPalettePtr(u16 species) return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data; } -// TODO: try to find a way to avoid using asm statement u8 UpdateMonIconFrame(struct Sprite *sprite) { u8 result = 0; @@ -1262,10 +1261,7 @@ u8 UpdateMonIconFrame(struct Sprite *sprite) (u8 *)sprite->images + (sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame), (u8 *)(OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP), sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]); - { - register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; - sprite->animDelayCounter = duration; - } + sprite->animDelayCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration & 0xFF; sprite->animCmdIndex++; result = sprite->animCmdIndex; break; |