Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1978 from DizzyEggg/windows_overflow 

Fix HideMapNamePopUpWindow possible overflow
This commit is contained in:
GriffinR 2024-02-04 20:34:17 -05:00 committed by GitHub
parent 246f47d9d0 e87a69a5e7
commit d7a361cef1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ld_script_modern.ld
View File

@ -15,11 +15,6 @@ SECTIONS {
ewram 0x2000000 (NOLOAD) : ewram 0x2000000 (NOLOAD) :
ALIGN(4) ALIGN(4)
{ {
/*
We link malloc.o here to prevent `gHeap` from landing in the middle of EWRAM.
Otherwise this causes corruption issues on some ld versions
*/
gflib/malloc.o(ewram_data);
src/*.o(ewram_data); src/*.o(ewram_data);
gflib/*.o(ewram_data); gflib/*.o(ewram_data);
} > EWRAM } > EWRAM

9
src/map_name_popup.c
View File

@ -317,8 +317,13 @@ void HideMapNamePopUpWindow(void)
{ {
if (FuncIsActiveTask(Task_MapNamePopUpWindow)) if (FuncIsActiveTask(Task_MapNamePopUpWindow))
{ {
ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE); #ifdef UBFIX
RemoveMapNamePopUpWindow(); if (GetMapNamePopUpWindowId() != WINDOW_NONE)
#endif // UBFIX
{
ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
RemoveMapNamePopUpWindow();
}
SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0); SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0);
DestroyTask(sPopupTaskId); DestroyTask(sPopupTaskId);
} }