diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-09 16:09:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 16:09:48 -0500 |
| commit | 8e424b69850eb90abd0d7a65be423f8621dc1c2e (patch) | |
| tree | 1308176f28fbc134c5e7cf19bf5788d7f93103fe /src/pokenav_main_menu.c | |
| parent | adf773f1ed272f31ae34e2613d20ec796b651bf8 (diff) | |
| parent | 1c82571fa04ecad7d4a805e5fbec4691643ac655 (diff) | |
Merge branch 'master' into doc-binterface
Diffstat (limited to 'src/pokenav_main_menu.c')
| -rw-r--r-- | src/pokenav_main_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 0166cc10c..714c8221a 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -421,9 +421,9 @@ static u32 LoopedTask_SlideMenuHeaderUp(s32 a0) case 0: return LT_INC_AND_PAUSE; case 2: - if (ChangeBgY(0, 384, 1) >= 0x2000u) + if (ChangeBgY(0, 384, BG_COORD_ADD) >= 0x2000u) { - ChangeBgY(0, 0x2000, 0); + ChangeBgY(0, 0x2000, BG_COORD_SET); return LT_FINISH; } @@ -433,9 +433,9 @@ static u32 LoopedTask_SlideMenuHeaderUp(s32 a0) static u32 LoopedTask_SlideMenuHeaderDown(s32 a0) { - if (ChangeBgY(0, 384, 2) <= 0) + if (ChangeBgY(0, 384, BG_COORD_SUB) <= 0) { - ChangeBgY(0, 0, 0); + ChangeBgY(0, 0, BG_COORD_SET); return LT_FINISH; } return LT_PAUSE; @@ -555,7 +555,7 @@ static void InitHelpBar(void) structPtr->helpBarWindowId = 0; DrawHelpBar(structPtr->helpBarWindowId); PutWindowTilemap(structPtr->helpBarWindowId); - CopyWindowToVram(structPtr->helpBarWindowId, 3); // TODO: Use a defined constant here. + CopyWindowToVram(structPtr->helpBarWindowId, COPYWIN_FULL); } void PrintHelpBarText(u32 textId) |