diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /src/field_map_obj.c | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
Diffstat (limited to 'src/field_map_obj.c')
| -rw-r--r-- | src/field_map_obj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index a5be62442..81cbe5210 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1146,7 +1146,7 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId) } if (graphicsId == 0x45) { - bard = sub_81201C8(); + bard = GetCurrentMauvilleOldMan(); return gMauvilleOldManGraphicsInfoPointers[bard]; } if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) |