Merge branch 'master' into misc-tasks

This commit is contained in:
GriffinR
2023-10-07 17:25:20 -04:00
committed by GitHub
167 changed files with 1341 additions and 1306 deletions

View File

@@ -1670,7 +1670,7 @@ static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 elevatio
struct ObjectEvent *objectEvent = &gObjectEvents[i];
if (objectEvent->active)
{
const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); // Unused
const struct ObjectEventGraphicsInfo UNUSED *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
struct Sprite *linkedSprite = &gSprites[objectEvent->spriteId];
xhi = sprite->x + sprite->centerToCornerVecX;