dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #407 from DizzyEggg/max_sprites

Browse Source 
Use MAX_SPRITES define
This commit is contained in:
Diegoisawesome
2018-11-28 14:34:11 -06:00
committed by GitHub
parent 0148e38973 0ed2f54d61
commit 4a9b4ba0b3
4 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_effect.c
+4 -5
View File
@@ -773,7 +773,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio
u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag);
PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
if (spriteId == 0xFFFF) if (spriteId == 0xFFFF)
return 0x40; return MAX_SPRITES;
else else
return spriteId; return spriteId;
} }
@@ -3469,13 +3469,12 @@ static void sub_80B957C(struct Sprite *sprite)
static void sub_80B963C(struct Sprite *sprite) static void sub_80B963C(struct Sprite *sprite)
{ {
struct Sprite *sprite1;
sprite->pos2.x = Cos(sprite->data[2], 0x8c); sprite->pos2.x = Cos(sprite->data[2], 0x8c);
sprite->pos2.y = Sin(sprite->data[2], 0x48); sprite->pos2.y = Sin(sprite->data[2], 0x48);
sprite->data[2] = (sprite->data[2] + 4) & 0xff; sprite->data[2] = (sprite->data[2] + 4) & 0xff;
if (sprite->data[6] != 0x40) if (sprite->data[6] != MAX_SPRITES)
{ {
sprite1 = &gSprites[sprite->data[6]]; struct Sprite *sprite1 = &gSprites[sprite->data[6]];
sprite1->coordOffsetEnabled = 0; sprite1->coordOffsetEnabled = 0;
sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x; sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x;
sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
@@ -3855,7 +3854,7 @@ void sub_80B9D24(struct Sprite* sprite)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
u8 spriteId = CreateSprite(&gUnknown_0855C5EC, xPos, yPos, 0); u8 spriteId = CreateSprite(&gUnknown_0855C5EC, xPos, yPos, 0);
if (spriteId != 0x40) if (spriteId != MAX_SPRITES)
{ {
StartSpriteAnim(&gSprites[spriteId], i); StartSpriteAnim(&gSprites[spriteId], i);
gSprites[spriteId].data[0] = i; gSprites[spriteId].data[0] = i;
src/mon_markings.c
+5 -5
View File
@@ -479,7 +479,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
spriteId = CreateSprite(&sprTemplate, x + 32, y + 32, 1); spriteId = CreateSprite(&sprTemplate, x + 32, y + 32, 1);
if (spriteId != 64) if (spriteId != MAX_SPRITES)
{ {
sMenu->menuWindowSprites[i] = &gSprites[spriteId]; sMenu->menuWindowSprites[i] = &gSprites[spriteId];
StartSpriteAnim(&gSprites[spriteId], i); 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++) for (i = 0; i < 4; i++)
{ {
spriteId = CreateSprite(&sprTemplate, x + 32, y + 16 + 16 * i, 0); spriteId = CreateSprite(&sprTemplate, x + 32, y + 16 + 16 * i, 0);
if (spriteId != 64) if (spriteId != MAX_SPRITES)
{ {
sMenu->menuMarkingSprites[i] = &gSprites[spriteId]; sMenu->menuMarkingSprites[i] = &gSprites[spriteId];
gSprites[spriteId].data[0] = i; 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); spriteId = CreateSprite(&sprTemplate, 0, 0, 0);
if (spriteId != 64) if (spriteId != MAX_SPRITES)
{ {
sMenu->menuTextSprite = &gSprites[spriteId]; sMenu->menuTextSprite = &gSprites[spriteId];
sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE; 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; sprTemplate.callback = sub_811FF7C;
spriteId = CreateSprite(&sprTemplate, x + 12, 0, 0); spriteId = CreateSprite(&sprTemplate, x + 12, 0, 0);
if(spriteId != 64) if (spriteId != MAX_SPRITES)
{ {
sMenu->unkSprite = &gSprites[spriteId]; sMenu->unkSprite = &gSprites[spriteId];
sMenu->unkSprite->data[0] = y + 16; sMenu->unkSprite->data[0] = y + 16;
@@ -600,7 +600,7 @@ static struct Sprite *sub_811FFD4(u16 tileTag, u16 paletteTag, const u16 *palett
LoadSpritePalette(&sprPalette); LoadSpritePalette(&sprPalette);
spriteId = CreateSprite(&sprTemplate, 0, 0, 0); spriteId = CreateSprite(&sprTemplate, 0, 0, 0);
if (spriteId != 64) if (spriteId != MAX_SPRITES)
return &gSprites[spriteId]; return &gSprites[spriteId];
else else
return NULL; return NULL;
src/overworld.c
+1 -1
View File
@@ -2955,7 +2955,7 @@ static void sub_808780C(u8 linkPlayerId)
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
u8 eventObjId = linkPlayerEventObj->eventObjId; u8 eventObjId = linkPlayerEventObj->eventObjId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct EventObject *eventObj = &gEventObjects[eventObjId];
if (eventObj->spriteId != 64 ) if (eventObj->spriteId != MAX_SPRITES)
DestroySprite(&gSprites[eventObj->spriteId]); DestroySprite(&gSprites[eventObj->spriteId]);
linkPlayerEventObj->active = 0; linkPlayerEventObj->active = 0;
eventObj->active = 0; eventObj->active = 0;
src/player_pc.c
+1 -1
View File
@@ -1021,7 +1021,7 @@ static void sub_816C060(u16 itemId)
FreeSpriteTilesByTag(0x13F6); FreeSpriteTilesByTag(0x13F6);
FreeSpritePaletteByTag(0x13F6); FreeSpritePaletteByTag(0x13F6);
spriteId = AddItemIconSprite(0x13F6, 0x13F6, itemId); spriteId = AddItemIconSprite(0x13F6, 0x13F6, itemId);
if(spriteId != 64) if (spriteId != MAX_SPRITES)
{ {
*spriteIdLoc = spriteId; *spriteIdLoc = spriteId;
gSprites[spriteId].oam.priority = 0; gSprites[spriteId].oam.priority = 0;