diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-29 18:36:18 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-29 18:36:18 -0400 |
| commit | 102582a3dff87769379acca9d50fe29f6f41d337 (patch) | |
| tree | f4b2b95ab5817efe5fda675741a6dfb9c40d1275 /src/battle_anim_mons.c | |
| parent | 79a8eb481f08a035d2b357b5f9c9a57cb54e99da (diff) | |
| parent | c40fb9288cf02f2cba1b72c7377d6272a0eef6f2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
Diffstat (limited to 'src/battle_anim_mons.c')
| -rw-r--r-- | src/battle_anim_mons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 3f4a35475..688009519 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1815,7 +1815,7 @@ void SetBattlerSpriteYOffsetFromYScale(u8 spriteId) { int var = 64 - GetBattlerYDeltaFromSpriteId(spriteId) * 2; u16 matrix = gSprites[spriteId].oam.matrixNum; - int var2 = (var << 8) / gOamMatrices[matrix].d; + int var2 = SAFE_DIV(var << 8, gOamMatrices[matrix].d); if (var2 > 128) var2 = 128; @@ -1828,7 +1828,7 @@ void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId) { int var = 64 - GetBattlerYDeltaFromSpriteId(otherSpriteId) * 2; u16 matrix = gSprites[spriteId].oam.matrixNum; - int var2 = (var << 8) / gOamMatrices[matrix].d; + int var2 = SAFE_DIV(var << 8, gOamMatrices[matrix].d); if (var2 > 128) var2 = 128; |