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

Merge remote-tracking branch 'ravepossum/bsbob_map_popups' into _RHH/pr/upcoming/bwPopupMergeFix

Browse source 
# Conflicts:
#	include/field_weather.h
#	include/rtc.h
#	include/strings.h
#	src/field_weather.c
#	src/map_name_popup.c
#	src/menu.c
#	src/rtc.c
#	src/strings.c
This commit is contained in:
Eduardo Quezada 2024-06-09 16:34:11 -04:00
commit 911af213c1
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->tState = STATE_WAIT;
gTasks[gPopupTaskId].data[1] = 0;
gTasks[gPopupTaskId].tOnscreenTimer = 0;
}
break;
case STATE_WAIT:
@ -460,8 +460,8 @@ static void Task_MapNamePopUpWindow(u8 taskId)
HideMapNamePopUpWindow();
return;
}
if (OW_POPUP_GENERATION != GEN_5)
SetGpuReg(REG_OFFSET_BG0VOFS, task->tYOffset);
if (OW_POPUP_GENERATION != GEN_5)
SetGpuReg(REG_OFFSET_BG0VOFS, task->tYOffset);
}
void HideMapNamePopUpWindow(void)