diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-16 13:53:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-16 13:53:55 -0500 |
| commit | 6546ff5d0ad80ceca6b422713e0d3cd0ffa62b53 (patch) | |
| tree | 51320be5ec4fb0755398911d705f6e3f323ddf0a /src/field_control_avatar.c | |
| parent | 196f2a1c24016eae8b9fad6d57cabd43d34f898e (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 2 |
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; } |