Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

This commit is contained in:
GriffinR
2023-01-07 13:30:11 -05:00
705 changed files with 36500 additions and 32348 deletions
+2 -2
View File
@@ -2870,7 +2870,7 @@ static bool8 TryMovePartySlot(s16 x, s16 width, u8 *leftMove, u8 *newX, u8 *newW
{
if (x + width < 0)
return FALSE;
if (x > 31)
if (x >= 32)
return FALSE;
if (x < 0)
@@ -2883,7 +2883,7 @@ static bool8 TryMovePartySlot(s16 x, s16 width, u8 *leftMove, u8 *newX, u8 *newW
{
*leftMove = 0;
*newX = x;
if (x + width > 31)
if (x + width >= 32)
*newWidth = 32 - x;
else
*newWidth = width;