diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/mon_markings.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/mon_markings.c')
| -rw-r--r-- | src/mon_markings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mon_markings.c b/src/mon_markings.c index 7f320002d..30015dbef 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -479,7 +479,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) for (i = 0; i < 2; i++) { spriteId = CreateSprite(&sprTemplate, x + 32, y + 32, 1); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuWindowSprites[i] = &gSprites[spriteId]; StartSpriteAnim(&gSprites[spriteId], i); @@ -502,7 +502,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) for (i = 0; i < 4; i++) { spriteId = CreateSprite(&sprTemplate, x + 32, y + 16 + 16 * i, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuMarkingSprites[i] = &gSprites[spriteId]; gSprites[spriteId].data[0] = i; @@ -518,7 +518,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) spriteId = CreateSprite(&sprTemplate, 0, 0, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuTextSprite = &gSprites[spriteId]; sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE; @@ -535,7 +535,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) sprTemplate.callback = sub_811FF7C; spriteId = CreateSprite(&sprTemplate, x + 12, 0, 0); - if(spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->unkSprite = &gSprites[spriteId]; sMenu->unkSprite->data[0] = y + 16; @@ -600,7 +600,7 @@ static struct Sprite *sub_811FFD4(u16 tileTag, u16 paletteTag, const u16 *palett LoadSpritePalette(&sprPalette); spriteId = CreateSprite(&sprTemplate, 0, 0, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) return &gSprites[spriteId]; else return NULL; |