diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/mauville_man.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/mauville_man.c')
| -rw-r--r-- | src/mauville_man.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mauville_man.c b/src/mauville_man.c index ac9a02ce9..b3e13ef64 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -10,7 +10,7 @@ #include "overworld.h" #include "random.h" #include "script.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/songs.h" #include "sound.h" #include "string_util.h" @@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId) void sub_80F83D0(void) { - VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); + VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); } struct Story |