Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-11 12:37:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some null pointer checks (#5130)

Browse Source 
* Fix some null pointer uses

* fix bad merge
This commit is contained in:
tertu
2024-08-10 06:33:05 -05:00
committed by GitHub
parent 113f8de9b1
commit aeb9da337e
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pokemon_storage_system.c
View File

@@ -1998,7 +1998,10 @@ static void VBlankCB_PokeStorage(void)
ProcessSpriteCopyRequests();
UnkUtil_Run();
TransferPlttBuffer();
SetGpuReg(REG_OFFSET_BG2HOFS, sStorage->bg2_X);
if (sStorage != NULL)
{
SetGpuReg(REG_OFFSET_BG2HOFS, sStorage->bg2_X);
}
}
static void CB2_PokeStorage(void)
@@ -4206,11 +4209,14 @@ static void StopFlashingCloseBoxButton(void)
static void UpdateCloseBoxButtonFlash(void)
{
if (sStorage->closeBoxFlashing && ++sStorage->closeBoxFlashTimer > 30)
if (sStorage != NULL)
{
sStorage->closeBoxFlashTimer = 0;
sStorage->closeBoxFlashState = (sStorage->closeBoxFlashState == FALSE);
UpdateCloseBoxButtonTilemap(sStorage->closeBoxFlashState);
if (sStorage->closeBoxFlashing && ++sStorage->closeBoxFlashTimer > 30)
{
sStorage->closeBoxFlashTimer = 0;
sStorage->closeBoxFlashState = (sStorage->closeBoxFlashState == FALSE);
UpdateCloseBoxButtonTilemap(sStorage->closeBoxFlashState);
}
}
}