dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-03-26 17:17:11 -04:00
parent 402f2643bd
commit b0878acc98
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+3 -3
View File
@@ -179,9 +179,9 @@ static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEve
static void npc_clear_strange_bits(struct ObjectEvent *objEvent) static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
{ {
objEvent->inanimate = 0; objEvent->inanimate = FALSE;
objEvent->disableAnim = 0; objEvent->disableAnim = FALSE;
objEvent->facingDirectionLocked = 0; objEvent->facingDirectionLocked = FALSE;
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_WATERING; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_WATERING;
} }
src/new_menu_helpers.c
+4 -4
View File
@@ -457,7 +457,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
void LoadStdWindowFrameGfx(void) void LoadStdWindowFrameGfx(void)
{ {
if (gQuestLogState == 2) if (gQuestLogState == QL_STATE_2)
{ {
gTextFlags.autoScroll = 1; gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM); TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
@@ -495,7 +495,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
ClearWindowTilemap(windowId); ClearWindowTilemap(windowId);
if (copyToVram == TRUE) if (copyToVram == TRUE)
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
if (gQuestLogState == 2) if (gQuestLogState == QL_STATE_2)
CommitQuestLogWindow1(); CommitQuestLogWindow1();
} }
@@ -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) 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 + 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); 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) void sub_80F7768(u8 windowId, bool8 copyToVram)
{ {
if (gQuestLogState == 2) if (gQuestLogState == QL_STATE_2)
{ {
gTextFlags.autoScroll = 1; gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM); TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);