ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Critical] fix memory corruption when handling trigger sprites (#3238)

Browse Source 
Co-authored-by: sbird <sbird@no.tld>
This commit is contained in:
Philipp AUER 2023-08-17 02:21:16 +02:00 committed by GitHub
parent dba28cf93f
commit cd90fdec5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_interface.c
View File

@ -1409,11 +1409,10 @@ bool32 IsMegaTriggerSpriteActive(void)
void HideMegaTriggerSprite(void) void HideMegaTriggerSprite(void)
{ {
if (gBattleStruct->mega.triggerSpriteId != 0xFF) if (gBattleStruct->mega.triggerSpriteId >= MAX_SPRITES)
{ return;
ChangeMegaTriggerSprite(gBattleStruct->mega.triggerSpriteId, 0); ChangeMegaTriggerSprite(gBattleStruct->mega.triggerSpriteId, 0);
gSprites[gBattleStruct->mega.triggerSpriteId].tHide = TRUE; gSprites[gBattleStruct->mega.triggerSpriteId].tHide = TRUE;
}
} }
void HideTriggerSprites(void) void HideTriggerSprites(void)

7
src/battle_z_move.c
View File

@ -345,9 +345,12 @@ bool32 IsZMoveTriggerSpriteActive(void)
void HideZMoveTriggerSprite(void) void HideZMoveTriggerSprite(void)
{ {
struct Sprite *sprite = &gSprites[gBattleStruct->zmove.triggerSpriteId]; struct Sprite *sprite;
sprite->tHide = TRUE;
gBattleStruct->zmove.viable = FALSE; gBattleStruct->zmove.viable = FALSE;
if (gBattleStruct->zmove.triggerSpriteId >= MAX_SPRITES)
return;
sprite = &gSprites[gBattleStruct->zmove.triggerSpriteId];
sprite->tHide = TRUE;
} }
static void ShowZMoveTriggerSprite(u8 battlerId) static void ShowZMoveTriggerSprite(u8 battlerId)