diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-26 17:53:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:53:18 -0400 |
| commit | b9c604b8d2ffe863cf17336a4d956b08438f0f45 (patch) | |
| tree | 95935cb5754f89ea78402cf4706830f71eb07e81 /src/new_menu_helpers.c | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
| parent | 9130579f1454c869e74ea8c953c0c778a4760396 (diff) | |
Merge pull request #311 from PikalaxALT/field_player_avatar
Field player avatar
Diffstat (limited to 'src/new_menu_helpers.c')
| -rw-r--r-- | src/new_menu_helpers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 959370398..78bc6b7a4 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -457,7 +457,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP void LoadStdWindowFrameGfx(void) { - if (gQuestLogState == 2) + if (gQuestLogState == QL_STATE_2) { gTextFlags.autoScroll = 1; TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM); @@ -495,8 +495,8 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); - if (gQuestLogState == 2) - sub_8111134(); + if (gQuestLogState == QL_STATE_2) + CommitQuestLogWindow1(); } void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram) @@ -527,7 +527,7 @@ static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u static void WindowFunc_DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - if (!IsMsgSignPost() || gQuestLogState == 2) + if (!IsMsgSignPost() || gQuestLogState == QL_STATE_2) { FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 0, tilemapLeft - 2, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM); FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 1, tilemapLeft - 1, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM); @@ -611,7 +611,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram) void sub_80F7768(u8 windowId, bool8 copyToVram) { - if (gQuestLogState == 2) + if (gQuestLogState == QL_STATE_2) { gTextFlags.autoScroll = 1; TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM); |