atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix conflicts with RavePossum's standalone BW pop up (#4752)

Browse source
This commit is contained in:
Alex 2024-06-10 00:02:42 +02:00 committed by GitHub
commit 43e48353ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/map_name_popup.c
View file

@ -418,7 +418,7 @@ static void Task_MapNamePopUpWindow(u8 taskId)
{ {
task->tYOffset = 0; task->tYOffset = 0;
task->tState = STATE_WAIT; task->tState = STATE_WAIT;
gTasks[gPopupTaskId].data[1] = 0; gTasks[gPopupTaskId].tOnscreenTimer = 0;
} }
break; break;
case STATE_WAIT: case STATE_WAIT:
@ -460,8 +460,8 @@ static void Task_MapNamePopUpWindow(u8 taskId)
HideMapNamePopUpWindow(); HideMapNamePopUpWindow();
return; return;
} }
if (OW_POPUP_GENERATION != GEN_5) if (OW_POPUP_GENERATION != GEN_5)
SetGpuReg(REG_OFFSET_BG0VOFS, task->tYOffset); SetGpuReg(REG_OFFSET_BG0VOFS, task->tYOffset);
} }
void HideMapNamePopUpWindow(void) void HideMapNamePopUpWindow(void)