summaryrefslogtreecommitdiff
path: root/src/field_control_avatar.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-07-17 20:15:15 -0500
committercamthesaxman <cameronghall@cox.net>2017-07-17 20:15:15 -0500
commite2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch)
tree843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /src/field_control_avatar.c
parentd4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff)
parent67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff)
fix merge conflicts
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r--src/field_control_avatar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 2d8140be5..a4f52f4b9 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -206,7 +206,7 @@ int sub_8068024(struct FieldInput *input)
sub_8071310();
return TRUE;
}
- if (input->pressedSelectButton && sub_80A6D1C() == 1)
+ if (input->pressedSelectButton && sub_80A6D1C() == TRUE)
return TRUE;
return FALSE;
}