diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-04 21:00:45 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-06 19:05:44 -0600 |
| commit | 27567719586859201cab665f9406ef8f39a39748 (patch) | |
| tree | 7ad7bf8bea14d2ab6150a1406569c0fbeb2e9f35 /src/trade.c | |
| parent | c40879aa3693a18c23be42cce54d52ca7afe1bca (diff) | |
More usage of ST_OAM constants and SPRITE macros
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trade.c b/src/trade.c index 909abe540..91b514067 100644 --- a/src/trade.c +++ b/src/trade.c @@ -3672,8 +3672,8 @@ static bool8 AnimateTradeSequenceCable(void) if (!IsMonSpriteNotFlipped(sTradeData->monSpecies[TRADE_PLAYER])) { gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].affineAnims = gSpriteAffineAnimTable_8338ECC; - gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = 3; - CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0, 3, 3); + gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = ST_OAM_AFFINE_DOUBLE; + CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), ST_OAM_AFFINE_DOUBLE); StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0); } else @@ -4170,8 +4170,8 @@ static bool8 AnimateTradeSequenceWireless(void) if (!IsMonSpriteNotFlipped(sTradeData->monSpecies[TRADE_PLAYER])) { gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].affineAnims = gSpriteAffineAnimTable_8338ECC; - gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = 3; - CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0, 3, 3); + gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].oam.affineMode = ST_OAM_AFFINE_DOUBLE; + CalcCenterToCornerVec(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), ST_OAM_AFFINE_DOUBLE); StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]], 0); } else |