diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /src/field/field_player_avatar.c | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'src/field/field_player_avatar.c')
| -rw-r--r-- | src/field/field_player_avatar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 795a53d0b..85cfdb829 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -615,7 +615,7 @@ u8 CheckForFieldObjectCollision(struct MapObject *a, s16 x, s16 y, u8 direction, return 5; if (ShouldJumpLedge(x, y, direction)) { - IncrementGameStat(0x2B); + IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES); return COLLISION_LEDGE_JUMP; } if (collision == 4 && sub_8058F6C(x, y, direction)) |